This commit was manufactured by cvs2svn to create tag 'autotagHEAD'.
diff --git a/org.eclipse.gmf.examples.runtime-feature/.cvsignore b/org.eclipse.gmf.examples.runtime-feature/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/org.eclipse.gmf.examples.runtime-feature/.project b/org.eclipse.gmf.examples.runtime-feature/.project
deleted file mode 100644
index c8a24a9..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime-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.examples.runtime-feature/build.properties b/org.eclipse.gmf.examples.runtime-feature/build.properties
deleted file mode 100644
index 1528408..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html               
diff --git a/org.eclipse.gmf.examples.runtime-feature/eclipse_update_120.jpg b/org.eclipse.gmf.examples.runtime-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime-feature/epl-v10.html b/org.eclipse.gmf.examples.runtime-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime-feature/feature.properties b/org.eclipse.gmf.examples.runtime-feature/feature.properties
deleted file mode 100644
index 31cefbd..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/feature.properties
+++ /dev/null
@@ -1,160 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework (GMF) Runtime Examples
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework Runtime Examples.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.examples.runtime-feature/feature.xml b/org.eclipse.gmf.examples.runtime-feature/feature.xml
deleted file mode 100644
index c0600a6..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/feature.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.examples.runtime"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName">
-
-   <description url="http://www.eclipse.org/gmf">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      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
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.gmf" version="1.4.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.common.service"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.decorator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.layout"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.emf.clipboard"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.geoshapes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.logic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.logic.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.logic.model.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.diagram.logic.model.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.gmf.examples.runtime-feature/license.html b/org.eclipse.gmf.examples.runtime-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime-feature/pom.xml b/org.eclipse.gmf.examples.runtime-feature/pom.xml
deleted file mode 100644
index 7d51efe..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.examples.runtime-feature/rootfiles/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime-feature/rootfiles/notice.html b/org.eclipse.gmf.examples.runtime-feature/rootfiles/notice.html
deleted file mode 100644
index c6af966..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateBundle/about.html b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateBundle/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, 2007</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-feature/sourceTemplateBundle/plugin.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 965d817..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/build.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 1fefb8c..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 =\
-epl-v10.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html
-src.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/feature.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 9a590b0..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Examples Runtime Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Source code for Graphical Modeling Framework Runtime Examples.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/license.html b/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/about.html b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/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, 2007</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-feature/sourceTemplatePlugin/about.ini b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/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.examples.runtime-feature/sourceTemplatePlugin/about.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 097e1aa..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# 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) Runtime Examples
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Runtime Examples \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.examples.runtime-feature/sourceTemplatePlugin/build.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index c6d7dcd..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/,\
-               about.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/modeling32.png b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 965d817..0000000
--- a/org.eclipse.gmf.examples.runtime-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources
-providerName=Eclipse Modeling Project
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 f20bb4d..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-doc
-bin
-serviceExample.zip
-target
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 11095ff..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.externalToolBuilders/New_Builder.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.common.service&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" 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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.diagram.decorator&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.common.service/buildZip.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.common.service}"/>
-</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 5890387..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>auto,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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.common.service/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f505103..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Apr 03 16:35:06 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 d605aab..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/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.common.service; singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 c3386d9..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.examples.runtime.common.service/pom.xml
deleted file mode 100644
index afd6bbc..0000000
--- a/org.eclipse.gmf.examples.runtime.common.service/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.common.service</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.common.service</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 da33c0e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-servicesDecorator.zip
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.decorator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 525cf42..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:35:27 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 6e8c0b5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/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.decorator; singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 5634259..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 Modeling Project
-
-
-
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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.decorator/pom.xml
deleted file mode 100644
index 1630b3e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.decorator</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.decorator</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 1b414dc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.decorator/src/org/eclipse/gmf/examples/runtime/diagram/decorator/provider/ReviewDecoratorProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core.runtime.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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d6d2ec2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-geoshapes.zip
-target
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 d45a31d..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,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.diagram.geoshapes&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" 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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.diagram.geoshapes&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.geoshapes/buildZip.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.diagram.geoshapes}"/>
-</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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e74d441..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:35:51 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 23dc8e2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +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.2.0.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.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy; exceptions="org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.nonactivating"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 b6db7b4..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 Modeling Project
-
-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 720c1f9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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                   -->
-<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 id="GeoshapesExampleGroupContributionItemProvider" name="GeoshapesExampleGroupContributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">
-         <Priority name="Low">
-         </Priority>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria
-                  objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart"
-                  objectCount="2+">
-               <method
-                     name="getDiagramEditDomain().getEditorPart().getEditorSite().getId()"
-                     value="GeoshapeEditor"/>     
-            </popupStructuredContributionCriteria>     
-            <popupAction path="/formatMenu/miscellaneousGroup" id="groupAction">
-            </popupAction>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart">
-            	<method
-                     name="getDiagramEditDomain().getEditorPart().getEditorSite().getId()"
-                     value="GeoshapeEditor"/>     
-            </popupStructuredContributionCriteria>                    
-            <popupAction path="/formatMenu/miscellaneousGroup" id="ungroupAction">
-            </popupAction>   
-         </popupContribution>                                 
-      </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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.geoshapes/pom.xml
deleted file mode 100644
index d9de5df..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.geoshapes</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.geoshapes</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 5590273..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, 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.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/wizards/"; //$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 c88b0ae..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/preferences/GeoshapesPreferenceInitializer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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(); 
-        // Anti Aliasing was turned off in fix Bugzilla 137155 
-        // Since Bugzilla 204012 is resolved, we can turn on again.
-        // This class should be removed, but leaving in case we need it again.
-        store.setDefault(IPreferenceConstants.PREF_ENABLE_ANTIALIAS, true);
-    }
-
-    /*
-     * (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 d8981f1..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.optimal.StandardDiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-
-public class GeoshapesDiagramViewFactory
-	extends StandardDiagramViewFactory {
-
-	/**
-	 * 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e7f9e9d..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-servicesLayout.zip
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.layout/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 404d810..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:36:13 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 d91353a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/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.diagram.layout; singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy; exceptions="org.eclipse.gmf.examples.runtime.diagram.layout.provider"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 e3a90d5..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.layout/pom.xml
deleted file mode 100644
index c086ba3..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.layout</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.layout</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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/graph/AbstractGMFGraphDemo.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/AbstractGMFGraphDemo.java
deleted file mode 100644
index 86c03b5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/AbstractGMFGraphDemo.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.graph;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.BorderNode;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.ConstantSizeNode;
-import org.eclipse.swt.SWT;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Implementation of a common part of the graph layout demo application. Mainly, it's
- * copied from the demo from GEF with some minor differences:
- * <li> Border nodes support
- * <li> Non-applicable things removed 
- * 
- * @author aboyko
- *
- */
-public abstract class AbstractGMFGraphDemo {
-
-	/** Contents of the demo */
-	protected IFigure contents;
-	/** Name of graph test method to run */
-	protected static String graphMethod;
-	/** Demo shell */
-	protected Shell shell;
-
-	private FigureCanvas fc;
-
-	/**
-	 * Builds a figure for the given edge and adds it to contents
-	 * @param contents the parent figure to add the edge to
-	 * @param edge the edge
-	 */
-	static void buildEdgeFigure(Figure contents, Edge edge) {
-		PolylineConnection conn = connection(edge);
-		conn.setForegroundColor(ColorConstants.gray);
-		PolygonDecoration dec = new PolygonDecoration();
-		conn.setTargetDecoration(dec);
-		conn.setPoints(edge.getPoints());
-		contents.add(conn);
-	}
-
-	/**
-	 * Builds a Figure for the given node and adds it to contents
-	 * @param contents the parent Figure to add the node to
-	 * @param node the node to add
-	 */
-	static void buildNodeFigure(Figure contents, Node node) {
-		Label label;
-		label = new Label();
-		label.setBackgroundColor(ColorConstants.lightGray);
-		label.setOpaque(true);
-		label.setBorder(new LineBorder());
-		if (node.incoming.isEmpty())
-			label.setBorder(new LineBorder(2));
-		String text = node.data.toString();
-		label.setText(text);
-		node.data = label;
-		contents.add(label, new Rectangle(node.x, node.y, node.width, node.height));
-		
-		if (node instanceof ConstantSizeNode) {
-			ConstantSizeNode cn = (ConstantSizeNode) node;
-			for (int i = 0; i < cn.borderNodes.size(); i++) {
-				buildBorderNodeFigure(contents, cn.borderNodes.get(i));
-			}
-		}
-	}
-
-	static void buildBorderNodeFigure(Figure contents, BorderNode node) {
-		Label label;
-		label = new Label();
-		label.setBackgroundColor(ColorConstants.lightGray);
-		label.setOpaque(true);
-		label.setBorder(new LineBorder());
-		String text = node.data.toString();// + "(" + node.index +","+node.sortValue+ ")";
-		label.setText(text);
-		node.data = label;
-		contents.add(label, new Rectangle(node.x, node.y, node.width, node.height));
-	}
-	
-	/**
-	 * Builds a connection for the given edge
-	 * @param e the edge
-	 * @return the connection
-	 */
-	static PolylineConnection connection(Edge e) {
-		PolylineConnection conn = new PolylineConnection();
-		conn.setConnectionRouter(new BendpointConnectionRouter());
-		List bends = new ArrayList();
-		NodeList nodes = e.vNodes;
-		if (nodes != null) {
-			for (int i = 0; i < nodes.size(); i++) {
-				Node n = nodes.getNode(i);
-				int x = n.x;
-				int y = n.y;
-				bends.add(new AbsoluteBendpoint(x, y));
-				bends.add(new AbsoluteBendpoint(x, y + n.height));
-			}
-		}
-		conn.setRoutingConstraint(bends);
-		return conn;
-	}
-
-	/**
-	 * @see org.eclipse.graph.AbstractExample#getContents()
-	 */
-	protected IFigure getContents() {
-		return null;
-	}
-
-	/**
-	 * Returns the FigureCanvas
-	 * @return this demo's FigureCanvas
-	 */
-	protected FigureCanvas getFigureCanvas() {
-		return fc;
-	}
-
-	/**
-	 * Returns an array of strings that represent the names of the methods which build
-	 * graphs for this graph demo
-	 * @return array of graph building method names 
-	 */
-	protected abstract String[] getGraphMethods();
-
-
-	/**
-	 * @see org.eclipse.graph.AbstractExample#hookShell()
-	 */
-	protected void hookShell() {
-		Composite composite = new Composite(shell, 0);
-		composite.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		
-		composite.setLayout(new GridLayout());	
-		final org.eclipse.swt.widgets.Label nodesLabel 
-				= new org.eclipse.swt.widgets.Label(composite, SWT.NONE);
-		nodesLabel.setText("Graph"); //$NON-NLS-1$
-		final Combo graphList = new Combo(composite, SWT.DROP_DOWN);
-		
-		String[] graphMethods = getGraphMethods();
-		for (int i = 0; i < graphMethods.length; i++) {
-			if (graphMethods[i] != null)
-				graphList.add(graphMethods[i]);
-		}
-		setGraphMethod(graphMethods[0]);
-		graphList.setText(graphMethod);
-		graphList.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				setGraphMethod(graphList.getItem(graphList.getSelectionIndex()));
-				getFigureCanvas().setContents(getContents());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-				graphList.setText(graphMethod);
-			}
-		});		
-	}
-
-	/**
-	 * Runs the demo.
-	 */
-	protected void run() {
-		Display d = Display.getDefault();
-		shell = new Shell(d);
-		String appName = getClass().getName();
-		appName = appName.substring(appName.lastIndexOf('.') + 1);
-		hookShell();
-		shell.setText(appName);
-		shell.setLayout(new GridLayout(2, false));
-		setFigureCanvas(new FigureCanvas(shell));
-		getFigureCanvas().setContents(contents = getContents());
-		getFigureCanvas().getViewport().setContentsTracksHeight(true);
-		getFigureCanvas().getViewport().setContentsTracksWidth(true);
-		getFigureCanvas().setLayoutData(new GridData(GridData.FILL_BOTH));
-		shell.setSize(1100, 700);
-		shell.open();
-		while (!shell.isDisposed())
-			while (!d.readAndDispatch())
-				d.sleep();
-	}
-
-	/**
-	 * Sets this demo's FigureCanvas
-	 * @param canvas this demo's FigureCanvas
-	 */
-	protected void setFigureCanvas(FigureCanvas canvas) {
-		this.fc = canvas;
-	}
-
-	/**
-	 * Sets the name of the method to call to build the graph
-	 * @param method name of the method used to build the graph
-	 */
-	public static void setGraphMethod(String method) {
-		graphMethod = method;
-	}
-
-}
diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFDirectedGraphDemo.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFDirectedGraphDemo.java
deleted file mode 100644
index 8ec9e69..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFDirectedGraphDemo.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.graph;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-
-public class GMFDirectedGraphDemo extends AbstractGMFGraphDemo {
-
-	protected String[] getGraphMethods() {
-		Method[] methods = GMFGraphTests.class.getMethods();
-		String[] methodNames = new String[methods.length];
-		
-		int nameIndex = 0;
-		for (int i = 0; i < methods.length; i++) {
-			if (methods[i].getReturnType().equals(DirectedGraph.class)) {
-				methodNames[nameIndex] = methods[i].getName();
-				nameIndex++;
-			}
-		}
-		return methodNames;
-	}
-
-	protected IFigure getContents() {
-		DirectedGraph graph = null;
-		try {
-			graph =
-				(DirectedGraph) (GMFGraphTests
-					.class
-					.getMethod(graphMethod, null)
-					.invoke(null, null));
-		} catch (Exception e) {
-			System.out.println("Could not build graph"); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		Figure contents = buildGraph(graph);
-		return contents;
-	}
-
-	public static void main(String[] args) {
-		new GMFDirectedGraphDemo().run();
-	}
-	
-	/**
-	 * Builds the graph, creates Draw2d figures for all graph components.
-	 * @param graph the graph to build
-	 * @return the Figure representing the graph
-	 */
-	public static Figure buildGraph(DirectedGraph graph) {
-		Figure contents = new Panel();
-		contents.setBackgroundColor(ColorConstants.white);
-		contents.setLayoutManager(new XYLayout());
-		
-		for (int i = 0; i < graph.nodes.size(); i++) {
-			Node node = graph.nodes.getNode(i);
-			buildNodeFigure(contents, node);
-		}
-		
-		for (int i = 0; i < graph.edges.size(); i++) {
-			Edge edge = graph.edges.getEdge(i);
-			buildEdgeFigure(contents, edge);
-		}
-		return contents;
-	}
-		
-	static void buildEdgeFigure(Figure contents, Edge edge) {
-		PolylineConnection conn = connection(edge);
-		conn.setForegroundColor(ColorConstants.gray);
-		PolygonDecoration dec = new PolygonDecoration();
-		conn.setTargetDecoration(dec);
-		conn.setPoints(edge.getPoints());
-		contents.add(conn);
-	}
-	
-	static PolylineConnection connection(Edge e) {
-		PolylineConnection conn = new PolylineConnection();
-		conn.setConnectionRouter(new BendpointConnectionRouter());
-		List bends = new ArrayList();
-		NodeList nodes = e.vNodes;
-		if (nodes != null) {
-			for (int i = 0; i < nodes.size(); i++) {
-				Node n = nodes.getNode(i);
-				int x = n.x;
-				int y = n.y;
-				bends.add(new AbsoluteBendpoint(x, y));
-				bends.add(new AbsoluteBendpoint(x, y + n.height));
-			}
-		}
-		conn.setRoutingConstraint(bends);
-		return conn;
-	}
-}
diff --git a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFGraphTests.java b/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFGraphTests.java
deleted file mode 100644
index d0cf57f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.layout/src/org/eclipse/gmf/examples/runtime/diagram/layout/graph/GMFGraphTests.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.graph;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.graph.DirectedGraph;
-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.gmf.runtime.draw2d.ui.graph.BorderNode;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.ConstantSizeNode;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.ConstrainedEdge;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.GMFDirectedGraphLayout;
-
-public class GMFGraphTests {
-	
-	public static DirectedGraph test1() {
-		ConstantSizeNode hub, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10;
-		ConstrainedEdge e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, temp;
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		Node extra = new ConstantSizeNode("Extra"); //$NON-NLS-1$
-		nodes.add(extra);
-		
-		nodes.add(hub = new ConstantSizeNode("Hub")); //$NON-NLS-1$
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		nodes.add(n7 = new ConstantSizeNode("n7")); //$NON-NLS-1$
-		nodes.add(n8 = new ConstantSizeNode("n8")); //$NON-NLS-1$
-		nodes.add(n9 = new ConstantSizeNode("n9")); //$NON-NLS-1$
-		nodes.add(n10 = new ConstantSizeNode("n10")); //$NON-NLS-1$
-		
-		hub.width = 400;
-		hub.setMinIncomingPadding(20);
-		hub.setMinOutgoingPadding(20);
-		n1.setMinIncomingPadding(10);
-		n2.setMinIncomingPadding(10);
-		n3.setMinIncomingPadding(10);
-		n4.setMinIncomingPadding(10);
-		n1.width = n6.width = n10.width = n4.width = 100;
-		n5.width = 180;
-		
-		n10.setMinOutgoingPadding(10);
-		n5.setMinIncomingPadding(10);
-		
-		edges.add(new Edge(extra, n1));
-		edges.add(new Edge(extra, n2));
-		edges.add(new Edge(extra, n2));
-		
-//		edges.add(new Edge(n10, n5));
-		
-		edges.add(e1 = new ConstrainedEdge(hub, n1));
-		edges.add(e2 = new ConstrainedEdge(hub, n2));
-		edges.add(e3 = new ConstrainedEdge(hub, n3));
-		edges.add(e4 = new ConstrainedEdge(hub, n4));
-		edges.add(e5 = new ConstrainedEdge(hub, n5));
-		edges.add(e6 = new ConstrainedEdge(n6, hub));
-		edges.add(e7 = new ConstrainedEdge(n7, hub));
-		edges.add(e8 = new ConstrainedEdge(n8, hub));
-		edges.add(e9 = new ConstrainedEdge(n9, hub));
-		edges.add(e10 = new ConstrainedEdge(n10, hub));
-				
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		new GMFDirectedGraphLayout().visit(g);
-		
-		return g;
-		
-	}
-	
-	public static DirectedGraph test2() {
-		ConstantSizeNode head, n1, n2, n3, n4, n5, d1, d2, n6, n7, tail;
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		nodes.add(head = new ConstantSizeNode("head")); //$NON-NLS-1$
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(d1 = new ConstantSizeNode("d1")); //$NON-NLS-1$
-		nodes.add(d2 = new ConstantSizeNode("d2")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		nodes.add(n7 = new ConstantSizeNode("n7")); //$NON-NLS-1$
-		nodes.add(tail = new ConstantSizeNode("tail")); //$NON-NLS-1$
-		
-		head.width = tail.width = 20;
-		head.height = tail.height = 250;
-		
-		edges.add(new Edge(head, n1));
-		edges.add(new Edge(head, n2));
-		edges.add(new Edge(head, n3));
-		edges.add(new Edge(head, n4));
-		edges.add(new Edge(head, n5));
-		
-		edges.add(new Edge(n1, d1));
-		edges.add(new Edge(n2, tail));
-		edges.add(new Edge(n3, d2));
-		edges.add(new Edge(n4, tail));
-		edges.add(new Edge(n5, tail));
-		
-		edges.add(new Edge(d1, n6));
-		edges.add(new Edge(n6, tail));
-		edges.add(new Edge(d1, tail));
-		
-		edges.add(new Edge(d2, n7));
-		edges.add(new Edge(n7, tail));
-		edges.add(new Edge(d2, tail));
-		
-		for (int i = 0; i < nodes.size(); i++) {
-			Node n = nodes.getNode(i);
-			if (n instanceof ConstantSizeNode) {
-				ConstantSizeNode cn = (ConstantSizeNode) n;
-				cn.setMinIncomingPadding(5);
-				cn.setMinOutgoingPadding(5);
-			}
-		}
-		
-		DirectedGraph graph = new DirectedGraph();
-		graph.nodes = nodes;
-		graph.edges = edges;
-		graph.setDirection(PositionConstants.WEST);
-		
-		new GMFDirectedGraphLayout().visit(graph);
-		return graph;
-	}
-	
-	public static DirectedGraph test3() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		ConstantSizeNode hub, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10;
-		ConstrainedEdge e1, e2, e3, e4, e5, e6, e7, e8, e9, e10;
-		
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		nodes.add(n7 = new ConstantSizeNode("n7")); //$NON-NLS-1$
-		nodes.add(n8 = new ConstantSizeNode("n8")); //$NON-NLS-1$
-		nodes.add(n9 = new ConstantSizeNode("n9")); //$NON-NLS-1$
-		nodes.add(n10 = new ConstantSizeNode("n10")); //$NON-NLS-1$
-		nodes.add(hub = new ConstantSizeNode("hub")); //$NON-NLS-1$
-		
-		hub.setMinIncomingPadding(10);
-		hub.setMinOutgoingPadding(10);
-		
-		hub.width = 1500;
-		hub.height = 500;
-		
-		//n1.width = n2.width = n3.width = n4.width = n5.width = n6.width = n7.width = n8.width = n9.width = n10.width = 300;
-		
-		
-		BorderNode bn1 = new BorderNode("BN1", hub); //$NON-NLS-1$
-		BorderNode bn2 = new BorderNode("BN2", hub); //$NON-NLS-1$
-		BorderNode bn3 = new BorderNode("BN3", hub); //$NON-NLS-1$
-		BorderNode bn4 = new BorderNode("BN4", hub); //$NON-NLS-1$
-		BorderNode bn5 = new BorderNode("BN5", hub); //$NON-NLS-1$
-		BorderNode bn6 = new BorderNode("BN6", hub); //$NON-NLS-1$
-		BorderNode bn7 = new BorderNode("BN7", hub); //$NON-NLS-1$
-		bn1.width = bn1.height = bn2.width = bn2.height = bn3.width = bn3.height = bn4.width = bn4.height = bn5.width = bn5.height = bn6.width = bn6.height = bn7.width = bn7.height = 50;
-		
-		bn7.setMinOutgoingPadding(5);
-		bn6.setMinIncomingPadding(5);
-		
-		edges.add(e1 = new ConstrainedEdge(hub, n1));
-		edges.add(e2 = new ConstrainedEdge(bn7, n2));
-		edges.add(e3 = new ConstrainedEdge(hub, n3));
-		edges.add(e4 = new ConstrainedEdge(hub, n4));
-		edges.add(e5 = new ConstrainedEdge(bn7, n5));
-		edges.add(e6 = new ConstrainedEdge(n6, bn6));
-		edges.add(e7 = new ConstrainedEdge(n7, bn6));
-		edges.add(e8 = new ConstrainedEdge(n8, hub));
-		edges.add(e9 = new ConstrainedEdge(n9, hub));
-		edges.add(e10 = new ConstrainedEdge(n10, bn6));
-		
-		DirectedGraph graph = new DirectedGraph();
-		graph.nodes = nodes;
-		graph.edges = edges;
-		graph.setDefaultPadding(new Insets(50));
-		
-		new GMFDirectedGraphLayout().visit(graph);
-		return graph;
-	}
-
-	public static DirectedGraph test2Orthogonal() {
-		ConstantSizeNode head, n1, n2, n3, n4, n5, d1, d2, n6, n7, tail;
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		nodes.add(head = new ConstantSizeNode("head")); //$NON-NLS-1$
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(d1 = new ConstantSizeNode("d1")); //$NON-NLS-1$
-		nodes.add(d2 = new ConstantSizeNode("d2")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		nodes.add(n7 = new ConstantSizeNode("n7")); //$NON-NLS-1$
-		nodes.add(tail = new ConstantSizeNode("tail")); //$NON-NLS-1$
-		
-		head.width = tail.width = 20;
-		head.height = tail.height = 250;
-		
-		edges.add(new ConstrainedEdge(head, n1));
-		edges.add(new ConstrainedEdge(head, n2));
-		edges.add(new ConstrainedEdge(head, n3));
-		edges.add(new ConstrainedEdge(head, n4));
-		edges.add(new ConstrainedEdge(head, n5));
-		
-		edges.add(new ConstrainedEdge(n1, d1));
-		edges.add(new ConstrainedEdge(n2, tail));
-		edges.add(new ConstrainedEdge(n3, d2));
-		edges.add(new ConstrainedEdge(n4, tail));
-		edges.add(new ConstrainedEdge(n5, tail));
-		
-		edges.add(new ConstrainedEdge(d1, n6));
-		edges.add(new ConstrainedEdge(n6, tail));
-		edges.add(new ConstrainedEdge(d1, tail));
-		
-		edges.add(new ConstrainedEdge(d2, n7));
-		edges.add(new ConstrainedEdge(n7, tail));
-		edges.add(new ConstrainedEdge(d2, tail));
-		
-		for (int i = 0; i < nodes.size(); i++) {
-			Node n = nodes.getNode(i);
-			if (n instanceof ConstantSizeNode) {
-				ConstantSizeNode cn = (ConstantSizeNode) n;
-				cn.setMinIncomingPadding(5);
-				cn.setMinOutgoingPadding(5);
-			}
-		}
-		
-		for (int i = 0; i < edges.size(); i++) {
-			ConstrainedEdge ce = (ConstrainedEdge) edges.getEdge(i);
-			ce.setStyle(ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE);
-		}
-		
-		DirectedGraph graph = new DirectedGraph();
-		graph.nodes = nodes;
-		graph.edges = edges;
-		graph.setDirection(PositionConstants.WEST);
-		
-		new GMFDirectedGraphLayout().visit(graph);
-		return graph;
-	}
-	
-	public static DirectedGraph test4() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3, n4, hub;
-		BorderNode bn1, bn2;
-		
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(hub = new ConstantSizeNode("hub")); //$NON-NLS-1$
-		
-		n1.width = n1.height = n2.width = n2.height = n3.width = n3.height = n4.width = n4.height = 100;
-		hub.width = 150;
-		hub.height = 150;
-		
-		hub.setPadding(new Insets(20, 50, 20, 50)); 
-		
-		bn1 = new BorderNode("bn1", hub); //$NON-NLS-1$
-		bn1.width = bn1.height = 20;
-		bn2 = new BorderNode("bn2", hub); //$NON-NLS-1$
-		bn2.width = bn2.height = 35;
-		bn2.setOutsideRatio(0.2f);
-		
-		bn2.setMinIncomingPadding(5);
-		bn1.setMinOutgoingPadding(5);
-		
-		edges.add(new ConstrainedEdge(n1, bn1));
-		edges.add(new ConstrainedEdge(n2, bn2));
-		edges.add(new ConstrainedEdge(bn1, n3));
-		edges.add(new ConstrainedEdge(bn2, n4));
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		new GMFDirectedGraphLayout().visit(g);
-		return g;
-	}
-
-	public static DirectedGraph test5() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2;
-		BorderNode bn1, bn2;
-		
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		
-		n1.width = n2.width = 100;
-		n1.height = n2.height = 30; 
-		
-		bn1 = new BorderNode("bn1", n1); //$NON-NLS-1$
-		bn2 = new BorderNode("bn2", n2); //$NON-NLS-1$
-		bn1.width = bn2.width = bn1.height = bn2.height = 10;
-		bn2.setOutsideRatio(1f);
-		bn1.setOutsideRatio(1f);
-		
-		bn2.setMinIncomingPadding(5);
-		bn1.setMinOutgoingPadding(5);
-		
-		edges.add(new ConstrainedEdge(bn1, bn2));
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		new GMFDirectedGraphLayout().visit(g);
-		return g;
-	}
-	
-	public static DirectedGraph variousHeights_Test1() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3, n4, n5, n6;
-		
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		
-		n2.height = 200;
-		n1.height = n3.height = 30;
-		
-		edges.add(new Edge(n1, n4));
-		edges.add(new Edge(n1, n5));
-		edges.add(new Edge(n1, n6));
-		edges.add(new Edge(n2, n4));
-		edges.add(new Edge(n2, n5));
-		edges.add(new Edge(n2, n6));
-		edges.add(new Edge(n3, n4));
-		edges.add(new Edge(n3, n5));
-		edges.add(new Edge(n3, n6));
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		new GMFDirectedGraphLayout().visit(g);
-		return g;
-	}
-
-	public static DirectedGraph variousHeights_Test2() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3, n4, n5, n6;
-		
-		nodes.add(n1 = new ConstantSizeNode("n1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("n2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("n3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("n4")); //$NON-NLS-1$
-		nodes.add(n5 = new ConstantSizeNode("n5")); //$NON-NLS-1$
-		nodes.add(n6 = new ConstantSizeNode("n6")); //$NON-NLS-1$
-		
-		n1.setMinOutgoingPadding(5);
-		n2.setMinOutgoingPadding(5);
-		n3.setMinOutgoingPadding(5);
-		
-		n4.setMinIncomingPadding(5);
-		n5.setMinIncomingPadding(5);
-		n6.setMinIncomingPadding(5);
-		
-		n2.height = 150;
-		n1.height = n3.height = 30;
-		
-		edges.add(new Edge(n1, n4));
-		edges.add(new Edge(n1, n5));
-		edges.add(new Edge(n1, n6));
-		edges.add(new Edge(n2, n4));
-		edges.add(new Edge(n2, n5));
-		edges.add(new Edge(n2, n6));
-		edges.add(new Edge(n3, n4));
-		edges.add(new Edge(n3, n5));
-		edges.add(new Edge(n3, n6));
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		new GMFDirectedGraphLayout().visit(g);
-		return g;
-	}
-	
-	public static DirectedGraph composite_test1() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3, n4;
-		BorderNode bn1, bn2, bn3, bn4;
-		Edge e1, e2, e3, e4;
-		
-		nodes.add(n1 = new ConstantSizeNode("Node1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("Node2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("Node3")); //$NON-NLS-1$
-		nodes.add(n4 = new ConstantSizeNode("Node4")); //$NON-NLS-1$
-		
-		bn1 = new BorderNode("bn1", n1); //$NON-NLS-1$
-		bn2 = new BorderNode("bn2", n2); //$NON-NLS-1$
-		bn3 = new BorderNode("bn3", n3); //$NON-NLS-1$
-		bn4 = new BorderNode("bn4", n4); //$NON-NLS-1$
-		
-		bn1.width = bn2.width = bn3.width = bn4.width = bn1.height = bn2.height = bn3.height = bn4.height = 10;
-		
-		bn1.setMinIncomingPadding(5);
-		bn2.setMinIncomingPadding(5);
-		bn3.setMinIncomingPadding(5);
-		bn4.setMinIncomingPadding(5);
-		n1.setMinIncomingPadding(5);
-		n2.setMinIncomingPadding(5);
-		n3.setMinIncomingPadding(5);
-		n4.setMinIncomingPadding(5);
-		
-		bn1.setMinOutgoingPadding(5);
-		bn2.setMinOutgoingPadding(5);
-		bn3.setMinOutgoingPadding(5);
-		bn4.setMinOutgoingPadding(5);
-		n1.setMinOutgoingPadding(5);
-		n2.setMinOutgoingPadding(5);
-		n3.setMinOutgoingPadding(5);
-		n4.setMinOutgoingPadding(5);
-
-		edges.add(e1 = new ConstrainedEdge(bn1, bn2));
-		edges.add(e2 = new ConstrainedEdge(bn1, n3));
-		edges.add(e3 = new ConstrainedEdge(bn2, bn3));
-		edges.add(e4 = new ConstrainedEdge(bn4, bn3));
-		
-		e1.setPadding(20);
-		e2.setPadding(20);
-		e3.setPadding(20);
-		e4.setPadding(20);
-		
-		n1.width = n3.width = 50;
-		n3.height = n3.height = 20;
-		
-		n2.height = 200;
-		n2.width = 150;
-		
-		n4.width = 120;
-		n4.height = 120;
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		g.setDefaultPadding(new Insets(20));
-		
-		new GMFDirectedGraphLayout().visit(g);
-		
-		return g;
-	}
-	
-	public static DirectedGraph cycle_test() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3;
-		Edge e1, e2, e3;
-		
-		nodes.add(n1 = new ConstantSizeNode("Node1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("Node2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("Node3")); //$NON-NLS-1$
-		
-		n1.setMinIncomingPadding(5);
-		n2.setMinIncomingPadding(5);
-		n3.setMinIncomingPadding(5);
-		
-		n1.setMinOutgoingPadding(5);
-		n2.setMinOutgoingPadding(5);
-		n3.setMinOutgoingPadding(5);
-
-		edges.add(e1 = new ConstrainedEdge(n1, n2));
-		edges.add(e2 = new ConstrainedEdge(n2, n3));
-		edges.add(e3 = new ConstrainedEdge(n3, n1));		
-		e1.setPadding(20);
-		e2.setPadding(20);
-		e3.setPadding(20);
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		g.setDefaultPadding(new Insets(20));
-		
-		new GMFDirectedGraphLayout().visit(g);
-		
-		return g;
-	}
-	
-	public static DirectedGraph cycle_BorderNodes_test() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3;
-		BorderNode bn1, bn2, bn3, bn4, bn5, bn6;
-		Edge e1, e2, e3;
-		
-		nodes.add(n1 = new ConstantSizeNode("Node1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("Node2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("Node3")); //$NON-NLS-1$
-		bn1 = new BorderNode("bn1", n1); //$NON-NLS-1$
-		bn2 = new BorderNode("bn2", n1); //$NON-NLS-1$
-		bn3 = new BorderNode("bn3", n2); //$NON-NLS-1$
-		bn4 = new BorderNode("bn4", n2); //$NON-NLS-1$
-		bn5 = new BorderNode("bn5", n3); //$NON-NLS-1$
-		bn6 = new BorderNode("bn6", n3); //$NON-NLS-1$
-		
-		n1.setMinIncomingPadding(5);
-		n2.setMinIncomingPadding(5);
-		n3.setMinIncomingPadding(5);
-		n1.setMinOutgoingPadding(5);
-		n2.setMinOutgoingPadding(5);
-		n3.setMinOutgoingPadding(5);
-
-		edges.add(e1 = new ConstrainedEdge(bn1, bn3));
-		edges.add(e2 = new ConstrainedEdge(bn4, bn5));
-		edges.add(e3 = new ConstrainedEdge(bn6, bn2));		
-		e1.setPadding(20);
-		e2.setPadding(20);
-		e3.setPadding(20);
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		g.setDefaultPadding(new Insets(20));
-		
-		new GMFDirectedGraphLayout().visit(g);
-		
-		return g;
-	}
-
-	public static DirectedGraph cycle_BorderNodes_test2() {
-		NodeList nodes = new NodeList();
-		EdgeList edges = new EdgeList();
-		
-		ConstantSizeNode n1, n2, n3;
-		BorderNode bn1, bn2, bn3;
-		Edge e1, e2, e3;
-		
-		nodes.add(n1 = new ConstantSizeNode("Node1")); //$NON-NLS-1$
-		nodes.add(n2 = new ConstantSizeNode("Node2")); //$NON-NLS-1$
-		nodes.add(n3 = new ConstantSizeNode("Node3")); //$NON-NLS-1$
-		bn1 = new BorderNode("bn1", n1); //$NON-NLS-1$
-		bn2 = new BorderNode("bn2", n2); //$NON-NLS-1$
-		bn3 = new BorderNode("bn3", n3); //$NON-NLS-1$
-		
-		n1.setMinIncomingPadding(5);
-		n2.setMinIncomingPadding(5);
-		n3.setMinIncomingPadding(5);
-		n1.setMinOutgoingPadding(5);
-		n2.setMinOutgoingPadding(5);
-		n3.setMinOutgoingPadding(5);
-
-		edges.add(e1 = new ConstrainedEdge(bn1, bn2));
-		edges.add(e2 = new ConstrainedEdge(bn2, bn3));
-		edges.add(e3 = new ConstrainedEdge(bn3, bn1));		
-		e1.setPadding(20);
-		e2.setPadding(20);
-		e3.setPadding(20);
-		
-		DirectedGraph g = new DirectedGraph();
-		g.nodes = nodes;
-		g.edges = edges;
-		
-		g.setDefaultPadding(new Insets(20));
-		
-		new GMFDirectedGraphLayout().visit(g);
-		
-		return g;
-	}
-}
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 b9d66e4..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 37d8dce..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-logicSemanticEdit.zip
-runtime
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eb4957c..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:37:20 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 81ff6a4..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/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.edit;singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 530e913..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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/pom.xml
deleted file mode 100644
index 909a322..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.edit/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.logic.model.edit</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.logic.model.edit</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 7c38642..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,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 51bf6b2..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,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 adb29f8..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 754f450..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,221 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_ContainerElement_children_feature", "_UI_ContainerElement_type"),  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-				 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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 fc0d652..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,191 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Element_outputTerminals_feature", "_UI_Element_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Element_inputTerminals_feature", "_UI_Element_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 0481a5c..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 98dc1c6..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 335d18d..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,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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") : //$NON-NLS-1$
-			getString("_UI_InputOutputTerminal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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 cc9b845..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,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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") : //$NON-NLS-1$
-			getString("_UI_InputTerminal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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 d058706..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,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_LED_value_feature", "_UI_LED_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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 5f4f60c..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 e57c5ee..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 87c8177..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,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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") : //$NON-NLS-1$
-			getString("_UI_OutputTerminal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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 47a65e7..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,153 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Terminal_id_feature", "_UI_Terminal_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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") : //$NON-NLS-1$
-			getString("_UI_Terminal_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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 187cbc9..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,244 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Wire_source_feature", "_UI_Wire_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_Wire_target_feature", "_UI_Wire_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				 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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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", //$NON-NLS-1$
-				 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 7be563f..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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")); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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"); //$NON-NLS-1$
-	}
-
-	/**
-	 * 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 304e861..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 958c1b5..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-logicSemanticEditor.zip
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5360c88..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:37:40 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 1840b5b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +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.2.0.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.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.examples.runtime.diagram.logic.model.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.workspace.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.transaction.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.workspace;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 4daea62..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 Modeling Project
-
-_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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/pom.xml
deleted file mode 100644
index ad52476..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model.editor/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.logic.model.editor</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.logic.model.editor</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 e6a4fa7..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,188 +0,0 @@
-/**
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of 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
- */
-
-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.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<Resource> ignoredResources = new java.util.HashSet<Resource>();
-	
-	/**
-	 * 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 && PlatformUI.isWorkbenchRunning()) {
-				PlatformUI.getWorkbench().getDisplay().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 && PlatformUI.isWorkbenchRunning()) {
-				PlatformUI.getWorkbench().getDisplay().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 b9d66e4..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 555b824..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-logicSemantic.zip
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.logic.model/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0539f52..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:36:56 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 a02c1dc..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +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.2.0.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.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 6ac3587..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.4 2009/01/09 18:56:21 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 Modeling Project
-
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/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.logic.model/pom.xml
deleted file mode 100644
index 6ffcae9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.logic.model</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.logic.model</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 7f19db7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/AndGate.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 daf4cb7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Circuit.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 727af20..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/ContainerElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-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 79ee115..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Element.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-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 04a3a72..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/FlowContainer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 8096e92..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Gate.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 56c8935..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputOutputTerminal.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 d978ad0..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/InputTerminal.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 f1bcf37..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/LED.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 3d67e52..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Model.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 d53eaf6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OrGate.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 d48da2b..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/OutputTerminal.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 1da5c28..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-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 252907f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/SemanticPackage.java
+++ /dev/null
@@ -1,1332 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-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"; //$NON-NLS-1$
-
-	/**
-	 * 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"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "semantic"; //$NON-NLS-1$
-
-	/**
-	 * 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 31226cf..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Terminal.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 13613d2..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/Wire.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 901a83f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic.model/src/org/eclipse/gmf/examples/runtime/diagram/logic/semantic/XORGate.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-
-
-/**
- * <!-- 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 d3d4360..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 378ab2e..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 0b1ae8d..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,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 39a656a..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,202 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 d9276b4..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 9181e57..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 0848896..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 38e9bea..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 60e09ce..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,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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: "); //$NON-NLS-1$
-		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 a3f7d24..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 eb1fd5b..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 576ec8f..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 0b5028e..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,211 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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"); //$NON-NLS-1$ 
-			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"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- 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 d9dc425..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,574 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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); //$NON-NLS-1$
-		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); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(elementEClass, Element.class, "Element", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-
-		initEClass(wireEClass, Wire.class, "Wire", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-
-		initEClass(circuitEClass, Circuit.class, "Circuit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(gateEClass, Gate.class, "Gate", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(flowContainerEClass, FlowContainer.class, "FlowContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(andGateEClass, AndGate.class, "AndGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(orGateEClass, OrGate.class, "OrGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(xorGateEClass, XORGate.class, "XORGate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(containerElementEClass, ContainerElement.class, "ContainerElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		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); //$NON-NLS-1$
-
-		initEClass(terminalEClass, Terminal.class, "Terminal", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		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); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(outputTerminalEClass, OutputTerminal.class, "OutputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(inputTerminalEClass, InputTerminal.class, "InputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(inputOutputTerminalEClass, InputOutputTerminal.class, "InputOutputTerminal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		// 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 95e6352..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,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 = ""; //$NON-NLS-1$
-
-	/**
-	 * 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: "); //$NON-NLS-1$
-		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 a7ce357..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,220 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 bdc9e95..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,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 531c758..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,362 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 c179051..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,453 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 797e516..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-logic.zip
-target
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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.diagram.logic/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5637454..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:36:32 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 5134d07..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +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.2.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.action.ide;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.examples.runtime.diagram.logic.model.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)"
-Bundle-ActivationPolicy: lazy; exceptions="org.eclipse.gmf.examples.runtime.diagram.logic.internal.nonactivating"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 d15c565..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 Modeling Project
-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 14a189a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/plugin.xml
+++ /dev/null
@@ -1,545 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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                   -->
-<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>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-	            <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>
-         <popupContribution
-               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider"
-               id="PortsColorMenuItem">
-            <popupStructuredContributionCriteria
-                  policyClass="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicPortsColorPopupPolicy">
-            </popupStructuredContributionCriteria>
-            <popupMenuGroup
-                  id="valueChangeGroup">
-            </popupMenuGroup>
-            <popupAction
-                  id="modifyPortsColorAction"
-                  path="/valueChangeGroup">
-            </popupAction>
-         </popupContribution>
-       </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>
-   
-   <extension id="LogicExampleGroupContributionItemProvider" name="LogicExampleGroupContributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider">
-         <Priority name="Low">
-         </Priority>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria
-                  objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart"
-                  objectCount="2+">
-               <method
-                     name="getDiagramEditDomain().getEditorPart().getEditorSite().getId()"
-                     value="LogicEditor"/>     
-            </popupStructuredContributionCriteria>     
-            <popupAction path="/formatMenu/miscellaneousGroup" id="groupAction">
-            </popupAction>
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart">
-            	<method
-                     name="getDiagramEditDomain().getEditorPart().getEditorSite().getId()"
-                     value="LogicEditor"/>     
-            </popupStructuredContributionCriteria>                    
-            <popupAction path="/formatMenu/miscellaneousGroup" id="ungroupAction">
-            </popupAction>   
-         </popupContribution>                                 
-      </contributionItemProvider>
-   </extension>
-   <extension
-         id="LogicExampleStatusLineItemProvider"
-         name="LogicExampleStatusLineItemProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.statusLineContributionItemProviders">
-      <statusLineContributionItemProvider
-            class="org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicExampleStatusLineContributionItemProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-      </statusLineContributionItemProvider>
-   </extension> 
-</plugin>
diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/pom.xml b/org.eclipse.gmf.examples.runtime.diagram.logic/pom.xml
deleted file mode 100644
index 4744dc9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.diagram.logic</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.diagram.logic</artifactId>
-  <version>1.2.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 fc7bfa8..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/LogicActionIds.java
+++ /dev/null
@@ -1,32 +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.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$
-	public final String MODIFY_PORTS_COLOR_VALUE = "modifyPortsColorAction"; //$NON-NLS-1$
-	
-}
diff --git a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/ModifyPortsColorAction.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/ModifyPortsColorAction.java
deleted file mode 100644
index 17916ef..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/actions/ModifyPortsColorAction.java
+++ /dev/null
@@ -1,72 +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.examples.runtime.diagram.logic.internal.actions;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.l10n.ExampleDiagramLogicMessages;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Implementation of an action that changes ports color on LED and/or Circuit
- * 
- * @author aboyko
- * 
- */
-public class ModifyPortsColorAction extends DiagramAction {
-
-	public ModifyPortsColorAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	public void init() {
-		super.init();
-		setId("PortsColor"); //$NON-NLS-1$
-		setText(ExampleDiagramLogicMessages.LogicPortsColor_Action_Label);
-		setToolTipText(ExampleDiagramLogicMessages.LogicPortsColor_Action_Tooltip);
-	}
-
-	protected Request createTargetRequest() {
-		return new Request(StringConstants.PORTSCOLOR_REQUEST);
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Shell shell = getDiagramGraphicalViewer().getControl().getShell();
-		ColorDialog dialog = new ColorDialog(shell);
-		RGB newRGB = dialog.open();
-		if (newRGB != null) {
-			getTargetRequest().getExtendedData().put(
-					StringConstants.PORTS_COLOR_PROPERTY_NAME,
-					FigureUtilities.RGBToInteger(newRGB));
-			ModifyPortsColorAction.super.doRun(progressMonitor);
-		}
-	}
-
-	protected Command getCommand() {
-		Command cmd = super.getCommand();		
-		// In the case of composite command the label is blank, hence lets just
-		// force the label to be there regardless of the command
-		cmd.setLabel(ExampleDiagramLogicMessages.LogicPortsColor_Action_Label);
-		return cmd;
-	}
-	
-}
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/ModifyPortsColorCommand.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ModifyPortsColorCommand.java
deleted file mode 100644
index 002b975..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/commands/ModifyPortsColorCommand.java
+++ /dev/null
@@ -1,101 +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.examples.runtime.diagram.logic.internal.commands;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-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.examples.runtime.diagram.logic.internal.editparts.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-
-/**
- * Implementation of the command for changing ports color
- * 
- * @author aboyko
- * 
- */
-public class ModifyPortsColorCommand extends AbstractTransactionalCommand {
-
-	private IGraphicalEditPart ep;
-	private Integer color;
-
-	public ModifyPortsColorCommand(TransactionalEditingDomain editingDomain,
-			IGraphicalEditPart ep, Integer color) {
-		super(editingDomain, "Modify Ports Color", null); //$NON-NLS-1$
-		this.ep = ep;
-		this.color = color;
-	}
-
-	/*
-	 * (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 {
-		List ports = getPorts();
-		if (ports != null && color != null && !ports.isEmpty()) {
-			PropertiesSetStyle style = (PropertiesSetStyle) ep
-					.getNotationView().getNamedStyle(
-							NotationPackage.eINSTANCE.getPropertiesSetStyle(),
-							StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-			if (style != null) {
-				if (style
-						.hasProperty(StringConstants.PORTS_COLOR_PROPERTY_NAME)) {
-					style.setProperty(
-							StringConstants.PORTS_COLOR_PROPERTY_NAME, color);
-					return CommandResult.newOKCommandResult();
-				}
-			}
-		}
-		return CommandResult.newCancelledCommandResult();
-	}
-
-	private List getPorts() {
-		List ports = new LinkedList();
-		for (Iterator itr = ep.getChildren().iterator(); itr.hasNext();) {
-			Object obj = itr.next();
-			if (obj instanceof TerminalEditPart) {
-				ports.add(obj);
-			}
-		}
-		return ports;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
-	 */
-	public boolean canExecute() {
-		if (ep.getNotationView() != null) {
-			if (ep.getNotationView().getNamedStyle(
-					NotationPackage.eINSTANCE.getPropertiesSetStyle(),
-					StringConstants.PORTS_PROPERTIES_STYLE_NAME) != null) {
-				List ports = getPorts();
-				return ports != null && !ports.isEmpty() && super.canExecute();
-			}
-		}
-		return false;
-	}
-
-}
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 aa2b358..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.examples.runtime.diagram.logic.semantic.Terminal;
-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<Terminal> terminals = new ArrayList<Terminal>();
-				
-				EObject source = createRelationshipRequest.getSource();
-				if (source != null) {
-					terminals.add((Terminal)source);
-				}
-				EObject target = createRelationshipRequest.getTarget();
-				if (target != null) {
-					terminals.add((Terminal)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 5677edd..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/CircuitEditPart.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.Iterator;
-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.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.ContainerHighlightEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.PortsColorEditPolicy;
-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.internal.providers.LogicConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-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.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-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.PropertiesSetStyle;
-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 {
-	
-	protected class CircuitContainerEditPolicy extends ShapeContainerEditPolicy {
-		
-		/**
-		 * Returns the child CompartmentEditPart as a target for pasting 
-		 * (the circuit is not a container, but ShapeCompartmentEditPart is)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-		 */
-		public EditPart getTargetEditPart(Request request) {
-			if (RequestConstants.REQ_PASTE.equals(request.getType())) {
-				IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
-				if (editPart instanceof CircuitEditPart) {
-					IGraphicalEditPart targetEP = 
-						((CircuitEditPart)editPart).getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-					if (targetEP != null) {
-						return targetEP;
-					}
-				} 
-			}
-			return super.getTargetEditPart(request);
-		}
-	}	
-	/**
-	 * @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());
-		installEditPolicy(StringConstants.PORTS_COLOR_EDITPOLICY_ROLE,
-				new PortsColorEditPolicy());
-		// ensure that the paste command will execute on its child LogicShapeCompartmentEditPart
-		installEditPolicy(EditPolicy.CONTAINER_ROLE, 
-				new CircuitContainerEditPolicy());
-	}
-
-	/**
-	 * 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);
-	}
-
-	protected void handleNotificationEvent(Notification evt) {
-		if (NotationPackage.eINSTANCE.getPropertyValue_RawValue().equals(
-				evt.getFeature())) {
-			View viewContainer = ViewUtil.getViewContainer((EObject) evt
-					.getNotifier());
-			if (viewContainer != null
-					&& viewContainer.equals(getNotationView())) {
-				PropertiesSetStyle style = (PropertiesSetStyle) getNotationView()
-						.getNamedStyle(
-								NotationPackage.eINSTANCE
-										.getPropertiesSetStyle(),
-								StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-				if (style != null
-						&& style.getPropertiesMap().get(
-								StringConstants.PORTS_COLOR_PROPERTY_NAME)
-								.equals(evt.getNotifier())) {
-					for (Iterator itr = getChildren().iterator(); itr.hasNext();) {
-						Object obj = itr.next();
-						if (obj instanceof TerminalEditPart) {
-							((TerminalEditPart) obj).refreshBackgroundColor();
-						}
-						getFigure().repaint();
-					}
-				}
-			}
-		} else {
-			super.handleNotificationEvent(evt);
-		}
-	}
-
-}
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 43c6468..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LEDEditPart.java
+++ /dev/null
@@ -1,216 +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.editparts;
-
-import java.util.HashMap;
-import java.util.Iterator;
-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.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.editpolicies.LEDEditPolicy;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editpolicies.PortsColorEditPolicy;
-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.internal.util.StringConstants;
-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.PropertiesSetStyle;
-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());
-		installEditPolicy(StringConstants.PORTS_COLOR_EDITPOLICY_ROLE,
-				new PortsColorEditPolicy());
-	}
-
-	/**
-	 * 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 if (NotationPackage.eINSTANCE.getPropertyValue_RawValue()
-				.equals(evt.getFeature())) {
-			View viewContainer = ViewUtil.getViewContainer((EObject) evt
-					.getNotifier());
-			if (viewContainer != null
-					&& viewContainer.equals(getNotationView())) {
-				PropertiesSetStyle style = (PropertiesSetStyle) getNotationView()
-						.getNamedStyle(
-								NotationPackage.eINSTANCE
-										.getPropertiesSetStyle(),
-								StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-				if (style != null
-						&& style.getPropertiesMap().get(
-								StringConstants.PORTS_COLOR_PROPERTY_NAME)
-								.equals(evt.getNotifier())) {
-					for (Iterator itr = getChildren().iterator(); itr.hasNext();) {
-						Object obj = itr.next();
-						if (obj instanceof TerminalEditPart) {
-							((TerminalEditPart) obj).refreshBackgroundColor();
-						}
-						getFigure().repaint();
-					}
-				}
-			}
-		} 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 17b6e99..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/LogicFlowContainerEditPart.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.LogicFlowBorder;
-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() {
-		LogicFlowFigure logicFlowFigure = new LogicFlowFigure(new Dimension(getMapMode().DPtoLP(100), getMapMode().DPtoLP(100)));
-        Dimension borderSize = new Dimension(getMapMode()
-                .DPtoLP(20), getMapMode().DPtoLP(18));
-        logicFlowFigure.setBorder(new LogicFlowBorder(borderSize));
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-		layout.setStretchMinorAxis(true);
-		logicFlowFigure.setLayoutManager(layout);
-		return logicFlowFigure;
-	} 
-    
-    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 de9d190..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editparts/TerminalEditPart.java
+++ /dev/null
@@ -1,135 +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.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.common.notify.Notification;
-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.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.PropertiesSetStyle;
-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);
-	}
-
-	protected void refreshBackgroundColor() {
-		View view = ViewUtil.getViewContainer(getNotationView());
-		if (view != null) {
-			PropertiesSetStyle propertiesStyle = (PropertiesSetStyle) view
-					.getNamedStyle(NotationPackage.eINSTANCE
-							.getPropertiesSetStyle(),
-							StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-			if (propertiesStyle != null
-					&& propertiesStyle
-							.hasProperty(StringConstants.PORTS_COLOR_PROPERTY_NAME)) {
-				try {
-					Integer value = (Integer) propertiesStyle
-							.getProperty(StringConstants.PORTS_COLOR_PROPERTY_NAME);
-					if (value != null) {
-						getFigure().setBackgroundColor(
-								FigureUtilities.integerToColor(value));
-						return;
-					}
-				} catch (Exception e) {
-					super.refreshBackgroundColor();
-				}
-			}
-		}
-		super.refreshBackgroundColor();
-	}
-
-	public void notifyChanged(Notification notification) {
-		super.notifyChanged(notification);
-	}
-}
\ 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 c4b63d8..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java
+++ /dev/null
@@ -1,148 +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.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))
-                	//checks if the wire maps to the same circuit
-                	if (! (wire.getSource().eContainer().equals(circuitElement)
-                		&& (wire.getTarget().eContainer().equals(circuitElement)))){               	
-                		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 a9a3790..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/LogicFlowEditPolicy.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.FlowLayoutEditPolicy;
-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 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/PortsColorEditPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/PortsColorEditPolicy.java
deleted file mode 100644
index 0bc2b36..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/PortsColorEditPolicy.java
+++ /dev/null
@@ -1,56 +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.examples.runtime.diagram.logic.internal.editpolicies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.commands.ModifyPortsColorCommand;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-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;
-
-/**
- * Edit policy responsible for handling ports color change requests
- * 
- * @author aboyko
- * 
- */
-public class PortsColorEditPolicy extends ComponentEditPolicy {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (StringConstants.PORTSCOLOR_REQUEST.equals(request.getType())) {
-			IGraphicalEditPart host = (IGraphicalEditPart) getHost();
-			Integer color = (Integer) request.getExtendedData().get(
-					StringConstants.PORTS_COLOR_PROPERTY_NAME);
-			return new ICommandProxy(new ModifyPortsColorCommand(host
-					.getEditingDomain(), host, color));
-		}
-		return super.getCommand(request);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (StringConstants.PORTSCOLOR_REQUEST.equals(request.getType()))
-			return getHost();
-		return null;
-	}
-}
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, selection…etc).
-<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 736931f..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowBorder.java
+++ /dev/null
@@ -1,62 +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.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.setBackgroundColor(LogicColorConstants.logicGreen);
-		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 ee5301a..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/figures/LogicFlowFigure.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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) {
-		super();
-		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 7637caa..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-	public static String LogicWizardPage_ModelOptions_GroupName;
-	public static String LogicWizardPage_ModelOptions_EmptyModelName;
-	public static String LogicWizardPage_ModelOptions_FourBitAdderModelName;
-	public static String LogicPortsColor_Action_Label;
-	public static String LogicPortsColor_Action_Tooltip;
-	
-	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 14c88e3..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/l10n/ExampleDiagramLogicMessages.properties
+++ /dev/null
@@ -1,91 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2008 IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-LogicWizardPage_ModelOptions_GroupName=Logic Model Samples
-LogicWizardPage_ModelOptions_EmptyModelName=Empty Model
-LogicWizardPage_ModelOptions_FourBitAdderModelName=Four-bit Adder Model
-
-# --- 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
-
-LogicPortsColor_Action_Label: Modify Ports Color
-LogicPortsColor_Action_Label: Modify Ports Color
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/IncrementDecrementContributionItem.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/IncrementDecrementContributionItem.java
deleted file mode 100644
index 7191890..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/IncrementDecrementContributionItem.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.IncrementDecrementAction;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.actions.LogicActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * An example status bar contribution for the status bar. This added the
- * increment / decrement actions to the status bar. These actions are in the
- * toolbar for GEF, but we are demonstrating them in the status bar for GMF.
- * 
- * @author Anthony Hunter
- */
-public class IncrementDecrementContributionItem extends ActionContributionItem
-		implements LogicActionIds {
-
-	/**
-	 * Constructor for a IncrementDecrementContributionItem
-	 * 
-	 * @param workbenchPage
-	 *            The workbench page
-	 * @param id
-	 *            the id for the action.
-	 */
-	public IncrementDecrementContributionItem(IWorkbenchPage workbenchPage,
-			String id) {
-		super(new IncrementDecrementAction(workbenchPage, id));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.ActionContributionItem#isDynamic()
-	 */
-	public boolean isDynamic() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.action.ActionContributionItem#fill(org.eclipse.swt.
-	 * widgets.Composite)
-	 */
-	public void fill(Composite parent) {
-		((DiagramAction) getAction()).init();
-		Button button = new Button(parent, SWT.PUSH);
-		button.setImage(getAction().getImageDescriptor().createImage());
-		button.setToolTipText(getAction().getToolTipText());
-		button.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				getAction().run();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// Not implemented
-
-			}
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.ActionContributionItem#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return getAction().isEnabled();
-	}
-
-}
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 1fe7cf9..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicContributionItemProvider.java
+++ /dev/null
@@ -1,56 +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.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.examples.runtime.diagram.logic.internal.actions.ModifyPortsColorAction;
-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());
-		} else if (actionId.equals(MODIFY_PORTS_COLOR_VALUE)) {
-			return new ModifyPortsColorAction(partDescriptor.getPartPage());
-		}
-
-		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 31a2283..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicEditPartProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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<EClass, Class> shapeMap = new HashMap<EClass, Class>();
-	{
-		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<EClass, Class> connectorMap = new HashMap<EClass, Class>();
-	{
-		connectorMap.put(SemanticPackage.eINSTANCE.getWire(), WireEditPart.class );
-	}
-	
-	/** list of supported shape compartment editparts */
-	private Map<String, Class> shapeCompartmentMap = new HashMap<String, Class>();
-	{
-		shapeCompartmentMap.put(LogicConstants.LOGIC_SHAPE_COMPARTMENT, LogicShapeCompartmentEditPart.class); 
-	}
-	
-	/** list of supported list compartment editparts */
-	private Map<String, Class> listCompartmentMap = new HashMap<String, Class>();
-	{
-		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 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 = listCompartmentMap.get(semanticHint);
-		if(clazz != null) {
-			return clazz;
-		}
-		clazz = shapeCompartmentMap.get(semanticHint);
-		if(clazz != null) {
-			return clazz;
-		}
-		clazz = 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/LogicExampleStatusLineContributionItemProvider.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicExampleStatusLineContributionItemProvider.java
deleted file mode 100644
index 8e4e3f7..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicExampleStatusLineContributionItemProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.actions.LogicActionIds;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LEDEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.ui.parts.LogicNotationEditor;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.statusline.AbstractStatusLineContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.services.statusline.GetStatusLineContributionOperation;
-import org.eclipse.gmf.runtime.common.ui.services.statusline.StatusLineMessageContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * A status line contribution item provider for the logic example.
- * 
- * @author Anthony Hunter
- */
-public class LogicExampleStatusLineContributionItemProvider extends
-		AbstractStatusLineContributionItemProvider implements LogicActionIds {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.statusline.
-	 * AbstractStatusLineContributionItemProvider
-	 * #getStatusLineContributionItems(org.eclipse.ui.IWorkbenchPage)
-	 */
-	public List<IContributionItem> getStatusLineContributionItems(
-			IWorkbenchPage workbenchPage) {
-		List<IContributionItem> contrItemList = new ArrayList<IContributionItem>();
-
-		// add the icon and message contribution
-		contrItemList.add(new StatusLineMessageContributionItem());
-
-		// add the increment and decrement contribution if the selected element
-		// is an LED
-		ISelection selection = workbenchPage.getActiveEditor().getSite()
-				.getSelectionProvider().getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (!structuredSelection.isEmpty()) {
-				if (structuredSelection.size() == 1
-						&& structuredSelection.getFirstElement() instanceof LEDEditPart) {
-					contrItemList.add(new IncrementDecrementContributionItem(
-							workbenchPage, ACTION_INCREMENT_VALUE));
-					contrItemList.add(new IncrementDecrementContributionItem(
-							workbenchPage, ACTION_DECREMENT_VALUE));
-				}
-			}
-		}
-		return contrItemList;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.statusline.
-	 * AbstractStatusLineContributionItemProvider
-	 * #provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetStatusLineContributionOperation) {
-			IWorkbenchPage workbenchPage = ((GetStatusLineContributionOperation) operation)
-					.getWorkbenchPage();
-			if (workbenchPage.getActiveEditor() instanceof LogicNotationEditor) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
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/LogicPortsColorPopupPolicy.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicPortsColorPopupPolicy.java
deleted file mode 100644
index 0c61a2e..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/providers/LogicPortsColorPopupPolicy.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.examples.runtime.diagram.logic.internal.providers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-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.runtime.common.ui.services.action.contributionitem.IPopupMenuContributionPolicy;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-/**
- * Class that helps to determine whether "Ports Color" menu item should be
- * contributed to the context menu
- * 
- * @author aboyko
- * 
- */
-public class LogicPortsColorPopupPolicy implements IPopupMenuContributionPolicy {
-
-	public boolean appliesTo(ISelection selection,
-			IConfigurationElement configuration) {
-		if (!selection.isEmpty() && selection instanceof StructuredSelection) {
-			for (Iterator itr = ((StructuredSelection) selection).iterator(); itr
-					.hasNext();) {
-				Object obj = itr.next();
-				if (!(obj instanceof LEDEditPart || obj instanceof CircuitEditPart))
-					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/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 97c43c2..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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.optimal.CompartmentViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ListCompartmentViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.StandardDiagramViewFactory;
-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", StandardDiagramViewFactory.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, CompartmentViewFactory.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(), ConnectorViewFactory.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 9feeefe..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,152 +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.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.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-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.FlowContainer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.OrGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.util.LogicSemanticType;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TreeContainerEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TreeDiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TreeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditorWithFlyoutPalette;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-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;
-            }
-        });
-    }
-
-    protected EditPartFactory getOutlineViewEditPartFactory() {
-        return new EditPartFactory() {
-
-            public EditPart createEditPart(EditPart context, Object model) {
-                if (model instanceof Diagram) {
-                    return new TreeDiagramEditPart(model);
-                } else if (model instanceof View
-                        && ViewType.GROUP.equals(((View) model).getType())) {
-                        return new TreeContainerEditPart(model);
-                } else {
-                    return new TreeEditPart(model) {
-
-                        protected String getText() {
-                            EObject element = ((View) getModel()).getElement();
-                            if (element != null) {
-                                if (element instanceof LED) {
-                                    return LogicSemanticType.LED
-                                        .getDisplayName();
-                                } else if (element instanceof Circuit) {
-                                    return LogicSemanticType.CIRCUIT
-                                        .getDisplayName();
-                                } else if (element instanceof FlowContainer) {
-                                    return LogicSemanticType.FLOWCONTAINER
-                                        .getDisplayName();
-                                } else if (element instanceof AndGate) {
-                                    return LogicSemanticType.ANDGATE
-                                        .getDisplayName();
-                                } else if (element instanceof OrGate) {
-                                    return LogicSemanticType.ORGATE
-                                        .getDisplayName();
-                                } else if (element instanceof XORGate) {
-                                    return LogicSemanticType.XORGATE
-                                        .getDisplayName();
-                                }
-                            }
-                            return super.getText();
-                        }
-
-                    };
-                }
-            }
-        };
-    }
-    
-    
-}
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 aacb262..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/LogicEditorUtil.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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) {
-					try {
-						semanticFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(semanticResourcePath));
-					} catch (Exception e){
-						
-					}
-					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;
-						}
-					}
-				}
-				
-				try {
-					newDiagramFile.refreshLocal(IResource.DEPTH_ZERO, null); 
-					if (semanticFile != null) {
-						semanticFile.refreshLocal(IResource.DEPTH_ZERO, null);
-					}
-				} catch (CoreException e) {
-					Trace.catching(LogicDiagramPlugin.getInstance(),
-							LogicDiagramDebugOptions.EXCEPTIONS_CATCHING,
-							LogicEditorUtil.class, "createNewDiagramFile", //$NON-NLS-1$
-							e);
-				}
-				
-				Model semanticModel = null;
-                if (semanticFileIsNew) {
-                	// create blank semantic model
-                	semanticModel = SemanticFactory.eINSTANCE.createModel();
-                	Resource semanticResource = resourceSet.createResource(
-                			URI.createPlatformResourceURI(semanticResourcePath,true));
-					semanticResource.getContents().add(semanticModel);
-                } else if (semanticFile != null){
-                	// load provided semantic model
-                	semanticModel = (Model) resourceSet.getResource(
-                			URI.createPlatformResourceURI(semanticResourcePath,true),true)
-                			.getContents().get(0);
-                }
-
-				// create blank notation model file
-				final String completeFileName = newDiagramFile.getLocation().toOSString();
-				Resource notationModel = resourceSet.createResource(URI.createFileURI(completeFileName));
-
-				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/StringConstants.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/StringConstants.java
deleted file mode 100644
index 852f1a6..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/util/StringConstants.java
+++ /dev/null
@@ -1,28 +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.examples.runtime.diagram.logic.internal.util;
-
-/**
- * Class that contains commonly used string constants
- * 
- * @author aboyko
- *
- */
-public class StringConstants {
-
-	public static String PORTS_PROPERTIES_STYLE_NAME = "portsProperties"; //$NON-NLS-1$
-	public static String PORTS_COLOR_PROPERTY_NAME = "portsColor"; //$NON-NLS-1$
-
-	public static final String PORTSCOLOR_REQUEST = "PortsColor"; //$NON-NLS-1$
-
-	public static final String PORTS_COLOR_EDITPOLICY_ROLE = "portsColorEditPolicy"; //$NON-NLS-1$
-
-}
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 236cce6..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,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EcorePackage;
-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.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The CircuitView Factory class
- * 
- * @author mmostafa
- */
-public class CircuitViewFactory extends ShapeViewFactory {
-
-	/*
-	 * (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());
-	}
-
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		PropertiesSetStyle properties = NotationFactory.eINSTANCE
-				.createPropertiesSetStyle();
-		properties.setName(StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-		properties.createProperty(StringConstants.PORTS_COLOR_PROPERTY_NAME,
-				EcorePackage.eINSTANCE.getEIntegerObject(), null);
-		styles.add(properties);
-		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/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 dba208a..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.optimal.ShapeViewFactory;
-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 ShapeViewFactory {
-    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 fca11ae..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,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.figures.LogicColorConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.PropertiesSetStyle;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The LEDView Factory class 
- * @author mmostafa
- */
-public class LEDViewFactory extends ShapeViewFactory {
-
-	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);
-	}
-
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		PropertiesSetStyle properties = NotationFactory.eINSTANCE
-				.createPropertiesSetStyle();
-		properties.setName(StringConstants.PORTS_PROPERTIES_STYLE_NAME);
-		properties.createProperty(StringConstants.PORTS_COLOR_PROPERTY_NAME,
-				EcorePackage.eINSTANCE.getEIntegerObject(), null);
-		styles.add(properties);
-		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/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 8bf8e2b..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,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory;
-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 ShapeViewFactory {
-
-	/**
-	 * @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 bc32de2..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.optimal.ShapeViewFactory;
-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 ShapeViewFactory {
-
-    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/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/LogicDiagramFactory.java b/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicDiagramFactory.java
deleted file mode 100644
index 00bda91..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicDiagramFactory.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RollbackException;
-import org.eclipse.emf.transaction.impl.EMFCommandTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.CircuitEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-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.Element;
-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.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.Wire;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate;
-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.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-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.CreateRelationshipRequest;
-
-/**
- * Factory for creating contents of example logic diagrams.
- * 
- * @author mgobeil
- */
-public class LogicDiagramFactory {
-
-	public static void CreateFourBitAdder(IGraphicalEditPart diagramEditPart,
-			IProgressMonitor progressMonitor) {
-
-		// create logic elements
-		Circuit fullAdder1 = createFullAdder(new Point(20, 120), new Dimension(
-				140, 230), diagramEditPart, progressMonitor);
-		Circuit fullAdder2 = createFullAdder(new Point(170, 120),
-				new Dimension(140, 230), diagramEditPart, progressMonitor);
-		Circuit fullAdder3 = createFullAdder(new Point(320, 120),
-				new Dimension(140, 230), diagramEditPart, progressMonitor);
-		Circuit halfAdder = createHalfAdder(new Point(470, 120), new Dimension(
-				70, 230), diagramEditPart, progressMonitor);
-
-		// chain carry bits
-		connect(outputTerminal(fullAdder1, 3), inputTerminal(fullAdder2, 4),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(fullAdder2, 3), inputTerminal(fullAdder3, 4),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(fullAdder3, 3), inputTerminal(halfAdder, 4),
-				diagramEditPart, progressMonitor);
-
-		// create and connect led input 1
-		final LED ledInput1 = createElement(LogicSemanticType.LED, LED.class,
-				new Point(150, 20), diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput1, 3), inputTerminal(fullAdder1, 0),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput1, 2), inputTerminal(fullAdder2, 0),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput1, 1), inputTerminal(fullAdder3, 0),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput1, 0), inputTerminal(halfAdder, 0),
-				diagramEditPart, progressMonitor);
-
-		// create and connect led input 2
-		final LED ledInput2 = createElement(LogicSemanticType.LED, LED.class,
-				new Point(350, 20), diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput2, 3), inputTerminal(fullAdder1, 2),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput2, 2), inputTerminal(fullAdder2, 2),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput2, 1), inputTerminal(fullAdder3, 2),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(ledInput2, 0), inputTerminal(halfAdder, 3),
-				diagramEditPart, progressMonitor);
-
-		// create and connect led output
-		LED ledOutput = createElement(LogicSemanticType.LED, LED.class,
-				new Point(250, 400), diagramEditPart, progressMonitor);
-		connect(outputTerminal(fullAdder1, 7), inputTerminal(ledOutput, 3),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(fullAdder2, 7), inputTerminal(ledOutput, 2),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(fullAdder3, 7), inputTerminal(ledOutput, 1),
-				diagramEditPart, progressMonitor);
-		connect(outputTerminal(halfAdder, 7), inputTerminal(ledOutput, 0),
-				diagramEditPart, progressMonitor);
-
-		// set the input values
-		org.eclipse.emf.common.command.Command cmd = new org.eclipse.emf.common.command.AbstractCommand() {
-			public void execute() {
-				ledInput1.setValue(3);
-				ledInput2.setValue(7);
-			}
-
-			public void redo() {
-				execute();
-			}
-		};
-		EMFCommandTransaction trans = new EMFCommandTransaction(cmd,
-				(InternalTransactionalEditingDomain) diagramEditPart
-						.getEditingDomain(), null);
-		try {
-			trans.start();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		trans.getCommand().execute();
-		try {
-			trans.commit();
-		} catch (RollbackException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static Circuit createFullAdder(Point location, Dimension size,
-			IGraphicalEditPart containerEditPart,
-			IProgressMonitor progressMonitor) {
-		Circuit circuit = createElement(LogicSemanticType.CIRCUIT,
-				Circuit.class, location, size, containerEditPart,
-				progressMonitor);
-		CircuitEditPart circuitEditPart = getEditPart(circuit,
-				CircuitEditPart.class, containerEditPart);
-
-		Circuit halfAdder1 = createHalfAdder(new Point(10, 10),
-				circuitEditPart, progressMonitor);
-		Circuit halfAdder2 = createHalfAdder(new Point(50, 100),
-				circuitEditPart, progressMonitor);
-		OrGate orGate = createElement(LogicSemanticType.ORGATE, OrGate.class,
-				new Point(40, 180), circuitEditPart, progressMonitor);
-		;
-
-		// input to first half adder
-		connect(outputTerminal(circuit, 0), inputTerminal(halfAdder1, 0),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(circuit, 2), inputTerminal(halfAdder1, 3),
-				circuitEditPart, progressMonitor);
-
-		// input to second half adder
-		connect(outputTerminal(circuit, 3), inputTerminal(halfAdder2, 3),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(halfAdder1, 7), inputTerminal(halfAdder2, 0),
-				circuitEditPart, progressMonitor);
-
-		// input to OR gate
-		connect(outputTerminal(halfAdder1, 4), inputTerminal(orGate, 0),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(halfAdder2, 4), inputTerminal(orGate, 1),
-				circuitEditPart, progressMonitor);
-
-		// output of circuit
-		connect(outputTerminal(orGate, 0), inputTerminal(circuit, 4),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(halfAdder2, 7), inputTerminal(circuit, 7),
-				circuitEditPart, progressMonitor);
-
-		return circuit;
-	}
-
-	public static Circuit createHalfAdder(Point location,
-			IGraphicalEditPart containerEditPart,
-			IProgressMonitor progressMonitor) {
-		return createHalfAdder(location, new Dimension(70, 70),
-				containerEditPart, progressMonitor);
-	}
-
-	public static Circuit createHalfAdder(Point location, Dimension size,
-			IGraphicalEditPart containerEditPart,
-			IProgressMonitor progressMonitor) {
-		Circuit circuit = createElement(LogicSemanticType.CIRCUIT,
-				Circuit.class, location, size, containerEditPart,
-				progressMonitor);
-		CircuitEditPart circuitEditPart = getEditPart(circuit,
-				CircuitEditPart.class, containerEditPart);
-
-		AndGate andGate = createElement(LogicSemanticType.ANDGATE,
-				AndGate.class, new Point(10, 20), circuitEditPart,
-				progressMonitor);
-		;
-		XORGate xorGate = createElement(LogicSemanticType.XORGATE,
-				XORGate.class, new Point(40, 20), circuitEditPart,
-				progressMonitor);
-		;
-
-		connect(outputTerminal(circuit, 0), inputTerminal(andGate, 0),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(circuit, 3), inputTerminal(andGate, 1),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(circuit, 0), inputTerminal(xorGate, 0),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(circuit, 3), inputTerminal(xorGate, 1),
-				circuitEditPart, progressMonitor);
-
-		connect(outputTerminal(andGate, 0), inputTerminal(circuit, 4),
-				circuitEditPart, progressMonitor);
-		connect(outputTerminal(xorGate, 0), inputTerminal(circuit, 7),
-				circuitEditPart, progressMonitor);
-
-		return circuit;
-	}
-
-	private static <T> T createElement(IElementType elementType,
-			Class<T> elementTypeClass, Point location,
-			IGraphicalEditPart container, IProgressMonitor progressMonitor) {
-
-		return createElement(elementType, elementTypeClass, location, null,
-				container, progressMonitor);
-	}
-
-	private static <T> T createElement(IElementType elementType,
-			Class<T> elementTypeClass, Point location, Dimension size,
-			IGraphicalEditPart container, IProgressMonitor progressMonitor) {
-
-		if (container instanceof CircuitEditPart) {
-			container = (IGraphicalEditPart) container
-					.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-		}
-
-		CreateViewRequest createRequest = CreateViewRequestFactory
-				.getCreateShapeRequest(elementType, container
-						.getDiagramPreferencesHint());
-
-		createRequest.setLocation(location);
-		createRequest.setSize(size);
-
-		Command command = container.getCommand(createRequest);
-
-		container.getDiagramEditDomain().getDiagramCommandStack().execute(
-				command, progressMonitor);
-
-		List<IAdaptable> newObject = (List<IAdaptable>) createRequest
-				.getNewObject();
-		ViewAndElementDescriptor viewAndElementDescriptor = (ViewAndElementDescriptor) newObject
-				.get(0);
-		return (T) viewAndElementDescriptor.getElementAdapter().getAdapter(
-				elementTypeClass);
-	}
-
-	private static void connect(OutputTerminal outputTerminal,
-			InputTerminal inputTerminal, IGraphicalEditPart container,
-			IProgressMonitor progressMonitor) {
-		CreateRelationshipRequest createRequest = new CreateRelationshipRequest(
-				container.getEditingDomain(), outputTerminal, inputTerminal,
-				LogicSemanticType.WIRE);
-
-		IElementType elementType = ElementTypeRegistry.getInstance()
-				.getElementType(createRequest.getEditHelperContext());
-
-		ICommand createCommand = elementType.getEditCommand(createRequest);
-
-		try {
-			createCommand.execute(progressMonitor, null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		}
-
-		// HAAAACK! why won't the above command create a view when the parent is
-		// a Model instead of a Circuit?
-		if (createRequest.getContainer() instanceof Model) {
-
-			// get matching editparts for semantic terminals
-			TerminalEditPart outputTerminalEditPart = getEditPart(
-					outputTerminal, TerminalEditPart.class, container);
-			TerminalEditPart inputTerminalEditPart = getEditPart(inputTerminal,
-					TerminalEditPart.class, container);
-
-			// create matching notational wire connection
-			Command command = CreateConnectionViewRequest.getCreateCommand(
-					(Wire) createCommand.getCommandResult().getReturnValue(),
-					outputTerminalEditPart, inputTerminalEditPart, container
-							.getDiagramPreferencesHint());
-			container.getDiagramEditDomain().getDiagramCommandStack().execute(
-					command, progressMonitor);
-		}
-	}
-
-	private static OutputTerminal outputTerminal(Element element, int terminal) {
-		return (OutputTerminal) element.getOutputTerminals().get(terminal);
-	}
-
-	private static InputTerminal inputTerminal(Element element, int terminal) {
-		return (InputTerminal) element.getInputTerminals().get(terminal);
-	}
-
-	private static <T> T getEditPart(EObject modelElement,
-			Class<T> editPartType, IGraphicalEditPart container) {
-		if (container instanceof CircuitEditPart) {
-			container = (IGraphicalEditPart) container
-					.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-		}
-
-		DiagramGraphicalViewer viewer = (DiagramGraphicalViewer) container
-				.getRoot().getViewer();
-		String proxyId = EMFCoreUtil.getProxyID(modelElement);
-		return (T) viewer.findEditPartsForElement(proxyId, editPartType).get(0);
-	}
-}
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 db55210..0000000
--- a/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/wizards/LogicWizardPage.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.ui.parts.LogicNotationEditor;
-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.editparts.IGraphicalEditPart;
-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.Group;
-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 emptyModel = null;
-	private Button adderModel = null;
-	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();
-		}
-
-		IFile diagramFile = LogicEditorUtil.createAndOpenDiagram(
-				getDiagramFileCreator(), containerPath, fileName,
-				initialContents, kind, dWindow, progressMonitor,
-				isOpenNewlyCreatedDiagramEditor(), saveDiagram,
-				semanticResourcePath);
-
-		if (adderModel.getSelection()) {
-			LogicNotationEditor editor = (LogicNotationEditor) dWindow
-					.getPartService().getActivePart();
-			IGraphicalEditPart diagramEditPart = (IGraphicalEditPart) editor
-					.getDiagramEditPart();
-			LogicDiagramFactory.CreateFourBitAdder(diagramEditPart,
-					progressMonitor);
-			editor.doSave(progressMonitor);
-		}
-
-		return diagramFile;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.
-	 * EditorWizardPage#getDefaultFileName()
-	 */
-	protected String getDefaultFileName() {
-		return ExampleDiagramLogicMessages.LogicVisualizer_DefaultLogicDiagramFileName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.
-	 * EditorWizardPage#getDiagramFileCreator()
-	 */
-	public DiagramFileCreator getDiagramFileCreator() {
-		return LogicDiagramFileCreator.getInstance();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.
-	 * EditorWizardPage#getDiagramKind()
-	 */
-	protected String getDiagramKind() {
-		return "logic"; //$NON-NLS-1$
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-
-		Composite composite = (Composite) getControl();
-
-		// sample section generation group
-		Group group = new Group(composite, SWT.NONE);
-		group.setLayout(new GridLayout());
-		group
-				.setText(ExampleDiagramLogicMessages.LogicWizardPage_ModelOptions_GroupName);
-		group.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
-				| GridData.HORIZONTAL_ALIGN_FILL));
-
-		// sample section generation checkboxes
-		emptyModel = new Button(group, SWT.RADIO);
-		emptyModel
-				.setText(ExampleDiagramLogicMessages.LogicWizardPage_ModelOptions_EmptyModelName);
-		emptyModel.setSelection(true);
-
-		adderModel = new Button(group, SWT.RADIO);
-		adderModel
-				.setText(ExampleDiagramLogicMessages.LogicWizardPage_ModelOptions_FourBitAdderModelName);
-	}
-
-	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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 88c264f..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-*.zip
-target
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 6f25160..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.externalToolBuilders/Zip EMF Clipboard Copypaste Example.launch
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-<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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.emf.clipboard&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.gmf.examples.runtime.emf.clipboard"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" 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;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.gmf.examples.runtime.emf.clipboard&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.emf.clipboard/buildZip.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.gmf.examples.runtime.emf.clipboard}"/>
-</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/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.emf.clipboard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9c4a76..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:37:58 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 8e0d011..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/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.examples.runtime.emf.clipboard; singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.examples.library.editor;bundle-version="[2.5.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 925f1cd..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 Modeling Project
-
-_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/pom.xml b/org.eclipse.gmf.examples.runtime.emf.clipboard/pom.xml
deleted file mode 100644
index 791b9a6..0000000
--- a/org.eclipse.gmf.examples.runtime.emf.clipboard/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.emf.clipboard</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.emf.clipboard</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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-feature/.project b/org.eclipse.gmf.examples.runtime.ui.pde-feature/.project
deleted file mode 100644
index b80ea54..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.ui.pde-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.examples.runtime.ui.pde-feature/build.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/build.properties
deleted file mode 100644
index 1528408..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html               
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/eclipse_update_120.jpg b/org.eclipse.gmf.examples.runtime.ui.pde-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/epl-v10.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.properties
deleted file mode 100644
index 28705a5..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.properties
+++ /dev/null
@@ -1,160 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Runtime Examples
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework Runtime Examples.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.xml b/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.xml
deleted file mode 100644
index ad3a9bf..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.examples.runtime.ui.pde"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName">
-
-   <description url="http://www.eclipse.org/gmf">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      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
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.gmf" version="1.4.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.gmf.examples.runtime.ui.pde"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/license.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/pom.xml b/org.eclipse.gmf.examples.runtime.ui.pde-feature/pom.xml
deleted file mode 100644
index 409b1f0..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.ui.pde</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/notice.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/notice.html
deleted file mode 100644
index c6af966..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateBundle/about.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateBundle/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, 2007</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-feature/sourceTemplateBundle/plugin.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 965d817..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/build.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 1fefb8c..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 =\
-epl-v10.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html
-src.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/feature.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 9a590b0..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Examples Runtime Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Source code for Graphical Modeling Framework Runtime Examples.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/license.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.html b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/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, 2007</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-feature/sourceTemplatePlugin/about.ini b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/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.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 097e1aa..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# 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) Runtime Examples
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Runtime Examples \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.examples.runtime.ui.pde-feature/sourceTemplatePlugin/build.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index c6d7dcd..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/,\
-               about.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/modeling32.png b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 965d817..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources
-providerName=Eclipse Modeling Project
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 304e861..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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<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 eb5a316..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
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 1ff1212..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime.ui.pde</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.examples.runtime.ui.pde/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b0b7ddf..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:38:21 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
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 1f31be5..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/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.ui.pde; singleton:=true
-Bundle-Version: 1.4.1.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.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 16fb3bd..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/emf-clipboard-copypaste.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/emf-clipboard-copypaste.zip
deleted file mode 100644
index f13f196..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/emf-clipboard-copypaste.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/geoshapes.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/geoshapes.zip
deleted file mode 100644
index f748fc7..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/geoshapes.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logic.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/logic.zip
deleted file mode 100644
index 7e04cf2..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logic.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemantic.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemantic.zip
deleted file mode 100644
index cdbbca2..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemantic.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEdit.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEdit.zip
deleted file mode 100644
index 8a1a924..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEdit.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEditor.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEditor.zip
deleted file mode 100644
index 4ac82b9..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/logicSemanticEditor.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/serviceExample.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/serviceExample.zip
deleted file mode 100644
index fa4c232..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/serviceExample.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesDecorator.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesDecorator.zip
deleted file mode 100644
index c0fee62..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesDecorator.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesLayout.zip b/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesLayout.zip
deleted file mode 100644
index fc7e6b8..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/examples/servicesLayout.zip
+++ /dev/null
Binary files differ
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 66e7403..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/gatherExamples.xml
+++ /dev/null
@@ -1,57 +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.emf.clipboard/emf-clipboard-copypaste.zip"/>
-			<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.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/clipboard.gif b/org.eclipse.gmf.examples.runtime.ui.pde/icons/clipboard.gif
deleted file mode 100755
index 39dd4d9..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/clipboard.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram.gif b/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram.gif
deleted file mode 100644
index b385e8c..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram2.gif b/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram2.gif
deleted file mode 100644
index b385e8c..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/diagram2.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/icons/geoshape.gif b/org.eclipse.gmf.examples.runtime.ui.pde/icons/geoshape.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/geoshape.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/icons/logic.gif b/org.eclipse.gmf.examples.runtime.ui.pde/icons/logic.gif
deleted file mode 100644
index ca05b78..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/icons/logic.gif
+++ /dev/null
Binary files differ
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 23cae49..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = Graphical Modeling Framework (GMF) Runtime Examples Plug-in
-Plugin.providerName = Eclipse Modeling Project
-
-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.logic.projectPage.title = Modeling Logic Diagram Plug-in Project Creation
-newWizards.examples.logic.projectPage.desc = Create the three plug-in projects of the logic example
-newWizards.examples.logic.projectName=org.eclipse.gmf.examples.runtime.diagram.logic
-
-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.geoshapes.projectPage.title = Modeling Geoshapes Diagram Plug-in Project Creation
-newWizards.examples.geoshapes.projectPage.desc = Create the plug-in project of the Geoshapes example
-newWizards.examples.geoshapes.projectName=org.eclipse.gmf.examples.runtime.diagram.geoshapes
-
-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.layoutservice.projectPage.title = Square Layout Provider Diagram Plug-in
-newWizards.examples.layoutservice.projectPage.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.layoutservice.projectName=org.eclipse.gmf.examples.runtime.diagram.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.decorationservice.projectPage.title = Review Decorator Provider Diagram Plug-in
-newWizards.examples.decorationservice.projectPage.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.decorationservice.projectName=org.eclipse.gmf.examples.runtime.diagram.decorator
-
-newWizards.examples.serviceexample.name = Service
-newWizards.examples.serviceexample.description = Creates the Service Example Plugin which demonstrates the use of the Service.
-newWizards.examples.serviceexample.projectPage.title = Service Example Plug-in Project Creation
-newWizards.examples.serviceexample.projectPage.desc = Creates the Service Example plug-in project
-newWizards.examples.serviceexample.projectName=org.eclipse.gmf.examples.runtime.common.service
-
-newWizards.examples.clipboard.name = Clipboard Support
-newWizards.examples.clipboard.description = Creates the Clipboard Support Example Plugin
-newWizards.examples.clipboard.projectPage.title = Clipboard Support Example Plug-in Project Creation
-newWizards.examples.clipboard.projectPage.desc = Creates the Clipboard Support Example plug-in project
-newWizards.examples.clipboard.projectName=org.eclipse.gmf.examples.runtime.emf.clipboard
-
-
-#
-# END TRANSLATABLE
-#
-
-# Convention used by the GMF build procedure to pack example zips
-# zip@<example_plugin_id> = <filename>.zip
-#
-zip@org.eclipse.gmf.examples.runtime.diagram.logic = examples/logic.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.logic.model = examples/logicSemantic.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.logic.model.edit = examples/logicSemanticEdit.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.logic.model.editor = examples/logicSemanticEditor.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.geoshapes = examples/geoshapes.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.layout = examples/servicesLayout.zip
-zip@org.eclipse.gmf.examples.runtime.diagram.decorator = examples/servicesDecorator.zip
-zip@org.eclipse.gmf.examples.runtime.common.service = examples/serviceExample.zip
-zip@org.eclipse.gmf.examples.runtime.emf.clipboard = examples/emf-clipboard-copypaste.zip
-
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 e3dca57..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/plugin.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2010  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      -->
-<plugin>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%newWizardCategories.examples.runtimePDEPlugin"
-            parentCategory="org.eclipse.ui.Examples"
-            id="org.eclipse.gmf.examples.runtime">
-      </category>
-      
-      <!-- Logic Example -->
-      <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.ProjectUnzipperNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.runtime.ui.pde.wizards.logic"
-            projectPageTitle="%newWizards.examples.logic.projectPage.title"
-            projectPageDescription="%newWizards.examples.logic.projectPage.desc"
-            projectName="%newWizards.examples.logic.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.logic"
-            	nameFormat = "{0}">
-           </project> 	
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.logic.model"
-            	nameFormat = "{0}.semantic">
-           </project> 	
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.logic.model.edit"
-            	nameFormat = "{0}.semantic.edit">
-           </project> 	
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.logic.model.editor"
-            	nameFormat = "{0}.semantic.editor">
-           </project> 	
-         <description>
-            %newWizards.examples.logic.desc
-         </description>
-      </wizard>  
-      
-      <!-- Geoshape Example -->
-      <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.ProjectUnzipperNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.ui.pde.wizards.geoshapes"
-            projectPageTitle="%newWizards.examples.geoshapes.projectPage.title"
-            projectPageDescription="%newWizards.examples.geoshapes.projectPage.desc"
-            projectName="%newWizards.examples.geoshapes.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.geoshapes">
-           </project> 	
-         <description>
-            %newWizards.examples.geoshapes.desc
-         </description>
-      </wizard>  
-
-	  <!-- Square Layout Provider Example -->       
-      <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.ProjectUnzipperNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.ui.pde.wizards.layoutService"
-            projectPageTitle="%newWizards.examples.layoutservice.projectPage.title"
-            projectPageDescription="%newWizards.examples.layoutservice.projectPage.desc"
-            projectName="%newWizards.examples.layoutservice.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.layout">
-           </project> 	
-         <description>
-            %newWizards.examples.layoutservice.desc
-         </description>
-      </wizard>  
-
-	  <!-- Review Decorator Provider Example -->      
-      <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.ProjectUnzipperNewWizard"
-            project="true"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            id="org.eclipse.gmf.examples.ui.pde.wizards.decoratorService"
-            projectPageTitle="%newWizards.examples.decorationservice.projectPage.title"
-            projectPageDescription="%newWizards.examples.decorationservice.projectPage.desc"
-            projectName="%newWizards.examples.decorationservice.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.diagram.decorator">
-           </project> 	
-         <description>
-            %newWizards.examples.decorationservice.desc
-         </description>
-      </wizard>  
-      
-      <!-- Service Example -->
-      <wizard
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.ProjectUnzipperNewWizard"
-            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"
-            projectPageTitle="%newWizards.examples.serviceexample.projectPage.title"
-            projectPageDescription="%newWizards.examples.serviceexample.projectPage.desc"
-            projectName="%newWizards.examples.serviceexample.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.common.service">
-           </project> 	
-         <description>
-            %newWizards.examples.serviceexample.description
-         </description>
-      </wizard>      
-
-	  <!-- Clipboard Support Example -->
-      <wizard
-            category="org.eclipse.ui.Examples/org.eclipse.gmf.examples.runtime"
-            class="org.eclipse.gmf.examples.runtime.ui.pde.internal.wizards.ProjectUnzipperNewWizard"
-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"
-            icon="icons/clipboard.gif"
-            id="org.eclipse.gmf.examples.runtime.common.service.wizards"
-            name="%newWizards.examples.clipboard.name"
-            project="true"
-            projectPageTitle="%newWizards.examples.clipboard.projectPage.title"
-            projectPageDescription="%newWizards.examples.clipboard.projectPage.desc"
-            projectName="%newWizards.examples.clipboard.projectName">
-            <project
-            	zipPath = "%zip@org.eclipse.gmf.examples.runtime.emf.clipboard">
-           </project>
-         <description>
-            %newWizards.examples.clipboard.description
-         </description>
-      </wizard>      
-      
-   </extension>
-</plugin>
diff --git a/org.eclipse.gmf.examples.runtime.ui.pde/pom.xml b/org.eclipse.gmf.examples.runtime.ui.pde/pom.xml
deleted file mode 100644
index f4fc185..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime.ui.pde</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime.ui.pde</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 2a6c1ef..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 0d96708..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 c60bebb..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 723aa0a..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/AbstractResourceManager.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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 9f36475..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 001e457..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 585e80a..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/l10n/messages.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-#
-
-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
-
-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/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 ed6b655..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/internal/wizards/ProjectUnzipperNewWizard.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-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.FileLocator;
-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.SubProgressMonitor;
-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;
-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;
-
-/**
- * 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
- */
-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
-	 */
-	public ProjectUnzipperNewWizard() {
-		super();
-		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 = FileLocator.toFileURL(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;
-		pageName = config.getAttribute("name"); //$NON-NLS-1$
-		pageTitle = config.getAttribute("projectPageTitle"); //$NON-NLS-1$
-		pageDescription = config.getAttribute("projectPageDescription"); //$NON-NLS-1$
-		pageProjectName = config.getAttribute("projectName"); //$NON-NLS-1$
-
-		List nameFormatsL = new ArrayList();
-		List zipURLs = new ArrayList();
-		
-		IConfigurationElement[] projectElements = config.getChildren("project"); //$NON-NLS-1$
-		for (int i=0;i<projectElements.length;i++) {
-			zipURLs.add(GmfExamplesPlugin.getDefault().find(new Path(projectElements[i].getAttribute("zipPath")))); //$NON-NLS-1$
-			if (projectElements[i].getAttribute("nameFormat") == null) { //$NON-NLS-1$
-				nameFormatsL.add("{0}"); //$NON-NLS-1$
-			} else { 
-				nameFormatsL.add(projectElements[i].getAttribute("nameFormat")); //$NON-NLS-1$
-			}
-		}
-		
-		projectZipURL = new URL[zipURLs.size()];
-		zipURLs.toArray(projectZipURL);
-		assert projectZipURL.length > 0;
-		nameFormats = new String[nameFormatsL.size()];
-		nameFormatsL.toArray(nameFormats);
-		assert nameFormats.length > 0;
-		assert projectZipURL.length == nameFormats.length;
-		
-	}
-
-}
\ 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/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 20533ae..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Log.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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
- */
-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 9ccd1b9..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/StringStatics.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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
- */
-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 5141772..0000000
--- a/org.eclipse.gmf.examples.runtime.ui.pde/src/org/eclipse/gmf/examples/runtime/ui/pde/util/Trace.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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
- */
-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.examples.runtime/.classpath b/org.eclipse.gmf.examples.runtime/.classpath
deleted file mode 100644
index c835067..0000000
--- a/org.eclipse.gmf.examples.runtime/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.examples.runtime/.cvsignore b/org.eclipse.gmf.examples.runtime/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/org.eclipse.gmf.examples.runtime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/org.eclipse.gmf.examples.runtime/.project b/org.eclipse.gmf.examples.runtime/.project
deleted file mode 100644
index efd7776..0000000
--- a/org.eclipse.gmf.examples.runtime/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.examples.runtime</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.examples.runtime/META-INF/MANIFEST.MF b/org.eclipse.gmf.examples.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index fa47b4e..0000000
--- a/org.eclipse.gmf.examples.runtime/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.examples.runtime
-Bundle-Version: 1.4.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmf.examples.runtime/about.html b/org.eclipse.gmf.examples.runtime/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.examples.runtime/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, 2007</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/about.ini b/org.eclipse.gmf.examples.runtime/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/org.eclipse.gmf.examples.runtime/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.examples.runtime/about.mappings b/org.eclipse.gmf.examples.runtime/about.mappings
deleted file mode 100644
index 529ce23..0000000
--- a/org.eclipse.gmf.examples.runtime/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.examples.runtime/about.properties b/org.eclipse.gmf.examples.runtime/about.properties
deleted file mode 100644
index 32affdd..0000000
--- a/org.eclipse.gmf.examples.runtime/about.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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) Runtime Examples
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Runtime Examples \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2010.  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.examples.runtime/build.properties b/org.eclipse.gmf.examples.runtime/build.properties
deleted file mode 100644
index 09d4f4a..0000000
--- a/org.eclipse.gmf.examples.runtime/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png,\
-               plugin.properties
diff --git a/org.eclipse.gmf.examples.runtime/modeling32.png b/org.eclipse.gmf.examples.runtime/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/org.eclipse.gmf.examples.runtime/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.examples.runtime/plugin.properties b/org.eclipse.gmf.examples.runtime/plugin.properties
deleted file mode 100644
index 6addb36..0000000
--- a/org.eclipse.gmf.examples.runtime/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName = Graphical Modeling Framework (GMF) Runtime Examples
-providerName = Eclipse Modeling Project
diff --git a/org.eclipse.gmf.examples.runtime/pom.xml b/org.eclipse.gmf.examples.runtime/pom.xml
deleted file mode 100644
index d2e7e65..0000000
--- a/org.eclipse.gmf.examples.runtime/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.examples.runtime</groupId>
-  <artifactId>org.eclipse.gmf.examples.runtime</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime-feature/.cvsignore b/org.eclipse.gmf.runtime-feature/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/org.eclipse.gmf.runtime-feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/org.eclipse.gmf.runtime-feature/.project b/org.eclipse.gmf.runtime-feature/.project
deleted file mode 100644
index afeb499..0000000
--- a/org.eclipse.gmf.runtime-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf-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-feature/build.properties b/org.eclipse.gmf.runtime-feature/build.properties
deleted file mode 100644
index 2071f77..0000000
--- a/org.eclipse.gmf.runtime-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 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
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               license.html,\
-               eclipse_update_120.jpg
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime-feature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime-feature/epl-v10.html b/org.eclipse.gmf.runtime-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime-feature/feature.properties b/org.eclipse.gmf.runtime-feature/feature.properties
deleted file mode 100644
index b349010..0000000
--- a/org.eclipse.gmf.runtime-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework (GMF) Runtime
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework runtime component.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime-feature/feature.xml b/org.eclipse.gmf.runtime-feature/feature.xml
deleted file mode 100644
index 56964ca..0000000
--- a/org.eclipse.gmf.runtime-feature/feature.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://www.eclipse.org/gmf">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      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
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.gmf.runtime.thirdparty"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.gmf.runtime.notation"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.gef" version="3.2.0"/>
-      <import feature="org.eclipse.emf.common" version="2.4.0"/>
-      <import feature="org.eclipse.emf.common.ui" version="2.4.0"/>
-      <import feature="org.eclipse.emf.ecore" version="2.4.0"/>
-      <import feature="org.eclipse.emf.ecore.edit" version="2.4.0"/>
-      <import feature="org.eclipse.emf.edit" version="2.4.0"/>
-      <import feature="org.eclipse.emf.edit.ui" version="2.4.0"/>
-      <import feature="org.eclipse.emf.transaction" version="1.0.0"/>
-      <import feature="org.eclipse.emf.validation" version="1.0.0"/>
-      <import feature="org.eclipse.emf.workspace" version="1.0.0"/>
-   </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.action.ide"
-         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.dnd.ide"
-         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.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.providers.ide"
-         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.diagram.ui.resources.editor.ide"
-         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.providers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.gmf"
-         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.printing.win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         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"/>
-
-</feature>
diff --git a/org.eclipse.gmf.runtime-feature/license.html b/org.eclipse.gmf.runtime-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.runtime-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime-feature/pom.xml b/org.eclipse.gmf.runtime-feature/pom.xml
deleted file mode 100644
index dce55a0..0000000
--- a/org.eclipse.gmf.runtime-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.runtime-feature/rootfiles/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime-feature/rootfiles/notice.html b/org.eclipse.gmf.runtime-feature/rootfiles/notice.html
deleted file mode 100644
index c184ca3..0000000
--- a/org.eclipse.gmf.runtime-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateBundle/about.html b/org.eclipse.gmf.runtime-feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateBundle/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, 2007</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-feature/sourceTemplateBundle/plugin.properties b/org.eclipse.gmf.runtime-feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 3a3c6bb..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources Bundle
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/build.properties b/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index d8844c2..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/feature.properties b/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 9026bea..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Runtime Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Graphical Modeling Framework Runtime component.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/license.html b/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/about.html b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/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, 2007</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-feature/sourceTemplatePlugin/about.ini b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/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.runtime-feature/sourceTemplatePlugin/about.mappings b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 529ce23..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/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.runtime-feature/sourceTemplatePlugin/about.properties b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 4308b2f..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/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) Developer Resources
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Developer Resources \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.runtime-feature/sourceTemplatePlugin/build.properties b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index c438e2b..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,34 +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
-###############################################################################
-bin.includes = modeling32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/,\
-               feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-			   about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/modeling32.png b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index fe74a3f..0000000
--- a/org.eclipse.gmf.runtime-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +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
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Developer Resources
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.runtime.common.core/.classpath b/org.eclipse.gmf.runtime.common.core/.classpath
deleted file mode 100644
index 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 b4e7551..0000000
--- a/org.eclipse.gmf.runtime.common.core/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.core/.settings/.api_filters b/org.eclipse.gmf.runtime.common.core/.settings/.api_filters
deleted file mode 100644
index 569826a..0000000
--- a/org.eclipse.gmf.runtime.common.core/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.common.core" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/common/core/command/AbstractCommand.java" type="org.eclipse.gmf.runtime.common.core.command.AbstractCommand">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ICommandWithSettableResult"/>
-                <message_argument value="AbstractCommand"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7454b87..0000000
--- a/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,66 +0,0 @@
-#Thu Feb 11 18:53:24 EST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 0ffe498..0000000
--- a/org.eclipse.gmf.runtime.common.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 16:42:06 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 0e25597..0000000
--- a/org.eclipse.gmf.runtime.common.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.common.core; singleton:=true
-Bundle-Version: 1.4.1.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.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- com.ibm.icu;bundle-version="[4.0.0,5.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 979b242..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.common.core/pom.xml
deleted file mode 100644
index ee0df86..0000000
--- a/org.eclipse.gmf.runtime.common.core/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.core</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 1818722..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * 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
- */
-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, should never be <code>null</code>.
-     */
-    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, should never be <code>null</code>.
-	 * @param affectedFiles
-	 *            the list of affected {@link IFile}s; may be <code>null</code>
-	 */
-	public AbstractCommand(String label, List affectedFiles) {
-		super((label == null) ? StringStatics.BLANK : 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 6e513d8..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CommandResult.java
+++ /dev/null
@@ -1,175 +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
- */
-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 137fa2f..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/CompositeCommand.java
+++ /dev/null
@@ -1,969 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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();
-				/*
-				 * Propagate the label of the original command to the reduced.
-				 */
-				if (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();
-        }
-    }
-    
-	@Override
-	public CommandResult getCommandResult() {
-		
-		CommandResult commandResult = super.getCommandResult();
-		if (commandResult == null) {
-			
-			List<IStatus> statusList = new ArrayList<IStatus>(size());
-
-			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) {
-						statusList.add(result.getStatus());
-					}
-				}
-			}
-			
-			// Don't set the command explicitly since the intermediate command could
-			// have children added later.
-			return new CommandResult(aggregateStatuses(statusList),
-				getReturnValues());
-		}
-		return commandResult;
-	}
-}
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 161fbd0..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/FileModificationValidator.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-	}
-	
-	/**
-	 * This interface works in conjuction with the {@link SyncExecHelper}
-	 * to bridge entities knowing of UI and those with knowledge of editing domains.
-	 * 
-	 * @author James Bruck (jbruck@ca.ibm.com)
-	 *
-	 */
-	public interface ISyncExecHelper {
-		
-		/**
-		 * Will wrap the input runnable with one that is thread safe.
-		 * 
-		 * @param runnable
-		 */
-		public Runnable safeRunnable(Runnable runnable);
-	}
-
-	/**
-	 * 
-	 * Utility class that is used to bridge those entities that 
-	 * have knowledge of UI and those that have knowledge of editing domains.
-	 * Uses {@link ISyncExecHelper}.
-	 * It is always initialized so we don't have to worry about null checking.
-	 * 
-	 * @author James Bruck (jbruck@ca.ibm.com)
-	 */
-	public static class SyncExecHelper implements ISyncExecHelper {
-
-		private static ISyncExecHelper INSTANCE;
-		static {
-			SyncExecHelper.setInstance(new SyncExecHelper());
-		}
-
-		/**
-		 * The result of this method is guaranteed to be 
-		 * non-null since we initialize it with a default implementation.
-		 * 
-		 * @return the ISyncExecHelper instance
-		 */
-		public static synchronized ISyncExecHelper getInstance() {
-			return INSTANCE;
-		}
-		
-		private SyncExecHelper(){
-			// not intended to be called externally
-		}
-
-		public static synchronized void setInstance(ISyncExecHelper instance) {
-			SyncExecHelper.INSTANCE = instance;
-		}
-
-		/**
-		 * Provides a default implementation. 
-		 */
-		public Runnable safeRunnable(Runnable runnable) {
-			return runnable;
-		}
-	}
-
-}
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 a1db948..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/ICommand.java
+++ /dev/null
@@ -1,93 +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
- */
-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 a82b6a3..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/command/UnexecutableCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.core.runtime.IStatus;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * 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
- */
-public class UnexecutableCommand extends AbstractCommand {
-
-	/**
-	 * The shared instance.
-	 */
-	public static final UnexecutableCommand INSTANCE = new UnexecutableCommand();
-
-	/**
-	 * Creates an instance of an unexecutable command.
-	 */
-	protected UnexecutableCommand() {
-		super(StringStatics.BLANK, null);
-	}
-	
-	/**
-	 * Specific instances of the UnexecutableCommand can be created in order 
-	 * to provide feedback.  If no feedback is required, the shared instance should be used.
-	 * 
-	 * @since 1.2
-	 */
-	public UnexecutableCommand(IStatus status) {
-		super(StringStatics.BLANK);
-		setResult(new CommandResult(status));
-	}
-
-	/**
-	 * @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 9806f26..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/AbstractProviderConfiguration.java
+++ /dev/null
@@ -1,1581 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- */
-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);
-							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);
-							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 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 Paramters List
-		 * @return The list of method parameters.
-		 */
-		protected List getParamtersList(){
-			return parameters;
-		}
-		
-		/**
-		 * 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 = 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 != null) ? method.invoke(object,
-                valuesCopy)
-                : null;
-
-			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 10b4a54..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ExecutionStrategy.java
+++ /dev/null
@@ -1,292 +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
- */
-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 327dfb4..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/ProviderPriority.java
+++ /dev/null
@@ -1,145 +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
- */
-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 d2241ff..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/service/Service.java
+++ /dev/null
@@ -1,901 +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.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
- */
-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 d582237..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/CompositeRunnable.java
+++ /dev/null
@@ -1,57 +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
- */
-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;
-		}
-	}
-
-}
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 a5e4319..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/EnumeratedType.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.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
- */
-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());
-	}
-}
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 101c4df..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/FileCopyUtil.java
+++ /dev/null
@@ -1,151 +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
- */
-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();
-	}
-}
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 237d071..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/HashUtil.java
+++ /dev/null
@@ -1,273 +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
- */
-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);
-	}
-}
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 386d65f..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/IUpdateable.java
+++ /dev/null
@@ -1,28 +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
- */
-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 0b4b6e2..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Log.java
+++ /dev/null
@@ -1,249 +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
- */
-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);
-	}
-}
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 eaaf3c0..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/ObjectAdapter.java
+++ /dev/null
@@ -1,83 +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
- */
-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);
-	}
-
-}
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 9cd2b32..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/PropertiesConfigurationManager.java
+++ /dev/null
@@ -1,177 +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
- */
-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);
-	}
-
-}
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 70101fa..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Proxy.java
+++ /dev/null
@@ -1,122 +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
- */
-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);
-	}
-}
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 196d6b7..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/RequestCollapser.java
+++ /dev/null
@@ -1,128 +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
- */
-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;
-	}
-}
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 2428141..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringMatcher.java
+++ /dev/null
@@ -1,516 +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
- * 
- */
-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 e2e8751..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/StringStatics.java
+++ /dev/null
@@ -1,99 +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
- */
-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$
-}
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 3f8c5c2..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- */
-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), 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 f46cfc1..0000000
--- a/org.eclipse.gmf.runtime.common.core/src/org/eclipse/gmf/runtime/common/core/util/Trace.java
+++ /dev/null
@@ -1,513 +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
- */
-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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 341528c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 957b06b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:58:33 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 fd4d6b7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/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.ui.action.ide
-Bundle-Version: 1.5.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 c882c0c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ==============================================================================

-#*+------------------------------------------------------------------------+

-#*| Copyright (c) 2005, 2010  IBM Corporation and others.                  |

-#*| All rights reserved. This program and the accompanying materials       |

-#*| are made available under the terms of the Eclipse Public License v1.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/

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 b5145eb..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 Modeling Project
diff --git a/org.eclipse.gmf.runtime.common.ui.action.ide/pom.xml b/org.eclipse.gmf.runtime.common.ui.action.ide/pom.xml
deleted file mode 100644
index 7ff9a61..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action.ide/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.action.ide</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.action.ide</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 62aea4b..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(cntxt.getActivePart().getSite());
-		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 512888a..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(cntxt.getActivePart().getSite());
-		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(cntxt.getActivePart().getSite());
-		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 3558795..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(cntxt.getActivePart().getSite());
-		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 91160a6..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(cntxt.getActivePart().getSite());
-		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 c5b6505..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(cntxt.getActivePart().getSite());
-		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 6cd4e78..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(cntxt.getActivePart().getSite());
-
-		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(
-							cntxt.getActivePart().getSite(),
-							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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 6f4236a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1d2415b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:58:22 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 9c1dc8e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/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.common.ui.action
-Bundle-Version: 1.5.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 5d6bd9e..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 Modeling Project
diff --git a/org.eclipse.gmf.runtime.common.ui.action/pom.xml b/org.eclipse.gmf.runtime.common.ui.action/pom.xml
deleted file mode 100644
index ea066b4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.action</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.action</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 ec11483..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/actions/global/GlobalPrintAction.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 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() {
-		setEnabled(!getGlobalActionHandlerData().isEmpty()); 
-	}
-	
-	/* (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 45dfade..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,114 +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;
-	}
-	
-	/**
-	 * Property change event handler; does nothing by default. Subclasses should
-	 * override if they are interested in handling property change events.
-	 */
-	public void propertyChanged(Object source, int propId) {
-		refresh();
-	}
-
-	protected boolean isPropertyListener() {
-		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 406bc6a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.action/src/org/eclipse/gmf/runtime/common/ui/action/internal/l10n/CommonUIActionPluginImages.java
+++ /dev/null
@@ -1,45 +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.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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 a264289..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.printing.win32</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 97b1733..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:58:54 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 6cde1cf..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 e81cd29..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.cpp
+++ /dev/null
@@ -1,654 +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 the orientation 
-		if((pDM->dmFields & DM_ORIENTATION) != 0) {		
-			jfieldID orientationField = env->GetFieldID(objectClass, "orientation", "I");
-			if(orientationField != NULL){
-				//The value of DMORIENT_LANDSCAPE==2 and DMORIENT_PORTRAIT==1 
-				//match up with PrinterData.LANDSCAPE==2 and PrinterData.PORTRAIT==1 on the java side.
-				env->SetIntField(printerData, orientationField, pDM->dmOrientation);
-			}
-		}
-		//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 ae7f801..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.dsw
+++ /dev/null
@@ -1,528 +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>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_ar
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_cs
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_da
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_de
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_el
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_es
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_fi
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_fr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_hu
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_it
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_iw
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_ja
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_ko
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_nl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_no
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_nb
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_nn
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_pl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_pt
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_pt_BR
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_ru
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_sv
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_tr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_zh
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name DiagramPrint_zh_TW
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_ar"=.\DiagramPrint_ar\DiagramPrint_ar.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_ar
-    .\DiagramPrint_ar
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_cs"=.\DiagramPrint_cs\DiagramPrint_cs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_cs
-    .\DiagramPrint_cs
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_da"=.\DiagramPrint_da\DiagramPrint_da.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_da
-    .\DiagramPrint_da
-    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_el"=.\DiagramPrint_el\DiagramPrint_el.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_el
-    .\DiagramPrint_el
-    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_fi"=.\DiagramPrint_fi\DiagramPrint_fi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_fi
-    .\DiagramPrint_fi
-    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_hu"=.\DiagramPrint_hu\DiagramPrint_hu.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_hu
-    .\DiagramPrint_hu
-    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_iw"=.\DiagramPrint_iw\DiagramPrint_iw.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_iw
-    .\DiagramPrint_iw
-    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_nb"=.\DiagramPrint_nb\DiagramPrint_nb.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_nb
-    .\DiagramPrint_nb
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_nl"=.\DiagramPrint_nl\DiagramPrint_nl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_nl
-    .\DiagramPrint_nl
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_nn"=.\DiagramPrint_nn\DiagramPrint_nn.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_nn
-    .\DiagramPrint_nn
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_no"=.\DiagramPrint_no\DiagramPrint_no.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_no
-    .\DiagramPrint_no
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_pl"=.\DiagramPrint_pl\DiagramPrint_pl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_pl
-    .\DiagramPrint_pl
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_pt"=.\DiagramPrint_pt\DiagramPrint_pt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_pt
-    .\DiagramPrint_pt
-    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_ru"=.\DiagramPrint_ru\DiagramPrint_ru.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_ru
-    .\DiagramPrint_ru
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_sv"=.\DiagramPrint_sv\DiagramPrint_sv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_sv
-    .\DiagramPrint_sv
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_tr"=.\DiagramPrint_tr\DiagramPrint_tr.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_tr
-    .\DiagramPrint_tr
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_zh"=.\DiagramPrint_zh\DiagramPrint_zh.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_zh
-    .\DiagramPrint_zh
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "DiagramPrint_zh_HK"=.\DiagramPrint_zh_HK\DiagramPrint_zh_HK.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    DiagramPrint_zh_HK
-    .\DiagramPrint_zh_HK
-    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 7fc0bb1..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 85e4a8b..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.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.plg
deleted file mode 100644
index 13d5fcf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint.plg
+++ /dev/null
@@ -1,754 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_ar - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_ar\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPED.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPED.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\ar\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_cs - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_cs\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF1.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF1.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\cs\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_da - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_da\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF5.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF5.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\da\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_de - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x407 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_de\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF9.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPF9.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\de\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_el - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_el\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPFD.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSPFD.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\el\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_es - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0xc0a /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_es\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP101.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP101.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\es\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_fi - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_fi\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP105.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP105.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\fi\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_fr - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x40c /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_fr\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP109.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP109.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\fr\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_hu - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_hu\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP10D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP10D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\hu\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_it - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x410 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_it\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP111.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP111.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\it\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_iw - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_iw\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP115.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP115.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\iw\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_ja - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x411 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_ja\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP119.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP119.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\ja\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_ko - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x412 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_ko\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP11D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP11D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\ko\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_nl - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_nl\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP121.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP121.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\nl\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_no - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_no\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP125.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP125.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\no\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_nb - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_nb\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP129.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP129.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\no\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_nn - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_nn\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP12D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP12D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\no\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_pl - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_pl\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP131.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP131.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\pl\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_pt - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_pt\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP135.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP135.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\pt\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_pt_BR - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x416 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_pt_BR\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP139.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP139.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\pt_BR\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_ru - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_ru\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP13D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP13D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\ru\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_sv - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_sv\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP141.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP141.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\sv\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_tr - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_tr\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP145.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP145.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\tr\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_zh - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_zh\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP149.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP149.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\zh\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint_zh_TW - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_zh_TW\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP14D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP14D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\zh_TW\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-<h3>
---------------------Configuration: DiagramPrint - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release/DiagramPrint.res" /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP151.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /FR"Release/" /Fp"Release/DiagramPrint.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP151.tmp" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP152.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_UNICODE" /D "_USRDLL" /FR"Release/" /Fp"Release/DiagramPrint.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP152.tmp" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP153.tmp" with contents
-[
-/nologo /subsystem:windows /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /def:".\DiagramPrint.def" /out:".\I10n\os\win32\x86\en\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib" 
-.\Release\DiagramPrint.obj
-.\Release\StdAfx.obj
-.\Release\DiagramPrint.res
-.\DiagramPrint_ar\Release\DiagramPrint.lib
-.\DiagramPrint_cs\Release\DiagramPrint.lib
-.\DiagramPrint_da\Release\DiagramPrint.lib
-.\DiagramPrint_de\Release\DiagramPrint.lib
-.\DiagramPrint_el\Release\DiagramPrint.lib
-.\DiagramPrint_es\Release\DiagramPrint.lib
-.\DiagramPrint_fi\Release\DiagramPrint.lib
-.\DiagramPrint_fr\Release\DiagramPrint.lib
-.\DiagramPrint_hu\Release\DiagramPrint.lib
-.\DiagramPrint_it\Release\DiagramPrint.lib
-.\DiagramPrint_iw\Release\DiagramPrint.lib
-.\DiagramPrint_ja\Release\DiagramPrint.lib
-.\DiagramPrint_ko\Release\DiagramPrint.lib
-.\DiagramPrint_nl\Release\DiagramPrint.lib
-.\DiagramPrint_no\Release\DiagramPrint.lib
-.\DiagramPrint_nb\Release\DiagramPrint.lib
-.\DiagramPrint_nn\Release\DiagramPrint.lib
-.\DiagramPrint_pl\Release\DiagramPrint.lib
-.\DiagramPrint_pt\Release\DiagramPrint.lib
-.\DiagramPrint_pt_BR\Release\DiagramPrint.lib
-.\DiagramPrint_ru\Release\DiagramPrint.lib
-.\DiagramPrint_sv\Release\DiagramPrint.lib
-.\DiagramPrint_tr\Release\DiagramPrint.lib
-.\DiagramPrint_zh\Release\DiagramPrint.lib
-.\DiagramPrint_zh_TW\Release\DiagramPrint.lib
-]
-Creating command line "link.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP153.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-StdAfx.cpp
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-Creating command line "bscmake.exe /nologo /o"Release/DiagramPrint.bsc"  .\Release\StdAfx.sbr .\Release\DiagramPrint.sbr"
-Creating browse info file...
-<h3>Output Window</h3>
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 156 warning(s)
-</pre>
-</body>
-</html>
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 9d874bb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/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
-
-/////////////////////////////////////////////////////////////////////////////
-// 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,8,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,39,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
-
-1547 DIALOGEX 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", 0, 0, 0x1
-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_ar/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint.aps
deleted file mode 100644
index a7589fa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint.rc
deleted file mode 100644
index b149766..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint.rc
+++ /dev/null
@@ -1,494 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Unknown language: 0x1, 0x1 resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ARA)
-#ifdef _WIN32
-LANGUAGE 0x1, 0x1
-#pragma code_page(1256)
-#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(1256)\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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ØÈÇÚÉ"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "æÍÏÉ ÇáØÈÇÚÉ ",1075,9,4,272,84,WS_GROUP
-    LTEXT           "ÇáÇ&Óã: ",1093,237,21,36,8
-    COMBOBOX        1139,85,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "ÇáÎÕÇ&ÆÕ...",1025,17,17,60,14,WS_GROUP
-    LTEXT           "ÇáÍÇáÉ:",1095,237,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,36,224,10
-    LTEXT           "ÇáäæÚ:",1094,237,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,48,224,10
-    LTEXT           "ÇáãßÇä:",1097,237,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,60,224,10
-    LTEXT           "ÇáÊÚÞíÈ:",1096,237,72,36,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,85,72,152,10
-    CONTROL         "ØÈÇ&ÚÉ Çáì ãáÝ",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,20,70,37,12
-    GROUPBOX        "äØÇÞ ØÈÇÚÉ ÇáÑÓã ÇáÈíÇäí",1072,9,93,272,106,WS_GROUP
-    CONTROL         "ÇáÑÓã ÇáÈíÇäí Çá&ÍÇáí",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,197,107,75,12
-    CONTROL         "ßá ÇáÑÓ&æã ÇáÈíÇäíÉ ãä ÇáäãÇÐÌ ÇáãÝÊæÍÉ",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,145,121,129,
-                    12
-    CONTROL         "ÇáÑÓæã Çá&ÈíÇäíÉ ÇáãÍÏÏÉ:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,190,135,83,12
-    LISTBOX         IDC_DIAGRAMS,18,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP,WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáãÞíÇÓ ",IDC_STATIC,9,202,272,51
-    CONTROL         "&ÖÈØ Çáì % ãä ÇáÍÌã ÇáÚÇÏí: ",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,217,109,12
-    CONTROL         "ãáÇÆã&É Çáì: ",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON,226,233,47,12
-    EDITTEXT        IDC_PERCENT,143,217,32,12,ES_NUMBER,WS_EX_LEFTSCROLLBAR
-    LTEXT           "ÚÑÖ ÇáÕ&ÝÍÇÊ: ",1105,171,235,47,8
-    EDITTEXT        IDC_PAGESM,135,233,32,12,ES_NUMBER,WS_EX_LEFTSCROLLBAR
-    RTEXT           "&Øæá ÇáÕÝÍÇÊ: ",IDC_STATIC,58,235,54,10
-    EDITTEXT        IDC_PAGESN,22,233,32,12,ES_NUMBER,WS_EX_LEFTSCROLLBAR
-    LTEXT           "",IDC_STATIC,22,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "ãÏì ÇáØÈÇÚÉ",1074,149,257,132,64,WS_GROUP
-    CONTROL         "&ßá ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,226,272,47,12
-    CONTROL         "ÕÝÍÇ&Ê ",1058,"Button",BS_AUTORADIOBUTTON,227,286,46,12
-    RTEXT           "&ãä: ",1089,245,302,20,8
-    EDITTEXT        1152,215,300,26,12,ES_NUMBER | WS_GROUP,
-                    WS_EX_LEFTSCROLLBAR
-    RTEXT           "&Çáì:",1090,193,302,20,8
-    EDITTEXT        1153,162,300,27,12,ES_NUMBER | WS_GROUP,
-                    WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáäÓÎ ",1073,10,257,132,64,WS_GROUP
-    LTEXT           "Ú&ÏÏ ÇáäÓÎ: ",1092,84,274,35,8
-    EDITTEXT        1154,22,271,32,12,ES_NUMBER | WS_GROUP,
-                    WS_EX_LEFTSCROLLBAR
-    CONTROL         "ÊÑÊíÈ ÇáäÓ&Î ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,18,296,64,12
-    DEFPUSHBUTTON   "ÍÓäÇ",IDOK,61,328,48,14,WS_GROUP
-    PUSHBUTTON      "ÇáÛÇÁ",IDCANCEL,9,328,48,14
-    ICON            "",1086,110,292,70,25,WS_GROUP
-END
-
-1539 DIALOGEX 32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ÇÚÏÇÏ ÇáØÈÇÚÉ "
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "æÍÏÉ ÇáØÈÇÚÉ ",1075,8,4,272,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÇ&Óã: ",1093,236,20,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1136,84,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "ÇáÎ&ÕÇÆÕ ",1025,16,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "ÇáÍÇáÉ:",1095,236,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáäæÚ:",1094,236,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáãßÇä: ",1097,236,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáÊÚÞíÈ: ",1096,236,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,72,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "ÇáæÑÞ ",1073,116,92,164,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÍ&Ìã: ",1089,236,108,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1137,124,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "ÇáãÕ&ÏÑ: ",1090,248,128,24,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1138,124,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáÇÊÌÇå",1072,8,92,100,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    ICON            "",1084,75,112,18,20,WS_GROUP
-    CONTROL         "Øæ&áíÇ ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,12,106,52,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&ÚÑÖíÇ ",1057,"Button",BS_AUTORADIOBUTTON,12,126,52,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "ÍÓäÇ",IDOK,60,156,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "ÇáÛÇÁ",IDCANCEL,8,156,48,14,0,WS_EX_RTLREADING
-END
-
-1546 DIALOGEX 32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RIGHT | WS_EX_RTLREADING
-CAPTION "ÇÚÏÇÏ ÇáÕÝÍÉ"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,76,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,76,88,80,4
-    GROUPBOX        "ÇáæÑÞ ",1073,8,96,224,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÍ&Ìã: ",1089,188,112,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1137,16,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "Çáã&ÕÏÑ: ",1090,188,132,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1138,16,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇÊÌÇå",1072,168,156,64,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "Øæ&áíÇ ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,172,170,52,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&ÚÑÖíÇ ",1057,"Button",BS_AUTORADIOBUTTON,172,190,52,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "ÇáåæÇãÔ",1075,8,156,152,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÃ&íÓÑ: ",1102,120,172,32,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1155,92,170,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "ÇáÃíã&ä: ",1103,55,172,21,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1157,16,170,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "ÇáÃ&Úáì: ",1104,129,192,23,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1156,92,190,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "ÇáÃ&ÓÝá: ",1105,51,192,24,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1158,16,190,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    DEFPUSHBUTTON   "ÍÓäÇ",IDOK,112,220,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "ÇáÛÇÁ",IDCANCEL,60,220,48,14,0,WS_EX_RTLREADING
-    PUSHBUTTON      "æÍÏÉ Çá&ØÈÇÚÉ... ",1026,8,220,48,14,0,WS_EX_RTLREADING
-END
-
-1234 DIALOGEX 32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_RIGHT | WS_EX_RTLREADING
-CAPTION "ØÈÇÚÉ"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "æÍÏÉ ÇáØÈÇÚÉ ",1075,1,4,279,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÇ&Óã: ",1093,236,20,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1139,84,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "ÇáÎ&ÕÇÆÕ ",1025,16,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "ÇáÍÇáÉ:",1095,236,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáäæÚ:",1094,236,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáãßÇä: ",1097,236,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáÊÚÞíÈ: ",1096,236,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,83,72,152,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&ØÈÇÚÉ Çáì ãáÝ ",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,17,70,59,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    GROUPBOX        "ãÏì ÇáØÈÇÚÉ",1072,141,92,140,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "&ßá ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,208,106,64,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ÕÝÍÇ&Ê ",1058,"Button",BS_AUTORADIOBUTTON,235,122,37,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "Ç&ÎÊíÇÑ ",1057,"Button",BS_AUTORADIOBUTTON,239,138,33,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    RTEXT           "&ãä: ",1089,217,124,11,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1152,188,122,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "&Çáì:",1090,172,124,13,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1153,144,122,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáäÓÎ ",1073,1,92,137,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ÚÏÏ ÇáäÓÎ: ",1092,52,108,68,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1154,16,106,32,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    ICON            "",1086,54,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "ÊÑÊ&íÈ ÇáäÓÎ ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,2,130,49,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "ÍÓäÇ",IDOK,60,164,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "ÇáÛÇÁ",IDCANCEL,8,164,48,14,0,WS_EX_RTLREADING
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ØÈÇÚÉ"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "æÍÏÉ ÇáØÈÇÚÉ ",1075,9,4,272,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "ÇáÇ&Óã: ",1093,237,21,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1139,85,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "ÇáÎÕÇ&ÆÕ...",1025,17,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "ÇáÍÇáÉ:",1095,237,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáäæÚ:",1094,237,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáãßÇä: ",1097,237,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ÇáÊÚÞíÈ: ",1096,237,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,85,72,152,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ØÈÇÚÉ Çáì ãá&Ý ",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,18,70,59,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    GROUPBOX        "äØÇÞ ØÈÇÚÉ ÇáÑÓã ÇáÈíÇäí ",1072,9,93,272,106,BS_RIGHT | 
-                    WS_GROUP,WS_EX_RTLREADING
-    CONTROL         "ÇáÑÓã Çá&ÈíÇäí ÇáÍÇáí ",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,196,107,77,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ßá ÇáÑÓæã ÇáÈíÇäíÉ ãä ÇáäãÇ&ÐÌ ÇáãÝÊæÍÉ ",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,143,121,131,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "Çá&ÑÓæã ÇáÈíÇäíÉ ÇáãÍÏÏÉ: ",IDC_SELECTED_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,188,135,85,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    LISTBOX         IDC_DIAGRAMS,18,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP,WS_EX_RIGHT | WS_EX_RTLREADING | 
-                    WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáãÞíÇÓ ",IDC_STATIC,9,202,272,51,BS_RIGHT,
-                    WS_EX_RTLREADING
-    CONTROL         "&ÖÈØ Çáì % ãä ÇáÍÌã ÇáÚÇÏí: ",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,169,218,104,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ãáÇÆã&É Çáì: ",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,226,233,47,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "&ÖÈØ Çáì % ãä ÇáÍÌã ÇáÚÇÏí: ",1102,171,219,88,8,NOT 
-                    WS_VISIBLE,WS_EX_RIGHT | WS_EX_RTLREADING
-    EDITTEXT        IDC_PERCENT,135,217,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&ÚÑÖ ÇáÕÝÍÇÊ: ",1105,171,235,47,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESM,135,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "&Øæá ÇáÕÝÍÇÊ: ",IDC_STATIC,58,235,54,10,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESN,22,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "",IDC_STATIC,22,235,7,8,NOT WS_VISIBLE,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    GROUPBOX        "ãÏì ÇáØÈÇÚÉ",1074,149,257,132,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "&ßá ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,226,272,47,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ÕÝÍÇ&Ê ",1058,"Button",BS_AUTORADIOBUTTON,227,286,46,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    RTEXT           "&ãä: ",1089,245,302,20,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1152,215,300,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "&Çáì:",1090,193,302,20,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1153,162,300,27,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ÇáäÓÎ ",1073,10,257,132,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "Ú&ÏÏ ÇáäÓÎ: ",1092,91,273,35,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1154,22,271,32,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    CONTROL         "ÊÑÊ&íÈ ÇáäÓÎ ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,7,295,52,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "ÍÓäÇ",IDOK,61,328,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "ÇáÛÇÁ",IDCANCEL,9,328,48,14,0,WS_EX_RTLREADING
-    ICON            "",1086,63,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    // Unknown language: 0x1, 0x1 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(1256)
-#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_ar/DiagramPrint_ar.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint_ar.dsp
deleted file mode 100644
index 0357d80..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint_ar.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_ar" - 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_ar - 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_ar.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_ar.mak" CFG="DiagramPrint_ar - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_ar - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_ar - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_ar"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_ar - 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_ar_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\ar\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_ar - 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_ar_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_ar - Win32 Release"
-# Name "DiagramPrint_ar - 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_ar/DiagramPrint_ar.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint_ar.plg
deleted file mode 100644
index 768b516..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/DiagramPrint_ar.plg
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_ar - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ar/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_base_wd40.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_base_wd40.dsp
deleted file mode 100644
index 1249641..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_base_wd40.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_wd40" - 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_wd40 - 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_wd40.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_wd40.mak" CFG="DiagramPrint_wd40 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_wd40 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_wd40 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_wd40"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_wd40 - 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_wd40_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\wd40\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_wd40 - 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_wd40_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_wd40 - Win32 Release"
-# Name "DiagramPrint_wd40 - 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_cs/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint.aps
deleted file mode 100644
index bb017df..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint.rc
deleted file mode 100644
index 4743334..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/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
-
-/////////////////////////////////////////////////////////////////////////////
-// Czech resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
-#ifdef _WIN32
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#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 5, 1\r\n"
-    "#pragma code_page(1250)\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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 315, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tisk"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Tiskárna",1075,8,4,301,84,WS_GROUP
-    LTEXT           "&Název:",1093,16,21,23,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Vlastnosti...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stav:",1095,16,36,22,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,36,224,10
-    LTEXT           "Typ:",1094,16,49,20,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,48,224,10
-    LTEXT           "Kde:",1097,16,62,19,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,60,224,10
-    LTEXT           "Komentáø:",1096,16,75,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,58,74,152,10
-    CONTROL         "&Tisk do souboru",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Rozsah tisku diagramu",1072,8,93,301,106,WS_GROUP
-    CONTROL         "&Aktuální diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | 
-                    WS_TABSTOP,16,107,253,12
-    CONTROL         "Všec&hny diagramy z otevøených modelù",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,270,12
-    CONTROL         "Vy&brané diagramy:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,179,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Škálování",IDC_STATIC,8,202,302,51
-    CONTROL         "&Upravit na % normální velikosti:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,
-                    216,139,12
-    CONTROL         "Pøi&zpùsobit:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,17,233,74,12
-    EDITTEXT        IDC_PERCENT,166,216,32,12,ES_NUMBER
-    RTEXT           "šíøce stráne&k:",1105,102,235,55,8
-    EDITTEXT        IDC_PAGESM,166,233,32,12,ES_NUMBER
-    RTEXT           "výšce st&ránek:",IDC_STATIC,211,236,54,8
-    EDITTEXT        IDC_PAGESN,269,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Rozsah tisku",1074,8,257,132,70,WS_GROUP
-    CONTROL         "Vš&e",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,87,12
-    CONTROL         "&Stránky",1058,"Button",BS_AUTORADIOBUTTON,16,286,82,12
-    RTEXT           "&od:",1089,19,305,20,8
-    EDITTEXT        1152,43,303,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,80,305,16,8
-    EDITTEXT        1153,100,303,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,147,257,162,70,WS_GROUP
-    RTEXT           "&Poèet kopií:",1092,159,273,51,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ko&mplet.",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,60,12
-    DEFPUSHBUTTON   "OK",IDOK,204,335,48,14,WS_GROUP
-    PUSHBUTTON      "Storno",IDCANCEL,260,335,48,14
-    ICON            "",1086,157,291,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 "Nastavení tisku"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Tiskárna",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Název:",1093,16,20,23,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Vlastnosti",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stav:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Kde:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentáø:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papír",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Ve&likost:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Zdroj:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientace",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "Na výš&ku",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,43,12
-    CONTROL         "Na šíøk&u",1057,"Button",BS_AUTORADIOBUTTON,224,126,41,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Storno",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 "Nastavení stránky"
-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        "Papír",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Ve&likost:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Zdroj:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientace",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Na výšku",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "Na šíøk&u",1057,"Button",BS_AUTORADIOBUTTON,16,190,41,
-                    12
-    GROUPBOX        "Okraje",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Vlevo:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "V&pravo:",1103,164,172,25,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "Nah&oøe:",1104,88,192,26,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Dole:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Storno",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Tiskárna...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 290, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tisk"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Tiskárna",1075,8,4,275,84,WS_GROUP
-    LTEXT           "&Název:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Vlastnosti",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stav:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Kde:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentáø:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "&Tisk do souboru",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Rozsah tisku",1072,8,92,144,64,WS_GROUP
-    CONTROL         "Vš&e",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,25,12
-    CONTROL         "&Stránky",1058,"Button",BS_AUTORADIOBUTTON,16,122,37,12
-    CONTROL         "Vý&bìr",1057,"Button",BS_AUTORADIOBUTTON,16,138,31,12
-    RTEXT           "&od:",1089,61,124,10,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,160,92,123,64,WS_GROUP
-    LTEXT           "Poèet &kopií:",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         "Ko&mplet.",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,41,12
-    DEFPUSHBUTTON   "OK",IDOK,182,164,48,14,WS_GROUP
-    PUSHBUTTON      "Storno",IDCANCEL,235,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tisk"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Tiskárna",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Název:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Vlastnosti...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Stav:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Kde:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentáø:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "&Tisk do souboru",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Rozsah tisku diagramu",1072,8,93,272,106,WS_GROUP
-    CONTROL         "&Aktuální diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Všec&hny diagramy z otevøených modelù",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,143,12
-    CONTROL         "Vy&brané diagramy:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,71,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Škálování",IDC_STATIC,8,202,272,51
-    CONTROL         "&Upravit na % normální velikosti:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,111,12
-    CONTROL         "Pøi&zpùsobit:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,50,12
-    LTEXT           "&Upravit na % normální velikosti:",1102,30,219,98,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,132,217,32,12,ES_NUMBER
-    LTEXT           "st&ránek na šíøku:",1105,75,235,53,8
-    EDITTEXT        IDC_PAGESM,132,233,32,12,ES_NUMBER
-    RTEXT           "stránek na vý&šku:",IDC_STATIC,172,235,56,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Rozsah tisku",1074,8,257,132,64,WS_GROUP
-    CONTROL         "Vš&e",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,25,12
-    CONTROL         "&Stránky",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&od:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Poèet &kopií:",1092,192,273,38,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ko&mplet.",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,41,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Storno",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, 289
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Czech 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 5, 1
-#pragma code_page(1250)
-#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_cs/DiagramPrint_cs.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint_cs.dsp
deleted file mode 100644
index 640fe03..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint_cs.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_cs" - 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_cs - 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_cs.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_cs.mak" CFG="DiagramPrint_cs - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_cs - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_cs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_cs"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_cs - 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_cs_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\cs\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_cs - 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_cs_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_cs - Win32 Release"
-# Name "DiagramPrint_cs - 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_cs/DiagramPrint_cs.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint_cs.plg
deleted file mode 100644
index ca44f33..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/DiagramPrint_cs.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_cs - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_cs\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP1B5.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP1B5.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\cs\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_cs/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_da/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint.aps
deleted file mode 100644
index f2f4aff..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint.rc
deleted file mode 100644
index d3ad8c8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint.rc
+++ /dev/null
@@ -1,425 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Danish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN)
-#ifdef _WIN32
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 312, 361
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Udskriv"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,9,6,295,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,19,8
-    COMBOBOX        1139,59,17,150,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaber...",1025,216,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,26,8,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,36,217,10
-    LTEXT           "Type:",1094,16,48,22,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,48,218,10
-    LTEXT           "Hvor:",1097,16,61,24,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,60,218,10
-    LTEXT           "Kommentar:",1096,16,73,42,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,71,71,148,10
-    CONTROL         "Udskriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,51,12
-    GROUPBOX        "Diagramudskrivningsomfang",1072,9,95,294,106,WS_GROUP
-    CONTROL         "A&ktuelt diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,211,12
-    CONTROL         "Alle &diagrammer i åbne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,17,121,226,12
-    CONTROL         "&Valgte diagrammer:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,129,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skalering",IDC_STATIC,8,202,295,51
-    CONTROL         "&Juster til % af normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    217,115,12
-    CONTROL         "&Tilpas til:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,53,12
-    EDITTEXT        IDC_PERCENT,138,217,32,12,ES_NUMBER
-    RTEXT           "sider i &bredden:",1105,84,235,52,8
-    EDITTEXT        IDC_PAGESM,145,233,32,12,ES_NUMBER
-    RTEXT           "sider i &højden:",IDC_STATIC,189,235,54,8
-    EDITTEXT        IDC_PAGESN,247,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Udskriftsområde",1074,8,257,132,73,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,75,12
-    CONTROL         "&Sider",1058,"Button",BS_AUTORADIOBUTTON,16,286,83,12
-    RTEXT           "&fra:",1089,24,308,10,8
-    EDITTEXT        1152,48,306,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "t&il:",1090,82,308,7,8
-    EDITTEXT        1153,100,306,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopier",1073,148,257,155,72,WS_GROUP
-    LTEXT           "Antal ko&pier:",1092,163,273,51,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortér",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,53,12
-    DEFPUSHBUTTON   "OK",IDOK,205,339,48,14,WS_GROUP
-    PUSHBUTTON      "Annullér",IDCANCEL,257,339,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 "Indstil printer"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,19,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaber",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,59,36,216,10
-    LTEXT           "Type:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,47,217,10
-    LTEXT           "Hvor:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,60,217,10
-    LTEXT           "Kommentar:",1096,16,72,39,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,72,217,10
-    GROUPBOX        "Papir",1073,8,92,164,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,108,29,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,128,17,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "&Stående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,40,12
-    CONTROL         "&Liggende",1057,"Button",BS_AUTORADIOBUTTON,224,126,43,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Annullér",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 "Sideopsætning"
-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        "Papir",1073,8,97,224,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,112,29,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,17,133,17,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Stående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,40,12
-    CONTROL         "&Liggende",1057,"Button",BS_AUTORADIOBUTTON,16,190,43,
-                    12
-    GROUPBOX        "Margener",1075,81,156,152,56,WS_GROUP
-    LTEXT           "&Venstre:",1102,88,172,26,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Højre:",1103,164,172,19,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           "&Bund:",1105,164,192,19,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Annullér",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 "Udskriv"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,19,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaber",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,59,36,217,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,48,217,10
-    LTEXT           "Hvor:",1097,16,61,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,60,217,10
-    LTEXT           "Kommentar:",1096,16,73,39,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,72,146,10
-    CONTROL         "Udskriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,213,70,51,12
-    GROUPBOX        "Udskriftsområde",1072,8,93,144,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,25,12
-    CONTROL         "&Sider",1058,"Button",BS_AUTORADIOBUTTON,16,122,29,12
-    CONTROL         "&Valg",1057,"Button",BS_AUTORADIOBUTTON,15,138,27,12
-    RTEXT           "&fra:",1089,52,124,10,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "t&il:",1090,105,124,7,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopier",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Antal ko&pier:",1092,168,108,39,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "S&ortér",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,32,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Annullér",IDCANCEL,233,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Udskriv"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Printer",1075,9,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,22,19,8
-    COMBOBOX        1139,59,18,146,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaber...",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,59,36,217,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,48,217,10
-    LTEXT           "Hvor:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,60,217,10
-    LTEXT           "Kommentar:",1096,16,72,39,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,59,72,146,10
-    CONTROL         "Udskriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,53,12
-    GROUPBOX        "Diagramudskrivningsomfang",1072,8,94,272,106,WS_GROUP
-    CONTROL         "A&ktuelt diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,62,12
-    CONTROL         "Alle &diagrammer i åbne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,112,12
-    CONTROL         "&Valgte diagrammer:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,17,135,73,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "&Juster til % af normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,107,12
-    CONTROL         "&Tilpas til:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,41,12
-    LTEXT           "&Juster til % af normal størrelse:",1102,30,219,93,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,128,217,32,12,ES_NUMBER
-    LTEXT           "sider i &bredden:",1105,71,235,48,8
-    EDITTEXT        IDC_PAGESM,128,233,32,12,ES_NUMBER
-    RTEXT           "sider i &højden:",IDC_STATIC,177,236,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Udskriftsområde",1074,8,258,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,25,12
-    CONTROL         "&Sider",1058,"Button",BS_AUTORADIOBUTTON,16,286,29,12
-    RTEXT           "&fra:",1089,24,302,10,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "t&il:",1090,85,302,7,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopier",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antal ko&pier:",1092,163,273,39,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortér",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,32,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Annullér",IDCANCEL,233,328,48,14
-    ICON            "",1086,156,290,70,25,WS_GROUP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 289
-        BOTTOMMARGIN, 349
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Danish resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_da/DiagramPrint_da.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint_da.dsp
deleted file mode 100644
index eba4eb0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/DiagramPrint_da.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_da" - 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_da - 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_da.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_da.mak" CFG="DiagramPrint_da - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_da - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_da - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_da"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_da - 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_da_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\da\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_da - 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_da_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_da - Win32 Release"
-# Name "DiagramPrint_da - 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_da/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_da/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_de/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.aps
deleted file mode 100644
index 6482d93..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 b18949a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_de/DiagramPrint.rc
+++ /dev/null
@@ -1,429 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "Drucken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,21,36,8
-    COMBOBOX        1139,57,18,147,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,28,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,219,10
-    LTEXT           "Typ:",1094,16,48,24,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,219,10
-    LTEXT           "Standort:",1097,16,60,33,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,55,60,219,10
-    LTEXT           "Kommentar:",1096,16,72,38,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,72,147,10
-    CONTROL         "&In Datei drucken",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,66,12
-    GROUPBOX        "Diagrammdruckbereich",1072,8,93,272,106,WS_GROUP
-    CONTROL         "A&ktuelles Diagramm",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &Diagramme aus geöffneten Modellen",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Ausge&wählte Diagramme:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,93,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skalierung",IDC_STATIC,8,202,272,51
-    CONTROL         "A&uf % der normalen Größe anpassen:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,130,12
-    CONTROL         "Ein&passen in:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,61,12
-    LTEXT           "A&uf % der normalen Größe anpassen:",1102,30,219,117,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,152,217,32,12,ES_NUMBER
-    LTEXT           "Seiten brei&t:",1105,107,235,37,8
-    EDITTEXT        IDC_PAGESM,152,233,32,12,ES_NUMBER
-    RTEXT           "Seiten &hoch:",IDC_STATIC,190,235,40,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Druckbereich",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Seiten",1058,"Button",BS_AUTORADIOBUTTON,16,286,33,12
-    RTEXT           "&von:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,147,257,132,64,WS_GROUP
-    LTEXT           "An&zahl der Kopien:",1092,163,273,59,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortieren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,232,302,44,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,232,328,48,14
-    ICON            "",1086,155,292,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 "Druckereinrichtung"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drucker",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      "Ei&genschaften",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Standort:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",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           "&Größe:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Quelle:",1090,16,128,36,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,52,12
-    CONTROL         "Querfor&mat",1057,"Button",BS_AUTORADIOBUTTON,224,126,
-                    52,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,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Quelle:",1090,16,132,36,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,52,12
-    CONTROL         "Querfor&mat",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Randeinstellungen",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Links:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Rechts:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Oben:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Unten:",1105,164,192,32,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, 288, 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,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      "Ei&genschaften",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Standort:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "&In Datei drucken",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Druckbereich",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Seiten",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Auswahl",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&von:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,160,92,120,64,WS_GROUP
-    LTEXT           "An&zahl der Kopien:",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         "S&ortieren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Drucken"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Drucker",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Name:",1093,16,21,36,8
-    COMBOBOX        1139,57,18,147,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,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,219,10
-    LTEXT           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,219,10
-    LTEXT           "Standort:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,219,10
-    LTEXT           "Kommentar:",1096,16,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,72,147,10
-    CONTROL         "&In Datei drucken",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,66,12
-    GROUPBOX        "Diagrammdruckbereich",1072,8,93,272,106,WS_GROUP
-    CONTROL         "A&ktuelles Diagramm",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &Diagramme aus geöffneten Modellen",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Ausge&wählte Diagramme:",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        "Skalierung",IDC_STATIC,8,202,272,51
-    CONTROL         "A&uf % der normalen Größe anpassen:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,132,12
-    CONTROL         "Ein&passen in:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,57,12
-    LTEXT           "A&uf % der normalen Größe anpassen:",1102,30,219,117,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,152,217,32,12,ES_NUMBER
-    LTEXT           "Seiten brei&t:",1105,110,235,38,8
-    EDITTEXT        IDC_PAGESM,152,233,32,12,ES_NUMBER
-    RTEXT           "Seiten &hoch:",IDC_STATIC,187,235,40,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Druckbereich",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Seiten",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&von:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&bis:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopien",1073,147,257,132,64,WS_GROUP
-    LTEXT           "An&zahl der Kopien:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortieren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,231,295,45,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",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    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_el/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint.aps
deleted file mode 100644
index a36b0de..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint.rc
deleted file mode 100644
index a33523f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint.rc
+++ /dev/null
@@ -1,421 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Greek resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)
-#ifdef _WIN32
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-#pragma code_page(1253)
-#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_ELL)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 8, 1\r\n"
-    "#pragma code_page(1253)\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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 330, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Åêôýðùóç"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "ÅêôõðùôÞò",1075,7,4,314,84,WS_GROUP
-    LTEXT           "¼&íïìá:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Éäéüôçôåò...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ÊáôÜóôáóç:",1095,16,38,43,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,37,218,10
-    LTEXT           "Åßäïò:",1094,16,50,25,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,49,218,10
-    LTEXT           "ÈÝóç:",1097,16,62,22,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,61,218,10
-    LTEXT           "Ó÷üëéï:",1096,16,74,29,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,73,218,10
-    CONTROL         "Åêôýðùóç óå áñ&÷åßï",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,236,70,40,12
-    GROUPBOX        "Åýñïò åêôýðùóçò äéáãñáììÜôùí",1072,7,92,314,106,
-                    WS_GROUP
-    CONTROL         "&ÔñÝ÷ïí äéÜãñáììá",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | BS_MULTILINE | WS_GROUP | 
-                    WS_TABSTOP,16,107,253,12
-    CONTROL         "¼ëá ôá &äéáãñÜììáôá áðü ôá áíïé÷ôÜ ìïíôÝëá",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON | 
-                    BS_MULTILINE,16,121,284,12
-    CONTROL         "&ÅðéëåãìÝíá äéáãñÜììáôá:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON | BS_MULTILINE,16,135,270,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Êëßìáêá",IDC_STATIC,7,202,314,51
-    CONTROL         "&ÐñïóáñìïãÞ óôï % ôïõ êáíïíéêïý ìåãÝèïõò:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | 
-                    BS_MULTILINE | WS_GROUP | WS_TABSTOP,16,217,162,12
-    CONTROL         "Ðñ&ïóáñìïãÞ óå:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | BS_MULTILINE | WS_TABSTOP,16,233,75,
-                    12
-    EDITTEXT        IDC_PERCENT,193,218,32,12,ES_NUMBER
-    LTEXT           "ðëÜ&ôïò óåëßäáò:",1105,98,236,68,8
-    EDITTEXT        IDC_PAGESM,173,236,32,12,ES_NUMBER
-    RTEXT           "ý&øïò óåëßäáò:",IDC_STATIC,221,236,56,10
-    EDITTEXT        IDC_PAGESN,281,234,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Åýñïò åêôýðùóçò",1074,8,257,132,69,WS_GROUP
-    CONTROL         "¼&ëåò",1056,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | 
-                    WS_GROUP | WS_TABSTOP,16,272,110,12
-    CONTROL         "&Óåëßäåò",1058,"Button",BS_AUTORADIOBUTTON | 
-                    BS_MULTILINE,16,286,114,12
-    RTEXT           "&áðü:",1089,16,302,24,8
-    EDITTEXT        1152,46,302,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "Ý&ùò:",1090,81,304,22,8
-    EDITTEXT        1153,107,303,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Áíôßãñáöá",1073,147,257,174,68,WS_GROUP
-    LTEXT           "Áñéèìüò áí&ôéãñÜöùí:",1092,158,273,79,8
-    EDITTEXT        1154,247,270,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ó&õññáöÞ",1041,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | 
-                    WS_GROUP | WS_TABSTOP,251,297,58,12
-    DEFPUSHBUTTON   "OK",IDOK,211,333,48,14,WS_GROUP
-    PUSHBUTTON      "Áêýñùóç",IDCANCEL,268,334,48,14
-    ICON            "",1086,157,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 "Ñýèìéóç åêôõðùôÞ"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "ÅêôõðùôÞò",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¼&íïìá:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Éäéüôçôåò",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           "&ÌÝãåèïò:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Ð&ñïÝëåõóç:",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         "&Êáôáêüñõöïò",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,224,106,52,12
-    CONTROL         "&Ïñéæüíôéïò",1057,"Button",BS_AUTORADIOBUTTON,224,126,
-                    52,12
-    DEFPUSHBUTTON   "OK",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 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        "×áñôß",1073,8,96,224,56,WS_GROUP
-    LTEXT           "&ÌÝãåèïò:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Ð&ñïÝëåõóç:",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         "&Êáôáêüñõöïò",1056,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,16,170,52,12
-    CONTROL         "&Ïñéæüíôéïò",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Ðåñéèþñéá",1075,80,156,152,56,WS_GROUP
-    LTEXT           "Á&ñéóôåñÜ:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Äå&îéÜ:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "ÐÜí&ù:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "ÊÜ&ôù:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Áêýñùóç",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "Å&êôõðùôÞò...",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 "Åêôýðùóç"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "ÅêôõðùôÞò",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¼&íïìá:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Éäéüôçôåò",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         "Åêôýðùóç óå áñ&÷åßï",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Åýñïò åêôýðùóçò",1072,8,92,144,64,WS_GROUP
-    CONTROL         "¼&ëåò",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Óåëßäåò",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "Åðé&ëïãÞ",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&áðü:",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        "Áíôßãñáöá",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Áñéèìüò áí&ôéãñÜöùí:",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         "Ó&õññáöÞ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Áêýñùóç",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Åêôýðùóç"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "ÅêôõðùôÞò",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¼&íïìá:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Éäéüôçôåò...",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         "Åêôýðùóç óå áñ&÷åßï",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Åýñïò åêôýðùóçò äéáãñáììÜôùí",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "&ÔñÝ÷ïí äéÜãñáììá",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¼ëá ôá &äéáãñÜììáôá áðü ôá áíïé÷ôÜ ìïíôÝëá",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "&ÅðéëåãìÝíá äéáãñÜììáôá:",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        "Êëßìáêá",IDC_STATIC,8,202,272,51
-    CONTROL         "&ÐñïóáñìïãÞ óôï % ôïõ êáíïíéêïý ìåãÝèïõò:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,104,12
-    CONTROL         "Ðñ&ïóáñìïãÞ óå:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "&ÐñïóáñìïãÞ óôï % ôïõ êáíïíéêïý ìåãÝèïõò:",1102,30,219,
-                    88,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "ðëÜ&ôïò óåëßäáò:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "ý&øïò óåëßäáò:",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        "Åýñïò åêôýðùóçò",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¼&ëåò",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Óåëßäåò",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&áðü:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "Ý&ùò:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Áíôßãñáöá",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Áñéèìüò áí&ôéãñÜöùí:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ó&õññáöÞ",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Áêýñùóç",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, 317
-        VERTGUIDE, 292
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Greek 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_ELL)
-#ifdef _WIN32
-LANGUAGE 8, 1
-#pragma code_page(1253)
-#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_el/DiagramPrint_el.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint_el.dsp
deleted file mode 100644
index 67de406..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/DiagramPrint_el.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_el" - 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_el - 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_el.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_el.mak" CFG="DiagramPrint_el - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_el - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_el - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_el"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_el - 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_el_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\el\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_el - 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_el_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_el - Win32 Release"
-# Name "DiagramPrint_el - 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_el/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_el/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 e4ef6e4..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 045ee6a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_es/DiagramPrint.rc
+++ /dev/null
@@ -1,375 +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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Spanish (Castilian) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP)
-#ifdef _WIN32
-LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "Imprimir"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,6,276,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,27,8
-    COMBOBOX        1139,57,17,152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades...",1025,217,18,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,38,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,59,37,215,10
-    LTEXT           "Tipo:",1094,16,49,21,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,59,49,217,10
-    LTEXT           "Lugar:",1097,16,61,24,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,59,61,217,10
-    LTEXT           "Comentario:",1096,16,73,40,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,59,73,145,10
-    CONTROL         "Imprimir a archi&vo",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,207,71,68,12
-    GROUPBOX        "Rango de impresión del diagrama",1072,8,93,275,106,WS_GROUP
-    CONTROL         "Diagrama act&ual",IDC_CURRENT_DIAGRAM,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,188,12
-    CONTROL         "Todos los diagramas de modelos a&biertos",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,120,234,12
-    CONTROL         "Diagramas s&eleccionados:",IDC_SELECTED_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,134,244,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    GROUPBOX        "Ajuste",IDC_STATIC,8,202,275,51
-    CONTROL         "A&justar a porcentaje del tamaño normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,214,137,12
-    CONTROL         "Ajusta&r a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,43,12
-    EDITTEXT        IDC_PERCENT,162,215,32,12,ES_NUMBER
-    LTEXT           "Páginas de &ancho:",1105,66,235,67,8
-    EDITTEXT        IDC_PAGESM,135,233,32,12,ES_NUMBER
-    RTEXT           "Páginas de al&to:",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,236,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Rango de impresión",1074,8,257,132,64,WS_GROUP
-    CONTROL         "To&do",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,272,30,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,286,39,12
-    RTEXT           "de&sde:",1089,19,304,21,8
-    EDITTEXT        1152,43,303,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,79,304,19,8
-    EDITTEXT        1153,104,303,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,147,257,135,64,WS_GROUP
-    LTEXT           "Número de c&opias:",1092,163,273,59,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Intercalar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,229,303,43,12
-    DEFPUSHBUTTON   "Aceptar",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",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 "Configuración de impresión"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impresora",1075,8,4,274,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,12,19,33,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,12,35,38,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,54,36,224,10
-    LTEXT           "Tipo:",1094,12,47,38,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,54,48,224,10
-    LTEXT           "Lugar:",1097,12,60,37,9,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,54,61,224,10
-    LTEXT           "Comentario:",1096,11,72,38,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,54,72,224,10
-    GROUPBOX        "Papel",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Tama&ñ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,102,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "V&ertical",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,224,106,52,12
-    CONTROL         "&Horizontal",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,12
-    DEFPUSHBUTTON   "Aceptar",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           "Tama&ñ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         "V&ertical",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           "I&zquierdo:",1102,88,172,31,8
-    EDITTEXT        1155,125,170,28,12,WS_GROUP
-    LTEXT           "&Derecho:",1103,164,172,32,8
-    EDITTEXT        1157,199,169,28,12,WS_GROUP
-    LTEXT           "&Superior:",1104,88,192,32,8
-    EDITTEXT        1156,126,190,28,12,WS_GROUP
-    LTEXT           "In&ferior:",1105,164,192,23,8
-    EDITTEXT        1158,199,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "Aceptar",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, 312, 185
-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,300,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,20,36,8
-    COMBOBOX        1139,56,17,152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades",1025,218,17,69,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,62,36,227,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,61,48,227,10
-    LTEXT           "Lugar:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,61,60,227,10
-    LTEXT           "Comentario:",1096,16,71,38,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,62,70,152,10
-    CONTROL         "Imprimir a archi&vo",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,220,71,68,12
-    GROUPBOX        "Rango de impresión",1072,7,92,166,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,41,12
-    CONTROL         "&Selección",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&desde:",1089,61,124,22,8
-    EDITTEXT        1152,88,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,118,124,19,8
-    EDITTEXT        1153,143,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,179,90,128,64,WS_GROUP
-    LTEXT           "Número de c&opias:",1092,186,108,68,8
-    EDITTEXT        1154,267,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,181,123,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "&Intercalar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,260,130,44,12
-    DEFPUSHBUTTON   "Aceptar",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Impresora",1075,7,4,277,84,WS_GROUP
-    LTEXT           "&Nombre:",1093,16,21,27,8
-    COMBOBOX        1139,57,17,152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Propiedades...",1025,220,17,60,14,WS_GROUP
-    LTEXT           "Estado:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,58,36,224,10
-    LTEXT           "Tipo:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,57,48,224,10
-    LTEXT           "Lugar:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,57,60,224,10
-    LTEXT           "Comentario:",1096,17,71,38,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,57,72,152,10
-    CONTROL         "Imprimir a archi&vo",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,213,70,69,12
-    GROUPBOX        "Rango de impresión del diagrama",1072,8,93,276,106,WS_GROUP
-    CONTROL         "Diagrama act&ual",IDC_CURRENT_DIAGRAM,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,65,12
-    CONTROL         "Todos los diag&ramas de modelos abiertos",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,122,143,12
-    CONTROL         "Diagramas s&eleccionados:",IDC_SELECTED_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,135,97,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    GROUPBOX        "Ajuste",IDC_STATIC,9,202,276,51
-    CONTROL         "A&justar a porcentaje del tamaño normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,137,12
-    CONTROL         "Aj&ustar a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,17,233,48,12
-    LTEXT           "A&justar a porcentaje del tamaño normal:",1102,27,219,124,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,161,216,32,12,ES_NUMBER
-    LTEXT           "Páginas de &ancho:",1105,71,235,23,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "Páginas de al&to:",IDC_STATIC,177,235,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Rango de impresión",1074,8,257,132,64,WS_GROUP
-    CONTROL         "To&do",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,272,33,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,15,286,39,12
-    RTEXT           "de&sde:",1089,22,302,22,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&hasta:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copias",1073,147,257,137,64,WS_GROUP
-    LTEXT           "Número de c&opias:",1092,163,273,59,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Intercalar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,235,294,43,12
-    DEFPUSHBUTTON   "Aceptar",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",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    // Spanish (Castilian) 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_fi/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint.aps
deleted file mode 100644
index 7ee05da..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint.rc
deleted file mode 100644
index b3380af..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint.rc
+++ /dev/null
@@ -1,413 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Finnish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN)
-#ifdef _WIN32
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-#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_FIN)\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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 293, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tulosta"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Kirjoitin",1075,8,5,279,84,WS_GROUP
-    LTEXT           "&Nimi:",1093,16,21,15,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ominaisuudet...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Tila:",1095,16,36,24,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,36,224,10
-    LTEXT           "Tyyppi:",1094,16,48,28,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,48,224,10
-    LTEXT           "Missä:",1097,16,60,27,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,60,224,10
-    LTEXT           "Kommentti:",1096,16,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Tulosta tie&dostoon",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,207,70,71,12
-    GROUPBOX        "Kaavion tulostusalue",1072,8,94,280,106,WS_GROUP
-    CONTROL         "N&ykyinen kaavio",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,66,12
-    CONTROL         "Kaikki avoimien mallien kaav&iot",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,111,12
-    CONTROL         "Valit&ut kaaviot:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,60,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skaalaus",IDC_STATIC,8,202,281,51
-    CONTROL         "S&äädä suhteessa normaalikokoon (%):",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,133,12
-    CONTROL         "&Sovita:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,35,12
-    LTEXT           "Säädä suht&eessa normaalikokoon (%):",1102,30,219,120,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,162,217,32,12,ES_NUMBER
-    LTEXT           "sivua &leveä:",1105,71,235,38,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sivua ko&rkea:",IDC_STATIC,177,235,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Tulostusalue",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Kaikki",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,33,12
-    CONTROL         "Si&vut",1058,"Button",BS_AUTORADIOBUTTON,16,286,29,12
-    RTEXT           "&Mistä:",1089,25,302,19,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "Mi&hin:",1090,76,302,19,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopiot",1073,147,258,140,64,WS_GROUP
-    LTEXT           "Kopioiden mää&rä:",1092,163,273,55,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "La&jittele",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,299,45,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",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 "Tulostusasetukset"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Kirjoitin",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nimi:",1093,16,20,15,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ominaisuudet",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Tila:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tyyppi:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Missä:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Paperi",1073,8,92,164,56,WS_GROUP
-    LTEXT           "&Koko:",1089,16,108,19,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Lähde:",1090,16,128,22,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Suunta",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "&Pysty",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,30,12
-    CONTROL         "&Vaaka",1057,"Button",BS_AUTORADIOBUTTON,224,126,34,12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",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 "Sivun asetukset"
-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        "Paperi",1073,8,96,224,56,WS_GROUP
-    LTEXT           "&Koko:",1089,16,112,19,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Lähde:",1090,16,132,22,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Suunta",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Pysty",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,30,12
-    CONTROL         "&Vaaka",1057,"Button",BS_AUTORADIOBUTTON,16,190,34,12
-    GROUPBOX        "Reunukset",1075,80,156,152,56,WS_GROUP
-    LTEXT           "Va&sen:",1102,88,172,22,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Oikea:",1103,164,172,21,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Ylä:",1104,88,192,12,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Ala:",1105,164,192,12,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "Ki&rjoitin...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 291, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tulosta"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Kirjoitin",1075,8,4,275,84,WS_GROUP
-    LTEXT           "&Nimi:",1093,16,20,15,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ominaisuudet",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Tila:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tyyppi:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Missä:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Tulosta tie&dostoon",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,206,70,71,12
-    GROUPBOX        "Tulostusalue",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Kaikki",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,33,12
-    CONTROL         "Si&vut",1058,"Button",BS_AUTORADIOBUTTON,16,122,29,12
-    CONTROL         "V&alinta",1057,"Button",BS_AUTORADIOBUTTON,16,138,35,12
-    RTEXT           "&Mistä:",1089,52,124,19,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "Mi&hin:",1090,101,124,19,8
-    EDITTEXT        1153,121,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopiot",1073,160,92,123,64,WS_GROUP
-    LTEXT           "Kopioiden mää&rä:",1092,168,108,55,8
-    EDITTEXT        1154,240,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,162,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "La&jittele",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,37,12
-    DEFPUSHBUTTON   "OK",IDOK,183,164,48,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",IDCANCEL,235,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 292, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Tulosta"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Kirjoitin",1075,8,4,276,84,WS_GROUP
-    LTEXT           "&Nimi:",1093,16,21,15,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ominaisuudet...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Tila:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tyyppi:",1094,16,48,36,8,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Missä:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentti:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Tulosta tie&dostoon",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,208,70,71,12
-    GROUPBOX        "Kaavion tulostusalue",1072,8,93,276,106,WS_GROUP
-    CONTROL         "N&ykyinen kaavio",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,66,12
-    CONTROL         "Kaikki avoimien mallien kaav&iot",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,111,12
-    CONTROL         "Valit&ut kaaviot:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,135,60,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Skaalaus",IDC_STATIC,8,202,276,51
-    CONTROL         "S&äädä suhteessa normaalikokoon (%):",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,133,12
-    CONTROL         "&Sovita:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,35,12
-    LTEXT           "Säädä suht&eessa normaalikokoon (%):",1102,30,219,120,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,162,217,32,12,ES_NUMBER
-    LTEXT           "sivua &leveä:",1105,71,235,38,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sivua ko&rkea:",IDC_STATIC,177,235,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Tulostusalue",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Kaikki",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,33,12
-    CONTROL         "Si&vut",1058,"Button",BS_AUTORADIOBUTTON,16,286,29,12
-    RTEXT           "&Mistä:",1089,24,302,19,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "Mi&hin:",1090,76,302,19,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopiot",1073,147,257,136,64,WS_GROUP
-    LTEXT           "Kopioiden mää&rä:",1092,163,273,55,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "La&jittele",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,37,12
-    DEFPUSHBUTTON   "OK",IDOK,183,328,48,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",IDCANCEL,235,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    // Finnish 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_FIN)
-#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_fi/DiagramPrint_fi.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint_fi.dsp
deleted file mode 100644
index b062010..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/DiagramPrint_fi.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_fi" - 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_fi - 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_fi.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_fi.mak" CFG="DiagramPrint_fi - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_fi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_fi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_fi"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_fi - 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_fi_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\fi\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_fi - 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_fi_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_fi - Win32 Release"
-# Name "DiagramPrint_fi - 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_fi/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fi/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 012fcf3..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 79823f4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/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
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#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_FRA)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 12, 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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 312, 354
-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,297,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,21,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           "Etat :",1095,16,36,25,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Type :",1094,16,48,23,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Où :",1097,16,60,20,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaire :",1096,16,72,48,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,73,72,152,10
-    CONTROL         "Imprimer vers un fic&hier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,71,43,8
-    GROUPBOX        "Plage d'impression du diagramme",1072,8,93,296,106,
-                    WS_GROUP
-    CONTROL         "Diagramme act&uel",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL        "Tous les d&iagrammes des modèles ouverts",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Diagrammes sél&ectionnés :",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        "Mise à l'échelle",IDC_STATIC,8,202,295,51
-    CONTROL        "P&ourcentage :",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,217,68,12
-    CONTROL         "Adapter &à :",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,63,12
-    EDITTEXT        IDC_PERCENT,93,217,32,12,ES_NUMBER
-    RTEXT           "&Largeur :",1105,84,235,39,8
-    EDITTEXT        IDC_PAGESM,127,233,32,12,ES_NUMBER
-    RTEXT           "&Hauteur :",IDC_STATIC,197,235,41,10
-    EDITTEXT        IDC_PAGESN,245,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Plage d'impression",1074,8,257,132,68,WS_GROUP
-    CONTROL         "&Tout",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,72,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,286,81,12
-    RTEXT           "&De :",1089,24,308,20,8
-    EDITTEXT        1152,48,306,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&A :",1090,76,308,20,8
-    EDITTEXT        1153,100,306,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copies",1073,147,257,156,70,WS_GROUP
-    RTEXT           "Nombre de &copies :",1092,160,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL        "A&ssembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,60,12
-    DEFPUSHBUTTON   "OK",IDOK,203,332,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,255,332,48,14
-    ICON            "",1086,156,289,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 "Configuration de l'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           "Etat :",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         "&Paysage",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 "Mise en 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         "&Paysage",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           "Etat :",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,152,10
-    CONTROL         "Imprimer vers un fic&hier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Plage d'impression",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Tout",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           "&A :",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,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "A&ssembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimer"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Imprimante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nom :",1093,16,21,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           "Etat :",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,152,10
-    CONTROL         "Imprimer vers un fic&hier",1040,"Button",
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Plage d'impression du diagramme",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "Diagramme act&uel",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Tous les d&iagrammes des modèles ouverts",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Diagrammes sél&ectionnés :",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        "Mise à l'échelle",IDC_STATIC,8,202,272,51
-    CONTROL        "P&ourcentage :",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "Adapter &à :",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT          "P&ourcentage :",1102,30,219,88,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "&Largeur :",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "&Hauteur :",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        "Plage d'impression",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Tout",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pa&ges",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&De :",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&A :",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           "Nombre de &copies :",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL          "A&ssembler",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Annuler",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, 289
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // French (France) 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_FRA)
-#ifdef _WIN32
-LANGUAGE 12, 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/DiagramPrint_fr.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint_fr.plg
deleted file mode 100644
index 2601040..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_fr/DiagramPrint_fr.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_fr - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x40c /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_fr\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP1AB.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP1AB.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\fr\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
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_hu/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint.aps
deleted file mode 100644
index 587f35d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint.rc
deleted file mode 100644
index 22ab030..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint.rc
+++ /dev/null
@@ -1,426 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Hungarian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)
-#ifdef _WIN32
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 303, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Nyomtatás"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Nyomtató",1075,8,4,292,84,WS_GROUP
-    LTEXT           "&Név:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Tulajdonságok...",1025,212,17,64,14,WS_GROUP
-    LTEXT           "Állapot:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Típus:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Hely:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Megjegyzés:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Nyomtatás &fájlba",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagram nyomtatási tartománya",1072,8,93,292,106,
-                    WS_GROUP
-    CONTROL         "&Jelenlegi diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Öss&zes diagram a megnyitott modellekbol",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "&Kijelölt diagramok:",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        "Méretezés",IDC_STATIC,8,202,292,51
-    CONTROL         "Nyomtatási méret (%):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "&Illeszkedés:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,58,12
-    LTEXT           "Nyomtatási méret (%):",1102,30,219,88,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,134,216,32,12,ES_NUMBER
-    LTEXT           "oldal &széles:",1105,83,236,43,8
-    EDITTEXT        IDC_PAGESM,135,234,32,12,ES_NUMBER
-    RTEXT           "oldal &magas:",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Nyomtatási tartomány",1074,8,257,132,64,WS_GROUP
-    CONTROL         "Ö&sszes",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Oldalak",1058,"Button",BS_AUTORADIOBUTTON,16,286,49,12
-    RTEXT           "&kezdo:",1089,12,306,24,8
-    EDITTEXT        1152,38,303,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&befejezo:",1090,66,303,33,8
-    EDITTEXT        1153,103,302,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Másolatok",1073,147,257,153,64,WS_GROUP
-    LTEXT           "&Másolatok száma:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Leválogatás",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,237,300,57,12
-    DEFPUSHBUTTON   "OK",IDOK,195,328,48,14,WS_GROUP
-    PUSHBUTTON      "Mégse",IDCANCEL,252,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 "Nyomtatási beállítás"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Nyomtató",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Név:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Tulajdonságok",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Állapot:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Típus:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Hely:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Megjegyzés:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papír",1073,8,92,164,56,WS_GROUP
-    LTEXT           "&Méret:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Forrás:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Tájolás",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "&Álló",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "&Fekvo",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Mégse",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 "Oldalbeállítás"
-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        "Papír",1073,8,96,224,56,WS_GROUP
-    LTEXT           "&Méret:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Forrás:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Tájolás",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Álló",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "&Fekvo",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Margók",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Bal:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Jobb:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Felso:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Alsó:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Mégse",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Nyomtató...",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 "Nyomtatás"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Nyomtató",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Név:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Tulajdonságok",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Állapot:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Típus:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Hely:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Megjegyzés:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Nyomtatás &fájlba",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Nyomtatási tartomány",1072,8,92,144,64,WS_GROUP
-    CONTROL         "Ö&sszes",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Oldalak",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Kijelölés",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "&kezdo:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&befejezo:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Másolatok",1073,160,92,120,64,WS_GROUP
-    LTEXT           "&Másolatok száma:",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         "&Leválogatás",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Mégse",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Nyomtatás"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Nyomtató",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Név:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Tulajdonságok...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Állapot:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Típus:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Hely:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Megjegyzés:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Nyomtatás &fájlba",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagram nyomtatási tartománya",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "&Jelenlegi diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Öss&zes diagram a megnyitott modellekbol",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "&Kijelölt diagramok:",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        "Méretezés",IDC_STATIC,8,202,272,51
-    CONTROL         "Nyomtatási méret (%):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "&Illeszkedés:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "Nyomtatási méret (%):",1102,30,219,88,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "oldal &széles:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "oldal &magas:",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        "Nyomtatási tartomány",1074,8,257,132,64,WS_GROUP
-    CONTROL         "Ö&sszes",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Oldalak",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&kezdo:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&befejezo:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Másolatok",1073,147,257,132,64,WS_GROUP
-    LTEXT           "&Másolatok száma:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Leválogatás",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Mégse",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, 300
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Hungarian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_hu/DiagramPrint_hu.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint_hu.dsp
deleted file mode 100644
index a91eceb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/DiagramPrint_hu.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_hu" - 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_hu - 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_hu.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_hu.mak" CFG="DiagramPrint_hu - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_hu - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_hu - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_hu"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_hu - 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_hu_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\hu\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_hu - 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_hu_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_hu - Win32 Release"
-# Name "DiagramPrint_hu - 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_hu/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_hu/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 3bf2877..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 72eae9f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_it/DiagramPrint.rc
+++ /dev/null
@@ -1,430 +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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Italian (Italy) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
-#ifdef _WIN32
-LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "Stampa"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,276,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,21,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,26,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,36,224,10
-    LTEXT           "Tipo:",1094,16,48,19,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,48,224,10
-    LTEXT           "Dove:",1097,16,60,27,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,60,224,10
-    LTEXT           "Commento:",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,93,276,106,
-                    WS_GROUP
-    CONTROL         "Diagramma c&orrente",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Tutti i &diagrammi da modelli aperti",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "Diagrammi s&elezionati:",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        "Adattamento",IDC_STATIC,8,202,278,51
-    CONTROL         "Regol&a a % della dimensione normale:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,150,12
-    CONTROL         "Ada&tta a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,40,12
-    LTEXT           "Regol&a a % della dimensione normale:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,186,220,32,12,ES_NUMBER
-    LTEXT           "larghezza &pagine:",1105,63,235,55,8
-    EDITTEXT        IDC_PAGESM,127,234,32,12,ES_NUMBER
-    RTEXT           "altezza &pagine:",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        "Stampa intervallo",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Tutto",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pa&gine",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&da:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copie",1073,147,257,135,64,WS_GROUP
-    LTEXT           "Numero di &copie:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "F&ascicola",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,227,305,50,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",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 "Impostazione stampante"
-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           "Dove:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commento:",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           "Di&mensione:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Alimentazione:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientamento",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "V&erticale",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "O&rizzontale",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           "Di&mensione:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Alimentazione:",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         "V&erticale",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "O&rizzontale",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           "&In Alto:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&In basso:",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           "Dove:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commento:",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        "Stampa intervallo",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         "F&ascicola",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
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Stampa"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Stampante",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,21,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           "Dove:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commento:",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,93,272,106,
-                    WS_GROUP
-    CONTROL         "Diagramma c&orrente",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Tutti i &diagrammi da modelli aperti",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "Diagrammi s&elezionati:",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        "Adattamento",IDC_STATIC,8,202,272,51
-    CONTROL         "Regol&a a % della dimensione normale:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,104,12
-    CONTROL         "Ada&tta a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT           "Regol&a a % della dimensione normale:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "larghezza &pagine:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "altezza &pagine:",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        "Stampa intervallo",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Tutto",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pa&gine",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&da:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Copie",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Numero di &copie:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "F&ascicola",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Annulla",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    // Italian (Italy) 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_iw/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint.aps
deleted file mode 100644
index 4fdaa69..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint.rc
deleted file mode 100644
index cb4829d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint.rc
+++ /dev/null
@@ -1,510 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Unknown language: 0xD, 0x1 resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HEB)
-#ifdef _WIN32
-LANGUAGE 0xD, 0x1
-#pragma code_page(1255)
-#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_HEB)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 13, 1\r\n"
-    "#pragma code_page(1255)\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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOGEX 32, 32, 307, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "äãôñä"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "îãôñú",1075,9,4,289,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ùí:",1093,245,21,36,8,0,WS_EX_RIGHT | WS_EX_RTLREADING
-    COMBOBOX        1139,85,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "&úëåðåú...þ",1025,17,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "îöá:",1095,252,36,29,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ñåâ:",1094,253,48,28,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "àéôä:",1097,255,60,26,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "äòøä:",1096,254,72,27,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,85,72,152,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "äãôñä ì&÷åáõ",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,13,70,64,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "èååç äãôñä ùì úøùéîéí",1072,9,93,290,106,BS_RIGHT | 
-                    WS_GROUP,WS_EX_RTLREADING
-    CONTROL         "úøùéí &ðåëçé",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,33,107,253,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ëì äúøùéîéí îäîåãìéí ä&ôúåçéí",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,109,121,177,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "úøù&éîéí ðáçøéí:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,171,135,115,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    LISTBOX         IDC_DIAGRAMS,18,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP,WS_EX_RIGHT | WS_EX_RTLREADING | 
-                    WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "÷ðä îéãä",IDC_STATIC,9,202,290,51,BS_RIGHT,
-                    WS_EX_RTLREADING
-    CONTROL         "äúàîä ì&àçåæ ùì çìåï øâéì:",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,171,218,111,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&äúàîä ìôé:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,232,233,50,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    EDITTEXT        IDC_PERCENT,121,217,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&øåçá áòîåãéí:",1105,161,235,53,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESM,121,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "&âåáä áòîåãéí:",IDC_STATIC,58,235,54,10,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESN,22,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "",IDC_STATIC,26,236,8,8,NOT WS_VISIBLE
-    GROUPBOX        "èååç äãôñä",1074,149,257,149,68,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "ä&ëì",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,174,272,110,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&òîåãéí",1058,"Button",BS_AUTORADIOBUTTON,174,286,110,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    RTEXT           "&îòîåã:",1089,254,304,24,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1152,222,302,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "ò&ã:",1090,189,304,16,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1153,154,302,27,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "òåú÷éí",1073,10,257,132,68,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "îñôø ò&åú÷éí:",1092,64,273,52,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1154,22,271,32,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    CONTROL         "àé&ñåó",1041,"Button",BS_AUTOCHECKBOX | BS_RIGHT | 
-                    WS_GROUP | WS_TABSTOP,13,294,45,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    DEFPUSHBUTTON   "àéùåø",IDOK,61,333,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "áéèåì",IDCANCEL,9,333,48,14,0,WS_EX_RTLREADING
-    ICON            "",1086,66,290,70,25,WS_GROUP
-END
-
-1539 DIALOGEX 32, 32, 288, 178
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "äâãøåú äãôñä"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "îãôñú",1075,8,4,272,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ùí:",1093,236,20,36,8,0,WS_EX_RIGHT | WS_EX_RTLREADING
-    COMBOBOX        1136,84,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "&úëåðåú",1025,16,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "îöá:",1095,236,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ñåâ:",1094,236,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "àéôä:",1097,236,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "äòøä:",1096,236,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,72,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "ðééø",1073,116,92,164,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&âåãì:",1089,236,108,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1137,124,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "î&÷åø:",1090,236,128,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1138,124,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ëéååðéåú",1072,8,92,100,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    ICON            "",1084,75,112,18,20,WS_GROUP
-    CONTROL         "ì&àåøê",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,12,106,52,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ì&øåçá",1057,"Button",BS_AUTORADIOBUTTON,12,126,52,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "àéùåø",IDOK,60,156,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "áéèåì",IDCANCEL,8,156,48,14,0,WS_EX_RTLREADING
-END
-
-1546 DIALOGEX 32, 32, 240, 240
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "äâãøåú òîåã"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "",1080,"Static",SS_WHITERECT | WS_GROUP,80,8,80,80
-    CONTROL         "",1081,"Static",SS_GRAYRECT | WS_GROUP,76,12,4,80
-    CONTROL         "",1082,"Static",SS_GRAYRECT | WS_GROUP,76,88,80,4
-    GROUPBOX        "ðééø",1073,8,96,224,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&âåãì:",1089,188,112,36,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1137,16,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "î&÷åø:",1090,205,132,19,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    COMBOBOX        1138,16,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "ëéååðéåú",1072,168,156,64,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "ì&àåøê",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,172,170,52,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ì&øåçá",1057,"Button",BS_AUTORADIOBUTTON,172,190,52,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "ùåìééí",1075,8,156,152,56,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ùîàìééí:",1102,118,172,34,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1155,86,170,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&éîðééí:",1103,44,172,32,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1157,13,170,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&òìéåðéí:",1104,120,192,32,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1156,86,190,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&úçúåðéí:",1105,44,192,32,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1158,13,190,28,12,WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    DEFPUSHBUTTON   "àéùåø",IDOK,112,220,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "áéèåì",IDCANCEL,60,220,48,14,0,WS_EX_RTLREADING
-    PUSHBUTTON      "&îãôñú...þ",1026,8,220,48,14,0,WS_EX_RTLREADING
-END
-
-1234 DIALOGEX 32, 32, 288, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "äãôñä"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "îãôñú",1075,9,4,272,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ùí:",1093,236,20,36,8,0,WS_EX_RIGHT | WS_EX_RTLREADING
-    COMBOBOX        1139,84,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "&úëåðåú",1025,16,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "îöá:",1095,236,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ñåâ:",1094,236,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,12,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "àéôä:",1097,236,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "äòøä:",1096,236,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,84,71,152,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "äãôñä ì&÷åáõ",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,12,70,64,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "èååç äãôñä",1072,136,92,144,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "ä&ëì",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,211,106,64,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&òîåãéí",1058,"Button",BS_AUTORADIOBUTTON,237,122,39,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&áçéøä",1057,"Button",BS_AUTORADIOBUTTON,211,138,64,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    RTEXT           "&îòîåã:",1089,209,124,24,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1152,181,122,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "ò&ã:",1090,166,124,11,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1153,138,122,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "òåú÷éí",1073,8,92,120,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "îñôø ò&åú÷éí:",1092,73,108,47,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1154,16,106,32,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    ICON            "",1086,50,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "àé&ñåó",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,12,130,36,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "àéùåø",IDOK,60,164,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "áéèåì",IDCANCEL,8,164,48,14,0,WS_EX_RTLREADING
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "äãôñä"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "îãôñú",1075,9,4,272,84,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "&ùí:",1093,237,21,36,8,0,WS_EX_RIGHT | WS_EX_RTLREADING
-    COMBOBOX        1139,85,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP,WS_EX_RIGHT | 
-                    WS_EX_LEFTSCROLLBAR
-    PUSHBUTTON      "&úëåðåú...þ",1025,17,17,60,14,WS_GROUP,WS_EX_RTLREADING
-    LTEXT           "îöá:",1095,237,36,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,36,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "ñåâ:",1094,237,48,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,48,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "àéôä:",1097,237,60,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,13,60,224,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "äòøä:",1096,237,72,36,10,SS_NOPREFIX,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,85,72,152,10,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "äãôñä ì&÷åáõ",1040,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,13,70,64,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    GROUPBOX        "èååç äãôñä ùì úøùéí",1072,9,93,272,106,BS_RIGHT | 
-                    WS_GROUP,WS_EX_RTLREADING
-    CONTROL         "úøùéí &ðåëçé",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,19,107,253,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "ëì äúøùéîéí îäîåãìéí ä&ôúåçéí",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,145,121,129,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    CONTROL         "úøù&éîéí ðáçøéí:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,201,135,73,12,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    LISTBOX         IDC_DIAGRAMS,18,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP,WS_EX_RIGHT | WS_EX_RTLREADING | 
-                    WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "÷ðä îéãä",IDC_STATIC,9,202,272,51,BS_RIGHT,
-                    WS_EX_RTLREADING
-    CONTROL         "äúàîä ì&àçåæ ùì çìåï øâéì:",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,218,111,
-                    12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "äúàîä &ìôé:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,219,234,54,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    LTEXT           "äúàîä ì&àçåæ ùì çìåï øâéì:",1102,161,219,98,8,NOT 
-                    WS_VISIBLE,WS_EX_RIGHT | WS_EX_RTLREADING
-    EDITTEXT        IDC_PERCENT,125,217,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "&øåçá áòîåãéí:",1105,163,236,51,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESM,125,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "&âåáä áòîåãéí:",IDC_STATIC,58,236,54,10,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        IDC_PAGESN,22,233,32,12,ES_NUMBER,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    LTEXT           "",IDC_STATIC,22,235,7,8,NOT WS_VISIBLE,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    GROUPBOX        "èååç äãôñä",1074,149,257,132,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    CONTROL         "ä&ëì",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,226,272,47,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    CONTROL         "&òîåãéí",1058,"Button",BS_AUTORADIOBUTTON,227,286,46,12,
-                    WS_EX_RIGHT | WS_EX_RTLREADING
-    RTEXT           "&îòîåã:",1089,243,302,24,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1152,212,300,26,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    RTEXT           "ò&ã:",1090,196,302,11,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1153,162,300,27,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    GROUPBOX        "òåú÷éí",1073,10,257,132,64,BS_RIGHT | WS_GROUP,
-                    WS_EX_RTLREADING
-    LTEXT           "îñôø ò&åú÷éí:",1092,58,273,68,8,0,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING
-    EDITTEXT        1154,22,271,32,12,ES_NUMBER | WS_GROUP,WS_EX_RIGHT | 
-                    WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR
-    CONTROL         "àé&ñåó",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,19,295,35,12,WS_EX_RIGHT | WS_EX_RTLREADING
-    DEFPUSHBUTTON   "àéùåø",IDOK,61,328,48,14,WS_GROUP,WS_EX_RTLREADING
-    PUSHBUTTON      "áéèåì",IDCANCEL,9,328,48,14,0,WS_EX_RTLREADING
-    ICON            "",1086,63,290,70,25,WS_GROUP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 304
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Unknown language: 0xD, 0x1 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_HEB)
-#ifdef _WIN32
-LANGUAGE 13, 1
-#pragma code_page(1255)
-#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_iw/DiagramPrint_iw.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint_iw.dsp
deleted file mode 100644
index 4727714..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/DiagramPrint_iw.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_iw" - 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_iw - 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_iw.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_iw.mak" CFG="DiagramPrint_iw - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_iw - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_iw - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_iw"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_iw - 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_iw_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\iw\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_iw - 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_iw_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_iw - Win32 Release"
-# Name "DiagramPrint_iw - 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_iw/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_iw/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 d0f9c01..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 782c1c7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint.rc
+++ /dev/null
@@ -1,416 +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", "Licensed Materials -- Property of IBM - (C) Copyright IBM Corporation, 2003,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "ˆóü"
-FONT 9, "MS UI Gothic"
-BEGIN
-    GROUPBOX        "ƒvƒŠƒ“ƒ^[",1075,8,4,272,84,WS_GROUP
-    LTEXT           "–¼‘O(&N):",1093,16,21,36,8
-    COMBOBOX        1139,60,18,139,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ƒvƒƒpƒeƒB[(&P)...",1025,200,17,75,14,WS_GROUP
-    LTEXT           "ó‹µ:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,60,36,211,10
-    LTEXT           "ƒ^ƒCƒv:        ",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,60,48,211,10
-    LTEXT           "êŠ:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,60,60,211,10
-    LTEXT           "ƒRƒƒ“ƒg:",1096,16,72,40,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,60,72,211,10
-    CONTROL         "ƒtƒ@ƒCƒ‹‚֏o—Í(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,261,71,15,12
-    GROUPBOX        "ƒ_ƒCƒAƒOƒ‰ƒ€ˆóü”͈Í",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Œ»Ý‚̃_ƒCƒAƒOƒ‰ƒ€(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "ŠJ‚¢‚Ä‚¢‚郂ƒfƒ‹“à‚Ì‚·‚ׂẴ_ƒCƒAƒOƒ‰ƒ€(&D)",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "‘I‘ð‚³‚ê‚½ƒ_ƒCƒAƒOƒ‰ƒ€(&E):",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        "Šg‘åk¬",IDC_STATIC,8,202,272,51
-    CONTROL         "’ʏíƒTƒCƒY‚ɑ΂·‚é”{—¦(&J):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,98,12
-    CONTROL         "“K—p‚·‚éƒTƒCƒY(&I):",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,68,12
-    EDITTEXT        IDC_PERCENT,140,217,32,12,ES_NUMBER
-    LTEXT           "ƒy[ƒW•(&W):",1105,87,235,47,8
-    EDITTEXT        IDC_PAGESM,140,233,32,12,ES_NUMBER
-    RTEXT           "ƒy[ƒW‚‚³(&T):",IDC_STATIC,178,235,50,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "ˆóü”͈Í",1074,8,257,132,64,WS_GROUP
-    CONTROL         "‚·‚ׂÄ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "ƒy[ƒW(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,
-                    12
-    RTEXT           "ŠJŽn(&F):",1089,17,302,25,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I—¹(&T):",1090,79,302,27,8
-    EDITTEXT        1153,109,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ˆóü",1073,147,257,132,64,WS_GROUP
-    LTEXT           "ˆóü•””(&C):",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "•”’PˆÊ(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,41,12
-    DEFPUSHBUTTON   "OK",IDOK,174,328,50,14,WS_GROUP
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,229,328,50,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 "ˆóüÝ’è"
-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      "ƒvƒƒpƒeƒB[(&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           "ƒ^ƒCƒv:",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           "ƒRƒƒ“ƒg:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "—pŽ†",1073,8,92,164,56,WS_GROUP
-    LTEXT           "ƒTƒCƒY(&Z):",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "ƒ\\\[ƒX(&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         "c•ûŒü(&A)",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",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           "ƒTƒCƒY(&Z):",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "ƒ\\\[ƒX(&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         "c•ûŒü(&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,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "ƒvƒŠƒ“ƒ^[(&P)...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 329, 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,313,84,WS_GROUP
-    LTEXT           "–¼‘O(&N):",1093,16,20,36,8
-    COMBOBOX        1139,56,18,183,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ƒvƒƒpƒeƒB[(&P)",1025,250,17,60,14,WS_GROUP
-    LTEXT           "ó‹µ:",1095,16,36,36,8,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,249,10
-    LTEXT           "ƒ^ƒCƒv:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,48,248,10
-    LTEXT           "êŠ:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,60,248,10
-    LTEXT           "ƒRƒƒ“ƒg:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,185,10
-    CONTROL         "ƒtƒ@ƒCƒ‹‚֏o—Í(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,245,70,64,12
-    GROUPBOX        "ˆóü”͈Í",1072,8,93,171,64,WS_GROUP
-    CONTROL         "‚·‚ׂÄ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "ƒy[ƒW(&G)",1058,"Button",BS_AUTORADIOBUTTON,17,121,38,
-                    12
-    CONTROL         "‘I‘ð(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "ŠJŽn(&F):",1089,59,123,26,8
-    EDITTEXT        1152,91,120,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I—¹(&T):",1090,121,123,25,8
-    EDITTEXT        1153,149,120,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ˆóü",1073,191,92,131,64,WS_GROUP
-    LTEXT           "ˆóü•””(&C):",1092,196,108,68,8
-    EDITTEXT        1154,268,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,194,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "•”’PˆÊ(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,275,129,43,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "ˆóü"
-FONT 9, "MS UI Gothic", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "ƒvƒŠƒ“ƒ^[",1075,8,4,272,84,WS_GROUP
-    LTEXT           "–¼‘O(&N):",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "ƒvƒƒpƒeƒB[(&P)...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "ó‹µ:",1095,16,36,36,8,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "ƒ^ƒCƒv:        ",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           "ƒRƒƒ“ƒg:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "ƒtƒ@ƒCƒ‹‚֏o—Í(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "ƒ_ƒCƒAƒOƒ‰ƒ€ˆóü”͈Í",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Œ»Ý‚̃_ƒCƒAƒOƒ‰ƒ€(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL          "ŠJ‚¢‚Ä‚¢‚郂ƒfƒ‹“à‚Ì‚·‚ׂẴ_ƒCƒAƒOƒ‰ƒ€(&D)",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "‘I‘ð‚³‚ê‚½ƒ_ƒCƒAƒOƒ‰ƒ€(&E):",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        "Šg‘åk¬",IDC_STATIC,7,205,272,51
-    CONTROL         "’ʏíƒTƒCƒY‚ɑ΂·‚é”{—¦(&J):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "“K—p‚·‚éƒTƒCƒY(&I):",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,17,233,61,12
-    LTEXT           "’ʏíƒTƒCƒY‚ɑ΂·‚é”{—¦(&J):",1102,140,219,78,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,222,217,32,12,ES_NUMBER
-    LTEXT           "ƒy[ƒW•(&W):",1105,84,235,36,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "ƒy[ƒW‚‚³(&T):",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        "ˆóü”͈Í",1074,8,257,132,64,WS_GROUP
-    CONTROL         "‚·‚ׂÄ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "ƒy[ƒW(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,
-                    12
-    RTEXT           "ŠJŽn(&F):",1089,20,302,24,8
-    EDITTEXT        1152,47,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "I—¹(&T):",1090,82,302,25,8
-    EDITTEXT        1153,109,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "ˆóü",1073,147,257,132,64,WS_GROUP
-    LTEXT           "ˆóü•””(&C):",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "•”’PˆÊ(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,42,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "ƒLƒƒƒ“ƒZƒ‹",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    // 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/DiagramPrint_ja.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint_ja.plg
deleted file mode 100644
index 6e81ad0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ja/DiagramPrint_ja.plg
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_ja - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x411 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_ja\DiagramPrint.rc"" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\ja\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
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 bc475a8..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 b01d322..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ko/DiagramPrint.rc
+++ /dev/null
@@ -1,425 +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
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 317, 355
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Àμâ"
-FONT 9, "±¼¸²"
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,302,84,WS_GROUP
-    LTEXT           "À̸§(&N):",1093,16,21,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,24,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "À¯Çü:",1094,16,48,26,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "À§Ä¡:",1097,16,60,23,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "ÁÖ¼®:",1096,16,72,26,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,64,12
-    GROUPBOX        "´ÙÀ̾î±×·¥ Àμ⠹üÀ§",1072,8,93,301,106,WS_GROUP
-    CONTROL         "ÇöÀç ´ÙÀ̾î±×·¥(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¿­¸° ¸ðµ¨ÀÇ ¸ðµç ´ÙÀ̾î±×·¥(&D)",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¼±ÅÃµÈ ´ÙÀ̾î±×·¥(&E):",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        "¹èÀ²",IDC_STATIC,8,202,302,51
-    CONTROL         "Á¤»ó Å©±âÀÇ %·Î Á¶Á¤(&J):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,217,104,12
-    CONTROL         "´ÙÀ½À¸·Î Á¶Á¤(&I):",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,234,68,12
-    EDITTEXT        IDC_PERCENT,124,217,32,12,ES_NUMBER
-    RTEXT           "ÆäÀÌÁö ³Êºñ(&W):",1105,86,236,59,8
-    EDITTEXT        IDC_PAGESM,150,234,32,12,ES_NUMBER
-    RTEXT           "ÆäÀÌÁö ±æÀÌ(&T):",IDC_STATIC,193,235,60,10
-    EDITTEXT        IDC_PAGESN,257,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Àμ⠹üÀ§",1074,8,257,142,66,WS_GROUP
-    CONTROL         "¸ðµÎ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,58,12
-    CONTROL         "ÆäÀÌÁö(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,64,
-                    12
-    RTEXT           "½ÃÀÛ(&F):",1089,15,302,41,8
-    EDITTEXT        1152,61,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",1090,93,302,20,8
-    EDITTEXT        1153,117,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Àμâ",1073,157,257,153,66,WS_GROUP
-    RTEXT           "Àμ⠸żö(&C):",1092,183,272,61,8
-    EDITTEXT        1154,255,270,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÇÑ ºÎ¾¿ Àμâ(&O)",1041,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,240,295,65,12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,196,334,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,248,334,48,14
-    ICON            "",1086,165,285,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 "Àμ⠼³Á¤"
-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,48,14
-    PUSHBUTTON      "ÇÁ¸°ÅÍ(&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 "Àμâ"
-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,212,70,64,12
-    GROUPBOX        "Àμ⠹üÀ§",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         "¼±ÅÃ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "½ÃÀÛ(&F):",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",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):",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   "È®ÀÎ",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Àμâ"
-FONT 9, "±¼¸²", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "ÇÁ¸°ÅÍ",1075,8,4,272,84,WS_GROUP
-    LTEXT           "À̸§(&N):",1093,16,21,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,64,12
-    GROUPBOX        "´ÙÀ̾î±×·¥ Àμ⠹üÀ§",1072,8,93,272,106,WS_GROUP
-    CONTROL         "ÇöÀç ´ÙÀ̾î±×·¥(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¿­¸° ¸ðµ¨ÀÇ ¸ðµç ´ÙÀ̾î±×·¥(&D)",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¼±ÅÃµÈ ´ÙÀ̾î±×·¥(&E):",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        "¹èÀ²",IDC_STATIC,8,202,272,51
-    CONTROL         "Á¤»ó Å©±âÀÇ %·Î Á¶Á¤(&J):",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "´ÙÀ½À¸·Î Á¶Á¤(&I):",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "Á¤»ó Å©±âÀÇ %·Î Á¶Á¤(&J):",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "ÆäÀÌÁö ³Êºñ(&W):",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "ÆäÀÌÁö ±æÀÌ(&T):",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        "Àμ⠹üÀ§",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¸ðµÎ(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "ÆäÀÌÁö(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,
-                    12
-    RTEXT           "½ÃÀÛ(&F):",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "³¡(&T):",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Àμâ",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Àμ⠸żö(&C):",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÇÑ ºÎ¾¿ Àμâ(&O)",1041,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "È®ÀÎ",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Ãë¼Ò",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, 289
-        BOTTOMMARGIN, 345
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Korean resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_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_nb/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint.aps
deleted file mode 100644
index 65ff41d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint.rc
deleted file mode 100644
index 0272dd2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint.rc
+++ /dev/null
@@ -1,427 +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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Norwegian (Bokmal) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
-#ifdef _WIN32
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,29,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,36,217,10
-    LTEXT           "Type:",1094,16,48,26,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,48,217,10
-    LTEXT           "Der:",1097,16,60,20,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,60,217,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,156,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,110,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,47,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,131,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,79,235,35,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",IDC_STATIC,188,235,43,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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 "Utskriftsformat"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papir",1073,8,92,164,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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 "Sideoppsett"
-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        "Papir",1073,8,96,224,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,8,156,64,56,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Marger",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Venstre:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Hø&yre:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Topp:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "B&unn:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Skriver...",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 "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Valg",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&fra:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",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         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,104,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",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        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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    // Norwegian (Bokmal) 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_nb/DiagramPrint_nb.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint_nb.dsp
deleted file mode 100644
index 6090c09..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint_nb.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_nb" - 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_nb - 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_nb.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_nb.mak" CFG="DiagramPrint_nb - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_nb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_nb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_nb"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_nb - 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_nb_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\no\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_nb - 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_nb_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_nb - Win32 Release"
-# Name "DiagramPrint_nb - 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_nb/DiagramPrint_nb.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint_nb.plg
deleted file mode 100644
index c80bec4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/DiagramPrint_nb.plg
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_nb - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nb/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_nl/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint.aps
deleted file mode 100644
index ccd8a1a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint.rc
deleted file mode 100644
index 405aa0d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 331, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Afdrukken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,317,84,WS_GROUP
-    LTEXT           "&Naam:",1093,16,21,36,8
-    COMBOBOX        1139,63,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschappen...",1025,218,17,67,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,26,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,63,36,255,10
-    LTEXT           "Type:",1094,16,48,23,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,63,48,255,10
-    LTEXT           "Waar:",1097,16,60,26,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,63,60,255,10
-    LTEXT           "Commentaar:",1096,13,74,43,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,63,72,152,10
-    CONTROL         "Afdru&kken naar bestand",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,223,72,89,12
-    GROUPBOX        "Afdrukbereik diagram",1072,7,93,317,106,WS_GROUP
-    CONTROL         "H&uidig diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,60,12
-    CONTROL         "Alle &diagrammen van open modellen",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,127,12
-    CONTROL         "Gese&lecteerde diagrammen:",IDC_SELECTED_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,135,101,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Schaal",IDC_STATIC,8,202,317,51
-    CONTROL         "Aan&passen aan % van normale grootte:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,137,12
-    CONTROL         "&Aanpassen aan:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,65,12
-    LTEXT           "Aanpassen aan &% van normale grootte:",1102,30,219,123,
-                    8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,157,217,32,12,ES_NUMBER
-    LTEXT           "&Breedte:",1105,90,235,27,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "&Hoogte:",IDC_STATIC,177,235,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Bereik afdrukken",1074,8,257,157,64,WS_GROUP
-    CONTROL         "Alle&s",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,38,12
-    CONTROL         "Pa&gina's",1058,"Button",BS_AUTORADIOBUTTON,16,286,55,
-                    12
-    RTEXT           "&van:",1089,35,302,14,8
-    EDITTEXT        1152,59,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&tot:",1090,94,302,10,8
-    EDITTEXT        1153,111,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Exemplaren",1073,171,257,153,64,WS_GROUP
-    LTEXT           "Aantal e&xemplaren:",1092,187,273,60,8
-    EDITTEXT        1154,259,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orteren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,271,301,40,12
-    DEFPUSHBUTTON   "OK",IDOK,211,330,48,14,WS_GROUP
-    PUSHBUTTON      "Annuleren",IDCANCEL,273,330,48,14
-    ICON            "",1086,182,290,70,25,WS_GROUP
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 329, 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,314,84,WS_GROUP
-    LTEXT           "&Naam:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschappen",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,263,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,263,10
-    LTEXT           "Waar:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,263,10
-    LTEXT           "Commentaar:",1096,16,72,46,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,67,72,249,10
-    GROUPBOX        "Papier",1073,8,92,164,56,WS_GROUP
-    LTEXT           "&Grootte:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Bron:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Afdrukstand",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "&Staand",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "&Liggend",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Annuleren",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 "Pagina-indeling"
-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           "&Grootte:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "B&ron:",1090,16,132,17,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Afdrukstand",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Staand",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "Liggen&d",1057,"Button",BS_AUTORADIOBUTTON,16,190,39,12
-    GROUPBOX        "Marges",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Links:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Re&chts:",1103,164,172,25,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Boven:",1104,88,192,23,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Onder:",1105,164,192,21,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Annuleren",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Printer...",1026,184,220,48,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 331, 186
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Afdrukken"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Printer",1075,7,4,319,84,WS_GROUP
-    LTEXT           "&Naam:",1093,16,20,27,8
-    COMBOBOX        1139,65,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschappen",1025,239,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,66,36,251,10
-    LTEXT           "Type:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,67,48,251,10
-    LTEXT           "Waar:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,67,60,251,10
-    LTEXT           "Commentaar:",1096,16,72,44,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,67,72,152,10
-    CONTROL         "Afdrukken naar &bestand",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,226,70,91,12
-    GROUPBOX        "Bereik afdrukken",1072,8,92,156,64,WS_GROUP
-    CONTROL         "&Alles",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pa&gina's",1058,"Button",BS_AUTORADIOBUTTON,16,122,45,
-                    12
-    CONTROL         "Sele&ctie",1057,"Button",BS_AUTORADIOBUTTON,16,138,39,
-                    12
-    RTEXT           "&van:",1089,61,124,20,8
-    EDITTEXT        1152,83,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&tot:",1090,113,124,16,8
-    EDITTEXT        1153,133,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Exemplaren",1073,171,92,155,64,WS_GROUP
-    LTEXT           "Aantal e&xemplaren:",1092,179,108,60,8
-    EDITTEXT        1154,269,105,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,175,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "&Sorteren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,257,130,45,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Annuleren",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 319, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Afdrukken"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Printer",1075,8,4,306,84,WS_GROUP
-    LTEXT           "&Naam:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Eigenschappen...",1025,212,17,71,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           "Waar:",1097,16,60,36,8,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Commentaar:",1096,16,72,47,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,65,72,143,10
-    CONTROL         "Afdrukken naar &bestand",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,215,70,95,12
-    GROUPBOX        "Afdrukbereik diagram",1072,8,93,306,106,WS_GROUP
-    CONTROL         "H&uidig diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,60,12
-    CONTROL         "Alle diagra&mmen van open modellen",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,123,127,14
-    CONTROL         "Gese&lecteerde diagrammen:",IDC_SELECTED_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,135,101,12
-    LISTBOX         IDC_DIAGRAMS,28,149,243,43,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Schaal",IDC_STATIC,8,202,307,51
-    CONTROL         "Aanpassen aan &% van normale grootte:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,137,12
-    CONTROL         "&Aanpassen aan:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,65,12
-    LTEXT           "Aanpassen aan % van normale &grootte:",1102,30,219,123,
-                    8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,169,215,32,12,ES_NUMBER
-    LTEXT           "Bree&dte:",1105,91,235,27,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "&Hoogte:",IDC_STATIC,177,235,54,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Bereik afdrukken",1074,8,257,132,64,WS_GROUP
-    CONTROL         "Alle&s",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,28,12
-    CONTROL         "&Pagina's",1058,"Button",BS_AUTORADIOBUTTON,16,286,40,
-                    12
-    RTEXT           "&van:",1089,24,302,14,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&tot:",1090,85,302,10,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Exemplaren",1073,149,257,166,64,WS_GROUP
-    LTEXT           "Aantal e&xemplaren:",1092,163,273,60,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orteren",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,44,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Annuleren",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
-        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_nl/DiagramPrint_nl.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint_nl.dsp
deleted file mode 100644
index 7a32f58..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/DiagramPrint_nl.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_nl" - 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_nl - 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_nl.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_nl.mak" CFG="DiagramPrint_nl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_nl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_nl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_nl"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_nl - 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_nl_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\nl\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_nl - 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_nl_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_nl - Win32 Release"
-# Name "DiagramPrint_nl - 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_nl/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nl/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_nn/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint.aps
deleted file mode 100644
index 29b666e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint.rc
deleted file mode 100644
index 29c7b91..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint.rc
+++ /dev/null
@@ -1,427 +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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Norwegian (Bokmal) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
-#ifdef _WIN32
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,24,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,36,211,10
-    LTEXT           "Type:",1094,16,48,20,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,48,211,10
-    LTEXT           "Der:",1097,16,60,20,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,56,60,211,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,156,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,110,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,47,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,131,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,79,235,35,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",IDC_STATIC,188,235,43,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,237,304,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,328,48,14
-    ICON            "",1086,158,292,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 "Utskriftsformat"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papir",1073,8,92,164,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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 "Sideoppsett"
-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        "Papir",1073,8,96,224,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,8,156,64,56,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Marger",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Venstre:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Hø&yre:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Topp:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "B&unn:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Skriver...",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 "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Valg",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&fra:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",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         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,104,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",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        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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    // Norwegian (Bokmal) 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_nn/DiagramPrint_nn.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint_nn.dsp
deleted file mode 100644
index a6d8ae3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint_nn.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_nn" - 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_nn - 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_nn.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_nn.mak" CFG="DiagramPrint_nn - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_nn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_nn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_nn"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_nn - 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_nn_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\no\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_nn - 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_nn_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_nn - Win32 Release"
-# Name "DiagramPrint_nn - 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_nn/DiagramPrint_nn.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint_nn.plg
deleted file mode 100644
index 8a7bea6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/DiagramPrint_nn.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_nn - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_nn\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP171.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP171.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\no\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_nn/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_no/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint.aps
deleted file mode 100644
index 95fc9f5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint.rc
deleted file mode 100644
index 0fef111..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint.rc
+++ /dev/null
@@ -1,427 +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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Norwegian (Bokmal) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)
-#ifdef _WIN32
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,25,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,36,210,10
-    LTEXT           "Type:",1094,16,48,22,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,48,210,10
-    LTEXT           "Der:",1097,16,60,23,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,57,60,210,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,156,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,110,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,47,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,131,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,79,235,35,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",IDC_STATIC,188,235,43,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,232,300,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,328,48,14
-    ICON            "",1086,155,291,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 "Utskriftsformat"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papir",1073,8,92,164,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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 "Sideoppsett"
-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        "Papir",1073,8,96,224,56,WS_GROUP
-    LTEXT           "St&ørrelse:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kilde:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Retning",1072,8,156,64,56,WS_GROUP
-    CONTROL         "S&tående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "L&iggende",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Marger",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Venstre:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Hø&yre:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Topp:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "B&unn:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Skriver...",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 "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Valg",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&fra:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",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         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Skriver",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Navn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Egenskaper...",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           "Der:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv til fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsområde for diagram",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Gj&eldende diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alle &diagrammer fra åpne modeller",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "V&algte diagrammer:",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        "Skalering",IDC_STATIC,8,202,272,51
-    CONTROL         "J&uster til % av normal størrelse:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,104,12
-    CONTROL         "T&ilpass til:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "J&uster til % av normal størrelse:",1102,30,219,88,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "sider b&red:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sider &høy:",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        "Utskriftsområde",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alle",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Si&der",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&fra:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&til:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Eksemplarer",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antall e&ksemplarer:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&orter",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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    // Norwegian (Bokmal) 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_no/DiagramPrint_no.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint_no.dsp
deleted file mode 100644
index b5ce026..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/DiagramPrint_no.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_no" - 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_no - 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_no.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_no.mak" CFG="DiagramPrint_no - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_no - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_no - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_no"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_no - 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_no_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\no\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_no - 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_no_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_no - Win32 Release"
-# Name "DiagramPrint_no - 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_no/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_no/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_pl/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint.aps
deleted file mode 100644
index 64339ae..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint.rc
deleted file mode 100644
index 9590023..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint.rc
+++ /dev/null
@@ -1,426 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Polish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
-#ifdef _WIN32
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 320, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Drukuj"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drukarka",1075,8,4,304,84,WS_GROUP
-    LTEXT           "&Nazwa:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&W³aœciwoœci...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,25,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Typ:",1094,16,48,20,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Gdzie:",1097,16,60,26,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentarz:",1096,16,72,41,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,66,72,152,10
-    CONTROL         "Drukuj &do pliku",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Zakres wydruku diagramu",1072,8,93,303,106,WS_GROUP
-    CONTROL         "&Bie¿¹cy diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Wszystkie &diagramy z otwartych modeli",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "&Wybrane diagramy:",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        "Skalowanie",IDC_STATIC,8,202,302,51
-    CONTROL         "Dopasuj do wartoœci &procentowej normalnej wielkoœci:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,213,192,12
-    CONTROL         "&Dopasuj do:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,58,12
-    EDITTEXT        IDC_PERCENT,217,214,32,12,ES_NUMBER
-    RTEXT           "&szerokoϾ strony:",1105,82,235,60,8
-    EDITTEXT        IDC_PAGESM,152,233,32,12,ES_NUMBER
-    RTEXT           "&wysokoϾ strony:",IDC_STATIC,199,235,62,10
-    EDITTEXT        IDC_PAGESN,265,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Zakres wydruku",1074,8,257,132,68,WS_GROUP
-    CONTROL         "&Wszystko",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,89,12
-    CONTROL         "&Strony",1058,"Button",BS_AUTORADIOBUTTON,16,286,86,12
-    RTEXT           "&od:",1089,21,305,20,8
-    EDITTEXT        1152,45,303,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,80,305,18,8
-    EDITTEXT        1153,102,303,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,147,257,164,68,WS_GROUP
-    LTEXT           "&Liczba kopii:",1092,163,273,53,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Sortuj kopie",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,65,12
-    DEFPUSHBUTTON   "OK",IDOK,211,334,48,14,WS_GROUP
-    PUSHBUTTON      "Anuluj",IDCANCEL,263,334,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 "Konfiguracja drukowania"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drukarka",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nazwa:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&W³aœciwoœci",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Gdzie:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentarz:",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           "&Rozmiar:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&ród³o:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientacja",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "P&ionowo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "P&oziomo",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Anuluj",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 "Ustawienia strony"
-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           "&Rozmiar:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&ród³o:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientacja",1072,8,156,64,56,WS_GROUP
-    CONTROL         "P&ionowo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "P&oziomo",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Marginesy",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Lewy:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Prawy:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Górny:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Dolny:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Anuluj",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Drukarka...",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 "Drukuj"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Drukarka",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nazwa:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&W³aœciwoœci",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Gdzie:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentarz:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Drukuj &do pliku",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Zakres wydruku",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Wszystko",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Strony",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Wybór",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&od:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,160,92,120,64,WS_GROUP
-    LTEXT           "&Liczba kopii:",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         "&Sortuj kopie",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Anuluj",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Drukuj"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Drukarka",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nazwa:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&W³aœciwoœci...",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Gdzie:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Komentarz:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Drukuj &do pliku",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Zakres wydruku diagramu",1072,8,93,272,106,WS_GROUP
-    CONTROL         "&Bie¿¹cy diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Wszystkie &diagramy z otwartych modeli",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "&Wybrane diagramy:",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        "Skalowanie",IDC_STATIC,8,202,272,51
-    CONTROL         "Dopasuj do wartoœci &procentowej normalnej wielkoœci:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,104,12
-    CONTROL         "&Dopasuj do:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT           "Dopasuj do wartoœci &procentowej normalnej wielkoœci:",
-                    1102,30,219,88,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "&szerokoϾ strony:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "&wysokoϾ strony:",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        "Zakres wydruku",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Wszystko",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Strony",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&od:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&do:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopie",1073,147,257,132,64,WS_GROUP
-    LTEXT           "&Liczba kopii:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Sortuj kopie",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Anuluj",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, 289
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Polish resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_pl/DiagramPrint_pl.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint_pl.dsp
deleted file mode 100644
index 92153c8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/DiagramPrint_pl.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_pl" - 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_pl - 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_pl.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_pl.mak" CFG="DiagramPrint_pl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_pl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_pl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_pl"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_pl - 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_pl_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\pl\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_pl - 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_pl_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_pl - Win32 Release"
-# Name "DiagramPrint_pl - 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_pl/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pl/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/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint.aps
deleted file mode 100644
index 8a662c5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint.rc
deleted file mode 100644
index e483898..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint.rc
+++ /dev/null
@@ -1,430 +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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Portuguese (Portugal) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG)
-#ifdef _WIN32
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 315, 354
-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,300,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,21,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           "Estado:",1095,16,36,28,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,16,48,21,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Onde:",1097,16,60,24,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,16,72,40,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,70,72,152,10
-    CONTROL         "Imprimir para fi&cheiro",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Âmbito de impressão do diagrama",1072,8,93,300,106,
-                    WS_GROUP
-    CONTROL         "Diagrama act&ual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Todos os &diagramas de modelos abertos",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Diagramas s&eleccionados:",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        "Escalar",IDC_STATIC,8,202,299,51
-    CONTROL         "A&justar a % do tamanho normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    216,122,12
-    CONTROL         "Ajust&ar a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,48,12
-    EDITTEXT        IDC_PERCENT,146,217,32,12,ES_NUMBER
-    RTEXT           "lar&gura de página:",1105,76,235,63,8
-    EDITTEXT        IDC_PAGESM,146,233,32,12,ES_NUMBER
-    RTEXT           "al&tura de página:",IDC_STATIC,192,235,62,10
-    EDITTEXT        IDC_PAGESN,258,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Intervalo de impressão",1074,8,257,132,70,WS_GROUP
-    CONTROL         "T&udo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,65,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,286,74,12
-    RTEXT           "&de:",1089,21,304,20,8
-    EDITTEXT        1152,45,302,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,85,304,15,8
-    EDITTEXT        1153,104,302,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,147,257,160,70,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,159,273,72,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Agrupa&r",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,52,12
-    DEFPUSHBUTTON   "OK",IDOK,208,335,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,260,335,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 "Configuração da impressã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           "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           "Onde:",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,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papel",1073,8,92,164,56,WS_GROUP
-    LTEXT           "Taman&ho:",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         "Vertica&l",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "Hori&zontal",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 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           "Taman&ho:",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         "Vertica&l",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "Hori&zontal",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Margens",1075,80,156,152,56,WS_GROUP
-    LTEXT           "Es&querda:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "Di&reita:",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           "&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      "Im&pressora...",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           "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           "Onde:",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,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Imprimir para fi&cheiro",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Intervalo de impressão",1072,8,92,144,64,WS_GROUP
-    CONTROL         "T&udo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Selecção",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           "&a:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Número de &cópias:",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         "Agrupa&r",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir \n"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,16,21,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           "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           "Onde:",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,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Imprimir para fi&cheiro",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Âmbito de impressão do diagrama",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "Diagrama act&ual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Todos os &diagramas de modelos abertos",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,253,
-                    12
-    CONTROL         "Diagramas s&eleccionados:",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        "Escalar",IDC_STATIC,8,202,272,51
-    CONTROL         "A&justar a % do tamanho normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,104,12
-    CONTROL         "Ajust&ar a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,34,12
-    LTEXT           "A&justar a % do tamanho normal:",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "lar&gura de página:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "al&tura de página:",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        "Intervalo de impressão",1074,8,257,132,64,WS_GROUP
-    CONTROL         "T&udo",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Pá&ginas",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&de:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Agrupa&r",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",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, 289
-        BOTTOMMARGIN, 349
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Portuguese (Portugal) 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/DiagramPrint_pt.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint_pt.dsp
deleted file mode 100644
index 41323e5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/DiagramPrint_pt.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_pt" - 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 - 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.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.mak" CFG="DiagramPrint_pt - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_pt - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_pt - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_pt"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_pt - 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_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\pt\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_pt - 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_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 - Win32 Release"
-# Name "DiagramPrint_pt - 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/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt/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 60499fa..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 a621d8e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_pt_BR/DiagramPrint.rc
+++ /dev/null
@@ -1,431 +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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Portuguese (Brazil) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTB)
-#ifdef _WIN32
-LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 289, 347
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Impressão"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,14,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "P&ropriedades...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,14,36,27,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,14,48,22,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Onde:",1097,14,60,24,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,13,74,38,8,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,73,138,10
-    CONTROL         "Imprimir no arqui&vo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,203,72,72,12
-    GROUPBOX        "Intervalo de impressão do diagrama",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "Diagrama a&tual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Todos os d&iagramas de modelos abertos",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,140,
-                    12
-    CONTROL         "Diagramas s&elecionados:",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        "Escala",IDC_STATIC,8,202,272,51
-    CONTROL         "A&justar a % do tamanho normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,114,12
-    CONTROL         "Aju&star a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,43,12
-    LTEXT           "A&justar a % do tamanho normal:",1102,27,220,101,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,134,217,32,12,ES_NUMBER
-    LTEXT           "&largura das páginas:",1105,65,235,66,8
-    EDITTEXT        IDC_PAGESM,134,233,32,12,ES_NUMBER
-    RTEXT           "alt&ura das páginas:",IDC_STATIC,167,235,66,8
-    EDITTEXT        IDC_PAGESN,236,234,35,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,263,235,7,9,NOT WS_VISIBLE
-    GROUPBOX        "Intervalo de impressão",1074,8,257,132,64,WS_GROUP
-    CONTROL         "T&odos",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,33,12
-    CONTROL         "&Páginas",1058,"Button",BS_AUTORADIOBUTTON,16,286,39,12
-    RTEXT           "&de:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "A&grupar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,223,303,48,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,328,48,14
-    ICON            "",1086,152,297,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 "Configuração de Impressão"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,13,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "P&ropriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,13,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tipo:",1094,13,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Onde:",1097,13,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Comentário:",1096,13,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,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         "&Retrato",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,37,12
-    CONTROL         "P&aisagem",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Margens",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Esquerda:",1102,85,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Direita:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Superior:",1104,85,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "I&nferior:",1105,164,192,23,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 "Impressão"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,13,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "P&ropriedades",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,13,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,36,221,10
-    LTEXT           "Tipo:",1094,13,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,48,221,10
-    LTEXT           "Onde:",1097,13,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,60,221,10
-    LTEXT           "Comentário:",1096,13,72,38,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,53,72,136,10
-    CONTROL         "Imprimir no arqui&vo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,200,70,74,12
-    GROUPBOX        "Intervalo de impressão",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Todos",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Páginas",1058,"Button",BS_AUTORADIOBUTTON,15,122,39,12
-    CONTROL         "&Seleção",1057,"Button",BS_AUTORADIOBUTTON,16,138,43,12
-    RTEXT           "&de:",1089,72,124,11,8
-    EDITTEXT        1152,86,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,113,124,8,8
-    EDITTEXT        1153,123,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Número de &cópias:",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         "A&grupar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,39,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Impressão"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Impressora",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Nome:",1093,14,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "P&ropriedades...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,14,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,36,221,10
-    LTEXT           "Tipo:",1094,14,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,48,221,10
-    LTEXT           "Onde:",1097,14,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,60,221,10
-    LTEXT           "Comentário:",1096,14,72,39,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,72,140,10
-    CONTROL         "Imprimir no arqui&vo",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,201,70,73,12
-    GROUPBOX        "Intervalo de impressão do diagrama",1072,8,93,272,106,
-                    WS_GROUP
-    CONTROL         "Diagrama a&tual",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,61,12
-    CONTROL         "Todos os d&iagramas de modelos abertos",
-                    IDC_ALL_DIAGRAMS,"Button",BS_AUTORADIOBUTTON,16,121,140,
-                    12
-    CONTROL         "Diagramas s&elecionados:",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        "Escala",IDC_STATIC,8,202,272,51
-    CONTROL         "A&justar a % do tamanho normal:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,114,12
-    CONTROL         "Aju&star a:",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,43,12
-    LTEXT           "A&justar a % do tamanho normal:",1102,28,220,101,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,131,217,32,12,ES_NUMBER
-    LTEXT           "&largura das páginas:",1105,65,235,64,8
-    EDITTEXT        IDC_PAGESM,132,233,32,12,ES_NUMBER
-    RTEXT           "alt&ura das páginas:",IDC_STATIC,171,235,59,8
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,7,8,NOT WS_VISIBLE
-    GROUPBOX        "Intervalo de impressão",1074,8,257,132,64,WS_GROUP
-    CONTROL         "T&odos",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,33,12
-    CONTROL         "&Páginas",1058,"Button",BS_AUTORADIOBUTTON,16,286,39,12
-    RTEXT           "&de:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&a:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Cópias",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Número de &cópias:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "A&grupar",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,40,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",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    // Portuguese (Brazil) 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_ru/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint.aps
deleted file mode 100644
index 2e5e403..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint.rc
deleted file mode 100644
index 67162f4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint.rc
+++ /dev/null
@@ -1,428 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 313, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Ïå÷àòü"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Ïðèíòåð",1075,8,4,295,84,WS_GROUP
-    LTEXT           "&Èìÿ:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ñâîéñòâà...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Ñîñòîÿíèå:",1095,16,36,49,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,74,36,216,10
-    LTEXT           "Òèï:",1094,16,48,49,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,74,48,216,10
-    LTEXT           "Ãäå:",1097,16,60,49,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,74,60,215,10
-    LTEXT           "Êîììåíòàðèé:",1096,16,75,49,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,74,74,146,10
-    CONTROL         "Ïå÷àòü â &ôàéë",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,230,73,69,12
-    GROUPBOX        "Äèàïàçîí ïå÷àòè äèàãðàìì",1072,8,93,296,106,WS_GROUP
-    CONTROL         "Ò&åêóùàÿ äèàãðàììà",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,17,104,253,12
-    CONTROL         "Âñå &äèàãðàììû îòêðûòûõ ìîäåëåé",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,17,119,253,12
-    CONTROL         "Â&ûáðàííûå äèàãðàììû:",IDC_SELECTED_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,17,135,253,12
-    LISTBOX         IDC_DIAGRAMS,28,153,243,39,LBS_MULTIPLESEL | 
-                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | 
-                    WS_TABSTOP
-    GROUPBOX        "Ìàñøòàá",IDC_STATIC,8,202,296,51
-    CONTROL         "Çà&äàòü â % îò îáû÷íîãî ðàçìåðà:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    217,130,12
-    CONTROL         "Ï&îäîãíàòü ê:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,62,12
-    EDITTEXT        IDC_PERCENT,156,218,32,12,ES_NUMBER
-    LTEXT           "ñòð. â &øèðèíó:",1105,93,235,58,8
-    EDITTEXT        IDC_PAGESM,156,233,32,12,ES_NUMBER
-    RTEXT           "ñòð. â âûñî&òó:",IDC_STATIC,194,235,58,10
-    EDITTEXT        IDC_PAGESN,258,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Äèàïàçîí ïå÷àòè",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Âñå",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,73,12
-    CONTROL         "Ñòðà&íèöû",1058,"Button",BS_AUTORADIOBUTTON,16,286,81,
-                    12
-    RTEXT           "&îò:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&äî:",1090,80,302,16,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Êîïèè",1073,147,257,157,64,WS_GROUP
-    LTEXT           "×èñëî &êîïèé:",1092,159,271,54,12
-    EDITTEXT        1154,225,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ñ&îðòèðîâàòü",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,230,298,70,12
-    DEFPUSHBUTTON   "OK",IDOK,205,329,48,14,WS_GROUP
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,257,329,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 "Íàñòðîéêà ïðèíòåðà"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Ïðèíòåð",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Èìÿ:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ñâîéñòâà",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           "Ðà&çìåð:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Èñòî÷íèê:",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         "Ê&íèæíàÿ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "À&ëüáîìíàÿ",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",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 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        "Áóìàãà",1073,8,96,224,56,WS_GROUP
-    LTEXT           "Ðà&çìåð:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Èñòî÷íèê:",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         "Ê&íèæíàÿ",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "À&ëüáîìíàÿ",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Ïîëÿ",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Ñëåâà:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Ñïðàâà:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Ñâåðõó:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "Ñ&íèçó:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Ïðèíòåð...",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 "Ïå÷àòü"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Ïðèíòåð",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Èìÿ:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ñâîéñòâà",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         "Ïå÷àòü â &ôàéë",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Äèàïàçîí ïå÷àòè",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Âñå",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Ñòðà&íèöû",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,
-                    12
-    CONTROL         "&Âûáîð",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&îò:",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        "Êîïèè",1073,160,92,120,64,WS_GROUP
-    LTEXT           "×èñëî &êîïèé:",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         "Ñ&îðòèðîâàòü",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOG DISCARDABLE  32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Ïå÷àòü"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Ïðèíòåð",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Èìÿ:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ñâîéñòâà...",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         "Ïå÷àòü â &ôàéë",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Äèàïàçîí ïå÷àòè äèàãðàìì",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Ò&åêóùàÿ äèàãðàììà",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Âñå &äèàãðàììû îòêðûòûõ ìîäåëåé",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "Â&ûáðàííûå äèàãðàììû:",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        "Ìàñøòàá",IDC_STATIC,8,202,272,51
-    CONTROL         "Çà&äàòü â % îò îáû÷íîãî ðàçìåðà:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,104,12
-    CONTROL         "Ï&îäîãíàòü ê:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "Çà&äàòü â % îò îáû÷íîãî ðàçìåðà:",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "ñòð. â &øèðèíó:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "ñòð. â âûñî&òó:",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        "Äèàïàçîí ïå÷àòè",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Âñå",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Ñòðà&íèöû",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,
-                    12
-    RTEXT           "&îò:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&äî:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Êîïèè",1073,147,257,132,64,WS_GROUP
-    LTEXT           "×èñëî &êîïèé:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "Ñ&îðòèðîâàòü",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,290,20,20,WS_GROUP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    1538, DIALOG
-    BEGIN
-        RIGHTMARGIN, 310
-        BOTTOMMARGIN, 349
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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_ru/DiagramPrint_ru.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint_ru.dsp
deleted file mode 100644
index aabce4e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/DiagramPrint_ru.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_ru" - 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_ru - 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_ru.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_ru.mak" CFG="DiagramPrint_ru - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_ru - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_ru - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_ru"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_ru - 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_ru_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\ru\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_ru - 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_ru_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_ru - Win32 Release"
-# Name "DiagramPrint_ru - 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_ru/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_ru/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_sv/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint.aps
deleted file mode 100644
index 5dd28d2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint.rc
deleted file mode 100644
index 6a286bc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint.rc
+++ /dev/null
@@ -1,425 +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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Swedish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
-#ifdef _WIN32
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 315, 359
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skrivare",1075,8,4,300,84,WS_GROUP
-    LTEXT           "&Namn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Egenska&per...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Status:",1095,16,36,28,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Typ:",1094,16,48,20,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Var:",1097,16,60,19,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,41,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,67,72,152,10
-    CONTROL         "Skriv ut till fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagramutskriftsintervall",1072,8,93,298,106,WS_GROUP
-    CONTROL         "Akt&uellt diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alla &diagram i öppna modeller",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "&Valda diagram:",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        "Skala",IDC_STATIC,8,202,298,51
-    CONTROL         "&Justera till % av normal storlek:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,
-                    216,113,12
-    CONTROL         "Anpassa t&ill:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,15,233,56,12
-    EDITTEXT        IDC_PERCENT,135,217,32,12,ES_NUMBER
-    RTEXT           "sidor &bred:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sidor &hög:",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,237,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Utskriftsintervall",1074,8,257,140,68,WS_GROUP
-    CONTROL         "&Alla",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,75,12
-    CONTROL         "&Sidor",1058,"Button",BS_AUTORADIOBUTTON,16,286,71,12
-    RTEXT           "&från:",1089,23,303,22,8
-    EDITTEXT        1152,53,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&till:",1090,90,302,17,8
-    EDITTEXT        1153,111,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopior",1073,154,257,152,69,WS_GROUP
-    RTEXT           "Antal &kopior:",1092,168,273,51,8
-    EDITTEXT        1154,242,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortera",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,242,295,57,12
-    DEFPUSHBUTTON   "OK",IDOK,206,335,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,258,335,48,14
-    ICON            "",1086,163,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 "Utskriftsinställningar"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skrivare",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Namn:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Egenska&per:",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Var:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Papper",1073,8,92,164,56,WS_GROUP
-    LTEXT           "S&torlek:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Källa:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientering",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "St&ående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "L&iggande",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,
-                    12
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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 "Utskriftsformat"
-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        "Papper",1073,8,96,224,56,WS_GROUP
-    LTEXT           "S&torlek:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Källa:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Orientering",1072,8,156,64,56,WS_GROUP
-    CONTROL         "St&ående",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "L&iggande",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,
-                    12
-    GROUPBOX        "Marginaler",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Vänster:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "&Höger:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "&Överkant:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "&Underkant:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "OK",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "&Skrivare...",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 "Skriv ut"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Skrivare",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Namn:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Egenska&per:",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Var:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv ut till fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Utskriftsintervall",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Alla",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "&Sidor",1058,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Urval",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "&från:",1089,52,124,20,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&till:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopior",1073,160,92,120,64,WS_GROUP
-    LTEXT           "Antal &kopior:",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         "S&ortera",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Skrivare",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Namn:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Egenska&per...",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           "Typ:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Var:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Kommentar:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "Skriv ut till fi&l",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Diagramutskriftsintervall",1072,8,93,272,106,WS_GROUP
-    CONTROL         "Akt&uellt diagram",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Alla &diagram i öppna modeller",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "&Valda diagram:",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        "Skala",IDC_STATIC,8,202,272,51
-    CONTROL         "&Justera till % av normal storlek:",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,109,12
-    CONTROL         "Anpassa t&ill:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,34,12
-    LTEXT           "&Justera till % av normal storlek:",1102,30,219,95,8,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "sidor &bred:",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "sidor &hög:",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        "Utskriftsintervall",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Alla",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "&Sidor",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "&från:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "&till:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopior",1073,147,257,132,64,WS_GROUP
-    LTEXT           "Antal &kopior:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "S&ortera",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,36,12
-    DEFPUSHBUTTON   "OK",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",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, 312
-        BOTTOMMARGIN, 347
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Swedish 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_sv/DiagramPrint_sv.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint_sv.dsp
deleted file mode 100644
index 016a750..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/DiagramPrint_sv.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_sv" - 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_sv - 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_sv.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_sv.mak" CFG="DiagramPrint_sv - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_sv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_sv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_sv"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_sv - 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_sv_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\sv\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_sv - 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_sv_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_sv - Win32 Release"
-# Name "DiagramPrint_sv - 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_sv/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_sv/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_tr/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint.aps
deleted file mode 100644
index 2ec02dd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint.rc
deleted file mode 100644
index f5a7f73..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint.rc
+++ /dev/null
@@ -1,426 +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_TRK)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1254)\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
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Turkish resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK)
-#ifdef _WIN32
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-#pragma code_page(1254)
-#endif //_WIN32
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-1538 DIALOG DISCARDABLE  32, 32, 318, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Yazdýr"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Yazýcý",1075,8,4,302,84,WS_GROUP
-    LTEXT           "&Ad:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Ö&zellikler...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Durum:",1095,16,36,26,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tip:",1094,16,48,16,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Yer:",1097,16,60,21,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Açýklama:",1096,16,72,35,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,61,72,152,10
-    CONTROL         "&Dosyaya yazdýr",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Çizge yazdýrma aralýðý",1072,8,93,302,106,WS_GROUP
-    CONTROL         "&Yürürlükteki çizge",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Açýk &modellerdeki tüm çizgeler",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "S&eçilen çizgeler:",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        "Ölçekleme",IDC_STATIC,8,202,301,51
-    CONTROL         "O&laðan büyüklüðün bu yüzdesine ayarla:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,11,215,146,12
-    CONTROL         "&Boyutlandýrma temeli:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,11,233,93,12
-    EDITTEXT        IDC_PERCENT,172,216,32,12,ES_NUMBER
-    RTEXT           "gnþlk syf sys:",1105,109,235,55,8
-    EDITTEXT        IDC_PAGESM,170,233,32,12,ES_NUMBER
-    RTEXT           "yksklk syf sys:",IDC_STATIC,215,235,45,10
-    EDITTEXT        IDC_PAGESN,265,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "Yazdýrma aralýðý",1074,8,257,132,68,WS_GROUP
-    CONTROL         "&Tümü",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,79,12
-    CONTROL         "Bu say&fa aralýðý",1058,"Button",BS_AUTORADIOBUTTON,16,
-                    286,101,12
-    RTEXT           "ilk:",1089,22,307,20,8
-    EDITTEXT        1152,46,305,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "son:",1090,80,307,20,8
-    EDITTEXT        1153,104,305,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopyalar",1073,147,257,161,68,WS_GROUP
-    LTEXT           "&Kopya sayýsý:",1092,163,273,59,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Harmanla",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,234,295,63,12
-    DEFPUSHBUTTON   "Tamam",IDOK,210,331,48,14,WS_GROUP
-    PUSHBUTTON      "Ýptal",IDCANCEL,262,331,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 "Yazdýrma Ayarý"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Yazýcý",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Ad:",1093,16,20,36,8
-    COMBOBOX        1136,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Ö&zellikler",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Durum:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tip:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Yer:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Açýklama:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,224,10
-    GROUPBOX        "Kaðýt",1073,8,92,164,56,WS_GROUP
-    LTEXT           "&Boyut:",1089,16,108,36,8
-    COMBOBOX        1137,52,106,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kaynak:",1090,16,128,36,8
-    COMBOBOX        1138,52,126,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Yön",1072,180,92,100,56,WS_GROUP
-    ICON            "",1084,195,112,18,20,WS_GROUP
-    CONTROL         "&Düþey",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,224,106,52,12
-    CONTROL         "&Yatay",1057,"Button",BS_AUTORADIOBUTTON,224,126,52,12
-    DEFPUSHBUTTON   "Tamam",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Ýptal",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 "Sayfa Ayarý"
-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        "Kaðýt",1073,8,96,224,56,WS_GROUP
-    LTEXT           "&Boyut:",1089,16,112,36,8
-    COMBOBOX        1137,64,110,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Kaynak:",1090,16,132,36,8
-    COMBOBOX        1138,64,130,160,160,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Yön",1072,8,156,64,56,WS_GROUP
-    CONTROL         "&Düþey",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,170,52,12
-    CONTROL         "&Yatay",1057,"Button",BS_AUTORADIOBUTTON,16,190,52,12
-    GROUPBOX        "Kenar Boþluklarý",1075,80,156,152,56,WS_GROUP
-    LTEXT           "&Sol:",1102,88,172,32,8
-    EDITTEXT        1155,120,170,28,12,WS_GROUP
-    LTEXT           "S&að:",1103,164,172,32,8
-    EDITTEXT        1157,196,170,28,12,WS_GROUP
-    LTEXT           "Üs&t:",1104,88,192,32,8
-    EDITTEXT        1156,120,190,28,12,WS_GROUP
-    LTEXT           "A&lt:",1105,164,192,32,8
-    EDITTEXT        1158,196,190,28,12,WS_GROUP
-    DEFPUSHBUTTON   "Tamam",IDOK,80,220,48,14,WS_GROUP
-    PUSHBUTTON      "Ýptal",IDCANCEL,132,220,48,14
-    PUSHBUTTON      "Yazý&cý...",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 "Yazdýr"
-FONT 8, "MS Sans Serif"
-BEGIN
-    GROUPBOX        "Yazýcý",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Ad:",1093,16,20,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Ö&zellikler",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Durum:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tip:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Yer:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Açýklama:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "&Dosyaya yazdýr",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Yazdýrma aralýðý",1072,8,92,144,64,WS_GROUP
-    CONTROL         "&Tümü",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Say&falar:",1058,"Button",BS_AUTORADIOBUTTON,16,122,41,
-                    12
-    CONTROL         "&Seçim",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "ilk:",1089,60,124,11,8
-    EDITTEXT        1152,74,122,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "son:",1090,100,124,16,8
-    EDITTEXT        1153,118,122,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopyalar",1073,160,92,120,64,WS_GROUP
-    LTEXT           "&Kopya sayýsý:",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         "&Harmanla",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,240,130,44,12
-    DEFPUSHBUTTON   "Tamam",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "Ýptal",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "Yazdýr"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "Yazýcý",1075,8,4,272,84,WS_GROUP
-    LTEXT           "&Ad:",1093,16,21,36,8
-    COMBOBOX        1139,52,18,152,152,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Ö&zellikler...",1025,212,17,60,14,WS_GROUP
-    LTEXT           "Durum:",1095,16,36,36,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,36,224,10
-    LTEXT           "Tip:",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,224,10
-    LTEXT           "Yer:",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,224,10
-    LTEXT           "Açýklama:",1096,16,72,36,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,72,152,10
-    CONTROL         "&Dosyaya yazdýr",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,212,70,64,12
-    GROUPBOX        "Çizge yazdýrma aralýðý",1072,8,93,272,106,WS_GROUP
-    CONTROL         "&Yürürlükteki çizge",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "Açýk &modellerdeki tüm çizgeler",IDC_ALL_DIAGRAMS,
-                    "Button",BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "S&eçilen çizgeler:",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        "Ölçekleme",IDC_STATIC,8,202,272,51
-    CONTROL         "&Olaðan büyüklüðün bu yüzdesine ayarla:",
-                    IDC_SCALE_PERCENT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,218,154,12
-    CONTROL         "&Boyutlandýrma temeli:",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,10,233,79,12
-    LTEXT           "O&laðan büyüklüðün bu yüzdesine ayarla:",1102,29,219,
-                    138,8,NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,199,217,32,12,ES_NUMBER
-    LTEXT           "gnþlk syf sys:",1105,94,235,43,8
-    EDITTEXT        IDC_PAGESM,141,233,32,12,ES_NUMBER
-    RTEXT           "yksklk syf sys:",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        "Yazdýrma aralýðý",1074,8,257,132,64,WS_GROUP
-    CONTROL         "&Tümü",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Bu say&fa aralýðý",1058,"Button",BS_AUTORADIOBUTTON,16,
-                    286,76,12
-    RTEXT           "ilk:",1089,24,302,20,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "son:",1090,76,302,20,8
-    EDITTEXT        1153,100,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "Kopyalar",1073,147,257,132,64,WS_GROUP
-    LTEXT           "&Kopya sayýsý:",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "&Harmanla",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,47,12
-    DEFPUSHBUTTON   "Tamam",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "Ýptal",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, 289
-        BOTTOMMARGIN, 342
-    END
-
-    1547, DIALOG
-    BEGIN
-        RIGHTMARGIN, 286
-        BOTTOMMARGIN, 342
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Turkish 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_TRK)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1254)
-#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_tr/DiagramPrint_tr.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint_tr.dsp
deleted file mode 100644
index 54815db..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/DiagramPrint_tr.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_tr" - 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_tr - 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_tr.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_tr.mak" CFG="DiagramPrint_tr - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_tr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_tr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_tr"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_tr - 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_tr_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\tr\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_tr - 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_tr_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_tr - Win32 Release"
-# Name "DiagramPrint_tr - 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_tr/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_tr/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/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint.aps
deleted file mode 100644
index 1d0730a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint.rc
deleted file mode 100644
index 3b8c236..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/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
-
-/////////////////////////////////////////////////////////////////////////////
-// 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
-
-#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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,21,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,209,73,64,12
-    GROUPBOX        "ͼ´òÓ¡·¶Î§",1072,7,93,272,106,WS_GROUP
-    CONTROL         "µ±Ç°Í¼(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "ÒÑ´ò¿ªÄ£ÐÍÖеÄËùÓÐͼ(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,108,12
-    CONTROL         "Ëùѡͼ(&E)£º",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        "Ëõ·Å",IDC_STATIC,8,202,272,51
-    CONTROL         "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,135,12
-    CONTROL         "ÊʺÏÒ³Ãæ(&I)£º",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,60,12
-    LTEXT           "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",1102,30,219,127,11,
-                    NOT WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,164,217,32,12,ES_NUMBER
-    LTEXT           "Ò³Ãæ¿í¶È(&W)£º",1105,78,235,53,8
-    EDITTEXT        IDC_PAGESM,134,233,32,12,ES_NUMBER
-    RTEXT           "Ò³Ãæ¸ß¶È(&T)£º",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "´òÓ¡·¶Î§",1074,8,257,132,64,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,
-                    62,12
-    RTEXT           "´Ó(&F)£º",1089,15,302,30,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,79,302,30,8
-    EDITTEXT        1153,110,300,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,147,257,132,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÕûÀí(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,230,295,44,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,291,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 "´òÓ¡ÉèÖÃ"
-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,48,14
-    PUSHBUTTON      "´òÓ¡»ú(&P)...",1026,184,220,52,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 298, 188
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,279,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,211,72,67,13
-    GROUPBOX        "´òÓ¡·¶Î§",1072,8,91,153,63,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,122,
-                    56,12
-    CONTROL         "Ñ¡Ôñ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    RTEXT           "´Ó(&F)£º",1089,75,123,29,8
-    EDITTEXT        1152,104,121,12,13,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,118,124,28,8
-    EDITTEXT        1153,147,121,12,13,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,164,92,129,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",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,41,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,21,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,64,12
-    GROUPBOX        "ͼ´òÓ¡·¶Î§",1072,8,93,272,106,WS_GROUP
-    CONTROL         "µ±Ç°Í¼(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "ÒÑ´ò¿ªÄ£ÐÍÖеÄËùÓÐͼ(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,108,12
-    CONTROL         "Ëùѡͼ(&E)£º",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        "Ëõ·Å",IDC_STATIC,7,201,272,51
-    CONTROL         "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",IDC_SCALE_PERCENT,
-                    "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,
-                    218,131,12
-    CONTROL         "ÊʺÏÒ³Ãæ(&I)£º",IDC_SCALE_FIT,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,16,233,61,12
-    LTEXT           "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",1102,30,219,125,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,163,217,32,12,ES_NUMBER
-    LTEXT           "Ò³Ãæ¿í¶È(&W)£º",1105,78,235,52,8
-    EDITTEXT        IDC_PAGESM,130,233,32,12,ES_NUMBER
-    RTEXT           "Ò³Ãæ¸ß¶È(&T)£º",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        "´òÓ¡·¶Î§",1074,8,257,132,64,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,
-                    77,12
-    RTEXT           "´Ó(&F)£º",1089,17,302,29,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,76,302,29,8
-    EDITTEXT        1153,106,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,147,257,132,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÕûÀí(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,40,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",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
-
-
-#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_CHS)\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
-
-#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_CHS)
-#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/DiagramPrint_zh.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint_zh.dsp
deleted file mode 100644
index fa46fc1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/DiagramPrint_zh.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_zh" - 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 - 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.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.mak" CFG="DiagramPrint_zh - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_zh - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_zh - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_zh"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_zh - 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_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\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_zh - 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_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 - Win32 Release"
-# Name "DiagramPrint_zh - 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/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh/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 482db04..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 65731a0..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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,21,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,209,73,64,12
-    GROUPBOX        "ͼ´òÓ¡·¶Î§",1072,7,93,272,106,WS_GROUP
-    CONTROL         "µ±Ç°Í¼(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "ÒÑ´ò¿ªÄ£ÐÍÖеÄËùÓÐͼ(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,108,12
-    CONTROL         "Ëùѡͼ(&E)£º",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        "Ëõ·Å",IDC_STATIC,8,202,272,51
-    CONTROL         "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,135,12
-    CONTROL         "ÊʺÏÒ³Ãæ(&I)£º",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,60,12
-    LTEXT           "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",1102,30,219,127,11,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,164,217,32,12,ES_NUMBER
-    LTEXT           "Ò³Ãæ¿í¶È(&W)£º",1105,78,235,53,8
-    EDITTEXT        IDC_PAGESM,134,233,32,12,ES_NUMBER
-    RTEXT           "Ò³Ãæ¸ß¶È(&T)£º",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "´òÓ¡·¶Î§",1074,8,257,132,64,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,62,12
-    RTEXT           "´Ó(&F)£º",1089,15,302,30,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,79,302,30,8
-    EDITTEXT        1153,110,300,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,147,257,132,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÕûÀí(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,39,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",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 "´òÓ¡ÉèÖÃ"
-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,48,14
-    PUSHBUTTON      "´òÓ¡»ú(&P)...",1026,184,220,52,14
-END
-
-1234 DIALOG DISCARDABLE  32, 32, 298, 188
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå"
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,279,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,211,72,67,13
-    GROUPBOX        "´òÓ¡·¶Î§",1072,8,91,153,63,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,106,64,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,122,56,12
-    CONTROL         "Ñ¡Ôñ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,138,64,
-                    12
-    RTEXT           "´Ó(&F)£º",1089,75,123,29,8
-    EDITTEXT        1152,104,121,12,13,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,118,124,28,8
-    EDITTEXT        1153,147,121,12,13,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,164,92,129,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",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,41,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,164,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",IDCANCEL,232,164,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "´òÓ¡"
-FONT 9, "ËÎÌå", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "´òÓ¡»ú",1075,8,4,272,84,WS_GROUP
-    LTEXT           "Ãû³Æ(&N)£º",1093,16,21,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,64,12
-    GROUPBOX        "ͼ´òÓ¡·¶Î§",1072,8,93,272,106,WS_GROUP
-    CONTROL         "µ±Ç°Í¼(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "ÒÑ´ò¿ªÄ£ÐÍÖеÄËùÓÐͼ(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,108,12
-    CONTROL         "Ëùѡͼ(&E)£º",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        "Ëõ·Å",IDC_STATIC,7,201,272,51
-    CONTROL         "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,131,12
-    CONTROL         "ÊʺÏÒ³Ãæ(&I)£º",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,61,12
-    LTEXT           "µ÷ÕûΪÕý³£´óСµÄij¸ö°Ù·Ö±È(&J)£º",1102,30,219,125,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,163,217,32,12,ES_NUMBER
-    LTEXT           "Ò³Ãæ¿í¶È(&W)£º",1105,78,235,52,8
-    EDITTEXT        IDC_PAGESM,130,233,32,12,ES_NUMBER
-    RTEXT           "Ò³Ãæ¸ß¶È(&T)£º",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        "´òÓ¡·¶Î§",1074,8,257,132,64,WS_GROUP
-    CONTROL         "È«²¿(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "Ò³Â뷶Χ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,77,12
-    RTEXT           "´Ó(&F)£º",1089,17,302,29,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "µ½(&T)£º",1090,76,302,29,8
-    EDITTEXT        1153,106,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¸±±¾",1073,147,257,132,64,WS_GROUP
-    LTEXT           "·ÝÊý(&C)£º",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "ÕûÀí(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,235,295,40,12
-    DEFPUSHBUTTON   "È·¶¨",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "È¡Ïû",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, 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/DiagramPrint_zh_CN.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint_zh_CN.plg
deleted file mode 100644
index 8a1353f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_CN/DiagramPrint_zh_CN.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_zh_CN - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x804 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_zh_CN\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP14B.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP14B.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\zh_CN\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
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_HK/DiagramPrint.aps b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint.aps
deleted file mode 100644
index de0fdf8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint.aps
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint.rc b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint.rc
deleted file mode 100644
index 118681c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint.rc
+++ /dev/null
@@ -1,412 +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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "¦C¦L"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,21,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,26,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,36,217,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,31,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,48,218,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,28,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,60,217,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,29,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,72,152,10
-    CONTROL         "¦C¦L¨ìÀÉ®×(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,229,70,41,12
-    GROUPBOX        "¹Ï«¬¦C¦L½d³ò",1072,8,93,272,106,WS_GROUP
-    CONTROL         "²{¦æ¹Ï«¬(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¶}±Ò¼Ò«¬¤¤ªº©Ò¦³¹Ï«¬(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¿ï¨úªº¹Ï«¬(&E)¡G",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        "½Õ¾ã¤j¤p",IDC_STATIC,8,202,272,51
-    CONTROL         "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "½Õ¾ã¬°(&I)¡G",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,56,12
-    LTEXT           "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",1102,28,219,91,10,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "­¶¼e(&W)¡G",1105,75,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "­¶°ª(&T)¡G",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "¦C¦L½d³ò",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "­¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "±q(&F):",1089,13,302,32,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,76,302,27,8
-    EDITTEXT        1153,107,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,147,257,132,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,227,300,48,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,295,70,25,WS_GROUP
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 183
-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,35,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,34,33,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,33,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,7,93,167,56,WS_GROUP
-    LTEXT           "¤j¤p(&Z)¡G",1089,9,109,36,8
-    COMBOBOX        1137,57,105,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "­ì©lÀÉ(&S)¡G",1090,10,129,45,8
-    COMBOBOX        1138,57,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           "­ì©lÀÉ(&S)¡G",1090,16,132,45,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, 307, 203
-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,291,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,235,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,235,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,235,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,75,12
-    GROUPBOX        "¦C¦L½d³ò",1072,8,93,155,77,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         "¿ï¶µ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,150,64,12
-    RTEXT           "±q(&F)¡G",1089,29,137,31,8
-    EDITTEXT        1152,65,134,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,93,137,35,8
-    EDITTEXT        1153,131,135,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,168,92,131,78,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,180,108,68,8
-    EDITTEXT        1154,252,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,173,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,252,130,43,12
-    DEFPUSHBUTTON   "½T©w",IDOK,197,179,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,249,179,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¦C¦L"
-FONT 9, "·s²Ó©úÅé", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,21,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,93,272,106,WS_GROUP
-    CONTROL         "²{¦æ¹Ï«¬(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¶}±Ò¼Ò«¬¤¤ªº©Ò¦³¹Ï«¬(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¿ï¨úªº¹Ï«¬(&E)¡G",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        "½Õ¾ã¤j¤p",IDC_STATIC,8,202,272,51
-    CONTROL         "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "²Å¦X(&I)¡G",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,53,12
-    LTEXT           "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "­¶¼e(&W)¡G",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "­¶°ª(&T)¡G",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        "¦C¦L½d³ò",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "­¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "±q(&F)¡G",1089,16,302,29,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,76,302,29,8
-    EDITTEXT        1153,107,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,147,257,132,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,229,295,46,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",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, 287
-        BOTTOMMARGIN, 345
-    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_HK/DiagramPrint_zh_HK.dsp b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint_zh_HK.dsp
deleted file mode 100644
index 802ee95..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint_zh_HK.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DiagramPrint_zh_HK" - 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_HK - 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_HK.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_HK.mak" CFG="DiagramPrint_zh_HK - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "DiagramPrint_zh_HK - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "DiagramPrint_zh_HK - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "DiagramPrint_zh_HK"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "DiagramPrint_zh_HK - 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_HK_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_HK\DiagramPrint.dll"
-
-!ELSEIF  "$(CFG)" == "DiagramPrint_zh_HK - 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_HK_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_HK - Win32 Release"
-# Name "DiagramPrint_zh_HK - 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_HK/DiagramPrint_zh_HK.plg b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint_zh_HK.plg
deleted file mode 100644
index 590a5aa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/DiagramPrint_zh_HK.plg
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: DiagramPrint_zh_HK - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x404 /fo"Release/DiagramPrint.res" /i "../." /d "NDEBUG" /d "_AFXDLL" "C:\jamesPrint\DiagramPrint\DiagramPrint_zh_HK\DiagramPrint.rc"" 
-Creating temporary file "C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP16D.tmp" with contents
-[
-/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /D "_WINDLL" /D "_AFXDLL" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\jamesPrint\DiagramPrint\DiagramPrint.cpp"
-"C:\jamesPrint\DiagramPrint\StdAfx.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\wdiu\LOCALS~1\Temp\RSP16D.tmp" 
-Creating command line "link.exe /nologo /dll /incremental:no /pdb:"Release/DiagramPrint.pdb" /machine:I386 /out:"..\I10n\os\win32\x86\zh_HK\DiagramPrint.dll" /implib:"Release/DiagramPrint.lib"  .\Release\DiagramPrint.obj .\Release\StdAfx.obj .\Release\DiagramPrint.res "
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-DiagramPrint.cpp
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(277) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(278) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(279) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(304) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(315) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
-C:\jamesPrint\DiagramPrint\DiagramPrint.cpp(538) : warning C4800: 'unsigned char' : forcing value to bool 'true' or 'false' (performance warning)
-StdAfx.cpp
-Generating Code...
-Linking...
-   Creating library Release/DiagramPrint.lib and object Release/DiagramPrint.exp
-
-
-
-<h3>Results</h3>
-DiagramPrint.dll - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/resource.h b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/resource.h
deleted file mode 100644
index 3491da8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_HK/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 3f54069..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 118681c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint/DiagramPrint_zh_TW/DiagramPrint.rc
+++ /dev/null
@@ -1,412 +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,2008 - US Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.\0"
-            VALUE "LegalTrademarks", "(R) 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", "2, 1, 0, 0\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 "¦C¦L"
-FONT 9, "·s²Ó©úÅé"
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,21,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,26,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,36,217,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,31,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,48,218,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,28,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,60,217,10
-    LTEXT           "µù¸Ñ¡G",1096,16,72,29,10,SS_NOPREFIX
-    CONTROL         "",1100,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,54,72,152,10
-    CONTROL         "¦C¦L¨ìÀÉ®×(&L)",1040,"Button",BS_AUTOCHECKBOX | 
-                    WS_GROUP | WS_TABSTOP,229,70,41,12
-    GROUPBOX        "¹Ï«¬¦C¦L½d³ò",1072,8,93,272,106,WS_GROUP
-    CONTROL         "²{¦æ¹Ï«¬(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¶}±Ò¼Ò«¬¤¤ªº©Ò¦³¹Ï«¬(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¿ï¨úªº¹Ï«¬(&E)¡G",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        "½Õ¾ã¤j¤p",IDC_STATIC,8,202,272,51
-    CONTROL         "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "½Õ¾ã¬°(&I)¡G",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,56,12
-    LTEXT           "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",1102,28,219,91,10,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "­¶¼e(&W)¡G",1105,75,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "­¶°ª(&T)¡G",IDC_STATIC,177,235,54,10
-    EDITTEXT        IDC_PAGESN,235,233,32,12,ES_NUMBER
-    LTEXT           "",IDC_STATIC,260,235,8,8,NOT WS_VISIBLE
-    GROUPBOX        "¦C¦L½d³ò",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "­¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "±q(&F):",1089,13,302,32,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,76,302,27,8
-    EDITTEXT        1153,107,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,147,257,132,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,227,300,48,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,232,328,48,14
-    ICON            "",1086,156,295,70,25,WS_GROUP
-END
-
-1539 DIALOG DISCARDABLE  32, 32, 288, 183
-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,35,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,34,33,10,SS_NOPREFIX
-    CONTROL         "",1099,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,33,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,7,93,167,56,WS_GROUP
-    LTEXT           "¤j¤p(&Z)¡G",1089,9,109,36,8
-    COMBOBOX        1137,57,105,112,112,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "­ì©lÀÉ(&S)¡G",1090,10,129,45,8
-    COMBOBOX        1138,57,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           "­ì©lÀÉ(&S)¡G",1090,16,132,45,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, 307, 203
-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,291,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,235,10
-    LTEXT           "Ãþ«¬¡G",1094,16,48,36,10,SS_NOPREFIX
-    CONTROL         "",1098,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,48,235,10
-    LTEXT           "¦ì¸m¡G",1097,16,60,36,10,SS_NOPREFIX
-    CONTROL         "",1101,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | 
-                    WS_GROUP,52,60,235,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,75,12
-    GROUPBOX        "¦C¦L½d³ò",1072,8,93,155,77,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         "¿ï¶µ(&S)",1057,"Button",BS_AUTORADIOBUTTON,16,150,64,12
-    RTEXT           "±q(&F)¡G",1089,29,137,31,8
-    EDITTEXT        1152,65,134,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,93,137,35,8
-    EDITTEXT        1153,131,135,26,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,168,92,131,78,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,180,108,68,8
-    EDITTEXT        1154,252,106,32,12,ES_NUMBER | WS_GROUP
-    ICON            "",1086,173,124,76,24,SS_CENTERIMAGE | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,252,130,43,12
-    DEFPUSHBUTTON   "½T©w",IDOK,197,179,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",IDCANCEL,249,179,48,14
-END
-
-1547 DIALOGEX 32, 32, 289, 354
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "¦C¦L"
-FONT 9, "·s²Ó©úÅé", 0, 0, 0x1
-BEGIN
-    GROUPBOX        "¦Lªí¾÷",1075,8,4,272,84,WS_GROUP
-    LTEXT           "¦WºÙ(&N)¡G",1093,16,21,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,93,272,106,WS_GROUP
-    CONTROL         "²{¦æ¹Ï«¬(&U)",IDC_CURRENT_DIAGRAM,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,107,253,12
-    CONTROL         "¶}±Ò¼Ò«¬¤¤ªº©Ò¦³¹Ï«¬(&D)",IDC_ALL_DIAGRAMS,"Button",
-                    BS_AUTORADIOBUTTON,16,121,253,12
-    CONTROL         "¿ï¨úªº¹Ï«¬(&E)¡G",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        "½Õ¾ã¤j¤p",IDC_STATIC,8,202,272,51
-    CONTROL         "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",IDC_SCALE_PERCENT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,218,104,12
-    CONTROL         "²Å¦X(&I)¡G",IDC_SCALE_FIT,"Button",BS_AUTORADIOBUTTON | 
-                    WS_TABSTOP,16,233,53,12
-    LTEXT           "½Õ¾ã¬°¥¿±`¤j¤pªº %(&J)¡G",1102,30,219,88,8,NOT 
-                    WS_VISIBLE
-    EDITTEXT        IDC_PERCENT,122,217,32,12,ES_NUMBER
-    LTEXT           "­¶¼e(&W)¡G",1105,71,235,43,8
-    EDITTEXT        IDC_PAGESM,122,233,32,12,ES_NUMBER
-    RTEXT           "­¶°ª(&T)¡G",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        "¦C¦L½d³ò",1074,8,257,132,64,WS_GROUP
-    CONTROL         "¥þ³¡(&A)",1056,"Button",BS_AUTORADIOBUTTON | WS_GROUP | 
-                    WS_TABSTOP,16,272,47,12
-    CONTROL         "­¶¼Æ(&G)",1058,"Button",BS_AUTORADIOBUTTON,16,286,46,12
-    RTEXT           "±q(&F)¡G",1089,16,302,29,8
-    EDITTEXT        1152,48,300,26,12,ES_NUMBER | WS_GROUP
-    RTEXT           "¨ì(&T)¡G",1090,76,302,29,8
-    EDITTEXT        1153,107,300,27,12,ES_NUMBER | WS_GROUP
-    GROUPBOX        "¥÷¼Æ",1073,147,257,132,64,WS_GROUP
-    LTEXT           "¥÷¼Æ(&C)¡G",1092,163,273,68,8
-    EDITTEXT        1154,235,271,32,12,ES_NUMBER | WS_GROUP
-    CONTROL         "¤À­¶(&O)",1041,"Button",BS_AUTOCHECKBOX | WS_GROUP | 
-                    WS_TABSTOP,229,295,46,12
-    DEFPUSHBUTTON   "½T©w",IDOK,180,328,48,14,WS_GROUP
-    PUSHBUTTON      "¨ú®ø",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, 287
-        BOTTOMMARGIN, 345
-    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_ar.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ar.dll
deleted file mode 100644
index b33c4b1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ar.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_cs.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_cs.dll
deleted file mode 100644
index bcfd583..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_cs.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_da.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_da.dll
deleted file mode 100644
index 6eec0ca..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_da.dll
+++ /dev/null
Binary files differ
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 06f158a..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_el.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_el.dll
deleted file mode 100644
index 2001875..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_el.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 1eee969..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 278db54..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_fi.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_fi.dll
deleted file mode 100644
index 8464eda..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_fi.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 2d268fa..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_hu.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_hu.dll
deleted file mode 100644
index d9e144e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_hu.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 ee09adc..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_iw.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_iw.dll
deleted file mode 100644
index fdf2f94..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_iw.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 3c6dd64..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 3ddda72..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_nb.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nb.dll
deleted file mode 100644
index 5562554..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nb.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nl.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nl.dll
deleted file mode 100644
index 480cc58..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nl.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nn.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nn.dll
deleted file mode 100644
index 5562554..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_nn.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_no.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_no.dll
deleted file mode 100644
index 5562554..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_no.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pl.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pl.dll
deleted file mode 100644
index 104b670..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pl.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt.dll
deleted file mode 100644
index 1412316..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_pt.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 41eb0bd..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_ru.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ru.dll
deleted file mode 100644
index dd1f8a9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_ru.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_sv.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_sv.dll
deleted file mode 100644
index c149426..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_sv.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_tr.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_tr.dll
deleted file mode 100644
index 1283a85..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_tr.dll
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh.dll
deleted file mode 100644
index dffc91d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh.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 86d1ba9..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_HK.dll b/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_HK.dll
deleted file mode 100644
index 9a695c4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/DiagramPrint_zh_HK.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 5b72ffc..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 6faec49..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui.printing.win32;singleton=true
-Bundle-Name: %Fragment.name
-Bundle-Vendor: %Fragment.providerName
-Bundle-Version: 1.4.0.qualifier
-Bundle-Localization: printingWin32Fragment
-Fragment-Host: org.eclipse.gmf.runtime.common.ui.printing
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)"
-Provide-Package: org.eclipse.gmf.runtime.common.ui.printing
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 7a86f16..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/build.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# ==============================================================================

-#*+------------------------------------------------------------------------+

-#*| Copyright (c) 2005, 2010  IBM Corporation and others.                  |

-#*| All rights reserved. This program and the accompanying materials       |

-#*| are made available under the terms of the Eclipse Public License v1.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 = 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,\

-               DiagramPrint/,\

-               DiagramPrint_ar.dll,\

-               DiagramPrint_cs.dll,\

-               DiagramPrint_el.dll,\

-               DiagramPrint_fi.dll,\

-               DiagramPrint_hu.dll,\

-               DiagramPrint_iw.dll,\

-               DiagramPrint_nl.dll,\

-               DiagramPrint_no.dll,\

-               DiagramPrint_pl.dll,\

-               DiagramPrint_pt.dll,\

-               DiagramPrint_ru.dll,\

-               DiagramPrint_sv.dll,\

-               DiagramPrint_tr.dll,\

-               DiagramPrint_zh.dll,\

-               DiagramPrint_nb.dll,\

-               DiagramPrint_nn.dll,\

-               DiagramPrint_da.dll,\

-               DiagramPrint_zh_HK.dll

-source.. = src/

-output.. = bin/

diff --git a/org.eclipse.gmf.runtime.common.ui.printing.win32/pom.xml b/org.eclipse.gmf.runtime.common.ui.printing.win32/pom.xml
deleted file mode 100644
index e587513..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.printing.win32</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.printing.win32</artifactId>
-  <version>1.4.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 a472cc3..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 Modeling Project
\ 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 2790961..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing.win32/src/org/eclipse/gmf/runtime/common/ui/printing/PrintHelper.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.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;

-import org.eclipse.swt.printing.PrinterData;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * 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", "ar", "cs", "da", "de", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ 

-			"el", "es", "fi", "hu", "fr", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-			"it", "iw", "ja", "ko", "nl", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-			"no", "nb", "nn", "pl", "pt", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-			"pt_BR", "ru", "sv", "tr", "zh", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

-			"zh_CN", "zh_TW", "zh_HK" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

-

-	/**

-	 * 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");

-

-		List<String> supported = new ArrayList<String>(Arrays.asList(SUPPORTED));

-		String localizedVersion = DEFAULT_LOCALE;

-

-		Locale defaultLocale = Locale.getDefault();

-		String language = defaultLocale.getLanguage().toLowerCase();

-		String country = defaultLocale.getCountry().toUpperCase();

-		String countrySpecificLocale = language + SEPARATOR + country;

-

-		if (supported.contains(countrySpecificLocale)) {

-			localizedVersion = countrySpecificLocale;

-		} else if (supported.contains(language)) {

-			localizedVersion = language;

-		}

-

-		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();

-

-		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);

-	}

-

-	/**

-	 * Initialize the scaling factor in the print dialog.

-	 */

-	public void setScaleFactor(int scaleFactor) {

-		initScalePercent(scaleFactor);

-	}

-

-	/**

-	 * Initialize the scale width and height in the print dialog.

-	 */

-	public void setScaleToWidthHeight(int width, int height) {

-		initScaleFitTo(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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 1dbab9c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 800b8cc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:58:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 73eec12..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/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.runtime.common.ui.printing;singleton:=true
-Bundle-Version: 1.4.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 fb0dfa9..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 Modeling Project
diff --git a/org.eclipse.gmf.runtime.common.ui.printing/pom.xml b/org.eclipse.gmf.runtime.common.ui.printing/pom.xml
deleted file mode 100644
index 68d50f9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.printing</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.printing</artifactId>
-  <version>1.4.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 e485e9d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.printing/src/org/eclipse/gmf/runtime/common/ui/printing/IPrintHelper.java
+++ /dev/null
@@ -1,172 +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);
-    
-    /**
-     * Preserve the scale factor that the user enters in the preview or print
-     * dialogs.
-     * 
-     * @param scaleFactor a zoom factor integer value greater than 0.
-     */
-    void setScaleFactor(int scaleFactor);
-    
-    /**
-     * Preserve the width and height scale factors
-     * 
-     * @param width scale to number of pages wide
-     * @param height scale to number of pages high
-     */
-   	void setScaleToWidthHeight(int width, int height);
-   
-    
-}
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.action/.classpath b/org.eclipse.gmf.runtime.common.ui.services.action/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.cvsignore b/org.eclipse.gmf.runtime.common.ui.services.action/.cvsignore
deleted file mode 100644
index 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.options b/org.eclipse.gmf.runtime.common.ui.services.action/.options
deleted file mode 100644
index a579dbb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.options
+++ /dev/null
@@ -1,17 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui.services.action plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui.services.action plug-in
-org.eclipse.gmf.runtime.common.ui.services.action/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting=false
-
-# Trace information related to service configuration
-org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config=false
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.project b/org.eclipse.gmf.runtime.common.ui.services.action/.project
deleted file mode 100644
index 7e3961c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/.api_filters b/org.eclipse.gmf.runtime.common.ui.services.action/.settings/.api_filters
deleted file mode 100644
index e1963de..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/.api_filters
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.common.ui.services.action" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContributionDescriptorReader"/>
-                <message_argument value="AbstractContributionItemProvider"/>
-            </message_arguments>
-        </filter>
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContributionItemProvider"/>
-                <message_argument value="AbstractContributionItemProvider"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="ProviderContributionDescriptor"/>
-                <message_argument value="AbstractContributionItemProvider"/>
-                <message_argument value="setContributionDescriptor(ProviderContributionDescriptor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider$PluginActionContributionItem">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="ActionContributionItem"/>
-                <message_argument value="PluginActionContributionItem"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider$PluginGroupMarker">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="GroupMarker"/>
-                <message_argument value="PluginGroupMarker"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider$PluginSeparator">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="Separator"/>
-                <message_argument value="PluginSeparator"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java" type="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContributionItemProvider"/>
-                <message_argument value="ContributionItemService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/filter/AbstractActionFilterProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IActionFilterProvider"/>
-                <message_argument value="AbstractActionFilterProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java" type="org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IActionFilterProvider"/>
-                <message_argument value="ActionFilterService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6d77d26..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:57:15 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.services.action/META-INF/MANIFEST.MF
deleted file mode 100644
index 443d0e4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/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.common.ui.services.action; singleton:=true
-Bundle-Version: 1.4.0.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.services.action.contributionitem,
- org.eclipse.gmf.runtime.common.ui.services.action.filter,
- org.eclipse.gmf.runtime.common.ui.services.action.global,
- org.eclipse.gmf.runtime.common.ui.services.action.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.action.internal.filter;x-friends:="org.eclipse.gmf.tests.runtime.common.ui.services.action"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/about.html b/org.eclipse.gmf.runtime.common.ui.services.action/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.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, 2007</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.action/build.properties b/org.eclipse.gmf.runtime.common.ui.services.action/build.properties
deleted file mode 100644
index e4b2538..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/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,\
-               .options,\
-               META-INF/,\
-               .,\
-               schema/,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/plugin.properties b/org.eclipse.gmf.runtime.common.ui.services.action/plugin.properties
deleted file mode 100644
index 6453877..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/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 Action Services
-Plugin.providerName = Eclipse Modeling Project
-
-
-# ===============================================================================
-# Extension Points - Translation Instruction : section to be translated
-# ===============================================================================
-extPoint.actionFilterProviders = GMF Action Filter Providers
-extPoint.globalActionHandlerProviders = GMF Global Action Handler Providers
-extPoint.contributionItemProviders =  GMF Contribution Item Providers
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/plugin.xml b/org.eclipse.gmf.runtime.common.ui.services.action/plugin.xml
deleted file mode 100644
index 9328f68..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/plugin.xml
+++ /dev/null
@@ -1,18 +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="actionFilterProviders" name="%extPoint.actionFilterProviders" schema="schema/actionFilterProviders.exsd"/>
-   <extension-point id="globalActionHandlerProviders" name="%extPoint.globalActionHandlerProviders" schema="schema/globalActionHandlerProviders.exsd"/>
-   <extension-point id="contributionItemProviders" name="%extPoint.contributionItemProviders" schema="schema/contributionItemProviders.exsd"/>
-   
-
-</plugin>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/pom.xml b/org.eclipse.gmf.runtime.common.ui.services.action/pom.xml
deleted file mode 100644
index 7dee74c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.services.action</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.services.action</artifactId>
-  <version>1.4.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/schema/actionFilterProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.action/schema/actionFilterProviders.exsd
deleted file mode 100644
index c155823..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/schema/actionFilterProviders.exsd
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.action">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.action" id="actionFilterProviders" name="Action Filter Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         &lt;P&gt;
-This extension point is used to configure providers for the action filter service (&lt;TT&gt;org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService&lt;/TT&gt;).
-&lt;/P&gt;
-&lt;P&gt;
-This service allows action filter attributes to be added to existing types, so long as they adapt to IActionFilter by returning the ActionFilterService. These action filter attributes can then be used inside the objectState element for enablement or visibility of static action contributions.  It also permits the entire workbench selection to be considered so that an action can be enabled if it is supported on one or more elements in the selection.
-&lt;/P&gt;
-&lt;P&gt;The action filter service will select a provider using one of the following criteria:
-&lt;OL&gt;
-&lt;LI&gt;by provider descriptor, which uses static XML to determine whether a provider provides the attribute test operation. A given provider can declare, in XML, that it supports zero or more name/value pairs (attribute elements); if the name/value of a given action expression matches any of these, its is assumed to provide the operation.&lt;/LI&gt;
-&lt;LI&gt;by provider policy. If no name/value pairs are specified in XML for a given provider, the service will try to load a policy for the provider (using the standard mechanism), if one is specified, and ask the policy if it provides the operation.&lt;/LI&gt;
-&lt;LI&gt;by the provider itself. If no name/value pairs and no policy have been specified, the service will load the provider itself and ask it if it provides the operation. Typically, it is preferred to make use of one of the first two criteria for providers.&lt;/LI&gt;
-&lt;/OL&gt;
-&lt;/P&gt;
-&lt;P&gt;
-Note that the value attribute is optional. When available in the provider&apos;s XML, the value will be used in conjunction with the name attribute to determine if that provider should be considered. When not available, only the name will be used to make the decision. For example, the value attribute for objectState elements of action expressions is sometimes set to either &quot;enablement&quot; or &quot;visibility&quot;. Some action filter providers use this information to determine whether the criteria is being tested to determine enablement or visibility for a contribution.
-&lt;/P&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="ActionFilterProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point, in this case, &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.actionFilterProviders&lt;/tt&gt;.
-               </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 human readable name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ActionFilterProvider">
-      <annotation>
-         <documentation>
-            This element is used to describe an action filter provider that will contribute action filter attributes to be used inside objectState elements for enablement or visibility of static action contributions.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Attribute" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of a fully qualified class that implements the the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.filter.IActionFilterProvider&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.IProvider&lt;/tt&gt; interfaces
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            This element is used to specify the priority that this provider has relative to other action filter providers that are registered to handle the same action filter attribute. When such a conflict occurs, the provider with the highest priority will be selected to provide the action filter.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  the name of the provider priority, one of &lt;tt&gt;Lowest&lt;/tt&gt;, &lt;tt&gt;Low&lt;/tt&gt;, &lt;tt&gt;Medium&lt;/tt&gt;, &lt;tt&gt;High&lt;/tt&gt;, or &lt;tt&gt;Highest&lt;/tt&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="Attribute">
-      <annotation>
-         <documentation>
-            This element is used to describe a new action filter attribute.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the action filter attribute, which is used to identify the provider that should perform the test for objectState elements used in action enablement or visibility criteria
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string">
-            <annotation>
-               <documentation>
-                  the optional value of the action filter attribute.  When provided it is also used to identify the provider that should perform the test for objectState elements use in action enablement or visibility criteria.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Policy">
-      <annotation>
-         <documentation>
-            This element can be used to specify a policy used to determine whether or not this provider should be asked to test an action filter attribute. The policy is only used if there are no attribute elements defined for the provider.
-			To delay plugin loading, the recommended strategy for policies is to define them in a separate package and add the package to the Eclipse-LazyStart in the Manifest.MF so that loading the policy class does not load the plug-in.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  the fully qualified name of the class that implements &lt;TT&gt;org.eclipse.gmf.runtime.common.core.service.IProviderPolicy&lt;/TT&gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.core.service.IProviderPolicy"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an action filter provider extension:
-         &lt;pre&gt;
-   &lt;extension
-         id=&quot;actionFilterProviders&quot;
-         name=&quot;%ext.actionFilterProviders&quot;
-         point=&quot;org.eclipse.gmf.runtime.common.ui.services.action.actionFilterProviders&quot;&gt;
-      &lt;ActionFilterProvider
-            class=&quot;org.eclipse.test.project.ui.providers.action.AllAreElementsActionFilterProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Highest&quot;&gt;
-         &lt;/Priority&gt;
-         &lt;Attribute
-               name=&quot;AllAreElements&quot;
-               value=&quot;enablement&quot;&gt;
-         &lt;/Attribute&gt;
-         &lt;Attribute
-               name=&quot;AllAreElements&quot;
-               value=&quot;visibility&quot;&gt;
-         &lt;/Attribute&gt;
-      &lt;/ActionFilterProvider&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 be a fully qualified name of a Java class that implements both the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.filter.IActionFilterProvider&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.IProvider&lt;/tt&gt; interfaces. For convenience, this can be a subclass of &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider&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.action/schema/contributionItemProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.action/schema/contributionItemProviders.exsd
deleted file mode 100644
index cea0923..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/schema/contributionItemProviders.exsd
+++ /dev/null
@@ -1,1031 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.action" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.action" id="contributionItemProviders" name="Contribution Item Providers Extension Point"/>
-      </appinfo>
-      <documentation>
-         &lt;P&gt;
-This extension point is used to register providers that contribute to different workbench part&apos;s contribution managers. The contributions described in this extension point could be for a workbench part&apos;s action bars (referred to as part contributions) or for a workbench part&apos;s popup menu (referred to as popup contributions). This extension point provides an XML description of those contributions to be read by the described providers. The extension point provides an alternative to the following Eclipse extension points:
-&lt;/P&gt;
-&lt;UL&gt;
-&lt;LI&gt;org.eclipse.ui.editorActions&lt;/LI&gt;
-&lt;LI&gt;org.eclipse.ui.viewActions&lt;/LI&gt;
-&lt;LI&gt;org.eclipse.ui.popupMenus (viewerContribution)&lt;/LI&gt;
-&lt;/UL&gt;
-&lt;P&gt;
-However, this extension point focuses on distinguishing the contribution criteria from the enablement and visibility of the described contributions. The description of each contribution has the following minimum information:
-&lt;/P&gt;
-&lt;UL&gt;
-&lt;LI&gt;Information to create the contribution (e.g., id)&lt;/LI&gt;
-&lt;LI&gt;Information to perform the contribution (e.g., path within manager)&lt;/LI&gt;
-&lt;LI&gt;Information to consider the contribution (e.g., target id, class)&lt;/LI&gt;
-&lt;/UL&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="contributionItemProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point, in this case, &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.contributionItemsProviders&lt;/tt&gt;
-               </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 human readable name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contributionItemProvider">
-      <annotation>
-         <documentation>
-            This element is used to describe a contribution item provider that will contribute actions and toolbar items to a view&apos;s popup menus or action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <sequence>
-               <element ref="partContribution" minOccurs="0" maxOccurs="unbounded"/>
-               <element ref="popupContribution" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of a fully qualified class that extends the the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.IProvider&lt;/tt&gt; interfaces
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="checkPluginLoaded" type="boolean" use="default" value="true">
-            <annotation>
-               <documentation>
-                  indicates whether or not the service should only consider contributions from this provider if the declaring plugin is already loaded (either true or false). Default value is true.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            This element is used to specify the priority that this provider has relative to other contribution item providers that are registered to provide the same kind of contribution to the same menu or toolbar.  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.  This means that a provider wishing to add contributions to menus or groups contributed by another provider must have the higher priority so that the menu or group has already been contributed by the time it is asked to make its own contributions.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  the name of the provider priority, one of &lt;tt&gt;Lowest&lt;/tt&gt;, &lt;tt&gt;Low&lt;/tt&gt;, &lt;tt&gt;Medium&lt;/tt&gt;, &lt;tt&gt;High&lt;/tt&gt;, or &lt;tt&gt;Highest&lt;/tt&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="partContribution">
-      <annotation>
-         <documentation>
-            This element is used to add a group of menus, groups, actions, and/or toolbar items to a workbench part. At least one of the two attributes &lt;tt&gt;id&lt;/tt&gt; or &lt;tt&gt;class&lt;/tt&gt; must be specified for this element.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="partMenu" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="partMenuGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="partAction" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="partCustom" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="partActionGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="partPredefinedItem" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional unique identifier of a registered workbench part that is the target of this contribution
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of a fully qualified class or interface. Contributions will be made to all workbench parts that subclass or implement this type.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupContribution">
-      <annotation>
-         <documentation>
-            &lt;P&gt;
-This element is used to add a group of menus, groups, actions, and/or custom items to a context menu. At least one of the two attributes &lt;tt&gt;id&lt;/tt&gt; or &lt;tt&gt;class&lt;/tt&gt; must be specified for this element.
-&lt;/P&gt;
-&lt;P&gt;
-Criteria for the visibility of this group of contributions can be specified by any number of the same kind of criteria elements from among:
-&lt;UL&gt;
-&lt;LI&gt;popupStructuredContributionCriteria&lt;/LI&gt;
-&lt;LI&gt;popupTextContributionCriteria&lt;/LI&gt;
-&lt;LI&gt;popupMarkContributionCriteria&lt;/LI&gt;
-&lt;/UL&gt;
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <choice minOccurs="0" maxOccurs="unbounded">
-               <element ref="popupStructuredContributionCriteria"/>
-               <element ref="popupTextContributionCriteria"/>
-               <element ref="popupMarkContributionCriteria"/>
-            </choice>
-            <element ref="popupMenu" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="popupMenuGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="popupAction" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="popupCustom" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="popupActionGroup" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="popupPredefinedItem" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional unique identifier of a registered context menu that is the target of this contribution
-&lt;BR&gt;
-For a given part, there could be one or more context menus. This id is used to specify the one the contributions are for.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of a fully qualified class or interface. Contributions will be made to all context menus that subclass or implement this type.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partMenu">
-      <annotation>
-         <documentation>
-            This element is used to add menu to a workbench part&apos;s action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  an optional identifier used to reference this menu contribution. It must be unique within the contribution item provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="menubarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu within the part&apos;s menubar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the menubar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="toolbarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu within the part&apos;s toolbar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the toolbar.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partMenuGroup">
-      <annotation>
-         <documentation>
-            A description for a menu group contribution to be contributed to a workbench part&apos;s action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the part menu group contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="menubarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu group within the part&apos;s menubar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. There should be a &apos;/&apos; at the end of the path. The menu group is inserted to the end of the last submenu in the path. If the field was omitted, the contribution will not take place to the menubar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="toolbarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu group within the part&apos;s toolbar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. There should be a &apos;/&apos; at the end of the path. The menu group is inserted to the end of the last submenu in the path. If the field was omitted, the contribution will not take place to the toolbar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="separator" type="boolean" use="default" value="true">
-            <annotation>
-               <documentation>
-                  A flag indicating whether the menu group is a separator &lt;true&gt; (default) or a group marker &lt;false&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partAction">
-      <annotation>
-         <documentation>
-            A description for an action contribution to be contributed to a workbench part&apos;s action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the part action contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="menubarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this action within the part&apos;s menubar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the menubar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="toolbarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this action within the part&apos;s toolbar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the toolbar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="global" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  A flag that determines whether the action is global or not. If the action is marked global, it will be added to the workbench part&apos;s global action handlers.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partCustom">
-      <annotation>
-         <documentation>
-            A description for a custom contribution to be contributed to a workbench part&apos;s action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the part custom contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="menubarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this custom contribution within the part&apos;s menubar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the menubar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="toolbarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this custom contribution within the part&apos;s toolbar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the toolbar.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupMenu">
-      <annotation>
-         <documentation>
-            A description for a menu contribution to be contributed to a workbench part&apos;s popup menu.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the popup menu manager contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="default" value="/additionsGroup">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu within the popup. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the popup menu.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupMenuGroup">
-      <annotation>
-         <documentation>
-            A description for a menu group contribution to be contributed to a workbench part&apos;s popup menu.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the popup menu group contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="default" value="/">
-            <annotation>
-               <documentation>
-                  The contribution path of this menu group within the popup menu. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. There should be a &apos;/&apos; at the end of the path. The menu group is inserted to the end of the last submenu in the path. If the field was omitted, the contribution will not take place to the popup menu.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="separator" type="boolean" use="default" value="true">
-            <annotation>
-               <documentation>
-                  A flag indicating whether the menu group is a separator (true) (default) or a group marker (false).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupAction">
-      <annotation>
-         <documentation>
-            A description for an action contribution to be contributed to a workbench part&apos;s popup menu.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the popup action contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="default" value="/additionsGroup">
-            <annotation>
-               <documentation>
-                  The contribution path of this action within the popup. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the popup menu.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupCustom">
-      <annotation>
-         <documentation>
-            A description for a custom contribution to be contributed to a workbench part&apos;s popup menu.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the popup custom contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="default" value="/additionsGroup">
-            <annotation>
-               <documentation>
-                  The contribution path of this custom contribution within the popup. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited. The final token in the path is either a group_id or a contribution_id.
-&lt;BR&gt;
-If the last token was a group, the contribution will be appended to the end of the group. Otherwise, the contribution will be inserted after the given contribution id. If the field was omitted, the contribution will not take place to the popup menu.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupStructuredContributionCriteria">
-      <annotation>
-         <documentation>
-            A description for a structured selection contribution criteria for a workbench part&apos;s popup menu contribution. The criteria can have an optional set of methods to call on the &quot;selected objects&quot;
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="staticMethod" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="objectCount" type="string">
-            <annotation>
-               <documentation>
-                  The number of objects in the selection that this contribution applies to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="objectClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface who is assignable or adaptable from the classes of objects in the selection. 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:
-&lt;PRE&gt;className&lt;(plugin id)&gt;?&lt;/PRE&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="policyClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a contribution policy class (that usually resides in a different plugin/fragment that is assumed to be loaded) to be used to determine wether this contributon should be considered or not. The class has to implement the &lt;code&gt;IPopupMenuContributionPolicy&lt;/code&gt; interface.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IPopupMenuContributionPolicy"/>
-               </appinfo>
-            </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="popupTextContributionCriteria">
-      <annotation>
-         <documentation>
-            A description for a text selection contribution criteria for a workbench part&apos;s popup menu contribution.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="text" type="string">
-            <annotation>
-               <documentation>
-                  The text in the selection. This is an optional field
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="policyClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a contribution policy class (that usually resides in a different plugin/fragment that is assumed to be loaded) to be used to determine wether this contributon should be considered or not. The class has to implement the &lt;code&gt;IPopupMenuContributionPolicy&lt;/code&gt; interface.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IPopupMenuContributionPolicy"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupMarkContributionCriteria">
-      <annotation>
-         <documentation>
-            A description for a mark selection contribution criteria for a workbench part&apos;s popup menu contribution.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="documentClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class/interface who is assignable or adaptable from the document of the mark selection. 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:
-&lt;PRE&gt;className&lt;(plugin id)&gt;?&lt;/PRE&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="policyClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a contribution policy class (that usually resides in a different plugin/fragment that is assumed to be loaded) to be used to determine wether this contributon should be considered or not. The class has to implement the &lt;code&gt;IPopupMenuContributionPolicy&lt;/code&gt; interface.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IPopupMenuContributionPolicy"/>
-               </appinfo>
-            </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:
-&lt;OL&gt;
-&lt;LI&gt;The return value string has to be in the &quot;value&quot; string set.&lt;/LI&gt;
-&lt;LI&gt;The return value string has to be not in the &quot;notValue&quot; string set.&lt;/LI&gt;
-&lt;LI&gt;The return value object has to be in the &quot;value&quot; object set.&lt;/LI&gt;
-&lt;LI&gt;The return value object has to be not in the &quot;notValue&quot; object set.&lt;/LI&gt;
-&lt;/OL&gt;
-         </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;PRE&gt;&lt;string&gt;[,&lt;string&gt;]*&lt;/PRE&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;PRE&gt;&lt;string&gt;[,&lt;string&gt;]*&lt;/PRE&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:
-&lt;PRE&gt;className&lt;(plugin id)&gt;?&lt;/PRE&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:
-&lt;PRE&gt;className&lt;(plugin id)&gt;?&lt;/PRE&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupActionGroup">
-      <annotation>
-         <documentation>
-            A description for a action group contribution to be contributed to a workbench part&apos;s popup menu.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the popup action group contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string">
-            <annotation>
-               <documentation>
-                  he contribution path of this action group within the popup. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*&lt;group_id|contribution_id&gt;
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be submenu_id path that is also &apos;/&apos; delimited.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partActionGroup">
-      <annotation>
-         <documentation>
-            A description for an Action Group contribution to be contributed to a workbench part&apos;s action bars.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the part action group contribution. The id is unique within a provider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="popupPredefinedItem">
-      <annotation>
-         <documentation>
-            Reference to a previously defined contribution to a workbench part&apos;s popup menu.  The referenced contributed must be defined in a lower priority provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the previously defined popup action contribution. The id combined with the path is unique within the popup menu.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this previously defined item within the popup. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be multiple submenu_id paths that are also &apos;/&apos; delimited.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="remove" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If true, an existing contribution item will be removed.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="partPredefinedItem">
-      <annotation>
-         <documentation>
-            Reference to a previously defined contribution to a workbench part&apos;s action bars.  The referenced contribution must be defined in a lower priority provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the previously defined contribution to the workbench part&apos;s action bars. The id combined with the toolbarPath uniquely defines the item in the toolbar. The  id combined with menubarPath uniquely defines the item in the menubar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="toolbarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this previously defined item within the part&apos;s toolbar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be multiple submenu_id paths that are also &apos;/&apos; delimited. It is required if removeFromToolbar is true. If omitted in this case, it is considered to be &apos;/&apos;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="menubarPath" type="string">
-            <annotation>
-               <documentation>
-                  The contribution path of this previously defined item within the part&apos;s menubar. The path is a &apos;/&apos; delimited string in the following format:
-&lt;PRE&gt;
-/&lt;submenu_id/&gt;*
-&lt;/PRE&gt;
-It has to start with a &apos;/&apos; indicating the root of the contribution manager. Following that there could be multiple submenu_id paths that are also &apos;/&apos; delimited. It is required if removeFromMenubar is true. If omitted in this case, it is considered to be &apos;/&apos;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="removeFromToolbar" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If true, an existing contribution item will be removed from the part&apos;s toolbar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="removeFromMenubar" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If true, an existing contribution item will be removed from the part&apos;s menubar.
-               </documentation>
-            </annotation>
-         </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;PresentationContributionItemProvider&quot;
-         name=&quot;%ext.contributionItemProvider&quot;
-          point=&quot;org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders&quot;&gt;
-      &lt;contributionItemProvider
-            class=&quot;org.eclipse.test.project.ui.providers.PresentationContributionItemProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Low&quot;&gt;
-         &lt;/Priority&gt;
-         &lt;partContribution
-               class=&quot;org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorPart&quot;&gt;
-            &lt;partMenu
-                  menubarPath=&quot;/additions&quot;
-                  id=&quot;diagramMenu&quot;&gt;
-            &lt;/partMenu&gt;
-            &lt;partMenuGroup
-                  menubarPath=&quot;/diagramMenu/&quot;
-                  toolbarPath=&quot;/&quot;
-                  id=&quot;viewGroup&quot;&gt;
-            &lt;/partMenuGroup&gt;
-            &lt;partMenu
-                  menubarPath=&quot;/diagramMenu/viewGroup&quot;
-                  toolbarPath=&quot;/viewGroup&quot;
-                  id=&quot;selectMenu&quot;&gt;
-            &lt;/partMenu&gt;
-            &lt;partMenuGroup
-                  menubarPath=&quot;/diagramMenu/selectMenu/&quot;
-                  toolbarPath=&quot;/selectMenu/&quot;
-                  id=&quot;selectGroup&quot;&gt;
-            &lt;/partMenuGroup&gt;
-            &lt;partAction
-                  global=&quot;true&quot;
-                  menubarPath=&quot;/diagramMenu/selectMenu/selectGroup&quot;
-                  toolbarPath=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAll&quot;&gt;
-            &lt;/partAction&gt;
-            &lt;partAction
-                  menubarPath=&quot;/diagramMenu/selectMenu/selectGroup&quot;
-                  toolbarPath=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAllShapesAction&quot;&gt;
-            &lt;/partAction&gt;
-            &lt;partAction
-                  menubarPath=&quot;/diagramMenu/selectMenu/selectGroup&quot;
-                  toolbarPath=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAllConnectorsAction&quot;&gt;
-            &lt;/partAction&gt;
-            &lt;partCustom
-                  menubarPath=&quot;/diagramMenu/viewGroup&quot;
-                  toolbarPath=&quot;/viewGroup&quot;
-                  id=&quot;zoomContributionItem&quot;&gt;
-            &lt;/partCustom&gt;
-            &lt;partPredefinedItem
-                  id=&quot;fillColorContributionItem&quot;
-                  toolbarPath=&quot;/&quot;
-                  menubarPath=&quot;/diagramMenu/fontColorLineGroup&quot;
-                  removeFromToolbar=&quot;true&quot;
-                  removeFromMenubar=&quot;true&quot;&gt;        
-            &lt;/partPredefinedItem&gt;            
-         &lt;/partContribution&gt;
-         &lt;popupContribution
-               id=&quot;org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu&quot;&gt;
-            &lt;popupMenuGroup
-                  id=&quot;viewGroup&quot;&gt;
-            &lt;/popupMenuGroup&gt;
-            &lt;popupMenu
-                  path=&quot;/viewGroup&quot;
-                  id=&quot;selectMenu&quot;&gt;
-            &lt;/popupMenu&gt;
-            &lt;popupMenuGroup
-                  path=&quot;/selectMenu/&quot;
-                  id=&quot;selectGroup&quot;&gt;
-            &lt;/popupMenuGroup&gt;
-            &lt;popupAction
-                  path=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAll&quot;&gt;
-            &lt;/popupAction&gt;
-            &lt;popupAction
-                  path=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAllShapesAction&quot;&gt;
-            &lt;/popupAction&gt;
-            &lt;popupAction
-                  path=&quot;/selectMenu/selectGroup&quot;
-                  id=&quot;selectAllConnectorsAction&quot;&gt;
-            &lt;/popupAction&gt;
-            &lt;popupCustom
-                  path=&quot;/viewGroup&quot;
-                  id=&quot;zoomContributionItem&quot;&gt;
-            &lt;/popupCustom&gt;
-         &lt;/popupContribution&gt;
-         &lt;popupContribution
-               class=&quot;org.eclipse.gmf.runtime.diagram.ui.internal.parts.DiagramContextMenuProvider&quot;&gt;
-            &lt;popupStructuredContributionCriteria
-                 objectCount=&quot;2&quot;                  
-                 objectClass=&quot;org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart&quot;&gt;
-            &lt;/popupStructuredContributionCriteria&gt;
-            &lt;popupAction
-                  path=&quot;/alignMenu/alignVerticalGroup&quot;
-                  id=&quot;alignTopAction&quot;&gt;
-            &lt;/popupAction&gt;
-            &lt;popupPredefinedItem
-                  id=&quot;autoSizeAction&quot;
-                  path=&quot;/formatMenu/&quot;
-                  remove=&quot;true&quot;/&gt;
-            &lt;/popupContribution&gt;
-      &lt;/contributionItemProvider&gt;
-   &lt;/extension&gt;
-&lt;/PRE&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiInfo"/>
-      </appinfo>
-      <documentation>
-         &lt;P&gt;
-The value of the contribution item provider &lt;tt&gt;class&lt;/tt&gt; attribute must be a fully qualified name of a Java class that implements the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider&lt;/tt&gt;. For convenience, this can be a subclass of &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider&lt;/tt&gt;.
-&lt;/P&gt;
-&lt;p&gt;
-The order of contribution is given as follows:
-&lt;OL&gt;
-&lt;LI&gt;the priority of the provider (Lowest first)&lt;/LI&gt;
-&lt;LI&gt;the order of the definition within the XML file&lt;/LI&gt;
-&lt;/OL&gt;
-&lt;/P&gt;
-&lt;P&gt;
-Therefore, a contribution path has to fully exist prior to being used as a path of contribution.
-&lt;/P&gt;
-      </documentation>
-   </annotation>
-
-
-   <annotation>
-      <appinfo>
-         <meta.section type="copyright"/>
-      </appinfo>
-      <documentation>
-         Copyright (c) 2003, 2009  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.action/schema/globalActionHandlerProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services.action/schema/globalActionHandlerProviders.exsd
deleted file mode 100644
index ca62f99..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/schema/globalActionHandlerProviders.exsd
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services.action">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services.action" id="globalActionHandlerProviders" name="Global Action Handler Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         &lt;P&gt;
-This extension point is used to configure providers for the global action handler service (&lt;TT&gt;org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerService&lt;/TT&gt;).
-&lt;/P&gt;
-&lt;P&gt;
-This service provides an extensible way to handle commonly used (global) actions in different views and editors. These global actions may appear in a view part context menu or may be predefined retargetable actions.  The service
-allows different handlers to be used depending on the nature of the element(s) selected in the workbench part.  Each global action handler provider registers itself for actions against a specific element type within a view part.
-&lt;/P&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="GlobalActionHandlerProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point, in this case, &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders&lt;/tt&gt;.
-               </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 human readable name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="GlobalActionHandlerProvider">
-      <annotation>
-         <documentation>
-            This element is used to describe a global action handler provider that will contribute handlers to a given view or views for one or more retargetable actions.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-            <element ref="ViewId" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier used to reference this provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of a fully qualified class that implements the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.IProvider&lt;/tt&gt; interfaces.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            This element is used to specify the priority that this provider has relative to other global action handler providers that are registered to handle the same global action for the kind of element in the same view. When such a conflict occurs, the provider with the highest priority will be selected to provide the global action handler.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  the name of the provider priority, one of &lt;tt&gt;Lowest&lt;/tt&gt;, &lt;tt&gt;Low&lt;/tt&gt;, &lt;tt&gt;Medium&lt;/tt&gt;, &lt;tt&gt;High&lt;/tt&gt;, or &lt;tt&gt;Highest&lt;/tt&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="ViewId">
-      <annotation>
-         <documentation>
-            This element is used to specify a group of global actions that this provider handles for the specified view and element types.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="ElementType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier of a registered view
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ElementType">
-      <annotation>
-         <documentation>
-            This element is used to define the set of global actions that are handled by this provider when objects of the specified type are selected.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="GlobalActionId" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the class or interface that at least one object in the selection must subclass or implement in order for this provider to be asked to handle the action(s)
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="GlobalActionId">
-      <annotation>
-         <documentation>
-            This element is used to describe a global action that will be handled by this provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="actionId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of a global action handled by this provider. Global action names are specified in org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Policy">
-      <annotation>
-         <documentation>
-            This element is used to optionally specify a policy to use to further determine if this provider should be considered to provide a handler for a global action, given that the view, element type and action ID all match the specified criteria.
-   To delay plugin loading, the recommended strategy for policies is to define them in a separate package and add the package to the Eclipse-LazyStart in the Manifest.MF so that loading the policy class does not load the plug-in.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the fully qualified name of the class that implements &lt;TT&gt;org.eclipse.gmf.runtime.common.core.service.IProviderPolicy&lt;/TT&gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.core.service.IProviderPolicy"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the global action handler provider extension:
-
-&lt;PRE&gt;
-   &lt;extension
-         id=&quot;globalActionHandlerProviders&quot;
-         name=&quot;%ext.globalActionHandlerProviders&quot;
-         point=&quot;org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders&quot;&gt;
-      &lt;GlobalActionHandlerProvider
-            class=&quot;org.eclipse.test.common.ui.views.internal.providers.GlobalActionHandlerProvider&quot;
-            id=&quot;ContainerResourceGlobalActionHandlerProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Lowest&quot;&gt;
-         &lt;/Priority&gt;
-         &lt;ViewId
-               id=&quot;org.eclipse.test.common.ui.views.DiagramNavigator&quot;&gt;
-            &lt;ElementType
-                  class=&quot;org.eclipse.test.common.ui.views.internal.providers.ContainerViewerElement&quot;&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;open&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;openProject&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;rename&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;delete&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;move&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;closeProject&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;copy&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;paste&quot;&gt;
-               &lt;/GlobalActionId&gt;
-               &lt;GlobalActionId
-                     actionId=&quot;properties&quot;&gt;
-               &lt;/GlobalActionId&gt;
-            &lt;/ElementType&gt;
-         &lt;/ViewId&gt;
-      &lt;/GlobalActionHandlerProvider&gt;
-   &lt;/extension&gt;
-&lt;/PRE&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The value of the global action handler provider &lt;tt&gt;class&lt;/tt&gt; attribute must be a fully qualified name of a Java class that implements both the &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider&lt;/tt&gt; and &lt;tt&gt;org.eclipse.gmf.runtime.common.core.service.IProvider&lt;/tt&gt; interfaces. For convenience, this can be a subclass of &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider&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.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java
deleted file mode 100644
index 2116d67..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/AbstractContributionItemProvider.java
+++ /dev/null
@@ -1,1337 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.action.contributionitem;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-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.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.common.ui.action.IDisposableAction;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ContributionItemConstants;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.DisposeContributionsOperation;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionDescriptorReader;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ProviderContributionDescriptor;
-import org.eclipse.gmf.runtime.common.ui.util.ActionGroupCache;
-import org.eclipse.gmf.runtime.common.ui.util.ActivityUtil;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.common.ui.util.WorkbenchPartDescriptor;
-import org.eclipse.jface.action.AbstractGroupMarker;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IContributionManagerOverrides;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.actions.ActionGroup;
-
-/**
- * An abstract implementation of the IContributionItemProvider interface
- * This provider performs the contribution by reading its XML contribution
- * descriptor and parsing it in the correct format.
- * <P>
- * Contribution item providers wishing "not" to read an XML-based descriptor
- * but rather performs the contribution totally programatically should not
- * subclass this class but rather implement the <code>IContributionItemProvider</code>
- * interface directly. 
- * 
- * @author melaasar, cmahoney
- */
-public abstract class AbstractContributionItemProvider
-	extends AbstractProvider
-	implements IContributionItemProvider, IContributionDescriptorReader {
-
-	/** the provider's contribution descriptor */
-	private ProviderContributionDescriptor contributionDescriptor;
-	/** the action registry cache by workbench part descriptor*/
-	private Map actionCache = new HashMap();
-	/** the Action Group registry cache by workbench part descriptor */
-	private ActionGroupCache actionGroupCache = new ActionGroupCache();
-	
-	/**
-	 * Identifies the plugin where the contributions were made so that these
-	 * contributions can be filtered if an activity/capability associated with
-	 * the plugin is disabled.
-	 */
-	private IPluginContribution pluginContribution;
-    
-	/**
-	 * A list of part descriptors ids for which actionbar contributions have
-	 * already been made.
-	 */
-	private Set partDescriptors = new HashSet();
-
-	/**
-	 * Gets the structured selection from the workbench part described by
-	 * <code>partDescriptor</code>.
-	 * 
-	 * @param partDescriptor
-	 *            the part descriptor
-	 * @return the structured selection
-	 */
-	protected IStructuredSelection getStructuredSelection(IWorkbenchPartDescriptor partDescriptor) {
-		
-		IStructuredSelection selection = null;
-		IWorkbenchPart activePart = partDescriptor.getPartPage().getActivePart();
-		if(activePart != null) {
-			ISelectionProvider selectionProvider = activePart.getSite().getSelectionProvider();
-				
-			if (selectionProvider != null
-				&& selectionProvider.getSelection() instanceof IStructuredSelection) {
-				selection = (IStructuredSelection) selectionProvider.getSelection();
-			}
-		}
-		return (selection != null) ? selection : StructuredSelection.EMPTY;
-	}
-	
-	/**
-	 * Gets the first object in the selection in the workbench part described by
-	 * <code>partDescriptor</code>.
-	 * 
-	 * @param partDescriptor
-	 *            the part descriptor
-	 * @return the first object in the selection
-	 */
-	protected Object getSelectedObject(IWorkbenchPartDescriptor partDescriptor)
-	{
-		IStructuredSelection ss = getStructuredSelection(partDescriptor);
-		if(!ss.isEmpty())
-			return ss.getFirstElement();
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionDescriptorReader#setContributionDescriptor(org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ProviderContributionDescriptor)
-	 */
-	public final void setContributionDescriptor(ProviderContributionDescriptor descriptor) {
-		contributionDescriptor = descriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#contributeToActionBars(org.eclipse.ui.IActionBars, org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	public final void contributeToActionBars(
-		IActionBars actionBars,
-		IWorkbenchPartDescriptor partDescriptor) {
-		
-		contributeToActionBars(actionBars, partDescriptor, false);
-	}
-	
-	/**
-	 * Contributes to the given action bars that belong to a part described with
-	 * the given part descriptor.
-	 * 
-	 * <p>
-	 * Note: There are currently issues with updating the main menu manager when
-	 * multiple editors are open. If contributing to a menu manager that the
-	 * contribution item service contributed (e.g. the diagram menu), when
-	 * updating it does not always find the instance of the menu manager
-	 * associated with the correct editor.
-	 * 
-	 * @param actionBars
-	 *            The target action bars
-	 * @param workbenchPartDescriptor
-	 *            The context workbench part descriptor
-	 * @param updateOnly
-	 *            If true, this is called when only updating the actionbars and
-	 *            not when the editor is first opened.
-	 */
-	private void contributeToActionBars(IActionBars actionBars,
-			IWorkbenchPartDescriptor partDescriptor, boolean updateOnly) {
-
-		partDescriptors.add(partDescriptor);
-
-		Iterator contributions =
-			contributionDescriptor
-				.getContributionsFor(
-					partDescriptor.getPartId(),
-					partDescriptor.getPartClass())
-				.iterator();
-
-		while (contributions.hasNext()) {
-			Object c = contributions.next();
-
-			if (c
-				instanceof ProviderContributionDescriptor.PartMenuDescriptor) {
-				ProviderContributionDescriptor.PartMenuDescriptor item =
-					(ProviderContributionDescriptor.PartMenuDescriptor) c;
-
-				if (!updateOnly) {
-					contributeItem(
-						new MenuContributionItemAdapter(
-							item.getId(),
-							partDescriptor),
-						actionBars.getMenuManager(),
-						item.getMenubarPath(),
-						item.getMenubarGroup());
-				}
-
-				contributeItem(
-					new MenuContributionItemAdapter(
-						item.getId(),
-						partDescriptor),
-					actionBars.getToolBarManager(),
-					item.getToolbarPath(),
-					item.getToolbarGroup());
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PartMenuGroupDescriptor) {
-				ProviderContributionDescriptor.PartMenuGroupDescriptor item =
-					(ProviderContributionDescriptor.PartMenuGroupDescriptor) c;
-
-				if (!updateOnly) {
-					contributeItem(
-						new MenuGroupContributionItemAdapter(
-							item.getId(),
-							item.isSeparator()),
-						actionBars.getMenuManager(),
-						item.getMenubarPath(),
-						item.getMenubarGroup());
-				}
-
-				contributeItem(
-					new MenuGroupContributionItemAdapter(
-						item.getId(),
-						item.isSeparator()),
-					actionBars.getToolBarManager(),
-					item.getToolbarPath(),
-					item.getToolbarGroup());
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PartActionDescriptor) {
-				ProviderContributionDescriptor.PartActionDescriptor item =
-					(ProviderContributionDescriptor.PartActionDescriptor) c;
-
-				if (!updateOnly) {
-					contributeItem(
-						new ActionContributionItemAdapter(
-							item.getId(),
-							partDescriptor, 
-							item),
-						actionBars.getMenuManager(),
-						item.getMenubarPath(),
-						item.getMenubarGroup());
-				}
-
-				contributeItem(
-					new ActionContributionItemAdapter(
-						item.getId(),
-						partDescriptor, 
-						item),
-					actionBars.getToolBarManager(),
-					item.getToolbarPath(),
-					item.getToolbarGroup());
-
-				if (item.isGlobal())
-					actionBars.setGlobalActionHandler(
-						item.getId(),
-						getAction(item.getId(), partDescriptor, item));
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PartCustomDescriptor) {
-				ProviderContributionDescriptor.PartCustomDescriptor item =
-					(ProviderContributionDescriptor.PartCustomDescriptor) c;
-
-				if (!updateOnly) {
-					contributeItem(
-						new CustomContributionItemAdapter(
-							item.getId(),
-							partDescriptor),
-						actionBars.getMenuManager(),
-						item.getMenubarPath(),
-						item.getMenubarGroup());
-				}
-
-				contributeItem(
-					new CustomContributionItemAdapter(
-						item.getId(),
-						partDescriptor),
-					actionBars.getToolBarManager(),
-					item.getToolbarPath(),
-					item.getToolbarGroup());
-			} else if (
-					c
-						instanceof ProviderContributionDescriptor.PartActionGroupDescriptor) {
-					ProviderContributionDescriptor.PartActionGroupDescriptor item =
-						(ProviderContributionDescriptor.PartActionGroupDescriptor) c;
-					
-					contributeItem(
-						new ActionGroupContributionItemAdapter(
-							item.getId(),
-							partDescriptor),
-							actionBars);
-			} else if (c instanceof ProviderContributionDescriptor.PartPredefinedItemDescriptor) {
-                ProviderContributionDescriptor.PartPredefinedItemDescriptor item = (ProviderContributionDescriptor.PartPredefinedItemDescriptor) c;
-
-                if (item.isToBeRemovedFromToolbar()) {
-                	removeExistingItem(item.getId(), item.getToolbarPath(), actionBars.getToolBarManager(), false);
-                }
-                if (item.isToBeRemovedFromMenubar()) {
-                    removeExistingItem(item.getId(), item.getMenubarPath(), actionBars.getMenuManager(), true);
-                }
-			}
-		}
-	}
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionItemProvider#updateActionBars(org.eclipse.ui.IActionBars,
-     *      org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-     */
-	public final void updateActionBars(IActionBars actionBars,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		if (!partDescriptors.contains(partDescriptor)) {
-			contributeToActionBars(actionBars, partDescriptor, true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#contributeToPopupMenu(org.eclipse.jface.action.IMenuManager, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public final void contributeToPopupMenu(
-		IMenuManager popupMenu,
-		IWorkbenchPart workbenchPart) {
-
-		ISelection selection =
-			workbenchPart.getSite().getSelectionProvider().getSelection();
-
-		IWorkbenchPartDescriptor partDescriptor =
-			new WorkbenchPartDescriptor(
-				workbenchPart.getSite().getId(),
-				workbenchPart.getClass(),
-				workbenchPart.getSite().getPage());
-
-		Iterator contributions =
-			contributionDescriptor
-				.getContributionsFor(popupMenu, selection)
-				.iterator();
-
-		while (contributions.hasNext()) {
-			Object c = contributions.next();
-
-			if (c
-				instanceof ProviderContributionDescriptor.PopupMenuDescriptor) {
-				ProviderContributionDescriptor.PopupMenuDescriptor item =
-					(ProviderContributionDescriptor.PopupMenuDescriptor) c;
-
-				contributeItem(
-					new MenuContributionItemAdapter(
-						item.getId(),
-						partDescriptor),
-					popupMenu,
-					item.getPath(),
-					item.getGroup());
-
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PopupMenuGroupDescriptor) {
-				ProviderContributionDescriptor.PopupMenuGroupDescriptor item =
-					(ProviderContributionDescriptor.PopupMenuGroupDescriptor) c;
-
-				contributeItem(
-					new MenuGroupContributionItemAdapter(
-						item.getId(),
-						item.isSeparator()),
-					popupMenu,
-					item.getPath(),
-					item.getGroup());
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PopupActionDescriptor) {
-				ProviderContributionDescriptor.PopupActionDescriptor item =
-					(ProviderContributionDescriptor.PopupActionDescriptor) c;
-
-				contributeItem(
-					new ActionContributionItemAdapter(
-						item.getId(),
-						partDescriptor,
-						item),
-					popupMenu,
-					item.getPath(),
-					item.getGroup());
-			} else if (
-				c
-					instanceof ProviderContributionDescriptor.PopupCustomDescriptor) {
-				ProviderContributionDescriptor.PopupCustomDescriptor item =
-					(ProviderContributionDescriptor.PopupCustomDescriptor) c;
-
-				contributeItem(
-					new CustomContributionItemAdapter(
-						item.getId(),
-						partDescriptor),
-					popupMenu,
-					item.getPath(),
-					item.getGroup());
-			} else if (
-					c
-						instanceof ProviderContributionDescriptor.PopupActionGroupDescriptor) {
-					ProviderContributionDescriptor.PopupActionGroupDescriptor item =
-						(ProviderContributionDescriptor.PopupActionGroupDescriptor) c;
-
-					contributeItem(
-						new ActionGroupContributionItemAdapter(
-							item.getId(),
-							partDescriptor),
-						popupMenu,
-						item.getPath(),
-						item.getGroup());
-            } else if (c instanceof ProviderContributionDescriptor.PopupPredefinedItemDescriptor) {
-                ProviderContributionDescriptor.PopupPredefinedItemDescriptor item = (ProviderContributionDescriptor.PopupPredefinedItemDescriptor) c;
-
-                if (item.isToBeRemoved()) {
-                    removeExistingItem(item.getId(), item.getPath(), popupMenu, false);
-                }
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#disposeContributions(org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	public final void disposeContributions(IWorkbenchPartDescriptor partDescriptor) {
-		ActionRegistry registry = (ActionRegistry) actionCache.get(partDescriptor);
-		if (registry != null) {
-			registry.dispose();
-		}
-		actionCache.remove(partDescriptor);
-		
-		// dispose of the action group contributions
-		actionGroupCache.dispose(partDescriptor);
-		
-		partDescriptors.remove(partDescriptor);
-	}
-
-	/* (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 DisposeContributionsOperation) {
-			IWorkbenchPartDescriptor partDescriptor =
-				((DisposeContributionsOperation) operation)
-					.getWorkbenchPartDescriptor();
-			return actionCache.containsKey(partDescriptor) || actionGroupCache.contains(partDescriptor);
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the action with the given id that is created for the given part id.
-	 * An action is created once and cached for each unique part's id.
-	 * 
-	 * @param actionId The request action id
-	 * @param partDescriptor The workbench part descriptor
-	 * @return The action with the given id
-	 */
-	protected final IAction getAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		ActionRegistry registry = (ActionRegistry) actionCache.get(partDescriptor);
-		if (registry == null) {
-			registry = new ActionRegistry();
-			actionCache.put(partDescriptor, registry);
-		}
-		
-		IAction action = getActionFromRegistry(actionId, partDescriptor, registry);
-		if (action == null) {
-			action = createAction(actionId, partDescriptor);
-			if (action != null) {
-				if (action instanceof IDisposableAction) {
-					((IDisposableAction) action).init();
-				}
-
-				registry.registerAction(actionId, action);
-			}
-		}
-		else {
-			if ( action instanceof IActionWithProgress ) {
-				((IActionWithProgress)action).refresh();
-			}
-		}
-		return action;
-	}
-
-	/**
-	 * Returns the action with the given id that is created for the given part
-	 * id. An action is created once and cached for each unique part's id.
-	 * <P>
-	 * The part selector is used is when the new action is an
-	 * <code>AbstractActionHandler</code> to determine whether or not the
-	 * action is applicable to a given selected part. If the part is not
-	 * applicable, the action will not be refreshed when selection changes in
-	 * the part.
-	 * 
-	 * @param actionId
-	 *            The request action id
-	 * @param partDescriptor
-	 *            The workbench part descriptor
-	 * @param partSelector
-	 *            The part selector
-	 * @return The action with the given id
-	 */
-	protected final IAction getAction(String actionId,
-			IWorkbenchPartDescriptor partDescriptor, IPartSelector partSelector) {
-
-        boolean actionExistsAlready = false;
-        ActionRegistry registry = (ActionRegistry) actionCache.get(partDescriptor);
-        if (registry != null) {
-            if (getActionFromRegistry(actionId, partDescriptor, registry) != null) {
-                actionExistsAlready = true;
-            }
-        }
-        
-		IAction result = getAction(actionId, partDescriptor);
-        
-        // If the action already existed in the registry and this is a popup
-        // menu contribution, we do not want to override the part selector
-        // already set as we could override the part selector for a toolbar
-        // action.  See bugzilla#157471.
-        if (actionExistsAlready
-            && partSelector instanceof ProviderContributionDescriptor.AbstractPopupContributionItemDescriptor) {
-            return result;
-        }
-		
-		if (result instanceof AbstractActionHandler && partSelector != null) {
-			((AbstractActionHandler) result).setPartSelector(partSelector);
-		}
-		return result;
-	}
-	/**
-	 * Returns the ActionGroup with the given id that is created for the given part id
-	 * An ActionGroup is created once and cached for each unique part's id
-	 * 
-	 * @param actionGroupId The request action group id
-	 * @param partDescriptor The workbench part descriptor
-	 * @return The ActionGroup with the given id
-	 */
-	protected final ActionGroup getActionGroup(String actionGroupId,
-			IWorkbenchPartDescriptor partDescriptor) {
-		ActionGroup actionGroup = actionGroupCache.getActionGroup(actionGroupId, partDescriptor);
-		
-		if (actionGroup == null) {
-			actionGroup = createActionGroup(actionGroupId, partDescriptor);
-			actionGroupCache.addActionGroup(actionGroupId, actionGroup, partDescriptor);
-		}
-		return actionGroup;
-	}
-	
-	/**
-	 * This method put in order to override the action registry caching. Used to
-	 * get around unimplemented features of contribution item service.
-	 * 
-	 * @param actionId
-	 *            the action id
-	 * @param partDescriptor
-	 *            the part descriptor
-	 * @param registry
-	 *            the action registry
-	 * @return the action with <code>actionId</code> retrieved from the action
-	 *         <code>registry</code>.
-	 */
-	protected IAction getActionFromRegistry(String actionId, IWorkbenchPartDescriptor partDescriptor, ActionRegistry registry){
-		return registry.getAction(actionId);
-	}
-
-	/**
-	 * Creates the action with the given id. By default, this method does
-	 * nothing. Subclasses must override to provide their own implementation of
-	 * action creation.
-	 * 
-	 * @param actionId
-	 *            The action id
-	 * @param partDescriptor
-	 *            The workbench part descriptor
-	 * @return The action with the given id
-	 */
-	protected IAction createAction(
-		String actionId,
-		IWorkbenchPartDescriptor partDescriptor) {
-		return null;
-	}
-
-	/**
-	 * Creates the action group for the given id. By default, this method does
-	 * nothing. Subclasses must override to provide their own implementation of
-	 * action group creation.
-	 * 
-	 * @param actionGroupId
-	 *            The action group id
-	 * @param partDescriptor
-	 *            The workbench part descriptor
-	 * @return Action Group for the given id
-	 */
-	protected ActionGroup createActionGroup(
-		String actionGroupId,
-		IWorkbenchPartDescriptor partDescriptor) {
-		return null;
-	}
-
-	/**
-	 * Creates the menu manager with the given id. By default, this method does
-	 * nothing. Subclasses must override to provide their own implementation of
-	 * menu manager creation.
-	 * 
-	 * @param menuId
-	 *            The menu manager id
-	 * @param partDescriptor
-	 *            The workbench part descriptor
-	 * @return The menu manager with the given id
-	 */
-	protected IMenuManager createMenuManager(
-		String menuId,
-		IWorkbenchPartDescriptor partDescriptor) {
-		return null;
-	}
-
-	/**
-	 * Creates the custom contribution with the given id. By default, this
-	 * method does nothing. Subclasses must override to provide their own
-	 * implementation of custom contribution creation.
-	 * 
-	 * @param customId
-	 *            The custom contribution id
-	 * @param partDescriptor
-	 *            The workbench part descriptor
-	 * @return The custom contribution with the given id
-	 */
-	protected IContributionItem createCustomContributionItem(
-		String customId,
-		IWorkbenchPartDescriptor partDescriptor) {
-		return null;
-	}
-
-	/**
-	 * Finds a menu manager using a '/' separated path.
-	 * 
-	 * @param parent
-	 *            The starting contribution manager
-	 * @param path
-	 *            The '/' separated path
-	 * @return A menu manager described by the given path
-	 */
-	private IMenuManager findMenuUsingPath(
-		IContributionManager parent,
-		String path) {
-
-		IContributionItem item = null;
-		String id = path;
-		String rest = null;
-		int separator = path.indexOf('/');
-		if (separator != -1) {
-			id = path.substring(0, separator);
-			rest = path.substring(separator + 1);
-		} else {
-			item = parent.find(path);
-			if (item instanceof IMenuManager)
-				return (IMenuManager) item;
-		}
-
-		item = parent.find(id);
-		if (item instanceof IMenuManager) {
-			IMenuManager manager = (IMenuManager) item;
-			return manager.findMenuUsingPath(rest);
-		}
-		return null;
-	}  
- 
-	/**
-	 * Contributes the given item to the given manager in the given path/group.
-	 * 
-	 * @param contributionItem
-	 *            The item to be contributed
-	 * @param contributionManager
-	 *            The manager to be contributed to
-	 * @param path
-	 *            The path of contribution within the manager
-	 * @param group
-	 *            The group of contribution within the path
-	 */
-	private void contributeItem(
-		IAdaptable contributionItemAdapter,
-		IContributionManager contributionManager,
-		String path,
-		String group) {
-
-		// Find parent menu.
-		if (path == null)
-			return;
-		IContributionManager parent = contributionManager;
-
-		if (path.length() > 1) { // if path is more than '/'
-			parent = findMenuUsingPath(parent, path.substring(1));
-			if (parent == null) {
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The contribution item path is invalid"); //$NON-NLS-1$
-				return;
-			}
-		}
-
-		//if contributing a menu group
-		if (contributionItemAdapter
-			instanceof MenuGroupContributionItemAdapter) {
-			IContributionItem contributionItem =
-				(IContributionItem) contributionItemAdapter.getAdapter(
-					IContributionItem.class);
-			parent.add(contributionItem);
-			return;
-		}
-		
-		//if contributing an action group
-		if (contributionItemAdapter
-			instanceof ActionGroupContributionItemAdapter) {
-
-			try {
-				ActionGroup actionGroup = 
-					(ActionGroup) contributionItemAdapter.getAdapter(
-						ActionGroup.class);
-	
-				if (parent instanceof IMenuManager) {
-					actionGroup.fillContextMenu((IMenuManager) parent);
-				}
-			} catch (IllegalArgumentException e) {
-				Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, CommonUIServicesActionPlugin.getDefault().getClass(), "Error adding contribution item", e); //$NON-NLS-1$
-				Log.error(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Error adding contribution item", e); //$NON-NLS-1$
-			}
-
-			return;
-		}
-		
-		// Find reference group.
-		if (group == null)
-			return;
-		IContributionItem sep = parent.find(group);
-		if (sep == null) {
-			if (group.equals(ContributionItemConstants.GROUP_ADDITIONS)) {
-				sep = new Separator(group);
-				parent.add(sep);
-			}
-			if (sep == null) {
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The contribution item group is invalid"); //$NON-NLS-1$
-				return;
-			}
-		}
-
-		// Add contribution to group
-		try {
-			IContributionItem contributionItem =
-				(IContributionItem) contributionItemAdapter.getAdapter(
-					IContributionItem.class);
-			if (contributionItem != null) {
-				if (sep.isGroupMarker())
-					parent.appendToGroup(group, contributionItem);
-				else
-					parent.insertAfter(group, contributionItem);
-			} else
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Failed to create the contribution with id: " + (String) contributionItemAdapter.getAdapter(String.class)); //$NON-NLS-1$
-		} catch (IllegalArgumentException e) {
-			Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, CommonUIServicesActionPlugin.getDefault().getClass(), "Error adding contribution item", e); //$NON-NLS-1$
-			Log.error(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Error adding contribution item", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Contributes the given item to the given manager in the given path/group.
-	 * 
-	 * @param contributionItem
-	 *            The item to be contributed
-	 * @param contributionManager
-	 *            The manager to be contributed to
-	 * @param path
-	 *            The path of contribution within the manager
-	 * @param group
-	 *            The group of contribution within the path
-	 */
-	private void contributeItem(
-		IAdaptable contributionItemAdapter,
-		IActionBars actionBars) {
-
-		//if contributing an action group
-		if (contributionItemAdapter
-			instanceof ActionGroupContributionItemAdapter) {
-
-			try {
-				ActionGroup actionGroup = 
-					(ActionGroup) contributionItemAdapter.getAdapter(
-						ActionGroup.class);
-	
-				actionGroup.fillActionBars(actionBars);
-				return;
-			} catch (IllegalArgumentException e) {
-				Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, CommonUIServicesActionPlugin.getDefault().getClass(), "Error adding contribution item", e); //$NON-NLS-1$
-				Log.error(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Error adding contribution item", e); //$NON-NLS-1$
-			}
-		}
-
-		Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Failed to create the contribution with id: " + (String) contributionItemAdapter.getAdapter(String.class)); //$NON-NLS-1$
-	}
-
-    /**
-     * @param id
-     * @param path
-     * @param contributionManager
-     */
-    private void removeExistingItem(String id, String path,
-            IContributionManager contributionManager, boolean useIdForRemoval) {
-
-        // Find the menu or action or group.
-        if (id == null)
-            return;
-        
-        IContributionManager parent = contributionManager;
-        if (path.length() > 1) { // if path is more than '/'
-            parent = findMenuUsingPath(contributionManager, path.substring(1));
-            if (parent == null) {
-                Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The contribution item path is invalid"); //$NON-NLS-1$
-                return;
-            }
-        }
-
-        IContributionItem predefinedItem = parent.find(id);
-        if (predefinedItem == null) {
-            Log.info(CommonUIServicesActionPlugin.getDefault(),
-                CommonUIServicesActionStatusCodes.SERVICE_FAILURE,
-                "The contribution item path is invalid"); //$NON-NLS-1$
-            return;
-        }
-
-         if (predefinedItem instanceof AbstractGroupMarker) {
-            IContributionItem allItems[] = parent.getItems();
-            int groupIndex;
-            for (groupIndex = 0; groupIndex < allItems.length; groupIndex++) {
-                IContributionItem item = allItems[groupIndex];
-                if (item.equals(predefinedItem)) {
-                    break;
-                }
-            }
-            for (int j = groupIndex + 1; j < allItems.length; j++) {
-                IContributionItem item = allItems[j];
-                if (item instanceof AbstractGroupMarker) {
-                    break;
-                }
-                parent.remove(item);
-            }
-
-        }
-        // parent.remove(item) and parent.remove(item.getId()) yield different results in some cases 
-        // parent.remove(item) seems to be working for all cases except for removing a menu from menu bar (item defined as partMenu)
-        if (useIdForRemoval) {
-        	parent.remove(predefinedItem.getId());
-        } else {
-        	parent.remove(predefinedItem);
-        }
-    }
-    
-	/**
-     * An adapter for an action contribution item.
-     */
-	private class ActionContributionItemAdapter implements IAdaptable {
-		private String actionId;
-		private IWorkbenchPartDescriptor partDescriptor;
-		private final IPartSelector partSelector;
-		
-		/**
-		 * Creates an instance of <code>ActionContributionItemAdapter</code>.
-		 * 
-		 * @param actionId attribute for action ID
-		 * @param partDescriptor attribute for partDescriptor
-         * @param partSelector selects parts that match this contribution item
-		 */
-		public ActionContributionItemAdapter(
-			String actionId,
-			IWorkbenchPartDescriptor partDescriptor,
-			IPartSelector partSelector) {
-			
-			this.actionId = actionId;
-			this.partDescriptor = partDescriptor;
-			this.partSelector = partSelector;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == IContributionItem.class) {
-				IAction action = getAction(actionId, partDescriptor, partSelector);
-				if (action != null) {
-					return new PluginActionContributionItem(action);
-				}
-			} else if (adapter == String.class) {
-				return actionId;
-			}
-			return null;
-		}
-	}
-	
-	/**
-	 * An adapter for an action group contribution item.
-	 */
-	private class ActionGroupContributionItemAdapter implements IAdaptable {
-		private String menuId;
-		private IWorkbenchPartDescriptor partDescriptor;
-
-		/**
-		 * Creates an instance of <code>ActionGroupContributionItemAdapter</code>
-		 * @param menuId attribute for menu ID
-		 * @param partDescriptor attribute for partDescriptor
-		 */
-		public ActionGroupContributionItemAdapter(
-			String menuId,
-			IWorkbenchPartDescriptor partDescriptor) {
-			this.menuId = menuId;
-			this.partDescriptor = partDescriptor;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == ActionGroup.class) {
-				return getActionGroup(menuId, partDescriptor);
-			} else if (adapter == String.class) {
-				return menuId;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * An adapter for an menu contribution item.
-	 */
-	private class MenuContributionItemAdapter implements IAdaptable {
-		private String menuId;
-		private IWorkbenchPartDescriptor partDescriptor;
-
-		/**
-		 * Creates an instance of <code>MenuContributionItemAdapter</code>.
-		 * 
-		 * @param menuId attribute for menuID
-		 * @param partDescriptor attribute for partDescriptor
-		 */
-		public MenuContributionItemAdapter(
-			String menuId,
-			IWorkbenchPartDescriptor partDescriptor) {
-			this.menuId = menuId;
-			this.partDescriptor = partDescriptor;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == IContributionItem.class) {
-                IMenuManager manager = createMenuManager(menuId, partDescriptor);
-                if (manager != null) {
-                    return new PluginMenuManager(manager);
-                }
-			} else if (adapter == String.class) {
-				return menuId;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * An adapter for an menu group contribution item.
-	 */
-	private class MenuGroupContributionItemAdapter implements IAdaptable {
-		private String groupId;
-		private boolean isSeparator;
-
-		/**
-		 * Creates an instance of <code>MenuGroupContributionItemAdapter</code>.
-		 * 
-		 * @param groupId attribute for groupID
-		 * @param isSeparator attribute for isSeparator
-		 */
-		public MenuGroupContributionItemAdapter(
-			String groupId,
-			boolean isSeparator) {
-			this.groupId = groupId;
-			this.isSeparator = isSeparator;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == IContributionItem.class) {
-				if (isSeparator)
-					return new PluginSeparator(groupId);
-				return new PluginGroupMarker(groupId);
-			} else if (adapter == String.class) {
-				return groupId;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * An adapter for an custom contribution item.
-	 */
-	private class CustomContributionItemAdapter implements IAdaptable {
-		private String customId;
-		private IWorkbenchPartDescriptor partDescriptor;
-
-		/**
-		 * Creates an instance of <code>CustomContributionItemAdapter</code>.
-		 * 
-		 * @param customId attribute for customID
-		 * @param partDescriptor attribute for partDescriptor
-		 */
-		public CustomContributionItemAdapter(
-			String customId,
-			IWorkbenchPartDescriptor partDescriptor) {
-			this.customId = customId;
-			this.partDescriptor = partDescriptor;
-		}
-
-		public Object getAdapter(Class adapter) {
-			if (adapter == IContributionItem.class) {
-				IContributionItem item =
-					createCustomContributionItem(customId, partDescriptor);
-				return item;
-			} else if (adapter == String.class) {
-				return customId;
-			}
-			return null;
-		}
-	}
-	
-	/**
-     * Checks if there are activities that have been matched to the plug-in or
-     * id in which the item has been contributed and if at least one of those
-     * matching activities are enabled.
-     * 
-     * @return true if at least one matching activity is enabled
-     */
-    private boolean areActivitiesEnabled(final String itemID) {
-        // check if the provider has been matched to a disabled activity id
-        if (!ActivityUtil.isEnabled(getPluginContribution().getLocalId(),
-            getPluginContribution().getPluginId())) {
-            return false;
-        }
-
-        // now check if the item has been matched to a disabled activity id
-        if (!ActivityUtil.isEnabled(itemID, getPluginContribution()
-            .getPluginId())) {
-            return false;
-        }
-
-        return true;
-    }
-
-	/**
-	 * Sets the plugin contribution which identifies the plugin where the
-	 * contributions were made so that these contributions can be filtered if an
-	 * activity/capability associated with the plugin is disabled.
-	 * 
-	 * @param pluginContribution
-	 *            the plugin contribution
-	 */
-	void setPluginContribution(IPluginContribution pluginContribution) {
-		this.pluginContribution = pluginContribution;
-	}
-
-	/**
-	 * Gets the plugin contribution which identifies the plugin where the
-	 * contributions were made so that these contributions can be filtered if an
-	 * activity/capability associated with the plugin is disabled.
-	 * 
-	 * @return the plugin contribution
-	 */
-	IPluginContribution getPluginContribution() {
-		return pluginContribution;
-	}
-
-	/**
-	 * An <code>IMenuManager</code> whose visibility is affected by
-	 * activites/capabilities.
-	 * 
-	 * @author cmahoney
-	 */
-	private class PluginMenuManager
-		extends MenuManager {
-
-		private IMenuManager realMenuManager;
-
-		public PluginMenuManager(IMenuManager menuManager) {
-			this.realMenuManager = menuManager;
-		}
-
-		public void add(IAction action) {
-			realMenuManager.add(action);
-		}
-
-		public void add(IContributionItem item) {
-			realMenuManager.add(item);
-		}
-
-		public void addMenuListener(IMenuListener listener) {
-			realMenuManager.addMenuListener(listener);
-		}
-
-		public void appendToGroup(String groupName, IAction action) {
-			realMenuManager.appendToGroup(groupName, action);
-		}
-
-		public void appendToGroup(String groupName, IContributionItem item) {
-			realMenuManager.appendToGroup(groupName, item);
-		}
-
-		public void dispose() {
-			realMenuManager.dispose();
-		}
-
-		public void fill(Composite parent) {
-			realMenuManager.fill(parent);
-		}
-
-		public void fill(CoolBar parent, int index) {
-			realMenuManager.fill(parent, index);
-		}
-
-		public void fill(Menu parent, int index) {
-			realMenuManager.fill(parent, index);
-		}
-
-		public void fill(ToolBar parent, int index) {
-			realMenuManager.fill(parent, index);
-		}
-
-		public IContributionItem find(String id) {
-			return realMenuManager.find(id);
-		}
-
-		public IMenuManager findMenuUsingPath(String path) {
-			return realMenuManager.findMenuUsingPath(path);
-		}
-
-		public IContributionItem findUsingPath(String path) {
-			return realMenuManager.findUsingPath(path);
-		}
-
-		public String getId() {
-			return realMenuManager.getId();
-		}
-
-		public IContributionItem[] getItems() {
-			return realMenuManager.getItems();
-		}
-
-		public IContributionManagerOverrides getOverrides() {
-			return realMenuManager.getOverrides();
-		}
-
-		public boolean getRemoveAllWhenShown() {
-			return realMenuManager.getRemoveAllWhenShown();
-		}
-
-		public void insertAfter(String id, IAction action) {
-			realMenuManager.insertAfter(id, action);
-		}
-
-		public void insertAfter(String id, IContributionItem item) {
-			realMenuManager.insertAfter(id, item);
-		}
-
-		public void insertBefore(String id, IAction action) {
-			realMenuManager.insertBefore(id, action);
-		}
-
-		public void insertBefore(String id, IContributionItem item) {
-			realMenuManager.insertBefore(id, item);
-		}
-
-		public String getMenuText() {
-			String text = null;
-			if(realMenuManager instanceof MenuManager) {
-				text = ((MenuManager)realMenuManager).getMenuText();
-			}
-			return text;
-		}
-
-		public boolean isDirty() {
-			return realMenuManager.isDirty();
-		}
-
-		public boolean isDynamic() {
-			return realMenuManager.isDynamic();
-		}
-
-		public boolean isEmpty() {
-			return realMenuManager.isEmpty();
-		}
-
-		public boolean isEnabled() {
-			return realMenuManager.isEnabled();
-		}
-
-		public boolean isGroupMarker() {
-			return realMenuManager.isGroupMarker();
-		}
-
-		public boolean isSeparator() {
-			return realMenuManager.isSeparator();
-		}
-
-		public boolean isVisible() {
-			if (!areActivitiesEnabled(getId())) {
-				return false;
-			}
-			return realMenuManager.isVisible();
-		}
-
-		public void markDirty() {
-			realMenuManager.markDirty();
-		}
-
-		public void prependToGroup(String groupName, IAction action) {
-			realMenuManager.prependToGroup(groupName, action);
-		}
-
-		public void prependToGroup(String groupName, IContributionItem item) {
-			realMenuManager.prependToGroup(groupName, item);
-		}
-
-		public IContributionItem remove(IContributionItem item) {
-			return realMenuManager.remove(item);
-		}
-
-		public IContributionItem remove(String id) {
-			return realMenuManager.remove(id);
-		}
-
-		public void removeAll() {
-			realMenuManager.removeAll();
-		}
-
-		public void removeMenuListener(IMenuListener listener) {
-			realMenuManager.removeMenuListener(listener);
-		}
-
-		public void saveWidgetState() {
-			realMenuManager.saveWidgetState();
-		}
-
-		public void setParent(IContributionManager parent) {
-			realMenuManager.setParent(parent);
-		}
-
-		public void setRemoveAllWhenShown(boolean removeAll) {
-			realMenuManager.setRemoveAllWhenShown(removeAll);
-		}
-
-		public void setVisible(boolean visible) {
-			realMenuManager.setVisible(visible);
-		}
-
-		public void update() {
-			realMenuManager.update();
-		}
-
-		public void update(boolean force) {
-			realMenuManager.update(force);
-		}
-
-		public void update(String id) {
-			realMenuManager.update(id);
-		}
-
-		public void updateAll(boolean force) {
-			realMenuManager.updateAll(force);
-		}
-	}
-
-	/**
-	 * A <code>Separator</code> whose visibility is affected by
-	 * activites/capabilities.
-	 * 
-	 * @author cmahoney
-	 */
-	private class PluginSeparator
-		extends Separator {
-
-		public PluginSeparator(String groupName) {
-			super(groupName);
-		}
-
-		public boolean isVisible() {
-			if (!areActivitiesEnabled(getId())) {
-				return false;
-			}
-			return super.isVisible();
-		}
-
-	}
-
-	/**
-	 * A <code>GroupMarker</code> whose visibility is affected by
-	 * activites/capabilities.
-	 * 
-	 * @author cmahoney
-	 */
-	private class PluginGroupMarker
-		extends GroupMarker {
-
-		public PluginGroupMarker(String groupName) {
-			super(groupName);
-		}
-
-		public boolean isVisible() {
-			if (!areActivitiesEnabled(getId())) {
-				return false;
-			}
-			return super.isVisible();
-		}
-
-	}
-
-	/**
-	 * An <code>ActionContributionItem</code> whose visibility is affected by
-	 * activites/capabilities.
-	 * 
-	 * @author cmahoney
-	 */
-	private class PluginActionContributionItem
-		extends ActionContributionItem {
-
-		public PluginActionContributionItem(IAction action) {
-			super(action);
-		}
-
-		public boolean isVisible() {
-			if (!areActivitiesEnabled(getId())) {
-				return false;
-			}
-			return super.isVisible();
-		}
-		
-	}
-    
-    
-}
-
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ActionRegistry.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ActionRegistry.java
deleted file mode 100644
index 85b1a78..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ActionRegistry.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.services.action.contributionitem;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.action.IAction;
-
-import org.eclipse.gmf.runtime.common.ui.action.IDisposableAction;
-
-/**
- * An action registry used for action life cycle management
- * 
- * @author melaasar
- */
-public class ActionRegistry {
-
-	/**
-	 * A hashmap that contains the actions.
-	 */
-	private Map map = new HashMap();
-
-	/**
-	 * Calls init on all actions which implement the {@link IDisposableAction} interface so they
-	 * can do their initialization.
-	 */
-	public void init() {
-		Iterator actions = getActions();
-		while (actions.hasNext()) {
-			IAction action = (IAction) actions.next();
-			if (action instanceof IDisposableAction)
-				 ((IDisposableAction) action).init();
-		}
-	}
-
-	/**
-	 * Calls dispose on all actions which implement the {@link IDisposableAction} interface so they
-	 * can perform their own clean-up.
-	 */
-	public void dispose() {
-		Iterator actions = getActions();
-		while (actions.hasNext()) {
-			IAction action = (IAction) actions.next();
-			if (action instanceof IDisposableAction)
-				 ((IDisposableAction) action).dispose();
-		}
-	}
-
-	/**
-	 * Returns the action with the given key. The key is the ID of the action
-	 * (see {@link #registerAction(IAction)}and
-	 * {@link #registerAction(String, IAction)}).
-	 * 
-	 * @param key
-	 *            the key
-	 * @return the action
-	 */
-	public IAction getAction(Object key) {
-		return (IAction) map.get(key);
-	}
-
-	/**
-	 * Returns an <code>Iterator</code> of all the actions.
-	 * @return the iterator
-	 */
-	protected Iterator getActions() {
-		return map.values().iterator();
-	}
-
-	/**
-	 * Register an action with this registry.  The action must have an id associated with it, which
-	 * will be used as the key to later obtain the action using {@link #getAction(Object)}. 
-	 * @param action the action to be registered
-	 */
-	public void registerAction(IAction action) {
-		registerAction(action.getId(), action);
-	}
-
-	/**
-	 * Register an action with this registry using the given id. The string
-	 * <code>id</code> will be used as the key to later obtain the action
-	 * using {@link #getAction(Object)}.
-	 * 
-	 * @param id
-	 *            the action ID
-	 * @param action
-	 *            the action
-	 */
-	public void registerAction(String id, IAction action) {
-		map.put(id, action);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java
deleted file mode 100644
index af79ca6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/ContributionItemService.java
+++ /dev/null
@@ -1,296 +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.ui.services.action.contributionitem;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-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.action.internal.CommonUIServicesActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ContributeToActionBarsOperation;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ContributeToPopupMenuOperation;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.DisposeContributionsOperation;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionDescriptorReader;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.ProviderContributionDescriptor;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.UpdateActionBarsOperation;
-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.common.ui.util.WorkbenchPartDescriptor;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IWorkbenchPart;
-import org.osgi.framework.Bundle;
-
-/**
- * A service for contributing items into different <code>IWorkbenchPart</code>'s 
- * contribution managers: ActionBars and ContextMenu(s).
- * 
- * @see IContributionItemProvider
- * @see AbstractContributionItemProvider
- * 
- * @author melaasar, cmahoney
- */
-public class ContributionItemService
-	extends Service
-	implements IContributionItemProvider {
-
-	/**
-	 * A descriptor for <code>IContributionItemProvider</code> defined
-	 * by a configuration element.
-	 */
-	protected static class ProviderDescriptor
-		extends ActivityFilterProviderDescriptor {
-
-		private static final String CHECK_PLUGIN_LOADED = "checkPluginLoaded"; //$NON-NLS-1$
-
-		/** the provider contribution descriptor parsed from XML */
-		private ProviderContributionDescriptor contributionDescriptor;
-		/** a flag to check if plugin is loaded */
-		private boolean checkPluginLoaded = true;
-
-		/**
-		 * Constructs a <code>IContributionItemProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			String s = element.getAttribute(CHECK_PLUGIN_LOADED);
-			if (s != null)
-				this.checkPluginLoaded = Boolean.valueOf(s).booleanValue();
-
-			this.contributionDescriptor =
-				ProviderContributionDescriptor.parse(element);
-			assert null != contributionDescriptor : "contributionDescriptor cannot be null"; //$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) {
-
-			// If contributions are to be disposed, dispose them regardless whether the plugin is loaded or not 
-			if (operation instanceof DisposeContributionsOperation) {
-				if (provider != null)
-					return provider.provides(operation);
-			}
-			
-			// filter providers based on disabled capabilities
-			if (!super.provides(operation)) {
-				return false;
-			}
-			
-			// if asked to check that the plugin is loaded and it is not, ignore
-			if (checkPluginLoaded && !isPluginLoaded()) {
-				return false;
-			}
-			
-			// if no XML contributions, forward to the provider 
-			if (!contributionDescriptor.hasContributions()) {
-				if (!policyInitialized){
-					policyInitialized = true;
-					policy = getPolicy();
-				}
-				if (policy!=null) {
-					return getPolicy().provides(operation);
-				}
-				if (getProvider() != null) {
-					return getProvider().provides(operation);
-				}
-			}
-
-			if (operation instanceof ContributeToActionBarsOperation) {
-				ContributeToActionBarsOperation op =
-					(ContributeToActionBarsOperation) operation;
-				return contributionDescriptor.hasContributionsFor(
-					op.getWorkbenchPartDescriptor().getPartId(),
-					op.getWorkbenchPartDescriptor().getPartClass());
-			} else if (operation instanceof ContributeToPopupMenuOperation) {
-				ContributeToPopupMenuOperation op =
-					(ContributeToPopupMenuOperation) operation;
-				ISelection selection =
-					op
-						.getWorkbenchPart()
-						.getSite()
-						.getSelectionProvider()
-						.getSelection();
-				return contributionDescriptor.hasContributionsFor(
-					op.getPopupMenu(),
-					selection);
-			}
-			return false;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.common.core.internal.service.Service.ProviderDescriptor#getProvider()
-		 */
-		public IProvider getProvider() {
-			if (provider == null) {
-				IProvider newProvider = super.getProvider();
-				if (provider instanceof IContributionDescriptorReader) {
-					IContributionDescriptorReader reader =
-						(IContributionDescriptorReader) newProvider;
-					reader.setContributionDescriptor(contributionDescriptor);
-				}
-				if (provider instanceof AbstractContributionItemProvider) {
-					((AbstractContributionItemProvider) provider)
-						.setPluginContribution(new IPluginContribution() {
-
-							public String getLocalId() {
-								return getElement().getDeclaringExtension()
-									.getSimpleIdentifier();
-							}
-
-							public String getPluginId() {
-								return getElement().getContributor().getName();
-							}
-						});
-				}
-				return newProvider;
-			}
-			return super.getProvider();
-		}
-
-		/**
-		 * Verify if the declaring plugin of the provider is loaded; if it is not loaded, add a listener that.
-		 * 
-		 * @return <code>true</code> if the declaring pluging of the propety
-		 *         provider is loaded, <code>false</code> otherwise
-		 */
-		private boolean isPluginLoaded() {
-			if (!getElement().isValid())
-				return false;
-			String pluginId = getElement().getDeclaringExtension().getContributor().getName();
-			Bundle bundle = Platform.getBundle(pluginId);
-			return null != bundle
-				&& bundle.getState() == org.osgi.framework.Bundle.ACTIVE;
-
-		}
-	}
-
-	/**
-	 * The single instance of the contribution item service. 
-	 */
-	private static final ContributionItemService instance =
-		new ContributionItemService();
-
-	/**
-	 * Returns the single instanceo of the <code>ContributionItemService</code>.
-	 * 
-	 * @return The single instance of the <code>ContributionItemService</code>
-	 */
-	public static ContributionItemService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Creates a new <code>ContributionItemService</code> instance.
-	 */
-	private ContributionItemService() {
-		 super();
-		 configureProviders(CommonUIServicesActionPlugin.getPluginId(), "contributionItemProviders"); //$NON-NLS-1$
-	}
-
-	/* (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);
-	}
-
-	/**
-	 * Makes contributions to the given <code>actionBars</code> that belong to the given part.
-	 * @param actionBars the action bars
-	 * @param workbenchPart the workbench part
-	 * @see #contributeToActionBars(IActionBars, IWorkbenchPartDescriptor)
-	 */
-	public void contributeToActionBars(
-		IActionBars actionBars,
-		IWorkbenchPart workbenchPart) {
-		contributeToActionBars(
-			actionBars,
-			new WorkbenchPartDescriptor(
-				workbenchPart.getSite().getId(),
-				workbenchPart.getClass(),
-				workbenchPart.getSite().getPage()));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#contributeToActionBars(org.eclipse.ui.IActionBars, org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	public void contributeToActionBars(
-		IActionBars actionBars,
-		IWorkbenchPartDescriptor workbenchPartDescriptor) {
-		execute(new ContributeToActionBarsOperation(actionBars,
-				workbenchPartDescriptor));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#contributeToPopupMenu(org.eclipse.jface.action.IMenuManager,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void contributeToPopupMenu(
-		IMenuManager popupMenu,
-		IWorkbenchPart workbenchPart) {
-		execute(new ContributeToPopupMenuOperation(popupMenu, workbenchPart));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.IContributionItemProvider#disposeContributions(org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	public void disposeContributions(IWorkbenchPartDescriptor workbenchPartDescriptor) {
-		execute(new DisposeContributionsOperation(workbenchPartDescriptor));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.internal.contributionitem.IContributionItemProvider#updateActionBars(org.eclipse.ui.IActionBars, org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor)
-	 */
-	public void updateActionBars(IActionBars actionBars,
-			IWorkbenchPartDescriptor workbenchPartDescriptor) {
-		execute(new UpdateActionBarsOperation(actionBars,
-			workbenchPartDescriptor));
-	}
-	
-	/**
-	 * Disposes of the contributions that have been made to the <code>workbenchPart</code>.
-	 * @param workbenchPart the workbench part
-	 */
-	public void disposeContributions(IWorkbenchPart workbenchPart) {
-		execute(
-			new DisposeContributionsOperation(
-				new WorkbenchPartDescriptor(
-					workbenchPart.getSite().getId(),
-					workbenchPart.getClass(),
-					workbenchPart.getSite().getPage())));
-
-	}
-
-	/**
-	 * Executes the operation with the REVERSE strategy.
-	 * 
-	 * @param operation the operation to be executed.
-	 */
-	private void execute(IOperation operation) {
-		execute(ExecutionStrategy.REVERSE, operation);
-	}
-
-		}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/IPopupMenuContributionPolicy.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/IPopupMenuContributionPolicy.java
deleted file mode 100644
index 8270100..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/IPopupMenuContributionPolicy.java
+++ /dev/null
@@ -1,42 +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.ui.services.action.contributionitem;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.ISelection;
-
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-
-/**
- * A policy interface for popup menu contributions. It inspects a
- * given selection and determines whether the contribution should
- * be applied to the popup menu given that selection or not.
- * 
- * @see IContributionItemProvider
- * @see ContributionItemService
- * 
- * @author melaasar
- */
-public interface IPopupMenuContributionPolicy {
-
-	/**
-	 * Tests whether the policy applies to the given selection.
-	 * 
-	 * @param selection The given context of the popup menu
-	 * @param configuration The policy's configuration (could be used to parse extra params)
-	 * @return Whether the policy applies to the selection or not
-	 */
-	public boolean appliesTo(
-		ISelection selection,
-		IConfigurationElement configuration);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/package.html b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/package.html
deleted file mode 100644
index 3dd14e7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/contributionitem/package.html
+++ /dev/null
@@ -1,58 +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 implement a <code>Service</code> that
-facilitates the contribution of actions to modeling platform workbench
-parts. It is meant to address some of the deficiencies in the Eclipse
-support for static action contributions, as follows:</p>
-<ul>
-	<li>adds support for static contribution of custom contribution items</li>
-
-	<li>adds support for static menu contributions to toolbar managers</li>
-
-	<li>adds support for static contributions to menu managers that have
-	been added programmatically to a toolbar</li>
-
-	<li>adds support for complex action enablement and visibility criteria</li>
-</ul>
-
-<p>In order to contribute contributions items to the service, clients
-should use the <code>org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders</code>
-extension point. The provider implementation specified in the extension
-point should subclass the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider}
-class in this package.</p>
-
-<p>Contributions made through this extension point could be for a workbench 
-part's action bars (referred to as part contributions) or for a workbench 
-part's popup menu (referred to as popup contributions). The extension point 
-provides an XML description of those contributions to be read by the described 
-providers. The extension point provides an alternative to the following Eclipse extension points:
-</P>
-<UL>
-<LI>org.eclipse.ui.editorActions</LI>
-<LI>org.eclipse.ui.viewActions</LI>
-<LI>org.eclipse.ui.popupMenus (viewerContribution)</LI>
-</UL>
-
-@canBeSeenBy %partners
-
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/AbstractActionFilterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/AbstractActionFilterProvider.java
deleted file mode 100644
index b085937..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/AbstractActionFilterProvider.java
+++ /dev/null
@@ -1,89 +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.action.filter;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.filter.IActionFilterProvider;
-
-/**
- * The parent of all action filter providers. Defines useful constants and
- * behavior for retrieving the current workbench selection.
- * 
- * @author khussey
- *
- */
-public abstract class AbstractActionFilterProvider
-	extends AbstractProvider
-	implements IActionFilterProvider {
-
-	/**
-	 * The attribute value indicating an enablement test.
-	 * 
-	 */
-	protected static final String ENABLEMENT_VALUE = "enablement"; //$NON-NLS-1$
-
-	/**
-	 * The attribute value indicating a visibility test.
-	 * 
-	 */
-	protected static final String VISIBILITY_VALUE = "visibility"; //$NON-NLS-1$
-
-	/**
-	 * Constructs a new action filter provider.
-	 */
-	protected AbstractActionFilterProvider() {
-		super();
-	}
-
-	/**
-	 * Retrieves the selection from selection service of the active workbench
-	 * window.
-	 * 
-	 * @return The current workbench selection.
-	 * 
-	 */
-	protected ISelection getSelection() {
-
-		ISelection selection = null;
-		
-		IWorkbenchWindow window =
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
-		if (null != window) {
-			selection = window.getSelectionService().getSelection();
-		}
-		return selection == null ? StructuredSelection.EMPTY : selection;
-	}
-
-	/**
-	 * Retrieves the selection as a structured selection.
-	 * 
-	 * @return The current workbench selection if it is a structured selection;
-	 *          an empty structured selection otherwise.
-	 * 
-	 */
-	protected IStructuredSelection getStructuredSelection() {
-		ISelection selection = getSelection();
-		if (selection instanceof IStructuredSelection) {
-			return (IStructuredSelection) getSelection();
-		} else {
-			return StructuredSelection.EMPTY;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java
deleted file mode 100644
index 480f16e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/ActionFilterService.java
+++ /dev/null
@@ -1,388 +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.ui.services.action.filter;
-
-import java.lang.ref.WeakReference;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.IOperationHistoryListener;
-import org.eclipse.core.commands.operations.OperationHistoryEvent;
-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.IProvider;
-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.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.filter.IActionFilterProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A service that provides action filters that can be used in evaluating action
- * expressions.
- * 
- * @author khussey
- *  
- */
-public class ActionFilterService
-	extends Service
-	implements IActionFilterProvider, IOperationHistoryListener {
-	
-	private static class CacheKey {
-
-		public String name;
-
-		public String value;
-
-		public CacheKey() {
-			this(null,null);
-		}
-
-		public CacheKey(String name, String value) {
-			this.name = name;
-			this.value = value;
-		}
-
-		public boolean equals(Object obj) {
-			//This is our key, and it won't never be called except with another CacheKey,
-			//therefore is no need to check for either null, or, instanceof CacheKey
-			CacheKey other = (CacheKey) obj;
-			return value.equals(other.value) && name.equals(other.name);
-		}
-
-		public int hashCode() {
-			return name.hashCode() ^ value.hashCode();
-		}
-	}
-	
-	private static final CacheKey TEST_KEY = new CacheKey();
-
-	/**
-	 * A descriptor for action filter providers defined by a configuration
-	 * element.
-	 * 
-	 * @author khussey
-	 *  
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/**
-		 * The name of the 'name' XML attribute.
-		 *  
-		 */
-		protected static final String A_NAME = "name"; //$NON-NLS-1$
-
-		/**
-		 * The name of the 'value' XML attribute.
-		 *  
-		 */
-		protected static final String A_VALUE = "value"; //$NON-NLS-1$
-
-		/**
-		 * The name of the 'Attribute' XML element.
-		 *  
-		 */
-		protected static final String E_ATTRIBUTE = "Attribute"; //$NON-NLS-1$
-
-		/**
-		 * Constructs a new action filter provider descriptor for the specified
-		 * configuration element.
-		 * 
-		 * @param element
-		 *            The configuration element describing the provider.
-		 *  
-		 */
-		protected ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-		}
-
-		/**
-		 * Indicates whether this provider descriptor provides the specified
-		 * operation.
-		 * 
-		 * @return <code>true</code> if the name and value (optional) of the
-		 *         specified operation matches the name and value (if provided)
-		 *         of one of the attributes (if any) defined for this provider
-		 *         descriptor or if this descriptor's policy or provider
-		 *         provides the operation; <code>false</code> otherwise.
-		 * @param operation
-		 *            The operation in question.
-		 * 
-		 * @see IProvider#provides(IOperation)
-		 *  
-		 */
-		public boolean provides(IOperation operation) {
-			if (!getElement().isValid())
-				return false;
-			IConfigurationElement[] elements = getElement().getChildren(
-				E_ATTRIBUTE);
-
-			if (0 < elements.length) {
-				TestAttributeOperation tao = (TestAttributeOperation) operation;
-
-				for (int i = 0; i < elements.length; i++) {
-
-					try {
-						String name = elements[i].getAttribute(A_NAME);
-						String value = elements[i].getAttribute(A_VALUE);
-
-						if (name.equals(tao.getName())
-							&& ((null == value) || value.equals(tao.getValue()))) {
-
-							return true;
-						} // if
-					} catch (Exception e) {
-						Trace.catching(CommonUIServicesActionPlugin.getDefault(),
-							CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "provides", e); //$NON-NLS-1$
-						Log.error(CommonUIServicesActionPlugin.getDefault(),
-							CommonUIServicesActionStatusCodes.SERVICE_FAILURE, MessageFormat
-								.format(INVALID_ELEMENT_MESSAGE_PATTERN,
-									new Object[] {elements[i].getName()}), e);
-					}
-				} // for
-
-				return false;
-			} else {
-				return super.provides(operation);
-			} // else
-		}
-	}
-
-	/**
-	 * Prefix for action expressions that use the action filter service.
-	 */
-	protected final static String PREFIX = "@"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the action filter service.
-	 *  
-	 */
-	private final static ActionFilterService instance = new ActionFilterService();
-
-	static {
-		instance.configureProviders(CommonUIServicesActionPlugin.getPluginId(), "actionFilterProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The cached results (for optimization).
-	 *  
-	 */
-	private final Map cachedResults = new HashMap();
-
-	/**
-	 * The cached selection (for optimization). The selection is cached only for
-	 * the purpose of validating the results cache when the service is asked to
-	 * test an attribute.
-	 *  
-	 */
-//	private ISelection cachedSelection = StructuredSelection.EMPTY;
-	/*
-	 * RATLC00527385 cachedSelection should be a weakreference, as it 
-	 * has a reference to ISelection, and it is not a selection listener.
-	 */
-	private WeakReference cachedSelection = null;
-
-	/**
-	 * Constructs a new action filter service.
-	 *  
-	 */
-	protected ActionFilterService() {
-		super(true);
-
-        getOperationHistory().addOperationHistoryListener(this);
-	}
-
-	/**
-	 * Retrieves the singleton instance of the action filter service.
-	 * 
-	 * @return The action filter service singleton.
-	 *  
-	 */
-	public static ActionFilterService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Retrieves the value of the <code>cachedResults</code> instance
-	 * variable.
-	 * 
-	 * @return The value of the <code>cachedResults</code> instance variable.
-	 *  
-	 */
-	private Map getCachedResults() {
-		return cachedResults;
-	}
-
-	/**
-	 * Retrieves the value of the <code>cachedSelection</code> instance
-	 * variable.
-	 * 
-	 * @return The value of the <code>cachedSelection</code> instance
-	 *         variable.
-	 *  
-	 */
-	private ISelection getCachedSelection() {
-		if(cachedSelection != null) {
-			Object sel = cachedSelection.get();
-			if(sel != null)
-				return (ISelection)sel;
-		}
-		return StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * Sets the <code>cachedSelection</code> instance variable to the
-	 * specified value.
-	 * 
-	 * @param selection
-	 *            The new value for the <code>cachedSelection</code> instance
-	 *            variable.
-	 *  
-	 */
-	private void setCachedSelection(ISelection selection) {
-		this.cachedSelection = new WeakReference(selection);
-	}
-
-	/**
-	 * Retrieves the action manager for this action filter service.
-	 * 
-	 * @return The action manager for this action filter service.
-	 *  
-	 */
-	protected ActionManager getActionManager() {
-		return ActionManager.getDefault();
-	}
-    
-    /**
-     * Returns the operation history from my action manager.
-     * 
-     * @return the operation history
-     */
-    protected IOperationHistory getOperationHistory() {
-        return getActionManager().getOperationHistory();
-    }
-
-	/**
-	 * Creates a new action filter provider descriptor for the specified
-	 * configuration element.
-	 * 
-	 * @return A new action filter provider descriptor.
-	 * @param element
-	 *            The configuration element from which to create the descriptor.
-	 *  
-	 */
-	protected Service.ProviderDescriptor newProviderDescriptor(
-			IConfigurationElement element) {
-
-		return new ProviderDescriptor(element);
-	}
-
-	/**
-	 * Clears this action filter service's cached results.
-	 * <P>
-	 * Clients are strongly discouraged from using this method. It will degrade
-	 * performance.
-	 *  
-	 */
-	public final void clearCachedResults() {
-		getCachedResults().clear();
-	}
-
-	/**
-	 * Updates the cached results and selection based on the current selection.
-	 *  
-	 */	
-	protected void updateCachedData() {
-		ISelection selection = null;
-		IWorkbenchWindow window = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow();
-
-		if (null != window) {
-			selection = window.getSelectionService().getSelection();
-		}
-
-		selection = (null == selection ? StructuredSelection.EMPTY
-			: selection);
-        ISelection cachedSel = getCachedSelection();
-        if (cachedSel != selection) {
-			if (!cachedSel.equals(selection)) {
-				clearCachedResults();
-			}
-			setCachedSelection(selection);
-		}
-	}
-
-	/**
-	 * Returns 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.
-	 * 
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
-	 *  
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-
-		updateCachedData();		
-	
-		TEST_KEY.name = name;
-		TEST_KEY.value = value;	
-		
-		Boolean result = (Boolean) getCachedResults().get(TEST_KEY);
-
-		if (null == result) {
-			
-			String normalizedname = name;
-			if (name.startsWith(PREFIX)) {
-				normalizedname = name.substring(1);
-			}
-
-			List results = execute(
-				ExecutionStrategy.FIRST,
-				new TestAttributeOperation(target, normalizedname, value));
-			result = results.isEmpty() ? Boolean.FALSE
-				: (Boolean) results.get(0);
-
-			getCachedResults().put(new CacheKey(name, value), result);
-		} // if
-
-		return result.booleanValue();
-	}
-    
-    /**
-     * Clears my cache when my operation history changes.
-     */
-    public void historyNotification(OperationHistoryEvent event) {
-        clearCachedResults();
-        setCachedSelection(StructuredSelection.EMPTY);
-    }   
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/TestAttributeOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/TestAttributeOperation.java
deleted file mode 100644
index e861dce..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/TestAttributeOperation.java
+++ /dev/null
@@ -1,159 +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.action.filter;
-
-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.util.HashUtil;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.filter.IActionFilterProvider;
-
-/**
- * An operation that performs attribute tests by determining whether a specific
- * attribute matches the state of a target object.
- * 
- * @author khussey
- *
- */
-public class TestAttributeOperation implements IOperation {
-
-    /**
-     * The target of the attribute test.
-     * 
-     */
-    private final Object target;
-
-    /**
-     * The name of the attribute to test.
-     * 
-     */
-    private final String name;
-
-    /**
-     * The value of the attribute to test.
-     * 
-     */
-    private final String value;
-
-    /**
-     * Constructs a new test attribute operation with the specified target
-     * object, attribute name, and attribute value.
-     * 
-     * @param target The target of the attribute test.
-     * @param name The name of the attribute to test.
-     * @param value The value of the attribute to test.
-     * 
-     */
-    public TestAttributeOperation(Object target, String name, String value) {
-        super();
-
-        assert null != target : "target cannot be null"; //$NON-NLS-1$
-        assert null != name : "name cannot be null"; //$NON-NLS-1$
-        assert null != value : "value cannot be null"; //$NON-NLS-1$
-
-        this.target = target;
-        this.name = name;
-        this.value = value;
-    }
-
-    /**
-     * Retrieves the value of the <code>target</code> instance variable.
-     * 
-     * @return The value of the <code>target</code> instance variable.
-     * 
-     */
-    public Object getTarget() {
-        return target;
-    }
-
-    /**
-     * 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>value</code> instance variable.
-     * 
-     * @return The value of the <code>value</code> instance variable.
-     * 
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Retrieves a hash code value for this test attribute operation. This
-     * method is supported for the benefit of hashtables such as those provided
-     * by <code>java.util.HashMap</code>.
-     * 
-     * @return A hash code value for this test attribute operation.
-     * 
-     * @see Object#hashCode()
-     * 
-     */
-    public int hashCode() {
-        return HashUtil.hash(HashUtil.hash(getName()), getValue());
-    }
-
-    /**
-     * Indicates whether some other test attribute operation is "equal to" this
-     * test attribute operation.
-     * 
-     * @return <code>true</code> if this test attribute operation is the same
-     *          as the test attribute operation argument; <code>false</code>
-     *          otherwise.
-     * @param operation The reference test attribute operation with which to
-     *                   compare.
-     * 
-     */
-    private boolean equals(TestAttributeOperation operation) {
-        return getName().equals(operation.getName())
-            && getValue().equals(operation.getValue());
-    }
-
-    /**
-     * Indicates whether some other object is "equal to" this test attribute
-     * operation.
-     * 
-     * @return <code>true</code> if this test attribute operation 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 boolean equals(Object object) {
-        return object instanceof TestAttributeOperation
-            && equals((TestAttributeOperation) object);
-    }
-
-    /**
-     * Executes this test attribute operation on the specified provider.
-     * 
-     * @param provider The provider on which to execute this operation.
-     * 
-     * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(IProvider)
-     * 
-     */
-    public Object execute(IProvider provider) {
-        return Boolean.valueOf(
-            ((IActionFilterProvider) provider).testAttribute(
-                getTarget(),
-                getName(),
-                getValue()));
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/package.html b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/package.html
deleted file mode 100644
index 31206cb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/filter/package.html
+++ /dev/null
@@ -1,56 +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 help in evaluating expressions for
-Eclipse <i>plug-in</i> action enablement and visibility. The {@link
-org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService}
-allows clients to extend the action filters supported by objects
-selected in workbench. It also permits the entire workbench selection 
-to be considered so that an action can be enabled if it is supported on one 
-or more elements in the selection.</p>
-
-<p>To add a new attribute to an object for action filtering, the object
-must implement the <code>IAdaptable</code> interface and an adapter
-factory must be registered that returns the 
-{@link org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService}
-when the object is adapted to <code>IActionFilter</code>. An 
-{@link org.eclipse.gmf.runtime.common.ui.services.action.filter.IActionFilterProvider} 
-can then be registered to provide the test for the attribute using the 
-<code>org.eclipse.gmf.runtime.common.ui.services.action.actionFilterProviders</code>
-extension point.</p>
-
-<p>Such attributes are named in <code>objectState</code> elements which
-evaluate the attribute state of each object in the current selection for
-enablement or visibility criteria (see the org.eclipse.ui.popupMenus extension point for details).
-Eclipse documentation states that if each object in the selection has 
-the specified attribute state, the expression is evaluated as true. However, this is
-not necessarily the case for attributes defined by an action filter provider, which can 
-optionally evaluate the expression to true if one or more of the objects in the selection
-has the specified attribute state.  The meaning of the value of the attribute (the <code>objectState</code> value) 
-is defined by the action filter provider.</p>
-
-<p>Action filter providers should be implemented by extending the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.filter.AbstractActionFilterProvider}
-class in this package.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandler.java
deleted file mode 100644
index 484b01a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandler.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.action.global;
-
-
-
-/**
- * The abstract parent of all concrete global action handlers. A concrete handler
- * needs to override the <code>getCommand()</code> and <code>canHandle()</code> methods.
- * This class implements the <code>IGlobalActionHandler</code> interface. It provides
- * access to the <code>IGlobalActionContext</code> to its decendents.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class AbstractGlobalActionHandler
-    implements IGlobalActionHandler {
-    /**
-     * Creates an AbstractGlobalActionHandler.
-     */
-    public AbstractGlobalActionHandler() {
-        super();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.global.IGlobalActionHandler#getLabel(org.eclipse.gmf.runtime.common.ui.action.global.IGlobalActionContext)
-	 */
-	public String getLabel(IGlobalActionContext cntxt) {
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandlerProvider.java
deleted file mode 100644
index 5782deb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/AbstractGlobalActionHandlerProvider.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.services.action.global;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * The abstract parent of all concrete global action handler providers.
- * A concrete provider needs to override the <code>getGlobalActionHandler()</code>
- * method only. The <code>provides()</code> method has a default implementation.
- * The <code>provides()</code> method is already handled by the proxy for
- * the provider (<code>GlobalActionHandlerService.ProviderDescriptor</code>).
- * The proxy contains all the information necessary to decide handle the
- * <code>provides()</code> method.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class AbstractGlobalActionHandlerProvider
-    extends AbstractProvider
-    implements IGlobalActionHandlerProvider {
-    /**
-     * Constructor for AbstractGlobalActionHandlerProvider.
-     */
-    public AbstractGlobalActionHandlerProvider() {
-        super();
-    }
-
-    /**
-     * Returns a <code>IGlobalActionHandler</code> for the given
-     * <code>IGlobalActionHandlerContext</code>
-     * 
-     * @param context The context information
-     * 
-     * @return The global action handler associated with the context
-     */
-    public IGlobalActionHandler getGlobalActionHandler(IGlobalActionHandlerContext context) {
-        return new AbstractGlobalActionHandler() {
-
-            public boolean canHandle(IGlobalActionContext cntxt) {
-                return false;
-            }
-
-            public ICommand getCommand(IGlobalActionContext cntxt) {
-                return null;
-            }
-        };
-    }
-
-    /**
-     * Returns <code>true</code> if the provider can handle the
-     * <code>GlobalActionHandlerOperation</code> operation
-     * 
-     * @param operation An operation
-     * 
-     * @return Returns <code>true</code> if the provider can handle the
-     *          <code>GlobalActionHandlerOperation</code> operation. Otherwise
-     *          returns <code>false</code>
-     */
-    public final boolean provides(IOperation operation) {
-
-        if (operation instanceof GlobalActionHandlerOperation) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GetGlobalActionHandlerOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GetGlobalActionHandlerOperation.java
deleted file mode 100644
index e7b00d1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GetGlobalActionHandlerOperation.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.common.ui.services.action.global;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * An operation that gets the <code>IGlobalActionHandler</code> associated
- * with the <code>IGlobalActionHandlerContext</code> from the
- * <code>IGlobalActionHandlerProvider</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class GetGlobalActionHandlerOperation
-    extends GlobalActionHandlerOperation {
-    /**
-     * Constructor for GetGlobalActionHandlerOperation.
-     * @param context The global action handler context
-     */
-    public GetGlobalActionHandlerOperation(IGlobalActionHandlerContext context) {
-        super(context);
-    }
-
-    /**
-     * Executes this operation on the <code>IGlobalActionHandlerProvider</code>
-     * provider.
-     * 
-     * @param provider The provider on which to execute this operation.
-     * 
-     * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(IProvider)
-     */
-    public Object execute(IProvider provider) {
-
-        if (provider instanceof IGlobalActionHandlerProvider) {
-            /* get the provider */
-            IGlobalActionHandlerProvider prov =
-                (IGlobalActionHandlerProvider)provider;
-
-            /* get the handler */
-            IGlobalActionHandler handler =
-                prov.getGlobalActionHandler(getContext());
-
-            /* return the handler */
-            return handler;
-        }
-
-        return null;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionContext.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionContext.java
deleted file mode 100644
index 2b47957..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionContext.java
+++ /dev/null
@@ -1,97 +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.action.global;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Implementation class for the interface <code>IGlobalActionContext</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalActionContext implements IGlobalActionContext {
-    /**
-     * Attribute for the action id
-     */
-    final private String actionId;
-
-    /**
-     * Attribute for the active part
-     */
-    final private IWorkbenchPart activePart;
-
-    /**
-     * Attribute for the <code>ISelection</code>
-     */
-    final private ISelection selection;
-
-    /**
-     * Attribute for the label of the action
-     */
-    final private String label;
-
-    /**
-     * Constructor for GlobalActionContext.
-     * 
-     * @param activePart attribute for active part
-     * @param selection attribute for selection 
-     * @param label attribute for label
-     * @param actionId attribute for action id
-     */
-    public GlobalActionContext(
-        IWorkbenchPart activePart,
-        ISelection selection,
-        String label,
-        String actionId) {
-        super();
-
-        assert null != activePart : "activePart cannot be null"; //$NON-NLS-1$
-        assert null != selection : "selection cannot be null"; //$NON-NLS-1$
-        assert null != label : "label cannot be null"; //$NON-NLS-1$
-        assert null != actionId : "actionId cannot be null"; //$NON-NLS-1$
-
-        this.activePart = activePart;
-        this.selection = selection;
-        this.label = label;
-        this.actionId = actionId;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext#getLabel()
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext#getSelection()
-     */
-    public ISelection getSelection() {
-        return selection;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext#getActionId()
-     */
-    public String getActionId() {
-        return actionId;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionContext#getActivePart()
-     */
-    public IWorkbenchPart getActivePart() {
-        return activePart;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerContext.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerContext.java
deleted file mode 100644
index e1d5f40..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerContext.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.action.global;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * The class used to create a <code>IGlobalActionHandlerContext</code> object.
- * This class implements <code>IGlobalActionHandlerContext</code> interface.
- * 
- * @author Vishy Ramaswamy
- */
-public final class GlobalActionHandlerContext
-    implements IGlobalActionHandlerContext {
-
-    /**
-     * Attribute for the <code>IWorkbenchPart</code>
-     */
-    final private IWorkbenchPart activePart;
-
-    /**
-     * Attribute for the <code>GlobalActionId</code>
-     */
-    final private String actionId;
-
-    /**
-     * Attribute for the element type (<code>Class</code>)
-     */
-    final private Class elementType;
-
-    /**
-     * Attribute for compatability flag
-     */
-    final private boolean isCompatible;
-
-    /**
-     * Constructor.
-     * 
-     * @param activePart attribute for active part
-     * @param actionId attribute for action ID
-     * @param elementType attribute for elementType
-     * @param isCompatible attribute for isCompatible
-     */
-    public GlobalActionHandlerContext(
-        IWorkbenchPart activePart,
-        String actionId,
-        Class elementType,
-        boolean isCompatible) {
-        super();
-
-        assert null != activePart : "activePart cannot be null"; //$NON-NLS-1$
-        assert null != elementType : "elementType cannot be null"; //$NON-NLS-1$
-
-        this.activePart = activePart;
-        this.actionId = actionId;
-        this.elementType = elementType;
-        this.isCompatible = isCompatible;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext#getActionId()
-     */
-    public String getActionId() {
-        return actionId;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext#getElementType()
-     */
-    public Class getElementType() {
-        return elementType;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext#getActivePart()
-     */
-    public IWorkbenchPart getActivePart() {
-        return activePart;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext#isCompatible()
-     */
-    public boolean isCompatible() {
-        return isCompatible;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerOperation.java
deleted file mode 100644
index e4dbe61..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerOperation.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.common.ui.services.action.global;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * The abstract parent of all global action handler operations. This
- * class maintains a reference to the <code>IGlobalActionHandlerContext</code>.
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class GlobalActionHandlerOperation implements IOperation {
-    /**
-     * Attribute for the <code>IGlobalActionHandlerContext</code>.
-     */
-    private final IGlobalActionHandlerContext context;
-
-    /**
-     * Create a GlobalActionHandlerOperation.
-     * 
-     * @param context attribute for the <code>IGlobalActionHandlerContext</code>
-     */
-    public GlobalActionHandlerOperation(IGlobalActionHandlerContext context) {
-        assert null != context : "context cannot be null"; //$NON-NLS-1$
-
-        this.context = context;
-    }
-
-    /**
-     * Returns the context.
-     * @return The <code>context</code> instance variable
-     */
-    public final IGlobalActionHandlerContext getContext() {
-        return context;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java
deleted file mode 100644
index f988966..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/GlobalActionHandlerService.java
+++ /dev/null
@@ -1,346 +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.action.global;
-
-import java.text.MessageFormat;
-import java.util.Enumeration;
-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.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.action.internal.CommonUIServicesActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionStatusCodes;
-
-/**
- * A service that provides the <code>IGlobalActionHandler</code> associated
- * with a <code>IGlobalActionHandlerContext</code>. This service gets the first
- * provider of the highest priority that provides a <code>IGlobalActionHandler</code>
- * for the given <code>IGlobalActionHandlerContext</code>.
- * 
- * @author Vishy Ramaswamy
- */
-public class GlobalActionHandlerService
-	extends Service
-	implements IGlobalActionHandlerProvider {
-	/**
-	 * A descriptor for <code>IGlobalActionHandlerProvider</code> defined
-	 * by a configuration element.
-	 * 
-	 * @author Vishy Ramaswamy
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-		/**
-		 * Attribute for maintaining the provider information
-		 */
-		private Hashtable partHandlerList = null;
-
-		/**
-		 * Constructs a <code>IGlobalActionHandlerProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 * @param partHandlerList A <code>Hashtable</code> with the provider information
-		 */
-		protected ProviderDescriptor(
-			IConfigurationElement element,
-			Hashtable partHandlerList) {
-			super(element);
-
-			assert null != partHandlerList : "partHandlerList cannot be null"; //$NON-NLS-1$
-
-			this.partHandlerList = partHandlerList;
-		}
-
-		/* (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 GlobalActionHandlerOperation)) {
-				return false;
-			}
-
-            /* Get all the context information */
-			IGlobalActionHandlerContext context =
-				((GlobalActionHandlerOperation) operation).getContext();
-			String partId = context.getActivePart().getSite().getId();
-			String actionId = context.getActionId();
-			Class elementType = context.getElementType();
-			boolean isCompatible = context.isCompatible();
-
-			/* Check if the part is handled */
-			Hashtable elementTypeTable =
-				(Hashtable) getPartHandlerList().get(partId);
-			if (elementTypeTable == null) {
-				return false;
-			}
-
-			/* Get the action id list */
-			List actionIdList = (List)
-				elementTypeTable.get(
-					isCompatible
-						? getCompatibleType(
-							elementTypeTable,
-							elementType,
-							actionId)
-							.getName()
-						: elementType.getName());
-			if (actionIdList == null) {
-				actionIdList = (List) elementTypeTable.get(NullElementType.class.getName());
-				
-				if (actionIdList == null) {
-					return false;
-				}
-			}
-
-			/* Check if the action is handled */
-			if (actionIdList.contains(actionId)) {
-				if (!policyInitialized){
-					policy = getPolicy();
-					policyInitialized = true;
-				}
-				if (policy != null)
-					return policy.provides(operation);
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Returns the <code>Hashtable</code> containing the provider information
-		 * 
-		 * @return Return the <code>partHandlerList</code> instance variable
-		 */
-		private Hashtable getPartHandlerList() {
-			return partHandlerList;
-		}
-
-		/**
-		 * Returns the element type from the element type table that is
-		 * assignable from the specified element type if the element type 
-		 * also has the correct action with it.
-		 * 
-		 * @param elementTypeTable The table of element types
-		 * @param elementType The specified element type
-		 * @param actionId the action string trying to match
-		 * @return Return the compatible type
-		 */
-		private Class getCompatibleType(
-			Hashtable elementTypeTable,
-			Class elementType,
-			String actionId) {
-			/* 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();
-				List actionIdList = (List)elementTypeTable.get(className);
-				if (actionIdList == null || !actionIdList.contains(actionId)) {
-					continue;
-				}
-
-				try {
-					newClass =
-						Class.forName(
-							className,
-							false,
-							elementType.getClassLoader());
-				} catch (ClassNotFoundException e) {
-					// Trace only. Logging should not be done because this
-					// is a normal condition for the class loader to fail.
-					Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getCompatibleType", e); //$NON-NLS-1$
-				}
-
-				if (newClass != null
-					&& newClass.isAssignableFrom(elementType)) {
-					return newClass;
-				}
-			}
-
-			return elementType;
-		}
-	}
-
-	/**
-	 * The GlobalActionHandlerService constructor
-	 */
-	private final static GlobalActionHandlerService instance =
-		new GlobalActionHandlerService();
-
-	static {
-		instance.configureProviders(CommonUIServicesActionPlugin.getPluginId(), "globalActionHandlerProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The GlobalActionHandlerService constructor
-	 */
-	protected GlobalActionHandlerService() {
-		super(false);
-	}
-
-	/**
-	 * Gets the instance of GlobalActionHandlerService
-	 * @return Returns the <code>instance</code> variable
-	 */
-	public static GlobalActionHandlerService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Executes the <code>GlobalActionHandlerOperation</code> operation
-	 * using the FIRST strategy
-	 * 
-	 * @param operation The <code>GlobalActionHandlerOperation</code> operation
-	 * 
-	 * @return Returns a <code>Object</code>
-	 */
-	private Object execute(GlobalActionHandlerOperation operation) {
-		List results = execute(ExecutionStrategy.FIRST, operation);
-		return results.isEmpty() ? null : results.get(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider#getGlobalActionHandler(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext)
-	 */
-	public IGlobalActionHandler getGlobalActionHandler(IGlobalActionHandlerContext context) {
-		assert null != context;
-
-		return (IGlobalActionHandler) execute(
-			new GetGlobalActionHandlerOperation(context));
-	}
-
-	/* (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,
-			getGlobalActionHandlerProviderInfo(element));
-	}
-
-	/**
-	 * Captures all the <code>IGlobalActionHandlerProvider</code> information.
-	 * 
-	 * @param element The configuration element associated with the provider
-	 * 
-	 * @return Returns a <code>Hashtable</code>
-	 */
-	private Hashtable getGlobalActionHandlerProviderInfo(IConfigurationElement element) {
-		Hashtable providerInfo = new Hashtable();
-		try {
-			/* get the view id children */
-			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) {
-						elementTypeClass = NullElementType.class.getName();
-					}
-
-					/* add a placeholder for the element type */
-					Hashtable table = (Hashtable) providerInfo.get(id);
-					table.put(elementTypeClass, new Vector());
-
-					/* get the action id children */
-					Vector listOfActionId = new Vector();
-					IConfigurationElement[] actionIdChildren =
-						elementTypeConfig.getChildren();
-					for (int k = 0; k < actionIdChildren.length; k++) {
-						IConfigurationElement actionIdConfig =
-							actionIdChildren[k];
-
-						/* get the action id attributes */
-						String actionId = actionIdConfig.getAttribute("actionId"); //$NON-NLS-1$
-						if (actionId == null) {
-							handleInvalidElement(actionIdConfig);
-							continue;
-						}
-
-						/* add to the list */
-						listOfActionId.addElement(actionId);
-					}
-
-					/* add the element type and its mapped vector */
-					Vector list =
-						(Vector) ((Hashtable) providerInfo.get(id)).get(
-							elementTypeClass);
-					list.addAll(listOfActionId);
-				}
-			}
-		} catch (Exception e) {
-			Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getGlobalActionHandlerProviderInfo", e); //$NON-NLS-1$
-			Log.error(
-				CommonUIServicesActionPlugin.getDefault(),
-				CommonUIServicesActionStatusCodes.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(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.SERVICES_CONFIG, message);
-		Log.error(
-			CommonUIServicesActionPlugin.getDefault(),
-			CommonUIServicesActionStatusCodes.SERVICE_FAILURE,
-			message);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionContext.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionContext.java
deleted file mode 100644
index 3f45b2f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionContext.java
+++ /dev/null
@@ -1,52 +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.action.global;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface that is passed to the <code>IGlobalActionHandler</code>. This interface
- * can be extended for handling/providing more view context information.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IGlobalActionContext {
-    /**
-     * Returns the <code>GlobalActionId</code>
-     * 
-     * @return Returns an <code>String</code>
-     */
-    public String getActionId();
-
-    /**
-     * Returns the active <code>IWorkbenchPart</code>
-     * 
-     * @return Returns the active <code>IWorkbenchPart</code>
-     */
-    public IWorkbenchPart getActivePart();
-
-    /**
-     * Return the label for the action
-     *
-     * @return String
-     */
-    public String getLabel();
-
-    /**
-     * Return the selection which contains items of type defined in the
-     * <code>IGlobalActionHandlerContext</code>
-     *
-     * @return ISelection
-     */
-    public ISelection getSelection();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandler.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandler.java
deleted file mode 100644
index 9a75678..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandler.java
+++ /dev/null
@@ -1,48 +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.action.global;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * Interface that needs to implemented by the <code>IGlobalActionHandlerProvider</code>
- * 
- * @author Vishy Ramaswamy
- */
-public interface IGlobalActionHandler {
-    /**
-     * Return true if the handler can handle the context
-     *
-     * @param context The context
-     * @return boolean
-     */
-    public boolean canHandle(IGlobalActionContext context);
-
-    /**
-     * Return the ICommand for the context
-     *
-     * @param context The context
-     * @return ICommand
-     */
-    public ICommand getCommand(IGlobalActionContext context);
-    
-    /**
-     * Gets the label for this global action, given the context.
-     * Returns <code>null</code> if the default global action label
-     * should be used.
-     * 
-     * @param context the global action context
-     * @return the global action label, or <code>null</code> if
-     * 		   the default label should be used.
-     */
-    public String getLabel(IGlobalActionContext context);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerContext.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerContext.java
deleted file mode 100644
index 820faa0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerContext.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.common.ui.services.action.global;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface for accessing the attributes used to determine the 
- * <code>IGlobalActionHandler</code>.
- * 
- * @author Vishy Ramaswamy
- */
-public interface IGlobalActionHandlerContext {
-    /**
-     * Returns the <code>GlobalActionId</code>
-     * 
-     * @return Returns an <code>String</code>
-     */
-    public String getActionId();
-
-    /**
-     * Returns an element type within the selection that
-     * occured in the active <code>IWorkbenchPart</code>
-     * 
-     * @return Returns a <code>Class</code>
-     */
-    public Class getElementType();
-
-    /**
-     * Returns the active <code>IWorkbenchPart</code>
-     * 
-     * @return Returns the active <code>IWorkbenchPart</code>
-     */
-    public IWorkbenchPart getActivePart();
-
-    /**
-     * 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();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerProvider.java
deleted file mode 100644
index fd61b0c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/IGlobalActionHandlerProvider.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.action.global;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Interface that needs to be implemented by the client who provides
- * a <code>IGlobalActionHandler</code>
- * 
- * @author Vishy Ramaswamy
- */
-public interface IGlobalActionHandlerProvider extends IProvider {
-	
-	/**
-	 * Describes the element type when no element type is associated with a
-	 * global action handler provider.
-	 */
-	public static final class NullElementType {
-		// No definition required.
-	}
-	
-    /**
-     * Returns the <code>IGlobalActionHandler</code> for the given
-     * <code>IGlobalActionHandlerContext</code>
-     * 
-     * @param context The context for the provider
-     * @return Returns an <code>IGlobalActionHandler</code>
-     */
-    public IGlobalActionHandler getGlobalActionHandler(IGlobalActionHandlerContext context);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/package.html b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/global/package.html
deleted file mode 100644
index 444ba81..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/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 classes that implement a <code>Service</code>
-that provides an extensible way to handle commonly used (global) actions
-in different views and editors. When a <code>GlobalAction</code> is
-registered as the action handler for a retargetable action in a given
-workbench part, the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.global.GlobalActionHandlerService}
-is consulted to do the real work in running the action.  The service
-allows different handlers to be used depending on the nature of the element(s) 
-selected in the workbench part.</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>In order to contribute global action handlers to the service, clients
-should use the <code>org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders</code>
-extension point. The provider implementation specified in the extension
-point should subclass the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandlerProvider}
-class in this package.</p>
-
-<p>Modeling platform global action handlers should subclass the {@link
-org.eclipse.gmf.runtime.common.ui.services.action.global.AbstractGlobalActionHandler}
-class.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionDebugOptions.java
deleted file mode 100644
index 5a6d8c1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionDebugOptions.java
+++ /dev/null
@@ -1,49 +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.action.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class CommonUIServicesActionDebugOptions {
-
-    /**
-     * This class should not be instantiated since it is a static constant
-     * class.
-     * 
-     */
-    private CommonUIServicesActionDebugOptions() {
-		/* private constructor */
-	}
-
-    /** Debug option. */
-    public static final String DEBUG = CommonUIServicesActionPlugin.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 service configuration. */
-    public static final String SERVICES_CONFIG = DEBUG + "/services/config"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java
deleted file mode 100644
index 7eb7daa..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionPlugin.java
+++ /dev/null
@@ -1,51 +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.action.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The Action plugin for Common UI Services.
- */
-public class CommonUIServicesActionPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * The singleton instance.
-	 */
-	private static CommonUIServicesActionPlugin INSTANCE;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public CommonUIServicesActionPlugin() {
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonUIServicesActionPlugin 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.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionStatusCodes.java
deleted file mode 100644
index 8a68574..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/CommonUIServicesActionStatusCodes.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.services.action.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author ldamus
- *
- */
-public final class CommonUIServicesActionStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonUIServicesActionStatusCodes() {
-		/* 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.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToActionBarsOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToActionBarsOperation.java
deleted file mode 100644
index ca98009..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToActionBarsOperation.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.runtime.common.ui.services.action.internal.contributionitem;
-
-import org.eclipse.ui.IActionBars;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-
-/**
- * An operation to contribute to the action bars of a given part type
- * 
- * @see ContributionItemService
- * @see IContributionItemProvider
- * 
- * @author melaasar, cmahoney
- */
-public class ContributeToActionBarsOperation implements IOperation {
-
-	/** the part's action bars */
-	private final IActionBars actionBars;
-	/** the part's descriptor */
-	private final IWorkbenchPartDescriptor workbenchPartDescriptor;
-
-	/**
-	 * Constructs a new <code>ContributeToActionBarsOperation</code> instance.
-	 * 
-	 * @param actionBars The part's action bars
-	 * @param workbenchPartDescriptor The part's descriptor
-	 */
-	public ContributeToActionBarsOperation(
-		IActionBars actionBars,
-		IWorkbenchPartDescriptor workbenchPartDescriptor) {
-
-		assert null != actionBars : "actionBars cannot be null"; //$NON-NLS-1$
-		assert null != workbenchPartDescriptor : "workbenchPartDescriptor cannot be null"; //$NON-NLS-1$
-
-		this.actionBars = actionBars;
-		this.workbenchPartDescriptor = workbenchPartDescriptor;
-	}
-
-	/**
-	 * Returns the action bars.
-	 * 
-	 * @return The action bars
-	 */
-	public IActionBars getActionBars() {
-		return actionBars;
-	}
-
-	/**
-	 * Returns the part's descriptor.
-	 * 
-	 * @return The part's descriptor
-	 */
-	public IWorkbenchPartDescriptor getWorkbenchPartDescriptor() {
-		return workbenchPartDescriptor;
-	}
-
-	/* (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) {
-		((IContributionItemProvider) provider).contributeToActionBars(
-			getActionBars(),
-			getWorkbenchPartDescriptor());
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToPopupMenuOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToPopupMenuOperation.java
deleted file mode 100644
index d866996..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributeToPopupMenuOperation.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.runtime.common.ui.services.action.internal.contributionitem;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-
-/**
- * An operation to contribute to a popup menu of a given part type.
- * 
- * @see ContributionItemService
- * @see IContributionItemProvider
- * 
- * @author melaasar
- */
-public final class ContributeToPopupMenuOperation implements IOperation {
-
-	/** the popup menu manager */
-	private final IMenuManager popupMenu;
-	/** the workbench part */
-	private final IWorkbenchPart workbenchPart;
-
-	/**
-	 * Constructs a new <code>ContributeToPopupMenuOperation</code> instance.
-	 * 
-	 * @param popupMenu The popup menu manager
-	 * @param workbenchPart The workbench part
-	*/
-	public ContributeToPopupMenuOperation(
-		IMenuManager popupMenu,
-		IWorkbenchPart workbenchPart) {
-		
-		assert null != popupMenu : "popupMenu cannot be null"; //$NON-NLS-1$
-		assert null != workbenchPart : "workbenchPart cannot be null"; //$NON-NLS-1$
-
-		this.popupMenu = popupMenu;
-		this.workbenchPart = workbenchPart;
-	}
-
-	/**
-	 * Retuns the popup menu manager.
-	 * 
-	 * @return The popup menu manager
-	 */
-	public IMenuManager getPopupMenu() {
-		return popupMenu;
-	}
-
-	/**
-	 * Returns the workbench part.
-	 * 
-	 * @return The workbench part
-	 */
-	public IWorkbenchPart getWorkbenchPart() {
-		return workbenchPart;
-	}
-
-	/* (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) {
-		((IContributionItemProvider) provider).contributeToPopupMenu(
-			getPopupMenu(),
-			getWorkbenchPart());
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributionItemConstants.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributionItemConstants.java
deleted file mode 100644
index 629e1f6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ContributionItemConstants.java
+++ /dev/null
@@ -1,24 +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.action.internal.contributionitem;
-
-/**
- * Constants used by the contribution item service.
- * 
- * @author melaasar
- */
-public interface ContributionItemConstants {
-
-	/** The id of the default additions group in a menu. */
-	public final String GROUP_ADDITIONS = "additionsGroup";//$NON-NLS-1$
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/DisposeContributionsOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/DisposeContributionsOperation.java
deleted file mode 100644
index 8c143bf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/DisposeContributionsOperation.java
+++ /dev/null
@@ -1,59 +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.action.internal.contributionitem;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-
-/**
- * An operation to dispose of and clear the cache of contributions
- * made to a part with a certain type.
- * 
- * @author melaasar
- */
-public final class DisposeContributionsOperation implements IOperation {
-
-	/** the part's descriptor */
-	private final IWorkbenchPartDescriptor workbenchPartDescriptor;
-
-	/**
-	 * Constructs an instance of <code>DisposeContributionsOperation</code>.
-	 * 
-	 * @param workbenchPartDescriptor the part's descriptor
-	 */
-	public DisposeContributionsOperation(IWorkbenchPartDescriptor workbenchPartDescriptor) {
-
-		assert null != workbenchPartDescriptor : "workbenchPartDescriptos cannot be null"; //$NON-NLS-1$
-
-		this.workbenchPartDescriptor = workbenchPartDescriptor;
-	}
-
-	/**
-	 * Returns the part's descriptor.
-	 * 
-	 * @return The part's descriptor
-	 */
-	public IWorkbenchPartDescriptor getWorkbenchPartDescriptor() {
-		return workbenchPartDescriptor;
-	}
-
-	/* (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) {
-		((IContributionItemProvider) provider).disposeContributions(
-			getWorkbenchPartDescriptor());
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionDescriptorReader.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionDescriptorReader.java
deleted file mode 100644
index 7f0cafd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionDescriptorReader.java
+++ /dev/null
@@ -1,30 +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.action.internal.contributionitem;
-
-
-/**
- * A package-protected interface for providers wishing to read the contribution
- * descriptor built by parsing the contribution information in the provider's extension.
- * 
- * @author melaasar
- */
-public interface IContributionDescriptorReader {
-
-	/**
-	 * Sets the contribution descriptor of the provider.
-	 * 
-	 * @param descriptor the contribution descriptor of the provider
-	 */
-	public void setContributionDescriptor(ProviderContributionDescriptor descriptor);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionItemProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionItemProvider.java
deleted file mode 100644
index ab44fe0..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/IContributionItemProvider.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.action.internal.contributionitem;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-
-/**
- * A provider interface to contribute to the action bars and/or
- * popup menus of workbench parts. A provider implementing this
- * interface will typically add contributions to the following
- * contribution managers: MainBar, ToolBar, GlobalActions and ContextMenu(s) of 
- * parts using the <code>ContributionItemService</code>
- * <P>
- * The information needed to perform the contribution can optionally
- * be described in XML along with the provider extension. In that case,
- * the provider implementing this interface has to also implement the package-protected
- * <code>IContributionDescriptorReader</code> interface , which ensures that
- * the provider gets a reference to its contribution description.
- * The <code>AbstractContributionItemProvider</code> provides an abstract
- * implementation of such provider
- * <P>
- * If a provider chose not to describe its contribution in its extension
- * then it has to implement this interface itself to do programatic
- * contributions to the managers.
- * 
- * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService
- * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.AbstractContributionItemProvider 
- * 
- * @author melaasar, cmahoney
- */
-public interface IContributionItemProvider extends IProvider {
-
-	/**
-	 * Contributes to the given action bars that belong to a part 
-	 * described with the given part descriptor.
-	 * <P>
-	 * This API is usually called from the <code>init()</code> method
-	 * of a <code>EditorActionBarContributor</code> class for editors
-	 * and from <code>init()</code> method of <code>IViewPart</code>
-	 * implementation for views.
-	 * 
-	 * @param actionBars The target action bars
-	 * @param workbenchPartDescriptor The context workbench part descriptor
-	 */
-	public void contributeToActionBars(
-		IActionBars actionBars,
-		IWorkbenchPartDescriptor workbenchPartDescriptor);
-	
-	/**
-	 * Contributes to the given action bars that belong to a part described with
-	 * the given part descriptor ONLY IF this provider has not already
-	 * contributed to this part.
-	 * <P>
-	 * This API is usually called when an event takes place such that new
-	 * providers may now provide contributions to the actionbars. Only those new
-	 * providers need to add their contributions.
-	 * 
-	 * @param actionBars
-	 *            The target action bars
-	 * @param workbenchPartDescriptor
-	 *            The context workbench part descriptor
-	 */
-	public void updateActionBars(
-		IActionBars actionBars,
-		IWorkbenchPartDescriptor workbenchPartDescriptor);
-
-	/**
-	 * Contributes to the given popup menu of the given part
-	 * The popup menu id has to match the id used to register this
-	 * menu with the part's site. Since the current selection could be
-	 * a context to this API, a selection could be retrieved from the
-	 * part's site's selection provider.
-	 * <P>
-	 * This API is usually called from <code>menuAboutToShow()</code> method
-	 * of the main <code>IMenuListener</code> to a given context menu.
-	 *
-	 * @param popupMenu The target popup menu manager
-	 * @param workbenchPart The context workbench part
-	 */
-	public void contributeToPopupMenu(
-		IMenuManager popupMenu,
-		IWorkbenchPart workbenchPart);
-
-	/**
-	 * Gives the provider a chance to clean up and dispose any cached contributions
-	 * previously targeted at a part described by the given descriptor.
-	 * <P>
-	 * This API is usually called when the part contributor is disposing. This 
-	 * would be form the <code>dispose</code> method of the 
-	 * <code>EditorActioBarContributor</code> for editors and the <code>dispose</code>
-	 * method of <code>IViewPart</code> for views. 
-	 * 
-	 * @param workbenchPartDescriptor The context workbench part descriptor
-	 */
-	public void disposeContributions(IWorkbenchPartDescriptor workbenchPartDescriptor);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ProviderContributionDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ProviderContributionDescriptor.java
deleted file mode 100644
index 1246cc6..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/ProviderContributionDescriptor.java
+++ /dev/null
@@ -1,1275 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.action.internal.contributionitem;
-
-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.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-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.contributionitem.IPopupMenuContributionPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.action.internal.CommonUIServicesActionStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.IMarkSelection;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-/**
- * A descriptor for an XML-based contribution made by a provider of
- * contribution items. This class parses an <code>IConfigurationElement</code> 
- * that is associated with a given extension of a contribution item provider 
- * and builds the contribution descriptor in memeory for a more convenient access
- * 
- * @author melaasar
- */
-public class ProviderContributionDescriptor extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String PART_CONTRIBUTION = "partContribution"; //$NON-NLS-1$
-	private static final String PART_MENU_CONTRIBUTION = "partMenu"; //$NON-NLS-1$
-	private static final String PART_MENUGROUP_CONTRIBUTION = "partMenuGroup"; //$NON-NLS-1$
-	private static final String PART_ACTION_CONTRIBUTION = "partAction"; //$NON-NLS-1$
-	private static final String PART_ACTIONGROUP_CONTRIBUTION = "partActionGroup"; //$NON-NLS-1$
-	private static final String PART_CUSTOM_CONTRIBUTION = "partCustom"; //$NON-NLS-1$
-	/**
-	 * @since 1.3
-	 */
-	private static final String PART_PREDEFINED_ITEM = "partPredefinedItem"; //$NON-NLS-1$
-	private static final String POPUP_CONTRIBUTION = "popupContribution"; //$NON-NLS-1$
-	private static final String POPUP_MENU_CONTRIBUTION = "popupMenu"; //$NON-NLS-1$
-	private static final String POPUP_MENUGROUP_CONTRIBUTION = "popupMenuGroup"; //$NON-NLS-1$
-	private static final String POPUP_ACTION_CONTRIBUTION = "popupAction"; //$NON-NLS-1$
-	private static final String POPUP_ACTIONGROUP_CONTRIBUTION = "popupActionGroup"; //$NON-NLS-1$
-	private static final String POPUP_CUSTOM_CONTRIBUTION = "popupCustom"; //$NON-NLS-1$
-    private static final String POPUP_PREDEFINED_ITEM = "popupPredefinedItem"; //$NON-NLS-1$
-	private static final String STRUCTURED_CRITERIA = "popupStructuredContributionCriteria"; //$NON-NLS-1$
-	private static final String TEXT_CRITERIA = "popupTextContributionCriteria"; //$NON-NLS-1$
-	private static final String MARK_CRITERIA = "popupMarkContributionCriteria"; //$NON-NLS-1$
-	private static final String CONTRIBUTION_ID = "id"; //$NON-NLS-1$
-	private static final String CONTRIBUTION_TOOLBAR_PATH = "toolbarPath"; //$NON-NLS-1$
-	private static final String CONTRIBUTION_MENUBAR_PATH = "menubarPath"; //$NON-NLS-1$
-	private static final String CONTRIBUTION_PATH = "path"; //$NON-NLS-1$
-	private static final String MENUGROUP_SEPARATOR = "separator"; //$NON-NLS-1$
-	private static final String OBJECT_CLASS = "objectClass"; //$NON-NLS-1$
-	private static final String OBJECT_COUNT = "objectCount"; //$NON-NLS-1$
-	private static final String POLICY_CLASS = "policyClass"; //$NON-NLS-1$
-	private static final String GLOBAL = "global"; //$NON-NLS-1$
-	private static final String TEXT = "text"; //$NON-NLS-1$
-	private static final String DOCUMENT_CLASS = "documentClass"; //$NON-NLS-1$
-    private static final String REMOVE = "remove"; //$NON-NLS-1$
-    /**
-	 * @since 1.3
-	 */
-    private static final String REMOVE_FROM_TOOLBAR = "removeFromToolbar"; //$NON-NLS-1$
-    /**
-	 * @since 1.3
-	 */
-    private static final String REMOVE_FROM_MENUBAR = "removeFromMenubar"; //$NON-NLS-1$
-
-	/** the list of all part contributions made by a provider */
-	private List partContributions = new ArrayList();
-
-	/** the list of all popup menu contributions made by a provider */
-	private List popupContributions = new ArrayList();
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private ProviderContributionDescriptor(IConfigurationElement configElement) {
-		IConfigurationElement configChildren[] = configElement.getChildren();
-		if (configChildren.length <= 1)
-			Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The contribution item provider has zero contributions"); //$NON-NLS-1$
-
-		// sort out the contributions into part and popup related
-		for (int i = 1; i < configChildren.length; i++) {
-			if (configChildren[i].getName().equals(PART_CONTRIBUTION)) {
-				partContributions.add(
-					new PartContributionDescriptor(configChildren[i]));
-			} else if (
-				configChildren[i].getName().equals(POPUP_CONTRIBUTION)) {
-				popupContributions.add(
-					new PopupContributionDescriptor(configChildren[i]));
-			}
-		}
-	}
-
-	/**
-	 * 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 ProviderContributionDescriptor parse(IConfigurationElement configElement) {
-		assert null != configElement : "null provider configuration element"; //$NON-NLS-1$
-		return new ProviderContributionDescriptor(configElement);
-	}
-
-	/**
-	 * Determines if the descriptor has any XML-based contributions.
-	 * 
-	 * @return Whether the descriptor contains contribution descriptors or not
-	 */
-	public boolean hasContributions() {
-		return !partContributions.isEmpty() || !popupContributions.isEmpty();
-	}
-
-	/**
-	 * Determines if the provider contribution descriptor has contributions
-	 * for a part with the given id and class.
-	 * 
-	 * @param partId The target part's id
-	 * @param partClass The target part's class
-	 * @return whether contribution are available or not
-	 */
-	public boolean hasContributionsFor(String partId, Class partClass) {
-		assert null != partId : "null part id"; //$NON-NLS-1$
-		assert null != partClass : "null part class"; //$NON-NLS-1$
-
-		Iterator iter = partContributions.iterator();
-		while (iter.hasNext()) {
-			PartContributionDescriptor contribution =
-				(PartContributionDescriptor) iter.next();
-			if (contribution.appliesTo(partId, partClass))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Determines if the provider contribution descriptor has contributions
-	 * for a given popup menu with a given selection as a context.
-	 * 
-	 * @param popupMenu The target popup menu manager
-	 * @param selection The menu context (selection)
-	 * @return whether contribution are available or not
-	 */
-	public boolean hasContributionsFor(
-		IMenuManager popupMenu,
-		ISelection selection) {
-		assert null != popupMenu : "null popupMenu"; //$NON-NLS-1$
-		assert null != selection : "null selection"; //$NON-NLS-1$
-
-		String popupId = popupMenu.getId();
-		Class popupClass = popupMenu.getClass();
-
-		Iterator iter = popupContributions.iterator();
-		while (iter.hasNext()) {
-			PopupContributionDescriptor contribution =
-				(PopupContributionDescriptor) iter.next();
-			if (contribution.appliesTo(popupId, popupClass, selection))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets a list of contributions available in the descriptor for a given 
-	 * part with the given id and class.
-	 * 
-	 * @param partId The target part's id
-	 * @param partClass The target part's class
-	 * @return a list of contributions
-	 */
-	public List getContributionsFor(String partId, Class partClass) {
-		assert null != partId : "null part id"; //$NON-NLS-1$
-		assert null != partClass : "null part class"; //$NON-NLS-1$
-
-		List contributions = new ArrayList();
-		Iterator iter = partContributions.iterator();
-		while (iter.hasNext()) {
-			PartContributionDescriptor contribution =
-				(PartContributionDescriptor) iter.next();
-			if (contribution.appliesTo(partId, partClass)) {
-				contributions.addAll(contribution.getContributionItems());
-			}
-		}
-		return contributions;
-	}
-
-	/**
-	 * Gets a list of contributions available in the descriptor for a given 
-	 * popup menu with a given selection as a context.
-	 * 
-	 * @param popupMenu The target popup menu manager
-	 * @param selection The menu context (selection)
-	 * @return a list of contributions
-	 */
-	public List getContributionsFor(
-		IMenuManager popupMenu,
-		ISelection selection) {
-		assert null != popupMenu : "null popupMenu"; //$NON-NLS-1$
-		assert null != selection : "null selection"; //$NON-NLS-1$
-
-		List contributions = new ArrayList();
-		Iterator iter = popupContributions.iterator();
-		while (iter.hasNext()) {
-			PopupContributionDescriptor contribution =
-				(PopupContributionDescriptor) iter.next();
-			if (contribution
-				.appliesTo(
-					popupMenu.getId(),
-					popupMenu.getClass(),
-					selection)) {
-				contributions.addAll(contribution.getContributionItems());
-			}
-		}
-		return contributions;
-	}
-
-	/**
-	 * An abstract descriptor for a contribution made in XML by 
-	 * a contribution item provider. 
-	 */
-	private static abstract class AbstractContributionDescriptor {
-		/** the target id */
-		private final String targetId;
-		/** the target class name */
-		private final String targetClassName;
-		/** the list of items contributed by this descriptor */
-		private List contributionItems = new ArrayList();
-
-		/**
-		 * Initializes a new contribution descriptor by reading the target
-		 * id and class from the contribution configuration element.
-		 * 
-		 * @param configElement The contribution configuration element
-		 */
-		public AbstractContributionDescriptor(IConfigurationElement configElement) {
-			targetId = configElement.getAttribute(ID);
-			targetClassName = configElement.getAttribute(CLASS);
-			if (targetId == null && targetClassName == null)
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "Both the target id and class are missing for the contribution"); //$NON-NLS-1$
-		}
-
-		/**
-		 * Determines whether this contribution is applicable to the given source id & class.
-		 * 
-		 * @param sourceId The source id
-		 * @param sourceClass The source class
-		 * @return <code>true</code> if applicable <code>false</code> if not
-		 */
-		protected boolean appliesTo(String sourceId, Class sourceClass) {
-			if (targetId != null && sourceId != null) {
-				return targetId.equals(sourceId);
-			}
-			if (targetClassName != null && sourceClass != null) {
-				return isAssignableTo(sourceClass, targetClassName);
-			}
-			return false;
-		}
-
-		/**
-		 * Returns the list of contribution items provided in this descriptor.
-		 * 
-		 * @return a List of contributions items provided by this descriptor
-		 */
-		public List getContributionItems() {
-			return contributionItems;
-		}
-
-	}
-
-	/**
-	 * A descriptor for a part contribution made by a contribution item provider.
-	 */
-	private static class PartContributionDescriptor
-		extends AbstractContributionDescriptor {
-
-		/**
-		 * Constructs a new descriptor for a part contribution 
-		 * by parsing all the contirbution items from a configuration element.
-		 * 
-		 * @param configElement The contribution configuration element
-		 */
-		public PartContributionDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-
-			IConfigurationElement configChildren[] =
-				configElement.getChildren();
-			if (configChildren.length <= 0)
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The part contribution has zero contribution items"); //$NON-NLS-1$
-
-			for (int i = 0; i < configChildren.length; i++) {
-				String contributionType = configChildren[i].getName();
-				if (contributionType.equals(PART_MENU_CONTRIBUTION))
-					getContributionItems().add(
-						new PartMenuDescriptor(configChildren[i]));
-				else if (contributionType.equals(PART_MENUGROUP_CONTRIBUTION))
-					getContributionItems().add(
-						new PartMenuGroupDescriptor(configChildren[i]));
-				else if (contributionType.equals(PART_ACTION_CONTRIBUTION))
-					getContributionItems().add(
-						new PartActionDescriptor(configChildren[i]));
-				else if (contributionType.equals(PART_CUSTOM_CONTRIBUTION))
-					getContributionItems().add(
-						new PartCustomDescriptor(configChildren[i]));
-				else if (contributionType.equals(PART_ACTIONGROUP_CONTRIBUTION))
-					getContributionItems().add(
-						new PartActionGroupDescriptor(configChildren[i]));
-	            else if (contributionType.equals(PART_PREDEFINED_ITEM))
-	                getContributionItems().add(
-	                    new PartPredefinedItemDescriptor(configChildren[i]));                 
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ProviderContributionDescriptor.AbstractContributionDescriptor#appliesTo(java.lang.String, java.lang.Class)
-		 */
-		public boolean appliesTo(String sourceId, Class sourceClass) {
-			return super.appliesTo(sourceId, sourceClass);
-		}
-	}
-
-	/**
-	 * A descriptor for a popup menu contribution made by a contribution item provider.
-	 */
-	private static class PopupContributionDescriptor
-		extends AbstractContributionDescriptor {
-		/** an optional popup menu contribution criteria */
-		private PopupContributionCriteria[] criteria;
-
-		/**
-		 * Constructs a new descriptor for a popup menu contribution 
-		 * by parsing all the contirbution items from a configuration element.
-		 * 
-		 * @param configElement The contribution configuration element
-		 */
-		public PopupContributionDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-
-			criteria = readCriteria(configElement);
-
-			IConfigurationElement configChildren[] =
-				configElement.getChildren();
-			if (configChildren.length <= 0)
-				Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The part contribution has zero contribution items"); //$NON-NLS-1$
-
-			for (int i = 0; i < configChildren.length; i++) {
-				String contributionType = configChildren[i].getName();
-				if (contributionType.equals(POPUP_MENU_CONTRIBUTION))
-					getContributionItems().add(
-						new PopupMenuDescriptor(configChildren[i]));
-				else if (contributionType.equals(POPUP_MENUGROUP_CONTRIBUTION))
-					getContributionItems().add(
-						new PopupMenuGroupDescriptor(configChildren[i]));
-				else if (contributionType.equals(POPUP_ACTION_CONTRIBUTION))
-					getContributionItems().add(
-						new PopupActionDescriptor(configChildren[i]));
-				else if (contributionType.equals(POPUP_CUSTOM_CONTRIBUTION))
-					getContributionItems().add(
-						new PopupCustomDescriptor(configChildren[i]));
-				else if (contributionType.equals(POPUP_ACTIONGROUP_CONTRIBUTION))
-					getContributionItems().add(
-						new PopupActionGroupDescriptor(configChildren[i]));
-               else if (contributionType.equals(POPUP_PREDEFINED_ITEM))
-                    getContributionItems().add(
-                        new PopupPredefinedItemDescriptor(configChildren[i]));
-
-			}
-		}
-
-		/**
-		 * Reads the contribution criteria if any. Depending on the type of
-		 * criteria, the correct descriptor will be instantiated.
-		 * @param configElement the configuration element
-		 * @return the popup contribution criteria
-		 */
-		protected PopupContributionCriteria[] readCriteria(IConfigurationElement configElement) {
-			IConfigurationElement[] criteriaEl;
-
-			criteriaEl = configElement.getChildren(STRUCTURED_CRITERIA);
-			if (criteriaEl.length > 0) {
-				PopupContributionCriteria[] pcc =
-					new PopupContributionCriteria[criteriaEl.length];
-				for (int i = 0; i < criteriaEl.length; i++) {
-					pcc[i] =
-						new PopupStructuredContributionCriteria(criteriaEl[i]);
-				}
-				return pcc;
-			}
-			criteriaEl = configElement.getChildren(TEXT_CRITERIA);
-			if (criteriaEl.length > 0) {
-				PopupContributionCriteria[] pcc =
-					new PopupContributionCriteria[criteriaEl.length];
-				for (int i = 0; i < criteriaEl.length; i++) {
-					pcc[i] = new PopupTextContributionCriteria(criteriaEl[i]);
-				}
-				return pcc;
-			}
-			criteriaEl = configElement.getChildren(MARK_CRITERIA);
-			if (criteriaEl.length > 0) {
-				PopupContributionCriteria[] pcc =
-					new PopupContributionCriteria[criteriaEl.length];
-				for (int i = 0; i < criteriaEl.length; i++) {
-					pcc[i] = new PopupMarkContributionCriteria(criteriaEl[i]);
-				}
-				return pcc;
-			}
-			return null;
-		}
-
-		/**
-		 * Determines whether this contribution is applicable to the given source 
-		 * id & class and for the given selection.
-		 * 
-		 * @param sourceId The source id
-		 * @param sourceClass The source class
-		 * @param selection The selection (context)
-		 * @return <code>true</code> if it applies and <code>false</code> if not
-		 */
-		public boolean appliesTo(
-			String sourceId,
-			Class sourceClass,
-			ISelection selection) {
-			if (!appliesTo(sourceId, sourceClass))
-				return false;
-			if (criteria != null) {
-				if (!isCriteriaMet(selection))
-					return false;
-			}
-			return true;
-		}
-
-		/**
-		 * Determines if at least one of the criteria is met in the given
-		 * <code>selection</code>.
-		 * 
-		 * @param selection
-		 *            the selection
-		 * @return <code>true</code> if at least one criteria is met,
-		 *         <code>false/code> otherwise
-		 */
-		protected boolean isCriteriaMet(ISelection selection) {
-			for (int i = 0; i < criteria.length; i++) {
-				if (criteria[i].appliesTo(selection))
-					return true;
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * An abstract descriptor for a contribution item by a contribution 
-	 * item provider through XML.
-	 */
-	private static abstract class AbstractContributionItemDescriptor {
-		/** the contribution item id */
-		private String id;
-
-		/**
-		 * Contructs a new contribution item descriptor by extracting the item's id
-		 * from the configuration element.
-		 * 
-		 * @param configElement The configuration element
-		 */
-		public AbstractContributionItemDescriptor(IConfigurationElement configElement) {
-			this.id = configElement.getAttribute(CONTRIBUTION_ID);
-			assert null != id : "The contribution item's id is missing"; //$NON-NLS-1$
-		}
-
-		/**
-		 * Returns the contribution item id.
-		 * 
-		 * @return The id of the contribution item
-		 */
-		public String getId() {
-			return id;
-		}
-
-		/**
-		 * A utility method to extract the contribution item's menu path within
-		 * its target manager from a location in the configuration.
-		 * 
-		 * @param location The supplied location in the configuration
-		 * @return The contribution item's menu path in its target manager
-		 */
-		protected static String extractMenuPath(String location) {
-			if (location != null) {
-				int loc = location.lastIndexOf('/');
-				if (loc != -1) {
-					return location.substring(0, loc == 0 ? 1 : loc);
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * A utility method to extract the contribution item's group within
-		 * its target manager from a location in the configuration.
-		 * 
-		 * @param location The supplied location in the configuration
-		 * @return The contribution item's group in its target manager
-		 */
-		protected static String extractGroup(String location) {
-			if (location != null) {
-				int loc = location.lastIndexOf('/');
-				if (loc != -1) {
-					return location.substring(loc + 1);
-				}
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * A descriptor for a part contribution item.
-	 */
-	private static abstract class AbstractPartContributionItemDescriptor
-		extends AbstractContributionItemDescriptor implements IPartSelector {
-		/** the contribution item's menubar path */
-		private String menubarPath;
-		/** the contribution item's menubar group */
-		private String menubarGroup;
-		/** the contribution item's toolbar path */
-		private String toolbarPath;
-		/** the contribution item's toolbar group */
-		private String toolbarGroup;
-		/** the contribution item's part ID, if specified */
-		private String targetId;
-		/** the contribution item's part class name or interface name, if specified */
-		private String targetClassName;
-
-		/**
-		 * Constructs a new part contribution item from its configuration element.
-		 * 
-		 * @param configElement The item's configuration element
-		 */
-		public AbstractPartContributionItemDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-
-			String location;
-
-			location = configElement.getAttribute(CONTRIBUTION_MENUBAR_PATH);
-			if (location != null) {
-				menubarPath = extractMenuPath(location);
-				menubarGroup = extractGroup(location);
-			}
-
-			location = configElement.getAttribute(CONTRIBUTION_TOOLBAR_PATH);
-			if (location != null) {
-				toolbarPath = extractMenuPath(location);
-				toolbarGroup = extractGroup(location);
-			}	
-
-			// extract the part ID or class name from the parent element
-			Object parent = configElement.getParent();
-			if (parent instanceof IConfigurationElement) {
-				IConfigurationElement parentElement = ((IConfigurationElement) parent);
-				targetId = parentElement.getAttribute(ID);
-				targetClassName = parentElement.getAttribute(CLASS);
-			}
-		}
-
-		/**
-		 * Returns the menubar path if any.
-		 * 
-		 * @return The menubar path if any
-		 */
-		public String getMenubarPath() {
-			return menubarPath;
-		}
-
-		/**
-		 * Returs the menubar group if any.
-		 * 
-		 * @return The menubar group if any
-		 */
-		public String getMenubarGroup() {
-			return menubarGroup;
-		}
-
-		/**
-		 * Returns the toolbar path if any.
-		 * 
-		 * @return The toolbar path if any
-		 */
-		public String getToolbarPath() {
-			return toolbarPath;
-		}
-
-		/**
-		 * Returs the toolbar group if any.
-		 * 
-		 * @return The toolbar group if any
-		 */
-		public String getToolbarGroup() {
-			return toolbarGroup;
-		}		
-		
-		/**
-		 * Determines whether or not this contribution is applicable to the
-		 * given workbench <code>part</code>.
-		 * 
-		 * @param part
-		 *            the workbench part to be tested
-		 * @return <code>true</code> if applicable, <code>false</code> if
-		 *         not
-		 */
-		public boolean selects(IWorkbenchPart part) {
-
-			IWorkbenchPartSite site = part.getSite();
-			if (site != null) {
-				String partId = site.getId();
-				if (targetId != null && partId != null) {
-					return targetId.equals(partId);
-				}
-			}
-
-			Class partClass = part.getClass();
-			if (targetClassName != null && partClass != null) {
-				return isAssignableTo(partClass, targetClassName);
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * A descriptor for a popup menu contribution item.
-	 */
-	public static abstract class AbstractPopupContributionItemDescriptor
-		extends AbstractContributionItemDescriptor implements IPartSelector {
-		/** the contribution item's path */
-		private String path;
-		/** the contribution item's group */
-		private String group;
-
-		/**
-		 * Constructs a new part contribution item from its configuration element.
-		 * 
-		 * @param configElement The item's configuration element
-		 */
-		public AbstractPopupContributionItemDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-
-			String location = configElement.getAttribute(CONTRIBUTION_PATH);
-			if (location != null) {
-				path = extractMenuPath(location);
-				group = extractGroup(location);
-			} else {
-				path = "/"; //$NON-NLS-1$
-				group = ContributionItemConstants.GROUP_ADDITIONS;
-			}
-		}
-
-		/**
-		 * Returns the contribution item's path if any.
-		 * 
-		 * @return The contribution item's path if any
-		 */
-		public String getPath() {
-			return path;
-		}
-
-		/**
-		 * Returs the contribution item's group if any.
-		 * 
-		 * @return The contribution item's group if any
-		 */
-		public String getGroup() {
-			return group;
-		}
-		
-		/**
-		 * Always returns <code>false</code>.
-		 * <P>
-		 * Popup contributions are always re-contributed when the menu is about
-		 * to be shown, so there is no need for them to listen for selection
-		 * change on the workbench part.
-		 */
-		public boolean selects(IWorkbenchPart part) {
-			return false;
-		}
-	}
-
-	/**
-	 * A descriptor for a part menu contribution item.
-	 */
-	public static class PartMenuDescriptor
-		extends AbstractPartContributionItemDescriptor {
-
-		/**
-		 * Constructs a new part menu descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PartMenuDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-
-	/**
-	 * A descriptor for a part menu group contribution item.
-	 */
-	public static class PartMenuGroupDescriptor
-		extends AbstractPartContributionItemDescriptor {
-		/** whether this menu group is a separator */
-		private Boolean separator;
-
-		/**
-		 * Constructs a new part menu group descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PartMenuGroupDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-			String sep = configElement.getAttribute(MENUGROUP_SEPARATOR);
-			separator = sep == null ? Boolean.TRUE : Boolean.valueOf(sep);
-		}
-
-		/**
-		 * Returns whether this menu group descriptor is also a separator.
-		 * 
-		 * @return <code>true</code> if separator and <code>false</code> if not
-		 */
-		public boolean isSeparator() {
-			return separator.booleanValue();
-		}
-	}
-
-	/**
-	 * A descriptor for a part action contribution item.
-	 */
-	public static class PartActionDescriptor
-		extends AbstractPartContributionItemDescriptor {
-
-		/** whether this action is a global one */
-		private Boolean isGlobal;
-
-		/**
-		 * Constructs a new part action descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PartActionDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-			String global = configElement.getAttribute(GLOBAL);
-			isGlobal = global == null ? Boolean.FALSE : Boolean.valueOf(global);
-		}
-
-		/**
-		 * Whether this is a global action
-		 * 
-		 * @return <code>true</code> if global, <code>false</code> otherwise
-		 */
-		public boolean isGlobal() {
-			return isGlobal.booleanValue();
-		}
-
-	}
-	
-	/**
-	 * A descriptor for a part action group contribution item.
-	 */
-	public static class PartActionGroupDescriptor
-		extends AbstractPartContributionItemDescriptor {
-
-		/**
-		 * Constructs a new popup action group descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PartActionGroupDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-
-	/**
-	 * A descriptor for a part custom contribution item.
-	 */
-	public static class PartCustomDescriptor
-		extends AbstractPartContributionItemDescriptor {
-		/**
-		 * Constructs a new part custom descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PartCustomDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-	
-	/**
-     * A descriptor for a contribution item previously defined as an addition to toolbar or menubar.
-     *
-	 * @since 1.3
-	 */
-	public static class PartPredefinedItemDescriptor
-    	extends AbstractContributionItemDescriptor {
-    
-		/** the contribution item's path in the menubar*/
-	    private String menubarPath;
-	    /** the contribution item's path in the toolbar*/
-	    private String toolbarPath;
-	    
-	    /** flag to remove the predefined contribution item from the toolbar*/
-	    private boolean removeFromToolbar;
-	    /** flag to remove the predefined contribution item from the menu*/
-	    private boolean removeFromMenubar;
-	
-	    /**
-	     * Constructs a new popup custom descriptor from its configuration element.
-	     * 
-	     * @param configElement The contribution's configuration element
-	     */
-	    public PartPredefinedItemDescriptor(IConfigurationElement configElement) {
-	        super(configElement);
-	        
-	        String location = configElement.getAttribute(CONTRIBUTION_MENUBAR_PATH);
-	        menubarPath = (location == null) ? "/" //$NON-NLS-1$
-	            : extractMenuPath(location);
-	        
-	        location = configElement.getAttribute(CONTRIBUTION_TOOLBAR_PATH);	
-	        toolbarPath = (location == null) ? "/" //$NON-NLS-1$
-		            : extractMenuPath(location);	        
-	        
-	        removeFromToolbar = Boolean.valueOf(configElement.getAttribute(REMOVE_FROM_TOOLBAR)).booleanValue();
-	        
-	        removeFromMenubar = Boolean.valueOf(configElement.getAttribute(REMOVE_FROM_MENUBAR)).booleanValue();           
-	    }
-	    
-	    /**
-	     * Returns the contribution item's path in the toolbar if any, or "/" if not.
-	     * 
-	     * @return The contribution item's path in the toolbar if any, or "/" if not
-	     */
-	    public String getToolbarPath() {
-	        return toolbarPath;
-	    }  	    
-	    
-	    /**
-	     * Returns the contribution item's path in the menu if any, or "/" if not.
-	     * 
-	     * @return The contribution item's path in the menu if any, or "/" if not
-	     */
-	    public String getMenubarPath() {
-	        return menubarPath;
-	    }       
-	    
-	    /**
-	     * Returns true if predefined item needs to be removed from the toolbar.
-	     * 
-	     * @return true if predefined item needs to be removed from the toolbar
-	     */
-	    public boolean isToBeRemovedFromToolbar() {
-	        return removeFromToolbar;
-	    }
-
-	    /**
-	     * Returns true if predefined item needs to be removed from the menubar.
-	     * 
-	     * @return true if predefined item needs to be removed from the menubar
-	     */	    
-	    public boolean isToBeRemovedFromMenubar() {
-	        return removeFromMenubar;
-	    }       
-	}		
-
-	/**
-	 * A descriptor for a popup menu contribution item.
-	 */
-	public static class PopupMenuDescriptor
-		extends AbstractPopupContributionItemDescriptor {
-
-		/**
-		 * Constructs a new popup menu descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PopupMenuDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-
-	/**
-	 * A descriptor for a popup menu group contribution item.
-	 */
-	public static class PopupMenuGroupDescriptor
-		extends AbstractPopupContributionItemDescriptor {
-		/** whether this menu group is a separator */
-		private Boolean separator;
-
-		/**
-		 * Constructs a new popup menu group descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PopupMenuGroupDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-			String sep = configElement.getAttribute(MENUGROUP_SEPARATOR);
-			separator = sep == null ? Boolean.TRUE : Boolean.valueOf(sep);
-		}
-
-		/**
-		 * Returns whether this menu group descriptor is also a separator.
-		 * 
-		 * @return <code>true</code> if separator and <code>false</code> if not
-		 */
-		public boolean isSeparator() {
-			return separator.booleanValue();
-		}
-
-	}
-
-	/**
-	 * A descriptor for a popup action contribution item.
-	 */
-	public static class PopupActionDescriptor
-		extends AbstractPopupContributionItemDescriptor {
-
-		/**
-		 * Constructs a new popup action descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PopupActionDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-
-	/**
-	 * A descriptor for a popup action group contribution item.
-	 */
-	public static class PopupActionGroupDescriptor
-		extends AbstractPopupContributionItemDescriptor {
-
-		/**
-		 * Constructs a new popup action group descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PopupActionGroupDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-
-	/**
-	 * A descriptor for a popup custom contribution item.
-	 */
-	public static class PopupCustomDescriptor
-		extends AbstractPopupContributionItemDescriptor {
-		/**
-		 * Constructs a new popup custom descriptor from its configration element.
-		 * 
-		 * @param configElement The contribution's configuration element
-		 */
-		public PopupCustomDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-		}
-	}
-    
-    /**
-     * A descriptor for a predefined contribution item.
-     */
-    public static class PopupPredefinedItemDescriptor
-        extends AbstractContributionItemDescriptor {
-        
-        /** the contribution item's path */
-        private String path;
-        
-        /** flag to remove the predefined contribution item */
-        private boolean remove;
-
-        /**
-         * Constructs a new popup custom descriptor from its configration element.
-         * 
-         * @param configElement The contribution's configuration element
-         */
-        public PopupPredefinedItemDescriptor(IConfigurationElement configElement) {
-            super(configElement);
-            
-            String location = configElement.getAttribute(CONTRIBUTION_PATH);
-            path = (location == null) ? "/" //$NON-NLS-1$
-                : extractMenuPath(location);
-            remove = Boolean.valueOf(configElement.getAttribute(REMOVE))
-                .booleanValue();
-        }
-        
-        /**
-         * Returns the contribution item's path if any.
-         * 
-         * @return The contribution item's path if any
-         */
-        public String getPath() {
-            return path;
-        }
-        
-        public boolean isToBeRemoved() {
-            return remove;
-        }
-        
-    }
-	/**
-	 * The popup menu contribution criteria.  Currently the following criteria are supported:
-	 * 1) Whether a given contribution policy applies to the selection.
-	 */
-	private static class PopupContributionCriteria {
-		/** the criteria configuration element */
-		private IConfigurationElement configElement;
-		/** the criteria's policy class name */
-		private String policyClassName;
-		/** the 'loaded' policy class */
-		private IPopupMenuContributionPolicy policy = null;
-
-		/**
-		 * Constructs a new popup menu contribution criteria from a configuration element.
-		 * 
-		 * @param configElement The criteria's configuration element
-		 */
-		public PopupContributionCriteria(IConfigurationElement configElement) {
-			this.configElement = configElement;
-			this.policyClassName = configElement.getAttribute(POLICY_CLASS);
-		}
-
-		/**
-		 * Determines if the contribution criteria applies to the given selection.
-		 * 
-		 * @param selection The selection in question
-		 * @return whether it applies to it or not
-		 */
-		public boolean appliesTo(ISelection selection) {
-			if (policyClassName != null) {
-				IPopupMenuContributionPolicy thePolicy = getPolicy();
-				if (thePolicy == null
-					|| !thePolicy.appliesTo(selection, configElement))
-					return false;
-			}
-			return true;
-		}
-
-		/**
-		 * Loads up the policy class (if any) from the configuration element.
-		 * 
-		 * @return The policy class (if any) from the contribution element
-		 */
-		protected IPopupMenuContributionPolicy getPolicy() {
-			if (null == policy) {
-				try {
-					Object extension =
-						configElement.createExecutableExtension(
-                            POLICY_CLASS);
-					if (extension instanceof IPopupMenuContributionPolicy)
-						policy = (IPopupMenuContributionPolicy) extension;
-					else
-						Log.info(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionStatusCodes.SERVICE_FAILURE, "The supplied policy class name does not implement IPopupMenuContributionPolicy"); //$NON-NLS-1$
-				} catch (CoreException ce) {
-					Trace.catching(CommonUIServicesActionPlugin.getDefault(), CommonUIServicesActionDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getPolicy", ce); //$NON-NLS-1$
-					Log.log(
-						CommonUIServicesActionPlugin.getDefault(),
-						ce.getStatus().getSeverity(),
-						CommonUIServicesActionStatusCodes.SERVICE_FAILURE,
-						ce.getStatus().getMessage(),
-						ce.getStatus().getException());
-				}
-			}
-			return policy;
-		}
-	}
-
-	/**
-	 * The popup menu contribution criteria. Currently the following criteria are supported:
-	 * <OL>
-	 * <LI>Whether all objects in the selection are assignable from a certain class/interface or adapt to it</LI>
-	 * <LI>Whether the number of objects in the selection matches a given number</LI>
-	 * </OL>
-	 * 
-	 * All criteria are optional and more could be added in the future.
-	 */
-	private static class PopupStructuredContributionCriteria
-		extends PopupContributionCriteria {
-		/** the object descriptor */
-		private ObjectDescriptor object;
-		/** the criteria's target count */
-		private Integer targetCount;
-		/** 'true' if numbers > the provided one should work */
-		private boolean orHigher;
-
-		/**
-		 * Constructs a new popup menu contribution criteria from a configuration element.
-		 * 
-		 * @param configElement The criteria's configuration element
-		 */
-		public PopupStructuredContributionCriteria(IConfigurationElement configElement) {
-			super(configElement);
-
-			object =
-				new ObjectDescriptor(
-					configElement,
-					OBJECT_CLASS);
-
-			String countStr = configElement.getAttribute(OBJECT_COUNT);
-			
-			this.orHigher = false;
-			
-			if (countStr != null) {
-				if (countStr.equals("*")) { //$NON-NLS-1$
-					this.targetCount = Integer.valueOf("0"); //$NON-NLS-1$
-					this.orHigher = true;
-				}
-				else if (countStr.equals("+")) { //$NON-NLS-1$
-					this.targetCount = Integer.valueOf("1"); //$NON-NLS-1$
-					this.orHigher = true;
-				}
-				else {
-					int plusIndex = countStr.lastIndexOf("+"); //$NON-NLS-1$
-					if (plusIndex > 0) {
-						this.orHigher = true;
-						countStr = countStr.substring(0, plusIndex);
-					}
-					
-					// Since the string is 'unsafe' we'll wrap the conversion in a try/catch block
-					try {
-						this.targetCount = Integer.valueOf(countStr);
-					} catch (NumberFormatException e) {
-						// TODO Log the exception
-						this.orHigher = true;
-						this.targetCount = Integer.valueOf("1"); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-
-		/**
-		 * Determines if the contribution criteria applies to the given selection.
-		 * 
-		 * @param selection The selection in question
-		 * @return whether it applies to it or not
-		 */
-		public boolean appliesTo(ISelection selection) {
-			if (!(selection instanceof IStructuredSelection))
-				return false;
-
-			IStructuredSelection structuredSelection =
-				(IStructuredSelection) selection;
-
-			Iterator objects = structuredSelection.iterator();
-			while (objects.hasNext()) {
-				if (!object.sameAs(objects.next()))
-					return false;
-			}
-			if (targetCount != null) {
-				// If 'orHigher' is set then hide if the selection count is < the targetCount
-				if (orHigher) {
-					if (structuredSelection.size() < targetCount.intValue())
-						return false;
-				}
-				else {
-					if (structuredSelection.size() != targetCount.intValue())
-						return false;
-				}
-			}
-			return super.appliesTo(selection);
-		}
-	}
-
-	/**
-	 * The popup menu contribution criteria. Currently the following criteria are supported:
-	 * <OL>
-	 * <LI>Whether the selection has to have a given text</LI>
-	 * </OL>
-	 * 
-	 * All criteria are optional and more could be added in the future.
-	 */
-	private static class PopupTextContributionCriteria
-		extends PopupContributionCriteria {
-		/** the text descriptor */
-		private String text;
-
-		/**
-		 * Constructs a new popup menu contribution criteria from a configuration element.
-		 * 
-		 * @param configElement The criteria's configuration element
-		 */
-		public PopupTextContributionCriteria(IConfigurationElement configElement) {
-			super(configElement);
-
-			text = configElement.getAttribute(TEXT);
-		}
-
-		/**
-		 * Determines if the contribution criteria applies to the given selection.
-		 * 
-		 * @param selection The selection in question
-		 * @return whether it applies to it or not
-		 */
-		public boolean appliesTo(ISelection selection) {
-			if (!(selection instanceof ITextSelection))
-				return false;
-
-			ITextSelection textSelection = (ITextSelection) selection;
-
-			if (text != null) {
-				if (!text.equals(textSelection.getText()))
-					return false;
-			}
-			return super.appliesTo(selection);
-		}
-	}
-
-	/**
-	 * The popup menu contribution criteria. Currently the following criteria are supported:
-	 * <OL>
-	 * <LI>Whether the mark document conforms to a given document descriptor</LI>
-	 * </OL>
-	 * 
-	 * All criteria are optional and more could be added in the future.
-	 */
-	private static class PopupMarkContributionCriteria
-		extends PopupContributionCriteria {
-		/** the document descriptor */
-		private ObjectDescriptor document;
-
-		/**
-		 * Constructs a new popup menu contribution criteria from a configuration element.
-		 * 
-		 * @param configElement The criteria's configuration element
-		 */
-		public PopupMarkContributionCriteria(IConfigurationElement configElement) {
-			super(configElement);
-
-			document =
-				new ObjectDescriptor(
-					configElement,
-					DOCUMENT_CLASS);
-		}
-
-		/**
-		 * Determines if the contribution criteria applies to the given selection.
-		 * 
-		 * @param selection The selection in question
-		 * @return whether it applies to it or not
-		 */
-		public boolean appliesTo(ISelection selection) {
-			if (!(selection instanceof IMarkSelection))
-				return false;
-
-			IMarkSelection markSelection = (IMarkSelection) selection;
-
-			if (!document.sameAs(markSelection.getDocument()))
-				return false;
-
-			return super.appliesTo(selection);
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/UpdateActionBarsOperation.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/UpdateActionBarsOperation.java
deleted file mode 100644
index 5d6175f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/contributionitem/UpdateActionBarsOperation.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.common.ui.services.action.internal.contributionitem;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.ui.IActionBars;
-
-/**
- * An operation to update the action bars of a given part type. An update may
- * occur when new providers may now provide contributions to the actionbars.
- * Only those new providers need to add their contributions.
- * 
- * @author cmahoney
- */
-public final class UpdateActionBarsOperation
-	extends ContributeToActionBarsOperation {
-
-	/**
-	 * Constructs a new <code>UpdateActionBarsOperation</code> instance.
-	 * 
-	 * @param actionBars
-	 *            The part's action bars
-	 * @param workbenchPartDescriptor
-	 *            The part's descriptor
-	 */
-	public UpdateActionBarsOperation(IActionBars actionBars,
-			IWorkbenchPartDescriptor workbenchPartDescriptor) {
-		super(actionBars, workbenchPartDescriptor);
-	}
-
-	/*
-	 * (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) {
-		((IContributionItemProvider) provider).updateActionBars(
-			getActionBars(), getWorkbenchPartDescriptor());
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/filter/IActionFilterProvider.java b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/filter/IActionFilterProvider.java
deleted file mode 100644
index c4dc0d1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/filter/IActionFilterProvider.java
+++ /dev/null
@@ -1,29 +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.action.internal.filter;
-
-import org.eclipse.ui.IActionFilter;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for providers of action filters, implementations of
- * <code>IActionFilter</code>.
- * 
- * @author khussey
- * 
- * @see org.eclipse.ui.IActionFilter
- *
- */
-public interface IActionFilterProvider extends IActionFilter, IProvider {
-	 /* no interface body */
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/package.html b/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/action/internal/package.html
deleted file mode 100644
index e51aaa9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.action/src/org/eclipse/gmf/runtime/common/ui/services/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.services.action plugin,
-including debug options and status codes for logging and tracing.</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.action.*
-
-</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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 c35af23..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.services.dnd.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 37fc0ad..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:59:43 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 f78af4f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.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.services.dnd.ide; singleton:=true
-Bundle-Version: 1.5.0.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.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 e163945..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 Modeling Project
-
-
-# ===============================================================================
-# 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/pom.xml b/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/pom.xml
deleted file mode 100644
index 95ad63e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd.ide/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.services.dnd.ide</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.services.dnd.ide</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 c8ff9e8..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(
-				Integer.valueOf(IDETransferId.RESOURCE_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				IDETransferId.RESOURCE_TRANSFER, ResourceTransfer.getInstance(),
-				false)));
-
-		getTransferDragSourceTable().put(
-				Integer.valueOf(IDETransferId.MARKER_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(
-				new TransferAgent(IDETransferId.MARKER_TRANSFER, MarkerTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-				Integer.valueOf(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(
-				Integer.valueOf(IDETransferId.RESOURCE_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				IDETransferId.RESOURCE_TRANSFER, ResourceTransfer.getInstance(),
-				false)));
-
-		getTransferDropTargetTable().put(
-				Integer.valueOf(IDETransferId.MARKER_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(
-				new TransferAgent(IDETransferId.MARKER_TRANSFER, MarkerTransfer
-					.getInstance(), false)));
-
-		getTransferDropTargetTable().put(
-				Integer.valueOf(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(Integer.valueOf(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(Integer.valueOf(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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 bbf450f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.ui.services.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/.api_filters b/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/.api_filters
deleted file mode 100644
index ffc6152..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.common.ui.services.dnd" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/AbstractTransferAdapterProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.dnd.core.AbstractTransferAdapterProvider">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ITransferAdapterProvider"/>
-                <message_argument value="AbstractTransferAdapterProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/dnd/core/TransferAdapterService.java" type="org.eclipse.gmf.runtime.common.ui.services.dnd.core.TransferAdapterService">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ITransferAdapterProvider"/>
-                <message_argument value="TransferAdapterService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7613a8d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:59:33 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 ccd0466..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/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; singleton:=true
-Bundle-Version: 1.5.0.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.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 fbf8475..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 Modeling Project
-
-
-# ===============================================================================
-# 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/pom.xml b/org.eclipse.gmf.runtime.common.ui.services.dnd/pom.xml
deleted file mode 100644
index 2122c86..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.dnd/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.services.dnd</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.services.dnd</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 8b7d80a..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(
-					Integer.valueOf(operationType.hashCode()));
-			if (transferIdList == null) {
-				return false;
-			}
-
-			return transferIdList.contains(Integer.valueOf(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(Integer.valueOf(id.hashCode()));
-			}
-
-			/* Add a placeholder in the table */
-			providerInfo.put(Integer.valueOf(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 954612e..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,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.lang.ref.WeakReference;
-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 WeakReference<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 = new WeakReference<IDragSourceContext>(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() {
-		if (context == null) return null;
-		return context.get();
-	}
-
-	/**
-	 * 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 54e6e91..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(Integer.valueOf(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(Integer.valueOf(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 3c8a545..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,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.lang.ref.WeakReference;
-
-import org.eclipse.gmf.runtime.common.ui.services.dnd.core.ITransferAgent;
-import org.eclipse.swt.dnd.DragSourceEvent;
-
-/**
- * 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 WeakReference<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() {
-		if (context == null) return null;
-		return context.get();
-	}
-
-	/*
-	 * (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 = new WeakReference<IDragSourceContext>(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 6932ff0..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,507 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ref.WeakReference;
-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 WeakReference<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() {
-		if(context==null) return null;
-		return context.get();
-	}
-
-	/*
-	 * (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 = new WeakReference<IDropTargetContext>(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 690e762..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,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ref.WeakReference;
-
-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 WeakReference<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() {
-		if (event.get() == null) {
-			return null;
-		}
-		return event.get().currentDataType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getCurrentOperation()
-	 */
-	public int getCurrentOperation() {
-		if (event.get() == null) {
-			return 0;
-		}
-		return event.get().detail;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getDataTypes()
-	 */
-	public TransferData[] getDataTypes() {
-		if (event.get() == null) {
-			return null;
-		}
-		return event.get().dataTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.dnd.drop.IDropTargetEvent#getOperations()
-	 */
-	public int getOperations() {
-		if (event.get() == null) {
-			return 0;
-		}
-		return event.get().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 = new WeakReference(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 bc45b31..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,321 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ref.WeakReference;
-
-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 WeakReference<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() {
-		if(context == null) return null;
-		return context.get();
-	}
-
-	/*
-	 * (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 = new WeakReference<IDropTargetContext>(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(getContext(), 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(getContext().getActivePart(), getContext()
-					.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 2c171cd..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(
-				Integer.valueOf(TransferId.CUSTOM_DATA_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.CUSTOM_DATA_TRANSFER, CustomDataTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-				Integer.valueOf(TransferId.FILE_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.FILE_TRANSFER, FileTransfer.getInstance(), false)));
-		getTransferDragSourceTable().put(
-				Integer.valueOf(TransferId.PLUGIN_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(
-				new TransferAgent(TransferId.PLUGIN_TRANSFER, PluginTransfer
-					.getInstance(), false)));
-		getTransferDragSourceTable().put(
-				Integer.valueOf(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(
-				Integer.valueOf(TransferId.TEXT_TRANSFER.hashCode()),
-			new TransferDragSourceAdapter(new TransferAgent(
-				TransferId.TEXT_TRANSFER, TextTransfer.getInstance(), false)));
-		getTransferDragSourceTable().put(
-				Integer.valueOf(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(
-				Integer.valueOf(TransferId.CUSTOM_DATA_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.CUSTOM_DATA_TRANSFER, CustomDataTransfer
-					.getInstance(), false)));
-		getTransferDropTargetTable().put(
-				Integer.valueOf(TransferId.FILE_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.FILE_TRANSFER, FileTransfer.getInstance(), false)));
-		getTransferDropTargetTable().put(
-				Integer.valueOf(TransferId.PLUGIN_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(
-				new TransferAgent(TransferId.PLUGIN_TRANSFER, PluginTransfer
-					.getInstance(), false)));
-		getTransferDropTargetTable().put(
-				Integer.valueOf(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(
-				Integer.valueOf(TransferId.TEXT_TRANSFER.hashCode()),
-			new TransferDropTargetAdapter(new TransferAgent(
-				TransferId.TEXT_TRANSFER, TextTransfer.getInstance(), false)));
-		getTransferDropTargetTable().put(
-				Integer.valueOf(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(Integer.valueOf(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(Integer.valueOf(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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 eca43de..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 38246cb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:59:54 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 efea8cc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/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.properties; singleton:=true
-Bundle-Version: 1.3.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.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 968c1d5..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 Modeling Project
-
-
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/pom.xml b/org.eclipse.gmf.runtime.common.ui.services.properties/pom.xml
deleted file mode 100644
index 4e7d7d3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.services.properties</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.services.properties</artifactId>
-  <version>1.3.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 ea54798..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/ApplyModifiersOperation.java
+++ /dev/null
@@ -1,59 +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
- */
-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;
-	}
-}
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 053878d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/IPropertiesModifier.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;
-
-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
- */
-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 5811d64..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesService.java
+++ /dev/null
@@ -1,335 +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
- */
-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);
-	}
-
-}
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 0247e7f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services.properties/src/org/eclipse/gmf/runtime/common/ui/services/properties/PropertiesServiceAdapterFactory.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;
-
-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
- */
-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);
-	}
-}
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 bcb7b79..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 Integer.valueOf(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 677b826..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-            	selection = comboBox.getSelectionIndex();
-            }
-        });
-
-         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() {
-            selection = comboBox.getSelectionIndex();
-    	    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 Integer.valueOf(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(Integer.valueOf(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 37754d2..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,340 +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.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-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();
-				}
-			}
-		});
-		
-        button.addTraverseListener(new TraverseListener() {
-
-            public void keyTraversed(TraverseEvent e) {
-                if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
-                    e.doit = false;
-                    getControl().traverse(SWT.TRAVERSE_TAB_PREVIOUS);
-                }
-
-                if (e.detail == SWT.TRAVERSE_TAB_NEXT) {
-                    e.doit = false;
-                    getControl().traverse(SWT.TRAVERSE_TAB_NEXT);
-                }
-            }
-        });		
-
-		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 fa29580..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,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.services.properties.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-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();
-	}
-}
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 69fb81b..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,39 +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;
-
-
-/**
- * @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$
-
-}
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 a7c1306..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,32 +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;
-
-/**
- * @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;
-}
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.common.ui.services/.classpath b/org.eclipse.gmf.runtime.common.ui.services/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.cvsignore b/org.eclipse.gmf.runtime.common.ui.services/.cvsignore
deleted file mode 100644
index 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.options b/org.eclipse.gmf.runtime.common.ui.services/.options
deleted file mode 100644
index 5b7abfe..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.options
+++ /dev/null
@@ -1,9 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui.services plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui.services plug-in
-org.eclipse.gmf.runtime.common.ui.services/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing=false
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.project b/org.eclipse.gmf.runtime.common.ui.services/.project
deleted file mode 100644
index e3f49d4..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.settings/.api_filters b/org.eclipse.gmf.runtime.common.ui.services/.settings/.api_filters
deleted file mode 100644
index dade716..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.common.ui.services" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/marker/AbstractMarkerNavigationProvider.java" type="org.eclipse.gmf.runtime.common.ui.services.marker.AbstractMarkerNavigationProvider">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IMarkerNavigationProvider"/>
-                <message_argument value="AbstractMarkerNavigationProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/services/marker/MarkerNavigationService.java" type="org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IMarkerNavigationProvider"/>
-                <message_argument value="MarkerNavigationService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 32ed0c7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:59:04 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.gmf.runtime.common.ui.services/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui.services/META-INF/MANIFEST.MF
deleted file mode 100644
index ded001c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/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.common.ui.services; singleton:=true
-Bundle-Version: 1.3.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.services.editor,
- org.eclipse.gmf.runtime.common.ui.services.elementselection,
- org.eclipse.gmf.runtime.common.ui.services.icon,
- org.eclipse.gmf.runtime.common.ui.services.internal;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.internal.elementselection;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.internal.icon;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.internal.marker;x-internal:=true,
- org.eclipse.gmf.runtime.common.ui.services.marker,
- org.eclipse.gmf.runtime.common.ui.services.parser,
- org.eclipse.gmf.runtime.common.ui.services.statusline,
- org.eclipse.gmf.runtime.common.ui.services.util
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.common.ui.services/about.html b/org.eclipse.gmf.runtime.common.ui.services/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.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, 2007</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/build.properties b/org.eclipse.gmf.runtime.common.ui.services/build.properties
deleted file mode 100644
index 260070f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/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/plugin.properties b/org.eclipse.gmf.runtime.common.ui.services/plugin.properties
deleted file mode 100644
index dec3894..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2009  IBM Corporation and others.                  |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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 Services
-Plugin.providerName = Eclipse Modeling Project
-
-# ===============================================================================
-# Extension Points - Translation Instruction : section to be translated
-# ===============================================================================
-extPoint.editorProviders =  GMF Editor Providers
-extPoint.iconProviders =  GMF Icon Providers
-extPoint.markerNavigationProviders =  GMF Marker Navigation Providers
-extPoint.parserProviders =  GMF Parser Providers
-extPoint.elementSelectionProviders = GMF Element Selection Providers
-statusLineContributionItemProviders = GMF Status Line Contribution Item Providers
-
-# ==============================================================================
-# Marker UI Text - Translation Instruction: section to be translated
-# ==============================================================================
-marker.name= Modeling Marker
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/plugin.xml b/org.eclipse.gmf.runtime.common.ui.services/plugin.xml
deleted file mode 100644
index 74bb87e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/plugin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- Copyright (c) 2005, 2009  IBM Corporation and others.                 -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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="editorProviders" name="%extPoint.editorProviders" schema="schema/editorProviders.exsd"/>
-   <extension-point id="markerNavigationProviders" name="%extPoint.markerNavigationProviders" schema="schema/markerNavigationProviders.exsd"/>
-   <extension-point id="iconProviders" name="%extPoint.iconProviders" schema="schema/iconProviders.exsd"/>
-   <extension-point id="parserProviders" name="%extPoint.parserProviders" schema="schema/parserProviders.exsd"/>
-   <extension-point id="elementSelectionProviders" name="%extPoint.elementSelectionProviders" schema="schema/elementSelectionProviders.exsd"/>
-   <extension-point id="statusLineContributionItemProviders" name="%extPoint.statusLineContributionItemProviders" schema="schema/statusLineContributionItemProviders.exsd"/>
-
-   <extension
-         id="marker"
-         name="%marker.name"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.core.resources.marker">
-      </super>
-      <persistent
-            value="false">
-      </persistent>
-      <attribute
-            name="elementId">
-      </attribute>
-   </extension>
-   <extension
-         id="bookmark"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.gmf.runtime.common.ui.services.marker">
-      </super>
-      <super
-            type="org.eclipse.core.resources.bookmark">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.gmf.runtime.common.ui.services/pom.xml b/org.eclipse.gmf.runtime.common.ui.services/pom.xml
deleted file mode 100644
index 3b016b8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui.services</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui.services</artifactId>
-  <version>1.3.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.common.ui.services/schema/editorProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/editorProviders.exsd
deleted file mode 100644
index b1cb9a2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/editorProviders.exsd
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="editorProviders" name="Editors Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point facilitates the configuration of providers for the editor service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.editor.EditorService&lt;/tt&gt;). Using this extension point, providers are registered to manipulate editors, such as handling how to open an editor on a given input.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="EditorProvider"/>
-         </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.editorProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;editorProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.editorProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="EditorProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </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.editor.AbstractEditorProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The provider priority as a String, which is one of 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="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Fully qualified string containing the provider class.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of an editor provider extension: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-        id=&quot;editorProviders&quot; 
-        name=&quot;%ext.editorProviders&quot; 
-        point=&quot;org.eclipse.gmf.runtime.common.ui.services.editorProviders&quot;&gt; 
-      &lt;EditorProvider 
-        class=&quot;org.eclipse.test.project.providers.MyDiagramEditorProvider&quot;&gt; 
-         &lt;Priority name=&quot;Lowest&quot;&gt;&lt;/Priority&gt; 
-      &lt;/EditorProvider&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.editor.IEditorProvider&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) 2004, 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/schema/elementSelectionProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/elementSelectionProviders.exsd
deleted file mode 100644
index 1f07a8b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/elementSelectionProviders.exsd
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="elementSelection" name="Element Selection Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point facilitates the configuration of providers for the element selection service (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionService&lt;/tt&gt;). Using this extension point, providers are registered to provide a list of element for the element selection composite and element selection dialog.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="ElementSelectionProvider"/>
-         </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.elementSelectionProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;elementSelectionProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.elementSelectionProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ElementSelectionProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </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.elementselection.IElementSelectionProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <complexType>
-         <attribute name="name" use="required">
-            <annotation>
-               <documentation>
-                  The provider priority as a String, which is one of 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="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider policy class. Provider policies can optionally be associated with providers to determine whether the providers provide a given operation.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a element selection provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-      id=&quot;elementSelectionProviders&quot; 
-      name=&quot;%ext.elementSelectionProviders&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.elementSelectionProviders&quot;&gt; 
-      &lt;elementSelectionProvider 
-         class=&quot;org.eclipse.uml.ui.internal.providers.elementselection.UMLElementSelectionProvider&quot;&gt; 
-         &lt;Priority 
-            name=&quot;Highest&quot;&gt; 
-         &lt;/Priority&gt; 
-      &lt;/elementSelectionProvider&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.elementselection.AbstractElementSelectionProvider&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/schema/iconProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/iconProviders.exsd
deleted file mode 100644
index 221163f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/iconProviders.exsd
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="iconProviders" name="Icon Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define icon providers for the icon service
-      (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.icon.IconService&lt;/tt&gt;).
-      &lt;p&gt;
-      The icon service supplies an icon for a given element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="IconProvider"/>
-         </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.iconProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;iconProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.iconProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="IconProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-            <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 provider class.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider"/>
-               </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="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider policy class.
-               </documentation>
-            </annotation>
-         </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(plugin id)
-               </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 : func(param[,param]*)
-               </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: string[,string]*
-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: string[,string]*
-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(plugin id)
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="context">
-      <annotation>
-         <documentation>
-            A context supported by the editpart provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="elements" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of element object ids (from the provider XML definition) that are supported by this provider in this context.
-               </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(plugin id)
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of an icon provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-        id=&quot;iconProviders&quot; 
-        name=&quot;%ext.iconProviders&quot; 
-        point=&quot;org.eclipse.gmf.runtime.common.ui.services.iconProviders&quot;&gt; 
-      &lt;IconProvider 
-        class=&quot;org.eclipse.test.project.providers.icon.MyIconProvider&quot;&gt; 
-         &lt;Priority name=&quot;Lowest&quot;&gt;&lt;/Priority&gt; 
-      &lt;/IconProvider&gt; 
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&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.gmf.runtime.common.ui.services.icon.IIconProvider&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  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/schema/markerNavigationProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/markerNavigationProviders.exsd
deleted file mode 100644
index 852b13c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/markerNavigationProviders.exsd
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="markerNavigationProviders" name="Marker Navigation Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point facilitates the configuration of providers for the marker navigation service
-         (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService&lt;/tt&gt;).
-         &lt;p&gt;
-         The marker navigation service enables Xtools clients to perform the navigation feedback when the
-         user double clicks on or &quot;goes to&quot; a marker reference. The attribute values defined on the marker
-         identify a location or locations in the resource that are of interest to the user. The feedback 
-         associated with navigation to that location depends upon the resource and its associated editors. 
-         The feedback might simply be selecting the appropriate object(s) specified by the marker&apos;s location
-         or the feedback could involve a separate dialog to describe the reason for the marker (e.g., errors). 
-         &lt;p&gt;
-         In order to make use of the marker navigation service, an Xtools client should define its own marker 
-         types and creates the marker instances on the appropriate resources. Markers created on the 
-         workspace root are not navigable.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="MarkerNavigationProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The identifier of the extension point, e.g. &lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. markerNavigationProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.markerNavigationProviders.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="MarkerNavigationProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="MarkerType" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <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.marker.AbstractMarkerNavigationProvider"/>
-               </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="MarkerType">
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name of the marker type that the provider understands.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider policy class. Provider policies can optionally be associated with providers to determine whether the providers provide a given operation.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a marker navigation provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-      id=&quot;markerNavigationProviders&quot; 
-      name=&quot;%ext.markerNavigationProviders&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders&quot;&gt; 
-      &lt;MarkerNavigationProvider 
-         class=&quot;org.eclipse.test.project.ui.providers.ModelerMarkerNavigationProvider&quot;&gt; 
-         &lt;Priority 
-            name=&quot;Highest&quot;&gt; 
-         &lt;/Priority&gt; 
-         &lt;MarkerType 
-            name=&quot;org.eclipse.test.bookmark&quot;&gt; 
-         &lt;/MarkerType&gt; 
-      &lt;/MarkerNavigationProvider&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.marker.IMarkerNavigationProvider&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  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/schema/parserProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/parserProviders.exsd
deleted file mode 100644
index db427b3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/parserProviders.exsd
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.common.ui.services">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="parserProviders" name="Parser Providers Extension Point"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define parser providers for the parser service
-      (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.parser.ParserService&lt;/tt&gt;).
-      &lt;p&gt;
-      The parser service supplies and applies text associated with a given element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="ParserProvider"/>
-         </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.parserProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. &lt;tt&gt;parserProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. &lt;tt&gt;%ext.parserProviders&lt;/tt&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="ParserProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider class.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider"/>
-               </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="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider policy class.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a parser provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-        id=&quot;parserProviders&quot; 
-        name=&quot;%ext.parserProviders&quot; 
-        point=&quot;org.eclipse.gmf.runtime.common.ui.services.parserProviders&quot;&gt; 
-      &lt;ParserProvider 
-        class=&quot;org.eclipse.test.project.providers.parser.MyParserProvider&quot;&gt; 
-         &lt;Priority name=&quot;Lowest&quot;&gt;&lt;/Priority&gt; 
-      &lt;/ParserProvider&gt; 
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&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.gmf.runtime.common.core.services.parser.IParserProvider&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/schema/statusLineContributionItemProviders.exsd b/org.eclipse.gmf.runtime.common.ui.services/schema/statusLineContributionItemProviders.exsd
deleted file mode 100644
index 86984eb..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/schema/statusLineContributionItemProviders.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.common.ui.services" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.common.ui.services" id="statusLineContributionItemProviders" name="statusLineContributionItemProviders"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define status line contribution item providers for the status line service.
-      (&lt;tt&gt;org.eclipse.gmf.runtime.common.ui.services.statusline.StatusLineService&lt;/tt&gt;).
-      &lt;p&gt;
-      The status line service supplies contribution items to the status line.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="statusLineContributionItemProvider"/>
-         </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="statusLineContributionItemProvider">
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="Policy" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <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.statusline.AbstractStatusLineContributionItemProvider:"/>
-               </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="Policy">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The provider policy class. Provider policies can optionally be associated with providers to determine whether the providers provide a given operation.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.2
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Following is an example of a status line item provider extension:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-      id=&quot;statusLineContributionItemProviders&quot; 
-      name=&quot;%ext.statusLineContributionItemProviders&quot; 
-      point=&quot;org.eclipse.gmf.runtime.common.ui.services.statusLineContributionItemProviders&quot;&gt; 
-      &lt;statusLineContributionItemProvider 
-         class=&quot;org.eclipse.gmf.examples.diagram.providers.StatusLineItemProvider&quot;&gt; 
-         &lt;Priority 
-            name=&quot;Lowest&quot;&gt; 
-         &lt;/Priority&gt; 
-      &lt;/statusLineContributionItemProvider&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.statusline.AbstractStatusLineContributionItemProvider&lt;/tt&gt;.
-      </documentation>
-   </annotation>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 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/src/org/eclipse/gmf/runtime/common/ui/services/editor/AbstractEditorProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/AbstractEditorProvider.java
deleted file mode 100644
index d2a0e50..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/AbstractEditorProvider.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.editor;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-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.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesStatusCodes;
-
-/**
- * An abstract implementation of an editor provider
- * 
- * @author melaasar
- */
-public abstract class AbstractEditorProvider
-	extends AbstractProvider
-	implements IEditorProvider {
-
-	/**
-	 * Opens an editor with the given editor input
-	 * 
-	 * @param editorInput
-	 *            the editor input object
-	 * 
-	 * @see IEditorProvider#openEditor(IEditorInput)
-	 */
-	public IEditorPart openEditor(IEditorInput editorInput) {
-		try {
-			return PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-				.getActivePage().openEditor(editorInput,
-					getEditorId(editorInput));
-		} catch (PartInitException e) {
-			Trace
-				.catching(CommonUIServicesPlugin.getDefault(),
-					CommonUIServicesDebugOptions.EXCEPTIONS_CATCHING,
-					CommonUIServicesPlugin.getDefault().getClass(),
-					"openEditor", e); //$NON-NLS-1$
-			Log.error(CommonUIServicesPlugin.getDefault(),
-				CommonUIServicesStatusCodes.SERVICE_FAILURE, "openEditor", e); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/**
-	 * Determines if the provider can handle the given editor operation
-	 * 
-	 * @param operation
-	 *            the given operation
-	 * 
-	 * @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 OpenEditorOperation)
-			&& canOpen(((OpenEditorOperation) operation).getEditorInput());
-	}
-
-	/**
-	 * Returns the Editor id suitable for the given editor input
-	 * 
-	 * @param editorInput
-	 *            the given editor input
-	 * @return String the editor id for the given editor input
-	 */
-	abstract protected String getEditorId(IEditorInput editorInput);
-
-	/**
-	 * Method Determines if the editor provider can open an editor for the given
-	 * editor input
-	 * 
-	 * @param editorInput
-	 *            the given editor input
-	 * @return boolean whether the provider can open an editor with the given
-	 *         input
-	 */
-	abstract protected boolean canOpen(IEditorInput editorInput);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/EditorService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/EditorService.java
deleted file mode 100644
index 7546e08..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/EditorService.java
+++ /dev/null
@@ -1,168 +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.editor;
-
-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.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-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.internal.CommonUIServicesPlugin;
-
-/**
- * A service for manipulating editors
- * 
- * @author melaasar
- */
-public class EditorService
-	extends Service
-	implements IEditorProvider {
-
-	/**
-	 * The singleton instance of the editor service.
-	 */
-	private final static EditorService instance = new EditorService();
-
-	static {
-		instance.configureProviders(CommonUIServicesPlugin.getPluginId(), "editorProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Constructs a new editor service.
-	 */
-	protected EditorService() {
-		super(true);
-	}
-
-	/**
-	 * Retrieves the singleton instance of the editor service.
-	 * 
-	 * @return The editor service singleton.
-	 */
-	public static EditorService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * Opens an editor with the given editor input
-	 * 
-	 * @param editorInput
-	 *            the editor input object
-	 * 
-	 * @see IEditorProvider#openEditor(IEditorInput)
-	 */
-	public IEditorPart openEditor(IEditorInput editorInput) {
-		assert null != editorInput;
-
-		IEditorPart editor = (IEditorPart) execute(new OpenEditorOperation(
-			editorInput));
-		return editor;
-	}
-
-	/** a map of all registered editors */
-	private Map editorsMap;
-
-	/**
-	 * Returns the editorsMap.
-	 * 
-	 * @return Map of editors
-	 */
-	protected Map getEditorsMap() {
-		if (editorsMap == null)
-			editorsMap = new HashMap();
-		return editorsMap;
-	}
-
-	/**
-	 * Method registerEditor registers the editor with the editor service should
-	 * be called by the editor upon initialization
-	 * 
-	 * @param editor
-	 *            to be registered in the editor service
-	 */
-	public void registerEditor(IEditorPart editor) {
-		assert null != editor;
-
-		String editorId = editor.getEditorSite().getId();
-		List editors = (List) getEditorsMap().get(editorId);
-		if (editors == null) {
-			editors = new ArrayList();
-			getEditorsMap().put(editorId, editors);
-		}
-		editors.add(editor);
-	}
-
-	/**
-	 * Method unregisterEditor unregisters the editor from the editor service
-	 * should be called by the editor upon getting disposed
-	 * 
-	 * @param editor
-	 *            to unregister from the editor service
-	 */
-	public void unregisterEditor(IEditorPart editor) {
-		assert null != editor;
-
-		String editorId = editor.getEditorSite().getId();
-		List editors = (List) getEditorsMap().get(editorId);
-		assert null != editors;
-		assert (editors.contains(editor));
-		editors.remove(editor);
-	}
-
-	/**
-	 * Returns all registered editors with given id
-	 * 
-	 * @param editorId
-	 *            returned editors must have this String id
-	 * @return List editors matching the String editorId
-	 */
-	public List getRegisteredEditors(String editorId) {
-		return (List) getEditorsMap().get(editorId);
-	}
-
-	/**
-	 * Return a list of all editor parts
-	 * 
-	 * @return List of IEditorPart editors.
-	 */
-	public List getRegisteredEditorParts() {
-		List allEditors = new ArrayList();
-		Iterator iter = getEditorsMap().values().iterator();
-
-		while (iter.hasNext())
-			allEditors.addAll((Collection) iter.next());
-
-		return allEditors;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/IEditorProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/IEditorProvider.java
deleted file mode 100644
index e193627..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/IEditorProvider.java
+++ /dev/null
@@ -1,36 +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.editor;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * An interface for manipulating editors
- * 
- * @author melaasar
- */
-public interface IEditorProvider
-	extends IProvider {
-
-	/**
-	 * Opens an editor with the given editor input
-	 * 
-	 * @param editorInput
-	 *            the editor input object
-	 * @return the opened IEditorPart
-	 */
-	public IEditorPart openEditor(IEditorInput editorInput);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/OpenEditorOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/OpenEditorOperation.java
deleted file mode 100644
index dfa6c25..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/OpenEditorOperation.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.editor;
-
-import org.eclipse.ui.IEditorInput;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * An operation that opens an editor with a given input
- * 
- * @author melaasar
- */
-public class OpenEditorOperation
-	implements IOperation {
-
-	/**
-	 * the input to be passed to the editor
-	 */
-	private IEditorInput editorInput;
-
-	/**
-	 * Constructs a new OpenEditorOperation with the given editor input
-	 * 
-	 * @param anEditorInput
-	 *            the editor input
-	 */
-	protected OpenEditorOperation(IEditorInput anEditorInput) {
-		assert null != anEditorInput;
-
-		this.editorInput = anEditorInput;
-	}
-
-	/**
-	 * Retrieves the editor input
-	 * 
-	 * @return IEditorInput
-	 */
-	public IEditorInput getEditorInput() {
-		return editorInput;
-	}
-
-	/*
-	 * (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 ((IEditorProvider) provider).openEditor(getEditorInput());
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/package.html b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/package.html
deleted file mode 100644
index 8477570..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/editor/package.html
+++ /dev/null
@@ -1,83 +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 an editor service for manipulating {@link
-org.eclipse.ui.IEditorPart Eclipse Editors}, including an operation to open an
-editor from an {@link org.eclipse.ui.IEditorInput org.eclipse.ui.IEditorInput}.
-The Editor Service also includes methods to get registered editors and to
-register and unregister editors.</P>
-
-<h2>Using this Package</h2>
-
-<P>The {@link org.eclipse.gmf.runtime.common.ui.services.editor.EditorService
-Editor Service} implements {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.IEditorProvider
-org.eclipse.gmf.runtime.common.ui.services.editor.IEditorProvider}.
-The interface contains only one method, {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.IEditorProvider#openEditor(org.eclipse.ui.IEditorInput)
-openEditor(IEditorInput)}, which takes the editor input for the editor to be
-opened.</P>
-
-<P>Providers may subclass {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.AbstractEditorProvider
-AbstractEditorProvider}, which implements the required
-{@link org.eclipse.gmf.runtime.common.ui.services.editor.IEditorProvider
-IEditorProvider}.  The only operation executed by the service is
-{@link org.eclipse.gmf.runtime.common.ui.services.editor.OpenEditorOperation
-OpenEditorOperation}, whose {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.OpenEditorOperation#OpenEditorOperation(org.eclipse.ui.IEditorInput)
-constructor} takes the same parameters as the interface's method.</P>
-
-<h3>The Editor Service</h3>
-
-<P>In addition to the openEditor method, the EditorService contains methods
-to keep track of editors and other methods that should be called when the editor
-is initialized and disposed.  The static instance of the EditorService class
-is obtained using the {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService#getInstance()
-getInstance()} method.</P>
-
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService#registerEditor(org.eclipse.ui.IEditorPart
-org.eclipse.ui.IEditorPart) registerEditor(IEditorPart)} method should be called
-when the editor is initialized, and the {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService#unregisterEditor(org.eclipse.ui.IEditorPart
-org.eclipse.ui.IEditorPart) unregisterEditor(IEditorPart)} method should be called
-when the editor is disposed.  Calling these methods will ensure the map of
-editors is updated.  This is important to obtain the expected results when
-either {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService#getRegisteredEditors(java.lang.String)
-getRegisteredEditors(String)} or {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService#getRegisteredEditorParts()
-getRegisteredEditorParts()} is called.  These methods return the registered
-editors matching the editor's {@link org.eclipse.ui.IWorkbenchPartSite#getId()
-ID from the editor site} and all the editors, respectively.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on Eclipse editors, please see 
-{@link org.eclipse.ui.IEditorPart org.eclipse.ui.IEditorPart}</P>
-<P>For more information on the Service Infrastructure, please see 
-{@link org.eclipse.gmf.runtime.common.core.service.Service
-org.eclipse.gmf.runtime.common.core.service.Service}</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionInput.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionInput.java
deleted file mode 100644
index a9941bc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionInput.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.common.ui.services.elementselection;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Abstract implementation of an IElementSelectionInput.
- * 
- * @author Anthony Hunter
- */
-public class AbstractElementSelectionInput
-    implements IElementSelectionInput {
-
-    /**
-     * The scope used for the search for matching objects.
-     */
-    private ElementSelectionScope scope;
-
-    /**
-     * A list of the input types.
-     */
-    private IFilter filter;
-
-    /**
-     * A context for the input.
-     */
-    private IAdaptable context;
-
-    /**
-     * A input filter for the input.
-     */
-    private String input;
-
-    /**
-     * Constructor for an AbstractElementSelectionInput
-     * 
-     * @param types
-     *            A list of the types.
-     * @param context
-     *            A context for the input.
-     * @param scope
-     *            The scope used for the search for matching objects.
-     * @param filter
-     *            The filter used for the search for matching objects.
-     */
-    public AbstractElementSelectionInput(IFilter filter, IAdaptable context,
-            ElementSelectionScope scope, String input) {
-        super();
-        this.input = input;
-        this.context = context;
-        this.scope = scope;
-        this.filter = filter;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ElementSelectionScope getScope() {
-        return scope;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public IFilter getFilter() {
-        return filter;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public IAdaptable getContext() {
-        return context;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getInput() {
-        return input;
-    }
-
-    /**
-     * Set the context for the element selection input.
-     * 
-     * @param context
-     *            the context for the element selection input.
-     */
-    public void setContext(IAdaptable context) {
-        this.context = context;
-    }
-
-    /**
-     * Set the filter for the element selection input.
-     * 
-     * @param filter
-     *            the filter for the element selection input.
-     */
-    public void setFilter(IFilter filter) {
-        this.filter = filter;
-    }
-
-    /**
-     * Set the scope for the element selection input.
-     * 
-     * @param scope
-     *            the scope for the element selection input.
-     */
-    public void setScope(ElementSelectionScope scope) {
-        this.scope = scope;
-    }
-
-    /**
-     * Set the input filter for the element selection input.
-     * 
-     * @param input
-     *            the input filter for the element selection input.
-     */
-    public void setInput(String input) {
-        this.input = input;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionProvider.java
deleted file mode 100644
index 6364072..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractElementSelectionProvider.java
+++ /dev/null
@@ -1,155 +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.common.ui.services.elementselection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-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.internal.l10n.CommonUIServicesMessages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Abstract implementation of an element selection provider.
- * 
- * @author Anthony Hunter
- */
-public abstract class AbstractElementSelectionProvider
-    extends AbstractProvider
-    implements IElementSelectionProvider {
-
-    /**
-     * The element selection input.
-     */
-    private IElementSelectionInput elementSelectionInput;
-
-    /**
-     * The element selection listener.
-     */
-    private IElementSelectionListener elementSelectionListener;
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public boolean provides(IOperation operation) {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ElementSelectionServiceJob getMatchingObjects(
-            IElementSelectionInput input, IElementSelectionListener listener) {
-        elementSelectionInput = input;
-        ElementSelectionServiceJob job = createSelectionJob();
-        elementSelectionListener = listener;
-        return job;
-    }
-    
-    /**
-     * Creates the selection service job that runs the provider's search.
-     * This method should configure the new job with the appropriate
-     * priority, scheduling rules, etc. but should not schedule it.
-     * 
-     * @return a new selection provider job
-     */
-    protected ElementSelectionServiceJob createSelectionJob() {
-        ElementSelectionServiceJob job = new ElementSelectionServiceJob(getJobName(), this);
-        job.setPriority(Job.SHORT);
-        return job;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public Object resolve(IMatchingObject object) {
-        /** 
-         * Extenders are expected to override.
-         */
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void run(IProgressMonitor monitor) {
-        /** 
-         * Extenders are expected to override.
-         */
-    }
-
-    /**
-     * Get the name for the ElementSelectionServiceJob. Clients can override.
-     * 
-     * @return the name for the job.
-     */
-    protected String getJobName() {
-        String providerName = getClass().getName().substring(
-            getClass().getName().lastIndexOf('.') + 1);
-        String filter = getElementSelectionInput().getInput();
-        return NLS.bind(
-            CommonUIServicesMessages.ElementSelectionService_JobName,
-            new String[] {providerName, filter});
-    }
-
-    /**
-     * Fire an end of matches event since there are no more matches.
-     */
-    protected void fireEndOfMatchesEvent() {
-        IMatchingObject matchingObject = new AbstractMatchingObject(null, null,
-            null, this);
-        MatchingObjectEvent matchingObjectEvent = new MatchingObjectEvent(
-            MatchingObjectEventType.END_OF_MATCHES, matchingObject);
-        fireMatchingObjectEvent(matchingObjectEvent);
-    }
-
-    /**
-     * Fire a matching object event.
-     * 
-     * @param matchingObject
-     *            the matching object.
-     */
-    protected void fireMatchingObjectEvent(IMatchingObject matchingObject) {
-        MatchingObjectEvent matchingObjectEvent = new MatchingObjectEvent(
-            MatchingObjectEventType.MATCH, matchingObject);
-        fireMatchingObjectEvent(matchingObjectEvent);
-    }
-
-    /**
-     * Send the matching object event to the listener.
-     * 
-     * @param matchingObjectEvent
-     *            the matching object event.
-     */
-    protected void fireMatchingObjectEvent(
-            IMatchingObjectEvent matchingObjectEvent) {
-        getElementSelectionListener().matchingObjectEvent(matchingObjectEvent);
-    }
-
-    /**
-     * Retrieve the element selection input.
-     * 
-     * @return the element selection input.
-     */
-    protected IElementSelectionInput getElementSelectionInput() {
-        return elementSelectionInput;
-    }
-
-    /**
-     * Retrieve the element selection listener.
-     * 
-     * @return the element selection listener.
-     */
-    protected IElementSelectionListener getElementSelectionListener() {
-        return elementSelectionListener;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractMatchingObject.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractMatchingObject.java
deleted file mode 100644
index 2b4d6c9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/AbstractMatchingObject.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.common.ui.services.elementselection;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Abstract implementation of an IElementSelectionProvider.
- * 
- * @author Anthony Hunter <a href="mailto:anthonyh@ca.ibm.com">
- *         anthonyh@ca.ibm.com </a>
- */
-public class AbstractMatchingObject
-	implements IMatchingObject {
-
-	/**
-	 * The dashes used to construct the display name.
-	 */
-	public static String DASHES = " - "; //$NON-NLS-1$
-
-	/**
-	 * The name of the matching object.
-	 */
-	private String name;
-
-	/**
-	 * The display name of the matching object.
-	 * <p>
-	 * The display name is the matching object name followed by dashes followed
-	 * by a fully qualified name to distingish between objects with the same
-	 * name.
-	 */
-	private String displayName;
-
-	/**
-	 * The image of the matching object.
-	 */
-	private Image image;
-
-	/**
-	 * The element selection provider that that provided this matching object.
-	 */
-	private IElementSelectionProvider provider;
-
-	/**
-	 * Constructor for an AbstractMatchingObject.
-	 * 
-	 * @param name
-	 *            the name of the matching object.
-	 * @param displayName
-	 *            The display name of the matching object.
-	 * @param image
-	 *            The image of the matching object.
-	 * @param provider
-	 *            The element selection provider that that provided this
-	 *            matching object.
-	 */
-	public AbstractMatchingObject(String name, String displayName, Image image,
-			IElementSelectionProvider provider) {
-		this.name = name;
-		this.displayName = displayName;
-		this.image = image;
-		this.provider = provider;
-	}
-
-    /**
-     * {@inheritDoc}
-     */
-	public String getName() {
-		return name;
-	}
-
-    /**
-     * {@inheritDoc}
-     */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-    /**
-     * {@inheritDoc}
-     */
-	public Image getImage() {
-		return image;
-	}
-
-    /**
-     * {@inheritDoc}
-     */
-	public String toString() {
-		return displayName != null ? displayName
-			: super.toString();
-	}
-
-    /**
-     * {@inheritDoc}
-     */
-	public IElementSelectionProvider getProvider() {
-		return provider;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionComposite.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionComposite.java
deleted file mode 100644
index 5f7695e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionComposite.java
+++ /dev/null
@@ -1,505 +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.common.ui.services.elementselection;
-
-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.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.internal.l10n.CommonUIServicesMessages;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The element selection composite. The composite functional similar to the JDT
- * select type dialog. There is a filter field and a table containing a list of
- * elements to select from.
- * <p>
- * The element selection composite requires an IElementSelectionInput as input
- * for the element selection service.
- * <p>
- * Subclasses must override the {@link #isValidSelection}and
- * {@link #handleSelection(boolean)} to provide custom validation.
- * 
- * @author Anthony Hunter
- */
-public abstract class ElementSelectionComposite
-    implements IElementSelectionListener {
-
-    /**
-     * The title to display at the top of the element selection composite.
-     */
-    private final String title;
-
-    /**
-     * The elements that have been selected by the user.
-     */
-    private final List selectedElements = new ArrayList();
-
-    /**
-     * Text control to display the filter text.
-     */
-    private Text filterText = null;
-
-    /**
-     * The table viewer to display list of matching objects.
-     */
-    private TableViewer tableViewer = null;
-
-    /**
-     * The progress bar when searching for matching objects.
-     */
-    private ProgressMonitorPart progressBar;
-
-    /**
-     * The input for the element selection service.
-     */
-    private AbstractElementSelectionInput input;
-
-    /**
-     * The job running the element selection service.
-     */
-    private ElementSelectionServiceJob job;
-
-    /**
-     * The element selection service to use to search for elements.
-     */
-    private final ElementSelectionService elementSelectionService;
-
-    /**
-     * Control character for the filter.
-     * <p>
-     * When the user enters the first character into the filterText, element
-     * selection service is called. When the user enters the second character
-     * after the first, we can use the existing results returned by the service.
-     * If the user enters text such that the first character has been changed,
-     * we need to query the service again.
-     * <p>
-     * For example, if the user enters "a" then "ab", we can use the existing
-     * results from "a". If the user enters "a" then "b", then we must query a
-     * second time.
-     * <p>
-     * We also must remember if the service has already been called. If the user
-     * enters "a" and then "b", we must cancel "a" and wait before calling the
-     * service for "b".
-     */
-    private char firstCharacter = Character.MIN_VALUE;
-
-    private String lastSearchedFor = StringStatics.BLANK;
-
-    private int lastScopeSearchedFor = 0;
-
-    /**
-     * matching objects from the element selection service.
-     */
-    private List matchingObjects = new ArrayList();
-
-    /**
-     * Pattern for the input filter.
-     */
-    private Pattern pattern;
-
-    /**
-     * Constructs a new instance that will create the new composite. I will use
-     * the default {@linkplain ElementSelectionService#getInstance() selection service}
-     * to process the <tt>input</tt>.
-     * 
-     * @param title
-     *            the dialog title
-     * @param input
-     *            the element selection input.
-     */
-    public ElementSelectionComposite(String title,
-            AbstractElementSelectionInput input) {
-        this(title, input, ElementSelectionService.getInstance());
-    }
-
-    /**
-     * Constructs a new instance that will create the new composite.
-     * 
-     * @param title the dialog title
-     * @param input the element selection input
-     * @param elementSelectionService the selection service to use to process the
-     *     <tt>input</tt>
-     */
-    public ElementSelectionComposite(String title,
-            AbstractElementSelectionInput input,
-            ElementSelectionService elementSelectionService) {
-        super();
-        this.title = title;
-        this.input = input;
-        this.elementSelectionService = elementSelectionService;
-        this.lastScopeSearchedFor = input.getScope().intValue();
-    }
-
-    /**
-     * Determines if the selected elements are a valid selection.
-     * 
-     * @param currentSelectedElements
-     *            the selected list of Elements
-     * @return <code>true</code> if the selected elements are a valid
-     *         selection
-     */
-    abstract protected boolean isValidSelection(List currentSelectedElements);
-
-    /**
-     * Handle a selection change, where the validity of the new selection is
-     * encoded in <code>isValid</code>.
-     * 
-     * @param isValid
-     *            <code>true</code> if the new selection is valid,
-     *            <code>false</code> otherwise.
-     */
-    protected abstract void handleSelection(boolean isValid);
-
-    /**
-     * Creates the composite.
-     * 
-     * @param parent
-     *            the parent composite
-     * @return the new composite
-     */
-    public Composite createComposite(Composite parent) {
-
-        Composite result = new Composite(parent, SWT.NONE);
-        result.setLayout(new GridLayout());
-        result.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        // Add the selection title label
-        Label label = new Label(result, SWT.NONE);
-        label.setText(title);
-
-        // Add the element selection text widget
-        filterText = new Text(result, SWT.SINGLE | SWT.BORDER);
-        filterText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        filterText.addModifyListener(new ModifyListener() {
-
-            public void modifyText(ModifyEvent e) {
-                handleFilterChange();
-            }
-
-        });
-
-        // Add the table viewer
-        int selectStyle = SWT.SINGLE;
-        tableViewer = new TableViewer(result, selectStyle | SWT.H_SCROLL
-            | SWT.V_SCROLL | SWT.BORDER);
-        tableViewer.setUseHashlookup(true);
-
-        Table table = tableViewer.getTable();
-        GridData gridData = new GridData(GridData.FILL_BOTH);
-        GC gc = new GC(result);
-        gc.setFont(JFaceResources.getDefaultFont());
-        FontMetrics fontMetrics = gc.getFontMetrics();
-        gc.dispose();
-        gridData.widthHint = Dialog
-            .convertWidthInCharsToPixels(fontMetrics, 80);
-        gridData.heightHint = table.getItemHeight() * 15;
-        table.setLayoutData(gridData);
-
-        table.addSelectionListener(new SelectionListener() {
-
-            public void widgetSelected(SelectionEvent e) {
-                handleSelectionChange();
-            }
-
-            public void widgetDefaultSelected(SelectionEvent e) {
-                handleWidgetDefaultSelected();
-            }
-        });
-
-        progressBar = new ProgressMonitorPart(result, new GridLayout());
-        progressBar.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        progressBar.setVisible(false);
-
-        tableViewer.setLabelProvider(new LabelProvider() {
-
-            public Image getImage(Object element) {
-                assert element instanceof AbstractMatchingObject;
-                return ((AbstractMatchingObject) element).getImage();
-            }
-
-            public String getText(Object element) {
-                assert element instanceof AbstractMatchingObject;
-                return ((AbstractMatchingObject) element).getDisplayName();
-            }
-        });
-        tableViewer.setSorter(new ViewerSorter() {
-
-            public int compare(Viewer viewer, Object e1, Object e2) {
-                if (e1 instanceof IMatchingObject && e2 instanceof IMatchingObject)
-                    return ((IMatchingObject)e1).getName().toLowerCase().compareTo(
-                            ((IMatchingObject) e2).getName().toLowerCase());
-
-                return super.compare(viewer, e1, e2);
-            }
-        });
-
-        createCompositeAdditions(result);
-
-        return result;
-    }
-
-    /**
-     * The method is provided so that clients can add additional fields to the
-     * bottom of the selection composite. For example, clients may want to a
-     * checkbox button to the bottom of the composite.
-     * 
-     * @param parent
-     *            the parent composite
-     */
-    protected void createCompositeAdditions(Composite parent) {
-        /* clients are expected to override this method */
-    }
-
-    /**
-     * Handles a filter change.
-     */
-    public void handleFilterChange() {
-        if (filterText.getText().equals(StringStatics.BLANK)) {
-            /* no filter, no results */
-            cancel();
-            matchingObjects.clear();
-            tableViewer.getTable().removeAll();
-            firstCharacter = Character.MIN_VALUE;
-            return;
-        }
-
-        String filter = validatePattern(filterText.getText());
-        pattern = Pattern.compile(filter);
-        if (firstCharacter != filterText.getText().charAt(0) ||
-                this.input.getScope().intValue() != this.lastScopeSearchedFor ||
-                !filterText.getText().startsWith(lastSearchedFor)) {
-            // scope changes, start from scratch...
-            cancel();
-            matchingObjects.clear();
-            tableViewer.getTable().removeAll();
-
-            firstCharacter = filterText.getText().charAt(0);
-            this.lastScopeSearchedFor = this.input.getScope().intValue();
-
-            startElementSelectionService();
-        } else {
-            /*
-             * clear the existing matches in the table and refilter results we have
-             * received
-             */
-            tableViewer.getTable().removeAll();
-            for (Iterator i = matchingObjects.iterator(); i.hasNext();) {
-                IMatchingObject matchingObject = (IMatchingObject) i.next();
-                Matcher matcher = pattern.matcher(matchingObject.getName()
-                    .toLowerCase());
-                if (matcher.matches()) {
-                    tableViewer.add(matchingObject);
-                    setSelection();
-                }
-            }
-        }
-    }
-
-    /**
-     * Fill the table viewer with results from the element selection service.
-     */
-    private void startElementSelectionService() {
-        /*
-         * Initialize all possible matching objects from the select element
-         * service.
-         */
-        input.setInput(filterText.getText());
-        lastSearchedFor = filterText.getText();
-
-        progressBar.setVisible(true);
-        progressBar.beginTask(
-            CommonUIServicesMessages.ElementSelectionService_ProgressName,
-            IProgressMonitor.UNKNOWN);
-
-        job = elementSelectionService.getMatchingObjects(input, this);
-    }
-
-    /**
-     * Handles a selection change and validates the new selection.
-     */
-    private void handleSelectionChange() {
-        StructuredSelection selection = (StructuredSelection) tableViewer
-            .getSelection();
-        if (selection.size() == 0) {
-            // nothing selected
-            selectedElements.clear();
-            handleSelection(false);
-            return;
-        }
-
-        List selectionList = selection.toList();
-
-        // get the current selected elements
-        List currentSelectedElements = new ArrayList();
-        for (Iterator iter = selectionList.iterator(); iter.hasNext();) {
-            AbstractMatchingObject matchingObject = (AbstractMatchingObject) iter
-                .next();
-            currentSelectedElements.add(matchingObject);
-        }
-
-        // validate selection
-        boolean isValidSelection = isValidSelection(currentSelectedElements);
-
-        // store the selection
-        selectedElements.clear();
-        if (isValidSelection) {
-            selectedElements.addAll(currentSelectedElements);
-        }
-
-        // update UI based on selection
-        handleSelection(isValidSelection);
-
-    }
-
-    /**
-     * Gets the user selected elements.
-     * 
-     * @return the user selected elements
-     */
-    public List getSelectedElements() {
-        List result = new ArrayList();
-        for (Iterator iter = selectedElements.iterator(); iter.hasNext();) {
-            IMatchingObject matchingObject = (IMatchingObject) iter.next();
-            IElementSelectionProvider provider = matchingObject.getProvider();
-            Object object = provider.resolve(matchingObject);
-            result.add(object);
-        }
-        return result;
-    }
-
-    public void matchingObjectEvent(IMatchingObjectEvent matchingObjectEvent) {
-        if (!progressBar.isDisposed()) {
-            if (matchingObjectEvent.getEventType() == MatchingObjectEventType.END_OF_MATCHES) {
-                progressBar.done();
-                progressBar.setVisible(false);
-                job = null;
-            } else {
-                IMatchingObject matchingObject = matchingObjectEvent
-                    .getMatchingObject();
-                progressBar.worked(1);
-                progressBar.subTask(matchingObject.getName());
-                matchingObjects.add(matchingObject);
-                Matcher matcher = pattern.matcher(matchingObject.getName()
-                    .toLowerCase());
-                if (matcher.matches()) {
-                    tableViewer.add(matchingObject);
-                    setSelection();
-                }
-            }
-        }
-    }
-
-    /**
-     * Cancel the job running the element selection service.
-     */
-    public void cancel() {
-        if (job != null) {
-            elementSelectionService.cancelJob(job);
-            job = null;
-            progressBar.done();
-            progressBar.setVisible(false);
-        }
-    }
-
-    /**
-     * 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 {
-                result.append(c);
-            }
-        }
-        result.append(".*"); //$NON-NLS-1$
-        return result.toString();
-    }
-
-    /**
-     * If there is no selection in the composite, set the selection to the
-     * provided MatchingObject.
-     * 
-     * @param matchingObject
-     *            the MatchingObject to select.
-     */
-    protected void setSelection() {
-        StructuredSelection selection = (StructuredSelection) tableViewer
-            .getSelection();
-        if (selection.isEmpty()) {
-            tableViewer.getTable().setSelection(0);
-            handleSelectionChange();
-        }
-    }
-
-    /**
-     * Retreive the filter text field.
-     * 
-     * @return the filter text field.
-     */
-    public Text getFilterText() {
-        return filterText;
-    }
-
-    /**
-     * Retreive the element selection service job.
-     * 
-     * @return the element selection service job.
-     */
-    public ElementSelectionServiceJob getSelectionServiceJob() {
-        return job;
-    }
-
-    /**
-     * Handle the double click of a selection in the table viewer.
-     */
-    protected void handleWidgetDefaultSelected() {
-        /** Default behavior is to do nothing. Subclasses can override. */
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionScope.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionScope.java
deleted file mode 100644
index fc6f689..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionScope.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.elementselection;
-
-/**
- * Class for setting and testing flags used by the element selection service.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionScope {
-
-    /**
-     * the scope for the element selection service.
-     */
-    private int scope;
-
-    /**
-     * Constructor for IconOptions
-     */
-    public ElementSelectionScope() {
-        this(0);
-    }
-
-    /**
-     * Constructor for ElementSelectionScope
-     * 
-     * @param scope
-     *            the scope
-     * @since 1.3
-     */
-    protected ElementSelectionScope(int scope) {
-        this.scope = scope;
-    }
-
-    /**
-     * The default option to provide all visible types based on the context.
-     */
-    public static final ElementSelectionScope VISIBLE = new ElementSelectionScope(
-        1 << 1);
-
-    /**
-     * Provide all types in the workspace and target environment (if
-     * applicable).
-     */
-    public static final ElementSelectionScope GLOBAL = new ElementSelectionScope(
-        1 << 2);
-
-    /**
-     * Provide all types in binaries (if applicable).
-     */
-    public static final ElementSelectionScope BINARIES = new ElementSelectionScope(
-        1 << 3);
-
-    /**
-     * Provide all types in the sources (if applicable).
-     */
-    public static final ElementSelectionScope SOURCES = new ElementSelectionScope(
-        1 << 4);
-
-    /**
-     * Provide all primities types in the sources (if applicable).
-     */
-    public static final ElementSelectionScope PRIMITIVES = new ElementSelectionScope(
-        1 << 5);
-
-    /**
-     * Returns the scope as an integer bit flag
-     * 
-     * @return int the scope as an integer bit flag
-     */
-    public int intValue() {
-        return scope;
-    }
-
-    /**
-     * Tests if the specified option is set
-     * 
-     * @param scope
-     *            the scope as an integer bit flag
-     * @param option
-     *            the specified option
-     * @return boolean <code>true</code> if this option is set, otherwise
-     *         <code>false</code>
-     */
-    public static boolean isSet(int scope, ElementSelectionScope option) {
-        if ((scope & option.scope) != 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Sets the specified option
-     * 
-     * @param option
-     *            the specified option
-     */
-    public void set(ElementSelectionScope option) {
-        scope = scope | option.scope;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionService.java
deleted file mode 100644
index a449b73..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionService.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/******************************************************************************
- * Copyright 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.elementselection;
-
-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.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-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.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.internal.elementselection.ElementSelectionList;
-import org.eclipse.gmf.runtime.common.ui.services.internal.elementselection.MatchingObjectsOperation;
-import org.eclipse.gmf.runtime.common.ui.services.internal.l10n.CommonUIServicesMessages;
-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The element selection service.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionService
-    extends Service
-    implements IElementSelectionProvider, IElementSelectionListener {
-
-    /**
-     * A provider descriptor that will ignore providers that are contributed by
-     * a plug-in that is matched to a disabled capability.
-     */
-    private static class ProviderDescriptor
-        extends Service.ProviderDescriptor {
-
-        private ActivityFilterProviderDescriptor activityFilter;
-
-        public ProviderDescriptor(IConfigurationElement element) {
-            super(element);
-            activityFilter = new ActivityFilterProviderDescriptor(element);
-        }
-
-        public boolean provides(IOperation operation) {
-            return activityFilter.provides(operation)
-                && super.provides(operation);
-        }
-    }
-
-    protected class JobData {
-        public IElementSelectionInput elementSelectionInput;
-
-        public IElementSelectionListener elementSelectionListener;
-
-        public HashMap<IElementSelectionProvider, ElementSelectionServiceJob> jobs = 
-            new HashMap<IElementSelectionProvider, ElementSelectionServiceJob>();
-    }
-    
-    private Map<ElementSelectionServiceJob, JobData> jobs2Data = 
-        new HashMap<ElementSelectionServiceJob, JobData>();
-    
-    public JobData getJobData() {
-        Job currentJob = jobManager.currentJob();
-        assert currentJob != null;
-        
-        if(currentJob == null) {
-            return null;
-        }
-        
-        JobData data = null;
-        synchronized(jobs2Data) {
-            data = jobs2Data.get(currentJob);
-        }
-        
-        return data;
-    }
-
-    /**
-     * The singleton instance of the type selection service.
-     */
-    private final static ElementSelectionService instance = new ElementSelectionService();
-
-    static {
-        instance.configureProviders();
-    }
-
-    /**
-     * Constructs a new type selection service.
-     */
-    protected ElementSelectionService() {
-        super(true);
-    }
-
-    /**
-     * Retrieves the singleton instance of the type selection service.
-     * 
-     * @return The type selection service singleton.
-     */
-    public static ElementSelectionService getInstance() {
-        return instance;
-    }
-
-    /**
-     * For backward compatibility, use the element selection service and return
-     * the results in a list.
-     * 
-     * @param input
-     *            the element selection input.
-     * @return list of matching objects.
-     */
-    public List getMatchingObjects(IElementSelectionInput input) {
-        return new ElementSelectionList().getMatchingObjects(input);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public ElementSelectionServiceJob getMatchingObjects(
-            IElementSelectionInput input, IElementSelectionListener listener) {
-        ElementSelectionServiceJob job = createSelectionJob();
-        JobData data = new JobData();
-        data.elementSelectionInput = input;
-        data.elementSelectionListener = listener;
-        job.setName(getJobName(data));
-        synchronized(jobs2Data) {
-            jobs2Data.put(job, data);
-        }
-        job.schedule();
-        return job;
-    }
-    
-    
-    protected String getJobName() {
-        return StringStatics.BLANK;
-    }
-    
-    /**
-     * Creates the selection service job that manages the individual provider
-     * search jobs.  This method should configure the new job with the appropriate
-     * priority, scheduling rules, etc. but should not schedule it.
-     * 
-     * @return a new selection service job
-     */
-    protected ElementSelectionServiceJob createSelectionJob() {
-        ElementSelectionServiceJob job = new ElementSelectionServiceJob(getJobName(), this);
-        job.setPriority(Job.SHORT);
-        return job;
-    }
-    
-    public static final IJobManager jobManager = Job.getJobManager();
-
-    /**
-     * {@inheritDoc}
-     */
-    public void run(IProgressMonitor monitor) {
-        JobData data = getJobData();
-        if(data == null)
-            return;
-        
-        List<IElementSelectionProvider> results = new ArrayList<IElementSelectionProvider>();
-        IOperation operation = new MatchingObjectsOperation(
-            data.elementSelectionInput);
-
-        /**
-         * Get the list of element selection providers based on the input.
-         */
-        for (int i = 0; i < ExecutionStrategy.PRIORITIES.length; ++i) {
-            List providers = ExecutionStrategy.FORWARD.getUncachedProviders(
-                this, ExecutionStrategy.PRIORITIES[i], operation);
-            results.addAll(providers);
-        }
-
-        /**
-         * Create the jobs for each provider.
-         */
-        for (Iterator<IElementSelectionProvider> i = results.iterator(); i.hasNext();) {
-            IElementSelectionProvider provider = i.next();
-
-            addJob(data, provider);
-        }
-
-        /**
-         * Start the provider jobs.
-         */
-        HashMap jobsClone; 
-        synchronized (data) {
-            jobsClone  = (HashMap)data.jobs.clone();
-        }
-        for (Iterator i = jobsClone.entrySet().iterator(); i.hasNext();) {
-            Map.Entry entry = (Map.Entry) i.next();
-            IElementSelectionProvider provider = (IElementSelectionProvider) entry
-            	.getKey();
-            ElementSelectionServiceJob job = (ElementSelectionServiceJob) entry
-                .getValue();
-            
-            schedule(provider, job);
-        }
-
-        /**
-         * Now loop, waiting for the provider jobs to complete.
-         */
-        monitor.beginTask(getJobName(data), 1000);
-        while (true) {
-            synchronized (data) {
-                if (data.jobs.size() == 0) {
-                    break;
-                }
-            }
-            monitor.worked(1);
-            /**
-             * if the progress monitor is canceled, then cancel the running jobs.
-             */
-            if (monitor.isCanceled()) {
-                synchronized(data) {
-                    // nullify the element selection listener.
-                    data.elementSelectionListener = null;
-                    cancelAllJobs();
-                    break;
-                }
-            }
-        }
-        monitor.done();
-        jobs2Data.clear();
-    }
-    
-    /**
-     * Schedules the specified selection provider job.
-     * 
-     * @param provider a selection provider
-     * @param job the <code>provider</code>'s job
-     */
-    protected void schedule(IElementSelectionProvider provider, ElementSelectionServiceJob job) {
-    	job.schedule();
-    }
-
-    /**
-     * Resolve the matching object to a modeling object. The service always
-     * returns null since the client should be asking the correct provider to
-     * resolve the object.
-     * 
-     * @return null.
-     */
-    public Object resolve(IMatchingObject object) {
-        return null;
-    }
-
-    /**
-     * Get the name for the ElementSelectionServiceJob. Clients can override.
-     * 
-     * @return the name for the job.
-     */
-    protected String getJobName(JobData data) {
-        if((getJobName() != null && getJobName().equals(StringStatics.BLANK)) && data != null) {
-            String providerName = getClass().getName().substring(
-                getClass().getName().lastIndexOf('.') + 1);
-            String filter = data.elementSelectionInput.getInput();
-            return NLS.bind(
-                CommonUIServicesMessages.ElementSelectionService_JobName,
-                new String[] {providerName, filter});
-        }
-        return getJobName();
-    }
-
-    /**
-     * Add an element selection provider to the list of jobs running the providers.
-     * 
-     * @param provider an element selection provider.
-     */
-    private void addJob(JobData data, IElementSelectionProvider provider) {
-        ElementSelectionServiceJob job = provider.getMatchingObjects(
-            data.elementSelectionInput, this);
-        synchronized (data) {
-            data.jobs.put(provider, job);
-        }
-        
-        synchronized(jobs2Data) {
-            jobs2Data.put(job, data);
-        }
-    }
-
-    /**
-     * Remove an element selection provider from the list.
-     * 
-     * @param provider an element selection provider.
-     */
-    private void removeJob(JobData data, IElementSelectionProvider provider) {
-        boolean end_of_matches = false;
-        Object job = null;
-        synchronized (data) {
-            job = data.jobs.remove(provider);
-            if (data.jobs.size() == 0) {
-                end_of_matches = true;
-            }
-        }
-        
-        /**
-         * All the jobs have finished, send end of matches event.
-         */
-        if (end_of_matches) {
-            fireEndOfMatchesEvent();
-        }
-
-        synchronized(jobs2Data) {
-            jobs2Data.remove(job);
-        }
-    }
-
-    /**
-     * Send the matching object event to the listener.
-     * 
-     * @param matchingObjectEvent
-     *            the matching object event.
-     */
-    protected void fireMatchingObjectEvent(
-            final IMatchingObjectEvent matchingObjectEvent) {
-        final Job currentJob = jobManager.currentJob();
-        if(currentJob == null)
-            return;
-        
-        JobData data = null;
-        synchronized(jobs2Data) {
-            data = jobs2Data.get(currentJob);
-        }
-        
-        if(data == null)
-            return;
-        
-        final JobData finalData = data;
-        PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
-            public void run() {
-                if (finalData.elementSelectionListener != null) {
-                    finalData.elementSelectionListener
-                        .matchingObjectEvent(matchingObjectEvent);
-                }
-            }
-        });
-    }
-
-    /**
-     * Fire an end of matches event since there are no more matches.
-     */
-    protected void fireEndOfMatchesEvent() {
-        IMatchingObject matchingObject = new AbstractMatchingObject(null, null,
-            null, this);
-        MatchingObjectEvent matchingObjectEvent = new MatchingObjectEvent(
-            MatchingObjectEventType.END_OF_MATCHES, matchingObject);
-        fireMatchingObjectEvent(matchingObjectEvent);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void matchingObjectEvent(IMatchingObjectEvent matchingObjectEvent) {
-        JobData data = getJobData();
-        if(data == null)
-            return;
-        if (matchingObjectEvent.getEventType() == MatchingObjectEventType.END_OF_MATCHES) {
-            removeJob(data, matchingObjectEvent.getMatchingObject().getProvider());
-        } else {
-            fireMatchingObjectEvent(matchingObjectEvent);
-        }
-    }
-    
-    /**
-     * Cancel the jobs running for the element selection service.
-     */
-    protected void cancelAllJobs() {
-        JobData data = getJobData();
-        HashMap jobsClone;
-        synchronized (data) {
-            jobsClone = (HashMap) data.jobs.clone();
-        }
-        for (Iterator i = jobsClone.entrySet().iterator(); i.hasNext();) {
-            Map.Entry entry = (Map.Entry) i.next();
-            IElementSelectionProvider provider = (IElementSelectionProvider) entry.getKey(); 
-            ElementSelectionServiceJob job = (ElementSelectionServiceJob) entry
-                .getValue();
-            job.cancel();
-            removeJob(data, provider);
-        }
-    }
-    
-    protected Service.ProviderDescriptor newProviderDescriptor(
-            IConfigurationElement element) {
-            return new ProviderDescriptor(element);
-    }
-    
-    /**
-     * Configures my providers from the <tt>elementSelectionProviders</tt>
-     * extension point.
-     */
-    protected void configureProviders() {
-    	configureProviders(
-    		CommonUIServicesPlugin.getPluginId(),
-        	"elementSelectionProviders"); //$NON-NLS-1$
-    }
-    
-    public void cancelJob(ElementSelectionServiceJob job) {
-        JobData data = null;
-        synchronized(jobs2Data) {
-            data = jobs2Data.get(job);
-        }
-        
-        if (data != null) {
-            synchronized(data) {
-                data.elementSelectionListener = null;
-            }
-        }
-        
-        job.cancel();
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionServiceJob.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionServiceJob.java
deleted file mode 100644
index 9ed0b05..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/ElementSelectionServiceJob.java
+++ /dev/null
@@ -1,62 +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.services.elementselection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * A job for an element selection provider. Each element selection provider is
- * run asynchronously in a separate job, sending matching objects to the
- * listener.
- * <p>
- * This is required since a ElementSelectionProvider may be a long running
- * process. Control is returned to the caller to either display a progress
- * monitor or update the UI as matching objects are received.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionServiceJob
-    extends Job {
-
-    /**
-     * The element selection provider.
-     */
-    private IElementSelectionProvider provider;
-
-    /**
-     * Constructor for a ElementSelectionServiceJob.
-     * 
-     * @param name
-     *            the name of the job.
-     * @param provider
-     *            The element selection provider.
-     */
-    public ElementSelectionServiceJob(String name,
-            IElementSelectionProvider provider) {
-        super(name);
-        this.provider = provider;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected IStatus run(IProgressMonitor monitor) {
-        provider.run(monitor);
-        if (monitor.isCanceled()) {
-            return Status.CANCEL_STATUS;
-        }
-        return Status.OK_STATUS;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionInput.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionInput.java
deleted file mode 100644
index 2e9b154..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionInput.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.common.ui.services.elementselection;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Interface describing the input for the element selection service.
- * 
- * @author Anthony Hunter
- */
-public interface IElementSelectionInput {
-
-    /**
-     * Retrieves the scope of the search.
-     * 
-     * @return ElementSelectionScope the scope of the search.
-     */
-    public ElementSelectionScope getScope();
-
-    /**
-     * Retrieves the filter provided for the input. The filter is used to give
-     * the user of the element selection service control over what types are
-     * selected by the providers.
-     * <p>
-     * Most frequently, the filter will select an object if it matches a
-     * specific list of types (<code>IElementType</code>).
-     * </p>
-     * 
-     * @return List the list of the input types.
-     */
-    public IFilter getFilter();
-
-    /**
-     * Retrieves the context for the input.
-     * 
-     * @return IAdaptable the context for the input.
-     */
-    public IAdaptable getContext();
-
-    /**
-     * Retrieves a string input filter for the input. The filter is used to
-     * match objects based on a string (? = any character, * = any string).
-     * 
-     * @return String the string input filter.
-     */
-    public String getInput();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionListener.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionListener.java
deleted file mode 100644
index e2cd7d7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionListener.java
+++ /dev/null
@@ -1,33 +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.services.elementselection;
-
-/**
- * Interface describing a listener for the element selection service.
- * <p>
- * The element selection service returns IMatchingObjectEvent to the
- * IElementSelectionListener. If there are ten matching objects, then eleven
- * IMatchingObjectEvent will be sent to the listener. The first ten will have
- * type MatchingObjectEventType.MATCH and will have a matching object. The
- * eleventh event will have type MatchingObjectEventType.END_OF_MATCHES.
- * 
- * @author Anthony Hunter
- */
-public interface IElementSelectionListener {
-
-    /**
-     * A matching object event has been sent.
-     * 
-     * @param serviceEvent
-     *            the matching object event.
-     */
-    public void matchingObjectEvent(IMatchingObjectEvent matchingObjectEvent);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionProvider.java
deleted file mode 100644
index d672025..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IElementSelectionProvider.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.common.ui.services.elementselection;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Interface describing a element selection provider for the element selection
- * service.
- * 
- * @author Anthony Hunter
- */
-public interface IElementSelectionProvider
-    extends IProvider {
-
-    /**
-     * Retrieve a list of matching objects from the provider.
-     * <p>
-     * The provider is given an IElementSelectionInput and
-     * IElementSelectionListener and creates a ElementSelectionServiceJob.
-     * <p>
-     * The provider returns IMatchingObjectEvent to the
-     * IElementSelectionListener. If there are ten matching objects, then eleven
-     * IMatchingObjectEvent will be sent to the listener. The first ten will
-     * have type MatchingObjectEventType.MATCH and will have a matching object.
-     * The eleventh event will have type MatchingObjectEventType.END_OF_MATCHES.
-     * 
-     * @param input
-     *            the element selection input.
-     * @param listener
-     *            the provider will send matching object events to this
-     *            listener.
-     * @return the job that is running this provider.
-     */
-    public ElementSelectionServiceJob getMatchingObjects(
-            IElementSelectionInput input, IElementSelectionListener listener);
-
-    /**
-     * Retrieve the list of matching objects from the provider.
-     * <p>
-     * The ElementSelectionServiceJob will invoke run. Clients must not call
-     * this method.
-     * 
-     * @param monitor
-     *            a progress monitor in which the provider is running.
-     */
-    public void run(IProgressMonitor monitor);
-
-    /**
-     * Resolve the matching object to a modeling object.
-     * 
-     * @param object
-     *            the matching object.
-     * @return a modeling object.
-     */
-    public Object resolve(IMatchingObject object);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObject.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObject.java
deleted file mode 100644
index be823a3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObject.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.elementselection;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Interface describing a matching object returned by the element selection
- * service.
- * 
- * @author Anthony Hunter <a href="mailto:anthonyh@ca.ibm.com">
- *         anthonyh@ca.ibm.com </a>
- */
-public interface IMatchingObject {
-
-	/**
-	 * Retrieve the name of the matching object, which is used when filtering
-	 * (we filter on the concrete name, not the display name).
-	 * 
-	 * @return the name of the matching object
-	 */
-	public String getName();
-
-	/**
-	 * Retrieve the display name of the matching object, which is used to as
-	 * display text by the label provider.
-	 * 
-	 * @return the display name of the matching object.
-	 */
-	public String getDisplayName();
-
-	/**
-	 * Retrieve the image of the matching object, which is used to as display
-	 * icon by the label provider.
-	 * 
-	 * @return the image of the matching object.
-	 */
-	public Image getImage();
-
-	/**
-	 * Retrieve the type selection provider that that provided this matching
-	 * object.
-	 * 
-	 * @return the type selection provider.
-	 */
-	public IElementSelectionProvider getProvider();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectEvent.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectEvent.java
deleted file mode 100644
index 6f5b778..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectEvent.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.common.ui.services.elementselection;
-
-/**
- * Interface describing a matching object event for the element selection
- * service.
- * <p>
- * The element selection service returns IMatchingObjectEvent to the
- * IElementSelectionListener. If there are ten matching objects, then eleven
- * IMatchingObjectEvent will be sent to the listener. The first ten will have
- * type MatchingObjectEventType.MATCH and will have a matching object. The
- * eleventh event will have type MatchingObjectEventType.END_OF_MATCHES.
- * <p>
- * 
- * @author Anthony Hunter
- */
-public interface IMatchingObjectEvent {
-
-    /**
-     * Retrieve the matching object event type.
-     * 
-     * @return the matching object event type.
-     */
-    public MatchingObjectEventType getEventType();
-
-    /**
-     * Retrieve the matching object.
-     * 
-     * @return the matching object.
-     */
-    public IMatchingObject getMatchingObject();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectsOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectsOperation.java
deleted file mode 100644
index 3f45285..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/IMatchingObjectsOperation.java
+++ /dev/null
@@ -1,29 +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.services.elementselection;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * The matching objects operation used by the element selection service.
- * 
- * @author Anthony Hunter
- */
-public interface IMatchingObjectsOperation
-    extends IOperation {
-    
-    /**
-     * Retreive the element selection input for this operation.
-     * 
-     * @return the element selection input.
-     */
-    public IElementSelectionInput getElementSelectionInput();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEvent.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEvent.java
deleted file mode 100644
index bf733c8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEvent.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.common.ui.services.elementselection;
-
-/**
- * A matching object event for the element selection service.
- * <p>
- * The element selection service returns IMatchingObjectEvent to the
- * IElementSelectionListener. If there are ten matching objects, then eleven
- * IMatchingObjectEvent will be sent to the listener. The first ten will have
- * type MatchingObjectEventType.MATCH and will have a matching object. The
- * eleventh event will have type MatchingObjectEventType.END_OF_MATCHES.
- * 
- * @author Anthony Hunter
- */
-public class MatchingObjectEvent
-    implements IMatchingObjectEvent {
-
-    /**
-     * the matching object event type.
-     */
-    private MatchingObjectEventType eventType;
-
-    /**
-     * the matching object.
-     */
-    private IMatchingObject matchingObject;
-
-    /**
-     * Constructor for a MatchingObjectEvent.
-     * 
-     * @param eventType
-     *            the matching object event type.
-     * @param matchingObject
-     *            the matching object.
-     */
-    public MatchingObjectEvent(MatchingObjectEventType eventType,
-            IMatchingObject matchingObject) {
-        super();
-        this.eventType = eventType;
-        this.matchingObject = matchingObject;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public MatchingObjectEventType getEventType() {
-        return eventType;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public IMatchingObject getMatchingObject() {
-        return matchingObject;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEventType.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEventType.java
deleted file mode 100644
index bcb727e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/elementselection/MatchingObjectEventType.java
+++ /dev/null
@@ -1,32 +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.services.elementselection;

-

-/**

- * Interface describing the type of the matching object event for the element

- * selection service.

- * 

- * @author Anthony Hunter

- */

-public class MatchingObjectEventType {

-

-    /**

-     * A matching object event that contains a matching object.

-     */

-    public static final MatchingObjectEventType MATCH = new MatchingObjectEventType();

-

-    /**

-     * A matching object event signaling that there are no more matching

-     * objects. This event does not contain a matching object and there are no

-     * further events to be received.

-     */

-    public static final MatchingObjectEventType END_OF_MATCHES = new MatchingObjectEventType();

-}

diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/GetIconOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/GetIconOperation.java
deleted file mode 100644
index 1fbe414..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/GetIconOperation.java
+++ /dev/null
@@ -1,44 +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.icon;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the <code>IconService</code>.  GetIconOperation
- * is instantiated by the <code>IconService</code> with an <code>IAdaptable</code> 
- * element for which an icon is to be retrieved, and is executed using 
- * FIRST <code>ExecutionStrategy</code>.  
- *
- * @author Michael Yee
- */
-public class GetIconOperation extends IconOperation {
-	final private int flags;
-
-    /**
-     * Constructor for GetIconOperation.
-     * @param hint argument adaptable to IElement
-     * @param flags icon flags, ex. IconOptions.NONE
-     */
-    protected GetIconOperation(IAdaptable hint, int flags) {
-        super(hint);
-        this.flags = flags;
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(IProvider)
-     */
-    public Object execute(IProvider provider) {
-        return ((IIconProvider) provider).getIcon(getHint(), flags);
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconOperation.java
deleted file mode 100644
index 9116dc3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconOperation.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.ui.services.icon;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * The operation used by the {@link IconService}.
- * 
- * @author ldamus
- */
-public interface IIconOperation extends IOperation {
-
-	/**
-	 * Gets the adaptable hint.
-	 * 
-	 * @return the hint
-	 */
-	public abstract IAdaptable getHint();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconProvider.java
deleted file mode 100644
index 42ebbd9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IIconProvider.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.common.ui.services.icon;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for providers of the "iconProvider" extension point.  Implement this interface
- * to contribute an extension to the "iconProvider" extension point.  Icon provider is responsible
- * for retrieving an icon for a specified element.
- * 
- * @author Michael Yee
- */
-public interface IIconProvider extends IProvider {
-
-	/**
-     * Gets the icon for the given object.
-     * 
-     * @param hint argument adaptable to IElement  
-     * @param flags optional icon flags
-     * @return Image the icon 
-     */
-    Image getIcon(IAdaptable hint, int flags);
-}
-
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOperation.java
deleted file mode 100644
index d87c06b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOperation.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.icon;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * The parent of all icon operations.
- * 
- * @author Michael Yee
- */
-public abstract class IconOperation implements IIconOperation {
-	
-	/**
-	 * A hint that does not adapt to anything. Used to indicate
-	 * that there is no hint.
-	 */
-	private final static IAdaptable NULL_HINT = new IAdaptable() {
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-	};
-	
-    /** the object hint - adaptable to IElement */
-    private final IAdaptable hint;
-    
-    
-    /**
-     * Constructor for IconOperation.
-     * @param hint argument adaptable to IElement
-     */
-    protected IconOperation(IAdaptable hint) {
-        super();
-        this.hint = hint;
-    }
-    
-    /**
-     * Gets the object hint
-     * @return the object hint
-     */
-    public final IAdaptable getHint() {
-    	if (hint == null) {
-    		// RATLC00529110 - we no longer assert that the hint 
-    		// is not null. Return a dummy adaptable to clients of
-    		// this method if the hint is null.
-    		return NULL_HINT;
-    	}
-        return hint;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOptions.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOptions.java
deleted file mode 100644
index d79c1b3..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconOptions.java
+++ /dev/null
@@ -1,87 +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.icon;
-
-/**
- * Class for setting and testing flags used by the icon service
- *  
- * @author Michael Yee
- */
-public final class IconOptions {
-    private int flags;
-
-    /**
-     * Constructor for IconOptions
-     */
-    public IconOptions() {
-        this(0);
-    }
-
-    /**
-     * Constructor for IconOptions
-     * @param flags the flags
-     */
-    private IconOptions(int flags) {
-        this.flags = flags;
-    }
-
-	/** no option */
-    public static final IconOptions NONE =
-        new IconOptions(0);
-        
-    /** set this if the stereotype image of an element's stereotype is requested */
-    public static final IconOptions GET_STEREOTYPE_IMAGE_FOR_ELEMENT =
-        new IconOptions(1 << 1);
-
-    /** 
-     * set this if no default image should be returned if the requested 
-     * stereotype image is not found
-     */
-    public static final IconOptions NO_DEFAULT_STEREOTYPE_IMAGE =
-        new IconOptions(1 << 2);
-
-    /**
-	 * set this if the image representing a stereotype is requested (use this to
-	 * find the icon for a stereotype without an element).
-	 */
-	public static final IconOptions GET_IMAGE_REPRESENTING_STEREOTYPE = new IconOptions(
-		1 << 3);
-
-    /**
-	 * Returns the flags as an integer bit flag
-	 * 
-	 * @return int the flags as an integer bit flag
-	 */
-    public int intValue() {
-        return flags;
-    }
-
-    /**
-     * Tests if the specified option is set
-     * @param flags     the flags as an integer bit flag
-     * @param option    the specified option
-     * @return boolean  <code>true</code> if this option is set, otherwise <code>false</code>
-     */
-    public static boolean isSet(int flags, IconOptions option) {
-        if ((flags & option.flags) != 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Sets the specified option
-     * @param option the specified option
-     */
-    public void set(IconOptions option) {
-        flags = flags | option.flags;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconService.java
deleted file mode 100644
index 24b7430..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/IconService.java
+++ /dev/null
@@ -1,137 +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.icon;
-
-import org.eclipse.core.runtime.IAdaptable;
-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.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.internal.icon.IconServiceProviderConfiguration;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Service which handles icon operations.
- * 
- * @author Michael Yee
- */
-public class IconService extends Service implements IIconProvider {
-
-	/** The singleton instance of the icon service. */
-    private final static IconService _instance = new IconService();
-
-    /**
-	 * A descriptor for <code>IIconProvider</code> defined
-	 * by a configuration element.
-	 * 
-	 * @author chmahone
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private IconServiceProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs a <code>IIconProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration =
-				IconServiceProviderConfiguration.parse(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)) {
-					providerConfiguration = null;
-					IProvider theProvider = getProvider();
-					return theProvider != null ? theProvider.provides(operation) : false;
-				}
-				return false;
-			}
-			IProvider theProvider = getProvider();
-			return theProvider != null ? theProvider.provides(operation) : false;
-		}
-
-		/**
-		 * Checks if the operation is supported by the XML extension.
-		 * 
-		 * @param operation
-		 * @return <code>true</code> if the operation is supported, <code>false</code> otherwise
-		 */
-		private boolean isSupportedInExtention(IOperation operation) {
-			if (operation instanceof GetIconOperation
-					&& providerConfiguration != null) {
-				GetIconOperation o = (GetIconOperation) operation;
-				return providerConfiguration.supports(o.getHint());
-			}
-			return false;
-		}
-	}
-	
-    /**
-     * The IconService constructor
-     */
-    private IconService() {
-		super();
-		configureProviders(CommonUIServicesPlugin.getPluginId(), "iconProviders"); //$NON-NLS-1$
-    }
-
-    /**
-     * Retrieves the singleton instance of the IconService.
-     * 
-     * @return IconService the IconService singleton instance 
-     */
-    public static IconService getInstance() {
-        return _instance;
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider#getIcon(IAdaptable, int)
-     */
-    public Image getIcon(IAdaptable hint, int flags) {
-        return (Image)executeUnique(ExecutionStrategy.FIRST, new GetIconOperation(hint, flags));
-    }
-
-    /**
-     * Convenience method for getting an icon for an element.
-     * 
-     * @param hint argument adaptable to IElement or IElementTypeInfo
-     * @return Image the image
-     */
-    public Image getIcon(IAdaptable hint) {
-        return getIcon(hint, IconOptions.NONE.intValue());
-    }
-
-	/**
-	 * @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);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/LabelChangedEvent.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/LabelChangedEvent.java
deleted file mode 100644
index 0722ecc..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/LabelChangedEvent.java
+++ /dev/null
@@ -1,83 +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.icon;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-
-/**
- * A custom provider changed event for handling icon and text changes
- * 
- * @author myee
- */
-public class LabelChangedEvent
-	extends ProviderChangeEvent {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Indicates if the event is affecting the children of the affected elements
-	 */
-	private boolean childrenAffecting = false;
-
-	/**
-	 * The affected elements
-	 */
-	private final Object[] elements;
-
-	/**
-	 * Constructor for LabelChangedEvent
-	 * 
-	 * @param source
-	 *            the provider source
-	 * @param elements
-	 *            the affected elements
-	 */
-	public LabelChangedEvent(IProvider source, Object[] elements) {
-		super(source);
-		this.elements = elements;
-	}
-
-	/**
-	 * Constructor for LabelChangedEvent
-	 * 
-	 * @param source
-	 *            the provider source
-	 * @param elements
-	 *            the affected elements
-	 * @param childrenAffecting
-	 *            Indicates if the event is affecting the children of the
-	 *            affected elements
-	 */
-	public LabelChangedEvent(IProvider source, Object[] elements,
-			boolean childrenAffecting) {
-		this(source, elements);
-		this.childrenAffecting = childrenAffecting;
-	}
-
-	/**
-	 * Returns the affected elements
-	 * 
-	 * @return the elements.
-	 */
-	public Object[] getElements() {
-		return elements;
-	}
-
-	/**
-	 * @return The indicator if the event is affecting the children of the
-	 *         affected elements
-	 */
-	public boolean isChildrenAffecting() {
-		return childrenAffecting;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/package.html b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/package.html
deleted file mode 100644
index b3de53a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/icon/package.html
+++ /dev/null
@@ -1,23 +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 framework for the icon service.</p>
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesDebugOptions.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesDebugOptions.java
deleted file mode 100644
index 72af829..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesDebugOptions.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.services.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *  
- */
-public final class CommonUIServicesDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private CommonUIServicesDebugOptions() {
-		/* private constructor */
-	}
-
-	/**
-	 * General debug string
-	 */
-	public static final String DEBUG = CommonUIServicesPlugin.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$
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesPlugin.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesPlugin.java
deleted file mode 100644
index b4c7fc7..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesPlugin.java
+++ /dev/null
@@ -1,56 +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.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The Common UI Services plug-in.
- * 
- * @author Wayne Diu, wdiu
- */
-public class CommonUIServicesPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static CommonUIServicesPlugin INSTANCE;
-
-	/**
-	 * Creates a new plug-in runtime object for the given plug-in descriptor.
-	 */
-	public CommonUIServicesPlugin() {
-		super();
-
-		INSTANCE = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonUIServicesPlugin 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/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesStatusCodes.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesStatusCodes.java
deleted file mode 100644
index a672d60..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/CommonUIServicesStatusCodes.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.services.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *  
- */
-public final class CommonUIServicesStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 *  
-	 */
-	private CommonUIServicesStatusCodes() {
-		/* 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;
-
-}
-
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/ElementSelectionList.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/ElementSelectionList.java
deleted file mode 100644
index 86e88a9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/ElementSelectionList.java
+++ /dev/null
@@ -1,88 +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.common.ui.services.internal.elementselection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionService;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.ElementSelectionServiceJob;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IElementSelectionListener;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IMatchingObjectEvent;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.MatchingObjectEventType;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * For backward compatibility, use the element selection service and return the
- * results in a list.
- * 
- * @author Anthony Hunter
- */
-public class ElementSelectionList {
-
-    private List results = new ArrayList();
-
-    private MatchingObjectEventType running = MatchingObjectEventType.MATCH;
-
-    private IElementSelectionInput elementSelectionInput;
-
-    class ElementSelectionListener
-        implements IElementSelectionListener {
-
-        public void matchingObjectEvent(IMatchingObjectEvent matchingObjectEvent) {
-            if (matchingObjectEvent.getEventType() == MatchingObjectEventType.END_OF_MATCHES) {
-                synchronized (running) {
-                    running = MatchingObjectEventType.END_OF_MATCHES;
-                }
-            } else {
-                synchronized (results) {
-                    results.add(matchingObjectEvent.getMatchingObject());
-                }
-            }
-        }
-    };
-
-    /**
-     * Run the element selection service and return the list of matching
-     * objects.
-     * 
-     * @param input
-     *            input for the element selection service.
-     * @return the list of matching objects.
-     */
-    public List getMatchingObjects(IElementSelectionInput input) {
-        this.elementSelectionInput = input;
-        ElementSelectionServiceJob job = ElementSelectionService.getInstance()
-            .getMatchingObjects(elementSelectionInput,
-                new ElementSelectionListener());
-        job.getName();
-        while (true) {
-            synchronized (running) {
-                if (running == MatchingObjectEventType.END_OF_MATCHES) {
-                    break;
-                }
-            }
-            if (PlatformUI.getWorkbench().getDisplay().getThread().equals(
-                Thread.currentThread())) {
-                while (PlatformUI.getWorkbench().getDisplay().readAndDispatch()) {
-                    // nothing, just dispatch events so the UI is not hung.
-                }
-            }
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException e) {
-                break;
-            }
-        }
-        return results;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/MatchingObjectsOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/MatchingObjectsOperation.java
deleted file mode 100644
index 068f728..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/elementselection/MatchingObjectsOperation.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.common.ui.services.internal.elementselection;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IElementSelectionInput;
-import org.eclipse.gmf.runtime.common.ui.services.elementselection.IMatchingObjectsOperation;
-
-/**
- * The matching objects operation used by the element selection service.
- * 
- * @author Anthony Hunter
- */
-public class MatchingObjectsOperation
-    implements IMatchingObjectsOperation {
-
-    /**
-     * the element selection input.
-     */
-    private IElementSelectionInput input;
-
-    /**
-     * Constructor for a MatchingObjectsOperation
-     * 
-     * @param input
-     *            the element selection input.
-     */
-    public MatchingObjectsOperation(IElementSelectionInput input) {
-        super();
-        this.input = input;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public IElementSelectionInput getElementSelectionInput() {
-        return input;
-    }
-
-    public Object execute(IProvider provider) {
-        assert true : "MatchingObjectsOperation.execute() should not be executed"; //$NON-NLS-1$
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/icon/IconServiceProviderConfiguration.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/icon/IconServiceProviderConfiguration.java
deleted file mode 100644
index 10bda33..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/icon/IconServiceProviderConfiguration.java
+++ /dev/null
@@ -1,132 +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.internal.icon;
-
-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 <code>IconService</code>. It helps in filtering out
- * and delay loading unrelated providers.
- * 
- * @author chmahone
- */
-public class IconServiceProviderConfiguration extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-	private static final String ELEMENTS = "elements"; //$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 IconServiceProviderConfiguration parse(IConfigurationElement configElement) {
-		assert null != configElement : "null provider configuration element"; //$NON-NLS-1$
-		return new IconServiceProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private IconServiceProviderConfiguration(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++) {
-			List elements =
-				getObjectList(
-					configChildren[i].getAttribute(ELEMENTS),
-					objects,
-					configElement);
-			if (elements != null)
-				requests.add(
-					new ContextDescriptor(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 elementAdapter adaptable to <code>IElement</code>
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(IAdaptable elementAdapter) {
-		if (requests.isEmpty())
-			return true;
-
-		Iterator iter = requests.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor request = (ContextDescriptor) iter.next();
-			if (request.matches(elementAdapter))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-		/** the element adapters */
-		private final List elementAdapters;
-
-		/**
-		 * creates a new context descriptor from its context info
-		 * 
-		 * @param elementAdapters The element adapters
-		 */
-		public ContextDescriptor(List elementAdapters) {
-			this.elementAdapters = elementAdapters;
-		}
-
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-	 	 * @param elementAdapter adaptable to <code>IElement</code>
-		 * @return boolean
-		 */
-		public boolean matches(IAdaptable elementAdapter) {
-			return objectMatches(elementAdapter, elementAdapters);
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.java
deleted file mode 100644
index 3f7c90c..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.java
+++ /dev/null
@@ -1,29 +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.services.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIServicesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.services.internal.l10n.CommonUIServicesMessages";//$NON-NLS-1$
-
-	private CommonUIServicesMessages() {
-		// Do not instantiate
-	}
-
-	public static String ElementSelectionService_ProgressName;
-    public static String ElementSelectionService_JobName;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIServicesMessages.class);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.properties b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.properties
deleted file mode 100644
index b6ca20a..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/l10n/CommonUIServicesMessages.properties
+++ /dev/null
@@ -1,15 +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                    |
-#*+------------------------------------------------------------------------+
-
-# Used to display progress in the element selection service.
-ElementSelectionService_ProgressName=Finding Matching Elements:
-ElementSelectionService_JobName=Select Matching Objects from {0} using filter: {1}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/marker/IMarkerNavigationProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/marker/IMarkerNavigationProvider.java
deleted file mode 100644
index 1f99e26..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/marker/IMarkerNavigationProvider.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.internal.marker;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * This interface enables clients to handle the navigation when the user goes to
- * (double clicks) a marker that the client has defined. The client can either
- * perform the necessary feedback in their provider or can delegate the
- * operation via an applicable mechanism (e.g., a GEF request).
- * 
- * @author Kevin Cornell
- */
-public interface IMarkerNavigationProvider
-	extends IProvider {
-
-	/**
-	 * Perform feedback for marker navigation.
-	 * 
-	 * @param editor
-	 *            the editor opened with the associated resource
-	 * @param marker
-	 *            the marker reference
-	 */
-	public void gotoMarker(IEditorPart editor, IMarker marker);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/package.html b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/internal/package.html
deleted file mode 100644
index 8c4cb42..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/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>
-
-<P>The org.eclipse.gmf.runtime.common.ui.services plugin contains the {@link
-org.eclipse.gmf.runtime.common.ui.services.editor.EditorService Editor Service}
-and the 
-{@link org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService
-org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService }.</P>
-@canBeSeenBy org.eclipse.gmf.runtime.common.ui.services.*
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/AbstractMarkerNavigationProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/AbstractMarkerNavigationProvider.java
deleted file mode 100644
index 6f1c15f..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/AbstractMarkerNavigationProvider.java
+++ /dev/null
@@ -1,85 +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.marker;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.ui.IEditorPart;
-
-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.internal.marker.IMarkerNavigationProvider;
-
-/**
- * This class saves the editor associated with the goto operation so that
- * utility methods in derived classes can access the editor instance before the
- * doGotoMarker() method is called.
- * 
- * @author Kevin Cornell
- */
-public abstract class AbstractMarkerNavigationProvider
-	extends AbstractProvider
-	implements IMarkerNavigationProvider {
-
-	/** Remember the editor associated with this goto operation. */
-	private IEditorPart editor = null;
-
-	/**
-	 * Save the editor instance associated with the marker.
-	 * 
-	 * @param anEditor
-	 *            the editor instance to be saved
-	 */
-	protected void setEditor(IEditorPart anEditor) {
-		this.editor = anEditor;
-	}
-
-	/**
-	 * Retrieve the saved editor instance.
-	 * 
-	 * @return the saved editor instance
-	 */
-	protected IEditorPart getEditor() {
-		return editor;
-	}
-
-	/**
-	 * Perform the marker navigation in a derived class.
-	 * 
-	 * @param marker
-	 *            the IMarker to go to
-	 */
-	abstract protected void doGotoMarker(IMarker marker);
-
-	/**
-	 * Perform the feedback for navigating to the given marker.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.internal.marker.IMarkerNavigationProvider#gotoMarker(org.eclipse.ui.IEditorPart,
-	 *      org.eclipse.core.resources.IMarker)
-	 */
-	public void gotoMarker(IEditorPart edit, IMarker marker) {
-		// Save the editor instance and call
-		setEditor(edit);
-
-		// Perform the marker navigation (feedback).
-		doGotoMarker(marker);
-	}
-
-	/*
-	 * (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 GotoMarkerOperation);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/GotoMarkerOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/GotoMarkerOperation.java
deleted file mode 100644
index f231621..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/GotoMarkerOperation.java
+++ /dev/null
@@ -1,85 +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.marker;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.common.ui.services.internal.marker.IMarkerNavigationProvider;
-
-/**
- * This class contains the information needed to perform the navigation to an
- * Eclipse marker. It contains getters for the parameters for the
- * MarkerNavigationService.gotoMarker() method.
- * 
- * @author Kevin Cornell
- */
-public class GotoMarkerOperation
-	implements IOperation {
-
-	/** Remember the editor instance opened for the marker's resource. */
-	private IEditorPart editor;
-
-	/** Remember the marker reference. */
-	private IMarker marker;
-
-	/**
-	 * Constructor - Create and save the goto marker operation.
-	 * <p>
-	 * 
-	 * @param anEditor
-	 *            the editor instance created for the marker's resource
-	 * @param aMarker
-	 *            the marker information
-	 */
-	public GotoMarkerOperation(IEditorPart anEditor, IMarker aMarker) {
-		assert null != anEditor;
-		assert null != aMarker;
-
-		this.editor = anEditor;
-		this.marker = aMarker;
-	}
-
-	/**
-	 * Retrieve the editor instance
-	 * 
-	 * @return the editor
-	 */
-	public IEditorPart getEditor() {
-		return editor;
-	}
-
-	/**
-	 * Retrieve the marker reference
-	 * 
-	 * @return the marker
-	 */
-	public IMarker getMarker() {
-		return marker;
-	}
-
-	/**
-	 * Execute the operation for the given provider
-	 * 
-	 * @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 IMarkerNavigationProvider) {
-			((IMarkerNavigationProvider) provider).gotoMarker(getEditor(),
-				getMarker());
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/MarkerNavigationService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/MarkerNavigationService.java
deleted file mode 100644
index 1ee2db8..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/MarkerNavigationService.java
+++ /dev/null
@@ -1,183 +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.marker;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IMarker;
-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.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.services.internal.marker.IMarkerNavigationProvider;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * This service is the distribution point for "gotoMarker" requests made by
- * Eclipse to an IEditorPart. In all editors, the implementation of the
- * gotoMarker() method simply forwards the request to this service.
- * <p>
- * Marker navigation providers are chosen based upon priority and the list of
- * marker types they support.
- * 
- * @author Kevin Cornell
- */
-public class MarkerNavigationService
-	extends Service
-	implements IMarkerNavigationProvider {
-
-	/** Remember the single instance of this service. */
-	private final static MarkerNavigationService instance = new MarkerNavigationService();
-
-	static {
-		instance.configureProviders(CommonUIServicesPlugin.getPluginId(),
-			"markerNavigationProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Marker Navigation Provider Descriptor.
-	 * <p>
-	 * This class is a descriptor for an <code>IMarkerNavigationProvider</code>
-	 * that is defined by an XML configuration element.
-	 */
-	protected static class MarkerNavigationProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/** The name of the 'name' XML attribute. */
-		protected static final String A_NAME = "name"; //$NON-NLS-1$
-
-		/** The name of the 'MarkerType' XML element. */
-		protected static final String E_MARKER_TYPE = "MarkerType"; //$NON-NLS-1$
-
-		/** Keep a list of the marker types accepted by this provider. */
-		private Vector markerTypes = new Vector();
-
-		/**
-		 * Constructs a <code>IMarkerNavigationProvider</code> descriptor for
-		 * the specified configuration element.
-		 * <p>
-		 * The configuration element is examined to obtain the list of marker
-		 * types that are supported by the corresponding provider.
-		 * <p>
-		 * 
-		 * @param element
-		 *            The configuration element describing the provider.
-		 */
-		protected MarkerNavigationProviderDescriptor(
-				IConfigurationElement element) {
-			super(element);
-
-			// Get the list of 'MarkerType' names supported by the provider.
-			IConfigurationElement[] elements = getElement().getChildren(
-				E_MARKER_TYPE);
-			for (int i = 0; i < elements.length; i++) {
-				String markerType = elements[i].getAttribute(A_NAME);
-				if (markerType != null) {
-					markerTypes.add(markerType);
-				}
-			}
-		}
-
-		/**
-		 * Determine if the corresponding provider accepts the operation.
-		 * Providers are trivially rejected if they do not support the
-		 * associated marker type. However, even if the marker type is
-		 * supported, the provider can reject the given operation.
-		 * 
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			boolean doesProvide = false;
-
-			if (operation instanceof GotoMarkerOperation) {
-				try {
-					// Get source marker type from the "goto" operation.
-					String markerType = ((GotoMarkerOperation) operation)
-						.getMarker().getType();
-
-					// If the marker type is supported, verify acceptance with
-					// the provider.
-					if (markerTypes.contains(markerType)) {
-						doesProvide = super.provides(operation);
-					}
-				} catch (Exception e) {
-					Trace.catching(CommonUIServicesPlugin.getDefault(),
-						CommonUIServicesDebugOptions.EXCEPTIONS_CATCHING,
-						getClass(), "provides", e); //$NON-NLS-1$
-					Log.error(CommonUIServicesPlugin.getDefault(),
-						CommonUIServicesStatusCodes.SERVICE_FAILURE, e
-							.getLocalizedMessage(), e);
-					doesProvide = false;
-				}
-			}
-
-			return doesProvide;
-		}
-	}
-
-	/*
-	 * (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 MarkerNavigationProviderDescriptor(element);
-	}
-
-	/**
-	 * The MarkerNavigationService constructor
-	 */
-	protected MarkerNavigationService() {
-		super(true);
-	}
-
-	/**
-	 * Gets the instance of MarkerNavigationService
-	 * 
-	 * @return Returns the <code>instance</code> variable
-	 */
-	public static MarkerNavigationService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Executes the <code>GotoMarkerOperation</code> operation using the FIRST
-	 * strategy
-	 * 
-	 * @param operation
-	 *            The <code>GotoMarkerOperation</code> operation
-	 */
-	private void execute(GotoMarkerOperation operation) {
-		execute(ExecutionStrategy.FIRST, operation);
-	}
-
-	/**
-	 * Perform the navigation to a marker in the associated editor.
-	 * <p>
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.internal.marker.IMarkerNavigationProvider#gotoMarker(org.eclipse.ui.IEditorPart,
-	 *      org.eclipse.core.resources.IMarker)
-	 */
-	public void gotoMarker(final IEditorPart editor, final IMarker marker) {
-		assert null != editor;
-		assert null != marker;
-		if (marker.exists())
-			execute(new GotoMarkerOperation(editor, marker));
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/package.html b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/package.html
deleted file mode 100644
index ea55e84..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/marker/package.html
+++ /dev/null
@@ -1,62 +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 Marker Navigation service, which is used to
-navigate to an Eclipse {@link org.eclipse.core.resources.IMarker IMarker} in an
-Eclipse {@link org.eclipse.ui.IEditorPart IEditorPart}.</P>
-
-<h2>Using this Package</h2>
-
-<P>
-The
-{@link org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService
-Marker Navigation Service} implements {@link
-org.eclipse.gmf.runtime.common.ui.services.marker.IMarkerNavigationProvider
-org.eclipse.gmf.runtime.common.ui.services.marker.IMarkerNavigationProvider}.
-The interface contains only one method, {@link
-org.eclipse.gmf.runtime.common.ui.services.marker#gotoMarker(org.eclipse.ui.IEditorPart,
-org.eclipse.core.resources.IMarker) gotoMarker(IEditorPart, IMarker)}, which
-takes the {@link org.eclipse.ui.IEditorPart IEditorPart} and the {@link
-org.eclipse.core.resources.IMarker IMarker} to navigate to.
-
-Providers may subclass {@link
-org.eclipse.gmf.runtime.common.ui.services.marker.AbstractMarkerNavigationProvider
-AbstractMarkerNavigationProvider}, which implements the required
-{@link org.eclipse.gmf.runtime.common.ui.services.marker.IMarkerNavigationProvider
-IMarkerNavigationProvider}.  The only operation executed by the service is
-{@link org.eclipse.gmf.runtime.common.ui.services.marker.GotoMarkerOperation
-GotoMarkerOperation}, whose {@link
-org.eclipse.gmf.runtime.common.ui.services.marker.GotoMarkerOperation#GotoMarkerOperation(org.eclipse.ui.IEditorPart,
-org.eclipse.core.resources.IMarker) constructor} takes the same parameters as the
-interface's method.
-
-</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on Eclipse Markers, please see 
-{@link org.eclipse.core.resources.IMarker org.eclipse.core.resources.IMarker}</P>
-<P>For more information on the Service Infrastructure, please see 
-{@link org.eclipse.gmf.runtime.common.core.service.Service
-org.eclipse.gmf.runtime.common.core.service.Service}</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/CommonParserHint.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/CommonParserHint.java
deleted file mode 100644
index 74f07bd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/CommonParserHint.java
+++ /dev/null
@@ -1,30 +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.parser;
-
-/** 
- * Defines common parser hints.  This file should not contain non-common hints
- * e.g. UML Hints.
- */
-public interface CommonParserHint {
-
-	/**
-	 * Hint to select the parser to provide a name string.
-	 */
-	static final public String NAME = "Name"; //$NON-NLS-1$
-	
-	/**
-	 * Hint to select the parser to provide a description string.
-	 */
-	static final public String DESCRIPTION = "Description"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/GetParserOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/GetParserOperation.java
deleted file mode 100644
index 445eb34..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/GetParserOperation.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.common.ui.services.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Operation to get a parser using an IAdaptable hint for the parser to be used 
- */
-public class GetParserOperation 
-	implements IOperation {
-
-	/**
-	 * Hint for the parser to be used
-	 */
-	private final IAdaptable hint;
-
-	/**
-	 * Method GetParserOperation.
-	 * 
-	 * @param hint IAdaptable hint for the parser to be used
-	 */
-	protected GetParserOperation(IAdaptable hint) {
-		assert null!=hint : "GetParserOperation constructor received NULL as argument"; //$NON-NLS-1$
-		
-		this.hint = hint;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		return ((IParserProvider) provider).getParser(getHint());
-	}
-
-	/**
-	 * Method getHint.
-	 * @return IAdaptable
-	 */
-	public final IAdaptable getHint() {
-		return hint;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParser.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParser.java
deleted file mode 100644
index 13bcda9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParser.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.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * The interface for all parsers
- * 
- * @author Michael Yee
- */
-public interface IParser {
-
-    /**
-     * Gets the string that is a subject to edit.
-     * 
-     * @param element	the element for which the edit string is requested
-     * @param flags  	the bitflag of parser options
-     * @return String	current contents of the edit string
-     */
-    public String getEditString(IAdaptable element, int flags);
-    
-    /**
-     * Tests if the user-entered string is in a valid form that can be parsed
-     * 
-     * @param element the element for which the edit string is applied to
-     * @param editString the user-entered string
-     * @return IParserEditStatus <code>EDITABLE_STATUS</code> if the edit string is valid, otherwise
-     * 				  a status that includes information describing why it is an invalid edit string.
-     */
-    public IParserEditStatus isValidEditString(IAdaptable element, String editString);
-
-    /**
-     * Gets the command that applies the new edit string
-     * 
-     * @param element		the element for which the parse command is requested
-     * @param newString	to be set by the command
-     * @param flags		the bitflag of parser options
-     * @return ICommand	command that when executed will result in
-     * 					  	setting the newString
-     */
-    public ICommand getParseCommand(
-        IAdaptable element,
-        String newString,
-        int flags);
-        
-
-    /**
-     * Returns a string intended for display. That might be a different string that the one
-     * returned by getEditString. E.g., for stereotypes, the print string will be adorned
-     * with <<>> brackets while edit string will not be adorned. 
-     * 
-     * @param element	the element for which the print string is requested
-     * @param flags	the bitflag of parser options
-     * @return String	the print string
-     */
-    public String getPrintString(IAdaptable element, int flags);
-
-    /**
-     * Determines if the event requires action from the parser point of view.
-     * The action usually involves some visual refreshment.
-     * 
-     * @param event	the event, an instance of IElementEvent
-     * @param flags	the bitflag of parser options
-     * @return boolean	<code>true</code> if the event affects the parser,
-     * 					otherwise <code>false</code>.
-     */
-    public boolean isAffectingEvent(Object event, int flags);
-    
-    /**
-     * Returns the parser's content assist processor
-     *  
-     * @param element the element
-     * @return the content assist processor
-     */
-    public IContentAssistProcessor getCompletionProcessor(IAdaptable element);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserEditStatus.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserEditStatus.java
deleted file mode 100644
index bb83601..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserEditStatus.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.common.ui.services.parser;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-
-/**
- * Status object for indicating the validity of an edit.
- *  
- * @author jcorchis
- */
-public interface IParserEditStatus extends IStatus {
-	
-	/** Status code constant (value 0) indicating the edit status editable. */
-	public static final int EDITABLE = 0;
-
-	/** Status code constant (bit mask, value 1) indicating the edit status uneditable. */
-	public static final int UNEDITABLE = 0x01;
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserProvider.java
deleted file mode 100644
index 530d12e..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/IParserProvider.java
+++ /dev/null
@@ -1,35 +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.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for all parser providers
- * 
- * Must implement a method to return a parser from an IAdaptable hint
- */
-public interface IParserProvider
-	extends IProvider {
-
-	/**
-	 * Method getParser.
-	 * 
-	 * @param hint
-	 *            IAdaptable hint used to determine the parser to return
-	 * @return IParser corresponding to the IAdaptable hint
-	 */
-	public IParser getParser(IAdaptable hint);
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserEditStatus.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserEditStatus.java
deleted file mode 100644
index 596d9cd..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserEditStatus.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.parser;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-
-
-/**
- * Concrete implementation of the IParserEditStatus suitable for use or extending. This
- * class aides parsing by enabling feedback to help users understand
- * 
- * @see #getMessage()
- * @author jcorchis
- */
-public class ParserEditStatus
-	extends Status 
-	implements IParserEditStatus {
-	
-	/**
-	 * The standard Editable status. Does not contain any message.
-	 */
-	public static final ParserEditStatus EDITABLE_STATUS = new ParserEditStatus(
-		CommonUIServicesPlugin.getPluginId(), EDITABLE, ""); //$NON-NLS-1$
-
-	/**
-	 * The standard Uneditable status. Does not contain a message.
-	 */
-	public static final ParserEditStatus UNEDITABLE_STATUS = new ParserEditStatus(
-		CommonUIServicesPlugin.getPluginId(), UNEDITABLE, ""); //$NON-NLS-1$
-	
-	/**
-	 * Creates a new status object.  The created status has no children.
-	 *
-	 * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>, 
-	 * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-	 * @param pluginId the unique identifier of the relevant plug-in
-	 * @param code either <code>EDITABLE</code> or <code>UNEDITABLE</code> 
-	 * @param message a human-readable message, localized to the
-	 *    current locale
-	 * @param exception a low-level exception, or <code>null</code> if not
-	 *    applicable 
-	 */
-	public ParserEditStatus(int status, String pluginId, int code, String message, Throwable exception) {
-		super(status, pluginId, code, message, exception);
-	}
-	
-	/**
-	 * Create a new status object with severity <code>INFO</code>, and null for the 
-	 * exception.
-	 * @param pluginId the unique identifier of the relevant plug-in
-	 * @param code either <code>EDITABLE</code> or <code>UNEDITABLE</code> 
-	 * @param message message a human-readable message, localized to the
-	 *    current locale
-	 */
-	public ParserEditStatus(String pluginId, int code, String message) {
-		super(IStatus.INFO, pluginId, code, message, null);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserOptions.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserOptions.java
deleted file mode 100644
index 3a2fedf..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserOptions.java
+++ /dev/null
@@ -1,157 +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.parser;
-
-/**
- * This is a wrapper used for defining, setting, and retrieving flags that can 
- * be used for the parser operations that take a flags int as a parameter.
- *  
- * @author chmahone, "unSet" method added by choang
- */
-public final class ParserOptions {
-    private int flags;
-
-    /**
-     * Default constructor to initialize ParserOptions with no custom flags.
-     */
-    public ParserOptions() {
-        flags = 0;
-    }
-
-    /**
-     * Constructor that takes flags in as a parameter.
-     * 
-     * @param flags that describe how the text should be parsed.  Some flags
-     * are defined in this class.
-     */
-    public ParserOptions(int flags) {
-        this.flags = flags;
-    }
-
-    // Caution: When adding parser options be sure that there are
-    // no overlapping options.  Some of the options are used by 
-    // more than one parser.
-
-    /**
-     * Default.  No parser options.
-     */
-    public static final ParserOptions NONE = new ParserOptions(0);
-
-    // ListItemParser options
-    /**
-     * Display the visibility of the item.
-     */
-    public static final ParserOptions VISIBILITY_STYLE_TEXT =
-        new ParserOptions(1 << 1);
-
-    /**
-     * Display the Stereotype.
-     */
-    public static final ParserOptions STEREOTYPE_STYLE_TEXT =
-        new ParserOptions(1 << 2);
-
-    // NameParser options
-    /**
-     * Show parent name.
-     */
-    public static final ParserOptions SHOW_PARENT_NAME =
-        new ParserOptions(1 << 3);
-
-    // OperationParser options    
-    /**
-     * Show signature.
-     */
-    public static final ParserOptions SHOW_SIGNATURE =
-        new ParserOptions(1 << 4);
-
-    /**
-     * Show type.
-     */
-    public static final ParserOptions SHOW_TYPE = new ParserOptions(1 << 5);
-
-    /**
-     * Show alias.
-     */
-    public static final ParserOptions SHOW_ALIAS = new ParserOptions(1 << 6);
-    
-    /**
-     * Show that the element is derived.
-     */
-    public static final ParserOptions SHOW_DERIVED = new ParserOptions(1 << 7);
-    
-    // MessageParser options
-    /**
-     * Show number of the message.
-     */
-    public static final ParserOptions SHOW_SEQUENCE_NUMBER = new ParserOptions(1 << 8);
-
-    // PatternsTemplateArgumentParser options
-    /**
-     * Show that there are bound arguments.
-     */
-    public static final ParserOptions BIND_STYLE_TEXT = new ParserOptions(1 << 9);
-    
-    /**
-     * Show the type.
-     */
-    public static final ParserOptions TYPE_STYLE_TEXT = new ParserOptions(1 << 10);
-    
-    /**
-     * Indicates that placeholders should be ignored - if there are no data, no
-     * placeholder will be generated. An example would be guillemets for the
-     * stereotype list. If there are no stereotypes, the guillemets would be the
-     * placeholder.
-     */
-    public static final ParserOptions IGNORE_PLACEHOLDERS = new ParserOptions(1 << 11);
-    
-    /**
-     * Indicates that message signatures should use the "<parameter name> = <value>" notation.
-     */
-    public static final ParserOptions USE_PARAMETER_NAMES = new ParserOptions(1 << 12);
-    
-    /**
-     * Returns the options as an int so they can be passed to operations.
-     * @return int the options in int form
-     */
-    public int intValue() {
-        return flags;
-    }
-
-    /**
-     * Checks if the specified option is set in the flags supplied.
-     * @param flags     int representing the flags
-     * @param option    one of the defined ParserOptions
-     * @return boolean  true if this option is set; false otherwise
-     */
-    public static boolean isSet(int flags, ParserOptions option) {
-        if ((flags & option.flags) != 0)
-            return true;
-        return false;
-    }
-
-    /**
-     * Sets an option in this ParserOptions.
-     * @param option    one of the defined ParserOptions
-     */
-    public void set(ParserOptions option) {
-        flags = flags | option.flags;
-    }
-    
-    /**
-     * UnSets an option in the this ParserOptions.
-     * @param option one of the defined ParserOptions
-     */
-    public void unSet(ParserOptions option){
-    	flags = flags &~ option.intValue();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserService.java
deleted file mode 100644
index 731f0a5..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/ParserService.java
+++ /dev/null
@@ -1,119 +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.parser;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-
-/**
- * The parser service which returns a parser for an IAdaptable.
- * Also includes methods to obtain the strings for the IAdaptable and to
- * determine whether editing is possible. 
- */
-public class ParserService
-	extends Service
-	implements IParserProvider {
-
-	/**
-	 * The singleton instance of the parser service.
-	 */
-	private final static ParserService service = new ParserService();
-
-	static {
-		service.configureProviders(CommonUIServicesPlugin.getPluginId(), "parserProviders"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Retrieves the singleton instance of the parser service.
-	 *
-	 * @return The editor service singleton.
-	 */
-	public static ParserService getInstance() {
-		return service;
-	}
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider#getParser(IAdaptable)
-     */
-	public IParser getParser(IAdaptable hint) {
-		return (IParser) executeUnique(ExecutionStrategy.FIRST, new GetParserOperation(hint));
-	}
-
-	/**
-	 * Returns the string that is a subject to edit.
-	 *
-	 * @param hint - hint adaptable to IElement
-	 * @param options - parser options
-	 * @return String - current contents of the edit string
-	 */
-	public String getEditString(IAdaptable hint, int options) {
-		String editString = null;
-		IParser parser = service.getParser(hint);
-
-		if (parser != null) {
-			editString = parser.getEditString(hint, options);
-		}
-
-		if (editString == null) {
-			editString = StringStatics.BLANK;
-		}
-
-		return editString;
-	}
-
-	/**
-	 * Gets the print string to display
-	 *
-	 * @param hint - hint adaptable to IElement
-	 * @param options - parser options
-	 * @return String - the print string
-	 */
-	public String getPrintString(IAdaptable hint, int options) {
-		IParser parser = service.getParser(hint);
-
-		if (parser == null) {
-			return StringStatics.BLANK;
-		}
-
-		return parser.getPrintString(hint, options);
-	}
-
-    /**
-     * Convenience method for getting the print string to display
-     * @param hint - hint adaptable to element
-     * @return String - the print string
-     */
-	public String getPrintString(IAdaptable hint) {
-		return getPrintString(hint, 0);
-	}
-
-    /**
-     * Determines if element can be edited
-     * @param hint - hint adaptable to element to check
-     * @return boolean <code>true</code> if element is editable, otherwise <code>false</code>
-     */
-	public boolean canEdit(IAdaptable hint) {
-		IParser parser = service.getParser(hint);
-
-		if (parser != null) {
-			String editString = parser.getEditString(hint, 0);
-			if (editString != null) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/package.html b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/package.html
deleted file mode 100644
index fb150a9..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/parser/package.html
+++ /dev/null
@@ -1,57 +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 framework for the parser service.
-Given an {@link org.eclipse.core.runtime.IAdaptable IAdaptable} hint, the {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.ParserService ParserService}
-class contains a method to return a parser for the IAdaptable.
-This is performed using the {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation
-GetParserOperation}.  From this method, the ParserService class provides
-implementations of convenience methods to obtain text for the IAdaptable and to
-determine whether or not the IAdaptable can be edited.  Flags for the parser
-service may be defined in an interface with constants such as {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint
-CommonParserHint} or using a convenience wrapper such as {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions
-ParserOptions}.</P>
-
-<h2>Using this Package</h2>
-<P>To implement a parser provider, implement {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider
-IParserProvider}, typically subclassing {@link
-org.eclipse.gmf.runtime.common.core.service.AbstractProvider}.  For on demand loading,
-consider implementing {@link org.eclipse.gmf.runtime.common.core.service.IProviderPolicy
-IProviderPolicy} and in particular the {@link
-org.eclipse.gmf.runtime.common.core.service.IProviderPolicy#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-provides()} method.  To implement the parser to be returned by the
-IParserProvider, implement the {@link
-org.eclipse.gmf.runtime.common.ui.services.parser.IParser IParser}
-interface.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information on the Service Infrastructure, please see 
-{@link org.eclipse.gmf.runtime.common.core.service.Service
-org.eclipse.gmf.runtime.common.core.service.Service}</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/AbstractStatusLineContributionItemProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/AbstractStatusLineContributionItemProvider.java
deleted file mode 100644
index 70e1090..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/AbstractStatusLineContributionItemProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.statusline;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Abstract implementation of a status line contribution item provider.
- * 
- * @author Anthony Hunter
- * @since 1.2
- */
-public class AbstractStatusLineContributionItemProvider extends AbstractProvider implements
-		IStatusLineContributionItemProvider {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.gmf.runtime.common.ui.services.statusline.IStatusLineContributionItemProvider
-	 * #getStatusLineItems(org.eclipse.ui.part.WorkbenchPart)
-	 */
-	public List<IContributionItem> getStatusLineContributionItems(IWorkbenchPage workbenchPage) {
-		return Collections.emptyList();
-	}
-
-	/*
-	 * (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 false;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/GetStatusLineContributionOperation.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/GetStatusLineContributionOperation.java
deleted file mode 100644
index fac2be1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/GetStatusLineContributionOperation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.statusline;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The parent of all status line items.
- * 
- * @author Paulina Masson
- * @author Anthony Hunter
- * @since 1.2
- */
-public class GetStatusLineContributionOperation implements IOperation {
-
-	private final IWorkbenchPage workbenchPage;
-
-	/**
-	 * Constructor for a GetStatusLineContributionOperation.
-	 * 
-	 * @param part
-	 *            the workbench part.
-	 */
-	public GetStatusLineContributionOperation(IWorkbenchPage workbenchPage) {
-		super();
-		this.workbenchPage = workbenchPage;
-	}
-
-	/*
-	 * (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 ((IStatusLineContributionItemProvider) provider).getStatusLineContributionItems(workbenchPage);
-	}
-
-	/**
-	 * Gets the workbench page as a hint.
-	 * 
-	 * @return the workbench page.
-	 */
-	public IWorkbenchPage getWorkbenchPage() {
-		return workbenchPage;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/IStatusLineContributionItemProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/IStatusLineContributionItemProvider.java
deleted file mode 100644
index 59dbbc2..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/IStatusLineContributionItemProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.statusline;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.part.WorkbenchPart;
-
-/**
- * The interface for providers of the "statusLineContributionItemProvider"
- * extension point. A status line item provider is responsible for retrieving a
- * status line contribution for a {@link WorkbenchPart}.
- * 
- * @noimplement This interface is not intended to be implemented by clients, use
- *              {@link AbstractStatusLineContributionItemProvider}
- * @author Paulina Masson
- * @author Anthony Hunter
- * @since 1.2
- */
-public interface IStatusLineContributionItemProvider extends IProvider {
-
-	/**
-	 * Gets a list of contribution items for the status line.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return a list of contribution items for the status line .
-	 */
-	public List<IContributionItem> getStatusLineContributionItems(
-			IWorkbenchPage workbenchPage);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineMessageContributionItem.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineMessageContributionItem.java
deleted file mode 100644
index 436986d..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineMessageContributionItem.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.statusline;
-
-import org.eclipse.gmf.runtime.common.ui.services.util.CommonLabelProvider;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A default implementation of a contribution item that provides content for the
- * message contribution in the status line. The default status line manager
- * provides the ability to display an icon and message. This class is not really
- * a ContributionItem but rather a label provider that is returned by the
- * {@link StatusLineService}
- * 
- * @author Anthony Hunter
- * @since 1.2
- */
-public class StatusLineMessageContributionItem extends ContributionItem
-		implements ILabelProvider {
-
-	private ILabelProvider labelProvider;
-
-	/**
-	 * Constructor for a StatusLineMessageContributionItem.
-	 * 
-	 * @param workbenchPage
-	 *            - workbench page to be used
-	 * @param id
-	 *            - contribution item id
-	 */
-	public StatusLineMessageContributionItem() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.
-	 * jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// Not implemented
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		return getLabelProvider().getImage(element);
-	}
-
-	/**
-	 * Get the label provider. If no label provider has been initialized by
-	 * setLabelProvider(), we create a new {@link CommonLabelProvider}.
-	 * 
-	 * @return the label provider.
-	 */
-	public ILabelProvider getLabelProvider() {
-		if (labelProvider == null) {
-			labelProvider = new CommonLabelProvider();
-		}
-		return labelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		return getLabelProvider().getText(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang
-	 * .Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse
-	 * .jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// Not implemented
-	}
-
-	/**
-	 * Set the label provider.
-	 * 
-	 * @param aLabelProvider
-	 *            the label provider.
-	 */
-	public void setLabelProvider(ILabelProvider aLabelProvider) {
-		this.labelProvider = aLabelProvider;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineService.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineService.java
deleted file mode 100644
index 3415a52..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/statusline/StatusLineService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.statusline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.ui.services.internal.CommonUIServicesPlugin;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Service which handles status line contributions.
- * 
- * @author Paulina Masson
- * @author Anthony Hunter
- * @since 1.2
- */
-public class StatusLineService extends Service implements
-		IStatusLineContributionItemProvider {
-
-	/**
-	 * The singleton instance of the status line service.
-	 */
-	private final static StatusLineService service = new StatusLineService();
-
-	static {
-		service.configureProviders(CommonUIServicesPlugin.getPluginId(),
-				"statusLineContributionItemProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Retrieves the singleton instance of the status line service.
-	 * 
-	 * @return The StatusLineService singleton.
-	 */
-	public static StatusLineService getInstance() {
-		return service;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.statusline.
-	 * IStatusLineContributionItemProvider
-	 * #getStatusLineContributionItems(org.eclipse.ui.IWorkbenchPage)
-	 */
-	@SuppressWarnings("unchecked")
-	public List<IContributionItem> getStatusLineContributionItems(
-			IWorkbenchPage workbenchPage) {
-		List<List<IContributionItem>> lists = execute(
-				ExecutionStrategy.FORWARD,
-				new GetStatusLineContributionOperation(workbenchPage));
-		// execute returns a list of lists, so compact into a single list.
-		List<IContributionItem> result = new ArrayList<IContributionItem>();
-		for (List<IContributionItem> items : lists) {
-			result.addAll(items);
-
-		}
-		return result;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/ActivityFilterProviderDescriptor.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/ActivityFilterProviderDescriptor.java
deleted file mode 100644
index a5532e1..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/ActivityFilterProviderDescriptor.java
+++ /dev/null
@@ -1,50 +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.common.ui.services.util;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-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.util.ActivityUtil;
-
-/**
- * A provider descriptor that will ignore providers that are contributed by a
- * plug-in that is matched to a disabled activity/capability.
- * 
- * @author cmahoney
- */
-public class ActivityFilterProviderDescriptor
-	extends Service.ProviderDescriptor {
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param element
-	 */
-	public ActivityFilterProviderDescriptor(IConfigurationElement element) {
-		super(element);
-	}
-
-	/**
-     * Returns false if and only if any matching activites are disabled.
-     */
-    public boolean provides(IOperation operation) {
-        if (getElement().isValid()) {
-            return ActivityUtil
-                .isEnabled(getElement().getDeclaringExtension()
-                    .getSimpleIdentifier(), getElement().getContributor()
-                    .getName());
-        }
-        return true;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/CommonLabelProvider.java b/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/CommonLabelProvider.java
deleted file mode 100644
index 94bcd9b..0000000
--- a/org.eclipse.gmf.runtime.common.ui.services/src/org/eclipse/gmf/runtime/common/ui/services/util/CommonLabelProvider.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.services.util;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconOptions;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-
-/**
- * Label provider that delegates to the Icon Service
- * and the Parser Service for the images and text it provides.
- * 
- * @author ldamus
- *
- */
-public class CommonLabelProvider
-	extends DecoratingLabelProvider {
-	
-	/**
-	 * A label provider which uses the icon and parser service to
-	 * get the labels.
-	 */
-	private static class MyDelegatingLabelProvider extends LabelProvider {
-		
-		private int parserOptions = ParserOptions.NONE.intValue();
-		private int iconOptions = IconOptions.NONE.intValue();
-
-		public Image getImage(Object element) {
-
-			if ((element instanceof IStructuredSelection)) {
-				IStructuredSelection ss = (IStructuredSelection) element;
-				if (ss.size() == 1) {
-					element = ss.getFirstElement();
-				}
-			}
-			
-			if (!(element instanceof IAdaptable)) {
-				return null;
-			}
-			
-			return IconService.getInstance().getIcon((IAdaptable) element, iconOptions);
-		}
-
-		public String getText(Object element) {
-
-			if ((element instanceof IStructuredSelection)) {
-				IStructuredSelection ss = (IStructuredSelection) element;
-				if (ss.size() == 1) {
-					element = ss.getFirstElement();
-				}
-			}
-			
-			if (!(element instanceof IAdaptable)) {
-				return StringStatics.BLANK;
-			}
-			
-			return ParserService.getInstance().getPrintString(
-				(IAdaptable) element, parserOptions);
-		}
-		
-		/**
-		 * Sets parser options.
-		 * 
-		 * @param options parser option
-		 */
-		public void setParserOptions(int options) {
-			this.parserOptions = options;
-		}
-		
-		/**
-		 * Sets icon options.
-		 * 
-		 * @param options icon options
-		 */
-		public void setIconOptions(int options) {
-			this.iconOptions = options;
-		}
-	};
-	
-	/**
-	 * Constructors a new label provider instance.
-	 */
-	public CommonLabelProvider() {
-		super(
-			new MyDelegatingLabelProvider(),
-			PlatformUI
-				.getWorkbench()
-				.getDecoratorManager()
-				.getLabelDecorator());
-	}
-	
-	/**
-	 * Sets the parser options.
-	 * @param options parser options
-	 */
-	public void setParserOptions(int options) {
-		((MyDelegatingLabelProvider) getLabelProvider()).setParserOptions(options);
-	}
-	
-	/**
-	 * Sets the icon options.
-	 * @param options icon options
-	 */
-	public void setIconOptions(int options) {
-		((MyDelegatingLabelProvider) getLabelProvider()).setIconOptions(options);
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/.classpath b/org.eclipse.gmf.runtime.common.ui/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.common.ui/.cvsignore b/org.eclipse.gmf.runtime.common.ui/.cvsignore
deleted file mode 100644
index 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
diff --git a/org.eclipse.gmf.runtime.common.ui/.options b/org.eclipse.gmf.runtime.common.ui/.options
deleted file mode 100644
index 255a41a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.options
+++ /dev/null
@@ -1,26 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.common.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.common.ui plug-in
-org.eclipse.gmf.runtime.common.ui/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.common.ui/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.common.ui/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.common.ui/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.common.ui/debug/methods/exiting=false
-
-# Trace information related to action administration
-org.eclipse.gmf.runtime.common.ui/debug/actions/admin=false
-# Trace when actions are run
-org.eclipse.gmf.runtime.common.ui/debug/actions/run=false
-# Trace when actions are repeated
-org.eclipse.gmf.runtime.common.ui/debug/actions/repeat=false
-# Trace resource management
-org.eclipse.gmf.runtime.common.ui/debug/resource/tracing=false
-
-# Trace information related to service configuration
-org.eclipse.gmf.runtime.common.core/debug/services/config=false
diff --git a/org.eclipse.gmf.runtime.common.ui/.project b/org.eclipse.gmf.runtime.common.ui/.project
deleted file mode 100644
index 03b9f67..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.common.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.common.ui/.settings/.api_filters b/org.eclipse.gmf.runtime.common.ui/.settings/.api_filters
deleted file mode 100644
index 437158b..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.settings/.api_filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.common.ui" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/action/ActionMenuManager.java" type="org.eclipse.gmf.runtime.common.ui.action.ActionMenuManager$MenuCreatorAction">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="LabelRetargetAction"/>
-                <message_argument value="MenuCreatorAction"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/resources/FileChangeManager.java" type="org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IFileChangeManager"/>
-                <message_argument value="FileChangeManager"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/common/ui/resources/FileObserverManager.java" type="org.eclipse.gmf.runtime.common.ui.resources.FileObserverManager">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="FileChangeEvent"/>
-                <message_argument value="FileObserverManager"/>
-                <message_argument value="notify(FileChangeEvent)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="MarkerChangeEvent"/>
-                <message_argument value="FileObserverManager"/>
-                <message_argument value="notify(MarkerChangeEvent)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1893207..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 03:58:09 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 85b5db9..0000000
--- a/org.eclipse.gmf.runtime.common.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:20:44 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2adc9a6..0000000
--- a/org.eclipse.gmf.runtime.common.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.common.ui; singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.common.ui.action,
- org.eclipse.gmf.runtime.common.ui.contentassist,
- org.eclipse.gmf.runtime.common.ui.dialogs,
- org.eclipse.gmf.runtime.common.ui.editors,
- org.eclipse.gmf.runtime.common.ui.internal;x-friends:="org.eclipse.gmf.tests.runtime.common.ui,org.eclipse.gmf.runtime.diagram.ui.resources.editor",
- org.eclipse.gmf.runtime.common.ui.internal.contentassist;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.runtime.common.ui.internal.dialogs;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.runtime.common.ui.internal.l10n;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.runtime.common.ui.internal.resources;x-friends:="org.eclipse.gmf.tests.runtime.common.ui",
- org.eclipse.gmf.runtime.common.ui.preferences,
- org.eclipse.gmf.runtime.common.ui.resources,
- org.eclipse.gmf.runtime.common.ui.util,
- org.eclipse.gmf.runtime.common.ui.viewers
-Require-Bundle: org.eclipse.ui.views;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.console;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.team.core;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.common.ui/about.html b/org.eclipse.gmf.runtime.common.ui/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.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, 2007</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/build.properties b/org.eclipse.gmf.runtime.common.ui/build.properties
deleted file mode 100644
index e99bb65..0000000
--- a/org.eclipse.gmf.runtime.common.ui/build.properties
+++ /dev/null
@@ -1,21 +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,\
-               .options,\
-               icons/,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/auto_scroll.gif b/org.eclipse.gmf.runtime.common.ui/icons/auto_scroll.gif
deleted file mode 100644
index 4b98910..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/auto_scroll.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/checkboxcleared.gif b/org.eclipse.gmf.runtime.common.ui/icons/checkboxcleared.gif
deleted file mode 100644
index f6b9f8a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/checkboxcleared.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/checkboxgreyed.gif b/org.eclipse.gmf.runtime.common.ui/icons/checkboxgreyed.gif
deleted file mode 100644
index 40973c9..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/checkboxgreyed.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/checkboxselected.gif b/org.eclipse.gmf.runtime.common.ui/icons/checkboxselected.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/checkboxselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/checkboxunselected.gif b/org.eclipse.gmf.runtime.common.ui/icons/checkboxunselected.gif
deleted file mode 100644
index 5e6bf3e..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/checkboxunselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/clear.gif b/org.eclipse.gmf.runtime.common.ui/icons/clear.gif
deleted file mode 100644
index 6bc10f9..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/clear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/hide.gif b/org.eclipse.gmf.runtime.common.ui/icons/hide.gif
deleted file mode 100644
index 495f249..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/hide.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/model_documentation.gif b/org.eclipse.gmf.runtime.common.ui/icons/model_documentation.gif
deleted file mode 100644
index 28ed693..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/model_documentation.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/output_view.gif b/org.eclipse.gmf.runtime.common.ui/icons/output_view.gif
deleted file mode 100644
index 675bb15..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/output_view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/show_all.gif b/org.eclipse.gmf.runtime.common.ui/icons/show_all.gif
deleted file mode 100644
index 4d44af6..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/show_all.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/icons/topic.gif b/org.eclipse.gmf.runtime.common.ui/icons/topic.gif
deleted file mode 100644
index d3a218c..0000000
--- a/org.eclipse.gmf.runtime.common.ui/icons/topic.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.common.ui/plugin.properties b/org.eclipse.gmf.runtime.common.ui/plugin.properties
deleted file mode 100644
index 41d011d..0000000
--- a/org.eclipse.gmf.runtime.common.ui/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 - Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = GMF Common UI
-Plugin.providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/pom.xml b/org.eclipse.gmf.runtime.common.ui/pom.xml
deleted file mode 100644
index df82511..0000000
--- a/org.eclipse.gmf.runtime.common.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.common.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.common.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionDelegate.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionDelegate.java
deleted file mode 100644
index 78d7e38..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionDelegate.java
+++ /dev/null
@@ -1,541 +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;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-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.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * The abstract parent of all concrete action delegates that execute commands.
- * Logging and exception handling are done in a uniform way in the
- * <code>run()</code> method. Concrete subclasses must provide a definition of
- * the <code>doRun()</code> method to gather any required input and execute a
- * command. As an implementer of the <code>IRepeatableAction</code> interface,
- * this class implements the <code>isRepeatable()</code> method to return
- * <code>true</code> if its plug-in action is enabled, and implements the
- * <code>repeat()</code> method to run the delegate's action. Subclasses that
- * aren't repeatable or require special repeat behavior must override the
- * default implementations of these interface methods.
- * <p>
- * This class provides definitions for the methods that are found in four of the
- * five action delegate interfaces in Eclipse. Hence, in most cases, adding a
- * new action delegate is simply a matter of subclassing this class and
- * declaring that the new class implements the desired action delegate
- * interface.
- * 
- * @author khussey
- * 
- * @see org.eclipse.ui.IActionDelegate
- * @see org.eclipse.ui.IEditorActionDelegate
- * @see org.eclipse.ui.IObjectActionDelegate
- * @see org.eclipse.ui.IViewActionDelegate
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate
- * @see org.eclipse.ui.IActionDelegate2
- */
-public abstract class AbstractActionDelegate implements IPartListener, IActionWithProgress {
-
-	/**
-	 * Flag to indicate whether or not this action has been set up.
-	 */
-	private boolean setup;
-	
-	/**
-	 * The action for which this is a delegate.
-	 */
-	private IAction action = null;
-
-	/**
-	 * The workbench part to which this action delegate applies.
-	 */
-	private IWorkbenchPart workbenchPart = null;
-
-	/**
-	 * The workbench window to which this action delegate applies.
-	 */
-	private IWorkbenchWindow workbenchWindow = null;
-
-	/**
-	 * Constructs a new action delegate.
-	 */
-	protected AbstractActionDelegate() {
-		super();
-		setSetup(false);
-	}
-
-	/**
-	 * Retrieves the value of the <code>action</code> instance variable.
-	 * 
-	 * @return The value of the <code>action</code> instance variable.
-	 */
-	protected final IAction getAction() {
-		return action;
-	}
-
-	/**
-	 * Sets the <code>action</code> instance variable to the specified value.
-	 * 
-	 * @param action The new value for the <code>action</code> instance
-	 *                variable.
-	 */
-	protected final void setAction(IAction action) {
-		this.action = action;
-	}
-
-	/**
-	 * Retrieves the value of the <code>workbenchPart</code> instance variable.
-	 * 
-	 * @return The value of the <code>workbenchPart</code> instance variable.
-	 */
-	protected final IWorkbenchPart getWorkbenchPart() {
-		return workbenchPart;
-	}
-
-	/**
-	 * Sets the <code>workbenchPart</code> instance variable to the specified
-	 * value.
-	 * 
-	 * @param workbenchPart The new value for the <code>workbenchPart</code> instance
-	 *                variable.
-	 */
-	protected final void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		this.workbenchPart = workbenchPart;
-	}
-
-	/**
-	 * Retrieves the value of the <code>workbenchWindow</code> instance
-	 * variable.
-	 * 
-	 * @return The value of the <code>workbenchWindow</code> instance variable.
-	 */
-	protected final IWorkbenchWindow getWorkbenchWindow() {
-		return workbenchWindow;
-	}
-
-	/**
-	 * Sets the <code>workbenchWindow</code> instance variable to the specified
-	 * value.
-	 * 
-	 * @param workbenchWindow The new value for the <code>workbenchWindow</code>
-	 *                instance variable.
-	 */
-	protected final void setWorkbenchWindow(IWorkbenchWindow workbenchWindow) {
-		this.workbenchWindow = workbenchWindow;
-	}
-
-	/**
-	 * Retrieves the action manager for this action delegate from its workbench
-	 * part.
-	 * 
-	 * @return The action manager for this action delegate.
-	 */
-	protected ActionManager getActionManager() {
-		IWorkbenchPart wbp = getWorkbenchPart();
-		if (wbp != null) {
-			ActionManager manager = (ActionManager)wbp.getAdapter(ActionManager.class);
-			if (manager != null) {
-				return manager;
-			}
-		}
-		return ActionManager.getDefault();
-	}
-    
-    /**
-     * Gets the operation history for this action delegate from its action
-     * manager.
-     * 
-     * @return the operation history
-     */
-    protected IOperationHistory getOperationHistory() {
-        return getActionManager().getOperationHistory();
-    }
-
-	/**
-	 * Retrieves the current selection.
-	 * 
-	 * @return The current selection.
-	 */
-	protected ISelection getSelection() {
-		ISelection selection = null;
-		IWorkbenchPart wbp = getWorkbenchPart();
-		if (wbp != null) {
-			IWorkbenchPartSite wbps = wbp.getSite();
-			if (wbps != null) {
-				ISelectionProvider selectionProvider = wbps.getSelectionProvider();
-				if (selectionProvider != null) {
-					selection = selectionProvider.getSelection();
-					if (selection != null)
-						return selection;
-				}
-			}
-		}
-		return StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * Retrieves the current structured selection.
-	 * 
-	 * @return The current structured selection.
-	 */
-	protected IStructuredSelection getStructuredSelection() {
-		IStructuredSelection selection = null;
-		IWorkbenchPart wbp = getWorkbenchPart();
-		if (wbp != null) {
-			ISelectionProvider selectionProvider = wbp.getSite().getSelectionProvider();
-			if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) {
-				selection = (IStructuredSelection)selectionProvider.getSelection();
-				if (selection != null)
-					return selection;
-			}
-		}
-		return StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * Performs this action. This method is called when the delegating action
-	 * has been triggered.
-	 *
-	 * @param act The action proxy that handles the presentation portion of
-	 *                the action.
-	 */
-	public void run(IAction act) {
-		getActionManager().run(this);
-	}
-
-	/**
-	 * Notifies this action delegate that the selection in the workbench has
-	 * changed.
-	 *
-	 * @param act The action proxy that handles presentation portion of the
-	 *                action.
-	 * @param selection The current selection, or <code>null</code> if there is
-	 *                   no selection.
-	 */
-	public void selectionChanged(IAction act, ISelection selection) {
-		setAction(act);
-	}
-
-	/**
-	 * Sets the active editor for this action delegate.
-	 *
-	 * @param action The action proxy that handles presentation portion of the
-	 *                action.
-	 * @param targetEditor The new editor target.
-	 */
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		setAction(action);
-		setWorkbenchPart(targetEditor);
-	}
-
-	/**
-	 * Sets the active part for this delegate. The active part is commonly used
-	 * to get a working context for the action, such as the shell for any dialog
-	 * which is needed.
-	 *
-	 * @param action The action proxy that handles presentation portion of the
-	 *                action.
-	 * @param targetPart The new part target.
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		setAction(action);
-		setWorkbenchPart(targetPart);
-	}
-
-	/**
-	 * Notifies this action delegate that the given part has been activated.
-	 *
-	 * @param part The part that was activated.
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		setWorkbenchPart(part);
-	}
-
-	/**
-	 * Notifies this action delegate that the given part has been brought to the
-	 * top.
-	 *
-	 * @param part The part that was surfaced.
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-		 /* not implemented */
-	}
-
-	/**
-	 * Notifies this action delegate that the given part has been closed.
-	 *
-	 * @param part The part that was closed.
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (getWorkbenchPart() == part) {
-			setWorkbenchPart(null);
-		}
-	}
-
-	/**
-	 * Notifies this action delegate that the given part has been deactivated.
-	 *
-	 * @param part The part that was deactivated.
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * Notifies this action delegate that the given part has been opened.
-	 *
-	 * @param part The part that was opened.
-	 */
-	public void partOpened(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * Initializes this action delegate with the view it will work in.
-	 *
-	 * @param view The view that provides the context for this delegate.
-	 */
-	public void init(IViewPart view) {
-		setWorkbenchPart(view);
-	}
-
-	/**
-	 * Disposes this action delegate.
-	 */
-	public void dispose() {
-		if (null != getWorkbenchWindow()) {
-			getWorkbenchWindow().getPartService().removePartListener(this);
-		}
-		setWorkbenchPart(null);
-		setWorkbenchWindow(null);
-		setAction(null);
-	}
-
-	/**
-	 * Initializes this action delegate with the workbench window it will work
-	 * in.
-	 *
-	 * @param window The window that provides the context for this delegate.
-	 */
-	public void init(IWorkbenchWindow window) {
-		setWorkbenchWindow(window);
-
-		if (null != window.getActivePage()) {
-			setWorkbenchPart(window.getActivePage().getActivePart());
-		}
-		window.getPartService().addPartListener(this);
-	}
-
-	/**
-	 * Retrieves the label for this action delegate.
-	 * 
-	 * @return The label for this action delegate.
-	 */
-	public String getLabel() {
-		return getAction().getText();
-	}
-
-	/**
-	 * Retrieves a Boolean indicating whether this action delegate can be run.
-	 * 
-	 * @return <code>true</code> if the action for this delegate is enabled;
-	 *          <code>false</code> otherwise.
-	 */
-	public boolean isRunnable() {
-		return getAction().isEnabled();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public void refresh() {
-		 /* method not implemented */
-	}
-
-	/**
-	 * Runs this action delegate.
-	 */
-	public void run(IProgressMonitor progressMonitor) {
-		if (isSetup() || !needsSetup()) {
-			try {
-				doRun(progressMonitor);
-			} catch (Exception e) {
-				handle(e);
-			}
-			setSetup(false);
-		} else {
-			throw new IllegalStateException("action must be setup before it is run"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Answers whether or not this action should be setup before it is run.
-	 * Subclasses should override if they provide vital behaviour in the setup method.
-	 * @return <code>true</code> if the action has a setup, <code>false</code>
-	 * 	  	   otherwise.
-	 */
-	protected boolean needsSetup() {
-		return false;
-	}
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception The exception to be handled.
-	 */
-	protected void handle(Exception exception) {
-		Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "handle", exception); //$NON-NLS-1$
-
-		IStatus status =
-			new Status(
-				IStatus.ERROR,
-				CommonUIPlugin.getPluginId(),
-				CommonUIStatusCodes.ACTION_FAILURE,
-				String.valueOf(exception.getMessage()),
-				exception);
-
-		Log.log(CommonUIPlugin.getDefault(), status);
-		openErrorDialog(status);
-	}
-
-	/**
-	 * Opens an error dialog for the specified status object.
-	 * 
-	 * @param status The status object for which to open an error dialog.
-	 * 
-	 */
-	protected void openErrorDialog(final IStatus status) {
-		
-        final Display display = DisplayUtils.getDisplay();
-
-        if (display.getThread() == Thread.currentThread()) {
-            // we're already on the UI thread
-            ErrorDialog.openError(display.getActiveShell(), Action
-                .removeMnemonics(getLabel()), null, status);
-
-        } else {
-            // we're not on the UI thread
-        	display.asyncExec(new Runnable() {
-                public void run() {
-                    ErrorDialog.openError(display.getActiveShell(),
-                        Action.removeMnemonics(getLabel()), null, status);
-                }
-            });
-        }
-    }
-
-	/**
-     * Performs the actual work when this action delegate is run. Subclasses
-     * must override this method to do some work.
-     * 
-     * @param progressMonitor
-     *            A progress monitor for tracking the progress of the action's
-     *            execution.
-     */
-	protected abstract void doRun(IProgressMonitor progressMonitor);
-
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress#getWorkIndicatorType()
-	 */
-	public WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.BUSY;
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IActionWithProgress#setup()
-	 */
-	public boolean setup() {
-		setSetup(true);
-		return true;
-	}
-	
-	/**
-	 * Returns the setup state of this action.
-	 *
-	 * @return <code>true</code> if the action has been setup, <code>false</code>
-	 *		   otherwise.
-	 */
-	public boolean isSetup() {
-		return setup;
-	}
-	
-	/**
-	 * Sets the setup state of this action.
-	 *
-	 * @param setup <code>true</code> if the action has been setup, <code>false</code>
-	 *		   otherwise.
-	 */
-	protected void setSetup(boolean setup) {
-		this.setup = setup;
-	}
-
-	/*
-	 * 
-	 * mgoyal: Fixing the memory leak caused in subclasses
-	 * that implement IEditorActionDelegate. This will provide 
-	 * the functionality to also implement IActionDelegate2 and get
-	 * notified of Lifecycle events.
-	 * 
-	 */
-
-	/**
-	 * Allows the action delegate to initialize itself after being created by
-	 * the proxy action. This lifecycle method is called after the
-	 * action delegate has been created and before any other method of the
-	 * action delegate is called.
-	 * 
-	 * @param anAction the proxy action that handles the presentation portion of
-	 * the action.
-	 */
-	public void init(IAction anAction) {
-		setAction(anAction);
-	}
-	
-	/**
-	 * Performs this action, passing the SWT event which triggered it. This
-	 * method is called by the proxy action when the action has been triggered.
-	 * Implement this method to do the actual work.
-	 * <p>
-	 * <b>Note:</b> This method is called instead of <code>run(IAction)</code>.
-	 * </p>
-	 *
-	 * @param anAction the action proxy that handles the presentation portion of
-	 * the action
-	 * @param event the SWT event which triggered this action being run
-	 */
-	public void runWithEvent(IAction anAction, Event event) {
-		run(anAction);
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionHandler.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionHandler.java
deleted file mode 100644
index d656a3c..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractActionHandler.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-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.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;
-import org.eclipse.gmf.runtime.common.ui.util.PartListenerAdapter;
-import org.eclipse.gmf.runtime.common.ui.util.StatusLineUtil;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.ErrorDialog;
-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.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * The abstract parent of all concrete action handlers that execute commands.
- * Logging and exception handling are done in a uniform way in the
- * <code>run()</code> method. Concrete subclasses must provide a definition of
- * the <code>doRun()</code> method to gather any required input and execute a
- * command. As an implementer of the <code>IRepeatableAction</code> interface,
- * this class implements the <code>isRepeatable()</code> method to return
- * <code>true</code> if it is enabled, and implements the
- * <code>repeat()</code> method to run itself. Subclasses that aren't
- * repeatable or require special repeat behavior must override the default
- * implementations of these interface methods.
- * 
- * This action handler supports life cycle methods by implementing the
- * <code>IDisposableAction</code> interface. Therefore, clients need to call
- * the <code>init()</code> method to initialize the action, and the
- * <code>dispose()</code> method when the action is no longer needed.
- * 
- * @author khussey
- */
-public abstract class AbstractActionHandler
-	extends Action
-	implements IDisposableAction, IActionWithProgress, ISelectionChangedListener,
-	IOperationHistoryListener, IPropertyListener {
-
-	/**
-	 * Flag to indicate whether or not this action has been set up.
-	 */
-	private boolean setup;
-
-	/**
-	 * My disposed state.
-	 */
-	private boolean disposed;
-
-	/**
-	 * The workbench part to which this action handler applies.
-	 */
-	private IWorkbenchPart workbenchPart;
-
-	/**
-	 * The workbench page this action is associated to
-	 */
-	private IWorkbenchPage workbenchPage;
-
-	/**
-	 * The part listener of this action
-	 */
-	private IPartListener partListener;
-	
-	/**
-	 * Selects workbench parts that match the part criteria with which I was
-	 * contributed. I will refresh myself when the selection changes on parts
-	 * that match this criteria, and when such parts are activated.
-	 */
-	private IPartSelector partSelector;
-
-	/**
-	 * Constructs a new action handler for the specified workbench part.
-	 * 
-	 * @param workbenchPart
-	 *            The workbench part to which this action handler applies.
-	 */
-	protected AbstractActionHandler(IWorkbenchPart workbenchPart) {
-		super();
-
-		assert null != workbenchPart : "null workbenchPart"; //$NON-NLS-1$
-
-		setWorkbenchPart(workbenchPart);
-
-		this.workbenchPage = workbenchPart.getSite().getPage();
-
-		// This is needed for backward compatibility in case the creator
-		// of the action (using this constructor) did not dispose of it
-		this.partListener = new PartListenerAdapter() {
-
-			/**
-			 * when the part closes, remove the listener to the workbench page
-			 * and remove all listeners.
-			 */
-			public void partClosed(IWorkbenchPart part) {
-				if (getWorkbenchPart() == part) {
-					dispose();
-				}
-			}
-		};
-		workbenchPage.addPartListener(partListener);
-	}
-
-	/**
-	 * Constructs a new action handler that gets its workbench part by listening
-	 * to the given workbench page
-	 * 
-	 * @param workbenchPage
-	 *            The workbench page associated with this action handler
-	 */
-	protected AbstractActionHandler(final IWorkbenchPage workbenchPage) {
-		super();
-
-		assert null != workbenchPage : "null workbenchPage"; //$NON-NLS-1$
-
-		this.workbenchPage = workbenchPage;
-
-		this.partListener = new PartListenerAdapter() {
-
-			/**
-			 * Listens to part activation and updates the active workbench
-			 */
-			public void partActivated(IWorkbenchPart part) {
-				setWorkbenchPart(part);
-				if (part != null && contributedToPart(part))
-					refresh();
-			}
-
-			/**
-			 * Listens to part deactivation and disables the action
-			 * Could be improved to only consider toolbar actions
-			 */
-			public void partDeactivated(IWorkbenchPart part) {
-				if (part != null && contributedToPart(part)) {
-					setEnabled(false);
-				}
-			}
-			
-		};
-		workbenchPage.addPartListener(partListener);
-	}
-
-	/**
-	 * The basic implementation sets the workbenchpart if not already set and
-	 * refreshes the action if the current part is not null.
-	 * <P>
-	 * Any subclass that overrided this method should ensure that the disposed
-	 * state of this action is maintained by calling
-	 * <code>setDisposed(false)</code> or calling <code>super.init()</code>.
-	 */
-	public void init() {
-
-		setDisposed(false);
-
-		if (getWorkbenchPart() == null)
-			setWorkbenchPart(getWorkbenchPage().getActivePart());
-		if (getWorkbenchPart() != null)
-			refresh();
-	}
-
-	/**
-	 * Default implementation of dispose. Any subclass that overrided this
-	 * method should ensure that the disposed state of this action is maintained
-	 * by calling <code>setDisposed(true)</code> or calling
-	 * <code>super.dispose()</code>.
-	 */
-	public void dispose() {
-		setWorkbenchPart(null);
-
-		if (partListener != null && workbenchPage != null) {
-			workbenchPage.removePartListener(partListener);
-			workbenchPage = null;
-			partListener = null;
-		}
-		setDisposed(true);
-	}
-
-	/**
-	 * Sets the current workbencgPart
-	 * 
-	 * @param workbenchPart
-	 *            The current workbenchPart
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		if (getWorkbenchPart() == workbenchPart)
-			return;
-
-		if (getWorkbenchPart() != null) {
-			if (isSelectionListener()) {
-				ISelectionProvider provider = getWorkbenchPart().getSite()
-					.getSelectionProvider();
-				if (provider != null) {
-					provider.removeSelectionChangedListener(this);
-				}
-			}
-			if (isPropertyListener()) {
-				getWorkbenchPart().removePropertyListener(this);
-			}
-			if (isOperationHistoryListener()) {
-                getOperationHistory().removeOperationHistoryListener(this);
-			}
-		}
-
-		this.workbenchPart = workbenchPart;
-
-		if (workbenchPart != null) {
-			
-			if (contributedToPart(workbenchPart)) {
-				
-				if (isSelectionListener()) {
-					ISelectionProvider provider = getWorkbenchPart().getSite()
-							.getSelectionProvider();
-					if (provider != null) {
-						provider.addSelectionChangedListener(this);
-					}
-				}
-				if (isPropertyListener()) {
-					getWorkbenchPart().addPropertyListener(this);
-				}
-				if (isOperationHistoryListener()) {
-					getOperationHistory().addOperationHistoryListener(this);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Answers whether or not I am contributed to <code>part</code>.
-	 * 
-	 * @param part
-	 *            the workbench part to be tested
-	 * @return <code>true</code> if I am contributed to this part,
-	 *         <code>false</code> otherwise.
-	 */
-	protected boolean contributedToPart(IWorkbenchPart part) {
-		return partSelector == null || partSelector.selects(part);
-	}
-	
-	/**
-	 * Sets my part selector. If my current workbench part doesn't match the
-	 * part selector, I stop listening to selection, property and operation
-	 * history changes on that part.
-	 * 
-	 * @param partSelector
-	 *            my new part selector
-	 */
-	public final void setPartSelector(IPartSelector partSelector) {
-		
-		if (this.partSelector == partSelector) {
-			return;
-		}
-		
-		this.partSelector = partSelector;
-		IWorkbenchPart part = getWorkbenchPart();
-		
-		if (part != null && !partSelector.selects(part)) {
-			if (isSelectionListener()) {
-				ISelectionProvider provider = getWorkbenchPart().getSite()
-					.getSelectionProvider();
-				if (provider != null) {
-					provider.removeSelectionChangedListener(this);
-				}
-			}
-			if (isPropertyListener()) {
-				getWorkbenchPart().removePropertyListener(this);
-			}
-			if (isOperationHistoryListener()) {
-                getOperationHistory().removeOperationHistoryListener(this);
-			}
-		}
-	}
-
-
-	/**
-	 * Retrieves the value of the <code>workbenchPart</code> instance
-	 * variable.
-	 * 
-	 * @return The value of the <code>workbenchPart</code> instance variable.
-	 */
-	protected final IWorkbenchPart getWorkbenchPart() {
-		return workbenchPart;
-	}
-
-	/**
-	 * Retrieves the action manager for this action handler from its workbench
-	 * part.
-	 * 
-	 * @return The action manager for this action handler.
-	 */
-	protected ActionManager getActionManager() {
-		ActionManager manager = null;
-		IWorkbenchPart wbPart = getWorkbenchPart();
-		if (wbPart != null) {
-			manager = (ActionManager) wbPart.getAdapter(
-				ActionManager.class);			
-		}
-		
-		return null == manager ? ActionManager.getDefault()
-			: manager;
-	}
-	
-    /**
-     * Returns the operation history for this action handler from its action
-     * manager.
-     * 
-     * @return the operation history
-     */
-    protected IOperationHistory getOperationHistory() {
-        return getActionManager().getOperationHistory();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		getActionManager().run(this);
-	}
-
-	/**
-	 * Runs this action handler.
-	 */
-	public void run(IProgressMonitor progressMonitor) {
-		if (isSetup() || !needsSetup()) {
-			try {
-				StatusLineUtil.outputErrorMessage(getWorkbenchPart(),
-					StringStatics.BLANK);
-				doRun(progressMonitor);
-			} catch (Exception e) {
-				handle(e);
-			}
-			setSetup(false);
-		} else {
-			throw new IllegalStateException(
-				"action must be setup before it is run"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Runs this action handler, passing the triggering SWT event.
-	 * 
-	 * @param event
-	 *            The SWT event which triggered this action being run.
-	 */
-	public void runWithEvent(Event event) {
-		getActionManager().run(this);
-	}
-
-	/**
-	 * Notifies this action handler that the selection has changed.
-	 * 
-	 * @param event
-	 *            Event object describing the change.
-	 */
-	public final void selectionChanged(SelectionChangedEvent event) {
-		refresh();
-	}
-
-	/**
-	 * Property change event handler; does nothing by default. Subclasses should
-	 * override if they are interested in handling property change events.
-	 */
-	public void propertyChanged(Object source, int propId) {
-		// Do nothing by default
-	}
-	
-	/**
-	 * Retrieves the label for this action handler.
-	 * 
-	 * @return The label for this action handler.
-	 */
-	public String getLabel() {
-		return getText();
-	}
-
-	/**
-	 * Retrieves the current selection.
-	 * 
-	 * @return The current selection.
-	 */
-	protected ISelection getSelection() {
-        ISelection selection = null;
-        ISelectionService selectionService = null;
-        if (getWorkbenchPart() != null && getWorkbenchPart().getSite().getWorkbenchWindow() != null) {
-            selectionService = getWorkbenchPart().getSite()
-                .getWorkbenchWindow().getSelectionService();
-        }
-
-        if (selectionService != null) {
-            selection = selectionService.getSelection();
-        }
-
-        return (selection != null) ? selection
-            : StructuredSelection.EMPTY;
-    }
-
-	/**
-	 * Retrieves the current structured selection.
-	 * 
-	 * @return The current structured selection.
-	 */
-	protected IStructuredSelection getStructuredSelection() {
-        ISelection selection = getSelection();
-        return (selection instanceof StructuredSelection) ? (StructuredSelection) selection
-            : StructuredSelection.EMPTY;
-    }
-
-	/**
-	 * Retrieves a Boolean indicating whether this action handler can be run.
-	 * 
-	 * @return <code>true</code> if this action handler is enabled;
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isRunnable() {
-		return isEnabled();
-	}
-
-	/**
-	 * Retrieves a Boolean indicating whether this action handler is interested
-	 * in selection events.
-	 * 
-	 * @return <code>true</code> if this action handler is interested;
-	 *         <code>false</code> otherwise.
-	 */
-	protected boolean isSelectionListener() {
-		return false;
-	}
-
-	/**
-	 * Answers whether of not this action handler is interested in property
-	 * change events.
-	 * <P>
-	 * This default implementation always returns <code>false</code>.
-	 * Subclasses must override if they are interested in property change
-	 * events.
-	 * 
-	 * @return <code>true</code> if this action handler is interested;
-	 *         <code>false</code> otherwise.
-	 */
-	protected boolean isPropertyListener() {
-		return false;
-	}
-	
-    /**
-     * Retrieves a Boolean indicating whether this action handler is interested
-     * in operation history changed events.
-     * 
-     * @return <code>true</code> if this action handler is interested;
-     *         <code>false</code> otherwise.
-     */
-    protected boolean isOperationHistoryListener() {
-        return false;
-    }
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception
-	 *            The exception to be handled.
-	 */
-	protected void handle(Exception exception) {
-		Trace.catching(CommonUIPlugin.getDefault(),
-			CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-			"handle", exception); //$NON-NLS-1$
-
-		IStatus status = new Status(IStatus.ERROR,
-			CommonUIPlugin.getPluginId(), CommonUIStatusCodes.ACTION_FAILURE,
-			String.valueOf(exception.getMessage()), exception);
-
-		Log.log(CommonUIPlugin.getDefault(), status);
-		openErrorDialog(status);
-	}
-
-	/**
-	 * Opens an error dialog for the specified status object.
-	 * 
-	 * @param status
-	 *            The status object for which to open an error dialog.
-	 *  
-	 */
-	protected void openErrorDialog(final IStatus status) {
-        
-        final Display display = DisplayUtils.getDisplay();
-
-        if (display.getThread() == Thread.currentThread()) {
-            // we're already on the UI thread
-            ErrorDialog.openError(display.getActiveShell(),
-                removeMnemonics(getLabel()), null, status);
-
-        } else {
-            // we're not on the UI thread
-        	display.asyncExec(new Runnable() {
-
-                public void run() {
-                    ErrorDialog.openError(display.getActiveShell(),
-                        removeMnemonics(getLabel()), null, status);
-                }
-            });
-        }
-    }
-
-	/**
-	 * Performs the actual work when this action handler is run. Subclasses must
-	 * override this method to do some work.
-	 * 
-	 * @param progressMonitor
-	 *            the progress monitor for tracking the progress of this action
-	 *            when it is run.
-	 */
-	protected abstract void doRun(IProgressMonitor progressMonitor);
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#getWorkIndicatorType()
-	 */
-	public WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.BUSY;
-	}
-
-	/**
-	 * Returns the part listener
-	 * 
-	 * @return The part listener
-	 */
-	protected IPartListener getPartListener() {
-		return partListener;
-	}
-
-	/**
-	 * Returns the workbench page
-	 * 
-	 * @return The workbench page
-	 */
-	protected IWorkbenchPage getWorkbenchPage() {
-		return workbenchPage;
-	}
-    
-    /**
-	 * Refreshes me if the history event has my workbench part's context, and
-	 * the event is one of:
-	 * <UL>
-	 * <LI>{@link OperationHistoryEvent#UNDONE}</LI>
-	 * <LI>{@link OperationHistoryEvent#REDONE}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_ADDED}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_CHANGED}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_NOT_OK}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_REMOVED}</LI>
-	 * </UL>
-	 * The other operation history events are ignored because they are
-	 * intermediate events that will be followed by one of those listed above.
-	 * We only want to refresh the action handler once for each change to the
-	 * operation history.
-	 */
-    public void historyNotification(OperationHistoryEvent event) {
-
-    	int type = event.getEventType();
-    	if (type == OperationHistoryEvent.UNDONE
-				|| type == OperationHistoryEvent.REDONE
-				|| type == OperationHistoryEvent.DONE
-				|| type == OperationHistoryEvent.OPERATION_ADDED
-				|| type == OperationHistoryEvent.OPERATION_CHANGED
-				|| type == OperationHistoryEvent.OPERATION_NOT_OK
-				|| type == OperationHistoryEvent.OPERATION_REMOVED) {
-        
-    		IUndoableOperation operation = event.getOperation();
-        
-	        if (operation != null) {
-	            IUndoContext partContext = getUndoContext();
-	
-	            if (partContext != null && operation.hasContext(partContext)) {
-	                refresh();
-	            }
-	        }
-    	}
-    }
-    
-    /**
-     * Gets the undo context from my workbench part.
-     * 
-     * @return the undo context
-     */
-    protected IUndoContext getUndoContext() {
-        IWorkbenchPart part = getWorkbenchPart();
-
-        if (part != null) {
-            return (IUndoContext) part.getAdapter(IUndoContext.class);
-        }
-
-        return null;
-    }
-
-	/*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#isDisposed()
-     */
-	public boolean isDisposed() {
-		return disposed;
-	}
-
-	/**
-	 * Sets my disposed state.
-	 * 
-	 * @param b
-	 *            <code>true</code> if I am disposed, <code>false</code>
-	 *            otherwise.
-	 */
-	protected void setDisposed(boolean b) {
-		disposed = b;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#setup()
-	 */
-	public boolean setup() {
-		setSetup(true);
-		return true;
-	}
-
-	/**
-	 * Returns the setup state of this action.
-	 * 
-	 * @return <code>true</code> if the action has been setup,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isSetup() {
-		return setup;
-	}
-
-	/**
-	 * Sets the setup state of this action.
-	 * 
-	 * @param setup
-	 *            <code>true</code> if the action has been setup,
-	 *            <code>false</code> otherwise.
-	 */
-	protected void setSetup(boolean setup) {
-		this.setup = setup;
-	}
-
-	/**
-	 * Answers whether or not this action should be setup before it is run.
-	 * Subclasses should override if they provide vital behaviour in the setup
-	 * method.
-	 * 
-	 * @return <code>true</code> if the action has a setup, <code>false</code>
-	 *         otherwise.
-	 */
-	protected boolean needsSetup() {
-		return false;
-	}
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractContributionItem.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractContributionItem.java
deleted file mode 100644
index 971b38d..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/AbstractContributionItem.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-import org.eclipse.core.commands.ExecutionException;
-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.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.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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.util.PartListenerAdapter;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.dialogs.ErrorDialog;
-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.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-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.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A custom contribution item that goes into a workbenchpart's toolbar
- * 
- * @author melaasar
- */
-public abstract class AbstractContributionItem
-	extends ContributionItem
-	implements ISelectionChangedListener, IOperationHistoryListener,
-	IActionWithProgress {
-
-	/**
-	 * Flag to indicate whether or not this action has been set up.
-	 */
-	private boolean setup;
-
-	// the part service
-	private IWorkbenchPage workbenchPage;
-
-	// the part listener
-	private IPartListener partListener;
-
-	// the current workbenchpart
-	private IWorkbenchPart workbenchPart;
-
-	// the item listener
-	private Listener itemListener;
-
-	// the item widget
-	private Item item;
-
-	// the control in case of a widget with a SWT.SEPARATOR style
-	private Control control;
-
-	// the control text
-	private String label;
-
-	// the enablement state of the item
-	private boolean enabled = true;
-
-	/**
-	 * Creates a new WorkbenchPartContributionItem
-	 * 
-	 * @param workbenchPage
-	 *            The workbench Page
-	 */
-	public AbstractContributionItem(IWorkbenchPage workbenchPage) {
-		this(workbenchPage, null);
-	}
-
-	/**
-	 * Creates a new WorkbenchPartContributionItem
-	 * 
-	 * @param workbenchPage
-	 *            The workbench Page
-	 * @param id
-	 *            The id of the contribution item
-	 */
-	public AbstractContributionItem(IWorkbenchPage workbenchPage, String id) {
-		super(id);
-		assert null != workbenchPage : "workbenchPage is null"; //$NON-NLS-1$
-		
-		this.workbenchPage = workbenchPage;
-		partListener = new PartListenerAdapter() {
-
-			public void partActivated(IWorkbenchPart part) {
-				setWorkbenchPart(part);
-				update();
-			}
-		};
-		itemListener = new Listener() {
-
-			public void handleEvent(Event event) {
-				AbstractContributionItem.this.handleWidgetEvent(event);
-			}
-		};
-	}
-
-	/**
-	 * <code>init</code> is used to initialize the common part of filling this
-	 * item in a contribution manager. The <code>dispose</code> method is
-	 * later called to clean up what has been initialized in the
-	 * <code>fill</code> and <code>init</code> methods
-	 */
-	protected void init() {
-		if (getWorkbenchPart() == null)
-			setWorkbenchPart(workbenchPage.getActivePart());
-		workbenchPage.addPartListener(partListener);
-	}
-
-	/**
-	 * Dispose should only clean up what was done in the <code>fill</code>
-	 * methods It is not meant to clean up what was done in constructors
-	 */
-	public void dispose() {
-		workbenchPage.removePartListener(partListener);
-		setWorkbenchPart(null);
-		item = null;
-		control = null;
-		super.dispose();
-	}
-
-	/**
-	 * Gets the current workbench part.
-	 * 
-	 * @return The current workbench part.
-	 */
-	protected IWorkbenchPart getWorkbenchPart() {
-		return workbenchPart;
-	}
-    
-    /**
-     * Gets the undo context from my workbench part.
-     * 
-     * @return the undo context
-     */
-    protected IUndoContext getUndoContext() {
-        IWorkbenchPart part = getWorkbenchPart();
-
-        if (part != null) {
-            return (IUndoContext) part.getAdapter(IUndoContext.class);
-        }
-
-        return null;
-    }
-
-	/**
-     * Gets the item control
-     * 
-     * @return The item control
-     */
-	protected Control getControl() {
-		return control;
-	}
-
-	/**
-	 * Gets the item widget
-	 * 
-	 * @return The item widget
-	 */
-	protected Item getItem() {
-		return item;
-	}
-
-	/**
-	 * Gets the tool item widget
-	 * 
-	 * @return The tool item widget
-	 */
-	protected ToolItem getToolItem() {
-		return item instanceof ToolItem ? (ToolItem) item
-			: null;
-	}
-
-	/**
-	 * Gets the tool item widget
-	 * 
-	 * @return The tool item widget
-	 */
-	protected MenuItem getMenuItem() {
-		return item instanceof MenuItem ? (MenuItem) item
-			: null;
-	}
-
-	/**
-	 * Gets the control tooltip text
-	 * 
-	 * @return The control tooltip text
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * @param item
-	 *            widget
-	 */
-	public void setItem(Item item) {
-		this.item = item;
-	}
-
-	/**
-	 * Sets the control label
-	 * 
-	 * @param label
-	 *            The control label
-	 */
-	protected void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * Sets the current workbench part
-	 * 
-	 * @param workbenchPart
-	 *            The current workbench part
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		if (getWorkbenchPart() != null) {
-			if (isSelectionListener()) {
-				ISelectionProvider provider = getWorkbenchPart().getSite()
-					.getSelectionProvider();
-				if (provider != null) {
-					provider.removeSelectionChangedListener(this);
-				}
-			}
-			if (isOperationHistoryListener()) {
-                getOperationHistory().removeOperationHistoryListener(this);
-			}
-		}
-
-		this.workbenchPart = workbenchPart;
-
-		if (workbenchPart != null) {
-			if (isSelectionListener()) {
-				ISelectionProvider provider = getWorkbenchPart().getSite()
-					.getSelectionProvider();
-				if (provider != null) {
-					provider.addSelectionChangedListener(this);
-				}
-			}
-			if (isOperationHistoryListener()) {
-                getOperationHistory().addOperationHistoryListener(this);
-			}
-		}
-	}
-
-	/**
-	 * The control item implementation of this <code>IContributionItem</code>
-	 * method calls the <code>createControl</code> framework method.
-	 * Subclasses must implement <code>createControl</code> rather than
-	 * overriding this method.
-	 * 
-	 * @param parent
-	 *            The parent of the control to fill
-	 */
-	public final void fill(Composite parent) {
-		init();
-		control = createControl(parent);
-		if (control != null) {
-			update();
-		}
-		assert null != control : "The contribution item cannot fill in composites"; //$NON-NLS-1$
-	}
-
-	/**
-	 * The control item implementation of this <code>IContributionItem</code>
-	 * method throws an exception since controls cannot be added to menus.
-	 * 
-	 * @param parent
-	 *            The menu
-	 * @param index
-	 *            Menu index
-	 */
-	public final void fill(Menu parent, int index) {
-		init();
-		MenuItem menuItem = createMenuItem(parent, index);
-		if (menuItem != null) {
-			menuItem.setData(this);
-			menuItem.setText(getLabel());
-			menuItem.addListener(SWT.Dispose, getItemListener());
-			setItem(menuItem);
-			update();
-		}
-		assert null != menuItem : "The contribution item cannot fill in menus"; //$NON-NLS-1$
-	}
-
-	/**
-	 * The control item implementation of this <code>IContributionItem</code>
-	 * method calls the <code>createControl</code> framework method to create
-	 * a control under the given parent, and then creates a new tool item to
-	 * hold it. Subclasses must implement <code>createControl</code> rather
-	 * than overriding this method.
-	 * 
-	 * @param parent
-	 *            The ToolBar to add the new control to
-	 * @param index
-	 *            Index
-	 */
-	public final void fill(ToolBar parent, int index) {
-		init();
-		ToolItem toolItem = createToolItem(parent, index);
-		if (toolItem != null) {
-			toolItem.setData(this);
-			toolItem.setToolTipText(getLabel());
-			toolItem.addListener(SWT.Dispose, getItemListener());
-			setItem(toolItem);
-			update();
-		}
-		assert null != toolItem : "The contribution item cannot fill in toolbars"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates the <code>ToolItem</code> with the given parent and index.
-	 * 
-	 * @param parent
-	 *            The ToolBar to add the new control to
-	 * @param index
-	 *            Index
-	 * @return <code>ToolItem</code> for specified <code>ToolBar</code> at specifiec index
-	 */
-	protected ToolItem createToolItem(ToolBar parent, int index) {
-		control = createControl(parent);
-		if (control != null) {
-			ToolItem anItem = new ToolItem(parent, SWT.SEPARATOR, index);
-			anItem.setControl(control);
-			anItem.setWidth(computeWidth(control));
-			return anItem;
-		}
-		return null;
-	}
-
-	/**
-	 * Creates the menuitem with the given parent and index.
-	 * 
-	 * @param parent
-	 *            The Menu to add the new control to
-	 * @param index
-	 *            Index
-	 * @return created <code>MenuItem</code> 
-	 */
-	protected MenuItem createMenuItem(Menu parent, int index) {
-		return null;
-	}
-
-	/**
-	 * Creates the control of this contributor - override only if a custom control
-	 * is needed.
-	 * 
-	 * @param parent the parent <code>Composite</code>
-	 * @return control for the specified parent <code>Composite</code>
-	 */
-	protected Control createControl(Composite parent) {
-		return null;
-	}
-
-	/**
-	 * Method is being called when there control created by subclasses is not
-	 * null.
-	 * 
-	 * Computes the width of the given control which is being added to a tool
-	 * bar. This is needed to determine the width of the tool bar item
-	 * containing the given control.
-	 * 
-	 * @param cont
-	 *            the control being added
-	 * @return the width of the control
-	 */
-	protected int computeWidth(Control cont) {
-		return cont.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x;
-	}
-
-	/**
-	 * updates the properties of this contribution item Subclasses should call
-	 * this method when an update is requested
-	 * 
-	 * This method is not intended to be overriden. Instead override the
-	 * <code>refresh()</code> method
-	 */
-	public final void update() {
-		if (getWorkbenchPart() == null)
-			setWorkbenchPart(workbenchPage.getActivePart());
-		if (getWorkbenchPart() != null) {
-			refresh();
-		}
-	}
-
-	/**
-	 * refreshed the properties of this contribution item This method should not
-	 * be called directly, instead <code>update</code> method should be
-	 * called.
-	 * 
-	 * Subclasses could override this method to add to the refresh and at the
-	 * end call <code>super.refresh()</code>
-	 */
-	public void refresh() {
-		setEnabled(calculateEnabled());
-		if (getControl() != null || getItem() != null)
-			refreshItem();
-	}
-
-	/**
-	 * Refreshes the item's GUI
-	 */
-	protected void refreshItem() {
-		if (getControl() != null)
-			getControl().setEnabled(isEnabled());
-		else if (getToolItem() != null)
-			getToolItem().setEnabled(isEnabled());
-		else if (getMenuItem() != null)
-			getMenuItem().setEnabled(isEnabled());
-	}
-
-	/**
-	 * Calculates enablement of the widget. Subclasses must implement. The
-	 * enablement will used every time the widget is refreshed. It is a
-	 * resposcibility of the subclasses to call refresh() when it is
-	 * appropriate.
-	 * 
-	 * @return boolean
-	 */
-	protected abstract boolean calculateEnabled();
-
-	/**
-	 * Method setEnabled.
-	 * 
-	 * @param enabled
-	 */
-	protected void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IContributionItem#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	/**
-	 * Executes the given <code>ommand</code>.
-	 * 
-	 * @param command <code>ICommand</code> to be executed
-	 */
-	protected void execute(ICommand command) {
-		if (command == null || !command.canExecute())
-			return;
-
-        command.addContext(getUndoContext());
-        
-        try {
-            getOperationHistory().execute(command, new NullProgressMonitor(), null);
-        
-        } catch (ExecutionException e) {
-            Trace.catching(CommonUIPlugin.getDefault(),
-                CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "execute", e); //$NON-NLS-1$
-
-            Log.error(CommonUIPlugin.getDefault(),
-                CommonUIStatusCodes.ACTION_FAILURE, e.getLocalizedMessage(), e);
-        }
-		return;
-	}
-
-	/**
-	 * Retrieves the action manager for this action delegate from its workbench
-	 * part.
-	 * 
-	 * @return The action manager for this action delegate.
-	 */
-	protected ActionManager getActionManager() {
-		ActionManager manager = (ActionManager) getWorkbenchPart().getAdapter(
-			ActionManager.class);
-
-		return null == manager ? ActionManager.getDefault()
-			: manager;
-	}
-	
-    /**
-     * Returns the operation history for this contribution item from its action
-     * manager.
-     * 
-     * @return the operation history
-     */
-    protected IOperationHistory getOperationHistory() {
-        return getActionManager().getOperationHistory();
-    }
-
-	/**
-	 * A generalized convinience method. Should be called by subclasses whenever
-	 * run() must be ivoked (e.g. whenever a button is pushed)
-	 * 
-	 * @param event
-	 *            an optional associated SWT event
-	 */
-	protected void runWithEvent(Event event) {
-		getActionManager().run(this);
-	}
-
-	/**
-	 * Performs the actual work when this action handler is run. Subclasses must
-	 * override this method to do some work.
-	 * 
-	 * @param progressMonitor
-	 *            the progress monitor for tracking the progress of this action
-	 *            when it is run.
-	 */
-	protected abstract void doRun(IProgressMonitor progressMonitor);
-
-	/**
-	 * Handles the specified exception.
-	 * 
-	 * @param exception
-	 *            The exception to be handled.
-	 */
-	protected void handle(Exception exception) {
-		Trace.catching(CommonUIPlugin.getDefault(),
-			CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-			"handle", exception); //$NON-NLS-1$
-
-		IStatus status = new Status(IStatus.ERROR,
-			CommonUIPlugin.getPluginId(), CommonUIStatusCodes.ACTION_FAILURE,
-			String.valueOf(exception.getMessage()), exception);
-
-		Log.log(CommonUIPlugin.getDefault(), status);
-		openErrorDialog(status);
-	}
-
-	/**
-	 * Opens an error dialog for the specified status object.
-	 * 
-	 * @param status
-	 *            The status object for which to open an error dialog.
-	 *  
-	 */
-	protected void openErrorDialog(IStatus status) {
-		ErrorDialog.openError(getWorkbenchPart().getSite().getShell(),
-			getLabel(), null, status);
-	}
-
-	/**
-	 * Handles an event from the widget (forwarded from nested listener).
-	 * 
-	 * @param e <code>Event</code> to be handled by this method
-	 */
-	protected void handleWidgetEvent(Event e) {
-		switch (e.type) {
-			case SWT.Dispose:
-				handleWidgetDispose(e);
-				break;
-		}
-	}
-
-	/**
-	 * Handles a widget dispose event for the widget corresponding to this item.
-	 * 
-	 * @param e widget dispose <code>Event</code>
-	 */
-	protected void handleWidgetDispose(Event e) {
-		dispose();
-	}
-
-	/**
-	 * Retrieves a Boolean indicating whether this action handler is interested
-	 * in selection events.
-	 * 
-	 * @return <code>true</code> if this action handler is interested;
-	 *         <code>false</code> otherwise.
-	 */
-	protected boolean isSelectionListener() {
-		return false;
-	}
-    
-    /**
-     * Retrieves a Boolean indicating whether this contribution item is interested
-     * in operation history changed events.
-     * 
-     * @return <code>true</code> if this action handler is interested;
-     *         <code>false</code> otherwise.
-     */
-    protected boolean isOperationHistoryListener() {
-        return false;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public final void selectionChanged(SelectionChangedEvent event) {
-		update();
-	}
-    
-    /**
-     * Refreshes me if the history event has my workbench part's context, and
-	 * the event is one of:
-	 * <UL>
-	 * <LI>{@link OperationHistoryEvent#UNDONE}</LI>
-	 * <LI>{@link OperationHistoryEvent#REDONE}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_ADDED}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_CHANGED}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_NOT_OK}</LI>
-	 * <LI>{@link OperationHistoryEvent#OPERATION_REMOVED}</LI>
-	 * </UL>
-	 * The other operation history events are ignored because they are
-	 * intermediate events that will be followed by one of those listed above.
-	 * We only want to refresh the action handler once for each change to the
-	 * operation history.
-     */
-    public void historyNotification(OperationHistoryEvent event) {
-
-    	int type = event.getEventType();
-    	if (type == OperationHistoryEvent.UNDONE
-				|| type == OperationHistoryEvent.REDONE
-				|| type == OperationHistoryEvent.DONE
-				|| type == OperationHistoryEvent.OPERATION_ADDED
-				|| type == OperationHistoryEvent.OPERATION_CHANGED
-				|| type == OperationHistoryEvent.OPERATION_NOT_OK
-				|| type == OperationHistoryEvent.OPERATION_REMOVED) {
-    		
-	        IUndoableOperation operation = event.getOperation();
-	
-	        if (operation != null) {
-	            IUndoContext partContext = getUndoContext();
-	
-	            if (partContext != null && operation.hasContext(partContext)
-	            		&& PlatformUI.isWorkbenchRunning()) {
-	                PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-	
-	                    public void run() {
-	                        update();
-	                    }
-	                });
-	            }
-	        }
-    	}
-    }
-
-	/**
-     * Retrieves the current selection.
-     * 
-     * @return The current selection.
-     */
-	protected ISelection getSelection() {
-		ISelection selection = null;
-		ISelectionProvider selectionProvider = getWorkbenchPart().getSite()
-			.getSelectionProvider();
-
-		if (selectionProvider != null) {
-			selection = selectionProvider.getSelection();
-		}
-
-		return (selection != null) ? selection
-			: StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * Retrieves the current structured selection.
-	 * 
-	 * @return <code>IStructuredSelection</code> for current selection
-	 */
-	protected IStructuredSelection getStructuredSelection() {
-		IStructuredSelection selection = null;
-		ISelectionProvider selectionProvider = getWorkbenchPart().getSite()
-			.getSelectionProvider();
-
-		if (selectionProvider != null
-			&& selectionProvider.getSelection() instanceof IStructuredSelection) {
-			selection = (IStructuredSelection) selectionProvider.getSelection();
-		}
-		return (selection != null) ? selection
-			: StructuredSelection.EMPTY;
-	}
-
-	/**
-	 * Returns the item listenr
-	 * 
-	 * @return The item listener
-	 */
-	protected Listener getItemListener() {
-		return itemListener;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#getWorkIndicatorType()
-	 */
-	public WorkIndicatorType getWorkIndicatorType() {
-		return WorkIndicatorType.BUSY;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#isRunnable()
-	 */
-	public boolean isRunnable() {
-		return isEnabled();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(IProgressMonitor progressMonitor) {
-		if (isSetup() || !needsSetup()) {
-			try {
-				doRun(progressMonitor);
-			} catch (Exception e) {
-				handle(e);
-			}
-			setSetup(false);
-		} else {
-			throw new IllegalStateException(
-				"action must be setup before it is run"); //$NON-NLS-1$
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#setup()
-	 */
-	public boolean setup() {
-		setSetup(true);
-		return true;
-	}
-
-	/**
-	 * Returns the setup state of this action.
-	 * 
-	 * @return <code>true</code> if the action has been setup,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isSetup() {
-		return setup;
-	}
-
-	/**
-	 * Sets the setup state of this action.
-	 * 
-	 * @param setup
-	 *            <code>true</code> if the action has been setup,
-	 *            <code>false</code> otherwise.
-	 */
-	protected void setSetup(boolean setup) {
-		this.setup = setup;
-	}
-
-	/**
-	 * Answers whether or not this action should be setup before it is run.
-	 * Subclasses should override if they provide vital behaviour in the setup
-	 * method.
-	 * 
-	 * @return <code>true</code> if the action has a setup, <code>false</code>
-	 *         otherwise.
-	 */
-	protected boolean needsSetup() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManager.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManager.java
deleted file mode 100644
index 5448da5..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManager.java
+++ /dev/null
@@ -1,299 +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;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/**
- * Responsible for managing the running of actions. All
- * actions (delegates and handlers) channel their run requests through an action
- * manager. An action manager keeps track of the action that was last run and
- * fires events to interested listeners whenever an action is run.
- * 
- * @author khussey
- */
-public class ActionManager {
-
-	/**
-	 * The empty string.
-	 */
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	/**
-	 * A string containing only a space character.
-	 */
-	protected static final String SPACE = " "; //$NON-NLS-1$
-
-	/**
-	 * The default action manager.
-	 */
-	private static ActionManager actionManager = null;
-    
-    private final IOperationHistory operationHistory;
-
-	/**
-	 * The last action that was run.
-	 */
-	private IActionWithProgress action = null;
-
-	/**
-	 * The action manager change listeners.
-	 */
-	private final List listeners =
-		Collections.synchronizedList(new ArrayList());
-    
-    /**
-     * Intializes me with an operation history.
-     * 
-     * @param operationHistory The operation history for this action manager.
-     */
-    public ActionManager(IOperationHistory operationHistory) {
-        super();
-
-        assert null != operationHistory;
-        this.operationHistory = operationHistory;
-    }
-
-	/**
-	 * Retrieves the default action manager.
-	 * 
-	 * @return The default action manager.
-	 */
-	public static ActionManager getDefault() {
-		if (null == actionManager) {
-			actionManager = new ActionManager(OperationHistoryFactory.getOperationHistory());
-		}
-
-		return actionManager;
-	}
-    
-    /**
-     * Gets my operation history.
-     * 
-     * @return my operation history
-     */
-    public final IOperationHistory getOperationHistory() {
-        return operationHistory;
-    }
-	
-	/**
-	 * Retrieves the value of the <code>action</code> instance variable.
-	 * 
-	 * @return The value of the <code>action</code> instance variable.
-	 */
-	protected final IActionWithProgress getAction() {
-		return action;
-	}
-
-	/**
-	 * Sets the <code>action</code> instance variable to the specified value.
-	 * 
-	 * @param action The new value for the <code>action</code> instance
-	 *                variable.
-	 */
-	protected final void setAction(IActionWithProgress action) {
-		this.action = action;
-	}
-
-	/**
-	 * Retrieves the value of the <code>listeners</code> instance variable.
-	 * 
-	 * @return The value of the <code>listeners</code> instance varible.
-	 */
-	protected final List getListeners() {
-		return listeners;
-	}
-
-	/**
-	 * Adds the specified listener to the list of action manager change
-	 * listeners for this action manager.
-	 * 
-	 * @param listener The listener to be added.
-	 */
-	public void addActionManagerChangeListener(IActionManagerChangeListener listener) {
-		assert null != listener;
-
-		getListeners().add(listener);
-	}
-
-	/**
-	 * Removes the specified listener from the list of action manager change
-	 * listeners for this action manager.
-	 * 
-	 * @param listener The listener to be removed.
-	 */
-	public void removeActionManagerChangeListener(IActionManagerChangeListener listener) {
-		assert null != listener;
-
-		getListeners().remove(listener);
-	}
-
-	/**
-	 * Notifies the listeners for this action manager that the specified
-	 * event has occurred.
-	 * 
-	 * @param event The action manager change event to be fired.
-	 */
-	protected void fireActionManagerChange(ActionManagerChangeEvent event) {
-		assert null != event;
-
-		List targets = null;
-		synchronized (getListeners()) {
-			targets = new ArrayList(getListeners());
-		}
-
-		for (Iterator i = targets.iterator(); i.hasNext();) {
-			((IActionManagerChangeListener) i.next()).actionManagerChanged(
-				event);
-		}
-	}
-
-	/**
-	 * Clears this action manager by discarding the last action that was run.
-	 */
-	public void clear() {
-		setAction(null);
-
-		fireActionManagerChange(new ActionManagerChangeEvent(this));
-	}
-
-	/**
-	 * Runs the specified action.
-	 * 
-	 * @param theAction The action to be run.
-	 * @exception UnsupportedOperationException If the action cannot be run.
-	 * @exception RuntimeException if any exception or error occurs 
-	 * 									   while running the action
-	 */
-	public void run(final IActionWithProgress theAction) {
-		if (!theAction.isRunnable()) {
-			UnsupportedOperationException uoe =
-				new UnsupportedOperationException();
-			Trace.throwing(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_THROWING, getClass(), "run", uoe); //$NON-NLS-1$
-			throw uoe;
-		}
-		
-		boolean setup = theAction.setup();
-		if (!setup) {
-			// The setup did not occur (e.g. the user cancelled
-			// a dialog presented in the setup). Do not proceed.
-			return;
-		}
-
-		IActionWithProgress.WorkIndicatorType type =
-			theAction.getWorkIndicatorType();
-
-		if (type == IActionWithProgress.WorkIndicatorType.PROGRESS_MONITOR) {
-			runActionInProgressMonitorDialog(theAction, false);
-
-		} else if (
-			type
-				== IActionWithProgress
-					.WorkIndicatorType
-					.CANCELABLE_PROGRESS_MONITOR) {
-			runActionInProgressMonitorDialog(theAction, true);
-
-		} else if (type == IActionWithProgress.WorkIndicatorType.BUSY) {
-			// display hourglass cursor
-			BusyIndicator.showWhile(null, new Runnable() {
-				public void run() {
-					theAction.run(new NullProgressMonitor());
-				}
-			});
-		} else {
-			theAction.run(new NullProgressMonitor());
-		}
-
-		setAction(theAction);
-
-		fireActionManagerChange(new ActionManagerChangeEvent(this, theAction));
-		Trace.trace(CommonUIPlugin.getDefault(), CommonUIDebugOptions.ACTIONS_RUN, "Action '" + String.valueOf(getAction()) + "' run."); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "run", ite); //$NON-NLS-1$
-			Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "run", ite); //$NON-NLS-1$
-
-			RuntimeException cre =
-				new RuntimeException(ite.getTargetException());
-
-			Trace.throwing(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_THROWING, getClass(), "run", cre); //$NON-NLS-1$
-			throw cre;
-
-		} catch (InterruptedException ie) {
-			Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "run", ie); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Runs <code>action</code> in the context of a progress monitor dialog.
-	 * The action 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 act the action to repeat
-	 * @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 runActionInProgressMonitorDialog(
-		final IActionWithProgress act,
-		boolean cancelable) {
-
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				act.run(monitor);
-			}
-		};
-		runInProgressMonitorDialog(runnable, cancelable);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManagerChangeEvent.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManagerChangeEvent.java
deleted file mode 100644
index e5eb54e..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionManagerChangeEvent.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.runtime.common.ui.action;
-
-import java.util.EventObject;
-
-/**
- * Represent an event that is fired when an action manager changes. Instances of
- * this class have an associated action manager (the source of the event) and
- * action (the action that was run).
- * 
- * @author khussey
- * 
- * @see org.eclipse.gmf.runtime.common.ui.action.IActionManagerChangeListener
- */
-public class ActionManagerChangeEvent extends EventObject {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * The action that was run.
-     */
-    private final IActionWithProgress action;
-
-    /**
-     * Constructs a new action manager change event for the specified action
-     * manager.
-     * 
-     * @param source The action manager that changed.
-     */
-    public ActionManagerChangeEvent(ActionManager source) {
-        this(source, null);
-    }
-
-    /**
-     * Constructs a new action manager change event for the specified action
-     * manager and action.
-     * 
-     * @param source The action manager that changed.
-     * @param action The action that has been run.
-     */
-    public ActionManagerChangeEvent(
-        ActionManager source,
-        IActionWithProgress action) {
-
-        super(source);
-
-        this.action = action;
-    }
-
-    /**
-     * Retrieves the value of the <code>action</code> instance variable.
-     * 
-     * @return The value of the <code>action</code> instance variable.
-     */
-    public IActionWithProgress getAction() {
-        return action;
-    }
-
-    /**
-     * Sets the <code>source</code> instance variable to the specified value.
-     * 
-     * @param source The new value for the <code>source</code> instance
-     *                variable.
-     */
-    protected void setSource(ActionManager source) {
-        assert null != source;
-
-        this.source = source;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionMenuManager.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionMenuManager.java
deleted file mode 100644
index 8a026db..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/ActionMenuManager.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.jface.action.AbstractGroupMarker;
-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.IMenuCreator;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-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.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.actions.LabelRetargetAction;
-
-/**
- * An implementation of an <code>IMenuManager</code> that inherits its
- * UI (text + icon + hints) from a given action. 
- * 
- * When filled in a toolbar, the menu is rendered as a tool item
- * with two parts: a button, whose icon comes from the supplied
- * action handler, and a drop-down menu arrow.
- * When the arrow is pressed, the drop-down menu is shown. When the
- * button is pressed, the associated action is executed. The manager can have
- * an optional style to retarget the last executed action. In this
- * case the tool item UI reflects the last executed sub-action from the menu.
- * 
- * When filled in a menu, this menu shows up as a normal cascading menu with 
- * its GUI inherited from the supplied action.
- *  
- * @author melaasar
- */
-public class ActionMenuManager extends MenuManager {
-
-    /**
-     * An action that provides a menu and fills it from the contribution
-     * items of the enclosing menu manager. It also retargets to the
-     * manager's supplied action handler.
-     */
-    public class MenuCreatorAction
-        extends LabelRetargetAction
-        implements IMenuCreator {
-        // the menu widget
-        private Menu menu;
-
-        // menu item selection listener: listens to selection events
-        private Listener menuItemListener = new Listener() {
-            public void handleEvent(Event event) {
-                if (SWT.Selection == event.type
-                    && !event.widget.isDisposed()) {
-                    ActionContributionItem item =
-                        (ActionContributionItem) event.widget.getData();
-                    if (retargetLastAction) {
-                        setActionHandler(item.getAction());
-                        setDefaultAction(item.getAction());
-                    }
-                    subActionSelected(item.getAction());
-                }
-            }
-        };
-
-        /**
-         * Creates a new menu creator action
-         * 
-         * @param actionHandler the action handler
-         */
-        public MenuCreatorAction(IAction actionHandler) {
-            super(actionHandler.getId(), actionHandler.getText());
-            setEnabled(false); // initially untill a menu item is added
-            setActionHandler(actionHandler);
-            setMenuCreator(this);
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-         */
-        public Menu getMenu(Control parent) {
-            if (menu != null)
-                menu.dispose();
-
-            menu = new Menu(parent);
-            return createMenu(menu);
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-         */
-        public Menu getMenu(Menu parent) {
-            if (menu != null)
-                menu.dispose();
-            menu = new Menu(parent);
-            return createMenu(menu);
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose()
-         */
-        public void dispose() {
-            if (menu != null) {
-                menu.dispose();
-                menu = null;
-            }
-            super.dispose();
-            ActionMenuManager.this.dispose();
-        }
-
-        /**
-         * Create the drop-down/pop-up menu.
-         * 
-         * @param mnu <code>Menu</code> for which to create the drop-down/pop-up menu
-         * @return <code>Menu</code> the drop-down/pop-up menu 
-         */
-        protected Menu createMenu(Menu mnu) {
-            IContributionItem[] items = getRealItems();
-            IContributionItem lastGroupMarker = null;
-            for (int i = 0; i < items.length; i++) {
-                IContributionItem item = items[i];
-                if (item instanceof AbstractGroupMarker) {
-                    if (i == 0
-                        || i == items.length - 1
-                        || items[i + 1] instanceof AbstractGroupMarker
-                        || mnu.getItemCount() < 1 
-                        || !item.isVisible()) {
-                        continue;
-                    } else {
-                        // Do not add last group marker until we know that there
-                        // will be items following it.
-                        lastGroupMarker = item;
-                    }
-                } else {
-                    if (!item.isVisible()) {
-                        continue;
-                    }
-                    try {
-                        if (lastGroupMarker != null) {
-                            lastGroupMarker.fill(menu, -1);
-                            lastGroupMarker = null;
-                        }
-                        item.fill(menu, -1);
-                    } catch (Exception e) {
-                        Log.info(CommonUIPlugin.getDefault(), CommonUIStatusCodes.GENERAL_UI_FAILURE, "The contribution item (" + item.getId() + ") failed to fill within the menu"); //$NON-NLS-1$ //$NON-NLS-2$
-                    }
-                }
-            }
-            MenuItem menuItems[] = mnu.getItems();
-            for (int i = 0; i < menuItems.length; i++) {
-                if (menuItems[i].getStyle() == SWT.SEPARATOR)
-                    continue;
-                menuItems[i].addListener(SWT.Selection, menuItemListener);
-            }
-            return mnu;
-        }
-
-        /**
-         * Ignores the action handler's "enable" event since "enablement"
-         * is determined by the sub-action(s) enablement state
-         * 
-         */
-        protected void propagateChange(PropertyChangeEvent event) {
-            if (!event.getProperty().equals(Action.ENABLED))
-                super.propagateChange(event);
-        }
-
-        /**
-         * Ignores the action handler's "enable" event since "enablement"
-         * is determined by the sub-action(s)
-         * 
-         */
-        protected void setActionHandler(IAction handler) {
-            boolean enabled = MenuCreatorAction.this.isEnabled();
-            super.setActionHandler(handler);
-            MenuCreatorAction.this.setEnabled(enabled);
-        }
-        
-        /**
-         * Only run the action handler if it is enabled
-         * 
-         */
-        public void run() {
-            if (getActionHandler() != null && getActionHandler().isEnabled())
-                super.run();
-            else if (getDefaultAction().isEnabled()) {
-                setActionHandler(getDefaultAction());
-                super.run();
-           }
-        }
-
-        /**
-         * Only run the action handler if it is enabled
-         * 
-         */
-        public void runWithEvent(Event event) {
-            if (getActionHandler() != null && getActionHandler().isEnabled())
-                super.runWithEvent(event);
-            else if (getDefaultAction().isEnabled()) {
-                 setActionHandler(getDefaultAction());
-                 super.runWithEvent(event);
-            }
-        }
-
-    }
-
-    /** the associated menu action */
-    protected final MenuCreatorAction action;
-
-    /** the associated menu action */
-    protected IAction defaultAction = null;
-
-    /** the delege action contribution item */
-    private final ActionContributionItem actionContributionItem;
-
-    /** an option to retarget the last action */
-    private boolean retargetLastAction;
-
-    /**
-     * Creates a new instance of <code>ActionMenuManager</code> with
-     * a given action handler. The manager does not retarget the last
-     * selected action from the menu
-     * 
-     * @param id The menu manager id
-     * @param actionHandler the menu associated action handler
-     */
-    public ActionMenuManager(String id, IAction actionHandler) {
-        this(id, actionHandler, false);
-    }
-
-    /**
-     * Creates a new instance of <code>ActionMenuManager</code> with
-     * a given action handler and an option to retarget the last 
-     * executed menu action.
-     * 
-     * @param id The menu manager id
-     * @param actionHandler the menu associated action handler
-     * @param retargetLastAction whether to retarget the last action or not
-     */
-    public ActionMenuManager(
-        String id,
-        IAction actionHandler,
-        boolean retargetLastAction) {
-        super(actionHandler.getText(), id);
-        assert null != actionHandler;
-        action = new MenuCreatorAction(actionHandler);
-        defaultAction = actionHandler;
-        actionContributionItem = new ActionContributionItem(action);
-        this.retargetLastAction = retargetLastAction;
-    }
-
-    /**
-     * Returns whether the option to retarget last action was requested
-     * 
-     * @return <code>true</code> if retargetLastAction is enabled, <code>false</code> otherwise
-     */
-    protected boolean isRetargetLastAction() {
-        return retargetLastAction;
-    }
-
-    /**
-     * Handle subaction selection
-     * 
-     * @param subActionHandler The selected sub action handler
-     */
-    protected void subActionSelected(IAction subActionHandler) {
-         /* method not implemented */
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.Composite)
-     */
-    public void fill(Composite parent) {
-        // this is only relevant in toolbars
-        retargetLastAction = false;
-        actionContributionItem.fill(parent);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.Menu, int)
-     */
-    public void fill(Menu parent, int index) {
-        // this is only relevant in toolbars
-        retargetLastAction = false;
-        actionContributionItem.fill(parent, index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#fill(org.eclipse.swt.widgets.ToolBar, int)
-     */
-    public void fill(ToolBar parent, int index) {
-        actionContributionItem.fill(parent, index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#dispose()
-     */
-    public void dispose() {
-        actionContributionItem.dispose();
-        super.dispose();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#isEnabled()
-     */
-    public boolean isEnabled() {
-        return actionContributionItem.isEnabled();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionManager#isDirty()
-     */
-    public boolean isDirty() {
-        return actionContributionItem.isDirty();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#isDynamic()
-     */
-    public boolean isDynamic() {
-        return actionContributionItem.isDynamic();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#isGroupMarker()
-     */
-    public boolean isGroupMarker() {
-        return actionContributionItem.isGroupMarker();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#isSeparator()
-     */
-    public boolean isSeparator() {
-        return actionContributionItem.isSeparator();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#isVisible()
-     */
-    public boolean isVisible() {
-        IContributionItem[] items = getRealItems();
-        for (int i = 0; i < items.length; i++) {
-            IContributionItem item = items[i];
-            if (!(item instanceof AbstractGroupMarker) && item.isVisible()) {
-                return actionContributionItem.isVisible();
-            }
-        }
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#setParent(org.eclipse.jface.action.IContributionManager)
-     */
-    public void setParent(IContributionManager parent) {
-        actionContributionItem.setParent(parent);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#setVisible(boolean)
-     */
-    public void setVisible(boolean visible) {
-        actionContributionItem.setVisible(visible);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#update()
-     */
-    public void update() {
-        actionContributionItem.update();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionItem#update(java.lang.String)
-     */
-    public void update(String id) {
-        actionContributionItem.update(id);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IMenuManager#updateAll(boolean)
-     */
-    public void updateAll(boolean force) {
-        update(force);
-
-        IContributionItem[] items = getRealItems();
-        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);
-                }
-            }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IContributionManager#update(boolean)
-     */
-    public void update(boolean force) {
-        update();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.ContributionManager#itemAdded(org.eclipse.jface.action.IContributionItem)
-     */
-    protected void itemAdded(IContributionItem item) {
-        super.itemAdded(item);
-        if (item instanceof SubContributionItem)
-            item = ((SubContributionItem) item).getInnerItem();
-        if (!item.isGroupMarker())
-            action.setEnabled(true);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.ContributionManager#itemRemoved(org.eclipse.jface.action.IContributionItem)
-     */
-    protected void itemRemoved(IContributionItem item) {
-        super.itemRemoved(item);
-        if (item instanceof SubContributionItem)
-            item = ((SubContributionItem) item).getInnerItem();
-        if (!item.isGroupMarker()) {
-            action.setEnabled(false);
-            IContributionItem[] items = getItems();
-            for (int i = 0; i < items.length; i++)
-                if (!items[i].isGroupMarker()){
-                    action.setEnabled(true);
-                    break;
-                }
-        }
-    }
-
-    /**
-     * Returns the contribution items of this manager. If an item
-     * is wrapper in a SubContributionItem instance it extracts the
-     * real item instance
-     * 
-     * @return An array of real items of this contribution manager 
-     */
-    protected IContributionItem[] getRealItems() {
-        IContributionItem[] items = getItems();
-        IContributionItem[] realItems = new IContributionItem[items.length];
-        for (int i = 0; i < items.length; i++) {
-                if (items[i] instanceof SubContributionItem) {
-                realItems[i] = ((SubContributionItem) items[i]).getInnerItem();
-                } else {
-                    realItems[i] = items[i];
-                }
-        }
-        return realItems;
-    }
-
-    
-    public IAction getDefaultAction() {
-        return defaultAction;
-    }
-
-    
-    protected void setDefaultAction(IAction defaultAction) {
-        this.defaultAction = defaultAction;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionManagerChangeListener.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionManagerChangeListener.java
deleted file mode 100644
index e44c791..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionManagerChangeListener.java
+++ /dev/null
@@ -1,39 +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;
-
-import java.util.EventListener;
-
-/**
- * The interface for all objects that are interested in action manager change
- * events. To be such a listener, a class has to implement this interface and
- * register itself as a listener on an action manager by calling
- * <code>addActionManagerChangeListener()</code>. When no longer interested in
- * receiving event notifications, it can deregister itself as a listener by
- * calling <code>removeActionManagerChangeListener()</code> on the action
- * manager.
- * 
- * @author khussey
- * 
- * @see org.eclipse.gmf.runtime.common.ui.action.ActionManager
- * @see org.eclipse.gmf.runtime.common.ui.action.ActionManagerChangeEvent
- */
-public interface IActionManagerChangeListener extends EventListener {
-
-    /**
-     * Handles an event indicating that an action manager has changed.
-     * 
-     * @param event The action manager change event to be handled.
-     */
-    public void actionManagerChanged(ActionManagerChangeEvent event);
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionWithProgress.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionWithProgress.java
deleted file mode 100644
index caf5f52..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IActionWithProgress.java
+++ /dev/null
@@ -1,125 +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;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * The interface for all actions that could potentially be run with a progress
- * indicator.
- * 
- * @author khussey
- * @author ldamus
- */
-public interface IActionWithProgress {
-    /**
-     * Enumerated type for work indicator type
-     */
-    public class WorkIndicatorType extends EnumeratedType {
-        private static int nextOrdinal = 0;
-    
-    	private static final long serialVersionUID = 1L;
-
-        /** No work indicator. */
-        public static final WorkIndicatorType NONE = new WorkIndicatorType("None"); //$NON-NLS-1$
-    
-        /** Busy work indicator. */
-        public static final WorkIndicatorType BUSY = new WorkIndicatorType("Busy"); //$NON-NLS-1$
-    
-        /** Progress monitor work indicator. */
-        public static final WorkIndicatorType PROGRESS_MONITOR = new WorkIndicatorType("Progress Monitor"); //$NON-NLS-1$
-    
-        /** Cancelable progress monitor work indicator. */
-    	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));
-        }
-    }
-
-    /**
-     * Retrieves the label for this action.
-     * 
-     * @return The label for this action.
-     */
-    public String getLabel();
-
-    /**
-     * Retrieves a Boolean indicating whether this action can be
-     * run.
-     * 
-     * @return <code>true</code> if this action can be run;
-     *          <code>false</code> otherwise.
-     */
-    public boolean isRunnable();
-
-    /**
-     * Refreshes various aspects of this action, such as its label
-     * and whether or not it is enabled.
-     */
-    public void refresh();
-    
-    /**
-     * Sets up the action. Should always be called before
-     * {@link #run(IProgressMonitor)} is called.
-     * @return <code>true</code> if the setup completed successfully,
-     * 		   <code>false</code> otherwise.
-     */
-    public boolean setup();
-
-    /**
-     * Runs this action.
-     * 
-     * @param progressMonitor <code>IProgressMonitor</code> monitoring the execution of this action
-     */
-    public void run(IProgressMonitor progressMonitor);
-
-    /**
-     * Gets type of work indicator (progress monitor, hourglass, or none).
-     * 
-     * @return type of work indicator
-     */
-    public WorkIndicatorType getWorkIndicatorType();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IDisposableAction.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IDisposableAction.java
deleted file mode 100644
index 56fd3a8..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/IDisposableAction.java
+++ /dev/null
@@ -1,42 +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;
-
-import org.eclipse.jface.action.IAction;
-
-/**
- * Interface extension to <code>IAction</code> adding lifecycle methods.
- * 
- * @author melaasar
- */
-public interface IDisposableAction extends IAction {
-
-	/**
-	 * init should be called after an action instance gets constructed 
-	 */
-	public void init();
-
-	/**
-	 * dispose should be called as soon as the action is no longer needed
-	 */
-	public void dispose();
-	
-	/**
-	 * Answers whether or not this action has been disposed and has not
-	 * been re-initialized.
-	 * 
-	 * @return <code>true</code> if the action has been disposed, 
-	 * 	 	   <code>false</code> otherwise.
-	 */
-	public boolean isDisposed();
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/package.html
deleted file mode 100644
index 1150650..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/action/package.html
+++ /dev/null
@@ -1,69 +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 defining <i>Actions</i> which are run
-in order to carry out application behaviour that the user has requested
-through the user-interface. Two types of actions are supported, namely <i>plugin-in</i>
-actions, and <i>retargetable</i> (or global) actions. Both kinds of
-actions are eligible to be repeated through the {@link
-org.eclipse.gmf.runtime.common.ui.action.ActionManager}.</p>
-
-<p>The <i>plugin-in</i> actions can be contributed using the extension
-points provided by the Eclipse platform, namely:
-<ul>
-	<li>org.eclipse.ui.actionsSets</li>
-	<li>org.eclipse.ui.editorActions</li>
-	<li>org.eclipse.ui.popupMenus</li>
-	<li>org.eclipse.ui.viewActions</li>
-</ul>
-The behaviour of these action extensions is defined in an
-<i>action delegate</i>
-. Modeling platform
-<i>plugin-in</i>
-action implementations should subclass the {@link
-org.eclipse.gmf.runtime.common.ui.action.AbstractActionDelegate} class
-in this package and implement the interface(s) appropriate to the
-Eclipse platform extension point(s) being used.
-</p>
-
-<p>The <i>retargetable</i> (or global) actions can be contributed using
-the extension points provided by the Eclipse platform, namely:
-<ul>
-	<li>org.eclipse.ui.actionSets</li>
-	<li>org.eclipse.ui.editors</li>
-</ul>
-The behaviour of these action extensions is defined in an
-<i>action handler</i>
-. Modeling platform
-<i>retargetable</i>
-action implementations should subclass the {@link
-org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler} class in
-this package.
-</p>
-
-<p>Modeling platform actions are run through an instance of the {@link
-org.eclipse.gmf.runtime.common.ui.action.ActionManager} class. The
-action manager will keep track of the last action that was run that is
-eligible to be repeated.</p>
-
-@canBeSeenBy %partners
-
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/ContentAssistantHelper.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/ContentAssistantHelper.java
deleted file mode 100644
index 57e251c..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/ContentAssistantHelper.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.common.ui.contentassist;
-
-import org.eclipse.jface.contentassist.SubjectControlContentAssistant;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.contentassist.ContentAssistHandler;
-
-import org.eclipse.gmf.runtime.common.ui.internal.contentassist.TextPresenter;
-
-/**
- * Helper class for content assist
- * 
- * @author myee
- */
-public class ContentAssistantHelper {
-
-	/**
-	 * Prevent calling the constructor
-	 */
-	private ContentAssistantHelper() {
-		// do nothing
-	}
-
-	/**
-	 * Returns a content assistant for a given text control and content assist
-	 * processor
-	 * 
-	 * @param text
-	 *            the text control
-	 * @param processor
-	 *            the content assist processor
-	 * @return the content assistant
-	 */
-	public static ContentAssistHandler createTextContentAssistant(
-			final Text text, IContentAssistProcessor processor) {
-		return createTextContentAssistant(text, null, null, processor);
-	}
-
-	/**
-	 * Returns a content assistant for a given text control and content assist
-	 * processor
-	 * 
-	 * @param text
-	 *            the text control
-	 * @param processor
-	 *            the content assist processor
-	 * @param foreground
-	 *            the foreground color
-	 * @param background
-	 *            the background color
-	 * @return the content assistant
-	 */
-	public static ContentAssistHandler createTextContentAssistant(
-			final Text text, Color foreground, Color background,
-			IContentAssistProcessor processor) {
-		return ContentAssistHandler.createHandlerForText(text,
-			createContentAssistant(processor, foreground, background));
-	}
-
-	/**
-	 * Returns a content assistant for a given control and content assist
-	 * processor
-	 * 
-	 * @param processor
-	 *            the content assist processor
-	 * @param foreground
-	 *            the foreground color, or <code>null</code> for default color
-	 * @param background
-	 *            the background color, or <code>null</code> for default color
-	 * @return the content assistant
-	 */
-	private static SubjectControlContentAssistant createContentAssistant(
-			IContentAssistProcessor processor, Color foreground,
-			Color background) {
-		final SubjectControlContentAssistant contentAssistant = new SubjectControlContentAssistant();
-
-		if (foreground != null) {
-			contentAssistant.setProposalSelectorForeground(foreground);
-		}
-		if (background != null) {
-			contentAssistant.setProposalSelectorBackground(background);
-		}
-
-		contentAssistant.setContentAssistProcessor(processor,
-			IDocument.DEFAULT_CONTENT_TYPE);
-
-		contentAssistant.enableAutoActivation(true);
-		contentAssistant.enableAutoInsert(true);
-
-		contentAssistant
-			.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE);
-		contentAssistant
-			.setInformationControlCreator(new IInformationControlCreator() {
-
-				public IInformationControl createInformationControl(Shell parent) {
-					return new DefaultInformationControl(parent, SWT.NONE,
-						new TextPresenter());
-				}
-			});
-
-		return contentAssistant;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/package.html
deleted file mode 100644
index 90f053a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/contentassist/package.html
+++ /dev/null
@@ -1,47 +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 support content assist.
-The {@link org.eclipse.gmf.runtime.common.ui.contentassist.ContentAssistantHelper
-ContentAssistantHelper} class provides convenience methods to instantiate a
-{@link org.eclipse.ui.contentassist.ContentAssistHandler ContentAssistHandler}.
-The {@link org.eclipse.gmf.runtime.common.ui.contentassist.TextPresenter
-TextPresenter} class subclasses
-{@link org.eclipse.jface.text.DefaultInformationControl.IInformationPresenter
-IInformationPresenter} to support boldface display of text.
-</P>
-
-<h2>Using this Package</h2>
-<P>Use the convenience methods from
-{@link org.eclipse.gmf.runtime.common.ui.contentassist.ContentAssistantHelper
-ContentAssistantHelper} to instantiate a
-{@link org.eclipse.ui.contentassist.ContentAssistHandler ContentAssistHandler}.
-It uses {@link org.eclipse.gmf.runtime.common.ui.contentassist.TextPresenter
-TextPresenter} to support boldface text.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information, please see
-{@link org.eclipse.ui.contentassist.ContentAssistHandler ContentAssistHandler}
-and {@link org.eclipse.jface.text.IInformationControl IInformationControl}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ExpansionType.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ExpansionType.java
deleted file mode 100644
index ae0c771..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ExpansionType.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.dialogs;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Expansion type enumeration for SRE.
- * 
- * Incoming, outoging, both incoming and ouotgoing, and all connected.
- * 
- * @author wdiu, Wayne Diu
- */
-
-public class ExpansionType
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for selection of elements.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * No expansion type. Do not expand.
-	 */
-	public static final ExpansionType NONE = new ExpansionType("None"); //$NON-NLS-1$
-
-	/**
-	 * Incoming relationships
-	 */
-	public static final ExpansionType INCOMING = new ExpansionType("Incoming"); //$NON-NLS-1$
-
-	/**
-	 * Outgoing relationships
-	 */
-	public static final ExpansionType OUTGOING = new ExpansionType("Outgoing"); //$NON-NLS-1$
-
-	/**
-	 * Incoming and outgoing relationships
-	 */
-	public static final ExpansionType BOTH = new ExpansionType("Both"); //$NON-NLS-1$
-
-	/**
-	 * All connected relatinoships
-	 */
-	public static final ExpansionType ALL = new ExpansionType("All"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	public static final ExpansionType[] VALUES = {NONE, INCOMING, OUTGOING,
-		BOTH, ALL};
-
-	/**
-	 * Constructs a new model type with the specified name and ordinal.
-	 * 
-	 * @param name
-	 *            The name of the new model type.
-	 * @param ordinal
-	 *            The ordinal for the new model type.
-	 */
-	protected ExpansionType(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new model type with the specified name.
-	 * 
-	 * @param name
-	 *            The name of the new model type.
-	 */
-	private ExpansionType(String name) {
-		this(name, nextOrdinal++);
-	}
-
-	/**
-	 * Retrieves the list of constants for this enumerated type.
-	 * 
-	 * @return 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.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/FilterWarningDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/FilterWarningDialog.java
deleted file mode 100644
index 0a2224f..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/FilterWarningDialog.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.dialogs;
-
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-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.Shell;
-
-/**
- * A dialog class that would be displayed to warn the user when adding an
- * element to the ME while the ME's filtering settings hide such element. It
- * allows the user to decide whether to override the filtering settings in order
- * to display the element.
- * 
- * @author Yasser Lulu
- *  
- */
-public class FilterWarningDialog
-	extends Dialog {
-
-	/**
-	 * the ok button
-	 */
-	private Button ok_button;
-
-	/**
-	 * the modify filter settings checkbox
-	 */
-	private Button modify_checkbox;
-
-	/**
-	 * the don't show this filter dialog checkbox
-	 */
-	private Button dontshow_checkbox;
-
-	/**
-	 * a boolean that stores the checked status of the dontshow_checkbox
-	 */
-	private boolean dontshowAgain;
-
-	/**
-	 * a boolean that stores the checked status of the modify_checkbox
-	 */
-	private boolean modifyFilterSettings;
-
-	/**
-	 * constructor
-	 * 
-	 * @param parentShell
-	 *            thge dialog's parent shell
-	 */
-	public FilterWarningDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(CommonUIMessages.FilterWarningDialog_title);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createButtonBar(Composite parent) {
-		return parent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite outer = (Composite) super.createDialogArea(parent);
-		outer.setSize(outer.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		GridLayout layout = new GridLayout(4, true);
-		outer.setLayout(layout);
-
-		StyledText text = new StyledText(outer, SWT.MULTI | SWT.WRAP
-			| SWT.READ_ONLY);
-		text.setCaret(null);
-		text.setFont(parent.getFont());
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalAlignment = GridData.BEGINNING;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalSpan = 4;
-		data.verticalSpan = 1;
-		data.widthHint = convertWidthInCharsToPixels(60);
-		data.heightHint = convertHeightInCharsToPixels(4);
-		text.setText(CommonUIMessages.FilterWarningDialog_filteredOut);
-		text.setLayoutData(data);
-		text.setCursor(null);
-		text.setBackground(outer.getBackground());
-		
-
-		modify_checkbox = new Button(outer, SWT.CHECK);
-		modify_checkbox.setText(CommonUIMessages.FilterWarningDialog_modifyOptions);
-		GridData modify_checkbox_data = new GridData();
-		modify_checkbox_data.horizontalAlignment = GridData.FILL;
-		modify_checkbox_data.verticalAlignment = GridData.BEGINNING;
-		modify_checkbox_data.grabExcessHorizontalSpace = true;
-		modify_checkbox_data.horizontalSpan = 4;
-		modify_checkbox_data.verticalSpan = 1;
-		modify_checkbox.setLayoutData(modify_checkbox_data);
-		modify_checkbox.setSelection(true);
-		modify_checkbox.setFont(parent.getFont());
-
-		dontshow_checkbox = new Button(outer, SWT.CHECK);
-		dontshow_checkbox.setText(CommonUIMessages.FilterWarningDialog_dontShowAgain);
-		GridData dontshow_checkbox_data = new GridData();
-		dontshow_checkbox_data.horizontalAlignment = GridData.FILL;
-		dontshow_checkbox_data.verticalAlignment = GridData.BEGINNING;
-		dontshow_checkbox_data.grabExcessHorizontalSpace = true;
-		dontshow_checkbox_data.horizontalSpan = 4;
-		dontshow_checkbox_data.verticalSpan = 1;
-		dontshow_checkbox.setLayoutData(dontshow_checkbox_data);
-		dontshow_checkbox.setFont(parent.getFont());
-		
-		ok_button = new Button(outer, SWT.PUSH);
-		ok_button.setText(IDialogConstants.OK_LABEL);
-		GridData ok_button_data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-			| GridData.GRAB_HORIZONTAL);
-		ok_button_data.horizontalAlignment = GridData.CENTER;
-		ok_button_data.verticalAlignment = GridData.CENTER;
-		ok_button_data.horizontalSpan = 4;
-		ok_button_data.verticalSpan = 1;
-		ok_button_data.widthHint = Math.max(
-				convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH),
-				ok_button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		
-
-		ok_button.setLayoutData(ok_button_data);
-		ok_button.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-				okPressed();
-			}
-		});
-		ok_button.setFont(parent.getFont());
-
-		return outer;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		dontshowAgain = dontshow_checkbox.getSelection();
-		modifyFilterSettings = modify_checkbox.getSelection();
-		super.okPressed();
-	}
-
-	/**
-	 * Returns the dontshowAgain check-box status.
-	 * 
-	 * @return boolean true if selected (checked) false otherwise
-	 */
-	public boolean isDontShowAgainSelected() {
-		return dontshowAgain;
-	}
-
-	/**
-	 * Returns the modifyFilterSettings check-box status.
-	 * 
-	 * @return boolean true if selected (checked) false otherwise
-	 */
-	public boolean isModifyFilterSettingsSelected() {
-		return modifyFilterSettings;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/GradientSelectionDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/GradientSelectionDialog.java
deleted file mode 100644
index cccb13b..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/GradientSelectionDialog.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.dialogs;
-
-import java.util.ArrayList;
-
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-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.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Resource;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Dialog that allows selection of two gradient colors and gradient style, and
- * optionally background transparency.
- * 
- * @author lgrahek
- * @since 1.2
- * 
- */
-public class GradientSelectionDialog extends Dialog {
-
-	protected Button color1Button, color2Button;	
-	protected Canvas canvas;	
-	private Button verticalStyle, horizontalStyle;
-	private Button okButton, cancelButton, clearButton;
-	
-	private RGB gradientColor1;
-	private RGB gradientColor2;	
-	private int gradientStyle;
-	
-	private int transparency;
-	
-	/**
-	 * value to be returned by open(), set to SWT.OK if the ok button has been pressed
-	 */
-	int returnVal; 			  
-							 		
-	ArrayList<Resource> resources;	
-	
-	
-	/**
-	 * Initializes dialog with the gradient and transparency data.
-	 * 
-	 * @param parent
-	 *            the parent shell
-	 * @param style
-	 *            shell style
-	 * @param initColor1
-	 *            initial gradient color 1
-	 * @param initColor2
-	 *            initial gradient color 2
-	 * @param defaultGradientStyle
-	 *            initial gradient style
-	 * @param transparency
-	 *            transparency used when drawing the sample. It is ignored if
-	 *            not within [0, 100] range
-	 */
-	public GradientSelectionDialog(Shell parent, int style, 
-			RGB initColor1, RGB initColor2, int defaultGradientStyle,
-			int transparency) {
-		super(parent, style);
-		setGradientColor1(initColor1);
-		setGradientColor2(initColor2);
-		setGradientStyle(defaultGradientStyle);
-		if (transparency < 0 || transparency > 100) {
-			setTransparency(0);
-		} else {
-			setTransparency(transparency);
-		}
-		returnVal = SWT.CANCEL;
-		resources = new ArrayList<Resource>();
-		
-	}
-	
-	/**
-	 * Opens the dialog. Location is not given and the dialog will be placed at the center of the screen
-	 */
-	public int open() {
-		return open(null);
-	}
-	
-	/**
-	 * Sets up the dialog and opens it at given location.
-	 * 
-	 * @param location
-	 *            Initial location of the dialog
-	 * @return SWT.OK if ok button is clicked, SWT.CANCEL if cancel button is
-	 *         clicked
-	 */
-	public int open(Point location) {
-		final Shell dialog = new Shell(getParent(), SWT.DIALOG_TRIM | getStyle());
-		dialog.setText(CommonUIMessages.GradientSelection_Gradient);
-				
-		GridLayout gridLayout = new GridLayout();
-	    gridLayout.numColumns = 1;
-	    gridLayout.marginHeight = 10;
-	    gridLayout.marginWidth = 10;
-	    dialog.setLayout(gridLayout);
-	    
-	    createDialogControls(dialog);		
-		dialog.setDefaultButton (okButton);
-		dialog.pack();
-			
-		Rectangle bounds = dialog.getBounds();
-		// if location is not given, place the dialog at the center of the screen
-		if (location == null) {
-			Rectangle rect = getParent().getMonitor().getBounds();
-			dialog.setLocation(rect.x + (rect.width - bounds.width) / 2, rect.y + (rect.height - bounds.height) / 2);
-		} else {
-			dialog.setLocation(location);
-		}
-		dialog.setMinimumSize(bounds.width, bounds.height);
-		
-		dialog.addListener(SWT.Close, new Listener() {
-			public void handleEvent(Event event) {
-				for (int i = 0; i < resources.size(); i++) {
-					Object obj = resources.get(i);
-					if (obj != null && obj instanceof Resource) {
-						((Resource) obj).dispose();
-					}
-				}
-				dialog.dispose();
-			}
-		});	
-				
-		dialog.open ();
-		
-		Display display = getParent().getDisplay();
-		while (!dialog.isDisposed()) {
-			if (!display.readAndDispatch()) display.sleep();
-		}
-		
-		return returnVal;
-	}
-	
-	/**
-	 * Creates the controls of the dialog.
-	 * 
-	 * @param parent
-	 *            Parent shell
-	 */
-	protected void createDialogControls(Shell parent) {
-	    GridLayout layout = new GridLayout();
-	    layout.numColumns = 3;	
-	    layout.marginHeight = 0;
-	    layout.marginWidth = 0;
-	   	Composite topComposite = new Composite(parent, SWT.NONE);
-	   	topComposite.setLayout(layout);
-	   	
-		createColorGroup(parent, topComposite);
-		createStyleGroup(topComposite);
-		createSample(parent, topComposite);
-		createOkCancelClearButtons(parent, topComposite);
-	}
-	
-	/**
-	 * Creates controls in the color group
-	 * 
-	 * @param parent
-	 *            Parent shell
-	 * @param topComposite
-	 *            Parent composite
-	 */
-	protected void createColorGroup(Shell parent, Composite topComposite) {
-		final Display display = parent.getDisplay();
-
-		Group colorGroup = new Group(topComposite, SWT.NONE);
-		colorGroup.setText(CommonUIMessages.GradientSelection_Colors);
-	    GridLayout layout = new GridLayout();
-	    layout.numColumns = 2;
-	    GridData gridData = new GridData();
-	    gridData.verticalAlignment = SWT.FILL;
-	    gridData.grabExcessVerticalSpace = true;
-	    colorGroup.setLayout(layout);
-	    colorGroup.setLayoutData(gridData);	
-	    
-	    Label label = new Label(colorGroup, SWT.NONE);
-	    label.setText(CommonUIMessages.GradientSelection_Color1);
-	    label = new Label(colorGroup, SWT.NONE);
-	    label.setText(CommonUIMessages.GradientSelection_Color2);	    
-	        
-		// button for choosing gradientColor1
-		color1Button = new Button(colorGroup, SWT.PUSH);
-
-		// set the button image (current gradientColor1)
-		setButtonImage(color1Button, gradientColor1, display);
-		color1Button.addListener(SWT.Selection, new Listener() { 
-			public void handleEvent(Event event) {
-				RGB color = changeColor(color1Button, display, gradientColor1);
-				if (color != null) {
-					setGradientColor1(color);
-				}
-			}
-		});
-		
-		// button for choosing gradientColor2
-		color2Button = new Button(colorGroup, SWT.PUSH);
-
-		// set the button image (current gradientColor1)
-		setButtonImage(color2Button, gradientColor2, display);
-		color2Button.addListener(SWT.Selection, new Listener() { 
-			public void handleEvent(Event event) {
-				RGB color = changeColor(color2Button, display, gradientColor2);
-				if (color != null) {
-					setGradientColor2(color);
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Creates controls in the gradient style group
-	 * 
-	 * @param topComposite
-	 *            Parent composite
-	 */
-	protected void createStyleGroup(Composite topComposite) {	
-		Group styleGroup = new Group(topComposite, SWT.NONE);
-		styleGroup.setText(CommonUIMessages.GradientSelection_ShadingStyle);
-	    GridLayout layout = new GridLayout();
-	    layout.numColumns = 1;
-	    GridData gridData = new GridData();
-	    gridData.horizontalAlignment = SWT.FILL;
-	    gridData.verticalAlignment = SWT.FILL;
-	    gridData.grabExcessHorizontalSpace = true;
-	    gridData.grabExcessVerticalSpace = true;
-	    styleGroup.setLayout(layout);
-	    styleGroup.setLayoutData(gridData);
-	    
-	    verticalStyle = new Button(styleGroup, SWT.RADIO);
-	    verticalStyle.setText(CommonUIMessages.GradientSelection_Vertical);
-	    verticalStyle.setSelection(gradientStyle == 0);
-	    horizontalStyle = new Button(styleGroup, SWT.RADIO);
-	    horizontalStyle.setText(CommonUIMessages.GradientSelection_Horizontal);
-	    horizontalStyle.setSelection(gradientStyle == 1);
-		
-	    SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if (!((Button)event.widget).getSelection()) {
-					// don't react on de-selection
-					return;
-				}
-				changeStyle();
-			}
-		};
-		verticalStyle.addSelectionListener(selectionListener);
-		horizontalStyle.addSelectionListener(selectionListener);	
-	}
-
-	/**
-	 * Creates controls in the sample group
-	 * 
-	 * @param parent
-	 *            Parent shell
-	 * @param topComposite
-	 *            Parent composite
-	 */
-	protected void createSample(Shell parent, Composite topComposite) {		
-		final Display display = parent.getDisplay();
-		
-		Composite sampleComposite = new Composite(topComposite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-	    layout.numColumns = 1;
-	    GridData gridData = new GridData();
-	    gridData.verticalAlignment = SWT.FILL;
-	    gridData.grabExcessVerticalSpace = true;	    
-	    gridData.verticalAlignment = SWT.BOTTOM;
-		sampleComposite.setLayout(layout);	
-		sampleComposite.setLayoutData(gridData);
-		
-		// message
-		Label message = new Label(sampleComposite, SWT.NONE); 
-		message.setText(CommonUIMessages.GradientSelection_Sample);
-		gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		//gridData.horizontalSpan = 2;		
-		message.setLayoutData(gridData);
-
-		// canvas
-		canvas = new Canvas(sampleComposite, SWT.NONE);
-		gridData = new GridData(GridData.FILL_BOTH);
-		gridData.widthHint = 35;
-		gridData.heightHint = 35;
-		canvas.setLayoutData(gridData);
-		canvas.addListener (SWT.Paint, new Listener () {
-			public void handleEvent (Event e) {
-				Point size = canvas.getSize();
-				Color color1 = new Color(display, gradientColor1);
-				Color color2 = new Color(display, gradientColor2);
-				
-				Image sample = new Image(display, size.x, size.y);
-				GC gc = new GC(sample);
-				Rectangle rect = sample.getBounds();
-				gc.setForeground(color1);
-				gc.setBackground(color2);
-				gc.setAlpha(255-transparency*255/100);
-				gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height, gradientStyle==0);				
-				gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
-				gc.drawRectangle(rect.x, rect.y, rect.width-1, rect.height-1);
-
-				if (sample != null) {
-					e.gc.drawImage (sample, 0, 0);
-				}				
-				
-				gc.dispose();				
-				sample.dispose();
-				color1.dispose();
-				color2.dispose();
-			}
-		});	
-	}
-	    		
-	/**
-	 * Creates ok and cancel buttons
-	 * 
-	 * @param parent
-	 *            Parent shell
-	 * @param topComposite
-	 *            Parent composite
-	 */
-	protected void createOkCancelClearButtons(Shell parent, Composite topComposite) {
-		Composite okCancelComp = new Composite(topComposite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		okCancelComp.setLayout(layout);
-		GridData gridData = new GridData();
-		gridData.verticalAlignment = SWT.BOTTOM;
-		gridData.horizontalSpan = 3;
-		okCancelComp.setLayout(layout);
-		okCancelComp.setLayoutData(gridData);
-		
-		// ok button left of cancel button
-		createOkButton(okCancelComp, parent);
-		createCancelButton(okCancelComp, parent);
-		createClearButton(okCancelComp, parent);
-	}
-	
-	/**
-	 * Creates cancel button as part of the given okCancelComp composite
-	 * 
-	 * @param okCancelComp
-	 *            Parent composite
-	 * @param parent
-	 *            Parent shell
-	 */
-	protected void createCancelButton(Composite okCancelComp, final Shell parent) {
-		// cancel button
-		cancelButton = new Button (okCancelComp, SWT.PUSH);
-		cancelButton.setText(CommonUIMessages.ShowHideRelationshipsDialog_Button_Cancel);
-		cancelButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				parent.close();
-			}
-		});
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = SWT.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		cancelButton.setLayoutData(gridData);
-	}
-	
-	/**
-	 * Creates ok button as part of the given okCancelComp composite
-	 * 
-	 * @param okCancelComp
-	 *            Parent composite
-	 * @param parent
-	 *            Parent shell
-	 */
-	protected void createOkButton(Composite okCancelComp, final Shell parent) {
-		// OK button
-		okButton = new Button (okCancelComp, SWT.PUSH);
-		okButton.setText(CommonUIMessages.ShowHideRelationshipsDialog_Button_OK);
-		okButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				returnVal = SWT.OK;
-				parent.close();
-			}
-		});
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = SWT.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		okButton.setLayoutData(gridData);				
-	}
-	
-	protected void createClearButton(Composite okCancelComp, final Shell parent) {
-		// OK button
-		clearButton = new Button (okCancelComp, SWT.PUSH);
-		clearButton.setText(CommonUIMessages.ClearAction_label);
-		clearButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				returnVal = -1;
-				parent.close();
-			}
-		});
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = SWT.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		clearButton.setLayoutData(gridData);				
-	}	
-	
-	/**
-	 * Opens color chooser dialog, and if user selects a color applies it to the
-	 * button and returns it.
-	 * 
-	 * @param button
-	 *            Color button whose color will change
-	 * @param display
-	 * @param currentColor
-	 *            Current color that given button represents
-	 * @return Newly selected RGB color
-	 */
-	protected RGB changeColor(Button button, Display display, RGB currentColor) {
-		ColorDialog dialog = new ColorDialog(Display.getCurrent().getActiveShell());
-
-		dialog.setRGB(currentColor);
-		WindowUtil.centerDialog(dialog.getParent(), Display.getCurrent()
-				.getActiveShell());
-		dialog.open();
-
-		RGB selectedColor = dialog.getRGB();
-		if (selectedColor != null) {
-			setButtonImage(button, selectedColor, display);
-			canvas.redraw();
-		}
-		return selectedColor;
-	}
-	
-	/**
-	 * Sets the image for a color button (square filled with the color that
-	 * button represents)
-	 */
-	protected void setButtonImage(Button btn, RGB rgbColor, Display display) {
-		// First, dispose the current image, if any
-        Image image = btn.getImage();
-        if (image != null) {
-        	resources.remove(image);
-        	image.dispose();
-        }
-		// Now set the new image based on rgbColor
-		Color color1 = new Color(display, rgbColor);
-		image = new Image(display, 16, 16);
-		GC gc = new GC(image);
-		gc.setBackground(color1);
-		Rectangle rect = image.getBounds();
-		gc.fillRectangle(rect);
-		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));		
-		gc.drawRectangle(rect.x, rect.y, rect.width - 1, rect.height - 1);
-		gc.dispose();		
-		color1.dispose();
-		btn.setImage(image);
-		resources.add(image);		
-	}
-	
-	/**
-	 * @return the canvas used for drawing sample
-	 */
-	protected Canvas getSampleCanvas() {
-		return canvas;
-	}
-	
-	/**
-	 * Changes gradienStyle and redraws canvas based on style selection.
-	 */
-	private void changeStyle() {
-		if (verticalStyle.getSelection()) {
-			gradientStyle = 0;
-		} else {
-			gradientStyle = 1;
-		}
-		canvas.redraw();
-	}
-
-
-	/**
-	 * @return the gradientColor1
-	 */
-	public RGB getGradientColor1() {
-		return gradientColor1;
-	}
-
-
-	/**
-	 * @param gradientColor1 the gradientColor1 to set
-	 */
-	public void setGradientColor1(RGB gradientColor1) {
-		this.gradientColor1 = gradientColor1;
-	}
-
-
-	/**
-	 * @return the gradientColor2
-	 */
-	public RGB getGradientColor2() {
-		return gradientColor2;
-	}
-
-
-	/**
-	 * @param gradientColor2 the gradientColor2 to set
-	 */
-	public void setGradientColor2(RGB gradientColor2) {
-		this.gradientColor2 = gradientColor2;
-	}
-
-
-	/**
-	 * @return the gradientStyle
-	 */
-	public int getGradientStyle() {
-		return gradientStyle;
-	}
-
-
-	/**
-	 * @param gradientStyle the gradientStyle to set
-	 */
-	public void setGradientStyle(int gradientStyle) {
-		this.gradientStyle = gradientStyle;
-	}
-
-
-	/**
-	 * @return the transparency
-	 */
-	public int getTransparency() {
-		return transparency;
-	}
-
-
-	/**
-	 * @param transparency the transparency to set
-	 */
-	public void setTransparency(int transparency) {
-		this.transparency = transparency;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/IShowRelatedElementsWithDetails.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/IShowRelatedElementsWithDetails.java
deleted file mode 100644
index d7b9ee6..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/IShowRelatedElementsWithDetails.java
+++ /dev/null
@@ -1,51 +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.dialogs;
-
-/**
- * Show Related Elements with details interface.
- * 
- * This is for interfaces that support Show Related Elements, including details
- * instead of just presets.
- * 
- * @author wdiu, Wayne Diu
- */
-public interface IShowRelatedElementsWithDetails {
-
-	/**
-	 * Toggle showing or hiding details.
-	 */
-	public void showOrHideDetails();
-
-	/**
-	 * Update the relationships and other settings should be updated in the
-	 * details pane according to the presets.
-	 * 
-	 * @param preset
-	 *            the ShowRelatedElementsPreset
-	 */
-	public void updateRelationships(ShowRelatedElementsPreset preset);
-
-	/**
-	 * Return the current settings of the details pane in a nameless
-	 * ShowRelatedElementsPreset object.
-	 * 
-	 * @return ShowRelatedElementsPreset object containing current settings of
-	 *         the details pane
-	 */
-	public ShowRelatedElementsPreset getCurrentSettings();
-
-	/**
-	 * This method is called as a notification that the details have changed.
-	 */
-	public void detailsChanged();
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PopupDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PopupDialog.java
deleted file mode 100644
index fe0f977..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PopupDialog.java
+++ /dev/null
@@ -1,78 +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.dialogs;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ListDialog;
-
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-
-/**
- * A simple dialog with a list from which the user can select one item.
- * 
- * @author ldamus
- */
-public class PopupDialog
-	extends ListDialog {
-
-	/**
-	 * Content Provider.
-	 */
-	private IStructuredContentProvider contentProvider = new IStructuredContentProvider() {
-
-		private List contents;
-
-		public void dispose() {
-			// nothing to dispose
-		}
-
-		public Object[] getElements(Object inputElement) {
-			if (contents != null && contents == inputElement) {
-				return contents.toArray();
-			}
-			return new Object[0];
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			if (newInput instanceof List) {
-				contents = (List) newInput;
-			} else {
-				contents = null;
-			}
-		}
-	};
-
-	/**
-	 * Constructs a new instance
-	 * 
-	 * @param parent
-	 *            the shell
-	 * @param contents
-	 *            the elements to present in the list
-	 * @param labelProvider
-	 *            the label provider
-	 */
-	public PopupDialog(Shell parent, List contents, ILabelProvider labelProvider) {
-		super(parent);
-		setLabelProvider(labelProvider);
-		setContentProvider(contentProvider);
-		setInput(contents);
-		setTitle(CommonUIMessages.PopupDialog_title);
-		setMessage(CommonUIMessages.PopupDialog_message);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PropertiesDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PropertiesDialog.java
deleted file mode 100644
index 06da1df..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/PropertiesDialog.java
+++ /dev/null
@@ -1,97 +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.dialogs;
-
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A Preference Dialog which has a Close button in place of OK/Cancel buttons,
- * and titled "Properties" in place of "Preferences"
- * 
- * @author Michael Yee
- */
-public class PropertiesDialog
-	extends PreferenceDialog {
-
-	/** the close button */
-	private Button closeButton;
-
-	/** return code constant (value 2) indicating that the window was canceled. */
-	static public final int CLOSE = 2;
-
-	/**
-	 * PropertiesDialog constructor
-	 * 
-	 * @param parentShell
-	 *            the parent shell
-	 * @param manager
-	 *            the preference manager
-	 */
-	public PropertiesDialog(Shell parentShell, PreferenceManager manager) {
-		super(parentShell, manager);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePageContainer#updateButtons()
-	 */
-	public void updateButtons() {
-		// do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create close button
-		closeButton = createButton(parent, IDialogConstants.CLOSE_ID,
-			IDialogConstants.CLOSE_LABEL, true);
-		getShell().setDefaultButton(closeButton);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Control control = super.createDialogArea(parent);
-
-		// set title to "Properties"
-		getShell().setText(
-			CommonUIMessages.PropertiesDialog_title);
-
-		return control;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.CLOSE_ID) {
-			close();
-			return;
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SaveAllDirtyEditorsDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SaveAllDirtyEditorsDialog.java
deleted file mode 100644
index 6c75861..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SaveAllDirtyEditorsDialog.java
+++ /dev/null
@@ -1,121 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.ListDialog;
-
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-
-/**
- * Dialog which displays all dirty editors and prompts user if they should be
- * saved
- * 
- * @author myee
- */
-public class SaveAllDirtyEditorsDialog
-	extends ListDialog {
-
-	/**
-	 * SaveAllDirtyEditorsDialog constructor
-	 * 
-	 * @param parent
-	 *            parent shell
-	 */
-	public SaveAllDirtyEditorsDialog(Shell parent) {
-		super(parent);
-
-		setTitle(CommonUIMessages.SaveAllDirtyEditorsDialog_title);
-		setMessage(CommonUIMessages.SaveAllDirtyEditorsDialog_message);
-		setAddCancelButton(true);
-
-		setLabelProvider(new LabelProvider() {
-
-			public Image getImage(Object element) {
-				return ((IEditorPart) element).getTitleImage();
-			}
-
-			public String getText(Object element) {
-				return ((IEditorPart) element).getTitle();
-			}
-		});
-
-		setContentProvider(new IStructuredContentProvider() {
-
-			List fContents;
-
-			public Object[] getElements(Object inputElement) {
-				if (fContents != null && fContents == inputElement)
-					return fContents.toArray();
-				return new Object[0];
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-				if (newInput instanceof List)
-					fContents = (List) newInput;
-				else
-					fContents = null;
-			}
-
-			public void dispose() {
-				// do nothing
-			}
-		});
-
-		setInput(Arrays.asList(getDirtyEditors()));
-	}
-
-	/**
-	 * Returns the dirty editors
-	 * 
-	 * @return the dirty editors
-	 */
-	public static IEditorPart[] getDirtyEditors() {
-		Set inputs = new HashSet();
-		List result = new ArrayList(0);
-		IWorkbench workbench = CommonUIPlugin.getDefault().getWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		for (int i = 0; i < windows.length; i++) {
-			IWorkbenchPage[] pages = windows[i].getPages();
-			for (int x = 0; x < pages.length; x++) {
-				IEditorPart[] editors = pages[x].getDirtyEditors();
-				for (int z = 0; z < editors.length; z++) {
-					IEditorPart ep = editors[z];
-					IEditorInput input = ep.getEditorInput();
-					if (!inputs.contains(input)) {
-						inputs.add(input);
-						result.add(ep);
-					}
-				}
-			}
-		}
-		return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectableElement.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectableElement.java
deleted file mode 100644
index a735178..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectableElement.java
+++ /dev/null
@@ -1,763 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * An element that contains a hint, a serializable String ID, a String label,
- * and an ImageDescriptor label.  SeletableElements keep track of its parent
- * which may or may not be null and a list of children which may be empty.
- * This allows SelectableElement objects to be optionally represented in tree
- * viewers.  SelectableElements also keep track of their SelectedType, which
- * describes if the element is selected, unselected, or set to leave.
- * Therefore, SelectableElement objects typically correspond to elements in the
- * UI.
- * 
- * <P>This class contains public convenience methods.  For eaxmple, it
- * includes methods to find SelectableElement objects or their hints based on
- * their String ID and a method to make copies of SelectableElement objects. 
- * 
- * <P>The SelectableElement class is used in at least 3 places, Show Related
- * Elements Show Hide Relationships, and Browse Diagrams.
- * 
- * @author Wayne Diu, wdiu
- */
-public class SelectableElement {
-
-	/**
-	 * Unique identifier for this selectable element.
-	 */
-	private String id;
-
-	/**
-	 * String name of the element
-	 */
-	private String name;
-
-	/**
-	 * Icon for the element
-	 */
-
-	private ImageDescriptor icon;
-
-	/**
-	 * This element's children
-	 */
-	private Vector children;
-
-	/**
-	 * True if element was checked by the user, false if it wasn't
-	 */
-	private SelectedType selectedType;
-
-	/**
-	 * This element's parent
-	 */
-	private SelectableElement parent;
-
-	/**
-	 * Hint for checking what the type of this element is
-	 */
-	private Object hint;
-
-	/**
-	 * Adds a child to this element
-	 * 
-	 * @param element
-	 *            the child to add
-	 */
-	public void addChild(SelectableElement element) {
-		children.add(element);
-		element.setParent(this);
-	}
-
-	/**
-	 * Remove all children of this SelectableElement
-	 */
-	public void removeAllChildren() {
-		Iterator i = children.iterator();
-		while (i.hasNext()) {
-			((SelectableElement) i.next()).setParent(null);
-		}
-		children = new Vector();
-	}
-
-	/**
-	 * Constructor to make a new SelectableElement
-	 * 
-	 * @param aName
-	 *            the String name of the element
-	 * @param anIcon
-	 *            the icon Image for the element
-	 * @param aHint
-	 *            the element type
-	 * @deprecated Use the other constructor.
-	 */
-	public SelectableElement(String aName, ImageDescriptor anIcon, Object aHint) {
-		// For now, we will use the name as a unique identifier.
-		this(aName, aName, anIcon, aHint);
-	}
-
-	/**
-	 * Constructor to make a new SelectableElement.
-	 * 
-	 * @param anID
-	 *            A non-language specific unique identifier for this selectable
-	 *            element.
-	 * @param aName
-	 *            A user-presentable name for this selectable element.
-	 * @param anIcon
-	 *            The icon image for the element.
-	 * @param aHint
-	 *            A hint associated with the selection of this element.
-	 */
-	public SelectableElement(String anID, String aName, ImageDescriptor anIcon,
-			Object aHint) {
-		children = new Vector();
-		this.id = anID;
-		this.name = aName;
-		this.icon = anIcon;
-		this.hint = aHint;
-		selectedType = SelectedType.UNSELECTED;
-	}
-
-	/**
-	 * Returns the number of children
-	 * 
-	 * @return int with the number of children this element has
-	 */
-	public int getNumberOfChildren() {
-		return children.size();
-	}
-
-	/**
-	 * Returns a child
-	 * 
-	 * @param i
-	 *            with the index of the child of this element
-	 * @return SelectableElement which is child i of this element
-	 */
-	public SelectableElement getChild(int i) {
-		assert (i >= 0 && i < children.size());
-		return (SelectableElement) children.get(i);
-	}
-
-	/**
-	 * Returns the icon of this element to display to the user.
-	 * 
-	 * @return Image with icon of this element to display to the user
-	 */
-	public ImageDescriptor getIconImageDescriptor() {
-		return icon;
-	}
-
-	/**
-	 * Returns the name of this element to display to the user.
-	 * 
-	 * @return String with name of this element to display to the user
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the icon of this element to display to the user.
-	 * 
-	 * @param anIcon
-	 *            The icon to set
-	 */
-	public void setIconImageDescriptor(ImageDescriptor anIcon) {
-		this.icon = anIcon;
-	}
-
-	/**
-	 * Sets the name of this element to display to the user.
-	 * 
-	 * @param aName
-	 *            The name to set
-	 */
-	public void setName(String aName) {
-		this.name = aName;
-	}
-
-	/**
-	 * Returns the parent of this element.
-	 * 
-	 * @return SelectableElement
-	 */
-	public SelectableElement getParent() {
-		return parent;
-	}
-
-	/**
-	 * Sets the parent of this element.
-	 * 
-	 * @param aParent
-	 *            The parent to set
-	 */
-	public void setParent(SelectableElement aParent) {
-		this.parent = aParent;
-	}
-
-	/**
-	 * Returns the children of this element as an array
-	 * 
-	 * @return SelectableElement[] array of this element's children.
-	 */
-	public SelectableElement[] getChildren() {
-		SelectableElement elements[] = new SelectableElement[getNumberOfChildren()];
-		for (int i = 0; i < getNumberOfChildren(); i++) {
-			elements[i] = (SelectableElement) children.elementAt(i);
-		}
-		return elements;
-	}
-
-	/**
-	 * Returns if the element was selected.
-	 * 
-	 * @return selectedType from the SelectedType EnumeratedType
-	 */
-	public SelectedType getSelectedType() {
-		return selectedType;
-	}
-
-	/**
-	 * Sets whether or not the element is selected. For example, if the element
-	 * is checked in the interface.
-	 * 
-	 * @param aSelectedType
-	 *            from the SelectedType EnumeratedType
-	 */
-	public void setSelectedType(SelectedType aSelectedType) {
-		this.selectedType = aSelectedType;
-	}
-
-	/**
-	 * Returns the hint, which is an Object. This could be subclassed if type
-	 * safety is required.
-	 * 
-	 * @return the element type
-	 */
-	public Object getHint() {
-		return hint;
-	}
-
-	/**
-	 * Sets the SelectedType for a SelectableElement and its children
-	 * 
-	 * @param parent
-	 *            sets the SelectedType for this SelectableElement
-	 * @param selectedType
-	 *            the SelectedType to set for the SelectableElement and its
-	 *            children.
-	 */
-	public static void setSelectedTypeForSelecteableElementAndChildren(
-			SelectableElement parent, SelectedType selectedType) {
-		for (int i = 0; i < parent.getNumberOfChildren(); i++) {
-			setSelectedTypeForSelecteableElementAndChildren(parent.getChild(i),
-				selectedType);
-		}
-		parent.setSelectedType(selectedType);
-	}
-
-	/**
-	 * Sets the SelectedType for a SelectableElement and its children that match
-	 * the IDs in the List of IDs.
-	 * 
-	 * @param parent
-	 *            sets the SelectedType for this SelectableElement
-	 * @param selectedType
-	 *            the SelectedType to set for the SelectableElement and its
-	 *            children.
-	 * @param list
-	 *            List of IDs, not hints
-	 */
-	public static void setSelectedTypeForMatchingSelecteableElementAndChildren(
-			SelectableElement parent, SelectedType selectedType, List list) {
-		for (int i = 0; i < parent.getNumberOfChildren(); i++) {
-			setSelectedTypeForMatchingSelecteableElementAndChildren(parent
-				.getChild(i), selectedType, list);
-		}
-
-		if (list.contains(parent.getId())) {
-			setSelectedTypeForSelecteableElementAndChildren(parent,
-				selectedType);
-		}
-
-	}
-
-	/**
-	 * Calculates the longest string length of this element's children for the
-	 * text that will be displayed in the control. This method only works for
-	 * root SelectableElements.
-	 * 
-	 * @param selectableElement
-	 *            the SelectableElement to calculate the longest string length.
-	 *            Also looks at its children.
-	 * @param control
-	 *            the control with the font to use when calculating the font
-	 *            size
-	 * @return int with the string length in pixels
-	 */
-	public static int calculateLongestStringLength(
-			SelectableElement selectableElement, Control control) {
-		int INITIAL_LONGEST_STRING_LENGTH = 0;
-		int INITIAL_ITERATION_LEVEL = -1; //there is a fake element
-
-		assert (selectableElement.getParent() == null);
-
-		GC gc = new GC(control);
-		int longestStringLength = calculateLongestStringLength(
-			selectableElement, gc, INITIAL_LONGEST_STRING_LENGTH,
-			INITIAL_ITERATION_LEVEL);
-		gc.dispose();
-		return longestStringLength;
-	}
-
-	/**
-	 * Calculates the longest string length of this element's children for the
-	 * text that will be displayed.
-	 * 
-	 * @param selectableElement
-	 *            the SelectableElement to calculate the longest string length.
-	 *            Also looks at its children.
-	 * @param gc
-	 *            the GC to use when calculating the font size
-	 * @param longestStringLength
-	 *            the longest string length for the selectableElement and its
-	 *            children so far.
-	 * @param iterationLevel
-	 *            how many levels we have gone to keep track of the indents of
-	 *            the icons
-	 * @return int with the string length in pixels
-	 */
-	private static int calculateLongestStringLength(
-			SelectableElement selectableElement, GC gc,
-			int longestStringLength, int iterationLevel) {
-		int ICON_WIDTH = 32;
-		//we don'internationalize these icons, checkbox is 16 and image is 16
-		Point size = gc.textExtent(selectableElement.getName());
-		if (size.x + (iterationLevel * ICON_WIDTH) > longestStringLength)
-			longestStringLength = size.x + (iterationLevel * ICON_WIDTH);
-		for (int i = 0; i < selectableElement.getNumberOfChildren(); i++) {
-			longestStringLength = calculateLongestStringLength(
-				selectableElement.getChild(i), gc, longestStringLength,
-				iterationLevel + 1);
-		}
-		return longestStringLength;
-	}
-
-	/**
-	 * Returns the number of children including itself. Includes children that
-	 * are children of children, etc.
-	 * 
-	 * @param selectableElement
-	 *            the SelectableElement that we will find the number of children
-	 *            for.
-	 * @return int the number of children including children that are children
-	 *         of children, etc, and itself.
-	 */
-	public static int calculateNumberOfChildren(
-			SelectableElement selectableElement) {
-		int numberOfChildren = 0;
-		for (int i = 0; i < selectableElement.getNumberOfChildren(); i++) {
-			numberOfChildren += calculateNumberOfChildren(selectableElement
-				.getChild(i));
-		}
-		return numberOfChildren + 1;
-	}
-
-	/**
-	 * Recursively checks SelectableElement and its children to determine which
-	 * elements have the specified selectedType. If a SelectableElement meets
-	 * the type criteria, its hint (RelationshipType) is added to the
-	 * matchingElements list.
-	 * 
-	 * @param matchingElements
-	 * @param typeToMatch
-	 */
-	private void getMatchingElementTypes(List matchingElements,
-			SelectedType typeToMatch) {
-
-		for (int i = 0; i < getNumberOfChildren(); i++) {
-			getChild(i).getMatchingElementTypes(matchingElements, typeToMatch);
-		}
-		if (getSelectedType() == typeToMatch && getHint() != null) {
-			if (getHint() instanceof Collection)
-				matchingElements.addAll((Collection) getHint());
-			else
-				matchingElements.add(getHint());
-		}
-	}
-
-	/**
-	 * Returns a list of SELECTED RelationshipTypes for a SelectableElement.
-	 * 
-	 * Checks this SelectableElement and the SelectableElement's children. For
-	 * each SelectableElement where the selectedType is SELECTED, add the
-	 * RelationshipType to a list.
-	 * 
-	 * @return List
-	 */
-	public List getSelectedElementTypes() {
-		List selectedElements = new Vector();
-		getMatchingElementTypes(selectedElements, SelectedType.SELECTED);
-		return selectedElements;
-	}
-
-	/**
-	 * Returns a list of UNSELECTED RelationshipTypes for a SelectableElement.
-	 * 
-	 * Checks this SelectableElement and the SelectableElement's children. For
-	 * each SelectableElement where the selectedType is UNSELECTED, add the
-	 * RelationshipType to a list.
-	 * 
-	 * @return List
-	 */
-	public List getUnSelectedElementTypes() {
-		List unselectedElements = new Vector();
-		getMatchingElementTypes(unselectedElements, SelectedType.UNSELECTED);
-		return unselectedElements;
-	}
-
-	/**
-	 * Returns a list of LEAVE RelationshipTypes for a SelectableElement.
-	 * 
-	 * Checks this SelectableElement and the SelectableElement's children. For
-	 * each SelectableElement where the selectedType is LEAVE, add the
-	 * RelationshipType to a list.
-	 * 
-	 * @return List
-	 */
-	public List getLeaveElementTypes() {
-		List leaveElements = new Vector();
-		getMatchingElementTypes(leaveElements, SelectedType.LEAVE);
-		return leaveElements;
-	}
-
-	/**
-	 * Returns a string representation of this selectable element. This is
-	 * useful if a selectable element must be persisted between invocations of
-	 * eclipse.
-	 * 
-	 * @return String id of this selectableElement
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Retrieves all of the hints from the list of selections. The selections
-	 * are strings that have been produced by the getId() method. Note: this
-	 * should be invoked from the selectable element root.
-	 * 
-	 * @param stringRepresentations
-	 *            Strings produced by the {@link SelectableElement#getId()}
-	 *            method.
-	 * @param hints
-	 *            (out) A set used to store all of the hints.
-	 */
-	public void getHints(List stringRepresentations, Set hints) {
-		// If we have hit a string representation that is fully selected
-		//  then we simply retrieve all of the hints for this subtree. For
-		//  this selectable element to have been in the "SELECTED" state, it
-		//  and all of its children were selected.
-		if (stringRepresentations.contains(getId())) {
-			getAllHints(hints);
-		} else {
-			for (Iterator i = children.iterator(); i.hasNext();) {
-				((SelectableElement) i.next()).getHints(stringRepresentations,
-					hints);
-			}
-		}
-	}
-
-	/**
-	 * Retrieve all hints for the subtree rooted at this selectable element.
-	 * 
-	 * @param hints
-	 *            (out) A set used to store all of the hints.
-	 */
-	public void getAllHints(Set hints) {
-		if (hint instanceof List)
-			hints.addAll((List) hint);
-		else if (hint != null)
-			hints.add(hint);
-		for (Iterator i = children.iterator(); i.hasNext();) {
-			((SelectableElement) i.next()).getAllHints(hints);
-		}
-	}
-
-	/**
-	 * Recursively add this SelectableElement's and this SelectableElement's
-	 * children's hints to a List which is not null.
-	 * 
-	 * It will not add duplicates into the List, and if the hint is null, it
-	 * will not be added to the List.
-	 * 
-	 * @param list
-	 *            not null, add hints to this List
-	 * @param selectableElement
-	 *            recursively add hints from this SelectableElement and its
-	 *            children
-	 */
-	public static void addHintsToList(List list,
-			SelectableElement selectableElement) {
-		assert null != list;
-		assert null != selectableElement;
-		for (int i = 0; i < selectableElement.getNumberOfChildren(); i++) {
-			addHintsToList(list, selectableElement.getChild(i));
-		}
-
-		Object hint = selectableElement.getHint();
-		if (hint != null) {
-			//I disagree that hint should be sometimes a List, and sometimes an
-			//element, but I will support it
-			if (hint instanceof List) {
-				Iterator it = ((List) hint).iterator();
-				while (it.hasNext()) {
-					Object nestedHint = it.next();
-					if (!list.contains(nestedHint)) {
-						list.add(nestedHint);
-					}
-				}
-			} else if (!list.contains(hint))
-				list.add(hint);
-		}
-	}
-
-	/**
-	 * Returns if all children have the same selected type
-	 * 
-	 * @return true if all children are checked, false otherwise
-	 * @param parent
-	 *            we'll be checking the children of this parent
-	 * @param selectType
-	 *            the SelectedType that all children of the parent are checked
-	 *            for
-	 */
-	public static boolean doAllChildrenHaveSelectedType(
-			SelectableElement parent, SelectedType selectType) {
-		for (int i = 0; i < parent.getNumberOfChildren(); i++) {
-			if (parent.getChild(i).getSelectedType() != selectType)
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Return all children that have the SelectedType.
-	 * 
-	 * @param parent
-	 *            parent selectable element.
-	 * @param selectType
-	 *            the selected type to match
-	 * @param list
-	 *            of SelectableElements
-	 */
-	public static void getAllChildrenOfType(SelectableElement parent,
-			SelectedType selectType, List list) {
-		assert null != list;
-
-		for (int i = 0; i < parent.getNumberOfChildren(); i++) {
-			if (parent.getChild(i).getSelectedType() == selectType) {
-				list.add(parent.getChild(i));
-			}
-
-			getAllChildrenOfType(parent.getChild(i), selectType, list);
-		}
-	}
-
-	/**
-	 * Return element IDs, including children, that are SelectedType.SELECTED.
-	 * 
-	 * @return List of element IDs, including children, that are
-	 *         SelectedType.SELECTED.
-	 */
-	public List getSelectedElementIds() {
-		List list = new ArrayList();
-		getMatchingElementIds(list, SelectedType.SELECTED);
-		return list;
-	}
-
-	/**
-	 * Return matching element IDs that match the typeToMatch.
-	 * 
-	 * @param matchingIds
-	 *            List of String ids we are filling
-	 * @param typeToMatch
-	 *            going to match this type
-	 */
-	private void getMatchingElementIds(List matchingIds,
-			SelectedType typeToMatch) {
-
-		for (int i = 0; i < getNumberOfChildren(); i++) {
-			getChild(i).getMatchingElementIds(matchingIds, typeToMatch);
-		}
-		if (getSelectedType() == typeToMatch) {
-			matchingIds.add(getId());
-		}
-	}
-
-	/**
-	 * Same idea as the clone method. Share the same images, hints, etc. of the
-	 * original. Just have different SelectableElements.
-	 * 
-	 * @return a copy of this selectableElement
-	 */
-	public SelectableElement makeCopy() {
-		SelectableElement selectableElement = immediateCopy(this);
-		copyChildren(this, selectableElement);
-		return selectableElement;
-	}
-
-	/**
-	 * Used by the copy method. Not suprisingly, this returns a copy of the src
-	 * 
-	 * @param src
-	 *            children will be copied from here
-	 * @return SelectableElement which is a copy of the src
-	 */
-	private SelectableElement immediateCopy(SelectableElement src) {
-		SelectableElement selectableElement = new SelectableElement(
-			src.getId(), src.getName(), src.getIconImageDescriptor(), src
-				.getHint());
-		selectableElement.setSelectedType(src.getSelectedType());
-		return selectableElement;
-	}
-
-	/**
-	 * Used by the copy method. Not surprisingly, this copies the children of
-	 * src into dest.
-	 * 
-	 * @param src
-	 *            children will be copied from here
-	 * @param dest
-	 *            children are copied into here
-	 */
-	private void copyChildren(SelectableElement src, SelectableElement dest) {
-		for (int i = 0; i < src.getNumberOfChildren(); i++) {
-			dest.addChild(immediateCopy(src.getChild(i)));
-			copyChildren(src.getChild(i), dest.getChild(i));
-		}
-	}
-
-	/**
-	 * Collect all the hints of the children into a list.
-	 * 
-	 * @param list
-	 *            that I am collecting the hints into.
-	 */
-	private void collectChildrenHints(List list) {
-		Object aHint = getHint();
-		if (aHint instanceof List) {
-			Iterator it = ((List) aHint).iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (!list.contains(obj))
-					list.add(obj);
-			}
-
-		} else if (aHint != null) {
-			if (!list.contains(aHint))
-				list.add(aHint);
-		}
-
-		for (int i = 0; i < getChildren().length; i++) {
-			getChild(i).collectChildrenHints(list);
-		}
-	}
-
-	/**
-	 * Collect the types that match a list of String ids. Unlike getHints, which
-	 * doesn't collect children hints.
-	 * 
-	 * @param list
-	 *            List to add into
-	 * @param ids
-	 *            List of String ids we are trying to match
-	 */
-	public void getHintsThatMatchTheseIds(List list, List ids) {
-		for (int i = 0; i < getNumberOfChildren(); i++) {
-			if (ids.contains(getChild(i).getId())) {
-				getChild(i).collectChildrenHints(list);
-			} else {
-				getChild(i).getHintsThatMatchTheseIds(list, ids);
-			}
-		}
-	}
-
-	/**
-	 * Return the first element that matches the given id from the List of
-	 * SelectableElement objects
-	 * 
-	 * @param selectableElements
-	 *            List of SelectableElement objects to match
-	 * @param id
-	 *            String id to match
-	 * @return the first element that matches the given id from the List of
-	 *         SelectableElement objects or null if nothing matched
-	 */
-	public static SelectableElement findById(List selectableElements, String id) {
-		assert null != selectableElements;
-		Iterator it = selectableElements.iterator();
-
-		while (it.hasNext()) {
-			Object obj = it.next();
-			assert (obj instanceof SelectableElement);
-
-			SelectableElement selectableElement = (SelectableElement) obj;
-			if (id.equals(selectableElement.getId())) {
-				return selectableElement;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Return the first element that matches the given id from this
-	 * SelectableElement and its children
-	 * 
-	 * @param theId
-	 *            String id to match
-	 * @return the first element that matches the given id from this
-	 *         SelectableElement and its children or null if nothing matched
-	 */
-	public SelectableElement findById(String theId) {
-
-		assert null != theId;
-		if (theId.equals(this.getId())) {
-			return this;
-		}
-
-		for (int i = 0; i < getNumberOfChildren(); i++) {
-			SelectableElement element = getChild(i).findById(theId);
-			if (element != null)
-				return element;
-		}
-
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectedType.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectedType.java
deleted file mode 100644
index 2405caa..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/SelectedType.java
+++ /dev/null
@@ -1,92 +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.dialogs;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Describes how a {@link
- * org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement
- * SelectableElement} is selected.  This is either selected,
- * unselected, or leave.
- * 
- * @author wdiu, Wayne Diu
- */
-
-public class SelectedType
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for selection of elements.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * The element was selected.
-	 */
-	public static final SelectedType SELECTED = new SelectedType("Selected"); //$NON-NLS-1$
-
-	/**
-	 * The element was unselected.
-	 */
-	public static final SelectedType UNSELECTED = new SelectedType("Unselected"); //$NON-NLS-1$
-
-	/**
-	 * The element was neither selected nor unselected
-	 */
-	public static final SelectedType LEAVE = new SelectedType("Leave"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final SelectedType[] VALUES = {SELECTED, UNSELECTED, LEAVE};
-
-	/**
-	 * Constructs a new model type with the specified name and ordinal.
-	 * 
-	 * @param name
-	 *            The name of the new model type.
-	 * @param ordinal
-	 *            The ordinal for the new model type.
-	 */
-	protected SelectedType(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new model type with the specified name.
-	 * 
-	 * @param name
-	 *            The name of the new model type.
-	 */
-	private SelectedType(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));
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowHideRelationshipsDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowHideRelationshipsDialog.java
deleted file mode 100644
index d834c15..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowHideRelationshipsDialog.java
+++ /dev/null
@@ -1,553 +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.dialogs;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.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.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIIconNames;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementTreeSelectionChangedAndMouseAndKeyListener;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementsContentProvider;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementsTriStateLabelProvider;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-
-/**
- * Show Hide Relationships dialog box, called from an action.
- * 
- * When OK is clicked, returns Window.OK and result of the dialog is saved.
- * 
- * When Cancel is clicked, returns Window.Cancel and result of dialog is not
- * saved.
- * 
- * @author Wayne Diu, wdiu
- */
-public class ShowHideRelationshipsDialog
-	extends Dialog {
-
-	/* Controls */
-
-	/**
-	 * The viewer on the left side of the box
-	 */
-	private TreeViewer viewer;
-
-	/**
-	 * OK button
-	 */
-	private Button ok;
-
-	/**
-	 * Cancel button
-	 */
-	private Button cancel;
-
-	/* Data for the view control */
-
-	/**
-	 * The root element
-	 */
-	private SelectableElement rootElement;
-
-	/**
-	 * The context sensitive help id
-	 */
-	private String helpContextId;
-
-	/* Statics */
-
-	/**
-	 * Tree viewer control's width for the hint
-	 */
-	private static int MAX_VIEWER_WIDTH = 400;
-
-	/**
-	 * Tree viewer control's height for the hint
-	 */
-	private static int MAX_VIEWER_HEIGHT = 400;
-
-	/**
-	 * Expansion group's width for the hint
-	 */
-	private static int TEXT_AREA_HEIGHT = 46;
-
-	static {
-		try {
-			MAX_VIEWER_WIDTH = Integer
-				.parseInt(CommonUIMessages.ShowHideRelationshipsDialog_MAX_VIEWER_WIDTH);
-			MAX_VIEWER_HEIGHT = Integer
-				.parseInt(CommonUIMessages.ShowHideRelationshipsDialog_MAX_VIEWER_HEIGHT);
-			TEXT_AREA_HEIGHT = Integer
-				.parseInt(CommonUIMessages.ShowHideRelationshipsDialog_TEXT_AREA_HEIGHT);
-		} catch (NumberFormatException e) {
-			/* already initialized with defaults */
-			Trace.catching(CommonUIPlugin.getDefault(),
-				CommonUIDebugOptions.EXCEPTIONS_CATCHING, CommonUIPlugin
-					.getDefault().getClass(), "NumberFormatException", e); //$NON-NLS-1$
-			Log
-				.error(
-					CommonUIPlugin.getDefault(),
-					CommonUIStatusCodes.RESOURCE_FAILURE,
-					"Failed to parse Show Hide Relationships Dialog's localized size", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * The real viewer width
-	 */
-	private int viewerWidth = MAX_VIEWER_WIDTH;
-
-	/* Legend icons */
-
-	/**
-	 * Selected icon image
-	 */
-	Image selectedIcon;
-
-	/**
-	 * Unselected icon image
-	 */
-	Image unselectedIcon;
-
-	/**
-	 * Cleared icon image
-	 */
-	Image clearedIcon;
-
-	/**
-	 * Constructor takes the parent shell and data to add into the viewer
-	 * 
-	 * @param parentShell
-	 *            the parent Shell
-	 * @param aRootElement
-	 *            the root SelectableElement to add into the viewer
-	 */
-	public ShowHideRelationshipsDialog(Shell parentShell,
-			SelectableElement aRootElement) {
-		super(parentShell);
-		this.rootElement = aRootElement.makeCopy();
-
-		try {
-			selectedIcon = AbstractUIPlugin.imageDescriptorFromPlugin(
-				CommonUIPlugin.getPluginId(),
-				CommonUIIconNames.IMG_CHECKBOX_SELECTED).createImage(); 
-			unselectedIcon = AbstractUIPlugin.imageDescriptorFromPlugin(
-				CommonUIPlugin.getPluginId(),
-				CommonUIIconNames.IMG_CHECKBOX_UNSELECTED).createImage(); 
-			clearedIcon = AbstractUIPlugin.imageDescriptorFromPlugin(
-				CommonUIPlugin.getPluginId(),
-				CommonUIIconNames.IMG_CHECKBOX_CLEARED).createImage(); 
-		} catch (Exception e) {
-			Trace.catching(CommonUIPlugin.getDefault(),
-				CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"ShowHideRelationshipsDialog", e); //$NON-NLS-1$
-			Log
-				.error(
-					CommonUIPlugin.getDefault(),
-					CommonUIStatusCodes.RESOURCE_FAILURE,
-					"Failed to get legend icons for Show Hide Relationships Dialog", e); //$NON-NLS-1$
-			// if even one is bad, then I'm not going to display the legend
-			disposeImages();
-			selectedIcon = null;
-			/*
-			 * don't have to do the rest, I'm just checking selectedIcon
-			 * unselectedIcon = null; clearedIcon = null;
-			 */
-		}
-
-	}
-
-	/**
-	 * Returns the tree viewer
-	 * 
-	 * @return TreeViewer on the left side of the dialog
-	 */
-	protected TreeViewer getTreeViewer() {
-		return viewer;
-	}
-
-	/**
-	 * Sets the tree viewer
-	 * 
-	 * @param aViewer
-	 *            is the TreeViewer on the left side of the dialog
-	 */
-	protected void setTreeViewer(TreeViewer aViewer) {
-		this.viewer = aViewer;
-	}
-
-	/**
-	 * Make the tree viewer on the left side of the dialog
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 */
-	protected void createViewer(Composite parent) {
-		setTreeViewer(new TreeViewer(parent, SWT.SINGLE | SWT.V_SCROLL
-			| SWT.BORDER));
-
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-
-		gridData.widthHint = viewerWidth;
-
-		// calculate the tree viewer height
-		int viewerHeight = SelectableElement
-			.calculateNumberOfChildren(rootElement);
-		GC gc = new GC(getTreeViewer().getTree());
-		Point size = gc.textExtent(StringStatics.BLANK);
-		// the buffer is 64
-		viewerHeight = (viewerHeight * size.y) + 64;
-		gc.dispose();
-		if (viewerHeight > MAX_VIEWER_HEIGHT)
-			viewerHeight = MAX_VIEWER_HEIGHT;
-		gridData.heightHint = viewerHeight;
-
-		Tree tree = getTreeViewer().getTree();
-		tree.setLayoutData(gridData);
-		tree.setLayout(new GridLayout(1, true));
-
-		getTreeViewer().setUseHashlookup(true);
-
-		SelectableElementTreeSelectionChangedAndMouseAndKeyListener listener = new SelectableElementTreeSelectionChangedAndMouseAndKeyListener(
-			getTreeViewer()) {
-
-			protected void switchCheckType(SelectableElement element) {
-				if (element.getSelectedType() == SelectedType.LEAVE) {
-					element.setSelectedType(SelectedType.UNSELECTED);
-				} else if (element.getSelectedType() == SelectedType.UNSELECTED) {
-					element.setSelectedType(SelectedType.SELECTED);
-				} else if (element.getSelectedType() == SelectedType.SELECTED) {
-					element.setSelectedType(SelectedType.LEAVE);
-				}
-			}
-		};
-
-		getTreeViewer().addSelectionChangedListener(listener);
-		getTreeViewer().getTree().addMouseListener(listener);
-		getTreeViewer().getTree().addKeyListener(listener);
-
-	}
-
-	/**
-	 * Makes the buttons at the bottom of the dialog
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 */
-	protected void makeButtons(Composite parent) {
-		Composite empty = new Composite(parent, SWT.NULL);
-		GridData gridData = new GridData();
-		gridData.heightHint = 20;
-		empty.setLayoutData(gridData);
-
-		Composite right = new Composite(parent, SWT.NULL);
-		right.setLayout(new GridLayout(3, false));
-		right.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		ok = new Button(right, SWT.PUSH);
-		ok.setText(CommonUIMessages.ShowHideRelationshipsDialog_Button_OK);
-		ok.setLayoutData(WindowUtil.makeFixedButtonData(ok));
-		ok.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				performOk();
-			}
-		});
-		cancel = new Button(right, SWT.PUSH);
-		cancel
-			.setText(CommonUIMessages.ShowHideRelationshipsDialog_Button_Cancel);
-		cancel.setLayoutData(WindowUtil.makeFixedButtonData(cancel));
-		cancel.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				setReturnCode(Window.CANCEL);
-				disposeImages();
-				close();
-			}
-		});
-	}
-
-	/**
-	 * Creates the line of text at the top of the dialog
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 */
-	private void createLineOfTextAtTop(Composite parent) {
-		Composite top = new Composite(parent, SWT.NULL);
-
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL
-			| GridData.FILL_VERTICAL);
-
-		// Assume the fonts in the tree control and in the composite are the
-		// same.
-		// I calculate viewerWidth by doing
-		// text length in pixels + beginning + buffer
-		// text length in pixels + 32 + 64
-		viewerWidth = SelectableElement.calculateLongestStringLength(
-			rootElement, top) + 96;
-		if (viewerWidth > MAX_VIEWER_WIDTH)
-			viewerWidth = MAX_VIEWER_WIDTH;
-
-		// the width will be smaller by a little bit, but that's ok
-		gridData.widthHint = viewerWidth;
-		gridData.heightHint = TEXT_AREA_HEIGHT;
-
-		top.setLayoutData(gridData);
-		top.setLayout(new GridLayout(1, false));
-
-		Label label = new Label(top, SWT.WRAP);
-
-		label.setText(CommonUIMessages.ShowHideRelationshipsDialog_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
-			| GridData.FILL_VERTICAL));
-	}
-
-	/**
-	 * Makes a little blank box
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 */
-	private void makeBlankBox(Composite parent) {
-		Composite blankBox = new Composite(parent, SWT.NULL);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.heightHint = 10;
-		blankBox.setLayoutData(gridData);
-	}
-
-	/**
-	 * Creates the legend at the bottom of the dialog just above the buttons
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 */
-	private void createLegend(Composite parent) {
-		final int NUM_BOXES = 3;
-
-		makeBlankBox(parent);
-
-		Label label = new Label(parent, SWT.NULL);
-		label
-			.setText(CommonUIMessages.ShowHideRelationshipsDialog_Label_Legend);
-
-		Composite legendBox = new Composite(parent, SWT.BORDER);
-
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-
-		legendBox.setLayoutData(gridData);
-		legendBox.setLayout(new GridLayout(3, true));
-
-		Composite[] elements = new Composite[NUM_BOXES];
-
-		for (int i = 0; i < NUM_BOXES; i++) {
-			elements[i] = new Composite(legendBox, SWT.NULL);
-
-			gridData = new GridData(GridData.FILL_HORIZONTAL);
-
-			elements[i].setLayoutData(gridData);
-			elements[i].setLayout(new GridLayout(2, false));
-		}
-
-		// 1
-		label = new Label(elements[0], SWT.NULL);
-		label.setImage(selectedIcon);
-
-		label = new Label(elements[0], SWT.NULL);
-		label
-			.setText(CommonUIMessages.ShowHideRelationshipsDialog_Label_LegendShow);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
-			| GridData.FILL_VERTICAL));
-
-		// 2
-		label = new Label(elements[1], SWT.NULL);
-		label.setImage(unselectedIcon);
-
-		label = new Label(elements[1], SWT.NULL);
-		label
-			.setText(CommonUIMessages.ShowHideRelationshipsDialog_Label_LegendHide);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
-			| GridData.FILL_VERTICAL));
-
-		// 3
-		label = new Label(elements[2], SWT.NULL);
-		label.setImage(clearedIcon);
-
-		label = new Label(elements[2], SWT.NULL);
-		label
-			.setText(CommonUIMessages.ShowHideRelationshipsDialog_Label_LegendLeave);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
-			| GridData.FILL_VERTICAL));
-
-		makeBlankBox(parent);
-	}
-
-	/**
-	 * Makes the dialog
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 * @return Control the parent Composite
-	 */
-	protected Control createContents(Composite parent) {
-
-		// if you want a line of text at the top of the dialog
-		createLineOfTextAtTop(parent);
-
-		Composite bottom = new Composite(parent, SWT.NULL);
-
-		bottom.setLayoutData(new GridData(GridData.FILL_BOTH));
-		bottom.setLayout(new GridLayout(1, false));
-
-		createViewer(bottom);
-
-		/*
-		 * don't have to do the rest, I'm just checking selectedIcon
-		 * unselectedIcon != null && clearedIcon != null
-		 */
-		if (selectedIcon != null)
-			createLegend(bottom);
-
-		makeButtons(bottom);
-
-		viewer.setLabelProvider(new SelectableElementsTriStateLabelProvider());
-		viewer.setContentProvider(new SelectableElementsContentProvider());
-
-		getTreeViewer().setInput(rootElement);
-
-		Tree tree = getTreeViewer().getTree();
-
-		// I just set the input to the root, so I make these asserts
-		TreeItem[] treeItems = tree.getItems();
-		assert null != treeItems : "treeItems cannot be null"; //$NON-NLS-1$
-		assert treeItems.length == 1 : "treeItems cannot be empty"; //$NON-NLS-1$
-		tree.setSelection(treeItems);
-
-		ok.setFocus();
-
-		resetDialog();
-
-		viewer.refresh();
-
-		getShell().setText(CommonUIMessages.ShowHideRelationshipsDialog_Title);
-
-        // set context sensitive help
-        if (helpContextId != null) {
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
-                helpContextId);
-        } else {
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, 
-                "org.eclipse.gmf.runtime.common.ui.egmf0100"); //$NON-NLS-1$
-        }
-
-		return parent;
-
-	}
-
-	/**
-	 * OK button click handler
-	 */
-	protected void performOk() {
-		disposeImages();
-		setReturnCode(Window.OK);
-		close();
-	}
-
-	/**
-	 * Reset button click handler, called to initialize the dialog
-	 */
-	void resetDialog() {
-		viewer.expandAll();
-	}
-
-	/**
-	 * Returns the root element of the RelatedElements that were in the viewer
-	 * control at the left of the dialog.
-	 * 
-	 * @return SelectableElement with the root element.
-	 */
-	public SelectableElement getRootElement() {
-		return rootElement;
-	}
-
-	/**
-	 * Returns a list of the selected relationship types.
-	 * 
-	 * @return List of the selected relationship types
-	 */
-	public List getSelectedRelationshipTypes() {
-		if (this.rootElement == null) {
-			return null;
-		}
-		return this.rootElement.getSelectedElementTypes();
-	}
-
-	/**
-	 * Returns a list of the unselected relationship types.
-	 * 
-	 * @return List of the unselected relationship types
-	 */
-	public List getUnselectedRelationshipTypes() {
-		if (this.rootElement == null) {
-			return null;
-		}
-		return this.rootElement.getUnSelectedElementTypes();
-	}
-
-	/**
-	 * Initialize the context sensitive help id.
-	 * 
-	 * @param helpId
-	 *            the help context id string
-	 */
-	public void initHelpContextId(String helpId) {
-		this.helpContextId = helpId;
-	}
-
-	/**
-	 * Disposes the images for the legend box
-	 */
-	public void disposeImages() {
-		if (selectedIcon != null && !selectedIcon.isDisposed())
-			selectedIcon.dispose();
-		if (unselectedIcon != null && !unselectedIcon.isDisposed())
-			unselectedIcon.dispose();
-		if (clearedIcon != null && !clearedIcon.isDisposed())
-			clearedIcon.dispose();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsComposite.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsComposite.java
deleted file mode 100644
index 35c74d0..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsComposite.java
+++ /dev/null
@@ -1,1088 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementTreeSelectionChangedAndMouseAndKeyListener;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementsContentProvider;
-import org.eclipse.gmf.runtime.common.ui.internal.dialogs.SelectableElementsTriStateLabelProvider;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-
-/**
- * A composite intended to be used in the Show Related Elements dialog. It
- * contains the details of determining which elements to show.
- * 
- * @author wdiu, schafe
- */
-public class ShowRelatedElementsComposite
-	extends Composite {
-
-	/**
-	 * The viewer on the left side of the box
-	 */
-	private TreeViewer viewer;
-
-	/**
-	 * Expansion group on right side of the box
-	 */
-	private Composite expansionComposite;
-
-	/**
-	 * The selection to consumer radio
-	 */
-	private Button consumerToSelection;
-
-	/**
-	 * The selection to supplier radio
-	 */
-	private Button selectionToSupplier;
-
-	/**
-	 * The both radio, for both selectionToConsumer and selectionToSupplier
-	 */
-	private Button both;
-
-	/**
-	 * The all connected radio
-	 */
-	private Button allConnected;
-
-	/**
-	 * For now, not all SRE implementors are supporting all connected. Later on,
-	 * this variable will be removed and we will always show "All connected"
-	 * because it will be required to be supported.
-	 */
-	protected boolean showAllConnected = false;
-
-	/**
-	 * Number of levels to add related elements
-	 */
-	private Text levels;
-
-	/**
-	 * Expand indefinitely checkbox
-	 */
-	private Button expandIndefinitely;
-
-	/**
-	 * The root element
-	 */
-	private SelectableElement rootElement;
-
-	/**
-	 * Value of the expand indefinitely checkbox
-	 */
-	private boolean cachedExpandIndefinitely;
-
-	/**
-	 * Value of the number of levels to expand box
-	 */
-	private int cachedExpandLevels;
-
-	/**
-	 * The expansion type
-	 */
-	private ExpansionType cachedExpansionType = ExpansionType.INCOMING;
-
-	/**
-	 * Show Related Elements image 1 for the right side of the dialog
-	 */
-	private Image showRelatedElementsImage1;
-
-	/**
-	 * Show Related Elements image 2 for the right side of the dialog
-	 */
-	private Image showRelatedElementsImage2;
-
-	/**
-	 * Show Related Elements image 3 for the right side of the dialog
-	 */
-	private Image showRelatedElementsImage3;
-
-	/**
-	 * True if you need to see the expansion controls, false otherwise
-	 */
-	private boolean needsExpansionControls;
-
-	/**
-	 * Listener for details being changed
-	 */
-	protected IShowRelatedElementsWithDetails detailsChangedListener;
-
-	/**
-	 * Contributed the expansion group.
-	 */
-	protected Composite contributedExpansionGroupComposite = null;
-
-	/**
-	 * Default value of the levels box
-	 */
-	private static final int DEFAULT_LEVELS = 1;
-
-	/**
-	 * Viewer width that's passed in from the constructor We don't have to
-	 * calculate it.
-	 */
-	protected int viewerWidth = -1;
-
-	/**
-	 * Constructor for ShowRelatedElementsComposite.
-	 * 
-	 * @param parent
-	 *            parent Composite
-	 * @param aRootElement
-	 *            root SelectableElement
-	 * @param preferredViewerWidth
-	 *            the preferred viewer width hint
-	 */
-	public ShowRelatedElementsComposite(Composite parent,
-			SelectableElement aRootElement, int preferredViewerWidth) {
-
-		this(parent, aRootElement, true, preferredViewerWidth);
-	}
-
-	/**
-	 * List of SelectableElement objects
-	 */
-	private List selectedSelectableElements;
-
-	/**
-	 * Constructor for ShowRelatedElementsComposite.
-	 * 
-	 * @param parent
-	 *            parent Composite
-	 * @param aRootElement
-	 *            root SelectableElement
-	 * @param createExpansion
-	 *            true to create the expansion group, false not to create it
-	 * @param preferredViewerWidth
-	 *            the preferred viewer width hint
-	 */
-	public ShowRelatedElementsComposite(Composite parent,
-			SelectableElement aRootElement, boolean createExpansion,
-			int preferredViewerWidth) {
-
-		super(parent, SWT.NONE);
-		this.needsExpansionControls = createExpansion;
-		this.rootElement = aRootElement.makeCopy();
-
-		selectedSelectableElements = new ArrayList();
-		SelectableElement.getAllChildrenOfType(this.rootElement,
-			SelectedType.LEAVE, selectedSelectableElements);
-
-		this.viewerWidth = preferredViewerWidth;
-		createContents();
-
-		// add listener for dispose of images
-		addListener(SWT.Dispose, new Listener() {
-
-			public void handleEvent(Event e) {
-				onDispose();
-			}
-		});
-	}
-
-	/**
-	 * Creates content for this composite.
-	 */
-	protected void createContents() {
-
-		this.setLayoutData(new GridData(GridData.FILL_BOTH));
-		this.setLayout(new GridLayout(2, false));
-
-		createViewer();
-
-		//only create the expansion group if specified
-		//to do so
-		if (this.needsExpansionControls) {
-			createExpansionControls();
-		}
-
-		reset();
-		viewer.refresh();
-	}
-
-	/**
-	 * Return the viewerWidth calculated in createContents, which is called by
-	 * the constructor.
-	 * 
-	 * @return int viewerWidth calculated in createContents, which is called by
-	 *         the constructor.
-	 */
-	public int getViewerWidth() {
-		return this.viewerWidth;
-	}
-
-	/**
-	 * Reset button click handler, called to initialize the dialog
-	 */
-	protected void reset() {
-
-		if (this.needsExpansionControls) {
-			setBoth();
-			setExpand(DEFAULT_LEVELS);
-		}
-
-		SelectableElement.setSelectedTypeForSelecteableElementAndChildren(
-			rootElement, SelectedType.SELECTED);
-
-		assert null != selectedSelectableElements;
-		Iterator it = selectedSelectableElements.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			assert (obj instanceof SelectableElement);
-			SelectableElement.setSelectedTypeForSelecteableElementAndChildren(
-				(SelectableElement) obj, SelectedType.LEAVE);
-		}
-
-		viewer.expandToLevel(2);
-		viewer.refresh();
-	}
-
-	/**
-	 * Returns the tree viewer
-	 * 
-	 * @return CheckboxTreeViewer on the left side of the dialog
-	 */
-	public TreeViewer getTreeViewer() {
-		return this.viewer;
-	}
-
-	/**
-	 * Method getLevels.
-	 * 
-	 * @return Text Control for levels
-	 */
-	public Text getLevels() {
-		return this.levels;
-	}
-
-	/**
-	 * Gets cached value for expandIndefinitely.
-	 * 
-	 * @return boolean true if expand indefinitely was checked when cached,
-	 *         false if it wasn't checked when cached.
-	 */
-	public boolean getExpandIndefinitely() {
-		return this.cachedExpandIndefinitely;
-	}
-
-	/**
-	 * Gets cached value for expandLevels.
-	 * 
-	 * @return int cached expand levels
-	 */
-	public int getExpandLevel() {
-		return this.cachedExpandLevels;
-	}
-
-	/**
-	 * Return the user's expansion type choice
-	 * 
-	 * @return ExpansionType the ExpansionType that was saved when cached
-	 */
-	public ExpansionType getExpansionType() {
-		return cachedExpansionType;
-	}
-
-	/**
-	 * Gets cached value for consumerToSelection. This will be deprecated when
-	 * all SRE implementors implement the all connected option. Use
-	 * getExpansionType() instead.
-	 * 
-	 * @return boolean true if at least one of the incoming or both checkboxes
-	 *         were selected when cached, false if none were selected when
-	 *         cached.
-	 */
-	public boolean getConsumerToSelection() {
-		return cachedExpansionType.equals(ExpansionType.INCOMING)
-			|| cachedExpansionType.equals(ExpansionType.BOTH);
-	}
-
-	/**
-	 * Gets cached value for selectiontoSupplier. This will be deprecated when
-	 * all SRE implementors implement the all connected option. Use
-	 * getExpansionType() instead.
-	 * 
-	 * @return boolean true if at least one of the outgoing or both checkboxes
-	 *         were selected when cached, false if none were selected when
-	 *         cached.
-	 */
-	public boolean getSelectionToSupplier() {
-		return cachedExpansionType.equals(ExpansionType.OUTGOING)
-			|| cachedExpansionType.equals(ExpansionType.BOTH);
-	}
-
-	/**
-	 * Gets cached value for all connected. This will be deprecated when all SRE
-	 * implementors implement the all connected option. Use getExpansionType()
-	 * instead.
-	 * 
-	 * @return boolean true if the all connected checkbox was selected when
-	 *         cached, false if it was not selected when cached.
-	 */
-	public boolean getAllConnected() {
-		return cachedExpansionType.equals(ExpansionType.ALL);
-	}
-
-	/**
-	 * Returns a list of the selected relationship types.
-	 * 
-	 * @return List of relationship types that were from SelectableElement
-	 *         objects under the root that had a SelectedType of SELECTED.
-	 */
-	public List getSelectedRelationshipTypes() {
-		if (this.rootElement == null) {
-			return null;
-		}
-		return this.rootElement.getSelectedElementTypes();
-	}
-
-	/**
-	 * Sets the tree viewer
-	 * 
-	 * @param aViewer
-	 *            is the CheckboxTreeViewer
-	 */
-	protected void setTreeViewer(TreeViewer aViewer) {
-		this.viewer = aViewer;
-	}
-
-	/**
-	 * Create the tree viewer in this composite. The tree viewer is used to
-	 * display relationships.
-	 */
-	protected void createViewer() {
-		Label label = new Label(this, SWT.NULL);
-		label.setText(
-			CommonUIMessages.ShowRelatedElementsDialog_RelationshipTypes);
-		GridData gridData = new GridData();
-		gridData.horizontalSpan = 2;
-		label.setLayoutData(gridData);
-
-		setTreeViewer(new TreeViewer(this, SWT.SINGLE | SWT.V_SCROLL
-			| SWT.BORDER));
-
-		gridData = new GridData(GridData.FILL_BOTH);
-		gridData.widthHint = this.viewerWidth;
-		//gridData.heightHint = VIEWER_HEIGHT;
-		gridData.horizontalSpan = 2;
-		Tree tree = getTreeViewer().getTree();
-		tree.setLayoutData(gridData);
-		//tree.setLayout(new GridLayout(1, true));
-
-		getTreeViewer().setUseHashlookup(true);
-
-		getTreeViewer().setLabelProvider(
-			new SelectableElementsTriStateLabelProvider());
-		getTreeViewer().setContentProvider(
-			new SelectableElementsContentProvider());
-
-		getTreeViewer().setInput(this.rootElement);
-
-		//I just set the input to the root, so I make these asserts
-		TreeItem[] treeItems = tree.getItems();
-		assert null != treeItems;
-		assert (treeItems.length == 1);
-		tree.setSelection(treeItems);
-
-		SelectableElementTreeSelectionChangedAndMouseAndKeyListener listener = new SelectableElementTreeSelectionChangedAndMouseAndKeyListener(
-			getTreeViewer()) {
-
-			protected void switchCheckType(SelectableElement element) {
-				detailsChanged();
-
-				if (element.getSelectedType() == SelectedType.LEAVE) {
-					element.setSelectedType(SelectedType.SELECTED);
-				} else if (element.getSelectedType() == SelectedType.SELECTED) {
-					element.setSelectedType(SelectedType.LEAVE);
-				}
-			}
-		};
-
-		getTreeViewer().addSelectionChangedListener(listener);
-		tree.addMouseListener(listener);
-		tree.addKeyListener(listener);
-	}
-
-	/**
-	 * Contribute to the expansion group composite
-	 * 
-	 * @param parent
-	 *            the parent expansion group composite that we are going to
-	 *            contribute to.
-	 */
-	protected void contributeToExpansionGroupComposite(Composite parent) {
-		//do not add anything
-	}
-
-	/**
-	 * Create group on left side of composite, to select expansion criteria.
-	 */
-	protected void createExpansionControls() {
-		this.expansionComposite = new Composite(this, SWT.NULL);
-
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		this.expansionComposite.setLayoutData(gridData);
-		GridLayout gridLayout = new GridLayout(2, false);
-		gridLayout.marginHeight = gridLayout.marginWidth = 0;
-		this.expansionComposite.setLayout(gridLayout);
-
-		Label label1 = new Label(this.expansionComposite, SWT.NULL);
-		gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		label1.setLayoutData(gridData);
-		label1.setText(CommonUIMessages.ShowRelatedElementsDialog_ExpansionGroup_Text);
-		
-		Composite expansionGroupComposite = new Composite(this.expansionComposite, SWT.NONE);
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		expansionGroupComposite.setLayoutData(gridData);
-		gridLayout = new GridLayout();
-		gridLayout.marginHeight = gridLayout.marginWidth = 0;
-		expansionGroupComposite.setLayout(gridLayout);
-
-		consumerToSelection = new Button(expansionGroupComposite, SWT.RADIO);
-		consumerToSelection.setText(
-			CommonUIMessages.ShowRelatedElementsDialog_Incoming); 
-		consumerToSelection.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				detailsChanged();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		selectionToSupplier = new Button(expansionGroupComposite, SWT.RADIO);
-		selectionToSupplier.setText(
-			CommonUIMessages.ShowRelatedElementsDialog_Outgoing);
-		selectionToSupplier.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				detailsChanged();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		//TODO temporarily hide the all connected radio button
-		allConnected = new Button(expansionGroupComposite, SWT.RADIO);
-		allConnected.setText(
-			CommonUIMessages.ShowRelatedElementsDialog_AllConnected);
-		allConnected.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				detailsChanged();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		gridData = new GridData();
-		gridData.exclude = !showAllConnected;
-		allConnected.setLayoutData(gridData);
-		/*
-		 * We have to set the visibility also to ensure screen readers
-		 * read the grouped controls properly. JAWS, for example, requires
-		 * controls to be invisible if they are to be skipped.
-		 */
-		allConnected.setVisible(showAllConnected);
-
-		both = new Button(expansionGroupComposite, SWT.RADIO);
-		both
-			.setText(
-				CommonUIMessages.ShowRelatedElementsDialog_ExpansionGroup_RadioButton_Both);
-		both.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				detailsChanged();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-
-		//TODO all connected radio should be moved here when fully implemented
-
-		//subclasses will override this method if they need to contribute
-		contributeToExpansionGroupComposite(this.expansionComposite);
-
-		Label label2 = new Label(this.expansionComposite, SWT.NULL);
-		gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		label2.setLayoutData(gridData);
-		label2.setText(CommonUIMessages.ShowRelatedElementsDialog_ExpansionGroup_Label_Levels);
-		
-		Composite levelsGroupComposite = new Composite(this.expansionComposite, SWT.NONE);
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		levelsGroupComposite.setLayoutData(gridData);
-		gridLayout = new GridLayout();
-		gridLayout.marginHeight = gridLayout.marginWidth = 0;
-		levelsGroupComposite.setLayout(gridLayout);
-
-		levels = new Text(levelsGroupComposite, SWT.BORDER);
-		gridData = new GridData();
-		//just pick a small, reasonable number, no need to externalize levels
-		// size
-		gridData.widthHint = 50;
-		levels.setLayoutData(gridData);
-		//don't use a modify listener
-		//this will reasonably handle almost all of the cases
-		levels.addKeyListener(new KeyListener() {
-
-			public void keyPressed(KeyEvent e) {
-				// do nothing
-			}
-
-			public void keyReleased(KeyEvent e) {
-				detailsChanged();
-			}
-		});
-
-		expandIndefinitely = new Button(levelsGroupComposite, SWT.CHECK);
-		expandIndefinitely
-			.setText(
-				CommonUIMessages.ShowRelatedElementsDialog_ExpansionGroup_CheckBox_Expand_Indefinitely); 
-		expandIndefinitely.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				widgetDefaultSelected(e);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				checkAndAskExpandIndefinitely();
-				detailsChanged();
-			}
-		});
-
-	}
-
-	/**
-	 * Performs validation. For now, only levels needs to be validated.
-	 * 
-	 * @param alert
-	 *            is true to alert the user when it fails, false to not alert
-	 *            the user
-	 * @return String null if it validated, the explanation message String if it
-	 *         did not validate
-	 */
-	public String validate(boolean alert) {
-		if (!validateLevels()) {
-			if (alert) {
-				performValidateFailed();
-			}
-			return 
-				CommonUIMessages.ShowRelatedElementsDialog_LevelsValidation_Message;
-		}
-
-		//subclasses may add more validation here by returning the
-		//explanation String when the first validate is false
-		return null;
-	}
-
-	/**
-	 * Validates the levels text box for an integer.
-	 * 
-	 * @return true if it validated, false if it did not validate
-	 */
-	private boolean validateLevels() {
-		if (levels.getText() == StringStatics.BLANK) {
-			return false;
-		} else {
-			int result;
-			try {
-				result = Integer.parseInt(levels.getText());
-				if (result < 0) {
-					return false;
-				}
-				return true;
-			} catch (NumberFormatException exception) {
-				//not an error, do not log
-				return false;
-			}
-		}
-		//you should not be here
-	}
-
-	/**
-	 * Call this when the validate for the levels text box fails. Displays a
-	 * message saying that the validation failed. Sets focus to the levels
-	 * control.
-	 */
-	private void performValidateFailed() {
-		MessageBox validate = new MessageBox(getShell(), SWT.ICON_ERROR);
-		validate.setText(
-			CommonUIMessages.ShowRelatedElementsDialog_LevelsValidation_Title);
-		validate
-			.setMessage(
-				CommonUIMessages.ShowRelatedElementsDialog_LevelsValidation_Message);
-		validate.open();
-		levels.setFocus();
-	}
-
-	/**
-	 * Saves the user input, so that it is available after the widgets have been
-	 * disposed.
-	 */
-	public void saveCachedValues() {
-
-		//if no expansion group, no values to be
-		//cached
-		if (!this.needsExpansionControls) {
-			return;
-		}
-		cachedExpandIndefinitely = expandIndefinitely.getSelection();
-
-		try {
-			cachedExpandLevels = Integer.parseInt(levels.getText());
-		} catch (NumberFormatException e) {
-			//this is expected when the user does not enter an integer
-			Trace.catching(CommonUIPlugin.getDefault(),
-				CommonUIDebugOptions.EXCEPTIONS_CATCHING,
-				ShowRelatedElementsComposite.class, "saveCachedValues", e); //$NON-NLS-1$
-			cachedExpandLevels = DEFAULT_LEVELS;
-		}
-
-		if (consumerToSelection.getSelection()) {
-			cachedExpansionType = ExpansionType.INCOMING;
-		} else if (selectionToSupplier.getSelection()) {
-			cachedExpansionType = ExpansionType.OUTGOING;
-		} else if (both.getSelection()) {
-			cachedExpansionType = ExpansionType.BOTH;
-		} else if (allConnected.getSelection()) {
-			cachedExpansionType = ExpansionType.ALL;
-		}
-
-	}
-
-	/**
-	 * Asks the user if they really want to expand indefinitely. This method
-	 * could clear the checkbox if it was already checked. If the expand
-	 * indefinitely checkbox is not checked, then it does not do anything
-	 */
-
-	public void checkAndAskExpandIndefinitely() {
-		if (expandIndefinitely.getSelection()) {
-			MessageBox messageBox = new MessageBox(getShell(), SWT.YES | SWT.NO
-				| SWT.ICON_QUESTION);
-			messageBox
-				.setText(
-					CommonUIMessages.ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Title);
-			messageBox
-				.setMessage(
-					CommonUIMessages.ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence1 
-					+ "\n" + CommonUIMessages.ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence2); //$NON-NLS-1$ 
-			if (messageBox.open() == SWT.NO) {
-				expandIndefinitely.setSelection(false);
-			}
-		}
-		levels.setEnabled(!expandIndefinitely.getSelection());
-	}
-
-	/**
-	 * Method called on composite dispose. Disposes of composite created images.
-	 */
-	private void onDispose() {
-		disposeImages();
-	}
-
-	/**
-	 * Disposes the images for the legend box.
-	 */
-	private void disposeImages() {
-		if (showRelatedElementsImage1 != null
-			&& !showRelatedElementsImage1.isDisposed())
-			showRelatedElementsImage1.dispose();
-		if (showRelatedElementsImage2 != null
-			&& !showRelatedElementsImage2.isDisposed())
-			showRelatedElementsImage2.dispose();
-		if (showRelatedElementsImage3 != null
-			&& !showRelatedElementsImage3.isDisposed())
-			showRelatedElementsImage3.dispose();
-	}
-
-	/**
-	 * Resets the root SelectableElement.
-	 * 
-	 * @param newRootElement
-	 *            the new SelectableElement to be used for the viewer's input
-	 */
-	public void resetRootElement(SelectableElement newRootElement) {
-		//set the rootElement to be new selectable element
-		this.rootElement = newRootElement;
-		viewer.setInput(newRootElement);
-		reset();
-	}
-
-	/**
-	 * Set the both radio button for expansion.
-	 */
-	public void setBoth() {
-		both.setSelection(true);
-		consumerToSelection.setSelection(false);
-		selectionToSupplier.setSelection(false);
-		allConnected.setSelection(false);
-	}
-
-	/**
-	 * Set the consumer to selection radio button for expansion.
-	 */
-	public void setConsumerToSelection() {
-		consumerToSelection.setSelection(true);
-		both.setSelection(false);
-		selectionToSupplier.setSelection(false);
-		allConnected.setSelection(false);
-	}
-
-	/**
-	 * Set the selection to supplier radio button for expansion.
-	 */
-	public void setSelectionToSupplier() {
-		selectionToSupplier.setSelection(true);
-		both.setSelection(false);
-		consumerToSelection.setSelection(false);
-		allConnected.setSelection(false);
-	}
-
-	/**
-	 * Set the selection to supplier radio button for expansion.
-	 */
-	public void setAllConnected() {
-		allConnected.setSelection(true);
-		selectionToSupplier.setSelection(false);
-		both.setSelection(false);
-		consumerToSelection.setSelection(false);
-	}
-
-	/**
-	 * Set the expand levels. Set to less than 0 for expand indefinitely.
-	 * 
-	 * @param expandLevels
-	 *            less than 0 for expand indefinitely, max int is 99.
-	 */
-	public void setExpand(int expandLevels) {
-		if (expandLevels >= 0) {
-			assert (expandLevels <= 99);
-			expandIndefinitely.setSelection(false);
-			levels.setEnabled(true);
-			levels.setText(Integer.toString(expandLevels));
-		} else {
-			expandIndefinitely.setSelection(true);
-			levels.setEnabled(false);
-		}
-	}
-
-	/**
-	 * Method ExpandIndefinitely
-	 * 
-	 * @param enable
-	 *            true to expand indefinitely and disable the levels text box
-	 */
-	public void ExpandIndefinitely(boolean enable) {
-		expandIndefinitely.setSelection(enable);
-		levels.setEnabled(!enable);
-	}
-
-	/**
-	 * Return the root element for the viewer
-	 * 
-	 * @return the root SelectableElement for the viewer
-	 */
-	public SelectableElement getRootElement() {
-		return rootElement;
-	}
-
-	/**
-	 * Enables or disables the controls that let the user choose the expansion
-	 * direction. These are the incoming, outgoing, and both controls.
-	 * 
-	 * @param enable
-	 *            true to enable, false to disable
-	 */
-	public void enableDirectionControls(boolean enable) {
-		consumerToSelection.setEnabled(enable);
-		both.setEnabled(enable);
-		selectionToSupplier.setEnabled(enable);
-	}
-
-	/**
-	 * Enables or disables the controls that let the user choose the number of
-	 * levels to expand. These are the expand indefinitely checkbox and the
-	 * levels text control.
-	 * 
-	 * @param enable
-	 *            true to enable, false to disable
-	 */
-	public void enableExpandLevels(boolean enable) {
-		expandIndefinitely.setEnabled(enable);
-		levels.setEnabled(enable);
-	}
-
-	/**
-	 * Select the SelectableElement objects with hints in the list.
-	 * 
-	 * @param list
-	 *            List of hints
-	 * @param selectableElement
-	 *            root SelectableElement which we call this method recursively
-	 *            on its children
-	 * 
-	 * @return true if it is selected if this is a leaf. If it's not a leaf,
-	 *         return true if all its children are selected. Return false if not
-	 *         all selected or leave.
-	 */
-	private boolean select(List list, SelectableElement selectableElement) {
-
-		if (selectableElement.getNumberOfChildren() == 0) {
-			if (list.contains(selectableElement.getHint())) {
-				selectableElement.setSelectedType(SelectedType.SELECTED);
-				return true;
-			} else {
-				selectableElement.setSelectedType(SelectedType.LEAVE);
-				return false;
-			}
-		} else {
-			boolean childrenSelected = true;
-			for (int i = 0; i < selectableElement.getNumberOfChildren(); i++) {
-				if (!select(list, selectableElement.getChild(i))) {
-					childrenSelected = false;
-				}
-			}
-
-			if (childrenSelected) {
-				selectableElement.setSelectedType(SelectedType.SELECTED);
-				return true;
-			} else {
-				selectableElement.setSelectedType(SelectedType.LEAVE);
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * One time initialize of the dialog's starting settings
-	 * 
-	 * @param cts
-	 *            consumer to selection, true if we want to show consumer to
-	 *            selection
-	 * @param sts
-	 *            selection to supplier, true if we want to show selection to
-	 *            supplier
-	 * @param expandLevel
-	 *            int with levels to expand, -1 for indefinite or 0 to 99.
-	 * @param selectedHints
-	 *            List of SelectableElement hints
-	 */
-	public void initializeSettings(boolean cts, boolean sts, int expandLevel,
-			List selectedHints) {
-		if (cts && sts) {
-			setBoth();
-		} else if (cts) {
-			setConsumerToSelection();
-		} else if (sts) {
-			setSelectionToSupplier();
-		} else {
-			//must have selected consumerToSelection or selectionToSupplier
-			//or both
-			assert (false);
-		}
-
-		setExpand(expandLevel);
-
-		select(selectedHints, rootElement);
-
-		viewer.refresh();
-
-		expandIndefinitely.setFocus();
-	}
-
-	/**
-	 * Update the relationships with the information contained in the preset
-	 * 
-	 * @param preset
-	 *            ShowRelatedElementsPreset that contains the information that I
-	 *            will be updating with.
-	 */
-	public void updateRelationships(ShowRelatedElementsPreset preset) {
-
-		assert null != rootElement;
-
-		if (preset == null) {
-			reset();
-			return;
-		}
-
-		SelectableElement.setSelectedTypeForSelecteableElementAndChildren(
-			rootElement, SelectedType.LEAVE);
-
-		//now go and select the ones that we need to select
-		SelectableElement
-			.setSelectedTypeForMatchingSelecteableElementAndChildren(
-				rootElement, SelectedType.SELECTED, preset.getIds());
-
-		if (preset.getExpansionType() == ExpansionType.INCOMING.getOrdinal()) {
-			setConsumerToSelection();
-		} else if (preset.getExpansionType() == ExpansionType.OUTGOING
-			.getOrdinal()) {
-			setSelectionToSupplier();
-		} else if (preset.getExpansionType() == ExpansionType.BOTH.getOrdinal()) {
-			setBoth();
-		} else if (preset.getExpansionType() == ExpansionType.ALL.getOrdinal()) {
-			setAllConnected();
-		} else {
-			//should be 1 of the 4 radio buttons
-			assert (false);
-		}
-
-		if (preset.getLevels() == -1) {
-			levels.setText("1"); //$NON-NLS-1$, just pick a reasonable number
-			expandIndefinitely.setSelection(true);
-			levels.setEnabled(false);
-		} else {
-			expandIndefinitely.setSelection(false);
-			levels.setText(Integer.toString(preset.getLevels()));
-			levels.setEnabled(true);
-		}
-
-		getTreeViewer().refresh();
-
-	}
-
-	/**
-	 * Return the immediate selected IDs for presisting the relationships that
-	 * the user selected.
-	 * 
-	 * @return Immediate selected IDs.
-	 */
-	public List getImmediateIds() {
-		return getRootElement().getSelectedElementIds();
-	}
-
-	/**
-	 * Return the custom data. Default implementation is to return null.
-	 * Subclasses should override this to return the data that would correspond
-	 * to data returned from the contributed composite.
-	 * 
-	 * @return custom data.
-	 */
-	protected Object getImmediateCustomData() {
-		//subclasses may override
-		return null;
-	}
-
-	/**
-	 * Return the immediate expansion levels.
-	 * 
-	 * @return immediate expansion levels.
-	 */
-	protected int getImmediateExpansionLevels() {
-		int numLevels = 0;
-
-		if (expandIndefinitely.getSelection()) {
-			numLevels = -1;
-		} else {
-			try {
-				numLevels = Integer.parseInt(levels.getText().trim());
-			} catch (NumberFormatException e) {
-				// do nothing.
-			}
-		}
-
-		return numLevels;
-	}
-
-	/**
-	 * Return the immediate expansion type.
-	 * 
-	 * @return immedate expansion type. See the ExpansionType EnumeratedType for
-	 *         more information.
-	 */
-	protected int getImmediateExpansionType() {
-		if (consumerToSelection.getSelection())
-			return ExpansionType.INCOMING.getOrdinal();
-		if (selectionToSupplier.getSelection())
-			return ExpansionType.OUTGOING.getOrdinal();
-		if (both.getSelection())
-			return ExpansionType.BOTH.getOrdinal();
-		if (allConnected.getSelection())
-			return ExpansionType.ALL.getOrdinal();
-		return -1;
-	}
-
-	/**
-	 * Return the unnamed current settings that make these details correspond to
-	 * a preset.
-	 * 
-	 * @return the unnamed current settings for the preset.
-	 */
-	public ShowRelatedElementsPreset getCurrentSettings() {
-		//it has no name yet
-		return new ShowRelatedElementsPreset(null, false,
-			getImmediateExpansionType(), getImmediateExpansionLevels(),
-			getImmediateIds(), getImmediateCustomData());
-	}
-
-	/**
-	 * Notify the listener that the details of this composite were changed.
-	 */
-	public void detailsChanged() {
-		if (detailsChangedListener != null) {
-			detailsChangedListener.detailsChanged();
-		}
-	}
-
-	/**
-	 * Set the details changed listener for listening to changes of details.
-	 * 
-	 * @param newDetailsChangedListener
-	 *            IShowRelatedElementsWithDetails
-	 */
-	public void setDetailsChangedListener(
-			IShowRelatedElementsWithDetails newDetailsChangedListener) {
-		detailsChangedListener = newDetailsChangedListener;
-	}
-
-	//TODO rename getXX to getCachedXX where appropriate
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsDialog.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsDialog.java
deleted file mode 100644
index 574e6ca..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsDialog.java
+++ /dev/null
@@ -1,586 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.window.Window;
-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;
-import org.eclipse.ui.PlatformUI;
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-
-/**
- * Show related elements dialog box, called from an action.
- * 
- * When OK is clicked, returns Window.OK and result of the dialog is saved.
- * 
- * When Cancel is clicked, returns Window.Cancel and result of dialog is not
- * saved.
- * 
- * This dialog does not include a listbox for models.
- * 
- * @author Wayne Diu, wdiu
- */
-public class ShowRelatedElementsDialog
-	extends Dialog
-	implements IShowRelatedElementsWithDetails {
-
-	/* Controls */
-
-	/**
-	 * The root element
-	 */
-	private SelectableElement rootElement;
-
-	/**
-	 * The help context id
-	 */
-	private String helpContextId;
-
-	/**
-	 * ShowRelatedElementsComposite
-	 */
-	private ShowRelatedElementsComposite showRelatedElementsComposite;
-
-	/**
-	 * True if the details pane is shown, false if hidden
-	 */
-	protected boolean detailsShown = false;
-
-	/**
-	 * For storing whether the details pane was shown or hidden
-	 */
-	IDialogSettings dialogSettings = CommonUIPlugin.getDefault()
-		.getDialogSettings();
-
-	/**
-	 * Dialog settings key True if the details pane is shown, false if hidden
-	 */
-	protected static final String DIALOG_SETTINGS_KEY = "ShowRelatedElementsDetails"; //$NON-NLS-1$
-
-	/**
-	 * List of queries.
-	 */
-	protected List queriesList;
-
-	/**
-	 * Cached levels of expansion -1 for indefinite. Default 1
-	 */
-	protected int cachedExpandLevels = 1;
-
-	/**
-	 * Cached expansion types. See ExpansionTypes for values. Default both
-	 */
-	protected int cachedExpansionType = ExpansionType.BOTH.getOrdinal();
-
-	/**
-	 * Cached relationship types.
-	 */
-	protected List cachedRelationshipTypes;
-
-	/**
-	 * Predefined composite placeholder.
-	 */
-	protected Composite placeholderForShowRelatedElementsComposite = null;
-
-	/**
-	 * Predefined composite.
-	 */
-	protected ShowRelatedElementsPredefinedComposite showRelatedElementsPredefinedComposite;
-
-	/**
-	 * Composite body that contains the interesting controls.
-	 */
-	protected Composite body;
-
-	/**
-	 * Preferred viewer width, cached
-	 */
-	protected int preferredViewerWidth = -1;
-
-	/**
-	 * Tree viewer control's width for the hint
-	 */
-	public static int MAX_VIEWER_WIDTH = 360;
-
-	static {
-		try {
-			MAX_VIEWER_WIDTH = Integer
-				.parseInt(CommonUIMessages.ShowRelatedElementsDialog_MAX_VIEWER_WIDTH);
-		} catch (NumberFormatException e) {
-			Trace.catching(CommonUIPlugin.getDefault(),
-				CommonUIDebugOptions.EXCEPTIONS_CATCHING, CommonUIPlugin
-					.getDefault().getClass(), "NumberFormatException", e); //$NON-NLS-1$
-			/* already initialized with defaults */
-			Log
-				.error(
-					CommonUIPlugin.getDefault(),
-					CommonUIStatusCodes.RESOURCE_FAILURE,
-					"Failed to parse Show Related Elements Composite's localized size", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Constructor takes the parent shell and root SelectableElement to add into
-	 * the viewer.
-	 * 
-	 * @param parentShell
-	 *            the parent Shell
-	 * @param aRootElement
-	 *            the root SelectableElement to add into the viewer
-	 */
-	public ShowRelatedElementsDialog(Shell parentShell,
-			SelectableElement aRootElement) {
-		this(parentShell, aRootElement, null);
-	}
-
-	/**
-	 * Constructor takes the parent shell and root SelectableElement to add into
-	 * the viewer. It also sets a list of predefined queries.
-	 * 
-	 * @param parentShell
-	 *            the parent Shell
-	 * @param aRootElement
-	 *            the root SelectableElement to add into the viewer
-	 * @param aQueriesList
-	 *            list of hardcoded queries
-	 */
-	public ShowRelatedElementsDialog(Shell parentShell,
-			SelectableElement aRootElement, List aQueriesList) {
-		super(parentShell);
-		this.rootElement = aRootElement;
-		this.queriesList = aQueriesList;
-
-		initDialogSettings();
-	}
-
-	/**
-	 * Make the predefined composite
-	 * 
-	 * @param parent
-	 *            parent Composite
-	 * @param root
-	 *            root SelectableElement
-	 * @param queries
-	 *            saved queries List
-	 * @param viewerWidth
-	 *            desired width of listbox viewer
-	 * @return the predefined queries composite
-	 */
-	protected ShowRelatedElementsPredefinedComposite makePredefinedComposite(
-			Composite parent, SelectableElement root, List queries,
-			int viewerWidth) {
-		return new ShowRelatedElementsPredefinedComposite(parent, this, root,
-			queries, viewerWidth, detailsShown);
-	}
-
-	/**
-	 * Cache the preferred viewer width after figuring it out from the longest
-	 * string length of the root element.
-	 * 
-	 * @return int, preferred viewer width
-	 */
-	protected int getPreferredViewerWidth() {
-		if (preferredViewerWidth == -1) {
-			// viewerWidth is based on the right side's control
-			preferredViewerWidth = SelectableElement
-				.calculateLongestStringLength(rootElement, getShell()) + 96;
-			if (preferredViewerWidth > MAX_VIEWER_WIDTH)
-				preferredViewerWidth = MAX_VIEWER_WIDTH;
-		}
-
-		return preferredViewerWidth;
-	}
-
-	/**
-	 * Suggested that you override makeShowRelatedElementsComposite instead,
-	 * unless you have a good reason for overriding the plcaeholder composite
-	 * too.
-	 * 
-	 * @param parent
-	 *            the parent Composite that we will be adding the placeholder
-	 *            into
-	 * @param root
-	 *            root SelectableElement
-	 * @return the composite that we made inside a placeholder
-	 */
-	protected ShowRelatedElementsComposite makeShowRelatedElementsCompositeInPlaceholder(
-			Composite parent, SelectableElement root) {
-		if (placeholderForShowRelatedElementsComposite == null) {
-			placeholderForShowRelatedElementsComposite = new Composite(parent,
-				SWT.NULL);
-			GridLayout gridLayout = new GridLayout(1, false);
-			gridLayout.marginHeight = 0;
-			gridLayout.marginWidth = 0;
-			placeholderForShowRelatedElementsComposite.setLayout(gridLayout);
-		}
-
-		if (detailsShown) {
-			ShowRelatedElementsComposite sreComposite = makeShowRelatedElementsComposite(
-				placeholderForShowRelatedElementsComposite, root,
-				getPreferredViewerWidth());
-			sreComposite.setDetailsChangedListener(this);
-			placeholderForShowRelatedElementsComposite
-				.setLayoutData(new GridData(GridData.FILL_VERTICAL
-					| GridData.VERTICAL_ALIGN_BEGINNING));
-			return sreComposite;
-		} else {
-			placeholderForShowRelatedElementsComposite
-				.setLayoutData(new GridData(0, 0));
-			return null;
-
-		}
-
-	}
-
-	/**
-	 * Make the show related elements composite
-	 * 
-	 * @param parent
-	 *            parent Composite we will be adding into.
-	 * @param root
-	 *            root SelectableElement
-	 * @param aViewerWidth
-	 *            int hint for viewer width
-	 * @return the composite that we made
-	 */
-	protected ShowRelatedElementsComposite makeShowRelatedElementsComposite(
-			Composite parent, SelectableElement root, int aViewerWidth) {
-		return new ShowRelatedElementsComposite(parent, root, aViewerWidth);
-	}
-
-	/**
-	 * Make the composites in the dialog
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 * @return the parent Composite
-	 */
-	protected Control createDialogArea(Composite parent) {
-		body = new Composite(parent, SWT.NONE);
-		body.setLayout(new GridLayout(2, false));
-
-		showRelatedElementsPredefinedComposite = makePredefinedComposite(body,
-			rootElement, queriesList, getPreferredViewerWidth());
-
-		showRelatedElementsComposite = makeShowRelatedElementsCompositeInPlaceholder(
-			body, rootElement);
-
-		assert (!detailsShown || (detailsShown && showRelatedElementsComposite != null));
-
-		if (showRelatedElementsComposite != null) {
-			this.showRelatedElementsComposite.getTreeViewer().refresh();
-		}
-
-		getShell().setText(CommonUIMessages.ShowRelatedElementsDialog_Title);
-
-		// set context sensitive help
-		if (helpContextId != null) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
-				helpContextId);
-        } else {
-            PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, 
-                "org.eclipse.gmf.runtime.common.ui.egmf0200"); //$NON-NLS-1$
-        }
-
-		return parent;
-	}
-
-	/**
-	 * Create contents and give focus to the OK button
-	 * 
-	 * @param parent
-	 *            the parent Composite
-	 * @return Control created from superclass
-	 */
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-
-		getButton(IDialogConstants.OK_ID).setFocus();
-
-		return control;
-	}
-
-	/**
-	 * OK button click handler.
-	 * 
-	 * Dialog is not closed if validation fails. Otherwise, the dialog closes.
-	 */
-	protected void okPressed() {
-		// do not continue if levels box is not ok
-		if (getShowRelatedElementsComposite() != null) {
-			if (getShowRelatedElementsComposite().validate(true) != null)
-				return;
-			getShowRelatedElementsComposite().saveCachedValues();
-			saveCachedValues();
-		}
-
-		setReturnCode(Window.OK);
-		close();
-	}
-
-	/**
-	 * Cancel button click handler
-	 * 
-	 * Dialog is not closed if validation fails. Otherwise, the dialog closes.
-	 */
-	protected void cancelPressed() {
-		// dialog settings should be saved even when cancel pressed
-		setReturnCode(Window.CANCEL);
-		close();
-	}
-
-	/**
-	 * Returns if the expand indefinitely box was checked, even if it is
-	 * disposed.
-	 * 
-	 * @return true if checked, false if not checked
-	 */
-	public boolean getExpandIndefinitely() {
-		return (cachedExpandLevels == -1);
-	}
-
-	/**
-	 * Returns the int value in the expand levels box, even if it is disposed
-	 * and even if the user did not enter an int.
-	 * 
-	 * @return int with the number of expand levels. 1 is returned if the user
-	 *         did not enter an int and this was not caught earlier.
-	 */
-	public int getExpandLevels() {
-		return cachedExpandLevels;
-	}
-
-	/**
-	 * Returns if the selection to consumer radio or both radio was selected
-	 * This will be deprecated when all SRE implementors implement the all
-	 * connected option. Use getExpansionType() instead.
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	public boolean getConsumerToSelection() { // useOutgoingRelationships
-		return (cachedExpansionType == ExpansionType.INCOMING.getOrdinal() || cachedExpansionType == ExpansionType.BOTH
-			.getOrdinal());
-	}
-
-	/**
-	 * Returns if the selection to supplier radio or both radio was selected
-	 * This will be deprecated when all SRE implementors implement the all
-	 * connected option. Use getExpansionType() instead.
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	public boolean getSelectionToSupplier() { // useIncomingRelationships
-		return (cachedExpansionType == ExpansionType.OUTGOING.getOrdinal() || cachedExpansionType == ExpansionType.BOTH
-			.getOrdinal());
-	}
-
-	/**
-	 * Returns the expansion type
-	 * 
-	 * @return true if selected, false if not selected
-	 */
-	public ExpansionType getExpansionType() {
-		return ExpansionType.VALUES[cachedExpansionType];
-	}
-
-	/**
-	 * Returns list of selected RelationshipTypes.
-	 * 
-	 * @return List of relationship types that were from SelectableElement
-	 *         objects under the root that had a SelectedType of SELECTED.
-	 */
-	public List getSelectedRelationshipTypes() {
-		return (cachedRelationshipTypes != null) ? cachedRelationshipTypes
-			: getRootElement().getSelectedElementTypes();
-	}
-
-	/**
-	 * Returns the root element of the RelatedElements that were in the viewer
-	 * control at the left of the dialog.
-	 * 
-	 * @return SelectableElement with the root element.
-	 */
-	public SelectableElement getRootElement() {
-		return rootElement;
-	}
-
-	/**
-	 * Method getShowRelatedElementsComposite.
-	 * 
-	 * @return the ShowRelatedElementsComposite contained in the dialog
-	 */
-	public ShowRelatedElementsComposite getShowRelatedElementsComposite() {
-		return this.showRelatedElementsComposite;
-	}
-
-	/**
-	 * Initialize the context sensitive help id.
-	 * 
-	 * @param helpId
-	 *            the help context id string
-	 */
-	public void initHelpContextId(String helpId) {
-		this.helpContextId = helpId;
-	}
-
-	/**
-	 * Save the cached values of the composite in our own cache.
-	 */
-	protected void saveCachedValues() {
-		showRelatedElementsComposite.saveCachedValues();
-		if (getShowRelatedElementsComposite().getExpandIndefinitely()) {
-			cachedExpandLevels = -1;
-		} else {
-			cachedExpandLevels = getShowRelatedElementsComposite()
-				.getExpandLevel();
-		}
-
-		cachedExpansionType = getShowRelatedElementsComposite()
-			.getExpansionType().getOrdinal();
-
-		cachedRelationshipTypes = getShowRelatedElementsComposite()
-			.getSelectedRelationshipTypes();
-	}
-
-	/**
-	 * Toggle showing or hiding details.
-	 */
-	public void showOrHideDetails() {
-		if (detailsShown) {
-			detailsShown = false;
-			saveCachedValues();
-
-			// don't just hide it
-			showRelatedElementsComposite.dispose();
-
-			showRelatedElementsComposite = makeShowRelatedElementsCompositeInPlaceholder(
-				body, rootElement);
-
-		} else {
-			detailsShown = true;
-
-			showRelatedElementsComposite = makeShowRelatedElementsCompositeInPlaceholder(
-				body, rootElement);
-		}
-
-		placeholderForShowRelatedElementsComposite.pack();
-
-		placeholderForShowRelatedElementsComposite.getParent().pack();
-		getShell().pack();
-
-	}
-
-	/**
-	 * Update relationshpips according to the preset
-	 * 
-	 * @param preset
-	 *            ShowRelatedElementsPreset containing new relationhips.
-	 * 
-	 */
-	public void updateRelationships(ShowRelatedElementsPreset preset) {
-		if (detailsShown) {
-			showRelatedElementsComposite.updateRelationships(preset);
-		} else {
-			// do not change settings if the preset is null,
-			// because that happens when there is a custom setting
-			if (preset == null)
-				return;
-
-			// just cache it
-			cachedExpandLevels = preset.getLevels();
-			cachedExpansionType = preset.getExpansionType();
-
-			cachedRelationshipTypes = new ArrayList();
-			rootElement.getHintsThatMatchTheseIds(cachedRelationshipTypes,
-				preset.getIds());
-		}
-
-	}
-
-	/**
-	 * Return the current preset settings
-	 * 
-	 * @return custom ShowRelatedElementsPreset settings
-	 */
-	public ShowRelatedElementsPreset getCurrentSettings() {
-		if (detailsShown) {
-			return showRelatedElementsComposite.getCurrentSettings();
-		}
-		return null;
-	}
-
-	/**
-	 * Notify the composite the details were changed
-	 */
-	public void detailsChanged() {
-		if (showRelatedElementsPredefinedComposite != null) {
-			showRelatedElementsPredefinedComposite.detailsChanged();
-		}
-
-	}
-
-	/**
-	 * Return the predefined composite.
-	 * 
-	 * @return the ShowRelatedElementsPredefinedComposite
-	 */
-	protected ShowRelatedElementsPredefinedComposite getPredefinedComposite() {
-		return showRelatedElementsPredefinedComposite;
-	}
-
-	/**
-	 * Read in dialog settings and update based on that.
-	 * 
-	 * For now, only take care of the detailsShown instance variable for
-	 * deciding whether or not we should show the details pane.
-	 * 
-	 */
-	protected void initDialogSettings() {
-		detailsShown = dialogSettings.getBoolean(DIALOG_SETTINGS_KEY);
-	}
-
-	/**
-	 * Store the dialog settings from our current dialog.
-	 * 
-	 * For now, only take care of the detailsShown instance variable for
-	 * deciding whether or not we should show the details pane.
-	 * 
-	 */
-	protected void saveDialogSettings() {
-		dialogSettings.put(DIALOG_SETTINGS_KEY, detailsShown);
-	}
-
-	/**
-	 * Save settings before close
-	 * 
-	 * @return boolean, superclass result
-	 */
-	public boolean close() {
-		saveDialogSettings();
-		return super.close();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPredefinedComposite.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPredefinedComposite.java
deleted file mode 100644
index e6eb3dd..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPredefinedComposite.java
+++ /dev/null
@@ -1,572 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-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.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-
-/**
- * The common Show Related Elements Predefined Queries Composite. It contains a
- * list of queries you may select from.
- * 
- * @author Wayne Diu, wdiu
- */
-public class ShowRelatedElementsPredefinedComposite
-	extends Composite {
-
-	/**
-	 * Save As button
-	 */
-	protected Button saveAs;
-
-	/**
-	 * Delete button
-	 */
-	protected Button delete;
-
-	/**
-	 * Details button
-	 */
-	protected Button details;
-
-	/**
-	 * Show Details button
-	 */
-	protected IShowRelatedElementsWithDetails showDetails;
-
-	/**
-	 * Root SelectableElement
-	 */
-	protected SelectableElement rootElement;
-
-	/**
-	 * If the Details is displayed
-	 */
-	protected boolean isDetails = false;
-
-	/**
-	 * Predefined list
-	 */
-	protected List predefinedBox;
-
-	/**
-	 * Data for the predefined queries
-	 */
-	protected java.util.List predefined = new ArrayList();
-
-	/**
-	 * Data for the hardcoded queries
-	 */
-	protected java.util.List queries;
-
-	/**
-	 * Dialog settings for storing presets.
-	 */
-	protected final IDialogSettings dialogSettings = CommonUIPlugin
-		.getDefault().getDialogSettings();
-
-	/**
-	 * Tree viewer control's height for the hint
-	 */
-	public static int VIEWER_HEIGHT = 225;
-
-	/**
-	 * Viewer width hint for the listbox viewer
-	 */
-	protected int viewerWidth = 175;
-	
-	/**
-	 * Max length of preset name
-	 */
-	private static int PRESET_NAME_LENGTH = 256;
-
-	static {
-		try {
-			VIEWER_HEIGHT = Integer.parseInt(
-				CommonUIMessages.ShowRelatedElementsDialog_VIEWER_HEIGHT);
-		} catch (NumberFormatException e) {
-			Trace.catching(CommonUIPlugin.getDefault(),
-				CommonUIDebugOptions.EXCEPTIONS_CATCHING, CommonUIPlugin
-					.getDefault().getClass(), "NumberFormatException", e); //$NON-NLS-1$
-			/* already initialized with defaults */
-			Log
-				.error(
-					CommonUIPlugin.getDefault(),
-					CommonUIStatusCodes.RESOURCE_FAILURE,
-					"Failed to parse Show Related Elements Composite's localized size", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Save as dialog. Cached.
-	 */
-	protected InputDialog saveAsDialog = new InputDialog(
-		Display.getDefault().getActiveShell(),
-			CommonUIMessages.ShowRelatedElementsPredefinedComposite_SaveAs_Title, 
-			CommonUIMessages.ShowRelatedElementsPredefinedComposite_ChooseName, 
-			StringStatics.BLANK, new IInputValidator() {  
-
-			public String isValid(String newText) {
-				if (containsSpecialCharacter(newText) || newText.length() == 0) {
-					return CommonUIMessages.ShowRelatedElementsPredefinedComposite_SpecialCharacter; 
-				}
-				return null;
-			}
-		})
-
-	{
-
-		protected Control createDialogArea(Composite parent) {
-			Control control = super.createDialogArea(parent);
-			Text text = getText();
-			assert null != text;
-			text.setTextLimit(30);
-			text.setTextLimit(PRESET_NAME_LENGTH);
-			return control;
-		}
-	};
-
-	/**
-	 * Opening a hardcoded query's display name
-	 */
-	protected static final String SPECIAL_OPENING = "["; //$NON-NLS-1$
-
-	/**
-	 * Closing a hardcoded query's display name
-	 */
-	protected static final String SPECIAL_CLOSING = "]"; //$NON-NLS-1$
-
-	/**
-	 * Dialog settings key
-	 */
-	protected static final String DIALOG_SETTINGS_KEY = "ShowRelatedElementsPresets"; //$NON-NLS-1$
-
-	/**
-	 * Default string
-	 */
-	protected static final String DEFAULT_STRING = SPECIAL_OPENING
-		+ CommonUIMessages.ShowRelatedElementsPredefinedComposite_DefaultQuery + SPECIAL_CLOSING; 
-
-	/**
-	 * Constructor
-	 * 
-	 * @param parent
-	 *            the parent Composite that we will add our composite into
-	 * @param sreWithDetails
-	 *            for sending updated events
-	 * @param root
-	 *            SelectableElement root
-	 * @param queriesList
-	 *            list of hardcoded queries
-	 * @param width
-	 *            int Width of composite to show
-	 * @param detailsShown
-	 *            boolean true if details are shown, false if not shown
-	 */
-	public ShowRelatedElementsPredefinedComposite(Composite parent,
-			IShowRelatedElementsWithDetails sreWithDetails,
-			SelectableElement root, java.util.List queriesList, int width,
-			boolean detailsShown) {
-		super(parent, SWT.NULL);
-		showDetails = sreWithDetails;
-		rootElement = root;
-		this.queries = queriesList;
-		this.viewerWidth = width;
-		this.isDetails = detailsShown;
-
-		createContents();
-	}
-
-	/**
-	 * Set the text of the show or hide details button depending on whether or
-	 * not the details are shown.
-	 */
-	private void setDetailsText() {
-		assert null != details;
-		if (!isDetails) {
-			details
-				.setText(CommonUIMessages.ShowRelatedElementsPredefinedComposite_ShowDetails);
-		} else {
-			details
-				.setText(CommonUIMessages.ShowRelatedElementsPredefinedComposite_HideDetails);
-		}
-	}
-
-	/**
-	 * Creates content for this composite. This includes the List of predefined
-	 * queries and several.
-	 */
-	protected void createContents() {
-
-		this.setLayoutData(new GridData(GridData.FILL_BOTH));
-		this.setLayout(new GridLayout(1, false));
-
-		new Label(this, SWT.NULL)
-			.setText(CommonUIMessages.ShowRelatedElementsPredefinedComposite_CustomQuery); 
-
-		predefinedBox = new List(this, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		gd.heightHint = VIEWER_HEIGHT;
-		gd.widthHint = viewerWidth;
-		predefinedBox.setLayoutData(gd);
-
-		Composite buttons;
-
-		if (showDetails == null) {
-			buttons = new Composite(this, SWT.NONE);
-			buttons.setLayout(new GridLayout(2, true));
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_CENTER
-				| GridData.VERTICAL_ALIGN_END);
-			gd.horizontalSpan = 2;
-			buttons.setLayoutData(gd);
-
-			makePredefinedSettingsButtons(buttons);
-		} else {
-			Composite moreButtons = new Composite(this, SWT.NONE);
-			GridLayout gridLayout = new GridLayout(2, false);
-			gridLayout.marginWidth = 0;
-			moreButtons.setLayout(gridLayout);
-			moreButtons.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_END));
-
-			buttons = new Composite(moreButtons, SWT.NONE);
-			gridLayout = new GridLayout(2, true);
-			gridLayout.marginWidth = 0;
-			buttons.setLayout(gridLayout);
-			buttons.setLayoutData(new GridData(
-				GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-			makePredefinedSettingsButtons(buttons);
-
-			details = new Button(moreButtons, SWT.PUSH);
-			setDetailsText();
-			details.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END
-				| GridData.GRAB_HORIZONTAL));
-
-			details.addSelectionListener(new SelectionListener() {
-
-				public void widgetSelected(SelectionEvent e) {
-					isDetails = !isDetails;
-					saveAs.setEnabled(isDetails);
-					showDetails.showOrHideDetails();
-					handlePredefinedBoxSelection();
-					setDetailsText();
-				}
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-					widgetSelected(e);
-				}
-			});
-
-			gd = WindowUtil.makeButtonData(details);
-			gd.horizontalAlignment = GridData.END;
-			gd.grabExcessHorizontalSpace = true;
-			details.setLayoutData(gd);
-
-		}
-
-		//delete made by makePredefinedSettingsButtons
-		assert null != delete;
-		delete.setEnabled(false);
-
-		contributeComposite(this);
-
-		predefinedBox.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				handlePredefinedBoxSelection();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-		});
-
-		contributeToList();
-		predefinedBox.select(predefinedBox.getItemCount() - 1);
-
-	}
-
-	/**
-	 * Handle when the user clicks on something in the predefined queries List.
-	 * 
-	 * It could involve sending a message to update the details. Also update the
-	 * delete button enablement.
-	 */
-	protected void handlePredefinedBoxSelection() {
-
-		if (predefinedBox.getSelectionIndex() == predefinedBox.getItemCount() - 1) {
-			if (showDetails != null)
-				showDetails.updateRelationships(null);
-			delete.setEnabled(false);
-		} else if (predefinedBox.getSelectionIndex() != predefinedBox
-			.getItemCount() - 1) {
-			String string = predefinedBox.getSelection()[0];
-			ShowRelatedElementsPreset preset = ShowRelatedElementsPresetHelper
-				.findPresetFromList(predefined, string);
-			if (preset == null) {
-				preset = ShowRelatedElementsPresetHelper.findPresetFromList(
-					queries, string.substring(0, string
-						.indexOf(StringStatics.SPACE + DEFAULT_STRING)));
-			}
-			assert null != preset;
-			if (showDetails != null)
-				showDetails.updateRelationships(preset);
-
-			//do not allow delete for anything with [ or ]
-			//just need to check one of them
-			delete.setEnabled(!containsSpecialCharacter(string));
-		}
-	}
-
-	/**
-	 * Contribute to the predefined queries List. Read in data. Add items to the
-	 * List.
-	 */
-	protected void contributeToList() {
-		//clear the model
-		predefined.clear();
-
-		//clear the ui
-		predefinedBox.removeAll();
-
-		java.util.List readPresets = readPresets(null);
-
-		predefined.addAll(readPresets);
-
-		//do not sort
-
-		//add the hardcoded queries
-		Iterator it;
-		if (queries != null) {
-			it = queries.iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				assert (obj instanceof ShowRelatedElementsPreset);
-				predefinedBox.add(((ShowRelatedElementsPreset) obj).getName()
-					+ StringStatics.SPACE + DEFAULT_STRING);
-			}
-		}
-
-		//add the user's predefined queries
-		it = predefined.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			assert (obj instanceof ShowRelatedElementsPreset);
-			predefinedBox.add(((ShowRelatedElementsPreset) obj).getName());
-
-		}
-
-		//do not use messageformat since the ordering must be like this for
-		//consistency with the rest
-		predefinedBox
-			.add(CommonUIMessages.ShowRelatedElementsPredefinedComposite_UserCustomQuery 
-				+ StringStatics.SPACE
-				+ SPECIAL_OPENING
-				+ CommonUIMessages.ShowRelatedElementsPredefinedComposite_DefaultQuery + SPECIAL_CLOSING); 
-	}
-
-	/**
-	 * Returns if the text string contains a special character.
-	 * 
-	 * @param text
-	 *            string to check for special characters
-	 * @return true if it contains a special character, false if it doesn't
-	 */
-	protected boolean containsSpecialCharacter(String text) {
-		return (text.indexOf(ShowRelatedElementsPresetHelper.KEY_SEPARATOR) != -1
-			|| text.indexOf(ShowRelatedElementsPresetHelper.VALUE_SEPARATOR) != -1
-			|| text.indexOf(SPECIAL_CLOSING) != -1 || text
-			.indexOf(SPECIAL_OPENING) != -1);
-	}
-
-	/**
-	 * Return a list of ShowRelatedElementsPreset objects.
-	 * 
-	 * @param nameToIgnore
-	 *            ignore this name when reading in the presets. Can be null if
-	 *            you do not want to ignore anything and read everything in.
-	 * @return List of the presets. Items in the List are
-	 *         ShowRelatedElementsPreset objects
-	 */
-	protected java.util.List readPresets(String nameToIgnore) {
-		return ShowRelatedElementsPresetHelper.readPresets(nameToIgnore,
-			dialogSettings.getArray(DIALOG_SETTINGS_KEY), null);
-	}
-
-	/**
-	 * Convert the presets to a string array used for serializing
-	 * 
-	 * @param presets
-	 *            List of ShowRelatedElementsPresets objects
-	 * @return String array that contains the data of the presets
-	 */
-	protected String[] convertPresetsToString(java.util.List presets) {
-		return ShowRelatedElementsPresetHelper.convertPresetsToString(presets,
-			null);
-	}
-
-	/**
-	 * Handle a save as for a predefined setting.
-	 */
-	protected void saveAs() {
-		assert null != showDetails;
-
-		if (saveAsDialog.open() == Window.OK) {
-			//save as
-			//name;ids,ids,ids;custom,custom,custom;typeint;int"
-			java.util.List presets = readPresets(saveAsDialog.getValue());
-
-			//serialize it back out
-			ShowRelatedElementsPreset newPreset = showDetails
-				.getCurrentSettings();
-			assert null != newPreset;
-			newPreset.setName(saveAsDialog.getValue());
-
-			presets.add(newPreset);
-
-			dialogSettings.put(DIALOG_SETTINGS_KEY,
-				convertPresetsToString(presets));
-
-			//TODO will be more efficient to just do the delta instead of
-			// complete refresh
-			contributeToList();
-			predefinedBox.select(predefinedBox.getItemCount() - 2);
-			delete.setEnabled(true);
-		}
-	}
-
-	/**
-	 * Make the buttons for the predefined settings list.
-	 * 
-	 * @param buttons
-	 *            composite I will be adding the buttons to.
-	 */
-	protected void makePredefinedSettingsButtons(Composite buttons) {
-		saveAs = new Button(buttons, SWT.PUSH);
-		saveAs.setText(CommonUIMessages.ShowRelatedElementsPredefinedComposite_SaveAs); 
-		saveAs.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				saveAs();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-		saveAs.setLayoutData(WindowUtil.makeButtonData(saveAs));
-
-		delete = new Button(buttons, SWT.PUSH);
-		delete.setText(CommonUIMessages.ShowRelatedElementsPredefinedComposite_Delete);
-
-		delete.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				delete();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-		delete.setLayoutData(WindowUtil.makeButtonData(delete));
-
-	}
-
-	/**
-	 * Handle a delete button press to delete the predefined setting.
-	 */
-	protected void delete() {
-		//do not allow deleting anything with [ in the name
-		//handled by change selection
-
-		assert (predefinedBox.getSelection().length != 0);
-
-		String selectedText = predefinedBox.getSelection()[0];
-
-		ShowRelatedElementsPreset preset = ShowRelatedElementsPresetHelper
-			.findPresetFromList(predefined, selectedText);
-
-		assert (selectedText.indexOf(SPECIAL_OPENING) == -1);
-
-		assert null != preset;
-
-		//more efficient than rereading it and redoing entire ui
-
-		//delete it from the model
-		predefined.remove(preset);
-
-		//delete it from the ui
-		predefinedBox.remove(predefinedBox.getSelectionIndex());
-
-		dialogSettings.put(DIALOG_SETTINGS_KEY,
-			convertPresetsToString(predefined));
-
-		//go back to the default query
-		predefinedBox.setSelection(predefinedBox.getItemCount() - 1);
-		delete.setEnabled(false);
-
-		showDetails.updateRelationships(null);
-	}
-
-	/**
-	 * Contribute a composite to the expansion group
-	 * 
-	 * @param parent
-	 *            the parent expansion group composite that we are going to
-	 *            contribute to.
-	 */
-	protected void contributeComposite(Composite parent) {
-		//do nothing, subclasses may override
-	}
-
-	/**
-	 * Details were changed, so update the predefined box to select the first
-	 * item.
-	 */
-	protected void detailsChanged() {
-		predefinedBox.select(predefinedBox.getItemCount() - 1);
-		//do not showDetails.updateRelationships(null);
-		//because the user is in the middle of updating it
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPreset.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPreset.java
deleted file mode 100644
index 432c820..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPreset.java
+++ /dev/null
@@ -1,286 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Show Related Elements Preset
- * 
- * @author Wayne Diu, wdiu
- */
-public class ShowRelatedElementsPreset {
-
-	/**
-	 * True if it's a default query, false if it's user defined
-	 */
-	protected boolean isDefault;
-
-	/**
-	 * Name
-	 */
-	protected String name;
-
-	/**
-	 * Identifier
-	 */
-	protected String id;
-
-	/**
-	 * List of IDs
-	 */
-	protected List ids = new ArrayList();
-
-	/**
-	 * Optional custom data
-	 */
-	protected Object custom;
-
-	/**
-	 * See ExpansionType enumeration for values
-	 */
-	protected int expansionType;
-
-	/**
-	 * Levels of expansion, -1 means expand indefinitely
-	 */
-	protected int levels;
-
-	/**
-	 * Optional layout type to use for this preset if functionality is
-	 * available.
-	 */
-	protected Object layoutType;
-
-	/**
-	 * Return true if it's the default query, false otherwise.
-	 * 
-	 * @return true if it's the default query, false otherwise.
-	 */
-	public boolean isDefault() {
-		return isDefault;
-	}
-
-	/**
-	 * Return this preset's name
-	 * 
-	 * @return String name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Set this preset's name
-	 * 
-	 * @param newName
-	 *            String name
-	 */
-	public void setName(String newName) {
-		name = newName;
-	}
-
-	/**
-	 * Retrieves the serializable non-language specific id of the preset.
-	 * 
-	 * @return The identifier for the preset.
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Return custom data for this preset, which may be null
-	 * 
-	 * @return custom data
-	 */
-	public Object getCustom() {
-		return custom;
-	}
-
-	/**
-	 * Set custom data
-	 * 
-	 * @param newCustom
-	 *            String with custom data
-	 */
-	public void setCustom(Object newCustom) {
-		this.custom = newCustom;
-	}
-
-	/**
-	 * Return List of serializable String ids
-	 * 
-	 * @return List of serializable String ids
-	 */
-	public List getIds() {
-		return ids;
-	}
-
-	/**
-	 * Add an id to the ID List
-	 * 
-	 * @param aID
-	 *            String id to add to the ID List
-	 */
-	public void addId(String aID) {
-		ids.add(aID);
-	}
-
-	/**
-	 * Add a List of String ids to the ID List
-	 * 
-	 * @param idList
-	 *            List of String ids to add to the ID List
-	 */
-	public void addIds(List idList) {
-		ids.addAll(idList);
-	}
-
-	/**
-	 * Return the int number of levels to expand, -1 means to expand
-	 * indefinitely.
-	 * 
-	 * @return int number of levels to expand. -1 means to expand indefinitely.
-	 */
-	public int getLevels() {
-		return levels;
-	}
-
-	/**
-	 * Return the expansion type ordinal. See ExpansionType for more information
-	 * 
-	 * @return the expansion type ordinal.
-	 */
-	public int getExpansionType() {
-		return expansionType;
-	}
-
-	/**
-	 * Return the optional layout type.
-	 * 
-	 * @return A layout type or (null) if none set.
-	 */
-	public Object getLayoutType() {
-		return layoutType;
-	}
-
-	/**
-	 * Set the optional layout type.
-	 * 
-	 * @param type
-	 *            A layout type or (null) for unset.
-	 */
-	public void setLayoutType(Object type) {
-		this.layoutType = type;
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param newName
-	 *            name of preset
-	 * @param newDefault
-	 *            true it's a hardcoded query, false if it's a user defined
-	 *            query
-	 * @param newType
-	 *            expansion type. See ExpansionType.
-	 * @param newLevels
-	 *            number of levels to expand, -1 for indefinite.
-	 */
-	public ShowRelatedElementsPreset(String newName, boolean newDefault,
-			int newType, int newLevels) {
-		name = newName;
-		isDefault = newDefault;
-		expansionType = newType;
-		levels = newLevels;
-		this.id = newName;
-	}
-
-	/**
-	 * Constructor that allows for serialization of the preset.
-	 * 
-	 * @param newName
-	 *            name of preset
-	 * @param newID
-	 *            serializable and non-language specific identifier for the
-	 *            preset
-	 * @param newDefault
-	 *            true it's a hardcoded query, false if it's a user defined
-	 *            query
-	 * @param newType
-	 *            expansion type. See ExpansionType.
-	 * @param newLevels
-	 *            number of levels to expand, -1 for indefinite.
-	 */
-	public ShowRelatedElementsPreset(String newName, String newID,
-			boolean newDefault, int newType, int newLevels) {
-		name = newName;
-		isDefault = newDefault;
-		expansionType = newType;
-		levels = newLevels;
-		this.id = newID;
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param newName
-	 *            name of preset
-	 * @param newDefault
-	 *            true it's a hardcoded query, false if it's a user defined
-	 *            query
-	 * @param newType
-	 *            expansion type. See ExpansionType.
-	 * @param newLevels
-	 *            number of levels to expand, -1 for indefinite.
-	 * @param idList
-	 *            list of IDs
-	 * @param newCustom
-	 *            custom String data.
-	 */
-	public ShowRelatedElementsPreset(String newName, boolean newDefault,
-			int newType, int newLevels, List idList, Object newCustom) {
-		this(newName, newDefault, newType, newLevels);
-		ids = idList;
-		custom = newCustom;
-	}
-
-	/**
-	 * Constructor that allows for serialization of the preset.
-	 * 
-	 * @param newName
-	 *            name of preset
-	 * @param newID
-	 *            serializable and non-language specific identifier for the
-	 *            preset
-	 * @param newDefault
-	 *            true it's a hardcoded query, false if it's a user defined
-	 *            query
-	 * @param newType
-	 *            expansion type. See ExpansionType.
-	 * @param newLevels
-	 *            number of levels to expand, -1 for indefinite.
-	 * @param idList
-	 *            list of IDs
-	 * @param newCustom
-	 *            custom String data.
-	 */
-	public ShowRelatedElementsPreset(String newName, String newID,
-			boolean newDefault, int newType, int newLevels, List idList,
-			Object newCustom) {
-		this(newName, newID, newDefault, newType, newLevels);
-		ids = idList;
-		custom = newCustom;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPresetHelper.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPresetHelper.java
deleted file mode 100644
index 1c29894..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/ShowRelatedElementsPresetHelper.java
+++ /dev/null
@@ -1,229 +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.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * Show Related Elements Presets helper.
- * 
- * Includes methods for serializing and deserializing and also a converter
- * interface for the serializer and deserializer.
- * 
- * @author wdiu, Wayne Diu
- */
-public class ShowRelatedElementsPresetHelper {
-
-	/**
-	 * Key separator for serialzing
-	 */
-	public static final String KEY_SEPARATOR = StringStatics.COLON;
-
-	/**
-	 * Value separator for serialzing
-	 */
-	public static final String VALUE_SEPARATOR = StringStatics.COMMA;
-
-	/**
-	 * Methods for the serializer and deserializer which should be implemented
-	 * to convert the serialized String into an object and to convert the object
-	 * into a serialzed String.
-	 */
-	public interface IConversionMethods {
-
-		/**
-		 * Convert the string to an object for the ShowRelatedElementsPreset's
-		 * custom data.
-		 * 
-		 * @param string
-		 *            to be converted
-		 * @return Object converted from string
-		 */
-		public Object convertSerializableStringToCustomData(String string);
-
-		/**
-		 * Convert the objet into a serializable string for the serialization
-		 * 
-		 * @param object
-		 *            to be converted
-		 * @return String converted from object
-		 */
-		public String convertCustomDataToSerializableString(Object object);
-	}
-
-	/**
-	 * Do not instantiate this private class
-	 */
-	private ShowRelatedElementsPresetHelper() {
-		//do nothing
-	}
-
-	/**
-	 * Convenience method to find a preset from the list.
-	 * 
-	 * @param list
-	 *            List of ShowRelatedElementsPreset objects.
-	 * @param name
-	 *            name to match
-	 * 
-	 * @return the first matching ShowRelatedElementsPreset.
-	 */
-	public static ShowRelatedElementsPreset findPresetFromList(List list,
-			String name) {
-		Iterator it = list.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			assert (obj instanceof ShowRelatedElementsPreset);
-			ShowRelatedElementsPreset preset = (ShowRelatedElementsPreset) obj;
-			if (preset.getName().equals(name))
-				return preset;
-		}
-
-		return null;
-
-	}
-
-	/**
-	 * Return a list of ShowRelatedElementsPreset objects.
-	 * 
-	 * @param nameToIgnore
-	 *            ignore this name when reading in the presets. Can be null if
-	 *            you do not want to ignore anything and read everything in.
-	 * @param settings
-	 *            string array of settings
-	 * @param conversionMethod
-	 *            see the IConversionMethods class above
-	 * 
-	 * @return List of the presets. Items in the List are
-	 *         ShowRelatedElementsPreset objects
-	 */
-	public static List readPresets(String nameToIgnore, String[] settings,
-			IConversionMethods conversionMethod) {
-		java.util.List presets = new ArrayList();
-
-		if (settings == null)
-			return presets;
-
-		String name, ids, custom, type, levels;
-		ShowRelatedElementsPreset preset;
-
-		for (int i = 0; i < settings.length; i++) {
-			preset = null;
-
-			String[] split = settings[i].split(KEY_SEPARATOR);
-
-			//TODO make sure it has a next token
-			name = split[0];
-			if (nameToIgnore != null
-				&& name.toUpperCase().equals(nameToIgnore.toUpperCase())) {
-				//skip;
-				continue;
-			}
-
-			//TODO make sure it has a next token
-			ids = split[1];
-			java.util.List readIds = new ArrayList();
-			String[] splitIds = ids.split(VALUE_SEPARATOR);
-			for (int j = 0; j < splitIds.length; j++) {
-				if (!splitIds[j].equals(StringStatics.SPACE))
-					readIds.add(splitIds[j]);
-			}
-
-			//TODO make sure it has a next token
-			custom = split[2];
-			/*
-			 * java.util.List readCustoms = new ArrayList(); String[]
-			 * splitCustoms = custom.split(VALUE_SEPARATOR); for (int j = 0; j <
-			 * splitCustoms.length; j++) { if
-			 * (!splitCustoms[j].equals(StringStatics.SPACE))
-			 * readCustoms.add(splitCustoms[j]); }
-			 */
-
-			//TODO make sure it has a next token
-			type = split[3];
-
-			levels = split[4];
-
-			//TODO better error checking when parsing int
-			preset = new ShowRelatedElementsPreset(name, false, Integer
-				.parseInt(type), Integer.parseInt(levels));
-			preset.addIds(readIds);
-			if (conversionMethod == null) {
-				preset.setCustom(custom);
-			} else {
-				preset.setCustom(conversionMethod
-					.convertSerializableStringToCustomData(custom));
-			}
-
-			presets.add(preset);
-		}
-		return presets;
-	}
-
-	/**
-	 * Convert the presets to a string array used for serializing
-	 * 
-	 * @param presets
-	 *            List of ShowRelatedElementsPresets objects
-	 * @param conversionMethod
-	 *            see the IConversionMethods class above
-	 * 
-	 * @return String array that contains the data of the presets
-	 */
-	public static String[] convertPresetsToString(java.util.List presets,
-			IConversionMethods conversionMethod) {
-
-		String[] array = new String[presets.size()];
-		int i = 0;
-		Iterator it = presets.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			assert (obj instanceof ShowRelatedElementsPreset);
-			ShowRelatedElementsPreset preset = (ShowRelatedElementsPreset) obj;
-			StringBuilder stringBuilder = new StringBuilder(preset.name
-					+ ShowRelatedElementsPresetHelper.KEY_SEPARATOR);
-			//String string = ;
-
-			Iterator idsIt = preset.getIds().iterator();
-			while (idsIt.hasNext()) {
-				obj = idsIt.next();
-				assert (obj instanceof String);
-
-				stringBuilder.append((String) obj);
-
-				if (idsIt.hasNext())
-					stringBuilder.append(ShowRelatedElementsPresetHelper.VALUE_SEPARATOR);
-
-			}
-
-			stringBuilder.append(ShowRelatedElementsPresetHelper.KEY_SEPARATOR);
-
-			stringBuilder.append((conversionMethod != null) ? conversionMethod
-				.convertCustomDataToSerializableString(preset.getCustom())
-				: StringStatics.BLANK);
-
-			stringBuilder.append(ShowRelatedElementsPresetHelper.KEY_SEPARATOR
-				+ preset.getExpansionType()
-				+ ShowRelatedElementsPresetHelper.KEY_SEPARATOR
-				+ preset.getLevels());
-
-			array[i] = stringBuilder.toString();
-			i++;
-		}
-		return array;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/package.html
deleted file mode 100644
index 6555095..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/dialogs/package.html
+++ /dev/null
@@ -1,81 +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 implementations of various common dialogs.
-These dialogs include
-<UL>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.DispatchingProgressMonitorDialog Dispatching Progress Monitor} dialog</LI>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowRelatedElementsDialog Show Related Elements} and {@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowHideRelationshipsDialog Show Hide Relationships} dialogs</LI>
-</UL>
-and 
-<UL>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.FilterWarningDialog Filter Warning} dialog</LI>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.PopupDialog Popup} dialog</LI>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.PropertiesDialog Properties} dialog</LI>
-<LI>{@link org.eclipse.gmf.runtime.common.ui.dialogs.SaveAllDirtyEditorsDialog Save All Dirty Editors} dialog</LI>
-</UL>
-</P>
-
-<h2>Dialogs</h2>
-<P>
-The use of most of the dialogs in this class is obvious.  One of the most
-commonly used dialogs in this package is the
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.DispatchingProgressMonitorDialog
-Dispatching Progress Monitor dialog}, which will dispatch pending UI events to
-the display thread whenever its <code>isCanceled()</code> method is called.
-</P>
-
-<h3>Show Related Elements and Show Hide Relationships</h3>
-<P>{@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowRelatedElementsDialog
-Show Related Elements} and
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowHideRelationshipsDialog
-Show Hide Relationships}, also referred to as SRE and SHR, are also commonly
-used dialogs.  Each dialog shows
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement
-SelectableElement} objects, which for our purposes represent relationships.
-SelectableElement objects are represented as trees, and leaf SelectableElement
-objects may be either set to selected, unselected, or leave, which are defined by
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.SelectedType SelectedType}.
-SelectableElement objects are displayed to the user using a label provider,
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElementsLabelProvider
-SelectableElementsLabelProvider} or
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElementsTriStateLabelProvider
-SelectableElementsTriStateLabelProvider}, and a
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElementsContentProvider
-content provider}.</P>
-
-<h4>Show Related Elements</h4>
-<P>The SRE dialog, which implements
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.IShowRelatedElementsWithDetails
-IShowRelatedElementsWithDetails}, is slightly more complex than the SHR dialog
-in that it also supports presets, and it may be separated into two sides, the
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowRelatedElementsPredefinedComposite
-ShowRelatedElementsPredefinedComposite} for the presets and the
-{@link org.eclipse.gmf.runtime.common.ui.dialogs.ShowRelatedElementsComposite
-ShowRelatedElementsComposite} for the user to choose detailed settings.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information, please see 
-{@link org.eclipse.jface.dialogs.Dialog org.eclipse.jface.dialogs.Dialog}</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/editors/IRevertiblePart.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/editors/IRevertiblePart.java
deleted file mode 100644
index 5a3569a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/editors/IRevertiblePart.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.common.ui.editors;
-
-import org.eclipse.ui.ISaveablePart;
-
-/**
- * Workbench parts can implement or adapt to this interface to participate
- * in the enablement and execution of the <code>Revert</code> action.
- * 
- * @author ldamus
- */
-public interface IRevertiblePart
-	extends ISaveablePart {
-
-	/**
-	 * Reverts this part by abandoning changes made in the part since the last
-	 * save operation.
-	 */
-	public void doRevertToSaved();
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIDebugOptions.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIDebugOptions.java
deleted file mode 100644
index 81c90a1..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIDebugOptions.java
+++ /dev/null
@@ -1,60 +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.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class CommonUIDebugOptions {
-
-    /**
-     * This class should not be instantiated since it is a static constant
-     * class.
-     * 
-     */
-    private CommonUIDebugOptions() {
-		/* private constructor */
-	}
-
-    /** Debug option. */
-    public static final String DEBUG = CommonUIPlugin.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 thrown exception. */
-    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$
-
-    /** Debug option used to trace actions admin. */
-    public static final String ACTIONS_ADMIN = DEBUG + "/actions/admin"; //$NON-NLS-1$
-    
-    /** Debug option used to trace action run. */
-    public static final String ACTIONS_RUN = DEBUG + "/actions/run"; //$NON-NLS-1$
-    
-    /** Debug option used to trace action repeat. */
-    public static final String ACTIONS_REPEAT = DEBUG + "/actions/repeat"; //$NON-NLS-1$
-    
-    /** Debug option used to trace resources. */
-	public static final String RESOURCE = DEBUG + "/resource/tracing"; //$NON-NLS-1$	
-	
-	/** Debug option used to trace service configuration. */
-	public static final String SERVICES_CONFIG = DEBUG + "/services/config"; //$NON-NLS-1$
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIIconNames.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIIconNames.java
deleted file mode 100644
index 6fb7824..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIIconNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.gmf.runtime.common.ui.internal;
-
-/******************************************************************************
- * 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 
- ****************************************************************************/
-
-/**
- * The set of icon filenames used by classes in org.eclipse.gmf.runtime.common.ui plugin.
- */
-public interface CommonUIIconNames {
-	
-	/** Cleared checkbox icon */
-	public static final String IMG_CHECKBOX_CLEARED = "icons/checkboxcleared.gif"; //$NON-NLS-1$
-	
-	/** Selected checkbox icon */
-	public static final String IMG_CHECKBOX_SELECTED = "icons/checkboxselected.gif"; //$NON-NLS-1$
-
-	/** Unselected checkbox icon */
-	public static final String IMG_CHECKBOX_UNSELECTED = "icons/checkboxunselected.gif"; //$NON-NLS-1$
-
-	/** Greyed checkbox icon */
-	public static final String IMG_CHECKBOX_GREYED = "icons/checkboxgreyed.gif"; //$NON-NLS-1$
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIPlugin.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIPlugin.java
deleted file mode 100644
index 7103ed0..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIPlugin.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.ui.internal;
-
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.ui.util.UIModificationValidator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The common UI plug-in.
- * 
- * @author khussey
- * 
- */
-public class CommonUIPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * This plug-in's shared instance.
-	 */
-	private static CommonUIPlugin plugin;
-    
-    /**
-     * UIModificationValidator
-     */
-    private UIModificationValidator uiValidator;
-
-	/**
-	 * Creates a new plug-in runtime object.
-	 */
-	public CommonUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Retrieves this plug-in's shared instance.
-	 * 
-	 * @return This plug-in's shared instance.
-	 */
-	public static CommonUIPlugin 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();
-	}
-
-	/**
-	 * Override to initialize the modification validator.
-	 */
-	public void start(BundleContext context)
-		throws Exception {
-		super.start(context);
-		
-		// Make sure validateEdit for resources affected by GMF operations is
-		// done with UI context.
-		uiValidator = new UIModificationValidator();
-		FileModificationValidator.setModificationValidator(uiValidator);
-	}
-    
-    /**
-     * Override to dispose the modification validator.
-     */
-    public void stop(BundleContext context)
-        throws Exception {
-        if (uiValidator != null) {
-            uiValidator.dispose();
-        }
-        
-        super.stop(context);
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIStatusCodes.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIStatusCodes.java
deleted file mode 100644
index b32c094..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/CommonUIStatusCodes.java
+++ /dev/null
@@ -1,71 +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.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-public final class CommonUIStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private CommonUIStatusCodes() {
-		/* 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/src/org/eclipse/gmf/runtime/common/ui/internal/contentassist/TextPresenter.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/contentassist/TextPresenter.java
deleted file mode 100644
index 511817c..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/contentassist/TextPresenter.java
+++ /dev/null
@@ -1,74 +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.internal.contentassist;
-
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Presents given text in bold
- * 
- * @author myee
- */
-public class TextPresenter
-	implements DefaultInformationControl.IInformationPresenter {
-
-	/**
-	 * The tag used to start displaying text in boldface. Text between the start
-	 * and end tags will be in boldface.
-	 */
-	static public final String BOLD_START_TAG = "<b>"; //$NON-NLS-1$
-
-	/**
-	 * The tag used to end displaying text in boldface. Text between the start
-	 * and end tags will be in boldface.
-	 */
-	static public final String BOLD_END_TAG = "</b>"; //$NON-NLS-1$
-
-	/**
-	 * Update text with bold style.
-	 * 
-	 * @param display
-	 *            the SWT display
-	 * @param hoverInfo
-	 *            the String to be presented
-	 * @param presentation
-	 *            the TextPresentation to be updated with the bold style
-	 * @param maxWidth
-	 *            the maximum width
-	 * @param maxHeight
-	 *            the maximum height
-	 * 
-	 * @return the hoverInfo String with the bold tags removed
-	 */
-	public String updatePresentation(Display display, String hoverInfo,
-			TextPresentation presentation, int maxWidth, int maxHeight) {
-		// parse the bold tags
-		int start = hoverInfo.indexOf(BOLD_START_TAG);
-		int end = hoverInfo.lastIndexOf(BOLD_END_TAG);
-		assert (start != -1 && end != -1);
-
-		// bold the text in the given range
-		StyleRange styleRange = new StyleRange(start, end - start
-			- BOLD_START_TAG.length(), null, null, SWT.BOLD);
-		presentation.addStyleRange(styleRange);
-
-		// return the text with the bold tags removed
-		String parsedText = hoverInfo.substring(0, start)
-			+ hoverInfo.substring(start + BOLD_START_TAG.length(), end)
-			+ hoverInfo.substring(end + BOLD_END_TAG.length());
-		return parsedText;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementTreeSelectionChangedAndMouseAndKeyListener.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementTreeSelectionChangedAndMouseAndKeyListener.java
deleted file mode 100644
index 3eb5205..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementTreeSelectionChangedAndMouseAndKeyListener.java
+++ /dev/null
@@ -1,249 +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.internal.dialogs;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement;
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectedType;
-
-/**
- * This is a selection changed listener for SelectableElement. You must
- * implement abstract protected void switchCheckType(SelectableElement element)
- * since there may be a different number of check types you want to support. The
- * show related elements only supports two, LEAVE and SELECTED. The show hide
- * relationships supports three, LEAVE, UNSELECTED, and SELECTED.
- * 
- * Also, add this as a SelectionChangedListener on the TreeViewer control, and
- * add a MouseListener and a KeyListener on the Tree control. If you don't add
- * the MouseListener and KeyListener, you'll have to take out the check for
- * mouseOrKeyPressed. I had to add mouse and key listeners to filter out tabbing
- * or pressing the up and down arrows.
- * 
- * @author Wayne Diu, wdiu
- */
-public abstract class SelectableElementTreeSelectionChangedAndMouseAndKeyListener
-	implements ISelectionChangedListener, MouseListener, KeyListener {
-
-	/**
-	 * The TreeViewer that will have its selection changed listener set to this
-	 * selection changed listener.
-	 */
-	private TreeViewer viewer;
-
-	/**
-	 * The ASCII code for the spacebar on the keyboard.
-	 */
-	private static final char KEYBOARD_SPACE_ASCII_CODE = 32;
-
-	/**
-	 * The mouse or keyboard was pressed
-	 */
-	protected boolean mouseOrKeyPressed = false;
-
-	/**
-	 * The selection from the selection changed event.
-	 */
-	protected SelectionChangedEvent selectionChangedEvent = null;
-
-	/**
-	 * Temporary check to see if this is Linux. Should not be needed after the
-	 * double selectionChanged event bug in Linux is resolved.
-	 */
-	protected boolean isLinux = false;
-
-	/**
-	 * Constructor that takes the TreeViewer that will have its selection
-	 * changed listener set to this selection changed listener.
-	 * 
-	 * @param aViewer
-	 *            the TreeViewer
-	 */
-	public SelectableElementTreeSelectionChangedAndMouseAndKeyListener(
-			TreeViewer aViewer) {
-		this.viewer = aViewer;
-
-		if (System.getProperty("os.name").toUpperCase().startsWith("LIN")) { //$NON-NLS-1$ //$NON-NLS-2$
-			isLinux = true;
-		}
-	}
-
-	/**
-	 * Pass in an element, and this will update its parents' check states
-	 * 
-	 * @param element
-	 *            the SelectableElement which will have its parents' check state
-	 *            updated
-	 */
-	private void setSelectedTypeForParent(SelectableElement element) {
-		SelectableElement parent = element.getParent();
-		if (parent != null) {
-
-			if (SelectableElement.doAllChildrenHaveSelectedType(parent,
-				SelectedType.UNSELECTED)) {
-				parent.setSelectedType(SelectedType.UNSELECTED);
-			} else if (SelectableElement.doAllChildrenHaveSelectedType(parent,
-				SelectedType.SELECTED)) {
-				parent.setSelectedType(SelectedType.SELECTED);
-			} else {
-				parent.setSelectedType(SelectedType.LEAVE);
-			}
-
-			setSelectedTypeForParent(parent);
-		}
-	}
-
-	/**
-	 * Pass in an element, and this will update its children's check states
-	 * 
-	 * @param parent
-	 *            the SelectableElement which will have its children's check
-	 *            state updated
-	 */
-	private void setSelectedTypeForChildren(SelectableElement parent) {
-		for (int i = 0; i < parent.getNumberOfChildren(); i++) {
-			parent.getChild(i).setSelectedType(parent.getSelectedType());
-			setSelectedTypeForChildren(parent.getChild(i));
-		}
-	}
-
-	/**
-	 * Switch the check type of an element
-	 * 
-	 * @param element
-	 *            the SelectableElement that will have its checktype changed
-	 */
-	abstract protected void switchCheckType(SelectableElement element);
-
-	/**
-	 * Handle the selection changed event. This won't do anything unless both a
-	 * selection occured and the mouse or key was pressed.
-	 */
-	public void handleSelectionChanged() {
-		if (selectionChangedEvent != null && mouseOrKeyPressed) {
-			StructuredSelection s = (StructuredSelection) selectionChangedEvent
-				.getSelection();
-			s.getFirstElement();
-
-			assert (s.getFirstElement() instanceof SelectableElement);
-			SelectableElement element = (SelectableElement) s.getFirstElement();
-
-			switchCheckType(element);
-
-			setSelectedTypeForChildren(element);
-			setSelectedTypeForParent(element);
-
-			viewer.refresh();
-
-			//reset since processed
-			selectionChangedEvent = null;
-			mouseOrKeyPressed = false;
-		}
-	}
-
-	//Mouse listeners
-
-	/**
-	 * The double click mouse event is ignored.
-	 * 
-	 * @param arg
-	 *            ignored
-	 */
-	public void mouseDoubleClick(MouseEvent arg) {
-		//do nothing
-	}
-
-	/**
-	 * The mouse down event sets the mouse or keyboard flag.
-	 * 
-	 * @param arg
-	 *            ignored
-	 */
-	public void mouseDown(MouseEvent arg) {
-		mouseOrKeyPressed = true;
-		handleSelectionChanged();
-	}
-
-	/**
-	 * The mouse up event is ignored
-	 * 
-	 * @param arg
-	 *            ignored
-	 */
-	public void mouseUp(MouseEvent arg) {
-		//do nothing
-	}
-
-	//Key listeners
-
-	/**
-	 * The key pressed event filters out everything except the spacebar before
-	 * setting the mouse or keyboard flag.
-	 * 
-	 * @param arg
-	 *            ignored
-	 */
-	public void keyPressed(KeyEvent arg) {
-		//only respond to space
-		if (arg.character == KEYBOARD_SPACE_ASCII_CODE) {
-			mouseOrKeyPressed = true;
-			handleSelectionChanged();
-		}
-	}
-
-	/**
-	 * The key released event is ignored.
-	 * 
-	 * @param arg
-	 *            ignored
-	 */
-	public void keyReleased(KeyEvent arg) {
-		//do nothing
-	}
-
-	//Selection changed
-
-	/**
-	 * Event handler. The check state has changed.
-	 * 
-	 * @param event
-	 *            the SelectionChangedEvent that made this selection changed
-	 *            event
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		//Temporary check to see if this is Linux. Should not be needed after
-		//the double selectionChanged event bug in Linux is resolved.
-		//This will not work if they change the order of the selectionChanged
-		//and mouse events, so I have restricted the possible problem to Linux
-		if (isLinux && !mouseOrKeyPressed)
-			return;
-
-		//I must check ((StructuredSelection)event.getSelection()).
-		//getFirstElement() instanceof SelectableElement for Linux
-		//because I get a selection event when expanding or
-		//collapsing a tree
-		if (event.getSelection() instanceof StructuredSelection
-			&& ((StructuredSelection) event.getSelection()).getFirstElement() instanceof SelectableElement) {
-			selectionChangedEvent = event;
-			handleSelectionChanged();
-		} else {
-			selectionChangedEvent = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsContentProvider.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsContentProvider.java
deleted file mode 100644
index 3c979d7..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsContentProvider.java
+++ /dev/null
@@ -1,99 +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.internal.dialogs;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement;
-
-/**
- * Content provider for SelectableElement viewer
- * 
- * @author Wayne Diu, wdiu
- */
-public class SelectableElementsContentProvider
-	implements ITreeContentProvider {
-
-	/**
-	 * An empty object array
-	 */
-	private static Object[] EMPTY_ARRAY = new Object[0];
-
-	/**
-	 * Tree viewer for content provider
-	 */
-	protected TreeViewer viewer;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-		/* method not implemented */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
-		this.viewer = (TreeViewer) aViewer;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof SelectableElement) {
-			return ((SelectableElement) parentElement).getChildren();
-		}
-		return EMPTY_ARRAY;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof SelectableElement) {
-			return ((SelectableElement) element).getParent();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsLabelProvider.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsLabelProvider.java
deleted file mode 100644
index f36ac13..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsLabelProvider.java
+++ /dev/null
@@ -1,157 +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.internal.dialogs;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectableElement;
-import org.eclipse.gmf.runtime.common.ui.util.ShiftedImageDescriptor;
-
-/**
- * Label provider for SelectableElement viewer
- * 
- * @author Wayne Diu, wdiu
- */
-public class SelectableElementsLabelProvider
-	extends LabelProvider
-	implements ILabelProviderListener {
-
-	/**
-	 * Image pool
-	 */
-	private Hashtable baseImagePool = new Hashtable();
-
-	/**
-	 * Width to shift image by, default 0
-	 */
-	private short width = 0;
-
-	/**
-	 * Height to shift image by, default 0
-	 */
-	private short height = 0;
-
-	/**
-	 * Constructor does nothing
-	 */
-	public SelectableElementsLabelProvider() {
-		/* Constructor */
-	}
-
-	/**
-	 * Constructor which you can specify the width and height to shift the image
-	 * by
-	 * 
-	 * @param aWidth
-	 *            to shift by
-	 * @param aHeight
-	 *            to shift by
-	 */
-	public SelectableElementsLabelProvider(short aWidth, short aHeight) {
-		this.width = aWidth;
-		this.height = aHeight;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		if (element instanceof SelectableElement) {
-
-			SelectableElement selectableElement = (SelectableElement) element;
-
-			String key = Integer.toString(selectableElement
-				.getIconImageDescriptor().hashCode());
-			Image image = (Image) baseImagePool.get(key);
-
-			if (image == null) {
-
-				ImageDescriptor imageDescriptor = selectableElement
-					.getIconImageDescriptor();
-				if (imageDescriptor != null) {
-					image = new ShiftedImageDescriptor(width, height,
-						imageDescriptor).createImage();
-				}
-
-				baseImagePool.put(key, image);
-			}
-
-			return image;
-		}
-
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(final Object element) {
-		if (element instanceof SelectableElement) {
-			return ((SelectableElement) element).getName();
-		}
-
-		return StringStatics.BLANK;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProviderListener#labelProviderChanged(org.eclipse.jface.viewers.LabelProviderChangedEvent)
-	 */
-	public void labelProviderChanged(LabelProviderChangedEvent event) {
-		fireLabelProviderChanged(event);
-	}
-
-	/**
-	 * Also frees up the images that were created Copied from
-	 * ModelExplorerDecorator, may move to public static
-	 * 
-	 * @param imagePool
-	 *            a HashTable that acts as an imagePool. It will have its images
-	 *            disposed.
-	 *  
-	 */
-	public void dispose(Hashtable imagePool) {
-		Collection c = imagePool.values();
-		Iterator i = c.iterator();
-		while (i.hasNext()) {
-			Image image = (Image) i.next();
-			if (image.isDisposed() == false) {
-				image.dispose();
-			}
-		}
-
-	}
-
-	/**
-	 * Also frees up the images that were created
-	 * 
-	 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-	 */
-	public void dispose() {
-		dispose(baseImagePool);
-		super.dispose();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsTriStateLabelProvider.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsTriStateLabelProvider.java
deleted file mode 100644
index ec10db1..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/dialogs/SelectableElementsTriStateLabelProvider.java
+++ /dev/null
@@ -1,263 +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.internal.dialogs;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-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.dialogs.SelectableElement;
-import org.eclipse.gmf.runtime.common.ui.dialogs.SelectedType;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIIconNames;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.gmf.runtime.common.ui.util.OverlayImageDescriptor;
-
-/**
- * This label provider overlays a selected or unselected icon on another icon.
- * It supports three states as defined in SelectedType, which are SELECTED,
- * UNSELECTED. and LEAVE. It decorates SELECTED with a green plus sign. It
- * decorates UNSELECTED with a red x. It doesn't do anything with LEAVE.
- * 
- * A mix of SELECTED, UNSELECTED, and LEAVE gives a greyed out parent. You could
- * call this this a fourth state, but it is not a real state.
- * 
- * @author wdiu, Wayne Diu
- */
-
-public class SelectableElementsTriStateLabelProvider
-	extends SelectableElementsLabelProvider {
-
-	/**
-	 * Image pool, this is not reusing the superclass' image pool because they
-	 * are supposed to be different.
-	 */
-	private Hashtable imagePool = new Hashtable();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		Image image = super.getImage(element);
-
-		// overlay if image is not null
-		if (image != null) {
-
-			SelectableElement selectableElement = (SelectableElement) element;
-			// super asserted on this
-
-			if ((selectableElement.getNumberOfChildren() > 0 && areAllChildrenOfType(
-				selectableElement, SelectedType.SELECTED))
-				|| (selectableElement.getNumberOfChildren() == 0 && selectableElement
-					.getSelectedType() == SelectedType.SELECTED)) {
-
-				String key = "s" + image.hashCode(); //$NON-NLS-1$ 
-				Image overlayImage = (Image) imagePool.get(key);
-
-				if (overlayImage == null) {
-					try {
-						overlayImage = overlayImage(image, AbstractUIPlugin
-							.imageDescriptorFromPlugin(CommonUIPlugin
-								.getPluginId(),
-								CommonUIIconNames.IMG_CHECKBOX_SELECTED));
-						imagePool.put(key, overlayImage);
-					} catch (Exception e) {
-						Trace.catching(CommonUIPlugin.getDefault(),
-							CommonUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "getImage", e); //$NON-NLS-1$
-						// don't just return the image,
-						// that will be more confusing in case of failure
-						Log.error(CommonUIPlugin.getDefault(),
-							CommonUIStatusCodes.RESOURCE_FAILURE,
-							"Failed to load SELECTED_ICON overlay", e); //$NON-NLS-1$
-						return null;
-					}
-				}
-				return overlayImage;
-
-			}
-
-			else if ((selectableElement.getNumberOfChildren() > 0 && areAllChildrenOfType(
-				selectableElement, SelectedType.UNSELECTED))
-				|| (selectableElement.getNumberOfChildren() == 0 && selectableElement
-					.getSelectedType() == SelectedType.UNSELECTED)) {
-				String key = "u" + image.hashCode(); //$NON-NLS-1$ 
-				Image overlayImage = (Image) imagePool.get(key);
-
-				if (overlayImage == null) {
-					try {
-						overlayImage = overlayImage(image, AbstractUIPlugin
-							.imageDescriptorFromPlugin(CommonUIPlugin
-								.getPluginId(),
-								CommonUIIconNames.IMG_CHECKBOX_UNSELECTED));
-						imagePool.put(key, overlayImage);
-					} catch (Exception e) {
-						// don't just return the image,
-						// that will be more confusing in case of failure
-						Trace.catching(CommonUIPlugin.getDefault(),
-							CommonUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "getImage", e); //$NON-NLS-1$
-						Log.error(CommonUIPlugin.getDefault(),
-							CommonUIStatusCodes.RESOURCE_FAILURE,
-							"Failed to load UNSELECTED_ICON overlay", e); //$NON-NLS-1$
-						return null;
-					}
-				}
-				return overlayImage;
-
-			}
-
-			else if ((selectableElement.getNumberOfChildren() > 0 && areAllChildrenOfType(
-				selectableElement, SelectedType.LEAVE))
-				|| (selectableElement.getNumberOfChildren() == 0 && selectableElement
-					.getSelectedType() == SelectedType.LEAVE)) {
-
-				String key = "c" + image.hashCode(); //$NON-NLS-1$ 
-				Image overlayImage = (Image) imagePool.get(key);
-
-				if (overlayImage == null) {
-					try {
-						overlayImage = overlayImage(image, AbstractUIPlugin
-							.imageDescriptorFromPlugin(CommonUIPlugin
-								.getPluginId(),
-								CommonUIIconNames.IMG_CHECKBOX_CLEARED));
-						imagePool.put(key, overlayImage);
-					} catch (Exception e) {
-						// don't just return the image,
-						// that will be more confusing in case of failure
-						Trace.catching(CommonUIPlugin.getDefault(),
-							CommonUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "getImage", e); //$NON-NLS-1$
-						Log.error(CommonUIPlugin.getDefault(),
-							CommonUIStatusCodes.RESOURCE_FAILURE,
-							"Failed to load CHECKBOX_ICON overlay", e); //$NON-NLS-1$
-						return null;
-					}
-				}
-				return overlayImage;
-			}
-
-			else {// mix, since has children
-
-				assert (selectableElement.getNumberOfChildren() > 0);
-
-				String key = "g" + image.hashCode(); //$NON-NLS-1$ 
-				Image overlayImage = (Image) imagePool.get(key);
-
-				if (overlayImage == null) {
-					try {
-						overlayImage = overlayImage(image, AbstractUIPlugin
-							.imageDescriptorFromPlugin(CommonUIPlugin
-								.getPluginId(),
-								CommonUIIconNames.IMG_CHECKBOX_GREYED));
-						imagePool.put(key, overlayImage);
-					} catch (Exception e) {
-						// don't just return the image,
-						// that will be more confusing in case of failure
-						Trace.catching(CommonUIPlugin.getDefault(),
-							CommonUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "getImage", e); //$NON-NLS-1$
-						Log.error(CommonUIPlugin.getDefault(),
-							CommonUIStatusCodes.RESOURCE_FAILURE,
-							"Failed to load GREYED_ICON overlay", e); //$NON-NLS-1$
-						return null;
-					}
-				}
-				return overlayImage;
-
-			}
-		}
-
-		return image;
-	}
-
-	/**
-	 * Overlays given base image with given overlay image ImageDescriptor
-	 * 
-	 * Based on overlayImage from ModelExplorerDecorator
-	 * 
-	 * @param srcImage
-	 *            base image
-	 * @param imageDesc
-	 *            overlay ImageDescriptor
-	 * @return Image the new overlay image
-	 */
-	private Image overlayImage(Image srcImage, ImageDescriptor imageDesc) {
-		OverlayImageDescriptor overlayDesc = new OverlayImageDescriptor(
-			srcImage, imageDesc, srcImage.getImageData().width, srcImage
-				.getImageData().height);
-
-		Image destImage = overlayDesc.createImage();
-		assert null != destImage;
-
-		return destImage;
-	}
-
-	/**
-	 * Returns if the SelectableElement's children all have the given type. This
-	 * function is recursive.
-	 * 
-	 * @param selectableElement
-	 *            the element to check if all children have the selectedType
-	 * @param selectedType
-	 *            the SelectedType that all children must have to return true
-	 * @return boolean true if all children are selectedType, false if they are
-	 *         not
-	 */
-	private boolean areAllChildrenOfType(SelectableElement selectableElement,
-			SelectedType selectedType) {
-		int numberOfChildren = selectableElement.getNumberOfChildren();
-		assert (numberOfChildren > 0);
-		for (int i = 0; i < numberOfChildren; i++) {
-			SelectableElement element = selectableElement.getChild(i);
-			if ((element.getNumberOfChildren() == 0 && element
-				.getSelectedType() != selectedType)
-				|| (element.getNumberOfChildren() > 0 && !areAllChildrenOfType(
-					element, selectedType)))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Also frees up the images that were created
-	 * 
-	 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-	 */
-	public void dispose() {
-		dispose(imagePool);
-		super.dispose();
-	}
-
-	/**
-	 * Constructor that calls its superclass
-	 */
-	public SelectableElementsTriStateLabelProvider() {
-		// randomly select an image, assume they're all the same size
-		// if your icon size is > short, then that would be very strange
-		// change it to int if you think that it will be a problem
-		super(
-			(AbstractUIPlugin.imageDescriptorFromPlugin(CommonUIPlugin
-				.getPluginId(), CommonUIIconNames.IMG_CHECKBOX_SELECTED) == null) ? (short) 0
-				: (short) (AbstractUIPlugin.imageDescriptorFromPlugin(
-					CommonUIPlugin.getPluginId(),
-					CommonUIIconNames.IMG_CHECKBOX_SELECTED).getImageData().width),
-			(short) 0);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.java
deleted file mode 100644
index 9d17110..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class CommonUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages";//$NON-NLS-1$
-
-	private CommonUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String XToolsUIPlugin__ERROR__startupErrorMessage;
-	public static String XToolsUIPlugin__ERROR__shutDownErrorMessage;
-	public static String ClearAction_label;
-	public static String MoveAction_label;
-	public static String ExplorerFilterSettingsAction_dialogTitle;
-	public static String ExplorerFilterSettingsAction_dialogMessage;
-	public static String SelectionComposite_invalidElementSelected;
-	public static String SelectionComposite_nothingSelectable;
-	public static String ShowRelatedElementsDialog_ExpansionGroup_Text;
-	public static String ShowRelatedElementsDialog_ExpansionGroup_RadioButton_Both;
-	public static String ShowRelatedElementsDialog_ExpansionGroup_Label_Levels;
-	public static String ShowRelatedElementsDialog_ExpansionGroup_CheckBox_Expand_Indefinitely;
-	public static String ShowRelatedElementsDialog_Title;
-	public static String ShowRelatedElementsDialog_Incoming;
-	public static String ShowRelatedElementsDialog_Outgoing;
-	public static String ShowRelatedElementsDialog_AllConnected;
-	public static String ShowRelatedElementsDialog_MAX_VIEWER_WIDTH;
-	public static String ShowRelatedElementsDialog_VIEWER_HEIGHT;
-	public static String ShowRelatedElementsDialog_LevelsValidation_Title;
-	public static String ShowRelatedElementsDialog_LevelsValidation_Message;
-	public static String ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Title;
-	public static String ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence1;
-	public static String ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence2;
-	public static String ShowHideRelationshipsDialog_Button_OK;
-	public static String ShowHideRelationshipsDialog_Button_Cancel;
-	public static String ShowRelatedElementsDialog_RelationshipTypes;
-	public static String ShowRelatedElementsPredefinedComposite_CustomQuery;
-	public static String ShowRelatedElementsPredefinedComposite_Delete;
-	public static String ShowRelatedElementsPredefinedComposite_SaveAs;
-    public static String ShowRelatedElementsPredefinedComposite_SaveAs_Title;
-	public static String ShowRelatedElementsPredefinedComposite_UserCustomQuery;
-	public static String ShowRelatedElementsPredefinedComposite_ShowDetails;
-	public static String ShowRelatedElementsPredefinedComposite_HideDetails;
-	public static String ShowRelatedElementsPredefinedComposite_SpecialCharacter;
-	//public static String ShowRelatedElementsPredefinedComposite_SaveAs;
-	public static String ShowRelatedElementsPredefinedComposite_ChooseName;
-	public static String ShowRelatedElementsPredefinedComposite_DefaultQuery;
-	public static String ShowHideRelationshipsDialog_Title;
-	public static String ShowHideRelationshipsDialog_Description;
-	public static String ShowHideRelationshipsDialog_MAX_VIEWER_WIDTH;
-	public static String ShowHideRelationshipsDialog_MAX_VIEWER_HEIGHT;
-	public static String ShowHideRelationshipsDialog_TEXT_AREA_HEIGHT;
-	public static String ShowHideRelationshipsDialog_Label_Legend;
-	public static String ShowHideRelationshipsDialog_Label_LegendShow;
-	public static String ShowHideRelationshipsDialog_Label_LegendHide;
-	public static String ShowHideRelationshipsDialog_Label_LegendLeave;
-	public static String TreeInlineTextEditor_errorDialogTitle;
-	public static String WorkbenchPartActivator_ErrorMessage;
-	public static String GlobalAction_infoDialogMessage;
-	public static String UIModificationValidator_ModificationMessage;
-	public static String ToggleAutomaticScrollingAction_label;
-	public static String ShowAllHiddenCategoriesAction_label;
-	public static String HideActiveCategoryAction_label;
-	public static String ToggleTabVisibilityAction_HideCategoryTab_label;
-	public static String ToggleTabVisibilityAction_ShowCategoryTab_label;
-	public static String OutputView_Clear_Tooltip;
-	public static String OutputView_ToggleAutomaticScrolling_Tooltip;
-	public static String OutputView_HideActiveCategory_Tooltip;
-	public static String OutputView_ShowAllHiddenCategories_Tooltip;
-	public static String FileModificationValidator_EditProblemDialogTitle;
-	public static String FileModificationValidator_EditProblemDialogMessage;
-	public static String FileModificationValidator_SaveProblemDialogTitle;
-	public static String FileModificationValidator_SaveProblemDialogMessage;
-	public static String FileModificationValidator_OK;
-	public static String FileModificationValidator_FileIsReadOnlyErrorMessage;
-	public static String PopupDialog_title;
-	public static String PopupDialog_message;
-	public static String FilterWarningDialog_title;
-	public static String FilterWarningDialog_modifyOptions;
-	public static String FilterWarningDialog_dontShowAgain;
-	public static String FilterWarningDialog_filteredOut;
-	public static String PropertiesDialog_title;
-	public static String ActionAbandonedDialog_title;
-	public static String SaveAllDirtyEditorsDialog_title;
-	public static String SaveAllDirtyEditorsDialog_message;
-	public static String FileModificationValidator_OutOfSyncMessage;
-	public static String GradientSelection_Gradient;
-	public static String GradientSelection_Colors;
-	public static String GradientSelection_Color1;
-	public static String GradientSelection_Color2;
-	public static String GradientSelection_Sample;
-	public static String GradientSelection_ShadingStyle;
-	public static String GradientSelection_Vertical;
-	public static String GradientSelection_Horizontal;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, CommonUIMessages.class);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.properties b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.properties
deleted file mode 100644
index 8e583cf..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/l10n/CommonUIMessages.properties
+++ /dev/null
@@ -1,231 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2009  IBM Corporation and others.                  |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-XToolsUIPlugin__ERROR__startupErrorMessage= IRJA0283E Error starting up {0} plug-in
-
-# Error message used when shutdown of a plug-in fails.
-# {0} = Plugin Name
-XToolsUIPlugin__ERROR__shutDownErrorMessage= IRJA0284E Error shutting down {0} plug-in
-
-# Label strings for actions.
-# ================================ BEGIN ==================================================
-ClearAction_label=Clear
-MoveAction_label=Move
-# ==================================== END =================================================
-
-
-# Default filter settings dialog title
-ExplorerFilterSettingsAction_dialogTitle=Model Explorer Filter Settings
-# Default filter setting dialog message
-ExplorerFilterSettingsAction_dialogMessage=Display the following elements
-
-
-# Selection composite messages
-SelectionComposite_invalidElementSelected=Invalid element selected
-SelectionComposite_nothingSelectable=No selection is available.
-
-
-
-# The show related elements dialog
-# ================================ BEGIN ==================================================
-ShowRelatedElementsDialog_ExpansionGroup_Text=Expansion Direction:
-ShowRelatedElementsDialog_ExpansionGroup_RadioButton_Both=Both
-ShowRelatedElementsDialog_ExpansionGroup_Label_Levels=Levels:
-ShowRelatedElementsDialog_ExpansionGroup_CheckBox_Expand_Indefinitely=Expand Indefinitely
-ShowRelatedElementsDialog_Title=Show Related Elements in Diagram
-ShowRelatedElementsDialog_Incoming=Incoming
-ShowRelatedElementsDialog_Outgoing=Outgoing
-ShowRelatedElementsDialog_AllConnected=All Connected
-
-# These following values may be adjusted to make the dialog appear properly when the translated text has been added
-# Because the translated text may occupy a different width or height than the English text, the dialog's width
-# and height may be adjusted to make it appear properly after the text in the dialog has been translated.
-# (DO NOT TRANSLATE - only modify number)
-#
-# START NON-TRANSLATABLE
-#
-
-ShowRelatedElementsDialog_MAX_VIEWER_WIDTH=500
-ShowRelatedElementsDialog_VIEWER_HEIGHT=225
-
-#
-# END NON-TRANSLATABLE
-#
-
-
-ShowRelatedElementsDialog_LevelsValidation_Title=Levels
-ShowRelatedElementsDialog_LevelsValidation_Message=Please enter a numeric value in the Levels text box
-ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Title=Expand indefinitely?
-
-# Fragmenting the following message so as to not use hard return characters in
-# translatable strings
-ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence1=Are you sure you want to expand indefinitely?
-ShowRelatedElementsDialog_ExpandIndefinitelyMessageBox_Message_Sentence2=Expanding indefinitely may require a high amount of system resources.
-# ==================================== END ================================================
-
-
-# The show/hide relationships dialog strings
-# ================================ BEGIN ==================================================
-ShowHideRelationshipsDialog_Button_OK=OK
-ShowHideRelationshipsDialog_Button_Cancel=Cancel
-ShowRelatedElementsDialog_RelationshipTypes=Relationship Types:
-
-ShowRelatedElementsPredefinedComposite_CustomQuery=Custom Query:
-ShowRelatedElementsPredefinedComposite_Delete=&Delete
-ShowRelatedElementsPredefinedComposite_SaveAs=Sa&ve As...
-ShowRelatedElementsPredefinedComposite_SaveAs_Title=Save As
-ShowRelatedElementsPredefinedComposite_UserCustomQuery=Custom Query
-ShowRelatedElementsPredefinedComposite_ShowDetails=De&tails >>
-ShowRelatedElementsPredefinedComposite_HideDetails=<< De&tails
-ShowRelatedElementsPredefinedComposite_SpecialCharacter=Please enter a string without special characters.
-#ShowRelatedElementsPredefinedComposite_SaveAs=Save As
-ShowRelatedElementsPredefinedComposite_ChooseName=Please enter a name.
-ShowRelatedElementsPredefinedComposite_DefaultQuery=Default
-
-ShowHideRelationshipsDialog_Title=Show/Hide Relationships
-ShowHideRelationshipsDialog_Description=Click on the relationships in the list below to add or remove them from the diagram.
-
-# These following values may be adjusted to make the dialog appear properly when the translated text has been added
-# Because the translated text may occupy a different width or height than the English text, the dialog's width
-# and height may be adjusted to make it appear properly after the text in the dialog has been translated.
-# (DO NOT TRANSLATE - only modify number)
-#
-# START NON-TRANSLATABLE
-#
-
-ShowHideRelationshipsDialog_MAX_VIEWER_WIDTH=500
-ShowHideRelationshipsDialog_MAX_VIEWER_HEIGHT=400
-ShowHideRelationshipsDialog_TEXT_AREA_HEIGHT=46
-
-#
-# END NON-TRANSLATABLE
-#
-
-ShowHideRelationshipsDialog_Label_Legend=Legend
-ShowHideRelationshipsDialog_Label_LegendShow=Show
-ShowHideRelationshipsDialog_Label_LegendHide=Hide
-ShowHideRelationshipsDialog_Label_LegendLeave=Leave
-# ==================================== END =================================================
-
-
-
-# error messages
-# ================================ BEGIN ==================================================
-TreeInlineTextEditor_errorDialogTitle= Problem encountered while editing label
-# {0} = View ID
-WorkbenchPartActivator_ErrorMessage=The view ''{0}'' could not be shown.
-
-# Display a message to the user if the execution had warnings or errors
-# {0} = Label for the Global Action
-GlobalAction_infoDialogMessage={0} operation was not completely successful.
-
-
-# ==================================== END =================================================
-
-
-# UIModificationValidator message to describe the type of change required by the
-# FileModificationValidator
-# ================================ BEGIN ===================================================
-UIModificationValidator_ModificationMessage = Modification
-# ==================================== END =================================================
-
-
-# output view action labels
-# ================================ BEGIN ==================================================
-ToggleAutomaticScrollingAction_label=AutoScroll
-ShowAllHiddenCategoriesAction_label=Show All
-HideActiveCategoryAction_label=Hide
-# {0} = Name of the category
-ToggleTabVisibilityAction_HideCategoryTab_label=Hide {0}
-# {0} = Name of the category
-ToggleTabVisibilityAction_ShowCategoryTab_label=Show {0}
-# ==================================== END =================================================
-
-
-
-
-# output view tooltips
-# ================================ BEGIN ==================================================
-OutputView_Clear_Tooltip=Clear contents of active category
-OutputView_ToggleAutomaticScrolling_Tooltip=Enable/Disable automatic scrolling
-OutputView_HideActiveCategory_Tooltip=Hide active category
-OutputView_ShowAllHiddenCategories_Tooltip=Show all hidden categories
-# ==================================== END =================================================
-
-
-
-# file change manager
-# ================================ BEGIN ==================================================
-# {0} = String describing the reason for editing the file
-FileModificationValidator_EditProblemDialogTitle={0} Problems
-
-# {0} = String describing the reason for editing the file
-# {1} = String describing the why file could not be edited
-FileModificationValidator_EditProblemDialogMessage={0} could not be completed.\n\nReason\n{1}
-
-FileModificationValidator_SaveProblemDialogTitle=Save Problems
-
-# {0} = String describing the why file could not be saved
-FileModificationValidator_SaveProblemDialogMessage=Save could not be completed.\n\nReason\n{0}
-
-FileModificationValidator_OK=OK
-# {0} = Full path of the file including the file name
-FileModificationValidator_FileIsReadOnlyErrorMessage=File {0} is read-only.
-
-# Status message informing the user that files are out of sync with the workspace
-FileModificationValidator_OutOfSyncMessage=The following files are out of synchronization with the workspace:
-# ==================================== END =================================================
-
-# Popup Dialog Strings; should be translated
-# ================================ BEGIN ==================================================
-PopupDialog_title=Select Action
-PopupDialog_message=Select an action:
-# ==================================== END =================================================
-
-# Filter warning dialog strings
-# ================================ BEGIN ==================================================
-FilterWarningDialog_title=Filtering
-FilterWarningDialog_modifyOptions=&Modify filter options to show this element
-FilterWarningDialog_dontShowAgain=&Don\'t show this message again
-FilterWarningDialog_filteredOut=This element has been filtered out and will not appear in this view.
-# ==================================== END =================================================
-
-# Properties dialog strings
-# ================================ BEGIN ==================================================
-PropertiesDialog_title=Properties
-# ==================================== END =================================================
-
-
-# ActionAbandonedDialog strings
-# ================================ BEGIN ==================================================
-ActionAbandonedDialog_title=Could not perform this action
-# ==================================== END =================================================
-
-# The Save All Dirty Editors dialog strings
-# ================================ BEGIN ==================================================
-SaveAllDirtyEditorsDialog_title=Save all Modified Resources
-SaveAllDirtyEditorsDialog_message=All modified resources must be saved before this operation.
-# ==================================== END =================================================
-
-# gradientSelectionDialog strings
-# ================================ BEGIN ==================================================
-GradientSelection_Gradient=Gradient Selection
-GradientSelection_Colors=Colors
-GradientSelection_Color1=Color 1
-GradientSelection_Color2=Color 2
-GradientSelection_Sample=Sample
-GradientSelection_ShadingStyle=Shading style
-GradientSelection_Vertical=Vertical
-GradientSelection_Horizontal=Horizontal
-# ==================================== END =================================================
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/package.html
deleted file mode 100644
index b30d9a0..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/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.
-
-
-<h2>Package Specification</h2>
-<p></p>
-@canBeSeenBy %level0
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEvent.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEvent.java
deleted file mode 100644
index 7972203..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEvent.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.internal.resources;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.IPath;

-

-

-/**

- * Utility class that describes a file change event.

- * 

- * @author Anthony Hunter <a

- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>

- */

-public class FileChangeEvent {

-

-	/**

-	 * the event type.

-	 */

-	private FileChangeEventType eventType;

-

-	/**

-	 * the original file of a rename or move event.

-	 */

-	private IFile oldFile;

-

-	/**

-	 * the event file.

-	 */

-	private IFile file;

-	

-	/**

-	 * The original file's absolute path.

-	 */

-	private IPath oldFilePath;

-	

-	/**

-	 * The event file's absolute path.

-	 */

-	private IPath filePath;

-

-	/**

-	 * Constructor for a file change event.

-	 * 

-	 * @param anEventType

-	 *            the event type, either changed or deleted.

-	 * @param aFile

-	 *            the changed or deleted file.

-	 */

-	public FileChangeEvent(FileChangeEventType anEventType, IFile aFile) {

-		assert (anEventType == FileChangeEventType.CHANGED

-			|| anEventType == FileChangeEventType.DELETED);

-		setEventType(anEventType);

-		setFile(aFile);

-		setOldFile(null);

-	}

-

-	/**

-	 * Constructor for a file change event.

-	 * 

-	 * @param anEventType

-	 *            the event type, either moved or renamed.

-	 * @param anOldFile

-	 *            the original file before the event.

-	 * @param newFile

-	 *            the new file after the event.

-	 */

-	public FileChangeEvent(FileChangeEventType anEventType, IFile anOldFile,

-			IFile newFile) {

-		assert (anEventType == FileChangeEventType.RENAMED

-			|| anEventType == FileChangeEventType.MOVED);

-		setEventType(anEventType);

-		setFile(newFile);

-		setOldFile(anOldFile);

-	}

-

-	/**

-	 * Get the event type.

-	 * 

-	 * @return the event type.

-	 */

-	public FileChangeEventType getEventType() {

-		return eventType;

-	}

-

-	/**

-	 * Get the file for the event.

-	 * 

-	 * @return the file for the event.

-	 */

-	public IFile getFile() {

-		return file;

-	}

-

-	/**

-	 * Get the original file before a rename or move the event.

-	 * 

-	 * @return the original file before a rename or move the event.

-	 */

-	public IFile getOldFile() {

-		return oldFile;

-	}

-

-	/**

-	 * Set the event type.

-	 * 

-	 * @param type

-	 *            the event type.

-	 */

-	private void setEventType(FileChangeEventType type) {

-		this.eventType = type;

-	}

-

-	/**

-	 * Set the file for the event.

-	 * 

-	 * @param aFile

-	 *            the file for the event.

-	 */

-	private void setFile(IFile aFile) {

-		this.file = aFile;

-	}

-

-	/**

-	 * Set the original file before a rename or move the event.

-	 * 

-	 * @param aFile

-	 *            the original file before a rename or move the event.

-	 */

-	private void setOldFile(IFile aFile) {

-		this.oldFile = aFile;

-	}

-

-	/**

-	 * Gets the cached original file's absolute path.

-	 * 

-	 * @return

-	 */

-	public IPath getOldFilePath() {

-		if (oldFilePath == null) {

-			oldFilePath = oldFile.getFullPath();

-		}

-		

-		return oldFilePath;

-	}

-

-	/**

-	 * Gets the cached event file's absolute path.

-	 * 

-	 * @return

-	 */

-	public IPath getFilePath() {

-		if (filePath == null) {

-			filePath = file.getFullPath();

-		}

-		

-		return filePath;

-	}	

-

-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEventType.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEventType.java
deleted file mode 100644
index c0f0e53..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileChangeEventType.java
+++ /dev/null
@@ -1,97 +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.internal.resources;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Enumeration class for a file change event type.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public class FileChangeEventType
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Moved file change event type.
-	 */
-	public static final FileChangeEventType MOVED = new FileChangeEventType(
-		"Moved"); //$NON-NLS-1$
-
-	/**
-	 * Renamed file change event type.
-	 */
-	public static final FileChangeEventType RENAMED = new FileChangeEventType(
-		"Renamed"); //$NON-NLS-1$
-
-	/**
-	 * Deleted file change event type.
-	 */
-	public static final FileChangeEventType DELETED = new FileChangeEventType(
-		"Deleted"); //$NON-NLS-1$
-
-	/**
-	 * Changed file change event type.
-	 */
-	public static final FileChangeEventType CHANGED = new FileChangeEventType(
-		"Changed"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final FileChangeEventType[] VALUES = {MOVED, RENAMED,
-		DELETED, CHANGED};
-
-	/**
-	 * Constructs a new file change event type with the specified name and
-	 * ordinal.
-	 * 
-	 * @param name
-	 *            The name of the new file change event type.
-	 * @param ordinal
-	 *            The ordinal for the new file change event type.
-	 */
-	protected FileChangeEventType(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new file change event type with the specified name.
-	 * 
-	 * @param name
-	 *            The name of the new file change event type.
-	 */
-	private FileChangeEventType(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));
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilter.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilter.java
deleted file mode 100644
index 0224a37..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilter.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.internal.resources;

-

-import java.net.URI;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.content.IContentType;

-

-

-/**

- * Utility class that describes a file observer filter.

- * 

- * @author Anthony Hunter <a

- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>

- */

-public class FileObserverFilter {

-

-	/**

-	 * the filter type.

-	 */

-	private FileObserverFilterType filterType;

-

-	/**

-	 * the filter.

-	 */

-	private Object filter;

-

-	/**

-	 * Create a file observer filter that will not filter out any events.

-	 * 

-	 * @param aFilterType

-	 *            The filter type, all.

-	 */

-	public FileObserverFilter(FileObserverFilterType aFilterType) {

-		assert (aFilterType == FileObserverFilterType.ALL);

-		setFilterType(aFilterType);

-		setFilter(null);

-	}

-

-	/**

-	 * Create a file observer filter that will filter out any events not for the

-	 * provided file extension.

-	 * 

-	 * @param aFilterType

-	 *            The filter type, extension.

-	 * @param extension

-	 *            The file extension array filter.

-	 */

-	public FileObserverFilter(FileObserverFilterType aFilterType,

-			String[] extension) {

-		assert (aFilterType == FileObserverFilterType.EXTENSION);

-		setFilterType(aFilterType);

-		setFilter(extension);

-	}

-

-	/**

-	 * Create a file observer filter that will filter out any events not for the

-	 * provided content types.

-	 * 

-	 * @param aFilterType

-	 *            The filter type, content type.

-	 * @param extension

-	 *            The file content type array filter.

-	 */

-	public FileObserverFilter(FileObserverFilterType aFilterType,

-			IContentType[] contentType) {

-		assert (aFilterType == FileObserverFilterType.CONTENT_TYPE);

-		setFilterType(aFilterType);

-		setFilter(contentType);

-	}

-

-	/**

-	 * Create a file observer filter that will filter out any events not for

-	 * children files under the provided folder.

-	 * 

-	 * @param aFilterType

-	 *            The filter type, folder.

-	 * @param folder

-	 *            The folder filter.

-	 */

-	public FileObserverFilter(FileObserverFilterType aFilterType, IFolder folder) {

-		assert (aFilterType == FileObserverFilterType.FOLDER);

-		setFilterType(aFilterType);

-		setFilter(folder);

-	}

-

-	/**

-	 * Create a file observer filter that will filter out any events not for the

-	 * provided file.

-	 * 

-	 * @param aFilterType

-	 *            The filter type, all.

-	 * @param file

-	 *            The file filter.

-	 */

-	public FileObserverFilter(FileObserverFilterType aFilterType, IFile file) {

-		assert (aFilterType == FileObserverFilterType.FILE);

-		setFilterType(aFilterType);

-		setFilter(file);

-	}

-

-	/**

-	 * Determines if the filter matches the provided resource.

-	 * 

-	 * @param resource

-	 *            the resource.

-	 * @return true if the filter matches the provided resource and the event

-	 *         should be given to the file change observer.

-	 */

-	public boolean matches(IResource resource) {

-		if (getFilterType() == FileObserverFilterType.ALL) {

-			return true;

-		}

-		if (getFilterType() == FileObserverFilterType.FILE

-			&& resource instanceof IFile

-			&& getAbsolutePath(getFileFilter()).equals(

-				getAbsolutePath(resource))) {

-			return true;

-

-		}

-		if (getFilterType() == FileObserverFilterType.FOLDER

-				&& resource instanceof IFile

-				&& getAbsolutePath(resource).startsWith(

-					getAbsolutePath(getFolderFilter()))) {

-				return true;

-			}

-		if (getFilterType() == FileObserverFilterType.CONTENT_TYPE

-				&& resource instanceof IFile

-				&& matchesContentType(((IFile)resource).getName())) {

-				return true;

-			}

-		if (getFilterType() == FileObserverFilterType.EXTENSION

-			&& resource instanceof IFile) {

-			String fileExtension = resource.getFullPath().getFileExtension();

-			if (matchesExtension(fileExtension)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Determines if the filter matches the provided path.

-	 * 

-	 * @param path

-	 *            the path.

-	 * @return true if the filter matches the provided path and the event should

-	 *         be given to the file change observer.

-	 */

-	public boolean matches(IPath path) {

-		if (getFilterType() == FileObserverFilterType.ALL) {

-			return true;

-		}

-		if (getFilterType() == FileObserverFilterType.FILE

-			&& getFileFilter().getFullPath().equals(path)) {

-			return true;

-		}

-		if (getFilterType() == FileObserverFilterType.FOLDER

-				&& path.isPrefixOf(getFolderFilter().getFullPath())) {

-				return true;

-			}

-		if (getFilterType() == FileObserverFilterType.CONTENT_TYPE

-				&& matchesContentType(path.segment(path.segmentCount()-1))) {

-				return true;

-			}

-		if (getFilterType() == FileObserverFilterType.EXTENSION

-			&& matchesExtension(path.getFileExtension())) {

-			return true;

-		}

-		return false;

-	}

-

-	/**

-	 * Determines if the file name matches observed content types

-	 * 

-	 * @param fileName

-	 *            file name to be matched

-	 * @return true if the file name matches observed content types

-	 */

-	private boolean matchesContentType(String fileName) {

-		IContentType[] contentTypes = getContentTypeFilter();

-		for (int i = 0; i < contentTypes.length; i++) {

-			if (contentTypes[i].isAssociatedWith(fileName)) {

-				return true;

-			}

-		}

-		return false;

-	}

-	/**

-	 * Determines if the extension matches observed extensions

-	 * 

-	 * @param extension

-	 *            Extension to be matched

-	 * @return true if the extension matches observed extensions

-	 */

-	private boolean matchesExtension(String extension) {

-		String[] extensions = getExtensionFilter();

-		for (int i = 0; i < extensions.length; i++) {

-			if (extensions[i].equals(extension)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Get the file filter.

-	 * 

-	 * @return the file filter.

-	 */

-	private IFile getFileFilter() {

-		assert (filterType == FileObserverFilterType.FILE);

-		return (IFile) filter;

-	}

-

-	/**

-	 * Get the folder filter.

-	 * 

-	 * @return the folder filter.

-	 */

-	private IFolder getFolderFilter() {

-		assert (filterType == FileObserverFilterType.FOLDER);

-		return (IFolder) filter;

-	}

-

-	/**

-	 * Get the file extension filter.

-	 * 

-	 * @return the file extension array filter.

-	 */

-	private String[] getExtensionFilter() {

-		assert (filterType == FileObserverFilterType.EXTENSION);

-		return (String[]) filter;

-	}

-

-	/**

-	 * Get the content type filter.

-	 * 

-	 * @return the content type array filter.

-	 */

-	private IContentType[] getContentTypeFilter() {

-		assert (filterType == FileObserverFilterType.CONTENT_TYPE);

-		return (IContentType[]) filter;

-	}

-

-	/**

-	 * Get the file observer filter type.

-	 * 

-	 * @return the file observer filter type.

-	 */

-	private FileObserverFilterType getFilterType() {

-		return filterType;

-	}

-

-	/**

-	 * Set the filter.

-	 * 

-	 * @param object

-	 *            the filter.

-	 */

-	private void setFilter(Object object) {

-		filter = object;

-	}

-

-	/**

-	 * Set the file observer filter type.

-	 * 

-	 * @param type

-	 *            the file observer filter type.

-	 */

-	private void setFilterType(FileObserverFilterType type) {

-		filterType = type;

-	}

-

-	/**

-	 * Get the path for a resource. In the case of a moved or deleted resource,

-	 * resource.getLocation() returns null since it does not exist in the

-	 * workspace. The workaround is below.

-	 * 

-	 * @param resource

-	 *            the resource.

-	 * @return the path for a resource.

-	 */

-	private String getAbsolutePath(IResource resource) {

-		URI locationURI = resource.getLocationURI();

-		if (locationURI == null) {

-			return resource.getFullPath().toString();

-		} else {

-			return locationURI.toString();

-		}

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilterType.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilterType.java
deleted file mode 100644
index 6dab540..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/FileObserverFilterType.java
+++ /dev/null
@@ -1,102 +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.internal.resources;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Enumeration class for a file observer filter type.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public class FileObserverFilterType
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * All file observer filter type.
-	 */
-	public static final FileObserverFilterType ALL = new FileObserverFilterType(
-		"All"); //$NON-NLS-1$
-
-	/**
-	 * file extension file observer filter type.
-	 */
-	public static final FileObserverFilterType EXTENSION = new FileObserverFilterType(
-		"Extension"); //$NON-NLS-1$
-
-	/**
-	 * folder file observer filter type.
-	 */
-	public static final FileObserverFilterType FOLDER = new FileObserverFilterType(
-		"Folder"); //$NON-NLS-1$
-
-	/**
-	 * file filter file observer filter type.
-	 */
-	public static final FileObserverFilterType FILE = new FileObserverFilterType(
-		"File"); //$NON-NLS-1$
-
-	/**
-	 * content type file observer filter type.
-     */
-	public static final FileObserverFilterType CONTENT_TYPE = new FileObserverFilterType("ContentType"); //$NON-NLS-1$
-	
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final FileObserverFilterType[] VALUES = {ALL, EXTENSION,
-		FOLDER, FILE, CONTENT_TYPE};
-
-	/**
-	 * Constructs a new file observer filter type with the specified name and
-	 * ordinal.
-	 * 
-	 * @param name
-	 *            The name of the new file observer filter type.
-	 * @param ordinal
-	 *            The ordinal for the new file observer filter type.
-	 */
-	protected FileObserverFilterType(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new file observer filter type with the specified name.
-	 * 
-	 * @param name
-	 *            The name of the new file observer filter type.
-	 */
-	private FileObserverFilterType(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));
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/IFileChangeManager.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/IFileChangeManager.java
deleted file mode 100644
index e0fb1b0..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/IFileChangeManager.java
+++ /dev/null
@@ -1,126 +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.internal.resources;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.gmf.runtime.common.ui.resources.IFileObserver;
-
-/**
- * Public interface for the File Change Manager.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public interface IFileChangeManager {
-
-	/**
-	 * Add a file observer without a filter. The file observer will be notified
-	 * of all file change events.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 */
-	public void addFileObserver(IFileObserver fileObserver);
-
-	/**
-	 * Add a file observer with a file filter. The file observer will be
-	 * notified of file change events for the provided file filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 * @param fileFilter
-	 *            the file filter.
-	 */
-	public void addFileObserver(IFileObserver fileObserver, IFile fileFilter);
-
-	/**
-	 * Add a file observer with a content type filter. The file observer will
-	 * be notified of file change events for any file whose file name is 
-	 * associated with the provided content type filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 * @param contentTypeFilter
-	 *            the content type array filter.
-	 */
-	public void addFileObserver(IFileObserver fileObserver, IContentType[] contentTypeFilter);
-
-	/**
-	 * Add a file observer with a folder filter. The file observer will be
-	 * notified of file change events for any file under the provided folder
-	 * filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 * @param folderFilter
-	 *            the folder filter.
-	 */
-	public void addFileObserver(IFileObserver fileObserver, IFolder folderFilter);
-
-	/**
-	 * Add a file observer with a file extension filter. The file observer will
-	 * be notified of file change events for any file having the same file
-	 * extension as the provided extension filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 * @param extensionFilter
-	 *            the file extension array filter.
-	 */
-	public void addFileObserver(IFileObserver fileObserver,
-			String[] extensionFilter);
-
-	/**
-	 * Remove a file observer.
-	 * 
-	 * @param fileObserver
-	 *            the file observer.
-	 */
-	public void removeFileObserver(IFileObserver fileObserver);
-
-	/**
-	 * Validates that the given files can be modified using the Team
-	 * validateEdit support.
-	 * 
-	 * @param files
-	 *            files that are to be modified; these files must all exist in
-	 *            the workspace.
-	 * @param modificationReason
-	 *            a String describing the reason for modifying the file, usually
-	 *            the command text.
-	 * @return true if it is OK to edit the files.
-	 * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit
-	 */
-	public boolean okToEdit(IFile[] files, String modificationReason);
-
-	/**
-	 * Validates that the given file can be saved using the Team validateSave
-	 * support.
-	 * 
-	 * @param file
-	 *            the file that is to be saved; this file must exist in the
-	 *            workspace.
-	 * @return true if it is OK to save the file.
-	 * @see org.eclipse.core.resources.IFileModificationValidator#validateSave
-	 */
-	public boolean okToSave(IFile file);
-
-	/**
-	 * Refresh changes made to the file directly on disk with the workspace.
-	 * 
-	 * @param file
-	 *            the file to refresh.
-	 */
-	public void refreshLocal(IFile file);
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEvent.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEvent.java
deleted file mode 100644
index ad4d801..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEvent.java
+++ /dev/null
@@ -1,99 +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.internal.resources;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-
-
-/**
- * Utility class that describes a marker change event.
- * 
- * @author Michael Yee
- */
-public class MarkerChangeEvent {
-
-	/**
-	 * the event type.
-	 */
-	private final MarkerChangeEventType eventType;
-
-	/**
-	 * the marker
-	 */
-	private final IMarker marker;
-
-	/**
-	 * the marker's old attributes, for a deleted marker only
-	 */
-	private final Map attributes;
-
-	/**
-	 * Constructor for MarkerChangeEvent
-	 * 
-	 * @param anEventType
-	 *            an event from the MarkerChangeEventType enumeration
-	 * @param aMarker
-	 *            IMarker for the marker change event
-	 * @param attributesMap
-	 *            marker's old attributes, for a deleted marker only. May be
-	 *            null
-	 */
-	public MarkerChangeEvent(MarkerChangeEventType anEventType,
-			IMarker aMarker, Map attributesMap) {
-		this.eventType = anEventType;
-		this.marker = aMarker;
-		this.attributes = attributesMap;
-	}
-
-	/**
-	 * Utility constructor for MarkerChangeEvent
-	 * 
-	 * @param anEventType
-	 *            an event from the MarkerChangeEventType enumeration
-	 * @param aMarker
-	 *            IMarker for the marker change event
-	 */
-	public MarkerChangeEvent(MarkerChangeEventType anEventType, IMarker aMarker) {
-		this(anEventType, aMarker, null);
-	}
-
-	/**
-	 * Gets the event type
-	 * 
-	 * @return the event type
-	 */
-	public MarkerChangeEventType getEventType() {
-		return eventType;
-	}
-
-	/**
-	 * Gets the marker
-	 * 
-	 * @return the marker
-	 */
-	public IMarker getMarker() {
-		return marker;
-	}
-
-	/**
-	 * Gets the marker's old attributes, for a deleted marker only
-	 * 
-	 * @return the marker's old attributes, for a deleted marker only, otherwise
-	 *         <code>null</code>
-	 */
-	public Map getAttributes() {
-		return attributes;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEventType.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEventType.java
deleted file mode 100644
index 6b14874..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/internal/resources/MarkerChangeEventType.java
+++ /dev/null
@@ -1,91 +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.internal.resources;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * Enumeration for a marker change event type.
- * 
- * @author Michael Yee
- */
-public class MarkerChangeEventType
-	extends EnumeratedType {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * An internal unique identifier for this enumerated type.
-	 */
-	private static int nextOrdinal = 0;
-
-	/**
-	 * Added file change event type.
-	 */
-	public static final MarkerChangeEventType ADDED = new MarkerChangeEventType(
-		"Added"); //$NON-NLS-1$
-
-	/**
-	 * Removed file change event type.
-	 */
-	public static final MarkerChangeEventType REMOVED = new MarkerChangeEventType(
-		"Removed"); //$NON-NLS-1$
-
-	/**
-	 * Changed file change event type.
-	 */
-	public static final MarkerChangeEventType CHANGED = new MarkerChangeEventType(
-		"Changed"); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	private static final MarkerChangeEventType[] VALUES = {ADDED, REMOVED,
-		CHANGED};
-
-	/**
-	 * Constructs a new marker change event type with the specified name and
-	 * ordinal.
-	 * 
-	 * @param name
-	 *            The name of the new file change event type.
-	 * @param ordinal
-	 *            The ordinal for the new file change event type.
-	 */
-	public MarkerChangeEventType(String name, int ordinal) {
-		super(name, ordinal);
-	}
-
-	/**
-	 * Constructs a new marker change event type with the specified name.
-	 * 
-	 * @param name
-	 *            The name of the new file change event type.
-	 */
-	private MarkerChangeEventType(String name) {
-		this(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/src/org/eclipse/gmf/runtime/common/ui/preferences/AbstractPreferencePage.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/AbstractPreferencePage.java
deleted file mode 100644
index 7b31087..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/AbstractPreferencePage.java
+++ /dev/null
@@ -1,105 +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.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract class for preference pages. Subclasses must set the preference store
- * in the constructor by calling <@link
- * PreferencePage#setPreferenceStore(org.eclipse.jface.preference.IPreferenceStore)>
- * or implement <@link PreferencePage#doGetPreferenceStore()> to return the
- * appropriate plugin's preference store.
- * 
- * @author schafe, cmahoney
- */
-public abstract class AbstractPreferencePage
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-
-	/**
-	 * Help ID string
-	 */
-	private String helpContextId = null;
-
-	/**
-	 * Constructor that calls the superclass and passses in the GridLayout
-	 * layout style constant.
-	 */
-	public AbstractPreferencePage() {
-		super(GRID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		initHelp();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		//initializing help context id, this is consistent
-		//with Eclipse preference pages
-		if (helpContextId != null)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, helpContextId);
-			
-		return super.createContents(parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-	 */
-	protected void createFieldEditors() {
-
-		Composite parent = getFieldEditorParent();
-		addFields(parent);
-
-	}
-
-	/**
-	 * Adds the field editors to this composite.
-	 * 
-	 * @param parent the parent Composite that the field editors will be added
-	 * to
-	 */
-	protected abstract void addFields(Composite parent);
-
-	/**
-	 * Initialize the context sensitive help id for this preference page.
-	 */
-	abstract protected void initHelp();
-
-	/**
-	 * Sets the context sensitive help id for this preference page.
-	 * 
-	 * @param id String ID for the context sensitive help
-	 */
-	protected void setPageHelpContextId(String id) {
-		this.helpContextId = id;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/CheckBoxFieldEditor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/CheckBoxFieldEditor.java
deleted file mode 100644
index de52654..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/CheckBoxFieldEditor.java
+++ /dev/null
@@ -1,64 +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.preferences;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Sublcasses BooleanFieldEditor to expose the checkbox control. The checkbox
- * control must be used to set the context sensitive help.
- * 
- * @author wdiu, Wayne Diu
- */
-public class CheckBoxFieldEditor
-	extends BooleanFieldEditor {
-
-	/**
-	 * The parent that will contain the checkbox field editor
-	 */
-	private Composite parent;
-
-	/**
-	 * Creates a boolean field editor in the default style.
-	 * 
-	 * @param name
-	 *            the name of the preference this field editor works on
-	 * @param label
-	 *            the label text string of the field editor
-	 * @param aParent
-	 *            the parent of the field editor's control
-	 */
-	public CheckBoxFieldEditor(String name, String label, Composite aParent) {
-		super(name, label, DEFAULT, aParent);
-		this.parent = aParent;
-	}
-
-	/**
-	 * Returns the checkbox control.
-	 * 
-	 * @return Button, the checkbox control
-	 */
-	public Button getCheckbox() {
-		return getChangeControl(parent);
-	}
-
-	/**
-	 * Get the parent composite.
-	 * 
-	 * @return the parent composite.
-	 */
-	public Composite getParent() {
-		return parent;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/ComboFieldEditor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/ComboFieldEditor.java
deleted file mode 100644
index d42c29b..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/ComboFieldEditor.java
+++ /dev/null
@@ -1,341 +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.preferences;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Constructs a field editor with a label and a drop down combo box.
- * 
- * @author Wayne Diu, wdiu
- */
-public class ComboFieldEditor
-	extends FieldEditor {
-
-	/**
-	 * Whether the label and combo should be on separate lines
-	 */
-	protected boolean separateLine = false;
-
-	/**
-	 * Whether you can type into the combo box
-	 */
-	protected boolean readOnly = false;
-
-	/**
-	 * Indent of controls
-	 */
-	protected int indent = 0;
-
-	/**
-	 * Width of combo box.
-	 */
-	protected int width = 0;
-
-	/**
-	 * The combo box control.
-	 */
-	protected Combo combo = null;
-
-	/*
-	 * static final types for determining how preferences are saved.
-	 */
-	/** STRING_TYPE saves the actual string. */
-	public static final int STRING_TYPE = 0;
-
-	/** INT_TYPE saves the index. */
-	public static final int INT_TYPE = 1;
-
-	/** INT_TYPE_INDEXED saves an associated value for the index value */
-	public static final int INT_TYPE_INDEXED = 2;
-
-	/**
-	 * The type that was chosen for saving preferences
-	 */
-	protected int type;
-
-	/**
-	 * Index of list contains value of preference to store
-	 */
-	protected ArrayList indexToValue = new ArrayList();
-
-	/**
-	 * True for automatically loading and storing and false for manual loading
-	 * and storing of values in the combo box.
-	 */
-	public boolean autoStorage = true;
-
-	/**
-	 * Constructor to create the combo field editor
-	 * 
-	 * @param name
-	 *            String containing unique name of field editor
-	 * @param labelText
-	 *            String containing text to display
-	 * @param parent
-	 *            Composite the parent composite that contains this field editor
-	 */
-	public ComboFieldEditor(String name, String labelText, Composite parent) {
-		this(name, labelText, parent, 0, false, STRING_TYPE, 0, false);
-	}
-
-	/**
-	 * Constructor to create the combo field editor
-	 * 
-	 * @param name
-	 *            String containing unique name of field editor
-	 * @param labelText
-	 *            String containing text to display
-	 * @param parent
-	 *            Composite the parent composite that contains this field editor
-	 * @param aType
-	 *            int, either INT_TYPE or STRING_TYPE which describes the way
-	 *            that we will be saving preferences. INT_TYPE will save
-	 *            according to the index and STRING_TYPE will save the actual
-	 *            string.
-	 * @param aSeparateLine
-	 *            boolean. Set to true to make labelText and the combo appear on
-	 *            separate lines. Set to false to make labelText appear to the
-	 *            left of the combo box.
-	 * @param anIndent
-	 *            How much to indent on the left side.
-	 * @param aWidth
-	 *            is the width of the combo.
-	 * @param aReadOnly
-	 *            true to be read only, false to be read write
-	 */
-	public ComboFieldEditor(String name, String labelText, Composite parent,
-			int aType, boolean aSeparateLine, int anIndent, int aWidth,
-			boolean aReadOnly) {
-		this.separateLine = aSeparateLine;
-		this.indent = anIndent;
-		this.width = aWidth;
-		this.readOnly = aReadOnly;
-		this.type = aType;
-		init(name, labelText);
-		createControl(parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)
-	 */
-	protected void adjustForNumColumns(int numColumns) {
-		/* empty method body */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite,
-	 *      int)
-	 */
-	protected void doFillIntoGrid(Composite parent, int numColumns) {
-		GridData labelGridData = new GridData();
-
-		getLabelControl(parent).setLayoutData(labelGridData);
-		labelGridData.horizontalIndent = indent;
-
-		getLabelControl(parent);
-
-		GridData gd = new GridData();
-		//We don't need to decrease the number of columns when
-		//it's going on a separate line.
-		if (separateLine) {
-			gd.horizontalSpan = numColumns;
-		} else {
-			gd.horizontalSpan = numColumns - 1;
-		}
-
-		//Width is affected only if it was specified and
-		//not zero
-		if (width == 0) {
-			gd.horizontalAlignment = GridData.FILL;
-			gd.grabExcessHorizontalSpace = true;
-		} else {
-			gd.widthHint = width;
-		}
-
-		//we must indent only if it's a separate line
-		if (separateLine) {
-			gd.horizontalIndent = indent;
-		}
-
-		int flags = SWT.CLIP_CHILDREN | SWT.CLIP_SIBLINGS | SWT.DROP_DOWN;
-		if (readOnly) {
-			flags = flags | SWT.READ_ONLY;
-		}
-		combo = new Combo(parent, flags);
-		combo.setLayoutData(gd);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditor#doLoad()
-	 */
-	protected void doLoad() {
-		if (!autoStorage)
-			return;
-		if (combo != null) {
-			if (type == STRING_TYPE) {
-				combo.setText(getPreferenceStore().getString(
-					getPreferenceName()));
-			} else if (type == INT_TYPE) {
-				combo.select(getPreferenceStore().getInt(getPreferenceName()));
-			} else if (type == INT_TYPE_INDEXED) {
-				int storeValue = getPreferenceStore().getInt(
-					getPreferenceName());
-				int index = indexToValue.indexOf(Integer.valueOf(storeValue));
-				combo.select(index);
-			}
-			//else, we have a problem because the
-			//type is not recognized and assert didn't catch it!
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()
-	 */
-	protected void doLoadDefault() {
-		if (!autoStorage)
-			return;
-		if (combo != null) {
-			if (type == STRING_TYPE) {
-				combo.setText(getPreferenceStore().getDefaultString(
-					getPreferenceName()));
-			} else if (type == INT_TYPE) {
-				combo.select(getPreferenceStore().getDefaultInt(
-					getPreferenceName()));
-			} else if (type == INT_TYPE_INDEXED) {
-				int storeValue = getPreferenceStore().getDefaultInt(
-					getPreferenceName());
-				int index = indexToValue.indexOf(Integer.valueOf(storeValue));
-				combo.select(index);
-			}
-			//else, we have a problem because the
-			//type is not recognized
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.FieldEditor#doStore()
-	 */
-	protected void doStore() {
-		if (!autoStorage)
-			return;
-
-		//otherwise, make sure either save as string or int
-		if (type == STRING_TYPE) {
-			getPreferenceStore().setValue(getPreferenceName(), combo.getText());
-		} else if (type == INT_TYPE) {
-			getPreferenceStore().setValue(getPreferenceName(),
-				combo.getSelectionIndex());
-		} else if (type == INT_TYPE_INDEXED) {
-			//get the value we want to save, for the selected
-			//index
-			Integer storeValue = (Integer) indexToValue.get(combo
-				.getSelectionIndex());
-			getPreferenceStore().setValue(getPreferenceName(),
-				storeValue.intValue());
-		}
-	}
-
-	/**
-	 * Returns this field editor's current value.
-	 * 
-	 * @return the value of the combo box as a String
-	 */
-	public String getStringValue() {
-		return combo.getText();
-	}
-
-	/**
-	 * Returns the number of controls in this editor
-	 * 
-	 * @return int 2 since there's the combo and the label
-	 */
-	public int getNumberOfControls() {
-		return 2;
-	}
-
-	/**
-	 * Returns the actual combo box contained in the field editor.
-	 * 
-	 * @return combo which is the actual combo box.
-	 */
-	public Combo getComboControl() {
-		return combo;
-	}
-
-	/**
-	 * Returns whether or not the given string is already in the combo box. You
-	 * could call this method to check to see if the string is already there
-	 * before inserting if you do not want duplicates.
-	 * 
-	 * @param value
-	 *            the String to check
-	 * @return boolean true if it exists, false if it doesn't
-	 */
-	public boolean existsInCombo(String value) {
-		//make sure it's not already in there.
-		for (int i = 0; i < combo.getItemCount(); i++) {
-			//get out of function since not going to
-			//add something that's already there
-			if (combo.getItem(i).compareToIgnoreCase(value) == 0)
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Sets the automatic loading and storing of contents for the combo box.
-	 * Default is true.
-	 * 
-	 * @param anAutoStorage
-	 *            true for automatically loading and storing and false for
-	 *            manual loading and storing
-	 */
-	public void setAutoStorage(boolean anAutoStorage) {
-		this.autoStorage = anAutoStorage;
-	}
-
-	/**
-	 * Adds an item to the combo. Also stores the value to be saved to the
-	 * preference store when the index is the selection. (As opposed to saving
-	 * the index value.)
-	 * 
-	 * @param stringValue
-	 *            String value of the item
-	 * @param storeValue
-	 *            int value of the item
-	 */
-	public void addIndexedItemToCombo(String stringValue, int storeValue) {
-		assert type == INT_TYPE_INDEXED : "type is not equal to INT_TYPE_INDEXED"; //$NON-NLS-1$
-		
-		combo.add(stringValue);
-		indexToValue.add(Integer.valueOf(storeValue));
-
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/FontFieldEditor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/FontFieldEditor.java
deleted file mode 100644
index 2a1d127..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/FontFieldEditor.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.preferences;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * A field editor for a font type preference.
- * 
- * Very similar to the org.eclipse.jface.preference.FontFieldEditor.
- * The difference is that the ability to change the selected font 
- * without a user action (using the change font button) is provided.
- * Subclassing from the jface FontFieldEditor was not an option because
- * the needed methods and instance variables were private.
- * 
- * @author schafe
- */
-public class FontFieldEditor extends FieldEditor {
-
-	/**
-	 * The change font button, or <code>null</code> if none
-	 * (before creation and after disposal).
-	 */
-	private Button changeFontButton = null;
-
-	/**
-	 * The text for the change font button, or <code>null</code>
-	 * if missing.
-	 */
-	private String changeButtonText;
-
-	/**
-	 * The text for the preview, or <code>null</code> if no preview is desired
-	 */
-	private String previewText;
-
-	/**
-	 * Font data for the chosen font button, or <code>null</code> if none.
-	 */
-	private FontData[] chosenFont;
-
-	/**
-	 * The label that displays the selected font, or <code>null</code> if none.
-	 */
-	private Label valueControl;
-
-	/**
-	 * The previewer, or <code>null</code> if none.
-	 */
-	private DefaultPreviewer previewer;
-
-	/**
-	 * Internal font previewer implementation.
-	 */
-	private static class DefaultPreviewer {
-		private Text text;
-		private String string;
-		private Font font;
-		
-		/**
-		 * Constructor for the previewer.
-		 * @param s
-		 * @param parent
-		 */
-		public DefaultPreviewer(String s, Composite parent) {
-			string = s;
-			text = new Text(parent, SWT.READ_ONLY | SWT.BORDER);
-			text.addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent e) {
-					if (font != null)
-						font.dispose();
-				}
-			});
-			if (string != null)
-				text.setText(string);
-		}
-
-		/**
-		 * @return the control the previewer is using
-		 */
-		public Control getControl() {
-			return text;
-		}
-
-		/**
-		 * Set the font to display with
-		 * @param fontData
-		 */
-		public void setFont(FontData[] fontData) {
-			if (font != null)
-				font.dispose();
-			font = new Font(text.getDisplay(), fontData);
-			text.setFont(font);
-		}
-		
-		/**
-		 * @return the preferred size of the previewer.
-		 */
-		public int getPreferredExtent() {
-			return 40;
-		}
-	}
-	
-	/**
-	 * Creates a font field editor with an optional preview area.
-	 * 
-	 * @param name the name of the preference this field editor works on
-	 * @param labelText the label text of the field editor
-	 * @param previewAreaText the text used for the preview window. If it is
-	 * <code>null</code> there will be no preview area,
-	 * @param parent the parent of the field editor's control
-	 */
-	public FontFieldEditor(
-		String name,
-		String labelText,
-		String previewAreaText,
-		Composite parent) {
-		init(name, labelText);
-		previewText = previewAreaText;
-		changeButtonText = JFaceResources.getString("openChange"); //$NON-NLS-1$
-		createControl(parent);
-
-	}
-	/**
-	 * Creates a font field editor without a preview.
-	 * 
-	 * @param name the name of the preference this field editor works on
-	 * @param labelText the label text of the field editor
-	 * @param parent the parent of the field editor's control
-	 */
-	public FontFieldEditor(String name, String labelText, Composite parent) {
-		this(name, labelText, null, parent);
-
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void adjustForNumColumns(int numColumns) {
-
-		GridData data = new GridData();
-		if (valueControl.getLayoutData() != null)
-			data = (GridData) valueControl.getLayoutData();
-
-		data.horizontalSpan = numColumns - getNumberOfControls() + 1;
-		valueControl.setLayoutData(data);
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void applyFont() {
-		if (chosenFont != null && previewer != null)
-			previewer.setFont(chosenFont);
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void doFillIntoGrid(Composite parent, int numColumns) {
-		getLabelControl(parent);
-
-		valueControl = getValueControl(parent);
-
-		GridData gd =
-			new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gd.horizontalSpan = numColumns - getNumberOfControls() + 1;
-		valueControl.setLayoutData(gd);
-		if (previewText != null) {
-			previewer = new DefaultPreviewer(previewText, parent);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.heightHint = previewer.getPreferredExtent();
-			gd.widthHint = previewer.getPreferredExtent();
-			previewer.getControl().setLayoutData(gd);
-		}
-
-		changeFontButton = getChangeControl(parent);
-		gd = new GridData();
-		gd.heightHint =
-			convertVerticalDLUsToPixels(
-				changeFontButton,
-				14);
-		int widthHint =
-			convertHorizontalDLUsToPixels(
-				changeFontButton,
-				IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint =
-			Math.max(
-				widthHint,
-				changeFontButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		changeFontButton.setLayoutData(gd);
-
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void doLoad() {
-		if (changeFontButton == null)
-			return;
-		updateFont(
-			PreferenceConverter.getFontDataArray(
-				getPreferenceStore(),
-				getPreferenceName()));
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void doLoadDefault() {
-		if (changeFontButton == null)
-			return;
-		updateFont(
-			PreferenceConverter.getDefaultFontDataArray(
-				getPreferenceStore(),
-				getPreferenceName()));
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	protected void doStore() {
-		if (chosenFont != null)
-			PreferenceConverter.setValue(
-				getPreferenceStore(),
-				getPreferenceName(),
-				chosenFont);
-	}
-	/**
-	 * Returns the change button for this field editor.
-	 *
-	 * @param parent The Composite to create the button in if required.
-	 * @return the change button
-	 */
-	protected Button getChangeControl(Composite parent) {
-		if (changeFontButton == null) {
-			changeFontButton = new Button(parent, SWT.PUSH);
-			if (changeButtonText != null)
-				changeFontButton.setText(changeButtonText);
-			changeFontButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					FontDialog fontDialog =
-						new FontDialog(changeFontButton.getShell());
-					if (chosenFont != null)
-						fontDialog.setFontList(chosenFont);
-					FontData font = fontDialog.open();
-					if (font != null) {
-						FontData[] oldFont = chosenFont;
-						if(oldFont == null)
-							oldFont = JFaceResources.getDefaultFont().getFontData();
-						setPresentsDefaultValue(false);
-						FontData[] newData = new FontData[1];
-						newData[0] = font;
-						updateFont(newData);
-						fireValueChanged(VALUE, oldFont[0], font);
-					}
-
-				}
-			});
-			changeFontButton.addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent event) {
-					changeFontButton = null;
-				}
-			});
-			changeFontButton.setFont(parent.getFont());
-			setButtonLayoutData(changeFontButton);
-		} else {
-			checkParent(changeFontButton, parent);
-		}
-		return changeFontButton;
-	}
-	/* (non-Javadoc)
-	 * Method declared on FieldEditor.
-	 */
-	public int getNumberOfControls() {
-		if (previewer == null)
-			return 3;
-		else
-			return 4;
-	}
-	/**
-	 * Returns the preferred preview height. 
-	 *
-	 * @return the height, or <code>-1</code> if no previewer
-	 *  is installed
-	 */
-	public int getPreferredPreviewHeight() {
-		if (previewer == null)
-			return -1;
-		return previewer.getPreferredExtent();
-	}
-	/**
-	 * Returns the preview control for this field editor.
-	 *
-	 * @return the preview control
-	 */
-	public Control getPreviewControl() {
-		if (previewer == null)
-			return null;
-
-		return previewer.getControl();
-	}
-	/**
-	 * Returns the value control for this field editor. The value control
-	 * displays the currently selected font name.
-	 * @param parent The Composite to create the viewer in if required
-	 * @return the value control
-	 */
-	protected Label getValueControl(Composite parent) {
-		if (valueControl == null) {
-			valueControl = new Label(parent, SWT.LEFT);
-			valueControl.setFont(parent.getFont());
-			valueControl.addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent event) {
-					valueControl = null;
-				}
-			});
-		} else {
-			checkParent(valueControl, parent);
-		}
-		return valueControl;
-	}
-	/**
-	 * Sets the text of the change button.
-	 *
-	 * @param text the new text
-	 */
-	public void setChangeButtonText(String text) {
-		Assert.isNotNull(text);
-		changeButtonText = text;
-		if (changeFontButton != null)
-			changeFontButton.setText(text);
-	}
-	/**
-	 * Updates the change font button and the previewer to reflect the
-	 * newly selected font.
-	 * @param font The FontData[] to update with.
-	 */
-	private void updateFont(FontData font[]) {
-		FontData[] bestFont =
-			JFaceResources.getFontRegistry().filterData(
-				font,
-				valueControl.getDisplay());
-
-		//if we have nothing valid do as best we can
-		if (bestFont == null)
-			bestFont = getDefaultFontData();
-
-		//Now cache this value in the receiver
-		this.chosenFont = bestFont;
-
-		if (valueControl != null) {
-			valueControl.setText(StringConverter.asString(chosenFont[0]));
-		}
-		if (previewer != null) {
-			previewer.setFont(bestFont);
-		}
-	}
-	/**
-	 * Store the default preference for the field
-	 * being edited
-	 */
-	protected void setToDefault() {
-		FontData[] defaultFontData =
-			PreferenceConverter.getDefaultFontDataArray(
-				getPreferenceStore(),
-				getPreferenceName());
-		PreferenceConverter.setValue(
-			getPreferenceStore(),
-			getPreferenceName(),
-			defaultFontData);
-	}
-
-	/**
-	 * Get the system default font data.
-	 * @return FontData[]
-	 */
-	private FontData[] getDefaultFontData() {
-		return valueControl.getDisplay().getSystemFont().getFontData();
-	}
-
-	/*
-	 * @see FieldEditor.setEnabled(boolean,Composite).
-	 */
-	public void setEnabled(boolean enabled, Composite parent) {
-		super.setEnabled(enabled, parent);
-		getChangeControl(parent).setEnabled(enabled);
-		getValueControl(parent).setEnabled(enabled);
-	}
-	
-	/**
-	 * Sets the displayed/selected font to be the font
-	 * for FontData newFont.
-	 * @param newFont
-	 */
-	public void setFont(FontData newFont){
-		FontData[] oldFont = chosenFont;
-		if(oldFont == null)
-			oldFont = JFaceResources.getDefaultFont().getFontData();
-		setPresentsDefaultValue(false);
-		FontData[] newData = new FontData[1];
-		newData[0] = newFont;
-		updateFont(newData);
-		fireValueChanged(VALUE, oldFont[0], newFont);	
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/package.html
deleted file mode 100644
index 3cf9919..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/preferences/package.html
+++ /dev/null
@@ -1,52 +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 preference page helpers, including an abstract preference
-page that supports context sensitive help and some field editors intended for
-use on preference pages.</P>
-
-<h2>Using this Package</h2>
-
-<P>First, subclass
-{@link org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage
-AbstractPreferencePage}.  The resulting preference page will support context
-sensitive help.
-</P>
-
-<P>The {@link org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor
-CheckboxFieldEditor}
-and the {@link org.eclipse.gmf.runtime.common.ui.preferences.ComboFieldEditor
-ComboFieldEditor}
-may be used on the subclassed preference page or another
-{@link org.eclipse.ui.IWorkbenchPreferencePage
-IWorkbenchPreferencePage}.
-
-Implement the
-{@link org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-createFieldEditors()} method to add the field editors.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information, please see {@link org.eclipse.ui.IWorkbenchPreferencePage
-IWorkbenchPreferencePage}.</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileChangeManager.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileChangeManager.java
deleted file mode 100644
index 943df96..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileChangeManager.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.resources;

-

-import java.util.Arrays;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IMarkerDelta;

-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.IWorkspaceRunnable;

-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.core.runtime.content.IContentType;

-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.internal.CommonUIDebugOptions;

-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;

-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;

-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEvent;

-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEventType;

-import org.eclipse.gmf.runtime.common.ui.internal.resources.IFileChangeManager;

-import org.eclipse.gmf.runtime.common.ui.internal.resources.MarkerChangeEvent;

-import org.eclipse.gmf.runtime.common.ui.internal.resources.MarkerChangeEventType;

-

-/**

- * The file change manager handles changes made to file resources within the

- * Eclipse workspace. Files in the workspace are affected by change events on

- * the files themselves as well as change events on the project and folder that

- * contains these files.

- * 

- * @author Anthony Hunter <a

- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>

- */

-public class FileChangeManager

-	implements IResourceChangeListener, IResourceDeltaVisitor,

-	IFileChangeManager {

-

-	/**

-	 * singleton instance of this class

-	 */

-	private static FileChangeManager INSTANCE = new FileChangeManager();

-

-	/**

-	 * get the singleton instance of this class

-	 * 

-	 * @return singleton instance of the FileChangeManager class

-	 */

-	public static FileChangeManager getInstance() {

-		return INSTANCE;

-	}

-

-	/**

-	 * list of resource observers

-	 */

-	private FileObserverManager fileObserverManager = new FileObserverManager();

-

-	/**

-	 * Simple constructor.

-	 */

-	private FileChangeManager() {

-		super();

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this,

-			IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)

-	 */

-	public final void resourceChanged(IResourceChangeEvent event) {

-		switch (event.getType()) {

-			case IResourceChangeEvent.POST_CHANGE:

-				try {

-					event.getDelta().accept(this);

-				} catch (CoreException e) {

-					Trace.catching(CommonUIPlugin.getDefault(),

-						CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),

-						"resourceChanged", e); //$NON-NLS-1$

-					Log.warning(CommonUIPlugin.getDefault(),

-						CommonUIStatusCodes.IGNORED_EXCEPTION_WARNING, e

-							.getMessage(), e);

-				}

-				break;

-			default:

-				break;

-		}

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)

-	 */

-	public final boolean visit(IResourceDelta delta) {

-		switch (delta.getKind()) {

-			case IResourceDelta.ADDED:

-				if ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0) {

-					if (delta.getMovedFromPath().removeLastSegments(1)

-						.equals(

-							delta.getResource().getFullPath()

-								.removeLastSegments(1))) {

-						

-						if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-							CommonUIDebugOptions.RESOURCE)) {

-							Trace.trace(CommonUIPlugin.getDefault(),

-								"...FileChangeManager: Resource " //$NON-NLS-1$

-										+ getAbsolutePath(delta.getResource())

-										+ " was renamed from " //$NON-NLS-1$

-										+ delta.getMovedFromPath().toString());

-						}

-						

-						if (delta.getResource() instanceof IFile) {

-							FileChangeEvent event = new FileChangeEvent(

-								FileChangeEventType.RENAMED,

-								(IFile) getMovedFromResource(delta),

-								(IFile) delta.getResource());

-							fileObserverManager.notify(event);

-						}

-					} else {

-						if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-							CommonUIDebugOptions.RESOURCE)) {

-							Trace.trace(CommonUIPlugin.getDefault(),

-									"...FileChangeManager: Resource " //$NON-NLS-1$

-									+ getAbsolutePath(delta.getResource())

-									+ " was moved from " //$NON-NLS-1$

-									+ delta.getMovedFromPath().toString());

-						}

-						

-						if (delta.getResource() instanceof IFile) {

-							FileChangeEvent event = new FileChangeEvent(

-								FileChangeEventType.MOVED,

-								(IFile) getMovedFromResource(delta),

-								(IFile) delta.getResource());

-							fileObserverManager.notify(event);

-						}

-					}

-                } else if (delta.getResource() instanceof IFile) {

-                    FileChangeEvent event = new FileChangeEvent(

-                        FileChangeEventType.CHANGED, (IFile) delta

-                            .getResource());

-                    fileObserverManager.notify(event);

-                    if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-    						CommonUIDebugOptions.RESOURCE)) {

-    						Trace.trace(CommonUIPlugin.getDefault(),

-    								"...FileChangeManager: Resource " //$NON-NLS-1$ 

-    								+ getAbsolutePath(delta.getResource()) + " was added"); //$NON-NLS-1$

-                    }

-				} else {

-					if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-						CommonUIDebugOptions.RESOURCE)) {

-						Trace.trace(CommonUIPlugin.getDefault(),

-								"...FileChangeManager: Resource " //$NON-NLS-1$ 

-								+ getAbsolutePath(delta.getResource()) + " was added"); //$NON-NLS-1$ 

-					}

-				}

-				break;

-			case IResourceDelta.REMOVED:

-				if ((delta.getFlags() & IResourceDelta.MOVED_TO) == 0) {

-					

-					if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-							CommonUIDebugOptions.RESOURCE)) {

-							Trace.trace(CommonUIPlugin.getDefault(),

-									"...FileChangeManager: Resource " //$NON-NLS-1$

-									+ getAbsolutePath(delta.getResource()) + " was deleted"); //$NON-NLS-1$ 

-					}

-					

-					if (delta.getResource() instanceof IFile) {

-						FileChangeEvent event = new FileChangeEvent(

-							FileChangeEventType.DELETED, (IFile) delta

-								.getResource());

-						fileObserverManager.notify(event);

-					}

-				}

-				break;

-			case IResourceDelta.CHANGED:

-				

-				if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-						CommonUIDebugOptions.RESOURCE)) {

-						Trace.trace(CommonUIPlugin.getDefault(),

-								"...FileChangeManager: Resource " //$NON-NLS-1$

-								+ getAbsolutePath(delta.getResource()) + " was changed"); //$NON-NLS-1$ 

-				}

-				

-				if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {

-					// fire notifications if markers have been

-					// added/removed/changed

-					List markers = Arrays.asList(delta.getMarkerDeltas());

-					for (Iterator i = markers.iterator(); i.hasNext();) {

-						

-						if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-								CommonUIDebugOptions.RESOURCE)) {

-								Trace.trace(CommonUIPlugin.getDefault(),

-										"...FileChangeManager: Resource marker of " //$NON-NLS-1$

-										+ getAbsolutePath(delta.getResource())

-										+ " was changed"); //$NON-NLS-1$ 

-						}

-

-						MarkerChangeEvent event = null;

-						IMarkerDelta markerDelta = (IMarkerDelta) i.next();

-						switch (markerDelta.getKind()) {

-							case IResourceDelta.ADDED:

-								event = new MarkerChangeEvent(

-									MarkerChangeEventType.ADDED, markerDelta

-										.getMarker());

-								fileObserverManager.notify(event);

-								break;

-							case IResourceDelta.REMOVED:

-								event = new MarkerChangeEvent(

-									MarkerChangeEventType.REMOVED, markerDelta

-										.getMarker(), markerDelta

-										.getAttributes());

-								fileObserverManager.notify(event);

-								break;

-							case IResourceDelta.CHANGED:

-								event = new MarkerChangeEvent(

-									MarkerChangeEventType.CHANGED, markerDelta

-										.getMarker());

-								fileObserverManager.notify(event);

-								break;

-							default:

-								break;

-						}

-					}

-				} else if (delta.getResource() instanceof IFile) {

-					FileChangeEvent event = new FileChangeEvent(

-						FileChangeEventType.CHANGED, (IFile) delta

-							.getResource());

-					fileObserverManager.notify(event);

-				}

-				break;

-			default:

-				break;

-		}

-		return true;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#okToEdit(org.eclipse.core.resources.IFile[],

-	 *      java.lang.String)

-	 */

-	public boolean okToEdit(IFile[] files, String modificationReason) {

-		return FileModificationValidator.getInstance().okToEdit(files,

-			modificationReason);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#okToSave(org.eclipse.core.resources.IFile)

-	 */

-	public boolean okToSave(IFile file) {

-		return FileModificationValidator.getInstance().okToSave(file);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#removeFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver)

-	 */

-	public void removeFileObserver(IFileObserver fileObserver) {

-		fileObserverManager.remove(fileObserver);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,

-	 *      org.eclipse.core.resources.IFile)

-	 */

-	public void addFileObserver(IFileObserver fileObserver, IFile fileFilter) {

-		fileObserverManager.add(fileObserver, fileFilter);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,

-	 *      org.eclipse.core.runtime.content.IContentType[])

-	 */

-	public void addFileObserver(IFileObserver fileObserver, IContentType[] contentTypeFilter) {

-		fileObserverManager.add(fileObserver, contentTypeFilter);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,

-	 *      org.eclipse.core.resources.IFolder)

-	 */

-	public void addFileObserver(IFileObserver fileObserver, IFolder folderFilter) {

-		fileObserverManager.add(fileObserver, folderFilter);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,

-	 *      java.lang.String[])

-	 */

-	public void addFileObserver(IFileObserver fileObserver,

-			String[] extensionFilter) {

-		fileObserverManager.add(fileObserver, extensionFilter);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver)

-	 */

-	public void addFileObserver(IFileObserver fileObserver) {

-		fileObserverManager.add(fileObserver);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#refreshLocal(org.eclipse.core.resources.IFile)

-	 */

-	public void refreshLocal(final IFile file) {

-		try {

-			file.getWorkspace().run(new IWorkspaceRunnable() {

-

-				public void run(IProgressMonitor monitor)

-					throws CoreException {

-					

-					if (Trace.shouldTrace(CommonUIPlugin.getDefault(),

-							CommonUIDebugOptions.RESOURCE)) {

-							Trace.trace(CommonUIPlugin.getDefault(),

-									"...FileChangeManager: Resource " +  //$NON-NLS-1$ 

-									getAbsolutePath(file) + " was refreshed"); //$NON-NLS-1$ 

-					}

-					

-					file.refreshLocal(IResource.DEPTH_ZERO, null);

-

-				}

-			}, new NullProgressMonitor());

-		} catch (CoreException e) {

-			Trace.catching(CommonUIPlugin.getDefault(),

-				CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),

-				"refreshResource", e); //$NON-NLS-1$

-			Log.error(CommonUIPlugin.getDefault(),

-				CommonUIStatusCodes.SERVICE_FAILURE, e.getMessage(), e); 

-		}

-

-	}

-

-	/**

-	 * Retrieve the moved from resource from the resource delta. The moved from

-	 * resource is the original resource after a rename or move.

-	 * 

-	 * @param delta

-	 *            the resource change containing the moved from path.

-	 * @return the moved from resource.

-	 */

-	public static IResource getMovedFromResource(IResourceDelta delta) {

-		IPath movedFromPath = delta.getMovedFromPath();

-		IResource resource = delta.getResource();

-		IResource movedResource = null;

-		switch (resource.getType()) {

-			case IResource.PROJECT:

-				movedResource = ResourcesPlugin.getWorkspace().getRoot()

-					.getProject(movedFromPath.lastSegment());

-				break;

-			case IResource.FOLDER:

-				movedResource = ResourcesPlugin.getWorkspace().getRoot()

-					.getFolder(movedFromPath);

-				break;

-			case IResource.FILE:

-				movedResource = ResourcesPlugin.getWorkspace().getRoot()

-					.getFile(movedFromPath);

-				break;

-			default:

-				break;

-		}

-		return movedResource;

-	}

-

-	/**

-	 * Get the path for a resource. In the case of a moved or deleted resource,

-	 * resource.getLocation() returns null since it does not exist in the

-	 * workspace. The workaround is below.

-	 * 

-	 * @param resource

-	 *            the resource.

-	 * @return the path for a resource.

-	 */

-	private String getAbsolutePath(IResource resource) {

-		if (resource.getLocationURI() == null) {

-			return resource.getFullPath().toString();

-		} else {

-			return resource.getLocationURI().toString();

-		}

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileModificationValidator.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileModificationValidator.java
deleted file mode 100644
index c8ff2ed..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileModificationValidator.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.resources;
-
-import java.io.File;
-import java.sql.Timestamp;
-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.IFileModificationValidator;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.team.core.RepositoryProvider;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A wrapper around the Eclipse IFileModificationValidator.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public class FileModificationValidator {
-
-	/**
-	 * singleton instance of this class
-	 */
-	private static FileModificationValidator INSTANCE = new FileModificationValidator();
-
-	/**
-	 * get the singleton instance of this class
-	 * 
-	 * @return singleton instance of the FileModificationValidator class
-	 */
-	public static FileModificationValidator getInstance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * Private constructor for the singleton instance of this class.
-	 */
-	private FileModificationValidator() {
-		super();
-	}
-
-	/**
-	 * Validates that the given files can be modified using the Team
-	 * validateEdit support.
-	 * 
-	 * @param files
-	 *            files that are to be modified; these files must all exist in
-	 *            the workspace.
-	 * @param modificationReason
-	 *            a String describing the reason for modifying the file, usually
-	 *            the command text.
-	 * @return true if it is OK to edit the files.
-	 * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit
-	 */
-	public boolean okToEdit(final IFile[] files, final String modificationReason) {
-        return okToEdit(files, modificationReason, null);
-    }
-
-    /**
-     * Validates that the given files can be modified using the Team
-     * validateEdit support.
-     * 
-     * @param files
-     *            files that are to be modified; these files must all exist in
-     *            the workspace.
-     * @param modificationReason
-     *            a String describing the reason for modifying the file, usually
-     *            the command text.
-     * @param shell
-     *            UI context for UI that could be presented to the user to
-     *            determine whether the file may be edited.
-     * @return true if it is OK to edit the files.
-     * @see org.eclipse.core.resources.IFileModificationValidator#validateEdit
-     */
-    public boolean okToEdit(final IFile[] files,
-			final String modificationReason, final Shell shell) {
-
-		final IStatus fileStatus = validateEdit(files, shell);
-		
-		if (!fileStatus.isOK()) {
-			// Similar to the DefaultUIFileModificationValidator we check if the shell is not null before 
-			// displaying messages.
-			if(shell != null){
-				shell.getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						MessageDialog
-								.openError(
-										shell,
-										NLS.bind(CommonUIMessages.FileModificationValidator_EditProblemDialogTitle,
-												modificationReason),
-										NLS.bind(CommonUIMessages.FileModificationValidator_EditProblemDialogMessage,
-												modificationReason,
-												fileStatus.getMessage()));
-					}
-				});
-			}
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Validates that the given file can be saved using the Team validateSave
-	 * support.
-	 * 
-	 * @param file
-	 *            the file that is to be saved; this file must exist in the
-	 *            workspace.
-	 * @return true if it is OK to save the file.
-	 * @see org.eclipse.core.resources.IFileModificationValidator#validateSave
-	 */
-	public boolean okToSave(IFile file) {
-		IStatus status = null;
-		RepositoryProvider provider = RepositoryProvider.getProvider(file
-			.getProject());
-
-		IFileModificationValidator validator = null;
-
-		// if no provider or no validator use the default validator
-		if (provider != null) {
-			validator = provider.getFileModificationValidator();
-		}
-
-		if (validator == null) {
-			status = getDefaultStatus(file);
-		} else {
-			status = validator.validateSave(file);
-		}
-
-		if (status.isOK()) {
-			return true;
-		} else {
-			MessageDialog
-				.openError(
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getShell(),
-					CommonUIMessages.FileModificationValidator_SaveProblemDialogTitle,
-					NLS
-						.bind(
-							CommonUIMessages.FileModificationValidator_SaveProblemDialogMessage,
-							status.getMessage(), status.getMessage()));
-			return false;
-		}
-	}
-
-	/**
-	 * return the default status for the file.
-	 * 
-	 * @param file
-	 *            the <code>IFile</code> that is to be validated.
-	 * @return IStatus OK, otherwise ERROR if the file is read-only.
-	 */
-	private IStatus getDefaultStatus(IFile file) {
-		if (file.isReadOnly()) {
-			String message = NLS
-				.bind(
-					CommonUIMessages.FileModificationValidator_FileIsReadOnlyErrorMessage,
-					file.getFullPath().toString());
-			return new Status(Status.ERROR, CommonUIPlugin.getPluginId(),
-				Status.ERROR, message, null);
-		} else {
-			return new Status(Status.OK, CommonUIPlugin.getPluginId(),
-				Status.OK, CommonUIMessages.FileModificationValidator_OK, null);
-		}
-	}
-
-	/**
-	 * Validates changes to the specified array of IFiles using the specified shell as a UI context.
-	 * This code delegates the bulk of its processing to the {@link IWorkspace#validateEdit(IFile[], Object)
-	 * method, but additionally checks to see if the specified IFiles are out of synchronization with
-	 * the filesystem, and if so, returns an error status.
-	 * 
-	 * @param files the array of files for which edit validation is requested
-	 * @param shell a UI context (SWT shell) for the validation.  Typed as object to avoid SWT dependency.
-	 * @return IStatus, {@link IStatus#OK} if edit of the specified files may proceed, {@link IStatus#ERROR}
-	 * or {@link IStatus#CANCEL} otherwise.
-	 */
-	public IStatus validateEdit(IFile[] files, Object shell) {
-		IStatus status = Status.OK_STATUS;
-		if (files == null || files.length == 0) {
-			return status;
-		}
-		Set<IFile> unsynchedFiles = new HashSet<IFile>();
-		Map<IFile, ModificationStamp> filesToModificationStamps = new HashMap<IFile, ModificationStamp>();
-
-		for (int i = 0; i < files.length; i++) {
-			IFile file = files[i];
-			filesToModificationStamps.put(file, new ModificationStamp(file));
-			boolean inSync = file.isSynchronized(IResource.DEPTH_ZERO);
-			if (!inSync) {
-				unsynchedFiles.add(file);
-			}
-		}
-		if (!unsynchedFiles.isEmpty()) {
-			status = buildOutOfSyncStatus(unsynchedFiles);
-		}
-
-		if (status.isOK()) {
-			status = ResourcesPlugin.getWorkspace().validateEdit(files, shell);
-
-			for (Map.Entry<IFile, ModificationStamp> entry : filesToModificationStamps.entrySet()) {
-				IFile file = entry.getKey();
-				ModificationStamp stamp = entry.getValue();
-				if (stamp.hasFileChanged()) {
-					unsynchedFiles.add(file);
-				}
-			}
-			if (!unsynchedFiles.isEmpty()) {
-				status = buildOutOfSyncStatus(unsynchedFiles);
-			}
-
-		}
-		return status;
-	}
-
-	/**
-	 *  Helper method to create a status for out of sync files.
-	 *  
-	 * @param unsynchedFiles Files that may be out of sync.
-	 * @return A status for out of sync files.
-	 */
-	private IStatus buildOutOfSyncStatus(Set<IFile> unsynchedFiles) {
-		StringBuffer buf = new StringBuffer(
-				CommonUIMessages.FileModificationValidator_OutOfSyncMessage);
-		buf.append("\n"); //$NON-NLS-1$
-		for (Iterator<IFile> unsynched = unsynchedFiles.iterator(); unsynched
-				.hasNext();) {
-			IFile file = unsynched.next();
-			buf.append(file.getFullPath().toString());
-			buf.append("\n"); //$NON-NLS-1$
-		}
-		return new Status(IStatus.ERROR, CommonUIPlugin.getPluginId(), 0, buf
-				.toString(), null);
-	}
-
-	private static class ModificationStamp {
-
-		/**
-		 * The file that the modification stamp applies to.
-		 */
-		private IFile file;
-		/**
-		 * Last modified date and time of the file
-		 */
-		private Timestamp lastModified = null;
-		/**
-		 * The file's length.
-		 */
-		private long fileLength = 0L;
-
-		public ModificationStamp(IFile file) {
-			assert file != null;
-			this.file = file;
-			IPath path = file.getLocation();
-			if (path != null) {
-				File ioFile = path.toFile();
-				if (ioFile != null) {
-					// new timestamp
-					lastModified = new Timestamp(ioFile.lastModified());
-					lastModified.setNanos(0);
-					fileLength = ioFile.length();
-				} else {
-					lastModified = new Timestamp(file.getModificationStamp());
-					lastModified.setNanos(0);
-				}
-			} else {
-				lastModified = new Timestamp(file.getModificationStamp());
-				lastModified.setNanos(0);
-			}
-
-		}
-
-		public Timestamp getLastModified() {
-			return lastModified;
-		}
-
-		public long getFileLength() {
-			return fileLength;
-		}
-
-		public IFile getFile() {
-			return file;
-		}
-
-		/**
-		 * Used in determining if two timestamps are equivalent 
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj) {
-				return true;
-			} else if (obj instanceof ModificationStamp) {
-				ModificationStamp stamp = (ModificationStamp) obj;
-				return file.equals(stamp.getFile())
-						&& fileLength == stamp.getFileLength()
-						&& lastModified.equals(stamp.getLastModified());
-			}
-
-			return false;
-		}
-
-		public int hashCode() {
-			return file.hashCode() + lastModified.hashCode()
-					+ (int) (fileLength ^ (fileLength >>> 32));
-
-		}
-
-		/**
-		 * Determines if the file has changed.
-		 * 
-		 * @return true if the file has changed.
-		 */
-		public boolean hasFileChanged() {
-			IPath path = file.getLocation();
-			if (path == null) {
-				return false;
-			}
-			File ioFile = path.toFile();
-			if (ioFile == null) {
-				return false;
-			}
-
-			// new timestamp
-			Timestamp newTimestamp = new Timestamp(ioFile.lastModified());
-			newTimestamp.setNanos(0);
-
-			return !(lastModified.getTime() == newTimestamp.getTime() && fileLength == ioFile
-					.length());
-		}
-	}
-	    
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileObserverManager.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileObserverManager.java
deleted file mode 100644
index 9b1e448..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/FileObserverManager.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.resources;
-
-import java.net.URI;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.content.IContentType;
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileChangeEventType;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileObserverFilter;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.FileObserverFilterType;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.MarkerChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.internal.resources.MarkerChangeEventType;
-
-/**
- * Manage the list of file observers for the file change manager.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public class FileObserverManager {
-
-	/**
-	 * list of file observers.
-	 */
-	private Hashtable fileObserverList = new Hashtable();
-
-	/**
-	 * Add a file observer with no filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 */
-	protected void add(IFileObserver fileObserver) {
-		trace("...FileObserverManager: addFileObserver " //$NON-NLS-1$
-			+ fileObserver.toString() + " filter ALL"); //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.ALL);
-		fileObserverList.put(fileObserver, filter);
-	}
-
-	/**
-	 * Add a file observer with a file filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 * @param fileFilter
-	 *            the file filter.
-	 */
-	protected void add(IFileObserver fileObserver, IFile fileFilter) {
-		URI uri = fileFilter.getLocationURI();
-		trace("...FileObserverManager: addFileObserver " //$NON-NLS-1$
-			+ fileObserver.toString()
-			+ " filter " + (uri != null ? uri.toString() : StringStatics.BLANK)); //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.FILE, fileFilter);
-		fileObserverList.put(fileObserver, filter);
-	}
-
-	/**
-	 * Add a file observer with a content type filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 * @param contentTypeFilter
-	 *            the content type array filter.
-	 */
-	protected void add(IFileObserver fileObserver, IContentType[] contentTypeFilter) {
-		trace("...FileObserverManager: addFileObserver " //$NON-NLS-1$
-			+ fileObserver.toString()
-			+ " filter " + contentTypeFilter.toString()); //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.CONTENT_TYPE, contentTypeFilter);
-		fileObserverList.put(fileObserver, filter);
-	}
-
-	/**
-	 * Add a file observer with a folder filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 * @param folderFilter
-	 *            the folder filter.
-	 */
-	protected void add(IFileObserver fileObserver, IFolder folderFilter) {
-		trace("...FileObserverManager: addFileObserver " //$NON-NLS-1$
-			+ fileObserver.toString()
-			+ " filter folder" + folderFilter.getLocationURI().toString()); //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.FOLDER, folderFilter);
-		fileObserverList.put(fileObserver, filter);
-	}
-
-	/**
-	 * Add a file observer with a file extension filter.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 * @param extensionFilter
-	 *            the file extension array filter.
-	 */
-	protected void add(IFileObserver fileObserver, String[] extensionFilter) {
-		trace("...FileObserverManager: addFileObserver " //$NON-NLS-1$
-			+ fileObserver.toString() + " filter " + extensionFilter[0]); //$NON-NLS-1$
-		FileObserverFilter filter = new FileObserverFilter(
-			FileObserverFilterType.EXTENSION, extensionFilter);
-		fileObserverList.put(fileObserver, filter);
-	}
-
-	/**
-	 * Remove a file observer.
-	 * 
-	 * @param fileObserver
-	 *            the file observer class implementing the IFileObserver
-	 *            interface.
-	 */
-	protected void remove(IFileObserver fileObserver) {
-		if (fileObserverList.containsKey(fileObserver)) {
-			trace("...FileObserverManager: removeFileObserver " + fileObserver.toString()); //$NON-NLS-1$
-			fileObserverList.remove(fileObserver);
-		}
-	}
-
-	/**
-	 * Notify file observers of a file change event.
-	 * 
-	 * @param event
-	 *            the file change event.
-	 */
-	protected void notify(FileChangeEvent event) {
-
-		// Avoid concurrency problems when multiple threads are modifying
-		// the fileObserverList
-		Hashtable fileObserverListCopy = (Hashtable) fileObserverList.clone();
-
-		for (Iterator i = fileObserverListCopy.entrySet().iterator(); i
-			.hasNext();) {
-			Map.Entry entry = (Map.Entry) i.next();
-			IFileObserver fileObserver = (IFileObserver) entry.getKey();
-			FileObserverFilter filter = (FileObserverFilter) entry.getValue();
-			if (event.getEventType() == FileChangeEventType.MOVED) {
-				if (filter.matches(event.getOldFilePath())) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleFileMoved"); //$NON-NLS-1$
-					fileObserver.handleFileMoved(event.getOldFile(), event
-						.getFile());
-				}
-			} else if (event.getEventType() == FileChangeEventType.RENAMED) {
-				if (filter.matches(event.getOldFilePath())) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleFileRenamed"); //$NON-NLS-1$
-					fileObserver.handleFileRenamed(event.getOldFile(), event
-						.getFile());
-				}
-			} else if (event.getEventType() == FileChangeEventType.DELETED) {
-				if (filter.matches(event.getFilePath())) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleFileDeleted"); //$NON-NLS-1$
-					fileObserver.handleFileDeleted(event.getFile());
-				}
-			} else if (event.getEventType() == FileChangeEventType.CHANGED) {
-				if (filter.matches(event.getFilePath())) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleFileChanged"); //$NON-NLS-1$
-					fileObserver.handleFileChanged(event.getFile());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Notify file observers of a marker change event.
-	 * 
-	 * @param event
-	 *            the marker change event.
-	 */
-	protected void notify(MarkerChangeEvent event) {
-
-		// Avoid concurrency problems when multiple threads are modifying
-		// the fileObserverList
-		Hashtable fileObserverListCopy = (Hashtable) fileObserverList.clone();
-
-		for (Iterator i = fileObserverListCopy.entrySet().iterator(); i
-			.hasNext();) {
-			Map.Entry entry = (Map.Entry) i.next();
-			IFileObserver fileObserver = (IFileObserver) entry.getKey();
-			FileObserverFilter filter = (FileObserverFilter) entry.getValue();
-			if (filter.matches(event.getMarker().getResource())) {
-				if (event.getEventType() == MarkerChangeEventType.ADDED) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleMarkerAdded"); //$NON-NLS-1$
-					fileObserver.handleMarkerAdded(event.getMarker());
-				} else if (event.getEventType() == MarkerChangeEventType.CHANGED) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleMarkerChanged"); //$NON-NLS-1$
-					fileObserver.handleMarkerChanged(event.getMarker());
-				} else if (event.getEventType() == MarkerChangeEventType.REMOVED) {
-					trace("...FileObserverManager: Notify " //$NON-NLS-1$
-						+ fileObserver.toString() + " handleMarkerDeleted"); //$NON-NLS-1$
-					fileObserver.handleMarkerDeleted(event.getMarker(), event
-						.getAttributes());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Print a trace message if tracing is on for file change management.
-	 * 
-	 * @param message
-	 *            the trace message to print.
-	 */
-	private void trace(String message) {
-		if (Trace.shouldTrace(CommonUIPlugin.getDefault(),
-			CommonUIDebugOptions.RESOURCE)) {
-			Trace.trace(CommonUIPlugin.getDefault(), message);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IBookmark.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IBookmark.java
deleted file mode 100644
index 25e4f04..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IBookmark.java
+++ /dev/null
@@ -1,24 +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.resources;
-
-
-/**
- * Convenience interface for the bookmark type and its attributes
- * 
- * @author bagrodia Created on: Oct 2, 2003
- */
-public interface IBookmark
-	extends org.eclipse.gmf.runtime.common.core.resources.IBookmark {
-
-	// UI version of IBookmark
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IFileObserver.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IFileObserver.java
deleted file mode 100644
index 07920d4..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IFileObserver.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.common.ui.resources;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-
-/**
- * A file observer is notified of changes to files in the workspace.
- * 
- * @author Anthony Hunter <a
- *         href="mailto:ahunter@rational.com">ahunter@rational.com </a>
- */
-public interface IFileObserver {
-
-	/**
-	 * handle the file renamed event.
-	 * 
-	 * @param oldFile
-	 *            the original file.
-	 * @param file
-	 *            the renamed file.
-	 */
-	public void handleFileRenamed(IFile oldFile, IFile file);
-
-	/**
-	 * handle the file moved event.
-	 * 
-	 * @param oldFile
-	 *            the original file.
-	 * @param file
-	 *            the moved file.
-	 */
-	public void handleFileMoved(IFile oldFile, IFile file);
-
-	/**
-	 * handle the file deleted event.
-	 * 
-	 * @param file
-	 *            the deleted file.
-	 */
-	public void handleFileDeleted(IFile file);
-
-	/**
-	 * handle the file content changed event.
-	 * 
-	 * @param file
-	 *            the changed file.
-	 */
-	public void handleFileChanged(IFile file);
-
-	/**
-	 * handle the marker added event
-	 * 
-	 * @param marker
-	 *            the added marker
-	 */
-	public void handleMarkerAdded(IMarker marker);
-
-	/**
-	 * Handle the marker deleted event.
-	 * 
-	 * Note that if the marker was deleted, it cannot be used to access
-	 * attributes. Use the attribute map parameter to access the old marker's
-	 * attributes.
-	 * 
-	 * @param marker
-	 *            the deleted marker
-	 * @param attributes
-	 *            the old marker's attributes.
-	 */
-	public void handleMarkerDeleted(IMarker marker, Map attributes);
-
-	/**
-	 * handle the marker changed event
-	 * 
-	 * @param marker
-	 *            the changed marker
-	 */
-	public void handleMarkerChanged(IMarker marker);
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IMarker.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IMarker.java
deleted file mode 100644
index e1ab5f0..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/IMarker.java
+++ /dev/null
@@ -1,22 +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.resources;
-
-/**
- * Convenience interface for the marker type and its attributes
- * 
- * @author Michael Yee
- */
-public interface IMarker extends org.eclipse.gmf.runtime.common.core.resources.IMarker{
-
-	// UI version of the IMarker
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/package.html
deleted file mode 100644
index 5968fdb..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/resources/package.html
+++ /dev/null
@@ -1,86 +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 framework to support Eclipse resource change events, such as those that relate to 
-{@link org.eclipse.core.resources.IFile IFile} and {@link
-org.eclipse.core.resources.IMarker IMarker}.</P>
-
-<h2>Listening to file resource changes</h2>
-<P>To listen to changes in files, add an {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileObserver IFileObserver} to the
-{@link
-org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager#getInstance()
-singleton instance} of the {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager
-FileChangeManager}, which implements {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager
-IFileChangeManager}.   Depending on the {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver)
-addFileObserver} method used, the {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager FileChangeManager}
-also supports filtering based on the actual {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,
-org.eclipse.core.resources.IFile) IFile}, {@link org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,
-org.eclipse.core.resources.IFolder) IFolder}, or {@link org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#addFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver,
-java.lang.String[]) the file's extension}.</P>
-<P>When finished listening, the {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileChangeManager#removeFileObserver(org.eclipse.gmf.runtime.common.ui.resources.IFileObserver)
-removeFileObserver} method should be called.
-
-<P>Internally, the {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager FileChangeManager}
-notifies the {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileObserverManager
-FileObserverManager} with {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileChangeEvent FileChangeEvent}
-and {@link org.eclipse.gmf.runtime.common.ui.resources.MarkerChangeEvent
-MarkerChangeEvent} objects.  The FileObserverManager is responsible
-for managing the {@link
-org.eclipse.gmf.runtime.common.ui.resources.IFileObserver IFileObserver} objects
-that were added to the FileChangeManager and instantiating the appropriate
-{@link org.eclipse.gmf.runtime.common.ui.resources.FileObserverFilter
-FileObserverFilter} objects for them.
-</P>
-
-<h2>The FileModificationValidator</h2>
-
-<P>The {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileModificationValidator
-FileModificationValidator} is used to determine whether a file may be edited or
-saved.  After obtaining the {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileModificationValidator#getInstance()
-singleton instance} of the class, the methods {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileModificationValidator#okToEdit(org.eclipse.core.resources.IFile[], java.lang.String)
-okToEdit} and {@link
-org.eclipse.gmf.runtime.common.ui.resources.FileModificationValidator#okToSave(org.eclipse.core.resources.IFile)
-okToSave} may be called, respectively.  More information is availabe from the
-documentation of Eclipse's {@link
-org.eclipse.core.resources.IFileModificationValidator
-IFileModificationValidator}.</P>
-
-<h2>Package Specification</h2>
-
-<P>For more information, please see 
-{@link org.eclipse.core.resources.IResource
-org.eclipse.core.resources.IResource}</P>
-
-@canBeSeenBy %partners
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActionGroupCache.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActionGroupCache.java
deleted file mode 100644
index 79333f1..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActionGroupCache.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.common.ui.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ui.actions.ActionGroup;
-
-/**
- * Cache for holding the ActionGroups created for part descriptors. This allows
- * them to be properly disposed of when nolonger needed.
- * 
- * There are not a lot of ActionGroups so try to be most efficient when none
- * 
- * @author hfraser
- */
-public class ActionGroupCache {
-
-	// map between part descriptors and the actiongroups defined for it.
-	private Map partDescriptorActionGroups;
-
-	/**
-	 * disposes all the action groups associated with the partDescriptor
-	 * supplied.
-	 * 
-	 * @param partDescriptor -
-	 *            part whose action groups are to be disposed.
-	 */
-	public void dispose(IWorkbenchPartDescriptor partDescriptor) {
-		if (partDescriptorActionGroups != null) {
-			Map actionGroupRegistry = (Map) partDescriptorActionGroups
-				.get(partDescriptor);
-			if (actionGroupRegistry != null) {
-				for (Iterator actionGroups = actionGroupRegistry.values()
-					.iterator(); actionGroups.hasNext();) {
-					ActionGroup actionGroup = (ActionGroup) actionGroups.next();
-					actionGroup.dispose();
-				}
-			}
-			partDescriptorActionGroups.remove(partDescriptor);
-		}
-	}
-
-	/**
-	 * Identifies if there are any action groups associated with the part
-	 * descriptor supplied.
-	 * 
-	 * @param partDescriptor
-	 *            part to check if it has any action groups.
-	 * @return true if there are action groups associated, false otherwise
-	 */
-	public boolean contains(IWorkbenchPartDescriptor partDescriptor) {
-		return (partDescriptorActionGroups != null && partDescriptorActionGroups
-			.containsKey(partDescriptor));
-	}
-
-	/**
-	 * Get the cached ActionGroup for the part descriptor with the id supplied
-	 * 
-	 * @param actionGroupId
-	 *            id of the action group to retrieve
-	 * @param partDescriptor
-	 *            part whose action group is to be retrieved
-	 * @return the ActionGroup previously created for the part, otherwise null
-	 */
-	public ActionGroup getActionGroup(String actionGroupId,
-			IWorkbenchPartDescriptor partDescriptor) {
-
-		ActionGroup actionGroup = null;
-		if (partDescriptorActionGroups != null) {
-			Map registry = (Map) partDescriptorActionGroups.get(partDescriptor);
-			if (registry != null) {
-				actionGroup = (ActionGroup) registry.get(actionGroupId);
-			}
-		}
-		return actionGroup;
-	}
-
-	/**
-	 * Add the action group just created with the id to the cache for the part
-	 * supplied
-	 * 
-	 * @param actionGroupId
-	 *            id of the action group to be cached
-	 * @param actionGroup
-	 *            action group to cache
-	 * @param partDescriptor
-	 *            part group was created for
-	 */
-	public void addActionGroup(String actionGroupId, ActionGroup actionGroup,
-			IWorkbenchPartDescriptor partDescriptor) {
-		Map registry = null;
-		if (partDescriptorActionGroups == null) {
-			partDescriptorActionGroups = new HashMap();
-		} else {
-			registry = (Map) partDescriptorActionGroups.get(partDescriptor);
-		}
-
-		if (registry == null) {
-			registry = new HashMap(3);
-			partDescriptorActionGroups.put(partDescriptor, registry);
-		}
-
-		registry.put(actionGroupId, actionGroup);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActivityUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActivityUtil.java
deleted file mode 100644
index 9c477bd..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ActivityUtil.java
+++ /dev/null
@@ -1,67 +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.common.ui.util;
-
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-
-/**
- * Utility method for activities (also known as capabilities).
- * 
- * @author crevells
- */
-public class ActivityUtil {
-
-    /**
-     * Checks if there are activities that have been matched to the plug-in or
-     * id in which the item has been contributed and if at least one of those
-     * matching activities are enabled.identifier is always considered enabled
-     * unless it matches only disabled activities.
-     * 
-     * @param localID
-     *            the local id of the contribution. Must not be
-     *            <code>null</code>. This should correspond to the
-     *            extension-specific identifier for a given contribution.
-     * @param pluginID
-     *            the id of the originating plugin. Can be <code>null</code>
-     *            if this contribution did not originate from a plugin.
-     * @return true unless the ids match only disabled activities.
-     */
-    public static boolean isEnabled(final String localID, final String pluginID) {
-        if (!WorkbenchActivityHelper.isFiltering())
-            return true;
-
-        IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI
-            .getWorkbench().getActivitySupport();
-        IIdentifier id = workbenchActivitySupport.getActivityManager()
-            .getIdentifier(
-                WorkbenchActivityHelper
-                    .createUnifiedId(new IPluginContribution() {
-
-                        public String getLocalId() {
-                            return localID;
-                        }
-
-                        public String getPluginId() {
-                            return pluginID;
-                        }
-                    }));
-        if (id != null && !id.isEnabled()) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/BaseInlineTextActionHandler.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/BaseInlineTextActionHandler.java
deleted file mode 100644
index c0f222f..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/BaseInlineTextActionHandler.java
+++ /dev/null
@@ -1,201 +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.util;
-
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A class that is used to handle all keyboard generated text actions 
- * associated with the displayed text editor 
- * 
- * @author Yasser Lulu
- * 
- */
-public abstract class BaseInlineTextActionHandler
-    implements IInlineTextActionHandler {
-    /**
-    * an empty string constant
-    */
-    protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-    /**
-     * a boolean indicating if text actions are hooked
-     */
-    private boolean hooked;
-    /**
-     * the text box widget used for editing
-     */
-    private Text text;
-
-    /**
-     * Creates a runtime instance of <code>BaseInlineTextActionHandler</code>.
-     * 
-     * @param text <code>Text</code> widget used for editing
-     */
-    BaseInlineTextActionHandler(Text text) {
-        setText(text);
-    }
-
-    /**
-     * sets the text widget
-     * @param text The Text widget to set
-     */
-    private void setText(Text text) {
-        this.text = text;
-    }
-    /**
-     * returns the text widget 
-     * @return Text The text widget
-     */
-    protected Text getText() {
-        return text;
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.common.ui.util.IInlineTextActionHandler
-     */
-    public void dispose() {
-        if (isHooked()) {
-            unHookHandlers();
-        }
-        setText(null);
-    }
-
-    /**
-     * Returns the hooked.
-     * @return boolean
-     */
-    protected boolean isHooked() {
-        return hooked;
-    }
-
-    /**
-     * Sets the hooked.
-     * @param hooked The hooked to set
-     */
-    protected void setHooked(boolean hooked) {
-        this.hooked = hooked;
-    }
-
-    /**
-     * handles cut action
-     */
-    protected void handleCut() {
-        getText().cut();
-    }
-
-    /**
-     * handles copy action
-     */
-    protected void handleCopy() {
-        getText().copy();
-    }
-
-    /**
-     * handles paste action
-     */
-    protected void handlePaste() {
-        getText().paste();
-    }
-
-    /**
-     * handles select-all action
-     */
-    protected void handleSelectAll() {
-        getText().selectAll();
-    }
-
-    /**
-     * handles delete action
-     */
-    protected void handleDelete() {
-        if (getText().getSelectionCount() > 0) {
-            getText().insert(EMPTY_STRING);
-        } else {
-            // remove the next character
-            int pos = getText().getCaretPosition();
-            if (pos < getText().getCharCount()) {
-                getText().setSelection(pos, pos + 1);
-                getText().insert(EMPTY_STRING);
-            }
-        }
-    }
-}
-
-/*
- * Please do NOT delete this commented code
- */
-//     /**
-//     * @see org.eclipse.gmf.runtime.common.ui.util.IInlineTextActionHandler
-//     */
-//    public void hookHandlers() {
-//        getText().addKeyListener(getKeyAdapter());
-//        getText().setFocus();
-//        setHooked(true);
-//    }
-//    /**
-//     * @see org.eclipse.gmf.runtime.common.ui.util.IInlineTextActionHandler
-//     */
-//    public void unHookHandlers() {
-//        getText().removeKeyListener(getKeyAdapter());
-//        setHooked(false);
-//    }
-//
-//    /**
-//     * Returns the keyAdapter.
-//     * @return KeyAdapter
-//     * 
-//     * NOTE: Eclipse does not dispatch to us the ctrl-x, ctrl-v, ctrl-c
-//     *  keyboard edit actions, but rather it installs by default and
-//     * uses the old Windows text editing short-cuts: 
-//     * shift-insert, shift-delete, ctrl-insert.
-//     * in other words this key adapter is useless since we'll never be called
-//     * appropriately 
-//     *                    CTRL+V or SHIFT+INS
-//     *                    CTRL+C or CTRL+INSERT
-//     *                    CTRL+X or SHIFT+DELETE
-//     */
-//    private KeyAdapter getKeyAdapter() {        
-//        if (keyAdapter == null) {            
-//            keyAdapter = new KeyAdapter() {
-//                public void keyReleased(KeyEvent event) {
-//                    if (event.keyCode == SWT.DEL) {
-//                        handleDelete();
-//                    } else if (event.stateMask == SWT.CTRL) {
-//                        switch (Character.toLowerCase(event.character)) {
-//                            case 'a' :
-//                                {
-//                                    handleSelectAll();
-//                                    break;
-//                                }
-//                            case 'c' :
-//                                {
-//                                    handleCopy();
-//                                    break;
-//                                }
-//                            case 'v' :
-//                                {
-//                                    handlePaste();
-//                                    break;
-//                                }
-//                            case 'x' :
-//                                {
-//                                    handleCut();
-//                                    break;
-//                                }
-//                        }
-//                    }
-//                }
-//            };
-//        }
-//
-//        return keyAdapter;
-//    }
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ConsoleUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ConsoleUtil.java
deleted file mode 100644
index 487c1c6..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ConsoleUtil.java
+++ /dev/null
@@ -1,244 +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.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-
-/**
- * A Util Class: provides convinient api to write to the Eclipse Console View  
- * 
- * The client of printXXXX(String name, String msg) methods does not need to do any 
- * housekeeping work to use this method. All pre-work for example registering the console 
- * with the Eclipse console manager if neccessary, creating the message stream, setting 
- * the default color are handled ny the method if neccesary.
- * 
- * However once they are done printing all there messages and have no more requirement
- * for the console and know that the console is not shared by others they can call 
- * unregisterConsole(String name) to dispose of the console
- * 
- * Also if the client wants to have more control over the console and streams or want
- * to display addititional message types in different colors (other than error:red, 
- * info:blue and warning:yellow) they can call registerConsole(String name, 
- * ImageDescriptor image) to create/register/get the console and then use standard 
- * eclipse api to do what they want.
- * 
- * @author bagrodia 
- */
-public class ConsoleUtil {
-	
-	/** cache for console name to actual console object mapping*/
-	private static Map nameToConsole = new HashMap();
-	
-	/** cache for 'console name' to 'default streams for error, warining and info for that console' mapping */
-	private static Map nameToDefaultStream = new HashMap();
-	
-	
-	// Strings for error, info, warning and default message types
-	private final static String ERROR = "ERROR"; //$NON-NLS-1$
-	private final static String INFO = "INFO";//$NON-NLS-1$
-	private final static String WARNING = "WARNING";//$NON-NLS-1$
-	private final static String DEFAULT= "DEFAULT";//$NON-NLS-1$
-	
-	//  Colors for error , info and warning message colors: By Default
-	//  error messages are red, warnings yellow and info blue.
-	
-	/** Default color used for logging error messages to the console. */
-	public final static Color DEFAULT_ERROR =  new Color(null,255,0,0);
-	
-	/** Default color used for logging info messages to the console. */
-	public final static Color DEFAULT_INFO =  new Color(null,0,0,255);
-	
-	/** Default color used for logging warning messages to the console. */
-	public final static Color DEFAULT_WARNING =  new Color(null,255,255,0);
-
-	/**
-	 * Registers the console with the Eclipse Console Manager.
-	 * 
-	 * @param name - the name for the console
-	 * @param image - the image associated with the console
-	 * @return the message console 
-	 */
-	public static MessageConsole registerConsole(String name, ImageDescriptor image){		
-		
-		if(nameToConsole.get(name) == null){	
-			
-			MessageConsole console = new MessageConsole(name,image);
-			ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[]{console});			
-			
-			nameToConsole.put(name, console );
-		}
-		
-		return (MessageConsole) nameToConsole.get( name);
-	}
-	
-	
-	/**
-	 * Registers the console with the Eclipse Console Manager
-	 * 
-	 * @param name - the name name for the console	 
-	 * @return message console  
-	 */
-	public static MessageConsole registerConsole(String name){		
-		return registerConsole(name,null);
-	}
-	
-	
-	/**
-	 *  Unregisters the console with the Eclipse Console Manager
-	 * 
-	 * 	@param name - the name name for the console	   
-	 */
-	public static void unregisterConsole(String name){		
-		if(nameToConsole.containsKey( name)){		
-			ConsolePlugin.getDefault().getConsoleManager().removeConsoles( new IConsole[]{(IConsole)nameToConsole.get(name)});
-			nameToConsole.remove( name);
-			nameToDefaultStream.remove(name+ERROR );
-			nameToDefaultStream.remove(name+INFO );
-			nameToDefaultStream.remove(name+WARNING );
-			
-		}		
-	}
-	
-	
-	
-	/**
-	 * returns the default (cached) MessageConsoleStream for the specified console name of the 
-	 * specified type (error, info or warning)
-	 * 
-	 * @param name - the specified console name
-	 * @param type - the specified type (error, info or warning)
-	 * @return the default MessageConsoleStream 
-	 */
-	private static MessageConsoleStream getDefaultStream(String name, String type){
-		if(nameToDefaultStream.get(name+type)== null){
-			MessageConsole console = registerConsole(name);			
-			MessageConsoleStream defaultStream = console.newMessageStream();
-			
-			nameToDefaultStream.put(name+type, defaultStream);
-			
-		}
-		
-		return (MessageConsoleStream) nameToDefaultStream.get(name+type);
-		
-	}
-	
-		
-	/**
-	 * Convinient static method to print an error string on the specified console.
-	 * The color of the error message printed is by red. 
-	 *  
-	 * The client of this method does not need to do any housekeeping work to use 
-	 * this method. All pre-work for example registering the console with the Eclipse 
-	 * console manager if neccessary, creating the message stream, setting the color
-	 * are handled by the method if neccesary.
-	 * 
-	 * @param name - specifies the console
-	 * @param errMsg - the error message
-	 */	
-	public static void printError(String name, String errMsg){		
-		MessageConsoleStream defaultStream = getDefaultStream(name, ERROR);
-		defaultStream.setColor(DEFAULT_ERROR);
-		defaultStream.println(errMsg);		
-	}
-	
-	/** 
-	 * Convinient static method to print an info string on the specified console.
-	 * The color of the info message printed is by blue. 
-	 *  
-	 * The client of this method does not need to do any housekeeping work to use 
-	 * this method. All pre-work for example registering the console with the Eclipse 
-	 * console manager if neccessary, creating the message stream, setting the color
-	 * are handled by the method if neccesary.  
-	 * 
-	 * @param name - specifies the console
-	 * @param infoMsg - the info message
-	 */
-	public static void printInfo(String name, String infoMsg){			
-		MessageConsoleStream defaultStream = getDefaultStream(name,INFO);
-		defaultStream.setColor(DEFAULT_INFO);
-		defaultStream.println(infoMsg);	
-	}
-	
-	
-	
-	/** 
-	 * Convinient static method to print an warning string on the specified console.
-	 * The color of the warning message printed is by yellow. 
-	 *  
-	 * The client of this method does not need to do any housekeeping work to use 
-	 * this method. All pre-work for example registering the console with the Eclipse 
-	 * console manager if neccessary, creating the message stream, setting the color
-	 * are handled by the method if neccesary.   
-	 * 
-	 * @param name - specifies the console
-	 * @param warnMsg  - the warning message
-	 */
-	public static void printWarning(String name, String warnMsg){			
-		MessageConsoleStream defaultStream = getDefaultStream(name, WARNING);
-		defaultStream.setColor(DEFAULT_WARNING);
-		defaultStream.println(warnMsg);	
-	}
-	
-
-	/** 
-	 * Convinient static method to print an string on the specified console.
-	 * The color of the message printed is by black. 
-	 *  
-	 * The client of this method does not need to do any housekeeping work to use 
-	 * this method. All pre-work for example registering the console with the Eclipse 
-	 * console manager if neccessary, creating the message stream, setting the color
-	 * are handled by the method if neccesary.   
-	 * 
-	 * @param name - specifies the console
-	 * @param msg  - the warning message
-	 */
-	public static void println(String name, String msg){
-		MessageConsoleStream defaultStream = getDefaultStream(name, DEFAULT);		
-		defaultStream.println(msg);			
-	}
-	
-
-	
-	/**
-	 * Shows the Eclipse console view and brings on top the specified console.
-	 * 
-	 * Also creates and registers the console with the Eclipse console manager 
-	 * if necessary.
-	 * 
-	 * @param name - specifies the console
-	 */
-	public static void showConsole(String name){
-		MessageConsole console = registerConsole(name);	
-		
-		// Need to call the following Eclipse API twice as there is a bug in the 
-		// API. 
-		// Expected: The API method should open the console view and display given the console.
-		// If the view is already open, it should be brought to the front.
-		// Actual: if the view is not already open, the method opens it but does not bring it 
-		// to front; A second invocation of the method is a workaround to bring to front the 
-		// opened view.
-		// Submitted Bugzilla Bug #70864 to track the defect
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console);
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console);
-	}
-
-	
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomData.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomData.java
deleted file mode 100644
index b37eaac..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomData.java
+++ /dev/null
@@ -1,66 +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.util;
-
-/**
- * The class used to create custom data for drag and drop/clipboard operations. This
- * class implements <code>ICustomData</code> interface used within the
- * transfer agent <code>CustomDataTransfer</code>
- * 
- * @author Vishy Ramaswamy
- */
-public final class CustomData implements ICustomData {
-    /* Attribute for the format type */
-    final private String formatType;
-
-    /* Attribute for the data */
-    final private byte[] data;
-
-    /**
-     * Constructs a CustomData.
-     * 
-     * @param formatType data format as <code>String</code>
-     * @param data attribute for the data
-     */
-    public CustomData(String formatType, byte[] data) {
-        super();
-
-        assert null != formatType;
-        assert null != data;
-        assert (data.length > 0);
-
-        this.formatType = formatType;
-        this.data = data;
-    }
-
-    /**
-     * Retrieves the format type
-     * 
-     * @return the format type
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.util.ICustomData#getFormatType()
-     */
-    public String getFormatType() {
-        return formatType;
-    }
-
-    /**
-     * Retrieves the data
-     * 
-     * @return the data as bytes
-     * 
-     * @see org.eclipse.gmf.runtime.common.ui.util.ICustomData#getData()
-     */
-    public byte[] getData() {
-        return data;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomDataTransfer.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomDataTransfer.java
deleted file mode 100644
index b39ebbb..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/CustomDataTransfer.java
+++ /dev/null
@@ -1,167 +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.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-
-/**
- * This class can be used to transfer an array of <code>ICustomData</code>
- * between two parts in a workbench in a drag and drop operation or used to
- * store/retrieve custom data to/from the system clipboard respectively.
- *
- * @author Vishy Ramaswamy
- */
-public final class CustomDataTransfer extends ByteArrayTransfer {
-    private static final String XTOOLS = "XTOOLS"; //$NON-NLS-1$
-    private static final int XTOOLSID = registerType(XTOOLS);
-    private static CustomDataTransfer instance = new CustomDataTransfer();
-
-    /**
-     * Return the singleton.
-     * 
-     * @return a singleton instance of <code>CustomDataTransfer</code>
-     */
-    public static CustomDataTransfer getInstance() {
-        return instance;
-    }
-
-    /**
-     * Constructor for ClipboardTransferAgent.
-     */
-    private CustomDataTransfer() {
-        super();
-    }
-
-    /**
-     * Converts an array of <code>ICustomData</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) {
-        if (object == null || !(object instanceof ICustomData[]))
-            return;
-
-        if (isSupportedType(transferData)) {
-            ICustomData[] myTypes = (ICustomData[]) object;
-            try {
-                // write data to a byte array and then ask super to convert to pMedium
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                DataOutputStream writeOut = new DataOutputStream(out);
-
-                /* The serialization format is:
-                 * (int) number of elements
-                 * Then, the following for each element:
-                 * (String) format type
-                 * (byte[]) data
-                 */
-
-                writeOut.writeInt(myTypes.length);
-
-                byte[] array = null;
-
-                for (int i = 0; i < myTypes.length; i++) {
-                    writeOut.writeUTF(myTypes[i].getFormatType());
-                    array = myTypes[i].getData();
-
-                    writeOut.writeInt(array.length);
-                    writeOut.write(array);
-                }
-
-                byte[] buffer = out.toByteArray();
-                writeOut.close();
-
-                super.javaToNative(buffer, transferData);
-
-            } catch (IOException e) {
-				Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "javaToNative", e); //$NON-NLS-1$
-				Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "javaToNative", e); //$NON-NLS-1$
-			}
-        }
-    }
-
-    /**
-     * Converts a <code>byte[]</code> in to an array of <code>ICustomData</code> 
-     * @return <code>Object</code>
-     * @see org.eclipse.swt.dnd.Transfer#nativeToJava(org.eclipse.swt.dnd.TransferData)
-     */
-    public Object nativeToJava(TransferData transferData) {
-
-        if (isSupportedType(transferData)) {
-
-            byte[] buffer = (byte[]) super.nativeToJava(transferData);
-
-            if (buffer == null) {
-                return null;
-            }
-
-            try {
-                ByteArrayInputStream in = new ByteArrayInputStream(buffer);
-                DataInputStream readIn = new DataInputStream(in);
-
-                int count = readIn.readInt();
-                ICustomData[] myData = new ICustomData[count];
-
-                String type = null;
-                byte[] array = null;
-
-                for (int i = 0; i < count; i++) {
-                    type = readIn.readUTF();
-                    array = new byte[readIn.readInt()];
-                    readIn.read(array);
-
-                    myData[i] = new CustomData(type, array);
-                }
-
-                readIn.close();
-
-                return myData;
-
-            } catch (IOException ex) {
-				Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "nativeToJava", ex); //$NON-NLS-1$
-				Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "nativeToJava", ex); //$NON-NLS-1$
-                return null;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * 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[] { XTOOLSID };
-    }
-
-    /**
-     * 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[] { XTOOLS };
-    }
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/DisplayUtils.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/DisplayUtils.java
deleted file mode 100644
index 5241ea6..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/DisplayUtils.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.util;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Utility methods to work with Display object
- * 
- * @author aboyko
- * @since 1.2
- */
-public class DisplayUtils {
-	
-	/**
-	 * Returns a non-null instance of Display object. Tries to find the Display
-	 * object for the current thread first and if it fails tries to get:
-	 * <li> Workbench display if the workbench running
-	 * <li> Default display object
-	 * 
-	 * @return non-null Display object
-	 * @since 1.2
-	 */
-	public static Display getDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null && PlatformUI.isWorkbenchRunning()) {
-			display = PlatformUI.getWorkbench().getDisplay();
-		}
-		return display != null ? display : Display.getDefault();
-	}
-	
-	/**
-	 * Attempts to return the default shell. If it cannot return the default
-	 * shell, it returns the shell of the first workbench window that has shell.
-	 * 
-	 * @return The shell
-	 * @since 1.2
-	 */
-	public static Shell getDefaultShell() {
-		Shell shell = null;
-
-		try {
-			shell = Display.getDefault().getActiveShell();
-		} catch (Exception e) {
-			// ignore
-		}
-
-		try {
-			if (shell == null) {
-				IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow();
-				if (activeWindow != null)
-					shell = activeWindow.getShell();
-				
-			}
-		} catch (Exception e) {
-			// ignore
-		}
-
-		if (shell == null) {
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
-				.getWorkbenchWindows();
-			for (int i = 0; shell == null && i < windows.length; i++) {
-				shell = windows[i].getShell();
-			}
-		}
-
-		return shell;
-	}
-    
-    /**
-     * Clear the event queue
-     * 
-     * @since 1.2
-     */
-    public static void clearEventLoop() {
-    	while (getDisplay().readAndDispatch());
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/FileUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/FileUtil.java
deleted file mode 100644
index a7e48a4..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/FileUtil.java
+++ /dev/null
@@ -1,162 +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.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-
-/**
- * This class provides general methods for operating on files.
- * @author wdiu
- */
-public class FileUtil {
-	/**
-	 * 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
-	 */
-	static public 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 {
-				Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, CommonUIPlugin.getDefault().getClass(), "createFile", e); //$NON-NLS-1$
-				Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "createFile", e); //$NON-NLS-1$
-				Trace.throwing(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_THROWING, CommonUIPlugin.getDefault().getClass(), "createFile", e); //$NON-NLS-1$
-				throw e;
-			}
-		}
-
-		if (monitor.isCanceled())
-			throw new OperationCanceledException();
-	}
-
-	/**
-	 * Deletes a file resource given the file handle.
-	 *
-	 * @param fileHandle the file handle to delete.
-	 * @param monitor the progress monitor to show visual progress with
-	 * @exception CoreException if the operation fails
-	 */
-	static public void deleteFile(IFile fileHandle, IProgressMonitor monitor)
-		throws CoreException {
-		try {
-			// Delete a file resource in the workspace
-			fileHandle.delete(true, monitor);
-		} catch (CoreException e) {
-			Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, CommonUIPlugin.getDefault().getClass(), "createFile", e); //$NON-NLS-1$
-			Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "createFile", e); //$NON-NLS-1$
-			Trace.throwing(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_THROWING, CommonUIPlugin.getDefault().getClass(), "createFile", e); //$NON-NLS-1$
-			throw e;
-		}
-
-		if (monitor.isCanceled())
-			throw new OperationCanceledException();
-	}
-	
-	private static final String RELATIVE_STR = ".."; //$NON-NLS-1$
-
-	/**
-	 * Build the relative path according to the url path and model path
-	 * 
-	 * @param urlPathstr
-	 *            the url path, make sure the url is a file path, otherwise do
-	 *            not change.
-	 * @param modelPathstr
-	 *            the model's path
-	 * @return the relative path
-	 */
-	public static String getRelativePath(String urlPathstr, String modelPathstr) {
-		StringBuffer res = new StringBuffer();
-		IPath urlPath = new Path(urlPathstr);
-		IPath modelPath = new Path(modelPathstr);
-		if (urlPathstr.indexOf("://") > 0) { //$NON-NLS-1$
-			return urlPathstr;
-		}
-		int matchingSegments = urlPath.matchingFirstSegments(modelPath);
-		int backSegments = modelPath.segmentCount() - matchingSegments - 1;
-		while (backSegments > 0) {
-			res.append(RELATIVE_STR); 
-			res.append(File.separatorChar);
-			backSegments--;
-		}
-		int segCount = urlPath.segmentCount();
-		for (int i = matchingSegments; i < segCount; i++) {
-			if (i > matchingSegments) {
-				res.append(File.separatorChar);
-			}
-			res.append(urlPath.segment(i));
-		}
-		return res.toString();
-	}
-	
-	
-	/**
-	 * make the absolute path from relative url path and base model path
-	 * 
-	 * @param strurlPath
-	 *            the URL Path String
-	 * @param strmodelPath
-	 *            the absolute Model Path
-	 * @return the relative path String
-	 */
-	public static String getAbsolutePath(String strurlPath, String strmodelPath) {
-		IPath urlPath = new Path(strurlPath);
-		
-		// RATLC00535293 - if the file path is already absolute, just return it
-		if (urlPath.isAbsolute())
-			return strurlPath;
-		 
-		IPath modelPath = new Path(strmodelPath);
-		int rel_level = 0;
-		for (int i = 0; i < urlPath.segmentCount(); i++) {
-			if (urlPath.segment(i).equals(RELATIVE_STR)) {
-				rel_level++;
-			}
-		}
-		urlPath = urlPath.removeFirstSegments(rel_level);
-		modelPath = modelPath.removeLastSegments(rel_level + 1);
-		urlPath = modelPath.append(urlPath);
-		return urlPath.toOSString();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ICustomData.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ICustomData.java
deleted file mode 100644
index 60aec94..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ICustomData.java
+++ /dev/null
@@ -1,34 +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.util;
-
-/**
- * Interface for defining custom data used within clipboard/DND operations by
- * the transfer agent <code>CustomDataTransfer</code>
- * 
- * @author Vishy Ramaswamy
- */
-public interface ICustomData {
-    /**
-     * Retrieves the format type
-     * 
-     * @return the format type
-     */
-    public String getFormatType();
-
-    /**
-     * Retrieves the data
-     * 
-     * @return the data as bytes
-     */
-    public byte[] getData();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IEditStringProvider.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IEditStringProvider.java
deleted file mode 100644
index a3d41e8..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IEditStringProvider.java
+++ /dev/null
@@ -1,57 +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.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-/**
- * An interface used to provide the string to edit for tree items when using the 
- * tree-inline-text-editor
- * 
- * @author Yasser Lulu
- * 
- */
-public interface IEditStringProvider {
-    /**
-     * Determines if node can be edited.
-     * 
-     * @param element The data associated with the tree-node being edited
-     * @return boolean <code>true</code> if node can be edited, otherwise <code>false</code>
-     */
-	boolean canEdit(Object element);
-    
-	/**
-     * Returns the initial to-be-edited string to diplay in the text-editor.
-     * for a given tree-node
-     * @param element The data associated with the tree-node being edited
-     * @return String the editable string to display for the user
-     */
-    String getEditString(Object element);
-    
-    /**
-     * Handles the newly edited string entered by the user for the given element.
-     * 
-     * @param element The data associated with the tree-node being edited
-     * @param newString The new string entered by the user 
-     * @return IStatus the status of string editing operation
-     */
-    IStatus setEditString(Object element, String newString);
-    
-    /**
-     * Retrieve <code>IContentAssistProcessor</code> for specified object.
-     *  
-     * @param element an object for which completion processor is to be retrieved
-     * @return the completion processor
-     */
-    IContentAssistProcessor getCompletionProcessor(Object element);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextActionHandler.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextActionHandler.java
deleted file mode 100644
index 2c7545f..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextActionHandler.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.common.ui.util;
-
-/**
- * Interface for handling text manipulation actions for inline editor
- * @author Yasser Lulu
- * 
- */
-public interface IInlineTextActionHandler {
-    /**
-     * hooks (enable)the text action handlers
-     */
-    void hookHandlers();
-    /**
-     * unhooks (disable)the text action handlers
-     */
-    void unHookHandlers();
-    /**
-     * diposes this action-handler
-     */
-    void dispose();
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextEditorPart.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextEditorPart.java
deleted file mode 100644
index 98d955a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IInlineTextEditorPart.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.common.ui.util;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-
-/**
- * This interface is used to describe a workbench part that supports inline
- * editing.
- * 
- * @author ldamus
- */
-public interface IInlineTextEditorPart {
-
-	/**
-	 * Start inline editing.
-	 */
-	public void startInlineEdit();
-
-	/**
-	 * sets the selection to the passed object and starts rename
-	 * 
-	 * @param object
-	 *            the object to set selection on and rename
-	 */
-	void startInlineEdit(Object object);
-
-	/**
-	 * sets the selection to the passed object and starts the
-	 * runnable to rename
-	 * 
-	 * @param object
-	 *            the object to set selection on and rename
-	 * @param editingRunnable a Runnable to invoke after setting selection on object
-	 * in order to start renaming
-	 */
-	void startInlineEdit(Object object, Runnable editingRunnable);
-
-	/**
-	 * Gets the viewer for this part, in case the <code>RenameResourceAction</code> is to be used for
-	 * inline editing.
-	 * 
-	 * @return the viewer, or <code>null</code> if there is none
-	 */
-	public StructuredViewer getViewer();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IPartSelector.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IPartSelector.java
deleted file mode 100644
index 780b791..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IPartSelector.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.runtime.common.ui.util;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Interface implemented by objects that know how to match an
- * <code>IWorkbenchPart</code> against themselves.
- * <P>
- * This interface should not be implemented by clients.
- * 
- * @author ldamus
- */
-public interface IPartSelector {
-
-	/**
-	 * Answers whether or not I select a given workbench <code>part</code>.
-	 * 
-	 * @param part
-	 *            the workbench part to be tested
-	 * @return <code>true</code> if the part matches my criteria,
-	 *         <code>false</code> otherwise
-	 */
-	public boolean selects(IWorkbenchPart part);
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IWorkbenchPartDescriptor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IWorkbenchPartDescriptor.java
deleted file mode 100644
index 7563afe..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/IWorkbenchPartDescriptor.java
+++ /dev/null
@@ -1,43 +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.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * A descriptor for a workbench part using its id, class and page
- * @author melaasar
- */
-public interface IWorkbenchPartDescriptor {
-	
-	/**
-	 * Gets the id of the workbench part
-	 * 
-	 * @return The id of the workbench part
-	 */
-	public String getPartId();
-	
-	/**
-	 * Gets the class of the workbench part
-	 * 
-	 * @return The class of the workbench part
-	 */
-	public Class getPartClass();
-	
-	/**
-	 * Gets the page of the workbench part
-	 * 
-	 * @return The page of the workbench part
-	 */
-	public IWorkbenchPage getPartPage();
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/InlineTextActionHandler.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/InlineTextActionHandler.java
deleted file mode 100644
index 534b3c4..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/InlineTextActionHandler.java
+++ /dev/null
@@ -1,331 +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.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * A class that is used to handle all global menu/keyboard generated text actions 
- * associated with the displayed text editor 
- * 
- * @author Yasser Lulu
- * 
- */
-public class InlineTextActionHandler
-	extends BaseInlineTextActionHandler
-	implements IInlineTextActionHandler {
-	/**
-	 * the action bars for the site that the text editor is displayed within
-	 */
-	private IActionBars actionBars;
-
-	/**
-	 * a map used to maintain the global-textEditing action-pairs
-	 */
-	private Map actionPairMap;
-	/**
-	 * global actions ids that are non-Eclipse, which the caller needs to have us
-	 * disable while editing is in progress
-	 */
-	private List disableActionsIds;
-
-	/**
-	 * Constructor for InlineTextActionHandler.
-	 * 
-	 * @param actionBars list of action bars for the site that the text editor is displayed within
-	 * @param text widget used for editing
-	 * @param disableActionsIds list of actions that must be disabled while editing is in progress
-	 */
-	public InlineTextActionHandler(
-		IActionBars actionBars,
-		Text text,
-		List disableActionsIds) {
-		super(text);
-		setActionPairMap(new HashMap());
-		setActionBars(actionBars);
-		this.disableActionsIds = disableActionsIds;
-	}
-	/**
-	 * a class used to insert a disabled action to be used whenever a given
-	 * global action has no corresponding replacement for text (e.g., find)
-	 */
-	private class DisabledTextActionHandler extends Action {
-		/**
-		 * Constructor.
-		 * 
-		 * @param name name label
-		 */
-		protected DisabledTextActionHandler(String name) {
-			super(name);
-			setEnabled(false);
-		}
-		public void setEnabled(boolean enabled) {
-			super.setEnabled(false);
-		}
-	}
-	/**
-	 * a structure used to hold the global-action and its correponding 
-	 * text-action replacement 
-	 */
-	private class ActionPair {
-		/**
-		 * the action id
-		 */
-		String actionId;
-		/**
-		 * the original action as installed by the app
-		 */
-		IAction originalAction;
-		/**
-		 * our own corresponding action replacement for handling text
-		 */
-		IAction textHandlerAction;
-	}
-
-	/**
-	 * returns the action-bars for the view-site
-	 * @return IActionBars The action-bars
-	 */
-	private IActionBars getActionBars() {
-		return actionBars;
-	}
-	/**
-	 * sets the action bars for the site
-	 * @param actionBars the IActionBars
-	 */
-	private void setActionBars(IActionBars actionBars) {
-		this.actionBars = actionBars;
-	}
-
-	/**
-	 * builds the action map pair
-	 */
-	private void buildActionPairMap() {
-		if (getActionPairMap().isEmpty() == false) {
-			return;
-		}
-		ActionPair actionPair = null;
-		IAction action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.CUT.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.CUT.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction = new Action(action.getText()) {
-				public void run() {
-					handleCut();
-				}
-			};
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-		//////////////////            
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.COPY.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.COPY.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction = new Action(action.getText()) {
-				public void run() {
-					handleCopy();
-				}
-			};
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-		//////////////////
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.PASTE.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.PASTE.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction = new Action(action.getText()) {
-				public void run() {
-					handlePaste();
-				}
-			};
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-		//////////////////
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.DELETE.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.DELETE.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction = new Action(action.getText()) {
-				public void run() {
-					handleDelete();
-				}
-			};
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-		//////////////////
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.SELECT_ALL.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.SELECT_ALL.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction = new Action(action.getText()) {
-				public void run() {
-					handleSelectAll();
-				}
-			};
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-		//////////////
-
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.UNDO.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.UNDO.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction =
-				new DisabledTextActionHandler(action.getText());
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.REDO.getId());
-		if (action != null) {
-			action.setEnabled(false);
-
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.REDO.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction =
-				new DisabledTextActionHandler(action.getText());
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-
-		action =
-			getActionBars().getGlobalActionHandler(
-				ActionFactory.FIND.getId());
-		if (action != null) {
-			actionPair = new ActionPair();
-			actionPair.actionId = ActionFactory.FIND.getId();
-			actionPair.originalAction = action;
-			actionPair.textHandlerAction =
-				new DisabledTextActionHandler(action.getText());
-			getActionPairMap().put(actionPair.actionId, actionPair);
-		}
-
-		Iterator it = disableActionsIds.iterator();
-		String specialCommandId = null;
-		while (it.hasNext()) {
-			specialCommandId = (String) it.next();
-			action = getActionBars().getGlobalActionHandler(specialCommandId);
-			if (action != null) {
-				actionPair = new ActionPair();
-				actionPair.actionId = specialCommandId;
-				actionPair.originalAction = action;
-				actionPair.textHandlerAction =
-					new DisabledTextActionHandler(action.getText());
-				getActionPairMap().put(actionPair.actionId, actionPair);
-			}
-		}
-
-	}
-	/**
-	 * hooks our text actions by replacing the installed global actions with
-	 * one suitable for text editing, in order to retarget them correctly while 
-	 * the editing is in progress
-	 */
-	public void hookHandlers() {
-		buildActionPairMap();
-		ActionPair actionPair = null;
-		Iterator it = getActionPairMap().values().iterator();
-		while (it.hasNext()) {
-			actionPair = (ActionPair) it.next();
-			getActionBars().setGlobalActionHandler(actionPair.actionId, null);
-		}
-		getActionBars().updateActionBars();
-		it = getActionPairMap().values().iterator();
-		while (it.hasNext()) {
-			actionPair = (ActionPair) it.next();
-			getActionBars().setGlobalActionHandler(
-				actionPair.actionId,
-				actionPair.textHandlerAction);
-			actionPair.textHandlerAction.setEnabled(true);
-		}
-		getActionBars().updateActionBars();
-		setHooked(true);
-	}
-	/**
-	 * unhooks and uninstall our text actions and re-install the original global 
-	 * actions 
-	 */
-	public void unHookHandlers() {
-		ActionPair actionPair = null;
-		Iterator it = getActionPairMap().values().iterator();
-		while (it.hasNext()) {
-			actionPair = (ActionPair) it.next();
-			getActionBars().setGlobalActionHandler(actionPair.actionId, null);
-		}
-		getActionBars().updateActionBars();
-		it = getActionPairMap().values().iterator();
-		while (it.hasNext()) {
-			actionPair = (ActionPair) it.next();
-			getActionBars().setGlobalActionHandler(
-				actionPair.actionId,
-				actionPair.originalAction);
-			actionPair.originalAction.setEnabled(
-				actionPair.originalAction.isEnabled());
-		}
-		getActionBars().updateActionBars();
-		setHooked(false);
-	}
-
-	/**
-	 * diposes this action-handler
-	 * 
-	 */
-	public void dispose() {
-		super.dispose();
-		setActionPairMap(null);
-		setActionBars(null);
-		disableActionsIds = null;
-	}
-	/**
-	 * Returns the actionPairMap.
-	 * @return Map
-	 */
-	private Map getActionPairMap() {
-		return actionPairMap;
-	}
-
-	/**
-	 * Sets the actionPairMap.
-	 * @param actionPairMap The actionPairMap to set
-	 */
-	private void setActionPairMap(Map actionPairMap) {
-		this.actionPairMap = actionPairMap;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/OverlayImageDescriptor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/OverlayImageDescriptor.java
deleted file mode 100644
index e764945..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/OverlayImageDescriptor.java
+++ /dev/null
@@ -1,118 +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.util;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * Allows one image descriptor to be overlayed on another image descriptor to
- * generate a new image. Commonly used to decorate an image with a second image
- * decoration.
- * 
- * @author Michael Yee
- */
-public class OverlayImageDescriptor
-	extends CompositeImageDescriptor {
-
-	/** default image width */
-	private final int DEFAULT_IMAGE_WIDTH = 16;
-
-	/** default image height */
-	private final int DEFAULT_IMAGE_HEIGHT = 16;
-
-	/** image width */
-	private int imageWidth = DEFAULT_IMAGE_WIDTH;
-
-	/** image height */
-	private int imageHeight = DEFAULT_IMAGE_HEIGHT;
-
-	/** base image */
-	private Image srcImage = null;
-
-	/** overlay image */
-	private ImageDescriptor overlayDesc = null;
-
-	/**
-	 * OverlayImageDescriptor constructor
-	 * 
-	 * @param srcImage
-	 *            the base image
-	 * @param overlayDesc
-	 *            the overlay image
-	 */
-	public OverlayImageDescriptor(Image srcImage, ImageDescriptor overlayDesc) {
-		assert null != srcImage;
-		assert null != overlayDesc;
-		this.srcImage = srcImage;
-		this.overlayDesc = overlayDesc;
-	}
-
-	/**
-	 * OverlayImageDescriptor constructor where you can set the width and height
-	 * 
-	 * @param srcImage
-	 *            the base image
-	 * @param overlayDesc
-	 *            the overlay image
-	 * @param width
-	 *            an int with the width of the image in pixels
-	 * @param height
-	 *            an int with the height of the image in pixels
-	 */
-	public OverlayImageDescriptor(Image srcImage, ImageDescriptor overlayDesc,
-			int width, int height) {
-		this(srcImage, overlayDesc);
-		imageWidth = width;
-		imageHeight = height;
-	}
-
-	/**
-	 * Draws the given source image data into this composite image at the given
-	 * position.
-	 * 
-	 * @param width
-	 *            the width of the image.
-	 * @param height
-	 *            the height of the image.
-	 * 
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int,
-	 *      int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		// draw the base image
-		ImageData backgroundData = srcImage.getImageData();
-		if (backgroundData != null) {
-			drawImage(backgroundData, 0, 0);
-		}
-
-		// draw the overlay image
-		ImageData overlayData = overlayDesc.getImageData();
-		if (overlayData != null) {
-			drawImage(overlayData, 0, 0);
-		}
-	}
-
-	/**
-	 * Retrieve the size of this composite image.
-	 * 
-	 * @return the x and y size of the image expressed as a point object
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		return new Point(imageWidth, imageHeight);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PartListenerAdapter.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PartListenerAdapter.java
deleted file mode 100644
index 7d1cd23..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PartListenerAdapter.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.ui.util;
-
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * A default implementation of the <code>IPartListener</code> interface.
- * @author melaasar
- */
-public class PartListenerAdapter implements IPartListener {
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-	/**
-	 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-		 /* method not implemented */
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PropertySheetUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PropertySheetUtil.java
deleted file mode 100644
index ccc022b..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/PropertySheetUtil.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.util;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * Utility class that implements some helpful method for <code>PropertySheetViewer.</code>
- * 
- * @author ldamus
- */
-public class PropertySheetUtil {
-	
-	/** ID of property view. */
-	public static final String PROPERTY_VIEW_ID = "org.eclipse.ui.views.PropertySheet"; //$NON-NLS-1$
-
-	/**
-	 * Refreshes the model for the current page of the property sheet viewer.
-	 * Ensures that the model reflects the state of the current viewer input. 
-	 */
-	public static void refreshCurrentPage() {
-		IPage propertyPage = getCurrentPropertySheetPage();
-
-		if (propertyPage instanceof PropertySheetPage) {
-			((PropertySheetPage) propertyPage).refresh();
-		}
-	}
-
-	/**
-	 * Sets the selection of the current property sheet page to 
-	 * <code>selection</code>. This has the effect of refreshing
-	 * the property sheet viewer input with the items in 
-	 * <code>selection</code>.
-	 * 
-	 * @param part the part where the selection occurred
-	 * @param selection the new selection
-	 */
-	public static void setCurrentPageSelection(
-		IWorkbenchPart part,
-		ISelection selection) {
-			
-		IPage propertyPage = getCurrentPropertySheetPage();
-
-		if (propertyPage instanceof IPropertySheetPage) {
-			((IPropertySheetPage) propertyPage).selectionChanged(
-				part,
-				selection);
-		}
-	}
-
-	/**
-	 * Gets the current property sheet page, or null if there is none.
-	 * 
-	 * @return the current property sheet page
-	 */
-	private static IPage getCurrentPropertySheetPage() {
-		
-		IWorkbenchWindow window =
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-
-			if (page != null) {
-				IViewPart view = page.findView(PROPERTY_VIEW_ID);
-
-				if (view != null) {
-
-					if (view instanceof PropertySheet) {
-						return ((PropertySheet) view).getCurrentPage();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/SelectionRefresher.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/SelectionRefresher.java
deleted file mode 100644
index 32c5679..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/SelectionRefresher.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.util;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class serves the purpose of refershing selection in shell.  
- * Refreshing selection has some positive side affects, one which is the 
- * refreshing of properties in the property browser.
- * Note: Properties will not be refreshed if SelectionProvider is null.
- * 
- * @author Tauseef A. Israr
- * Created on: Oct 10, 2002
- * 
- * 
- */
-public class SelectionRefresher {
-
-	/**
-	 * represents the number of unhandled requests
-	 * 0 = no requests
-	 * > 0 processing requests
-	 */
-	private static int count = 0;
-
-	/**
-	 * Clients call this function to refresh the selection.
-	 * This function is implemented in a way in which it refreshes at the 
-	 * instance it is first called and while the refresh is in progress, if 
-	 * it receives more messages, it queues them and only refresh once after 
-	 * that.
-	 * 
-	 */
-	public synchronized static void refreshSelection() {
-		if (0 == count) {
-			Thread thread1 = getJavaThread();
-			thread1.start();
-		}
-		count++;
-	}
-
-	/**
-	 * Method to inform that the thread has finished refreshing the selection.
-	 */
-	private synchronized static void finishedRefresh() {
-
-		if (count == 1) {
-			count = 0;
-		}
-		if (count > 1) {
-			count = 1;
-			Thread thread1 = getJavaThread();
-			thread1.start();
-		}
-	}
-
-	/**
-	 * Refreshes the current property sheet page so that 
-	 * its model is updated from its input source.
-	 */
-	private static void doRun() {
-
-		PropertySheetUtil.refreshCurrentPage();
-	}
-
-	/**
-	 * 
-	 * @param count the counter is 
-	 * @return Thread
-	 */
-	private static Thread getJavaThread() {
-
-		Thread thread1 = new Thread() {
-
-			public void run() {
-
-				/*
-				 * The body of the run method assumes that workbench must be
-				 * running. Hence, it will be executed on platform's UI thread.
-				 */
-				PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
-
-					public void run() {
-						try {
-							doRun();
-							///////////////////////////////////////////////////////////////////////////////
-							//                            IWorkbench workBench = PlatformUI.getWorkbench();
-							//
-							//                            IWorkbenchWindow workbenchwindow =
-							//                                workBench.getActiveWorkbenchWindow();
-							//
-							//                            IWorkbenchPage page =
-							//                                workbenchwindow.getActivePage();
-							//
-							//                            IViewReference[] parts = page.getViewReferences();
-							//
-							//                            for (int i = 0; i < parts.length; i++) {
-							//                                // Refresh each part of the active page
-							//                                IWorkbenchPart part = parts[i].getPart(false);
-							//
-							//                                if (part != null) {
-							//                                    ISelectionProvider selectionProvider =
-							//                                        part.getSite().getSelectionProvider();
-							//
-							//                                    if (selectionProvider != null) {
-							//                                        ISelection selection =
-							//                                            selectionProvider.getSelection();
-							//                                        selectionProvider.setSelection(
-							//                                            StructuredSelection.EMPTY);
-							//                                        selectionProvider.setSelection(
-							//                                            selection);
-							//                                    }
-							//                                }
-							//                            }
-							///////////////////////////////////////////////////////////////////////////////
-							SelectionRefresher.finishedRefresh();
-
-						} catch (NullPointerException e) {
-							/*try catch is done so that if any of the variable
-							  in try clause is null, the program will not crash.
-							  This also means that no selection change will 
-							  occur. which also means that no properties will be
-							  refreshed.*/
-							Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "getJavaThread", e); //$NON-NLS-1$
-							Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.SERVICE_FAILURE, "getJavaThread", e); //$NON-NLS-1$
-						}
-					}
-				});
-			}
-
-		};
-		return thread1;
-	}
-
-	
-    /**
-     * This method forces a selection refresh to null back again to selection 
-     * previously held.
-     */
-    public synchronized static void forceSelectionRefresh() {
-		IWorkbench workBench = PlatformUI.getWorkbench();
-
-		IWorkbenchWindow workbenchwindow = workBench.getActiveWorkbenchWindow();
-
-		IWorkbenchPage page = workbenchwindow.getActivePage();
-
-        if (page != null){
-            IWorkbenchPart part = page.getActivePart();
-            
-            if (part != null){
-                ISelectionProvider selectionProvider =
-                    part.getSite().getSelectionProvider();
-
-                if (selectionProvider != null) {
-                    ISelection selection = selectionProvider.getSelection();
-                    selectionProvider.setSelection(StructuredSelection.EMPTY);
-                    selectionProvider.setSelection(selection);
-                }
-            }
-        }
-    }
-
-        
-           
-    /**
-     * Retrives the current ISelection
-     * @return ISelection The current selection.  Null if no selection is set.
-     */
-    public static ISelection getCurrentSelection(){
-        IWorkbench workBench = PlatformUI.getWorkbench();
-
-        IWorkbenchWindow workbenchwindow = workBench.getActiveWorkbenchWindow();
-
-        IWorkbenchPage page = workbenchwindow.getActivePage();
-
-        if (page != null){
-            IWorkbenchPart part = page.getActivePart();
-            
-            if (part != null){
-                ISelectionProvider selectionProvider =
-                    part.getSite().getSelectionProvider();
-
-                if (selectionProvider != null) {
-                    return selectionProvider.getSelection();
-                }
-            }
-        }
-        return null;
-    }
-        
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ShiftedImageDescriptor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ShiftedImageDescriptor.java
deleted file mode 100644
index 1bbe8d7..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/ShiftedImageDescriptor.java
+++ /dev/null
@@ -1,104 +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.util;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * An image descriptor that is cached and shifted from the left or from the
- * top or both.  The shifted area contains the original image and the area
- * on the left or top contains a background color.  Both the original image
- * and background color are specified in the constructor.
- * 
- * @author wdiu, Wayne Diu
- */
-public class ShiftedImageDescriptor
-	extends CompositeImageDescriptor {
-
-	/**
-	 * The cached size of the shifted image
-	 */
-	private Point size = null;
-
-	/**
-	 * How much to shift from the left
-	 */
-	private short shiftX = 0;
-
-	/**
-	 * How much to shift from the top
-	 */
-	private short shiftY = 0;
-
-	/**
-	 * Original image data for the image that will be shifted
-	 */
-	private ImageData imageData = null;
-
-	/**
-	 * Make a new image descriptor of an image that is shifted.
-	 * 
-	 * @param shiftX
-	 *            how much to shift from the left
-	 * @param shiftY
-	 *            how much to shift from the top
-	 * @param imageDescriptor
-	 *            original image to shift by shiftX and shiftY
-	 */
-	public ShiftedImageDescriptor(short shiftX, short shiftY,
-		ImageDescriptor imageDescriptor) {
-
-		assert (shiftX >= 0);
-		assert (shiftY >= 0);
-		assert (imageDescriptor.getImageData().width >= 0);
-		assert (imageDescriptor.getImageData().height >= 0);
-		assert null != imageDescriptor;
-
-		this.shiftX = shiftX;
-		this.shiftY = shiftY;
-		this.imageData = imageDescriptor.getImageData();
-	}
-
-	/**
-	 * Draw the image in the shifted position
-	 * 
-	 * @param width
-	 *            int ignored
-	 * @param height
-	 *            int ignored
-	 * 
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int,
-	 *      int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		drawImage(imageData, shiftX, shiftY);
-
-	}
-
-	/**
-	 * Return the size of the shifted image and cache it
-	 * 
-	 * @return Point with the size of the shifted image 
-	 * 
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		if (size == null) {
-			size = new Point(imageData.width + shiftX, imageData.height
-				+ shiftY);
-		}
-		return size;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/StatusLineUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/StatusLineUtil.java
deleted file mode 100644
index 578d62a..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/StatusLineUtil.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.util;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorActionBarContributor;
-
-/**
- * Utility class for outputting text to the status line
- * 
- * @author myee
- */
-public class StatusLineUtil {
-
-    private StatusLineUtil() {
-        /* private constructor */
-    }
-
-    /**
-     * Outputs an error message to the part's status line. Does nothing if the
-     * status line manager cannot be determined from the <code>part</code>.
-     * <P>
-     * Can be invoked from a non-UI thread.
-     * 
-     * @param part
-     *            the part
-     * @param errorMessage
-     *            the error message
-     */
-    public static void outputErrorMessage(IWorkbenchPart part,
-            final String errorMessage) {
-
-        final IStatusLineManager statusLineManager = getStatusLineManager(part);
-
-        if (statusLineManager == null) {
-            // can't find the status line manager
-            return;
-        }
-
-		final Display workbenchDisplay = PlatformUI.isWorkbenchRunning() ? PlatformUI
-				.getWorkbench().getDisplay()
-				: Display.getDefault();
-
-        if (workbenchDisplay.getThread() == Thread.currentThread()) {
-            // we're already on the UI thread
-            statusLineManager.setErrorMessage(errorMessage);
-        } else {
-            // we're not on the UI thread
-            workbenchDisplay.asyncExec(new Runnable() {
-
-                public void run() {
-                    statusLineManager.setErrorMessage(errorMessage);
-                }
-            });
-        }
-    }
-
-    private static IStatusLineManager getStatusLineManager(IWorkbenchPart part) {
-
-        IStatusLineManager result = null;
-
-        if (part instanceof IViewPart) {
-            IViewPart viewPart = (IViewPart) part;
-            result = viewPart.getViewSite().getActionBars()
-                .getStatusLineManager();
-
-        } else if (part instanceof IEditorPart) {
-            IEditorPart editorPart = (IEditorPart) part;
-
-            IEditorActionBarContributor contributor = editorPart
-                .getEditorSite().getActionBarContributor();
-
-            if (contributor instanceof EditorActionBarContributor) {
-                result = ((EditorActionBarContributor) contributor)
-                    .getActionBars().getStatusLineManager();
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/TreeInlineTextEditor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/TreeInlineTextEditor.java
deleted file mode 100644
index fdfe5a7..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/TreeInlineTextEditor.java
+++ /dev/null
@@ -1,771 +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.ui.util;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TreeEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.contentassist.ContentAssistHandler;
-
-import org.eclipse.gmf.runtime.common.ui.contentassist.ContentAssistantHelper;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-
-/**
- * A class that enables inline-text editing for tree nodes
- * 
- * @author Yasser Lulu
- *  
- */
-
-public class TreeInlineTextEditor {
-
-	/**
-	 * a tree editor used to aid in editing the nodes
-	 */
-	private TreeEditor treeEditor;
-
-	/**
-	 * the tree whose nodes are being edited
-	 */
-	private Tree tree;
-
-	/**
-	 * a text widget displayed to enable user string input
-	 */
-	private Text textEditor;
-
-	/**
-	 * a composite parent for the text widget
-	 */
-	private Composite textEditorParent;
-
-	/**
-	 * a zero size rectangle to force the text widget to disappear from screen
-	 * when ending editing
-	 */
-	private static final Rectangle nullRectangle = new Rectangle(0, 0, 0, 0);
-
-	/**
-	 * the final text entered and commited by the user
-	 */
-	private String finalText;
-
-	/**
-	 * the initial string displayed when editing started
-	 */
-	private String initialText;
-
-	/**
-	 * the edit string source and sink
-	 */
-	private IEditStringProvider editStringProvider;
-
-	/**
-	 * the tree item currently being edited
-	 */
-	private TreeItem treeItem;
-
-	/**
-	 * the viewer encapsulating the tree to edit
-	 */
-	private TreeViewer viewer;
-
-	/**
-	 * the text action hanndler
-	 */
-	private IInlineTextActionHandler textActionHandler;
-
-	/**
-	 * flag for disabling F2
-	 */
-	private boolean isF2disabled;
-
-	/**
-	 * A semaphore that prevents re-entrance into the endEdit() behavior.
-	 */
-	private volatile boolean inEndEdit;
-
-	/**
-	 * content assistant handler
-	 */
-	private ContentAssistHandler contentAssistHandler = null;
-
-	/**
-	 * content assist background color
-	 */
-	private Color proposalPopupBackgroundColor;
-
-	/**
-	 * content assist foreground color
-	 */
-	private Color proposalPopupForegroundColor;
-
-	/**
-	 * Returns the isF2disabled.
-	 * 
-	 * @return boolean
-	 */
-	private boolean isF2disabled() {
-		return isF2disabled;
-	}
-
-	/**
-	 * Sets the isF2disabled.
-	 * 
-	 * @param isF2disabled
-	 *            The isF2disabled to set
-	 */
-	private void setIsF2disabled(boolean isF2disabled) {
-		this.isF2disabled = isF2disabled;
-	}
-
-	/**
-	 * returns the tree viewer
-	 * 
-	 * @return TreeViewer
-	 */
-	private TreeViewer getTreeViewer() {
-		return viewer;
-	}
-
-	/**
-	 * sets the tree viewer
-	 * 
-	 * @param viewer
-	 *            the TreeViewer to set
-	 */
-	private void setTreeViewer(TreeViewer viewer) {
-		this.viewer = viewer;
-	}
-
-	/**
-	 * return the currently edited tree item, null if none
-	 * 
-	 * @return TreeItem the tree-item currently being edited or null if none
-	 */
-	private TreeItem getTreeItem() {
-		return treeItem;
-	}
-
-	/**
-	 * returns the edit string provider
-	 * 
-	 * @return IEditStringProvider theedit string provider
-	 */
-	private IEditStringProvider getEditStringProvider() {
-		return editStringProvider;
-	}
-
-	/**
-	 * return the tree-editor
-	 * 
-	 * @return TreeEditor the tree-editor
-	 */
-	private TreeEditor getTreeEditor() {
-		return treeEditor;
-	}
-
-	/**
-	 * sets the tree-editor
-	 * 
-	 * @param treeEditor
-	 *            The TreeEditor
-	 */
-	private void setTreeEditor(TreeEditor treeEditor) {
-		this.treeEditor = treeEditor;
-	}
-
-	/**
-	 * Constructor for TreeInlineTextEditor.
-	 */
-	public TreeInlineTextEditor(TreeViewer treeViewer, IActionBars actionBars,
-			List disableActionsIds, IEditStringProvider editStringProvider) {
-		this(treeViewer, editStringProvider, false);
-		initTextActionHandler(actionBars, disableActionsIds);
-	}
-
-	/**
-	 * Constructor for TreeInlineTextEditor.
-	 * 
-	 * @param treeViewer the tree viewer
-	 * @param editStringProvider
-	 * @param isF2disabled boolean flag indicating whether F2 is disabled
-	 */
-	public TreeInlineTextEditor(TreeViewer treeViewer,
-			IEditStringProvider editStringProvider, boolean isF2disabled) {
-		setTreeViewer(treeViewer);
-		setTree(treeViewer.getTree());
-		setIsF2disabled(isF2disabled);
-		setEditStringProvider(editStringProvider);
-		createControl();
-		init();
-	}
-
-	/**
-	 * answers whether this inline-editor has been disposed
-	 * 
-	 * @return boolean indicating its dispose status
-	 */
-	public boolean isDisposed() {
-		return ((getTextEditorParent() == null) || (getTextEditorParent()
-			.isDisposed()));
-	}
-
-	/**
-	 * answers if we can start editing
-	 * 
-	 * @return boolean indicating if we can start editing
-	 */
-	public boolean canEdit() {
-		return ((isDisposed() == false) && (getTree().isDisposed() == false)
-			&& (getTree().getEnabled()) && (getTree().getVisible()) && (isSelectedItemEditable()));
-	}
-
-	/**
-	 * Answers whether the currently selected tree-item meets all the editablity
-	 * criteria
-	 * 
-	 * @return boolean true if editable, false otherwise
-	 */
-	private boolean isSelectedItemEditable() {
-		return ((getTree().getSelection().length == 1)
-			&& (getTree().getSelection()[0].isDisposed() == false)
-			&& (getTree().getSelection()[0].getData() != null) && getEditStringProvider()
-			.canEdit(getTree().getSelection()[0].getData()));
-	}
-
-	/**
-	 * starts the editing process
-	 */
-	public void startEdit() {
-		while (Display.getCurrent().readAndDispatch()) {
-			// process handler.setEnabled(false) queued in
-			// hide() before re-entering content assist mode
-		}
-
-		if (canEdit()) {
-			cancelEdit();
-			setTreeItem(getTree().getSelection()[0]);
-			setInitialText(getEditStringProvider().getEditString(
-				getTreeItem().getData()));
-			getTextEditor().setText(getInitialText());
-			getTreeEditor().setItem(getTreeItem());
-
-			show();
-		}
-	}
-
-	/**
-	 * cancels the editing process
-	 */
-	public void cancelEdit() {
-		if (canProceed()) {
-			hide();
-		}
-	}
-
-	/**
-	 * ends the editing process
-	 */
-	public void endEdit() {
-		if (inEndEdit) {
-			// prevent re-entrance into this method when we are already
-			//   ending the edit. This prevents, in particular, the focus
-			//   listener from ending the edit while we are ending it
-			return;
-		}
-
-		inEndEdit = true;
-		try {
-			if (canProceed()) {
-				setFinalText(getCurrentText());
-				if (getFinalText().equals(getInitialText()) == false) {
-					final Object obj = getTreeItem().getData();
-					getEditStringProvider().setEditString(
-						obj, getFinalText());
-					// Hide first so that the focus change when the dialog opens
-					// doesn't attempt to re-enter "endEdit()".
-					
-					//RATLC00529737
-					//ask the label-provider to the update tree-node's label in order to
-					//display the newly entered name  
-					getTreeItem().getDisplay().asyncExec(new Runnable() {
-
-						public void run() {
-							if (!isDisposed()) {
-								getTreeViewer().update(obj, null);
-							}
-						}
-					});
-					hide();
-				} else {
-					hide();
-				}
-			}
-		} finally {
-			inEndEdit = false;
-		}
-	}
-
-	/**
-	 * Opens an error dialog for the specified status object.
-	 * 
-	 * @param status
-	 *            The status object for which to open an error dialog.
-	 *  
-	 */
-	protected void openErrorDialog(IStatus status) {
-		ErrorDialog.openError(getShell(), CommonUIMessages.TreeInlineTextEditor_errorDialogTitle, null, status);
-	}
-
-	private Shell getShell() {
-		return getTree().getShell();
-	}
-
-	/**
-	 * answers if it is ok to continue operation
-	 * 
-	 * @return boolean indicating if it is ok to continue operation
-	 */
-	private boolean canProceed() {
-		return isDisposed() == false && getTreeItem() != null
-				&& !getTreeItem().isDisposed();
-	}
-
-	/**
-	 * displays the text editing widget
-	 */
-	private void show() {
-		uninstallContentAssist(false);
-
-		if (getTreeItem() != null) {
-			IContentAssistProcessor processor = getEditStringProvider()
-				.getCompletionProcessor(getTreeItem().getData());
-			if (processor != null) {
-				// install content assist
-				contentAssistHandler = ContentAssistantHelper
-					.createTextContentAssistant(getTextEditor(),
-						proposalPopupForegroundColor,
-						proposalPopupBackgroundColor, processor);
-			}
-		}
-        getTextEditorParent().setEnabled(true);
-		getTextEditorParent().setVisible(true);
-        getTextEditor().setEnabled(true);
-        getTextEditor().setVisible(true);
-		adjustTextEditorBounds();
-		getTextEditorParent().redraw();
-		getTextEditor().selectAll();
-		getTextEditor().setFocus();
-
-		if (getTextActionHandler() != null) {
-			getTextActionHandler().hookHandlers();
-		}
-	}
-
-	/**
-	 * hides the text editing widget
-	 */
-	private void hide() {
-		setTreeItem(null);
-		getTreeEditor().setItem(null);
-		
-        getTextEditor().setVisible(false);
-        getTextEditor().setEnabled(false);
-		
-        getTextEditorParent().setBounds(getNullRectangle());
-        getTextEditorParent().setVisible(false);
-        getTextEditorParent().setEnabled(false);
-        
-		if (getTextActionHandler() != null) {
-			getTextActionHandler().unHookHandlers();
-		}
-
-		uninstallContentAssist(true);
-	}
-
-	/**
-	 * Uninstalls content assist on the text widget, if installed
-	 * 
-	 * @param fork
-	 *            whether to queue the uninstall or not
-	 */
-	private void uninstallContentAssist(boolean fork) {
-		if (contentAssistHandler != null) {
-			// uninstall content assist
-			final ContentAssistHandler localHandler = contentAssistHandler;
-			contentAssistHandler = null;
-			if (fork) {
-				Display.getCurrent().asyncExec(new Runnable() {
-
-					public void run() {
-						// Content Assist hack - queue disablement, otherwise
-						// cleanup on focus lost won't happen
-						localHandler.setEnabled(false);
-
-					}
-				});
-			} else {
-				localHandler.setEnabled(false);
-			}
-		}
-	}
-
-	/**
-	 * Disposes the text widget and reset the editorText field. 
-	 * It becomes unreusable afterwards
-	 */
-	public void dispose() {
-		if (getTextEditorParent() != null) {
-			if (getTextActionHandler() != null) {
-				getTextActionHandler().dispose();
-			}
-			setTextActionHandler(null);
-			setTextEditorParent(null);
-			setTextEditor(null);
-			getTreeEditor().setEditor(null, null);
-			setTreeEditor(null);
-			setTree(null);
-
-			proposalPopupBackgroundColor.dispose();
-			proposalPopupForegroundColor.dispose();
-		}
-	}
-
-	/**
-	 * creates the text widget and its parent composite
-	 */
-	private void createControl() {
-		setTextEditorParent(new Composite(getTree(), SWT.NONE));
-		setTreeEditor(new TreeEditor(getTree()));
-		getTreeEditor().horizontalAlignment = SWT.LEFT;
-		getTreeEditor().grabHorizontal = true;
-		getTreeEditor().setEditor(getTextEditorParent(), null);
-		getTextEditorParent().setVisible(false);
-		setTextEditor(new Text(getTextEditorParent(), SWT.NONE));
-		getTextEditorParent().setBackground(getTextEditor().getBackground());
-
-		proposalPopupBackgroundColor = new Color(getShell().getDisplay(),
-			new RGB(254, 241, 233));
-		proposalPopupForegroundColor = new Color(getShell().getDisplay(),
-			new RGB(0, 0, 0));
-
-	}
-
-	/**
-	 * initializes the controls and listeners needed to manage the editing
-	 * process
-	 */
-	private void init() {
-		getTextEditorParent().addListener(SWT.Paint, new Listener() {
-
-			public void handleEvent(Event e) {
-				Point textSize = getTextEditor().getSize();
-				Point parentSize = getTextEditorParent().getSize();
-				e.gc.drawRectangle(0, 0, Math.min(textSize.x + 4,
-					parentSize.x - 1), parentSize.y - 1);
-			}
-		});
-
-		getTextEditor().addListener(SWT.Modify, new Listener() {
-
-			public void handleEvent(Event e) {
-				adjustTextEditorBounds();
-				getTextEditorParent().redraw();
-			}
-		});
-
-		getTextEditor().addKeyListener(new KeyAdapter() {
-
-			public void keyReleased(KeyEvent event) {
-				if (event.character == SWT.CR) {
-					endEdit();
-				} else if (event.character == SWT.ESC) {
-					cancelEdit();
-				}
-			}
-		});
-
-		getTextEditor().addFocusListener(new FocusAdapter() {
-
-			public void focusGained(FocusEvent e) {
-				return;
-			}
-
-			public void focusLost(FocusEvent fe) {
-				Shell activeShell = fe.display.getActiveShell();
-				if (activeShell != null
-					&& getTextEditor().getShell().equals(
-						activeShell.getParent())) {
-					/*
-					 * CONTENT ASSIST: focus is lost to the content assist pop
-					 * up - stay in focus
-					 */
-					return;
-				}
-
-				if ((getTreeViewer().getSelection().isEmpty() == false)
-					&& canProceed()) {
-					final Object obj = getTreeItem().getData();
-					getTreeItem().getDisplay().asyncExec(new Runnable() {
-
-						public void run() {
-							if (!isDisposed()) {
-								getTreeViewer().update(obj, null);
-							}
-						}
-					});
-				}
-				endEdit();
-			}
-		});
-
-		getTreeViewer().addSelectionChangedListener(
-			new ISelectionChangedListener() {
-
-				public void selectionChanged(SelectionChangedEvent event) {
-					cancelEdit();
-				}
-			});
-
-		if (!isF2disabled()) {
-			getTree().addKeyListener(new KeyAdapter() {
-
-				public void keyReleased(KeyEvent event) {
-					if (event.keyCode == SWT.F2) {
-						startEdit();
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * initializes the text action handlers
-	 * 
-	 * @param actionBars
-	 *            The IActionBars for the view-site to retarget global
-	 *            edit-cut-copy events for the text box
-	 * @param disableActionsIds
-	 *            a List of global actions ids that are non-Eclipse and which
-	 *            we'll have to disable
-	 */
-	private void initTextActionHandler(IActionBars actionBars,
-			List disableActionsIds) {
-		if (actionBars == null) {
-			return;
-		}
-
-		actionBars.getMenuManager().addMenuListener(new IMenuListener() {
-
-			public void menuAboutToShow(IMenuManager manager) {
-				cancelEdit();
-			}
-		});
-
-		setTextActionHandler(new InlineTextActionHandler(actionBars,
-			getTextEditor(), disableActionsIds));
-
-	}
-
-	/**
-	 * adjusts the bounds of the text widget
-	 */
-	private void adjustTextEditorBounds() {
-		Point textSize = getTextEditor().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		textSize.x += textSize.y; // increase width a little
-		Point parentSize = getTextEditorParent().getSize();
-		getTextEditor().setBounds(2, 1, Math.min(textSize.x, parentSize.x - 4),
-			parentSize.y - 2);
-	}
-
-	/**
-	 * Get the Tree being edited.
-	 * 
-	 * @returnTree
-	 */
-	private Tree getTree() {
-		return tree;
-	}
-
-	/**
-	 * return the current text
-	 * 
-	 * @return String the text currently in the text widget, or null if it is
-	 *         disposed already
-	 */
-	public String getCurrentText() {
-		return (canProceed()) ? getTextEditor().getText()
-			: null;
-	}
-
-	/**
-	 * returns the initial value when editing started
-	 * 
-	 * @return String the last initial value used when editing last started
-	 */
-	public String getInitialText() {
-		return initialText;
-	}
-
-	/**
-	 * returns the comitted string by the user when editing ended (not-canclled)
-	 * 
-	 * @return String the comitted string by the user
-	 */
-	public String getFinalText() {
-		return finalText;
-	}
-
-	/**
-	 * returns the text widget
-	 * 
-	 * @return Text the text widget used for editing
-	 */
-	private Text getTextEditor() {
-		return textEditor;
-	}
-
-	/**
-	 * returns the text widget parent composite
-	 * 
-	 * @return Composite text widget parent composite
-	 */
-	private Composite getTextEditorParent() {
-		return textEditorParent;
-	}
-
-	/**
-	 * Sets the editStringProvider.
-	 * 
-	 * @param editStringProvider
-	 *            The editStringProvider to set
-	 */
-	private void setEditStringProvider(IEditStringProvider editStringProvider) {
-		this.editStringProvider = editStringProvider;
-	}
-
-	/**
-	 * Sets the textEditor.
-	 * 
-	 * @param textEditor
-	 *            The textEditor to set
-	 */
-	private void setTextEditor(Text textEditor) {
-		this.textEditor = textEditor;
-	}
-
-	/**
-	 * Sets the textEditorParent.
-	 * 
-	 * @param textEditorParent
-	 *            The textEditorParent to set
-	 */
-	private void setTextEditorParent(Composite textEditorParent) {
-		this.textEditorParent = textEditorParent;
-	}
-
-	/**
-	 * Sets the tree.
-	 * 
-	 * @param tree
-	 *            The tree to set
-	 */
-	private void setTree(Tree tree) {
-		this.tree = tree;
-	}
-
-	/**
-	 * Sets the treeItem.
-	 * 
-	 * @param treeItem
-	 *            The treeItem to set
-	 */
-	private void setTreeItem(TreeItem treeItem) {
-		this.treeItem = treeItem;
-	}
-
-	/**
-	 * Returns the nullRectangle.
-	 * 
-	 * @return Rectangle
-	 */
-	private Rectangle getNullRectangle() {
-		return nullRectangle;
-	}
-
-	/**
-	 * Sets the finalText.
-	 * 
-	 * @param finalText
-	 *            The finalText to set
-	 */
-	private void setFinalText(String finalText) {
-		this.finalText = finalText;
-	}
-
-	/**
-	 * Sets the initialText.
-	 * 
-	 * @param initialText
-	 *            The initialText to set
-	 */
-	private void setInitialText(String initialText) {
-		this.initialText = initialText;
-	}
-
-	/**
-	 * Returns the textActionHandler.
-	 * 
-	 * @return TextActionHandler
-	 */
-	private IInlineTextActionHandler getTextActionHandler() {
-		return textActionHandler;
-	}
-
-	/**
-	 * Sets the textActionHandler.
-	 * 
-	 * @param textActionHandler
-	 *            The textActionHandler to set
-	 */
-	private void setTextActionHandler(IInlineTextActionHandler textActionHandler) {
-		this.textActionHandler = textActionHandler;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java
deleted file mode 100644
index e40e8bf..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/UIModificationValidator.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.command.IModificationValidator;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator.ISyncExecHelper;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;
-import org.eclipse.gmf.runtime.common.ui.resources.FileModificationValidator;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A validator responsible for doing the actual validation on files. The
- * validation determines whether files may be modified. It delegates to
- * IWorkspace's validateEdit and supplies a UI context from the active shell if
- * available.
- * 
- * @author wdiu, Wayne Diu
- */
-public class UIModificationValidator
-	implements IModificationValidator {
-
-    /**
-     * Window listener
-     */
-    private WindowListener listener;
-    
-    /**
-     * Window listener to obtain the active shell
-     * 
-     * @author wdiu, Wayne Diu
-     */
-    private class WindowListener implements IWindowListener {
-        /**
-         * A shell that can be specified as a parameter in the constructor
-         */
-        protected Shell shell;
-        
-        /* (non-Javadoc)
-         * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-         */
-        public void windowActivated(IWorkbenchWindow window) {
-            shell = window.getShell();
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-         */
-        public void windowClosed(IWorkbenchWindow window) {
-            //do nothing
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-         */
-        public void windowDeactivated(IWorkbenchWindow window) {
-            //do nothing
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-         */
-        public void windowOpened(IWorkbenchWindow window) {
-            //do nothing
-        }
-        
-        /**
-         * Constructor that takes a shell
-         * @param theShell initial active shell
-         */
-        public WindowListener(Shell theShell) {
-            this.shell = theShell;
-        }
-        
-        /**
-         * Returns the active shell
-         * @return active Shell
-         */
-        public Shell getShell() {
-            return shell;
-        }
-    }
-    
-	/**
-	 * Error status code. The OK status code is defined by Eclipse's Status
-	 * class.
-	 */
-	private static final Status ERROR_STATUS = new Status(Status.ERROR,
-		Platform.PI_RUNTIME, 1, StringStatics.BLANK, null);
-
-    /**
-     * Constructs a UI modification validator and initializes the UI context
-     */
-	public UIModificationValidator() {
-		if (PlatformUI.isWorkbenchRunning()) {
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-
-					if (PlatformUI.isWorkbenchRunning()) {
-						IWorkbenchWindow window = PlatformUI.getWorkbench()
-								.getActiveWorkbenchWindow();
-						Shell shell = window == null ? null : window.getShell();
-						listener = new WindowListener(shell);
-						PlatformUI.getWorkbench().addWindowListener(listener);
-					}
-				}
-			});
-		}
-	}
-            
-   /**
-    *  Helper class that allows us to return status information 
-    *  in addition to providing the option of clearing the 
-    *  shell variable before running doValidate().
-    *  
-    * @author James Bruck (jbruck)
-    */
-    class RunnableWithStatus implements Runnable {
-
-		private final IFile[] files;
-		private IStatus status;
-		private Shell shell;
-		
-		RunnableWithStatus(IFile[] files, Shell shell) {
-			this.files = files;
-			this.shell = shell;
-		}
-
-		public void run() {
-			status = doValidateEdit(files, shell);
-		}
-		public IStatus getResult() {
-			return status;
-		}
-		
-		public void setShell(Shell shell) {
-			this.shell = shell;
-		}
-	}
-        
-    /**
-     * This is the where the real call to validate the files takes place.
-     * 
-     * @param files list of files to validate.
-     * @param shell the shell to use when displaying error messages.
-     * @return the status indicating whether the validate succeeded or not.
-     */
-    protected IStatus doValidateEdit(IFile[] files, Shell shell) {
-
-		boolean ok = FileModificationValidator.getInstance().okToEdit(files,
-				CommonUIMessages.UIModificationValidator_ModificationMessage,
-				shell);
-		return ok ? Status.OK_STATUS : ERROR_STATUS;
-	}
-	    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.core.command.IModificationValidator#validateEdit(org.eclipse.core.resources.IFile[])
-     */
-    public IStatus validateEdit(IFile[] files) {
-
-		Shell shell = listener == null ? null : listener.getShell();
-		RunnableWithStatus r = new RunnableWithStatus(files, shell);
-		Display display = DisplayUtils.getDisplay();
-
-		ISyncExecHelper syncExecHelper = org.eclipse.gmf.runtime.common.core.command.FileModificationValidator.SyncExecHelper
-				.getInstance();
-
-		if (ModalContext.isModalContextThread(Thread.currentThread())) {
-			Runnable safeRunnable = syncExecHelper.safeRunnable(r);
-			if( safeRunnable != null){
-				display.syncExec(safeRunnable);
-			} else {
-				r.run();
-			}
-		} else {
-			if (display == null) {
-				r.setShell(null);
-			}
-			r.run();
-		}
-		return r.getResult();
-	}
-    
-    /**
-	 * Disposes this UI modification validator.
-	 */
-    public void dispose() {
-        if (listener != null) {
-        	DisplayUtils.getDisplay().asyncExec(new Runnable() {
-                public void run() {
-                    PlatformUI.getWorkbench().removeWindowListener(listener);
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WindowUtil.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WindowUtil.java
deleted file mode 100644
index 6e960dd..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WindowUtil.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.util;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.util.Geometry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Monitor;
-import org.eclipse.swt.widgets.Shell;
-
-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.internal.CommonUIDebugOptions;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;
-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;
-
-/**
- * Utilities for windows.
- * 
- * There are also several utility methods that can be used on controls in a
- * window.
- * 
- * @author wdiu, Wayne Diu
- */
-public class WindowUtil {	
-	/**
-	 * Center the dialog relative to a parent window.
-	 * @param dialogShell contains the dialog to center
-	 * @param parentShell contains the window to center relative to
-	 */
-	public static void centerDialog(Shell dialogShell, Shell parentShell) {
-		try {
-			Point dialogSize = dialogShell.getSize();
-			//don't use Display and then get shell from there, since
-			//we are trying to find the shell of the whole Eclipse window
-			Point windowLocation = parentShell.getLocation();
-			Point windowSize = parentShell.getSize();
-			//do not take the absolute value.
-			dialogShell.setLocation(
-				((windowSize.x - dialogSize.x) / 2) + windowLocation.x,
-				((windowSize.y - dialogSize.y) / 2) + windowLocation.y);
-		} catch (Exception e) {
-			//any exception when centering a dialog may be ignored
-			Trace.catching(CommonUIPlugin.getDefault(), CommonUIDebugOptions.EXCEPTIONS_CATCHING, WindowUtil.class, "Failed to center dialog", e); //$NON-NLS-1$
-            Log.error(CommonUIPlugin.getDefault(), CommonUIStatusCodes.GENERAL_UI_FAILURE, "Failed to center dialog", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Calculates the position of a window so that it does not run off the
-	 * screen while taking given initLocation into account. Also, if lowerY is
-	 * greater than -1 it takes that into account: if the window is moved above
-	 * requested initLocation.y, than it has to be completely above lowerY. This
-	 * is needed, for example, when the window is opened by clicking on the
-	 * button and we don't wont the button to be hidden by this popup.
-	 * 
-	 * @param shell
-	 *            Window shell
-	 * @param initLocation
-	 *            the initial location;
-	 * @param lowerY
-	 *            if -1, it is ignored; otherwise, if popup is moved up, it has
-	 *            to be completely above lowerY
-	 * @return Constrained location
-	 * @since 1.2
-	 */
-	public static Point constrainWindowLocation(Shell shell,
-			Point initLocation, int lowerY) {
-		// First, find the (closest) monitor that contains the popup
-		Monitor[] monitors = shell.getDisplay().getMonitors();
-		int closest = Integer.MAX_VALUE;
-		Monitor closestMonitor = monitors[0];
-		Rectangle windowBounds = shell.getBounds();
-		Point toFind = Geometry.centerPoint(windowBounds);
-		for (int idx = 0; idx < monitors.length; idx++) {
-			Monitor current = monitors[idx];
-			Rectangle clientArea = current.getClientArea();
-			if (clientArea.contains(toFind)) {
-				closestMonitor = current;
-				break;
-			}
-			int distance = Geometry.distanceSquared(Geometry
-					.centerPoint(clientArea), toFind);
-			if (distance < closest) {
-				closest = distance;
-				closestMonitor = current;
-			}
-		}
-		Rectangle monitorBounds = closestMonitor.getClientArea();
-		// Find location that ensures that popup stays within the screen.
-		int windowX = Math.max(monitorBounds.x, Math.min(initLocation.x,
-				monitorBounds.x + monitorBounds.width - windowBounds.width));
-		int windowY = Math.max(monitorBounds.y, Math.min(initLocation.y,
-				monitorBounds.y + monitorBounds.height - windowBounds.height));
-
-		if (lowerY > -1 && windowY < initLocation.y
-				&& windowY + windowBounds.height > lowerY) {
-			// popup is moved up and is hiding part or all of the button (or
-			// another control that launched the window);
-			// make sure it is completely above the button
-			windowY = lowerY - windowBounds.height;
-		}
-		return new Point(windowX, windowY);
-	}
-
-	/**
-	 * Dispose a parent's children
-	 * 
-	 * @param parent composite containing children to be disposed.
-	 */
-	public static void disposeChildren(Composite parent) {
-		Control[] children = parent.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].dispose();
-		}
-	}
-
-	/**
-	 * Returns height and width data in a GridData for the button that was
-	 * passed in.  You can call button.setLayoutData with the returned
-	 * data.
-	 * 
-	 * @param button which has already been made.  We'll be making the
-	 * GridData for this button, so be sure that the text has already
-	 * been set.
-	 * @return GridData for this button with the suggested height and width
-	 */
-	public static GridData makeButtonData(Button button) {
-		GC gc = new GC(button);
-		gc.setFont(button.getFont());
-
-		GridData data = new GridData();
-		data.heightHint =
-			Dialog.convertVerticalDLUsToPixels(
-				gc.getFontMetrics(),
-				14);
-		data.widthHint =
-			Math.max(
-				Dialog.convertHorizontalDLUsToPixels(
-					gc.getFontMetrics(),
-					IDialogConstants.BUTTON_WIDTH),
-				button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-
-		gc.dispose();
-
-		return data;
-	}
-
-	/**
-	 * Makes the GridData for a button to be a fixed size, regardless of
-	 * the contents of the button
-	 * @param button the button control that we'll make the GridData for.
-	 * @return GridData the new GridData for the button control.
-	 */
-	public static GridData makeFixedButtonData(Button button) {
-		GC gc = new GC(button);
-		gc.setFont(button.getFont());
-
-		GridData gridData = new GridData();
-
-		gridData.widthHint =
-			Dialog.convertHorizontalDLUsToPixels(
-				gc.getFontMetrics(),
-				IDialogConstants.BUTTON_WIDTH);
-
-		gridData.heightHint =
-			Dialog.convertVerticalDLUsToPixels(
-				gc.getFontMetrics(),
-				14);
-
-		gc.dispose();
-
-		return gridData;
-	}
-
-	/**
-	 * Display a message box
-	 * @param message the String message for the message box
-	 * @param title the String title for the message box
-	 * @param swtStyle the int style for the message box
-	 * @param shell the Shell for the message box, such as Display.getActive().getShell()
-	 */
-	public static void doMessageBox(
-		String message,
-		String title,
-		int swtStyle,
-		Shell shell) {
-		MessageBox messageBox = new MessageBox(shell, swtStyle);
-
-		//stuff inside
-		messageBox.setMessage(message);
-
-		//title
-		messageBox.setText(title);
-		messageBox.open();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartActivator.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartActivator.java
deleted file mode 100644
index 5141cec..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartActivator.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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.util;

-

-import java.text.MessageFormat;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IPageLayout;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.PlatformUI;

-

-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.internal.CommonUIDebugOptions;

-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIPlugin;

-import org.eclipse.gmf.runtime.common.ui.internal.CommonUIStatusCodes;

-import org.eclipse.gmf.runtime.common.ui.internal.l10n.CommonUIMessages;

-

-/**

- * This is just a helper class that is packages the steps necessary to activate

- * a view's window in convenient methods.

- * 

- * @author Yasser Lulu

- */

-public final class WorkbenchPartActivator {

-

-	/**

-	 * Inner class to perform the work of showing a workbench view in a 

-	 * runnable. Also remembers the view part that has been shown, which

-	 * can be accessed through #getViewPart().

-	 */

-	private static class ShowViewRunnable implements Runnable {

-

-		private IViewPart viewPart = null;

-		private final String viewId;

-

-		/**

-		 * Constructor.

-		 * 

-		 * @param viewId id of view to show

-		 */

-		public ShowViewRunnable(String viewId) {

-			this.viewId = viewId;

-		}

-

-		public void run() {

-			IWorkbenchWindow workbenchWindow =

-				PlatformUI.getWorkbench().getActiveWorkbenchWindow();

-			if (workbenchWindow == null) {

-				return;

-			}

-			IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();

-			if (workbenchPage == null) {

-				return;

-			}

-			try {

-				viewPart = workbenchPage.showView(viewId);

-			} catch (PartInitException pie) {

-				Trace.catching(

-					CommonUIPlugin.getDefault(),

-					CommonUIDebugOptions.EXCEPTIONS_CATCHING,

-					getClass(),

-					pie.getMessage(),

-					pie);

-				Log.warning(

-					CommonUIPlugin.getDefault(),

-					CommonUIStatusCodes.GENERAL_UI_FAILURE,

-					pie.getMessage(),

-					pie);

-				String message =

-					MessageFormat.format(

-						CommonUIMessages.WorkbenchPartActivator_ErrorMessage,

-						new Object[] { viewId });

-				ErrorDialog.openError(

-					Display.getCurrent().getActiveShell(),

-					null,

-					message,

-					new Status(

-						IStatus.ERROR,

-						CommonUIPlugin.getPluginId(),

-						CommonUIStatusCodes.GENERAL_UI_FAILURE,

-						pie.getLocalizedMessage(),

-						pie));

-			}

-		}

-

-		/**

-		 * Retrieve a view part.

-		 * 

-		 * @return the <code>IViewPart</code>

-		 */

-		public IViewPart getViewPart() {

-			return viewPart;

-		}

-	}

-

-	/**

-	 * Private constructor to prevent instantiation

-	 */

-	private WorkbenchPartActivator() {

-		 /* private constructor */

-	}

-

-	/**

-	 * The function that tries to activate the view-window in the context of the

-	 * GUI thread -which also means create the view if necessary-. 

-	 * It blocks until the view-window is activated.

-	 * 

-	 * @param viewId	The unique id of the view as registered with eclipse.

-	 * @return The view part shown, or null if no part was shown.     

-	 */

-	public static IViewPart showView(final String viewId) {

-		ShowViewRunnable runnable = new ShowViewRunnable(viewId);

-		Display.getCurrent().syncExec(runnable);

-		return runnable.getViewPart();

-	}

-

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showTaskList() {

-		return showView(IPageLayout.ID_TASK_LIST);

-	}

-

-	/**

-	 * Ensures that the Eclipse 3.0 Problems view is visible, if it is open.

-	 * 

-	 * @return The Problems view part, or null if it was not shown. 

-	 */

-	public static IViewPart showProblemView() {

-		return showView(IPageLayout.ID_PROBLEM_VIEW);

-	}

-	

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showBookmarkNavigator() {

-		return showView(IPageLayout.ID_BOOKMARKS);

-	}

-

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showEditorArea() {

-		return showView(IPageLayout.ID_EDITOR_AREA);

-	}

-

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showContentOutline() {

-		return showView(IPageLayout.ID_OUTLINE);

-	}

-

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showPropertySheet() {

-		return showView(IPageLayout.ID_PROP_SHEET);

-	}

-

-	/**

-	 * A convenience method, calls the #showView with the proper view Id.

-	 * @return The view part shown, or null if no part was shown. 

-	 */

-	public static IViewPart showResourceNavigator() {

-		return showView(IPageLayout.ID_PROJECT_EXPLORER);

-	}

-

-}

diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescirptor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescirptor.java
deleted file mode 100644
index 001fb8f..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescirptor.java
+++ /dev/null
@@ -1,27 +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.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * A standard implementation of <code>IWorkbenchPartDescriptor</code> interface
- * @author melaasar
- * @deprecated use org.eclipse.gmf.runtime.common.ui.util.WorkbenchPartDescriptor
- */
-public class WorkbenchPartDescirptor extends WorkbenchPartDescriptor {
-
-	public WorkbenchPartDescirptor(String partId, Class partClass, IWorkbenchPage partPage) {
-		super(partId, partClass, partPage);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescriptor.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescriptor.java
deleted file mode 100644
index 72e651f..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/WorkbenchPartDescriptor.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.common.ui.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * A standard implementation of <code>IWorkbenchPartDescriptor</code> interface
- * @author melaasar
- */
-public class WorkbenchPartDescriptor implements IWorkbenchPartDescriptor {
-
-	/** the part's id */
-	private final String partId;
-	/** the part's class */
-	private final Class partClass;
-	/** the part's page */
-	private final IWorkbenchPage partPage;
-
-	/**
-	 * Creates a new instance of the workbench part descriptor
-	 * 
-	 * @param partId The workbench part id
-	 * @param partClass The workbench part class
-	 * @param partPage The workbench part page
-	 */
-	public WorkbenchPartDescriptor(
-		String partId,
-		Class partClass,
-		IWorkbenchPage partPage) {
-		assert null != partId;
-		assert null != partClass;
-		assert null != partPage;
-		this.partId = partId;
-		this.partClass = partClass;
-		this.partPage = partPage;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor#getPartId()
-	 */
-	public String getPartId() {
-		return partId;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor#getPartClass()
-	 */
-	public Class getPartClass() {
-		return partClass;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor#getPartPage()
-	 */
-	public IWorkbenchPage getPartPage() {
-		return partPage;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof WorkbenchPartDescriptor) {
-			WorkbenchPartDescriptor descriptor = (WorkbenchPartDescriptor) obj;
-			return descriptor.getPartId().equals(getPartId())
-				&& descriptor.getPartClass() == getPartClass()
-				&& descriptor.getPartPage() == getPartPage();
-		}
-		return false;
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		int idCode = getPartId().hashCode();
-		int classCode = getPartClass().hashCode();
-		int pageCode = getPartPage().hashCode();
-		return (idCode + classCode + pageCode)
-			+ (idCode | ~classCode | ~pageCode);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/package.html b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/package.html
deleted file mode 100644
index ecdfb0d..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/util/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>
-
-Provides miscellaneous utility classes for the platform.
-@canBeSeenBy %partners
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/viewers/ViewerHintConstants.java b/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/viewers/ViewerHintConstants.java
deleted file mode 100644
index 6b20b91..0000000
--- a/org.eclipse.gmf.runtime.common.ui/src/org/eclipse/gmf/runtime/common/ui/viewers/ViewerHintConstants.java
+++ /dev/null
@@ -1,27 +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.viewers;
-
-/**
- * Defines viewer hint constants used by various viewers and their
- * collaborators.
- * 
- * @author dmisic
- */
-public interface ViewerHintConstants {
-
-	/**
-	 * The id for tree expansion level hint. The value associated with this id
-	 * should be an instance of Integer.
-	 */
-	static final String ID_TREE_EXPANSION_LEVEL = "org.eclipse.gmf.runtime.common.ui.viewers.TreeExpansionLevel"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.core/.classpath b/org.eclipse.gmf.runtime.diagram.core/.classpath
deleted file mode 100644
index 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 0f460d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e3e915b..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:00:05 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 12148fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +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.6.0.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.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 2a0624b..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 Modeling Project
-
-# ===============================================================================
-# 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/pom.xml b/org.eclipse.gmf.runtime.diagram.core/pom.xml
deleted file mode 100644
index 282a1bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.core</artifactId>
-  <version>1.6.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 580178e..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/schema/viewProviders.exsd
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<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">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <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. org.eclipse.gmf.runtime.diagram.core.viewProviders
-               </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:
-Lowest, Low, Medium, High, Highest. 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(plugin id)
-               </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 : pluginID/ClassName.func(param,param)
-               </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: string,string*
-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: string,string*
-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 : func(param,param*).func(param,param*)*
-               </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: string,string*
-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: string,string*
-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(plugin id)
-               </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(plugin id)
-               </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 d4ff5ce..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/DiagramEditingDomainFactory.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-						try {
-							deb.resourceSetChanged(
-									new ResourceSetChangeEvent(
-											this,
-											tx,
-											filtered));
-
-							newTx.commit();
-						} catch (RuntimeException e) {
-							// close the internal transaction that was created.
-							newTx.rollback();
-							throw e;
-						}
-					} 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());
-		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());
-		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/GroupCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/GroupCommand.java
deleted file mode 100644
index ef4b48d..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/GroupCommand.java
+++ /dev/null
@@ -1,162 +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.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.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.ViewType;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command groups node views (i.e. shapes) together. It creates a new group
- * view and reparents the nodes passed in to be children of the group. The
- * nodes' locations are also changed to be relative to the location of the
- * group.
- * 
- * @author crevells, mmostafa
- * @since 2.1
- */
-public class GroupCommand
-    extends AbstractTransactionalCommand {
-
-    private List nodes;
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param editingDomain
-     *            the editing domain
-     * @param nodes
-     *            A list of nodes (i.e. shape views) that are to be grouped. The
-     *            nodes must all have the same parent.
-     */
-    public GroupCommand(TransactionalEditingDomain editingDomain, List nodes) {
-        this(editingDomain, nodes, null);
-    }
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param editingDomain
-     *            the editing domain
-     * @param nodes
-     *            A list of nodes (i.e. shape views) that are to be grouped. The
-     *            nodes must all have the same parent.
-     * @param options
-     *            for the transaction in which this command executes, or
-     *            <code>null</code> for the default options
-     */
-    public GroupCommand(TransactionalEditingDomain editingDomain, List nodes,
-            Map options) {
-        super(editingDomain, DiagramCoreMessages.GroupCommand_Label, options,
-            getWorkspaceFiles(nodes));
-        this.nodes = nodes;
-    }
-
-    /**
-     * Creates the new group, reparents the nodes, and sets the locations of the
-     * group and nodes as appropriate.\
-     */
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        Node group = NotationFactory.eINSTANCE.createNode();
-        group.setType(ViewType.GROUP);
-        group.setElement(null);
-
-        View parentView = (View) ((View) getNodes().get(0)).eContainer();
-        parentView.getPersistedChildren().add(group);
-
-        int x = 0;
-        int y = 0;
-        boolean first = true;
-        for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-            Object view = iter.next();
-            if (view instanceof Node) {
-                LayoutConstraint layoutConstraint = ((Node) view)
-                    .getLayoutConstraint();
-                if (layoutConstraint instanceof Location) {
-                    Location location = (Location) layoutConstraint;
-                    if (first) {
-                        x = location.getX();
-                        y = location.getY();
-                        first = false;
-                    } else {
-                        if (x > location.getX())
-                            x = location.getX();
-                        if (y > location.getY())
-                            y = location.getY();
-                    }
-                }
-                group.insertChild((View) view);
-            }
-        }
-
-        Bounds groupBounds = NotationFactory.eINSTANCE.createBounds();
-        groupBounds.setX(x);
-        groupBounds.setY(y);
-        groupBounds.setWidth(-1);
-        groupBounds.setHeight(-1);
-        group.setLayoutConstraint(groupBounds);
-
-        translateChildrenLocations(x, y);
-        return CommandResult.newOKCommandResult(group);
-    }
-
-    /**
-     * Translate the location of the children to be relative to the group's
-     * location.
-     * 
-     * @param x the group's location x-value
-     * @param y the group's location y-value
-     */
-    private void translateChildrenLocations(int x, int y) {
-        if (x == 0 && y == 0)
-            return;
-        for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
-            Object view = iter.next();
-            if (view instanceof Node) {
-                LayoutConstraint layoutConstraint = ((Node) view)
-                    .getLayoutConstraint();
-                if (layoutConstraint instanceof Location) {
-                    Location location = (Location) layoutConstraint;
-                    location.setX(location.getX() - x);
-                    location.setY(location.getY() - y);
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the list of nodes to be grouped.
-     * 
-     * @return the list of nodes to be grouped
-     */
-    protected List getNodes() {
-        return nodes;
-    }
-
-}
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 a75a565..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetConnectionEndsCommand.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-	
-	private List affectedFiles;
-
-	/**
-	 * 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() {
-		if (affectedFiles == null) {
-			View view = (View) edgeAdaptor.getAdapter(View.class);
-			if (view != null) {
-				affectedFiles = getWorkspaceFiles(view);
-			} else {
-				affectedFiles = super.getAffectedFiles();
-			}			
-		}
-		return affectedFiles;
-	}
-	
-	/**
-	 * 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);
-		}
-
-		setEdgeAdaptor(null);
-		setNewSourceAdaptor(null);
-		setNewTargetAdaptor(null);
-
-		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 2450670..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/SetPropertyCommand.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.common.core.util.StringStatics;
-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, StringStatics.BLANK, 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.length() != 0) ? 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/UngroupCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/UngroupCommand.java
deleted file mode 100644
index 3a9e84a..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/UngroupCommand.java
+++ /dev/null
@@ -1,123 +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.commands;
-
-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.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.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command ungroups a group view. It reparents the children of the group so
- * that their parent is the group's parent and it deletes the group view. The
- * children's locations are also changed to be relative to the location of their
- * new parent.
- * 
- * @author crevells
- * @since 2.1
- */
-public class UngroupCommand
-    extends AbstractTransactionalCommand {
-
-    private Node group;
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param editingDomain
-     *            the editing domain
-     * @param groupView
-     *            the group view to ungroup
-     */
-    public UngroupCommand(TransactionalEditingDomain editingDomain,
-            Node groupView) {
-        this(editingDomain, groupView, null);
-    }
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param editingDomain
-     *            the editing domain
-     * @param groupView
-     *            the group view to ungroup
-     * @param options
-     *            for the transaction in which this command executes, or
-     *            <code>null</code> for the default options
-     */
-    public UngroupCommand(TransactionalEditingDomain editingDomain,
-            Node group, Map options) {
-        super(editingDomain, DiagramCoreMessages.UngroupCommand_Label, options,
-            getWorkspaceFiles(group));
-        this.group = group;
-    }
-
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        translateChildrenLocations();
-
-        View parentView = (View) getGroup().eContainer();
-        if (parentView != null) {
-            parentView.getPersistedChildren().addAll(
-                getGroup().getPersistedChildren());
-        }
-        
-        DestroyElementCommand.destroy(getGroup());
-
-        return CommandResult.newOKCommandResult();
-    }
-
-    /**
-     * Translate the location of the children to no longer be relative to the
-     * group's location.
-     */
-    protected void translateChildrenLocations() {
-        Location groupLocation = (Location) getGroup().getLayoutConstraint();
-
-        for (Iterator iter = getGroup().getChildren().iterator(); iter
-            .hasNext();) {
-            Object child = iter.next();
-            if (child instanceof Node) {
-                LayoutConstraint layoutConstraint = ((Node) child)
-                    .getLayoutConstraint();
-                if (layoutConstraint instanceof Location) {
-                    Location location = (Location) layoutConstraint;
-                    location.setX(location.getX() + groupLocation.getX());
-                    location.setY(location.getY() + groupLocation.getY());
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Returns the group to be ungrouped.
-     * 
-     * @return the group to be ungrouped.
-     */
-    protected Node getGroup() {
-        return group;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/UpdateGroupLocationCommand.java b/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/UpdateGroupLocationCommand.java
deleted file mode 100644
index 9ca9722..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/commands/UpdateGroupLocationCommand.java
+++ /dev/null
@@ -1,156 +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.commands;
-
-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.emf.ecore.EObject;
-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.ViewType;
-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.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command will relocate the group so that the group's location reflects
- * the location of the top-most and left-most shape. The locations of all the
- * children will also be updated so that they are relative to the new location
- * of the group. It can be used after a shape in the group has been moved,
- * resized, or deleted.
- * 
- * @author crevells
- * @since 2.1
- */
-public class UpdateGroupLocationCommand
-    extends AbstractTransactionalCommand {
-
-    private View groupView;
-
-    /**
-     * Creates a new instance.
-     */
-    public UpdateGroupLocationCommand(TransactionalEditingDomain domain,
-            View groupView) {
-        super(domain, DiagramCoreMessages.UpdateLocation_Label,
-            getWorkspaceFiles(groupView));
-        this.groupView = groupView;
-    }
-
-    /**
-     * Gets the group view to be updated.
-     * 
-     * @return the group view
-     */
-    protected View getGroupView() {
-        return groupView;
-    }
-
-    protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        updateGroupLocation(getGroupView());
-
-        // update container groups in case of nested groups
-        EObject container = getGroupView().eContainer();
-        while (container instanceof View
-            && ViewType.GROUP.equals(((View) container).getType())) {
-            updateGroupLocation((View) container);
-            container = ((View) container).eContainer();
-        }
-        return CommandResult.newOKCommandResult();
-    }
-
-    /**
-     * Updates the group location and the children locations as required.
-     */
-    private void updateGroupLocation(View group) {
-        int minChildX = Integer.MAX_VALUE;
-        int minChildY = Integer.MAX_VALUE;
-
-        for (Iterator iterator = group.getChildren().iterator(); iterator
-            .hasNext();) {
-            View childView = (View) iterator.next();
-
-            if (childView instanceof Node) {
-                LayoutConstraint layoutConstraint = ((Node) childView)
-                    .getLayoutConstraint();
-                if (layoutConstraint instanceof Location) {
-                    Location childLocation = (Location) layoutConstraint;
-
-                    if (childLocation.getX() < minChildX) {
-                        minChildX = childLocation.getX();
-                    }
-                    if (childLocation.getY() < minChildY) {
-                        minChildY = childLocation.getY();
-                    }
-                }
-            }
-        }
-
-        if (minChildX != 0) {
-
-            // The group's x location must change and consequently all the
-            // children x locations as they are relative to the group's
-            // location.
-
-            Integer x = (Integer) ViewUtil.getStructuralFeatureValue(group,
-                NotationPackage.eINSTANCE.getLocation_X());
-            ViewUtil.setStructuralFeatureValue(group, NotationPackage.eINSTANCE
-                .getLocation_X(), new Integer(x.intValue() + minChildX));
-
-            for (Iterator iterator = group.getChildren().iterator(); iterator
-                .hasNext();) {
-                View childView = (View) iterator.next();
-                x = (Integer) ViewUtil.getStructuralFeatureValue(childView,
-                    NotationPackage.eINSTANCE.getLocation_X());
-                ViewUtil.setStructuralFeatureValue(childView,
-                    NotationPackage.eINSTANCE.getLocation_X(), new Integer(x
-                        .intValue()
-                        - minChildX));
-            }
-        }
-
-        if (minChildY != 0) {
-
-            // The group's y location must change and consequently all the
-            // children y locations as they are relative to the group's
-            // location.
-
-            Integer y = (Integer) ViewUtil.getStructuralFeatureValue(group,
-                NotationPackage.eINSTANCE.getLocation_Y());
-            ViewUtil.setStructuralFeatureValue(group, NotationPackage.eINSTANCE
-                .getLocation_Y(), new Integer(y.intValue() + minChildY));
-
-            for (Iterator iterator = group.getChildren().iterator(); iterator
-                .hasNext();) {
-                View childView = (View) iterator.next();
-                y = (Integer) ViewUtil.getStructuralFeatureValue(childView,
-                    NotationPackage.eINSTANCE.getLocation_Y());
-                ViewUtil.setStructuralFeatureValue(childView,
-                    NotationPackage.eINSTANCE.getLocation_Y(), Integer.valueOf(y
-                        .intValue()
-                        - minChildY));
-            }
-        }
-    }
-
-}
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 d7e52a1..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/NotationViewDependentsAdvice.java
+++ /dev/null
@@ -1,166 +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.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.diagram.core.commands.UngroupCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.UpdateGroupLocationCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-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()));
-				}
-			}			
-		}
-		
-		// handle deletion of groups
-        if (destructee instanceof Node) {
-            EObject parent = ((Node) destructee).eContainer();
-            if (parent instanceof Node
-                && ViewType.GROUP.equals(((Node) parent).getType())) {
-                if (((Node) parent).getChildren().size() == 2) {
-                    // There will only be one child of the group left after this
-                    // child is destroyed, so remove the group as well.
-                    result = CompositeCommand.compose(result,
-                        new UngroupCommand(request.getEditingDomain(),
-                            (Node) parent));
-                } else {
-                    // The remaining group's location may require changing after
-                    // the deletion.
-                    result = CompositeCommand.compose(result,
-                        new UpdateGroupLocationCommand(request
-                            .getEditingDomain(), (Node) parent));
-                }
-            }
-        }
-        
-		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 e3e4021..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/edithelpers/RemoveBookmarksAdvice.java
+++ /dev/null
@@ -1,180 +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.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.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;
-		
-		if(eResource instanceof XMLResource){
-			String elementID = ((XMLResource)eResource).getID(bookmarkedObject);
-
-			IMarker[] bookmarks = new IMarker[0];
-
-			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$
-			}
-
-			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;
-		} else {
-			return new HashSet();
-		}
-	}
-	
-	/**
-	 * @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 7e64ca2..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringForwardCommand.java
+++ /dev/null
@@ -1,56 +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
- */
-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 5edcdaa..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/BringToFrontCommand.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 appends it to the "Front"
- * of the list.
- * 
- * @author jschofie
- */
-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 b5d2334..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/CreateDiagramLinkCommand.java
+++ /dev/null
@@ -1,66 +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
- */
-
-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 b368cef..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/IPropertyValueDeferred.java
+++ /dev/null
@@ -1,22 +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
- *
- * 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 e87d605..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/PersistElementCommand.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.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
- * 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 e18cb1d..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendBackwardCommand.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 its current location to one step
- * closer to the "back" of the list.
- * 
- * @author jschofie
- */
-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 5d8d3ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/SendToBackCommand.java
+++ /dev/null
@@ -1,50 +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
- */
-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 25dffb0..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/commands/ZOrderCommand.java
+++ /dev/null
@@ -1,43 +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
- */
-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 73ccf46..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.java
+++ /dev/null
@@ -1,45 +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;
-    public static String UpdateLocation_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 a44d132..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/l10n/DiagramCoreMessages.properties
+++ /dev/null
@@ -1,37 +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
-UngroupCommand_Label = Ungroup
-UpdateLocation_Label = Update Location
-
-# ===============================================================================
-# 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 e6578b3..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/listener/NotationSemProc.java
+++ /dev/null
@@ -1,258 +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();
-
-			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;
-						}
-					}
-				}
-
-				((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 03d066a..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/DiagramEventBroker.java
+++ /dev/null
@@ -1,786 +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 addedObjects = NotificationUtil.getAddedObjects(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);
-                    }
-                }
-                // see bugzilla [186637]
-            	if (deleted || 
-                     (addedObjects.contains(notifier) && NotationPackage.Literals.VIEW__ELEMENT.equals(notification.getFeature()))) {
-                    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 addedObjects = NotificationUtil.getAddedObjects(event);
-        Set existingObjects = new HashSet();
-        boolean deleteElementCheckRequired = !deletedObjects.isEmpty();
-        boolean handleNotificationOnAddedElement = false;
-        boolean handleNotificationOnDeletedElement = false;
-        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) {
-                    if (deleted) {
-                        handleNotificationOnDeletedElement = true;
-                        continue;
-                    }// see bugzilla [186637]
-                    else if (addedObjects.contains(notifier) && NotationPackage.Literals.VIEW__ELEMENT.equals(notification.getFeature())){
-                        handleNotificationOnAddedElement = true;
-                        continue;
-                    }
-                }
-                fireNotification(notification);
-            }
-        }
-        if (handleNotificationOnAddedElement) {
-            handleNotificationOnAddedElement(event);
-        }
-        if (handleNotificationOnDeletedElement) {
-            handleNotificationOnDeletedElement(event);
-        }
-    }
-
-    /**
-     * This method allows clients to customize the Diagram event broker behavior when
-     * it comes to handling events on added objects.
-     * The default behavior will just ignore them
-     * @param event being handled
-     */
-    protected void handleNotificationOnAddedElement(ResourceSetChangeEvent event) {
-        // default implementation does nothing
-        
-    }
-
-    /**
-     * 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 e99b252..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/NotificationUtil.java
+++ /dev/null
@@ -1,150 +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.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;
-    }
-
-    /**
-     * Collect the added objects from all the notifications in the event.
-     * 
-     * @param event
-     * @return Set contains all added objects
-     */
-    public static Set getAddedObjects(ResourceSetChangeEvent event) {
-        HashSet addedObjects = new HashSet();
-        for (Iterator i = event.getNotifications().iterator(); i.hasNext();) {
-            Notification notification = (Notification) i.next();
-            int eventType = notification.getEventType();
-            if ((eventType == Notification.ADD_MANY)
-                || (eventType == Notification.ADD)) {
-                Object feature = notification.getFeature();
-                if (feature instanceof EReference
-                    && ((EReference) feature).isContainment()) {                    
-                    if (eventType == Notification.ADD_MANY) {
-                        // Mutli value add handling
-                        for (Iterator iter = ((Collection) notification
-                            .getNewValue()).iterator(); iter.hasNext();) {
-                            addedObjects.add(iter.next());
-                        }
-                    } else {
-                        // single value add handling
-                        addedObjects.add(notification.getNewValue());
-                    }
-                }
-            }            
-        }
-        return addedObjects;
-    }
-    
-}
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 adff876..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, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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, Integer.valueOf(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, Integer.valueOf(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(new Object[] { });
-			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 faea5db..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 dummyHint = "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 dummyHint;
-	}
-
-	/** 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 7fb52f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewRefactorHelper.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.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) {
-		if (oldNode.eIsSet(NotationPackage.eINSTANCE.getNode_LayoutConstraint())) {
-			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());
-		if (oldDiagram.eIsSet(NotationPackage.eINSTANCE.getDiagram_PersistedEdges())) {
-			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());
-		if (oldView.eIsSet(NotationPackage.eINSTANCE.getView_SourceEdges())) {
-			newView.getSourceEdges().addAll(oldView.getSourceEdges());
-		}
-		if (oldView.eIsSet(NotationPackage.eINSTANCE.getView_TargetEdges())) {
-			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);
-		copyViewAppearanceProperties(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);
-				}
-			}
-		}
-	}
-	
-	private void copyViewAppearanceProperties(View oldView, View newView, final List excludeStyles) {
-		for (EAttribute attribute : oldView.eClass().getEAllAttributes()) {
-			EClass containingEClass = attribute.getEContainingClass();
-			if (NotationPackage.Literals.STYLE.isSuperTypeOf(containingEClass) && !excludeStyles.contains(containingEClass)) {
-				EObject newViewStyle = newView.getStyle(containingEClass);
-				if (newViewStyle != null) {
-					if (!oldView.eIsSet(attribute)) {
-						if (newViewStyle.eIsSet(attribute)) {
-							newViewStyle.eUnset(attribute);
-						}
-					} else {
-						newViewStyle.eSet(attribute, oldView.eGet(attribute));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 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) {
-		if (oldView.eIsSet(NotationPackage.eINSTANCE.getView_Styles())) {
-			for (Style oldStyle : (List<Style>) oldView.getStyles()) {
-				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<EClass, Style> eClassMap = new HashMap<EClass, Style>();
-		for (EStructuralFeature feature : oldStyle.eClass().getEAllStructuralFeatures()) {
-			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) {
-				if (!oldStyle.eIsSet(feature)) {
-					if (!newStyle.eIsSet(feature)) {
-						// both features are null; nothing to do
-						continue;
-					} else {
-						// new style's feature is set and must be cleared
-						newStyle.eUnset(feature);
-					}
-				} else {
-					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 a0f42ba..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewType.java
+++ /dev/null
@@ -1,48 +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.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$
-
-    /**
-     * the group semantic hint
-     */
-    public static String GROUP = "Group"; //$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 559ff2c..0000000
--- a/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/util/ViewUtil.java
+++ /dev/null
@@ -1,883 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin - Bugzilla 242283
- *    Matt Biggs - Bugzilla 298155
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.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 java.util.Set;
-import java.util.Stack;
-
-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.resource.Resource;
-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 != null && 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) {
-    	Resource resource = view.eResource();
-    	if( resource instanceof XMLResource ) {
-	        String id = ((XMLResource) resource).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();
-            Resource resource = child.eResource();
-            if( resource instanceof XMLResource ) {
-	            if (idStr.equals(((XMLResource) resource).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;
-    }
-    
-    /**
-	 * Goes up through the containers of the passed in <code>EObject</code>
-	 * and returns the first container that is a <code>View</code>
-	 * 
-	 * @param obj
-	 *            the <code>EObject</code>
-	 * @return the first found <code>View</code> container of the object
-	 */
-	static public View getViewContainer(EObject obj) {
-		while (obj != null) {
-			if (obj.eContainer() instanceof View)
-				return (View) obj.eContainer();
-			obj = obj.eContainer();
-		}
-		return null;
-	}
-
-	/**
-	 * Constructs a set of all source and target edges from a view and all its
-	 * children down to the leaves of a view hierarchy
-	 * 
-	 * @param view
-	 * @param allEdges
-	 */
-	static public void  getAllRelatedEdgesForView(View view, Set<Edge> allEdges) {
-		allEdges.addAll(ViewUtil.getSourceConnections(view));
-		allEdges.addAll(ViewUtil.getTargetConnections(view));
-		for (Iterator itr = view.getChildren().iterator(); itr.hasNext();) {
-			Object obj = itr.next();
-			if (obj instanceof View) {
-				getAllRelatedEdgesForView((View)obj, allEdges);
-			}
-		}
-	}
-	
-	/**
-	 * Constructs a set of all source and target edges from a list of view and all their
-	 * children down to the leaves of a view hierarchy
-	 * 
-	 * @param views
-	 * @param allEdges
-	 */
-	static public void getAllRelatedEdgesFromViews(List views, HashSet<Edge> allEdges) {
-		for (Iterator itr = views.iterator(); itr.hasNext();) {
-			Object obj = itr.next();
-			if (obj instanceof View) {
-				getAllRelatedEdgesForView((View)obj, allEdges);
-			}
-		}
-	}
-	
-	static public Set<Edge> getAllInnerEdges(View view) {
-		Set<View> allViews = new HashSet<View>();
-		Set<Edge> edges = new HashSet<Edge>();
-		Set<Edge> edgesConnectingViews = new HashSet<Edge>();
-		getAllNestedViews(view, allViews);
-		for (View v : allViews) {
-			getAllEdgesFromView(v, edges);
-		}
-		Stack<Edge> connectionsPath = new Stack<Edge>();
-		/*
-		 * Create a set of connections constained within the given editpart
-		 */
-		while (!edges.isEmpty()) {
-			/*
-			 * Take the first connection and check whethe there is a path
-			 * through that connection that leads to the target contained within
-			 * the given editpart
-			 */
-			Edge edge = edges.iterator().next();
-			edges.remove(edge);
-			connectionsPath.add(edge);
-			
-			/*
-			 * Initialize the target for the current path
-			 */
-			View target = edge.getTarget();
-			while(edges.contains(target)) {
-				/*
-				 * If the target end is a connection, check if it's one of the
-				 * connection's whose target is a connection and within the
-				 * given editpart. Append it to the path if it is. Otherwise
-				 * check if the target is within the actual connections or nodes
-				 * contained within the given editpart
-				 */
-				Edge targetEdge = (Edge) target;
-				edges.remove(targetEdge);
-				connectionsPath.add(targetEdge);
-				
-				/*
-				 * Update the target for the new path
-				 */
-				target = targetEdge.getTarget();
-			}
-			
-			/*
-			 * The path is built, check if it's target is a node or a connection
-			 * contained within the given editpart
-			 */
-			if (allViews.contains(target) || edgesConnectingViews.contains(target)) {
-				edgesConnectingViews.addAll(connectionsPath);
-			}
-			connectionsPath.clear();
-		}
-		return edgesConnectingViews;
-	}
-	
-	static private void getAllNestedViews(View view, Set<View> allViews) {
-		for (View childView : (List<View>) view.getChildren() ) {
-			getAllNestedViews(childView, allViews);
-			allViews.add(childView);
-		}
-	}
-	
-	static private void getAllEdgesFromView(View view, Set<Edge> edges) {
-		for (Edge e : (List<Edge>) view.getSourceEdges()) {
-			getAllEdgesFromView(e, edges);
-			edges.add(e);
-		}
-	}
-	
-}
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 4037750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-org
-target
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 a0890a4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ab8599d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:00:27 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 0b1d7fd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/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.actions
-Bundle-Version: 1.4.1.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.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.6.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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/aligncenter.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/aligncenter.gif
deleted file mode 100644
index 842b7f1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/aligncenter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignleft.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignleft.gif
deleted file mode 100644
index 7b5dc0c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignleft.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignright.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignright.gif
deleted file mode 100644
index 2fed944..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/alignright.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/arrow_type.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type.gif
deleted file mode 100644
index ac2240e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_none.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_none.gif
deleted file mode 100644
index 018d53b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_none.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_open.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_open.gif
deleted file mode 100644
index 2b488b4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_open.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_solid.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_solid.gif
deleted file mode 100644
index 744db8e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/arrow_type_solid.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/group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/group.gif
deleted file mode 100644
index 8f6a925..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/group.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/line_type.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type.gif
deleted file mode 100644
index 6dcc2bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash.gif
deleted file mode 100644
index 4b0349c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot.gif
deleted file mode 100644
index aaa394b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot_dot.gif
deleted file mode 100644
index 2eac1b1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dash_dot_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dot.gif
deleted file mode 100644
index 17a1f28..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_solid.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_solid.gif
deleted file mode 100644
index 018d53b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_type_solid.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width.gif
deleted file mode 100644
index d57fa7d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_five.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_five.gif
deleted file mode 100644
index 425a995..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_five.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_four.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_four.gif
deleted file mode 100644
index 669c038..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_four.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_one.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_one.gif
deleted file mode 100644
index e8f7325..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_one.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_three.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_three.gif
deleted file mode 100644
index 911887d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_three.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_two.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_two.gif
deleted file mode 100644
index 018d53b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/line_width_two.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/ungroup.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/ungroup.gif
deleted file mode 100644
index 7373b3a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/dlcl16/ungroup.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/aligncenter.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/aligncenter.gif
deleted file mode 100644
index 9a57a08..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/aligncenter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignleft.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignleft.gif
deleted file mode 100644
index a9e12b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignleft.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignright.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignright.gif
deleted file mode 100644
index f50ea48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/alignright.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/arrow_type.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type.gif
deleted file mode 100644
index bf2f6b7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_none.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_none.gif
deleted file mode 100644
index f3d8235..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_none.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_open.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_open.gif
deleted file mode 100644
index b74f4b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_open.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_solid.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_solid.gif
deleted file mode 100644
index f47fc5b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/arrow_type_solid.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/group.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/group.gif
deleted file mode 100644
index 43547d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/group.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/line_type.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type.gif
deleted file mode 100644
index 9a0dc2e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash.gif
deleted file mode 100644
index d354299..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot.gif
deleted file mode 100644
index 1db7c5a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot_dot.gif
deleted file mode 100644
index 80a3f6b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dash_dot_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dot.gif
deleted file mode 100644
index 328e3d1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_solid.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_solid.gif
deleted file mode 100644
index f3d8235..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_type_solid.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width.gif
deleted file mode 100644
index fc3eb8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_five.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_five.gif
deleted file mode 100644
index 8384bc9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_five.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_four.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_four.gif
deleted file mode 100644
index d4400c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_four.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_one.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_one.gif
deleted file mode 100644
index 60b66e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_one.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_three.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_three.gif
deleted file mode 100644
index 6bc5f3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_three.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_two.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_two.gif
deleted file mode 100644
index f3d8235..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/line_width_two.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/ungroup.gif b/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/ungroup.gif
deleted file mode 100644
index 7d184af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/ungroup.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 d2108c0..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 6f49d9d..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 Modeling Project
-
-# ===============================================================================
-# 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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.actions/pom.xml
deleted file mode 100644
index 2693796..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.actions</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.actions</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 7278fca..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IEditableEditPart;
-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.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.diagram.ui.type.DiagramNotationType;
-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 ff216fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/AttachShapeAction.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2004, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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;

-		}

-	}

-

-	/*

-	 * (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 4f7c4ce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/IndividualCompartmentAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.core.runtime.Assert;
-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.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;
-	}
-	
-    @Override
-    protected boolean digIntoGroups() {
-        return true;
-    }
-}
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 e787b2a..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.core.runtime.Assert;
-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.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 dda8aa0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AddMenuManager.java
+++ /dev/null
@@ -1,41 +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
- */
-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 0638aa1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AlignMenuManager.java
+++ /dev/null
@@ -1,48 +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
- *
- * 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 6742456..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AllCompartmentsAction.java
+++ /dev/null
@@ -1,118 +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 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
- */
-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;
-	}
-
-    @Override
-    protected boolean digIntoGroups() {
-        return true;
-    }
-
-}
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 ba3f42b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeAction.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-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.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
- */
-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() {
-        List operationSet = getOperationSet();
-        if (operationSet.isEmpty()) {
-            return null;
-        }
-        CompoundCommand arrangeCC = new CompoundCommand(getLabel());
-        if (isArrangeAll()) {
-            for (Iterator iter = operationSet.iterator(); iter.hasNext();) {
-                EditPart element = (EditPart) iter.next();
-                Command cmd = element.getCommand(getTargetRequest());
-                if (cmd != null)
-                    arrangeCC.add(cmd);
-            }
-        } else {
-            EditPart targetEP = getTargetEditPartForArrangeSelection(operationSet);
-            if (targetEP != null) {
-                Command cmd = targetEP.getCommand(getTargetRequest());
-                if (cmd != null)
-                    arrangeCC.add(cmd);
-            }
-        }
-        return arrangeCC;
-    }
-    
-    private EditPart getTargetEditPartForArrangeSelection(List editparts) {
-
-        if (editparts.size() == 1) {
-            
-            // If there is only one editpart selected, then the Arrange
-            // Selected request gets sent to this editpart's target editpart to
-            // allow clients to do as they wish.
-            return ((EditPart) editparts.get(0))
-                .getTargetEditPart(getTargetRequest());
-            
-        } else {
-            
-            // If there is more than one editpart selected, then the Arrange
-            // Selected request gets sent to the common parent.
-            EditPart parentEP = getSelectionParent(editparts);
-            if (parentEP == null)
-                return null;
-
-            for (int i = 1; i < editparts.size(); i++) {
-                EditPart part = (EditPart) editparts.get(i);
-                if (part instanceof ConnectionEditPart) {
-                    continue;
-                }
-                // if there is no common parent, then Arrange Selected isn't
-                // supported.
-                if (part.getParent() != parentEP)
-                    return null;
-            }
-            return parentEP;
-        }
-    }
-
-    /* 
-     * 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 createOperationSetForArrangeAll(selection);
-            }
-            if (getDiagramEditPart() != null) {
-                return getDiagramEditPart().getChildren();
-            }
-            return Collections.EMPTY_LIST;
-
-        } else {
-
-            // this is the case of Arrange Selection
-            if (selection.isEmpty()
-                || !(selection.get(0) instanceof IGraphicalEditPart))
-                return Collections.EMPTY_LIST;
-
-            selection = ToolUtilities.getSelectionWithoutDependants(selection);
-            return 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;
-    }
-
-    /* (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 createOperationSetForArrangeAll(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;
-    }
-    
-    public String getLabel() {
-        return isArrangeAll() ? DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeAll_ActionLabelText
-            : DiagramUIActionsMessages.ArrangeAction_toolbar_ArrangeSelection_ActionLabelText;
-    }
-
-}
-
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 04e0ae0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrangeMenuManager.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.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
- *
- * 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/ArrowTypeAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeAction.java
deleted file mode 100644
index 7d7974b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeAction.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ListIterator;
-
-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.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-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.notation.ArrowStyle;
-import org.eclipse.gmf.runtime.notation.ArrowType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The action for arrow type.
- * 
- * @author Anthony Hunter
- */
-public class ArrowTypeAction extends PropertyChangeAction {
-
-	/**
-	 * The arrow type property value.
-	 */
-	private ArrowType arrowType;
-
-	/**
-	 * Constructor for an ArrowTypeAction.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @param arrowType
-	 *            the arrow type.
-	 */
-	protected ArrowTypeAction(IWorkbenchPage workbenchPage,
-			ArrowType arrowType, String property) {
-		super(
-				workbenchPage,
-				property,
-				DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		this.arrowType = arrowType;
-	}
-
-	/**
-	 * Creates the arrow type none action on the source end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the arrow type none action.
-	 */
-	public static ArrowTypeAction createArrowTypeSourceNoneAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.NONE_LITERAL, Properties.ID_ARROW_SOURCE);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_SOURCE_NONE);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_none);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE);
-		return action;
-	}
-
-	/**
-	 * Creates the arrow type none action on the target end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the arrow type none action.
-	 */
-	public static ArrowTypeAction createArrowTypeTargetNoneAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.NONE_LITERAL, Properties.ID_ARROW_TARGET);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_TARGET_NONE);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_none);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_NONE);
-		return action;
-	}
-
-	/**
-	 * Creates the solid arrow type action on the source end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the solid arrow type action.
-	 */
-	public static ArrowTypeAction createArrowTypeSourceSolidAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.SOLID_ARROW_LITERAL, Properties.ID_ARROW_SOURCE);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_SOURCE_SOLID);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_solid);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID);
-		return action;
-	}
-
-	/**
-	 * Creates the solid arrow type action on the target end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the solid arrow type action.
-	 */
-	public static ArrowTypeAction createArrowTypeTargetSolidAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.SOLID_ARROW_LITERAL, Properties.ID_ARROW_TARGET);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_TARGET_SOLID);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_solid);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_SOLID);
-		return action;
-	}
-
-	/**
-	 * Creates the open arrow type action on the source end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the solid arrow type action.
-	 */
-	public static ArrowTypeAction createArrowTypeSourceOpenAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.OPEN_ARROW_LITERAL, Properties.ID_ARROW_SOURCE);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_SOURCE_OPEN);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_open);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN);
-		return action;
-	}
-
-	/**
-	 * Creates the open arrow type action on the target end.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the solid arrow type action.
-	 */
-	public static ArrowTypeAction createArrowTypeTargetOpenAction(
-			IWorkbenchPage workbenchPage) {
-		ArrowTypeAction action = new ArrowTypeAction(workbenchPage,
-				ArrowType.OPEN_ARROW_LITERAL, Properties.ID_ARROW_TARGET);
-		action.setId(ActionIds.ACTION_ARROW_TYPE_TARGET_OPEN);
-		action.setText(DiagramUIActionsMessages.ArrowTypeAction_open);
-		action
-				.setToolTipText(DiagramUIActionsMessages.ArrowTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_OPEN);
-		return action;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getId() == ActionIds.ACTION_ARROW_TYPE_SOURCE_NONE
-				|| getId() == ActionIds.ACTION_ARROW_TYPE_SOURCE_OPEN
-				|| getId() == ActionIds.ACTION_ARROW_TYPE_SOURCE_SOLID
-				|| getId() == ActionIds.ACTION_ARROW_TYPE_TARGET_NONE
-				|| getId() == ActionIds.ACTION_ARROW_TYPE_TARGET_OPEN
-				|| getId() == ActionIds.ACTION_ARROW_TYPE_TARGET_SOLID) {
-			for (ListIterator<?> li = getSelectedObjects().listIterator(); li
-					.hasNext();) {
-				Object object = li.next();
-				if (!(object instanceof ConnectionEditPart)) {
-					return false;
-				}
-				View view = ((IGraphicalEditPart) object).getPrimaryView();
-				if (view != null) {
-					ArrowStyle style = (ArrowStyle) view
-							.getStyle(NotationPackage.eINSTANCE.getArrowStyle());
-					if (style == null) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return super.calculateEnabled();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return arrowType;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeMenuManager.java
deleted file mode 100644
index 688a484..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeMenuManager.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * The menu manager for arrow type.
- * 
- * @author Anthony Hunter
- */
-public class ArrowTypeMenuManager extends ActionMenuManager {
-
-	/**
-	 * The arrow type menu action containing the UI for the arrow type menu
-	 * manager
-	 */
-	private static class ArrowTypeMenuAction extends Action {
-		public ArrowTypeMenuAction() {
-			setText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeText);
-			setToolTipText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeToolTip);
-			setImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE);
-			setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE_DISABLED);
-			setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_ARROW_TYPE);
-		}
-	}
-
-	/**
-	 * Constructor for an ArrowTypeMenuManager.
-	 */
-	public ArrowTypeMenuManager() {
-		super(ActionIds.MENU_ARROW_TYPE, new ArrowTypeMenuAction(), 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/ArrowTypeSourceMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeSourceMenuManager.java
deleted file mode 100644
index 5ba2c27..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeSourceMenuManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 menu manager for the source end of arrow type.
- * 
- * @author Anthony Hunter
- */
-public class ArrowTypeSourceMenuManager extends ActionMenuManager {
-
-	/**
-	 * The arrow type menu action containing the UI for the arrow type menu manager.
-	 */
-	private static class ArrowTypeSourceMenuAction extends Action {
-		public ArrowTypeSourceMenuAction() {
-			setText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeSourceText);
-			setToolTipText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeSourceToolTip);
-		}
-	}
-
-	/**
-	 * Constructor for an ArrowTypeSourceMenuManager.
-	 */
-	public ArrowTypeSourceMenuManager() {
-		super(ActionIds.MENU_ARROW_TYPE_SOURCE, new ArrowTypeSourceMenuAction(), true);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeTargetMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeTargetMenuManager.java
deleted file mode 100644
index 5ac7f5a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ArrowTypeTargetMenuManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 menu manager for the target end of arrow type.
- * 
- * @author Anthony Hunter
- */
-public class ArrowTypeTargetMenuManager extends ActionMenuManager {
-
-	/**
-	 * The arrow type menu action containing the UI for the arrow type menu manager
-	 */
-	private static class ArrowTypeTargetMenuAction extends Action {
-		public ArrowTypeTargetMenuAction() {
-			setText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeTargetText);
-			setToolTipText(DiagramUIActionsMessages.ArrowTypeActionMenu_arrowTypeTargetToolTip);
-		}
-	}
-
-	/**
-	 * Constructor for an ArrowTypeTargetMenuManager.
-	 */
-	public ArrowTypeTargetMenuManager() {
-		super(ActionIds.MENU_ARROW_TYPE_TARGET, new ArrowTypeTargetMenuAction(), true);
-	}
-
-}
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 ea2f3d1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/AutoSizeAction.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * 
- * @author melaasar
- */
-public class AutoSizeAction extends DiagramAction {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getCommandLabel()
-	 */
-	protected String getCommandLabel() {
-		return DiagramUIActionsMessages.AutoSizeAction_ActionLabelText;
-	}
-
-	/**
-     * @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;
-    }
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-    
-    @Override
-    protected Command getCommand(Request request) {
-    	boolean foundNonAutosizedPart = false;
-    	List operationSet = getOperationSet();
-		Iterator editParts = operationSet.iterator();
-		CompoundCommand command = new CompoundCommand(getCommandLabel());
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			
-			//check if the editpart is autosized
-			if (editPart instanceof GraphicalEditPart) {
-				GraphicalEditPart graphicalEditPart = (GraphicalEditPart) editPart;
-				Integer containerWidth = (Integer) graphicalEditPart
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE
-								.getSize_Width());
-				Integer containerHeight = (Integer) graphicalEditPart
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE
-								.getSize_Height());
-				if (containerWidth.intValue() != -1
-						|| containerHeight.intValue() != -1) {
-					foundNonAutosizedPart = true;
-				}
-			}
-			
-			Command curCommand = editPart.getCommand(request);
-			if (curCommand != null) {
-				command.add(curCommand);
-			}
-		}
-		return command.isEmpty() || command.size() != operationSet.size() || !foundNonAutosizedPart ? UnexecutableCommand.INSTANCE
-			: (Command) command;
-    	
-    	
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-		setEnabled(calculateEnabled());
-	}
-
-}
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 82da9c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ColorPropertyContributionItem.java
+++ /dev/null
@@ -1,666 +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
- */
-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());
-		if (lastColor != null){			
-			dialog.setRGB(FigureUtilities.integerToRGB(lastColor));
-		}			
-		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);
-	}
-
-    @Override
-    protected boolean digIntoGroups() {
-        return true;
-    }
-
-
-}
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 a105b40..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CompartmentMenuManager.java
+++ /dev/null
@@ -1,48 +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
- *
- * 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 e699d29..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ConnectionLabelMenuManager.java
+++ /dev/null
@@ -1,54 +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
- * 
- * 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);
-	}
-
-}
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 6363990..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CopyAppearancePropertiesAction.java
+++ /dev/null
@@ -1,87 +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
- * @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 a29d58e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateConnectionViewAction.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 
- ****************************************************************************/
-/*
- * 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
- */
-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 9db5b63..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateShapeViewAction.java
+++ /dev/null
@@ -1,152 +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
- */
-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 1b2ba9c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/CreateViewAction.java
+++ /dev/null
@@ -1,160 +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
- */
-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 a43e90e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DeleteFromDiagramAction.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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
- */
-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){
-    
-	    boolean isCanonical = false;
-        if ( !selectedItems.isEmpty()) {
-
-            for  (Iterator si = selectedItems.iterator(); si.hasNext() && !isCanonical;) {
-                Object selected = si.next();   
-                if ( selected instanceof EditPart ) {
-                    EditPart child = (EditPart)selected;
-                    View view = (View)child.getAdapter(View.class);
-
-                    if (  view == null 
-                            || view.getElement() == null
-                            || view.getElement() instanceof View ) {
-                        // 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.
-                        isCanonical = false;
-                        continue;
-                    }
-                    if (child instanceof ConnectionEditPart) {
-                        ConnectionEditPart connection = (ConnectionEditPart)child;
-                        isCanonical = ( !connection.isSemanticConnection()
-                                || (isCanonical(connection.getSource())
-                                        && isCanonical(connection.getTarget())) );
-                    } 
-                    else {
-                        isCanonical = isCanonical(child);
-                    }
-                }
-            }
-        }
-        return isCanonical;
-
-	    
-	}
-	
-	/**
-	 * @param gep
-	 * @return
-	 */
-	private boolean isCanonical(EditPart ep) {
-	    EObject eObject = (EObject)ep.getAdapter(EObject.class);
-        EditPart parent = ep.getParent();
-        if ( eObject != null && parent != null ) { //sanity checks
-            CanonicalEditPolicy cep = (CanonicalEditPolicy)parent.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-            return cep != null
-                && cep.isEnabled()
-                && cep.canCreate(eObject);
-        }
-        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 2a922f5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionFilterProvider.java
+++ /dev/null
@@ -1,91 +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
- */
-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;
-    }
-
-}
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 758ec8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsDebugOptions.java
+++ /dev/null
@@ -1,43 +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
- *
- */
-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$
-}
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 0564cb4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DiagramActionsStatusCodes.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.diagram.ui.actions.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- *  @author Yasser Lulu
- *
- */
-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 871f817..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/DuplicateActionDelegate.java
+++ /dev/null
@@ -1,259 +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;
-
-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
- */
-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
-        
-    }
-
-}
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 0838543..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/EditMenuManager.java
+++ /dev/null
@@ -1,42 +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
- */
-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 b0b5f1f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FileMenuManager.java
+++ /dev/null
@@ -1,43 +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
- */
-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 772da21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FiltersMenuManager.java
+++ /dev/null
@@ -1,43 +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
- */
-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 b1af3fc..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, 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 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
- */
-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, Integer.valueOf(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);
-		}
-	}
-	
-    @Override
-    protected boolean digIntoGroups() {
-        return true;
-    }
-}
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 b4cffda..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontNameContributionItem.java
+++ /dev/null
@@ -1,114 +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 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
- */
-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;
-	}
-
-    @Override
-    protected boolean digIntoGroups() {
-        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 e8b5844..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontSizeContributionItem.java
+++ /dev/null
@@ -1,112 +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 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
- */
-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 = Integer.valueOf(selectedSize);
-		runWithEvent(event);
-	}
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-
-    @Override
-    protected boolean digIntoGroups() {
-        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 b290f9b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/FontStyleAction.java
+++ /dev/null
@@ -1,83 +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 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
- * 
- * 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;
-	}
-	
-    @Override
-    protected boolean digIntoGroups() {
-        return true;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/GroupAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/GroupAction.java
deleted file mode 100644
index 1bc6f68..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/GroupAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-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.UnexecutableCommand;
-import org.eclipse.gef.requests.GroupRequest;
-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.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * An action to group shapes together.
- * 
- * @author mmostafa, crevells
- */
-public class GroupAction
-    extends DiagramAction {
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param workbenchPage
-     */
-    public GroupAction(IWorkbenchPage workbenchPage) {
-        super(workbenchPage);
-        setId(ActionIds.ACTION_GROUP);
-        setText(DiagramUIActionsMessages.GroupAction_Group_ActionLabelText);
-        setToolTipText(DiagramUIActionsMessages.GroupAction_Group_ActionToolTipText);
-        setImageDescriptor(DiagramUIActionsPluginImages.DESC_GROUP);
-        setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_GROUP_DISABLED);
-        setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_GROUP);
-    }
-
-    protected Request createTargetRequest() {
-        return new GroupRequest(getId());
-    }
-
-    protected void updateTargetRequest() {
-        GroupRequest request = (GroupRequest) getTargetRequest();
-        request.setEditParts(getOperationSet());
-    }
-
-    protected Command getCommand() {
-        if (getOperationSet().size() > 1) {
-            EditPart parent = ((EditPart) getOperationSet().get(0)).getParent();
-            return parent.getCommand(getTargetRequest());
-        }
-        return UnexecutableCommand.INSTANCE;
-    }
-
-    protected List createOperationSet() {
-		List selection = getSelectedObjects();
-		if (selection.size() <= 1
-				|| !(selection.get(0) instanceof IGraphicalEditPart)) {
-			return Collections.EMPTY_LIST;
-		}
-		List<GraphicalEditPart> operationSet = new ArrayList<GraphicalEditPart>();
-		for (GraphicalEditPart editpart : (List<GraphicalEditPart>) selection) {
-			if (!(editpart instanceof ConnectionEditPart)
-					&& !ToolUtilities.isAncestorContainedIn(operationSet,
-							editpart)) {
-				operationSet.add(editpart);
-			}
-		}
-		return operationSet;
-	}
-
-    protected boolean isSelectionListener() {
-        return true;
-    }
-
-    protected void doRun(IProgressMonitor progressMonitor) {
-
-        super.doRun(progressMonitor);
-
-        // now select the new group
-        Object model = ((EditPart) ((GroupRequest) getTargetRequest())
-            .getEditParts().get(0)).getModel();
-        if (model instanceof View) {
-            Object groupView = ((View) model).eContainer();
-            final Object groupEP = getDiagramGraphicalViewer().getEditPartRegistry()
-                .get(groupView);
-            if (groupEP != null) {
-                getDiagramGraphicalViewer().setSelection(
-                    new StructuredSelection(groupEP));
-                getDiagramGraphicalViewer().reveal((EditPart) groupEP);
-            }
-        }
-    }
-
-}
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/LineTypeAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineTypeAction.java
deleted file mode 100644
index db656aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineTypeAction.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ListIterator;
-
-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.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-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.notation.LineType;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The action for line type.
- * 
- * @author Anthony Hunter
- */
-public class LineTypeAction extends PropertyChangeAction {
-
-	/**
-	 * The line type property value.
-	 */
-	private LineType lineType;
-
-	/**
-	 * Constructor for a LineTypeAction.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @param textAlignment
-	 *            the text alignment type.
-	 */
-	protected LineTypeAction(IWorkbenchPage workbenchPage, LineType lineType) {
-		super(
-				workbenchPage,
-				Properties.ID_LINE_TYPE,
-				DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		this.lineType = lineType;
-	}
-
-	/**
-	 * Creates the line type solid action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line type solid action.
-	 */
-	public static LineTypeAction createLineTypeSolidAction(
-			IWorkbenchPage workbenchPage) {
-		LineTypeAction action = new LineTypeAction(workbenchPage,
-				LineType.SOLID_LITERAL);
-		action.setId(ActionIds.ACTION_LINE_TYPE_SOLID);
-		action.setText(DiagramUIActionsMessages.LineTypeAction_solid);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_SOLID);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_SOLID_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_SOLID);
-		return action;
-	}
-
-	/**
-	 * Creates the line type dash action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line type dash action.
-	 */
-	public static LineTypeAction createLineTypeDashAction(
-			IWorkbenchPage workbenchPage) {
-		LineTypeAction action = new LineTypeAction(workbenchPage,
-				LineType.DASH_LITERAL);
-		action.setId(ActionIds.ACTION_LINE_TYPE_DASH);
-		action.setText(DiagramUIActionsMessages.LineTypeAction_dash);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH);
-		return action;
-	}
-
-	/**
-	 * Creates the line type dot action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line type dot action.
-	 */
-	public static LineTypeAction createLineTypeDotAction(
-			IWorkbenchPage workbenchPage) {
-		LineTypeAction action = new LineTypeAction(workbenchPage,
-				LineType.DOT_LITERAL);
-		action.setId(ActionIds.ACTION_LINE_TYPE_DOT);
-		action.setText(DiagramUIActionsMessages.LineTypeAction_dot);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DOT);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DOT_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DOT);
-		return action;
-	}
-
-	/**
-	 * Creates the line type dash dot action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line type dash dot action.
-	 */
-	public static LineTypeAction createLineTypeDashDotAction(
-			IWorkbenchPage workbenchPage) {
-		LineTypeAction action = new LineTypeAction(workbenchPage,
-				LineType.DASH_DOT_LITERAL);
-		action.setId(ActionIds.ACTION_LINE_TYPE_DASH_DOT);
-		action.setText(DiagramUIActionsMessages.LineTypeAction_dashdot);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT);
-		return action;
-	}
-
-	/**
-	 * Creates the line type dash dot dot action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line type dash dot dot action.
-	 */
-	public static LineTypeAction createLineTypeDashDotDotAction(
-			IWorkbenchPage workbenchPage) {
-		LineTypeAction action = new LineTypeAction(workbenchPage,
-				LineType.DASH_DOT_DOT_LITERAL);
-		action.setId(ActionIds.ACTION_LINE_TYPE_DASH_DOT_DOT);
-		action.setText(DiagramUIActionsMessages.LineTypeAction_dashdotdot);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineTypeAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT_DOT);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT_DOT_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DASH_DOT_DOT);
-		return action;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getId() == ActionIds.ACTION_LINE_TYPE_SOLID
-				|| getId() == ActionIds.ACTION_LINE_TYPE_DASH
-				|| getId() == ActionIds.ACTION_LINE_TYPE_DASH_DOT
-				|| getId() == ActionIds.ACTION_LINE_TYPE_DASH_DOT_DOT
-				|| getId() == ActionIds.ACTION_LINE_TYPE_DOT) {
-			for (ListIterator<?> li = getSelectedObjects().listIterator(); li
-					.hasNext();) {
-				Object object = li.next();
-				if (!(object instanceof ConnectionEditPart)
-						&& !(object instanceof ShapeNodeEditPart)) {
-					return false;
-				}
-				View view = ((IGraphicalEditPart) object).getPrimaryView();
-				if (view != null) {
-					LineTypeStyle style = (LineTypeStyle) view
-							.getStyle(NotationPackage.eINSTANCE
-									.getLineTypeStyle());
-					if (style == null) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return super.calculateEnabled();
-	}
-
-	/* 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return lineType;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineTypeMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineTypeMenuManager.java
deleted file mode 100644
index 83bcf82..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineTypeMenuManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * The menu manager for line type.
- * 
- * @author Anthony Hunter
- */
-public class LineTypeMenuManager extends ActionMenuManager {
-
-	/**
-	 * The line type menu action containing the UI for the line type menu manager
-	 */
-	private static class LineWidthMenuAction extends Action {
-		public LineWidthMenuAction() {
-			setText(DiagramUIActionsMessages.LineTypeActionMenu_lineTypeText);
-			setToolTipText(DiagramUIActionsMessages.LineTypeActionMenu_lineTypeToolTip);
-	        setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE);
-	        setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE_DISABLED);
-	        setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_TYPE);
-		}
-	}
-
-	/**
-	 * Constructor for a LineTypeMenuManager.
-	 */
-	public LineTypeMenuManager() {
-		super(ActionIds.MENU_LINE_TYPE, new LineWidthMenuAction(), true);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthAction.java
deleted file mode 100644
index 133166b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthAction.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ListIterator;
-
-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.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-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.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The action for line width.
- * 
- * @author Anthony Hunter
- */
-public class LineWidthAction extends PropertyChangeAction {
-
-	/**
-	 * The line width property value.
-	 */
-	private int lineWidth;
-
-	/**
-	 * Constructor for a LineWidthAction.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @param lineWidth
-	 *            the line width.
-	 */
-	protected LineWidthAction(IWorkbenchPage workbenchPage, int lineWidth) {
-		super(
-				workbenchPage,
-				Properties.ID_LINE_WIDTH,
-				DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		this.lineWidth = lineWidth;
-	}
-
-	/**
-	 * Creates the line width of one point action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line width of one point action.
-	 */
-	public static LineWidthAction createLineWidthOneAction(
-			IWorkbenchPage workbenchPage) {
-		LineWidthAction action = new LineWidthAction(workbenchPage, 1);
-		action.setId(ActionIds.ACTION_LINE_WIDTH_ONE);
-		action.setText(DiagramUIActionsMessages.LineWidthAction_one);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_ONE);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_ONE_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_ONE);
-		return action;
-	}
-
-	/**
-	 * Creates the line width of two points action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line width of two points action.
-	 */
-	public static LineWidthAction createLineWidthTwoAction(
-			IWorkbenchPage workbenchPage) {
-		LineWidthAction action = new LineWidthAction(workbenchPage, 2);
-		action.setId(ActionIds.ACTION_LINE_WIDTH_TWO);
-		action.setText(DiagramUIActionsMessages.LineWidthAction_two);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_TWO);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_TWO_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_TWO);
-		return action;
-	}
-
-	/**
-	 * Creates the line width of three points action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line width of three points action.
-	 */
-	public static LineWidthAction createLineWidthThreeAction(
-			IWorkbenchPage workbenchPage) {
-		LineWidthAction action = new LineWidthAction(workbenchPage, 3);
-		action.setId(ActionIds.ACTION_LINE_WIDTH_THREE);
-		action.setText(DiagramUIActionsMessages.LineWidthAction_three);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_THREE);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_THREE_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_THREE);
-		return action;
-	}
-
-	/**
-	 * Creates the line width of four points action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line width of four points action.
-	 */
-	public static LineWidthAction createLineWidthFourAction(
-			IWorkbenchPage workbenchPage) {
-		LineWidthAction action = new LineWidthAction(workbenchPage, 4);
-		action.setId(ActionIds.ACTION_LINE_WIDTH_FOUR);
-		action.setText(DiagramUIActionsMessages.LineWidthAction_four);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FOUR);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FOUR_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FOUR);
-		return action;
-	}
-
-	/**
-	 * Creates the line width of five points action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the line width of five points action.
-	 */
-	public static LineWidthAction createLineWidthFiveAction(
-			IWorkbenchPage workbenchPage) {
-		LineWidthAction action = new LineWidthAction(workbenchPage, 5);
-		action.setId(ActionIds.ACTION_LINE_WIDTH_FIVE);
-		action.setText(DiagramUIActionsMessages.LineWidthAction_five);
-		action
-				.setToolTipText(DiagramUIActionsMessages.LineWidthAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FIVE);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FIVE_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_FIVE);
-		return action;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getId() == ActionIds.ACTION_LINE_WIDTH_ONE
-				|| getId() == ActionIds.ACTION_LINE_WIDTH_TWO
-				|| getId() == ActionIds.ACTION_LINE_WIDTH_THREE
-				|| getId() == ActionIds.ACTION_LINE_WIDTH_FOUR
-				|| getId() == ActionIds.ACTION_LINE_WIDTH_FIVE) {
-			for (ListIterator<?> li = getSelectedObjects().listIterator(); li
-					.hasNext();) {
-				Object object = li.next();
-				if (!(object instanceof ConnectionEditPart)
-						&& !(object instanceof ShapeNodeEditPart)) {
-					return false;
-				}
-				View view = ((IGraphicalEditPart) object).getPrimaryView();
-				if (view != null) {
-					LineStyle style = (LineStyle) view
-							.getStyle(NotationPackage.eINSTANCE.getLineStyle());
-					if (style == null || style.getLineWidth() == -1) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return super.calculateEnabled();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return lineWidth;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthMenuManager.java
deleted file mode 100644
index a80a520..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/LineWidthMenuManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * The menu manager for line width.
- * 
- * @author Anthony Hunter
- */
-public class LineWidthMenuManager extends ActionMenuManager {
-
-	/**
-	 * The line width menu action containing the UI for the line width menu manager
-	 */
-	private static class LineWidthMenuAction extends Action {
-		public LineWidthMenuAction() {
-			setText(DiagramUIActionsMessages.LineWidthActionMenu_lineWidthText);
-			setToolTipText(DiagramUIActionsMessages.LineWidthActionMenu_lineWidthToolTip);
-	        setImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH);
-	        setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH_DISABLED);
-	        setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_LINE_WIDTH);
-		}
-	}
-
-	/**
-	 * Constructor for a LineWidthMenuManager.
-	 */
-	public LineWidthMenuManager() {
-		super(ActionIds.MENU_LINE_WIDTH, new LineWidthMenuAction(), true);
-	}
-
-}
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 189e31b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/MakeSameSizeMenuManager.java
+++ /dev/null
@@ -1,43 +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
- */
-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 caa9f3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/OpenWithMenuManager.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.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
- */
-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 876bd0a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PageSetupAction.java
+++ /dev/null
@@ -1,93 +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
- */
-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/PromptingDeleteFromDiagramAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PromptingDeleteFromDiagramAction.java
deleted file mode 100644
index 6a59e85..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PromptingDeleteFromDiagramAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gef.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.GroupRequestViaKeyboard;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Extends DeleteFromDiagramAction to ensure that preference for prompt on
- * delete from diagram is respected when using context menu delete from diagram option.
- * 
- * @author lgrahek
- * 
- */
-public class PromptingDeleteFromDiagramAction extends DeleteFromDiagramAction {
-	/**
-	 * Constructs a new diagram action
-	 * 
-	 * @param workbenchPart
-	 *            The workbench part associated with this action
-	 */
-	public PromptingDeleteFromDiagramAction(IWorkbenchPart part) {
-		super(part);
-	}
-
-	/**
-	 * Constructs a new diagram action
-	 * 
-	 * @param workbenchPage
-	 *            The workbench page associated with this action
-	 */
-	public PromptingDeleteFromDiagramAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Creates the delete request that will allow taking into account the preference 
-     * to show the information dialog.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.DeleteFromDiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		GroupRequestViaKeyboard deleteReq = new GroupRequestViaKeyboard(
-				RequestConstants.REQ_DELETE);
-
-		deleteReq.setShowInformationDialog(false);		
-		return deleteReq;
-	}
-
-	/** First gets the delete command, where target request is modified to include the information about
-	 * whether confirmation prompt should be issued. Then it runs the obtained command.
-	 *  
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Request req = getTargetRequest();
-		boolean showInformationDialog = ((IPreferenceStore) getPreferencesHint()
-				.getPreferenceStore())
-				.getBoolean(IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		((GroupRequestViaKeyboard) req)
-				.setShowInformationDialog(showInformationDialog);
-		super.doRun(progressMonitor);
-	}
-		
-	
-}
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 ecf6286..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/PropertyChangeContributionItem.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.EditPart;
-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.GroupEditPart;
-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.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
- */
-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() {
-						setResult(getStructuralFeatureValue(editPart, thePropertyId));
-					}
-				});
-		} 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 {
-             return getStructuralFeatureValue(editPart, thePropertyId);
-        }
-    }
-
-	/**
-	 * 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;
-	}
-	
-    /**
-     * Override to return true to have this property action work on the shapes
-     * in a <code>GroupEditPart</code> as if the shapes were multi-selected.
-     * 
-     * @return true if this property action is to dig into the shapes of groups
-     */
-    protected boolean digIntoGroups() {
-        return false;
-    }
-    
-    /**
-     * Gets the structural feature value of the property id on the editpart
-     * passed in or one of the children if the editpart is a group and
-     * {@link #digIntoGroups()} returns true.
-     * 
-     * @param editpart
-     *            the editpart
-     * @param thePropertyId
-     *            the property id
-     */
-    private Object getStructuralFeatureValue(IGraphicalEditPart editpart,
-            final String thePropertyId) {
-        ENamedElement element = PackageUtil.getElement(thePropertyId);
-        if (element instanceof EStructuralFeature) {
-            if (digIntoGroups() && editpart instanceof GroupEditPart) {
-                editpart = (IGraphicalEditPart) editpart.getChildren().get(0);
-            }
-            return editpart
-                .getStructuralFeatureValue((EStructuralFeature) element);
-        }
-        return null;
-    }
-
-    protected List getTargetEditParts(EditPart editpart) {
-        if (digIntoGroups() && editpart instanceof GroupEditPart) {
-            List targetEPs = new ArrayList();
-            for (Iterator iterator = ((GroupEditPart) editpart)
-                .getShapeChildren().iterator(); iterator.hasNext();) {
-                EditPart childEP = (EditPart) iterator.next();
-                targetEPs.addAll(super.getTargetEditParts(childEP));
-            }
-            return targetEPs;
-        }
-        return super.getTargetEditParts(editpart);
-    }
-    
-    
-
-}
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 fd63d52..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RecalculatePageBreaksAction.java
+++ /dev/null
@@ -1,92 +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
- */
-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 c1b3c79..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterAction.java
+++ /dev/null
@@ -1,151 +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
- */
-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 35b5bfb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/RouterMenuManager.java
+++ /dev/null
@@ -1,48 +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
- *
- * 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 ca2485c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectAllAction.java
+++ /dev/null
@@ -1,358 +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.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.GroupEditPart;
-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
- * 
- */
-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);
-
-                // Do not dig into groups -- just select the group, but not the
-                // shapes inside.
-                if (!(editpart instanceof GroupEditPart)) {
-                    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()) {
-            EditPart ep = (EditPart)li.next();
-			getBorderItemEditParts(ep, connnectableEditParts);
-            if (ep instanceof GroupEditPart) {
-                connnectableEditParts.addAll(((GroupEditPart)ep).getShapeChildren());
-            }
-		}
-		
-		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/SelectConnectionEndAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectConnectionEndAction.java
deleted file mode 100644
index 755f1ce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectConnectionEndAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-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.requests.SelectConnectionEndRequest;
-import org.eclipse.ui.IWorkbenchPage;
-
-
-/**
- * @author mmostafa
- * 
- * Action to select one of the connection's ends
- *
- */
-public class SelectConnectionEndAction extends DiagramAction{
-	
-	private boolean isSource = false;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new SelectConnectionEndRequest(isSource);
-	}
-	
-	
-	/**
-     * creats a select connection source action
-	 * @param workbenchPage
-	 * @return action that will select the connection source
-	 */
-	static SelectConnectionEndAction createSelectConnectionSourceAction(IWorkbenchPage workbenchPage){
-		return new SelectConnectionEndAction(workbenchPage,true); 
-	}
-	
-    /**
-     * creats a select connection target action
-     * @param workbenchPage
-     * @return action that will select the connection target
-     */
-	static SelectConnectionEndAction createSelectConnectionTargetAction(IWorkbenchPage workbenchPage){
-		return new SelectConnectionEndAction(workbenchPage,false);
-	}
-
-	/**
-     * constructor
-	 * @param workbenchPage
-	 * @param true means select connection source, false means select connection end
-	 */
-	public SelectConnectionEndAction(IWorkbenchPage workbenchPage, boolean source) {
-	        super(workbenchPage);
-	        isSource = source;
-	        if (isSource){
-	        	setText(DiagramUIActionsMessages.SelectConnectionEndAction_SelectSource_ActionLabelText);
-	        	setText(DiagramUIActionsMessages.SelectConnectionEndAction_SelectSource_ActionToolTipText);
-	        }else {
-	        	setText(DiagramUIActionsMessages.SelectConnectionEndAction_SelectTarget_ActionLabelText);
-	        	setText(DiagramUIActionsMessages.SelectConnectionEndAction_SelectTarget_ActionToolTipText);
-	        }
-	        
-			
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#isSelectionListener()
-	 */
-	protected boolean isSelectionListener() {
-		return false;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		List operationSet = getOperationSet();
-		if (operationSet.size()!=1)
-			return false;
-		return true;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		List operationSet = getOperationSet();
-		if (operationSet.isEmpty())
-			return;
-		ConnectionEditPart connectionEditPart = 
-			(ConnectionEditPart)operationSet.get(0);
-		EditPart editPartToSelect = null;
-		if (isSource){
-			editPartToSelect = connectionEditPart.getSource();
-		}
-		else {
-			editPartToSelect = connectionEditPart.getTarget();
-		}
-		editPartToSelect.getViewer().reveal(editPartToSelect);
-        editPartToSelect.getViewer().select(editPartToSelect);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#getTargetEditParts(org.eclipse.gef.EditPart)
-	 */
-	protected List getTargetEditParts(EditPart editpart) {
-		return Collections.singletonList(editpart);
-	}
-	
-	
-}
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 2ebd449..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SelectMenuManager.java
+++ /dev/null
@@ -1,75 +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
- *
- * 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 b66c87e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowCompartmentTitleAction.java
+++ /dev/null
@@ -1,44 +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
- */
-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 4579ed4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowConnectionLabelsAction.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.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
- */
-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 c51e620..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ShowInMenuManager.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.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
- */
-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 e0e603d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeBothAction.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.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
- */
-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 2fbe716..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeHeightAction.java
+++ /dev/null
@@ -1,140 +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
- */
-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 a4a259b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SizeWidthAction.java
+++ /dev/null
@@ -1,142 +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
- */
-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 7fed784..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapBackAction.java
+++ /dev/null
@@ -1,68 +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.
- * 
- */
-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 e1a37d2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SnapToGridAction.java
+++ /dev/null
@@ -1,126 +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 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
- */
-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())){
-			// set checked to 'false' if the IDiagramWorkbenchPart doesn't have a
-			// graphical viewer or the viewer doesn't have a preference store
-			boolean shouldBeChecked = false;
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				
-				if (viewer != null) {
-					IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				
-					if (preferenceStore != null) {
-						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 98e112d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/SortFilterAction.java
+++ /dev/null
@@ -1,132 +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
- */
-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/TextAlignmentAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/TextAlignmentAction.java
deleted file mode 100644
index 657a202..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/TextAlignmentAction.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ListIterator;
-
-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.actions.PropertyChangeAction;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * The action for text alignment.
- * 
- * @author Anthony Hunter
- */
-public class TextAlignmentAction extends PropertyChangeAction {
-
-	/**
-	 * The text alignment property value.
-	 */
-	private TextAlignment textAlignment;
-
-	/**
-	 * Constructor for a TextAlignmentAction.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @param textAlignment
-	 *            the text alignment type.
-	 */
-	protected TextAlignmentAction(IWorkbenchPage workbenchPage,
-			TextAlignment textAlignment) {
-		super(
-				workbenchPage,
-				Properties.ID_TEXT_ALIGNMENT,
-				DiagramUIActionsMessages.TextAlignmentAction_ChangePropertyValueRequest_label);
-		this.textAlignment = textAlignment;
-	}
-
-	/**
-	 * Creates the left text alignment action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the left text alignment action.
-	 */
-	public static TextAlignmentAction createTextAlignmentLeftAction(
-			IWorkbenchPage workbenchPage) {
-		TextAlignmentAction action = new TextAlignmentAction(workbenchPage,
-				TextAlignment.LEFT_LITERAL);
-		action.setId(ActionIds.ACTION_TEXT_ALIGNMENT_LEFT);
-		action.setText(DiagramUIActionsMessages.TextAlignmentAction_left);
-		action
-				.setToolTipText(DiagramUIActionsMessages.TextAlignmentAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_LEFT);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_LEFT_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_LEFT);
-		return action;
-	}
-
-	/**
-	 * Creates the center text alignment action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the center text alignment action.
-	 */
-	public static TextAlignmentAction createTextAlignmentCenterAction(
-			IWorkbenchPage workbenchPage) {
-		TextAlignmentAction action = new TextAlignmentAction(workbenchPage,
-				TextAlignment.CENTER_LITERAL);
-		action.setId(ActionIds.ACTION_TEXT_ALIGNMENT_CENTER);
-		action.setText(DiagramUIActionsMessages.TextAlignmentAction_center);
-		action
-				.setToolTipText(DiagramUIActionsMessages.TextAlignmentAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_CENTER);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_CENTER_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_CENTER);
-		return action;
-	}
-
-	/**
-	 * Creates the right text alignment action.
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page.
-	 * @return the right text alignment action.
-	 */
-	public static TextAlignmentAction createTextAlignmentRightAction(
-			IWorkbenchPage workbenchPage) {
-		TextAlignmentAction action = new TextAlignmentAction(workbenchPage,
-				TextAlignment.RIGHT_LITERAL);
-		action.setId(ActionIds.ACTION_TEXT_ALIGNMENT_RIGHT);
-		action.setText(DiagramUIActionsMessages.TextAlignmentAction_right);
-		action
-				.setToolTipText(DiagramUIActionsMessages.TextAlignmentAction_ChangePropertyValueRequest_label);
-		action
-				.setImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_RIGHT);
-		action
-				.setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_RIGHT_DISABLED);
-		action
-				.setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_TEXT_ALIGNMENT_RIGHT);
-		return action;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (getId() == ActionIds.ACTION_TEXT_ALIGNMENT_LEFT
-				|| getId() == ActionIds.ACTION_TEXT_ALIGNMENT_CENTER
-				|| getId() == ActionIds.ACTION_TEXT_ALIGNMENT_RIGHT) {
-			for (ListIterator<?> li = getSelectedObjects().listIterator(); li
-					.hasNext();) {
-				Object object = li.next();
-				if (!(object instanceof IGraphicalEditPart)) {
-					return false;
-				}
-				IGraphicalEditPart node = (IGraphicalEditPart) object;
-				if (node.getModel() != null) {
-					View view = (View) node.getModel();
-					TextStyle style = (TextStyle) view
-							.getStyle(NotationPackage.Literals.TEXT_STYLE);
-					if (style == null) {
-						return false;
-					}
-				}
-			}
-		}
-
-		return super.calculateEnabled();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return textAlignment;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/TextAlignmentMenuManager.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/TextAlignmentMenuManager.java
deleted file mode 100644
index 7ba9628..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/TextAlignmentMenuManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 menu manager for text alignment.
- * 
- * @author Anthony Hunter
- */
-public class TextAlignmentMenuManager extends ActionMenuManager {
-
-	/**
-	 * The text alignment menu action containing the UI for the text alignment menu manager
-	 */
-	private static class TextAlignmentMenuAction extends Action {
-		public TextAlignmentMenuAction() {
-			setText(DiagramUIActionsMessages.TextAlignmentActionMenu_textAlignmentText);
-			setToolTipText(DiagramUIActionsMessages.TextAlignmentActionMenu_textAlignmentToolTip);
-		}
-	}
-
-	/**
-	 * Creates a new instance of the text alignment menu manager
-	 */
-	public TextAlignmentMenuManager() {
-		super(ActionIds.MENU_TEXT_ALIGNMENT, new TextAlignmentMenuAction(), true);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/UngroupAction.java b/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/UngroupAction.java
deleted file mode 100644
index 8c9bd38..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/UngroupAction.java
+++ /dev/null
@@ -1,52 +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.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.ui.IWorkbenchPage;
-
-/**
- * An action to ungroup a group of shapes.
- * 
- * @author crevells
- */
-public class UngroupAction
-    extends DiagramAction {
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param workbenchPage
-     */
-    public UngroupAction(IWorkbenchPage workbenchPage) {
-        super(workbenchPage);
-        setId(ActionIds.ACTION_UNGROUP);
-        setText(DiagramUIActionsMessages.GroupAction_Ungroup_ActionLabelText);
-        setToolTipText(DiagramUIActionsMessages.GroupAction_Ungroup_ActionToolTipText);
-        setImageDescriptor(DiagramUIActionsPluginImages.DESC_UNGROUP);
-        setDisabledImageDescriptor(DiagramUIActionsPluginImages.DESC_UNGROUP_DISABLED);
-        setHoverImageDescriptor(DiagramUIActionsPluginImages.DESC_UNGROUP);
-    }
-
-    protected Request createTargetRequest() {
-        return new Request(getId());
-    }
-
-    protected boolean isSelectionListener() {
-        return true;
-    }
-
-}
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 472d6d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewGridAction.java
+++ /dev/null
@@ -1,130 +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 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
- */
-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())){
-			// set checked to 'false' if the IDiagramWorkbenchPart doesn't have a
-			// graphical viewer or the viewer doesn't have a preference store
-			boolean shouldBeChecked = false;
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				
-				if (viewer != null) {
-					IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-					
-					if (preferenceStore != null) {
-						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 7389568..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewMenuManager.java
+++ /dev/null
@@ -1,43 +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
- */
-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 dd6a734..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewPageBreaksAction.java
+++ /dev/null
@@ -1,125 +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 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
- */
-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())){
-			// set checked to 'false' if the IDiagramWorkbenchPart doesn't have a
-			// graphical viewer or the viewer doesn't have a preference store
-			boolean shouldBeChecked = false;
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				
-				if (viewer != null) {
-					IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				
-					if (preferenceStore != null) {
-						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 0a41405..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ViewRulersAction.java
+++ /dev/null
@@ -1,126 +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 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
- */
-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())){
-			// set checked to 'false' if the IDiagramWorkbenchPart doesn't have a
-			// graphical viewer or the viewer doesn't have a preference store
-			boolean shouldBeChecked = false;
-			
-			if (workbenchPart instanceof IDiagramWorkbenchPart){
-				IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)workbenchPart).getDiagramGraphicalViewer();
-				
-				if (viewer != null) {
-					IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
-				
-					if (preferenceStore != null) {
-						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 efc5cc0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderAction.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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
- */
-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 ffe2fac..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/ZOrderMenuManager.java
+++ /dev/null
@@ -1,43 +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
- */
-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 87120fe..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-    public static String SelectConnectionEndAction_SelectSource_ActionLabelText;
-    public static String SelectConnectionEndAction_SelectSource_ActionToolTipText;
-    public static String SelectConnectionEndAction_SelectTarget_ActionLabelText;
-    public static String SelectConnectionEndAction_SelectTarget_ActionToolTipText;
-    public static String TextAlignmentActionMenu_textAlignmentText;
-    public static String TextAlignmentActionMenu_textAlignmentToolTip;
-    public static String TextAlignmentAction_ChangePropertyValueRequest_label;
-    public static String TextAlignmentAction_left;
-    public static String TextAlignmentAction_center;
-    public static String TextAlignmentAction_right;
-    public static String LineWidthActionMenu_lineWidthText;
-    public static String LineWidthActionMenu_lineWidthToolTip;
-    public static String LineWidthAction_ChangePropertyValueRequest_label;
-    public static String LineWidthAction_one;
-    public static String LineWidthAction_two;
-    public static String LineWidthAction_three;
-    public static String LineWidthAction_four;
-    public static String LineWidthAction_five;
-    public static String LineTypeActionMenu_lineTypeText;
-    public static String LineTypeActionMenu_lineTypeToolTip;
-    public static String LineTypeAction_ChangePropertyValueRequest_label;
-    public static String LineTypeAction_solid;
-    public static String LineTypeAction_dash;
-    public static String LineTypeAction_dot;
-    public static String LineTypeAction_dashdot;
-    public static String LineTypeAction_dashdotdot;
-    public static String ArrowTypeActionMenu_arrowTypeText;
-    public static String ArrowTypeActionMenu_arrowTypeToolTip;
-    public static String ArrowTypeActionMenu_arrowTypeSourceText;
-    public static String ArrowTypeActionMenu_arrowTypeSourceToolTip;
-    public static String ArrowTypeActionMenu_arrowTypeTargetText;
-    public static String ArrowTypeActionMenu_arrowTypeTargetToolTip;
-    public static String ArrowTypeAction_ChangePropertyValueRequest_label;
-    public static String ArrowTypeAction_none;
-    public static String ArrowTypeAction_solid;
-    public static String ArrowTypeAction_open;
-    
-	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 d5bb6d9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsMessages.properties
+++ /dev/null
@@ -1,335 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2004, 2008  IBM Corporation and others.                  |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-GroupAction_Group_ActionToolTipText=Group
-GroupAction_Ungroup_ActionLabelText=&Ungroup
-GroupAction_Ungroup_ActionToolTipText=Ungroup
-
-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
-
-SelectConnectionEndAction_SelectSource_ActionLabelText=Select Source
-SelectConnectionEndAction_SelectSource_ActionToolTipText=Select Source
-
-SelectConnectionEndAction_SelectTarget_ActionLabelText=Select Target
-SelectConnectionEndAction_SelectTarget_ActionToolTipText=Select Target
-
-
-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 selected 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
-
-
-# --- text alignment actions
-TextAlignmentActionMenu_textAlignmentText=&Text Alignment
-TextAlignmentActionMenu_textAlignmentToolTip=Text Alignment
-TextAlignmentAction_ChangePropertyValueRequest_label=Text Alignment
-TextAlignmentAction_left=&Left
-TextAlignmentAction_center=&Center
-TextAlignmentAction_right=&Right
-
-# --- line width actions
-LineWidthActionMenu_lineWidthText=Line &Width
-LineWidthActionMenu_lineWidthToolTip=Line Width
-LineWidthAction_ChangePropertyValueRequest_label=Line Width
-LineWidthAction_one=&One Point
-LineWidthAction_two=&Two Points
-LineWidthAction_three=T&hree Points
-LineWidthAction_four=&Four Points
-LineWidthAction_five=F&ive Points
-
-# --- line type actions
-LineTypeActionMenu_lineTypeText=Line T&ype
-LineTypeActionMenu_lineTypeToolTip=Line Type
-LineTypeAction_ChangePropertyValueRequest_label=Line Type
-LineTypeAction_solid=Sol&id
-LineTypeAction_dash=&Dash
-LineTypeAction_dot=D&ot
-LineTypeAction_dashdot=D&ash Dot
-LineTypeAction_dashdotdot=Da&sh Dot Dot
-
-# --- arrow type actions
-ArrowTypeActionMenu_arrowTypeText=Arrow Ty&pe
-ArrowTypeActionMenu_arrowTypeToolTip=Arrow Type
-ArrowTypeActionMenu_arrowTypeSourceText=&Source End
-ArrowTypeActionMenu_arrowTypeSourceToolTip=Source End
-ArrowTypeActionMenu_arrowTypeTargetText=&Target End
-ArrowTypeActionMenu_arrowTypeTargetToolTip=Target End
-ArrowTypeAction_ChangePropertyValueRequest_label=Arrow Type
-ArrowTypeAction_none=&No Arrow
-ArrowTypeAction_solid=&Solid Arrow
-ArrowTypeAction_open=&Open Arrow
\ 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/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 6190cb3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.actions/src/org/eclipse/gmf/runtime/diagram/ui/actions/internal/l10n/DiagramUIActionsPluginImages.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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$	
-
-    public static final ImageDescriptor DESC_GROUP = create(PREFIX_ENABLED + "group.gif"); //$NON-NLS-1$
-    public static final ImageDescriptor DESC_GROUP_DISABLED = create(PREFIX_DISABLED + "group.gif"); //$NON-NLS-1$
-    public static final ImageDescriptor DESC_UNGROUP = create(PREFIX_ENABLED + "ungroup.gif"); //$NON-NLS-1$
-    public static final ImageDescriptor DESC_UNGROUP_DISABLED = create(PREFIX_DISABLED + "ungroup.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_LEFT = create(PREFIX_ENABLED
-			+ "alignleft.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_LEFT_DISABLED = create(PREFIX_DISABLED
-			+ "alignleft.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_CENTER = create(PREFIX_ENABLED
-			+ "aligncenter.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_CENTER_DISABLED = create(PREFIX_DISABLED
-			+ "aligncenter.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_RIGHT = create(PREFIX_ENABLED
-			+ "alignright.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_RIGHT_DISABLED = create(PREFIX_DISABLED
-			+ "alignright.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_LINE_WIDTH = create(PREFIX_ENABLED
-			+ "line_width.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_DISABLED = create(PREFIX_DISABLED
-			+ "line_width.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_ONE = create(PREFIX_ENABLED
-			+ "line_width_one.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_ONE_DISABLED = create(PREFIX_DISABLED
-			+ "line_width_one.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_TWO = create(PREFIX_ENABLED
-			+ "line_width_two.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_TWO_DISABLED = create(PREFIX_DISABLED
-			+ "line_width_two.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_THREE = create(PREFIX_ENABLED
-			+ "line_width_three.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_THREE_DISABLED = create(PREFIX_DISABLED
-			+ "line_width_three.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_FOUR = create(PREFIX_ENABLED
-			+ "line_width_four.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_FOUR_DISABLED = create(PREFIX_DISABLED
-			+ "line_width_four.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_FIVE = create(PREFIX_ENABLED
-			+ "line_width_five.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_WIDTH_FIVE_DISABLED = create(PREFIX_DISABLED
-			+ "line_width_five.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_ARROW_TYPE = create(PREFIX_ENABLED
-			+ "arrow_type.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_DISABLED = create(PREFIX_DISABLED
-			+ "arrow_type.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_NONE = create(PREFIX_ENABLED
-			+ "arrow_type_none.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_NONE_DISABLED = create(PREFIX_DISABLED
-			+ "arrow_type_none.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_OPEN = create(PREFIX_ENABLED
-			+ "arrow_type_open.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_OPEN_DISABLED = create(PREFIX_DISABLED
-			+ "arrow_type_open.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_SOLID = create(PREFIX_ENABLED
-			+ "arrow_type_solid.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ARROW_TYPE_SOLID_DISABLED = create(PREFIX_DISABLED
-			+ "arrow_type_solid.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_LINE_TYPE = create(PREFIX_ENABLED
-			+ "line_type.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DISABLED = create(PREFIX_DISABLED
-			+ "line_type.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_SOLID = create(PREFIX_ENABLED
-			+ "line_type_solid.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_SOLID_DISABLED = create(PREFIX_DISABLED
-			+ "line_type_solid.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH = create(PREFIX_ENABLED
-			+ "line_type_dash.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH_DISABLED = create(PREFIX_DISABLED
-			+ "line_type_dash.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DOT = create(PREFIX_ENABLED
-			+ "line_type_dot.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DOT_DISABLED = create(PREFIX_DISABLED
-			+ "line_type_dot.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH_DOT = create(PREFIX_ENABLED
-			+ "line_type_dash_dot.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH_DOT_DISABLED = create(PREFIX_DISABLED
-			+ "line_type_dash_dot.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH_DOT_DOT = create(PREFIX_ENABLED
-			+ "line_type_dash_dot_dot.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINE_TYPE_DASH_DOT_DOT_DISABLED = create(PREFIX_DISABLED
-			+ "line_type_dash_dot_dot.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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 715e1f0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8f1e197..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:00:57 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 455b0d2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.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.diagram.ui.dnd
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 64daa5e..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui.dnd/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.dnd/pom.xml
deleted file mode 100644
index bcdecce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.dnd</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.dnd</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 99d9066..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.dnd/src/org/eclipse/gmf/runtime/diagram/ui/dnd/parts/DiagramViewerDropAdapter.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.core.runtime.Assert;
-import org.eclipse.gef.dnd.DelegatingDropAdapter;
-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;
-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;
-
-/**
- * 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 c2639b2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.geoshapes</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 586dea9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:01:09 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 a80d266..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/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.ui.geoshapes; singleton:=true
-Bundle-Version: 1.4.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",
- org.eclipse.gmf.runtime.diagram.ui.geoshapes.type
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 7e51cb2..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 Modeling Project
-
-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 bceb9e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/plugin.xml
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2008  IBM Corporation and others.                       -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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"
-                  description="%GeoshapeDrawer.Description"
-                  id="geoshapeDrawer"
-                  kind="drawer"
-                  label="%GeoshapeDrawer.Label"
-                  large_icon="icons/IconEllipse24.gif"
-                  path="/"
-                  small_icon="icons/IconEllipse.gif">
-            </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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/pom.xml
deleted file mode 100644
index bee4c3b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.geoshapes</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.geoshapes</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 2c810d0..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,149 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-import org.eclipse.swt.graphics.Path;
-
-/**
- * @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<Point> points = computePoints( getBounds().getCopy().shrink(getLineWidth() / 2, getLineWidth() / 2) );
-
-		PointList outline = new PointList();
-		for( int index = 0; index < 6; index++ ) {
-			outline.addPoint( (Point)points.get( index ) );
-		}
-
-		g.pushState();
-		// don't apply transparency to the outline
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			// Fill the shape with the fill color
-			g.fillPolygon(outline);
-		} else {
-			fillGradient(g, getPath(points));
-		}
-		g.popState();
-
-		// set the line type and line width
-		g.setLineStyle(getLineStyle());
-		g.setLineWidth(getLineWidth());
-		
-		// Draw the shape's outline
-		g.drawPolygon(outline);
-
-		// Draw the remaining lines
-		Point p2 = (Point) points.get(1);
-		Point p4 = (Point) points.get(3);
-		Point p6 = (Point) points.get(5);
-		Point p7 = (Point) points.get(6);
-		g.drawLine(p6, p7);
-		g.drawLine(p7, p4);
-		g.drawLine(p7, p2);
-	}
-
-	private List<Point> computePoints( Rectangle rect ) {
-		List<Point> toReturn = new ArrayList<Point>();
-		
-		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<Point> 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;
-	}
-	
-	/**
-	 * Creates the path corresponding to this figure based on given points.
-	 * 
-	 * @param points
-	 * @return created path
-	 * @since 1.2
-	 */
-	protected Path getPath(List<Point> points) {
-		Path path = new Path(null);
-		Point pt = (Point)points.get(0);
-		path.moveTo(pt.x, pt.y);
-		for( int index = 1; index < 6; index++ ) {
-			pt = (Point)points.get(index);
-			path.lineTo(pt.x, pt.y);
-		}
-		path.close();
-		return path;
-	}
-
-}
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 b6fb4d0..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,255 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.IPolygonAnchorableFigure;
-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.swt.SWT;
-import org.eclipse.swt.graphics.Path;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Cylinder Figure
- */
-public class GeoShapeCylinderFigure extends GeoShapeFigure implements IPolygonAnchorableFigure {
-
-    // cache the anchor border point list since the calculation is costly.
-    private PointList anchorBorderPointList;
-    
-	/**
-	 * 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) {
-		g.pushState();
-		// don't apply transparency to the outline
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			// Fill cylinder with fill color
-			g.setFillRule(SWT.FILL_WINDING);
-			Path path = getPath();
-			try {
-				g.fillPath(path);
-			} finally {
-				path.dispose();
-			}
-		} else {
-			// Use gradient info to fill the cylinder with gradient
-			fillGradient(g, SWT.FILL_WINDING);
-		}
-		g.popState();
-
-		// Now draw the border
-		Rectangle r = getBounds().getCopy();
-		r.shrink(getLineWidth() / 2, getLineWidth() / 2);
-		int height = getTopHeight(r);
-		Rectangle ellipse = new Rectangle(r.x, r.y, r.width, height + 1);
-		Rectangle middle = new Rectangle(r.x, r.y + (height / 2), r.width,
-				r.height - height);
-		Rectangle lowerArc = new Rectangle(r.x, r.y + r.height - height - 1,
-				r.width - 1, height);
-
-		// set the line type and line width
-		g.setLineStyle(getLineStyle());
-		g.setLineWidth(getLineWidth());
-
-		// 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);
-
-		// Draw the lower arc outline
-		g.drawLine(middle.x + middle.width - 1, middle.y, middle.x
-				+ middle.width - 1, middle.y + middle.height);
-		g.drawArc(lowerArc, 180, 180);
-    }
-        
-    /**
-     * Estimate the anchor intersection points by using a polyline smoothed
-     * with bezier curves for the rounded top and bottom arcs. 
-     * 
-     * @return PointList of the border of the cylinder shape
-     */
-    protected PointList getAnchorBorderPointList() {
-        Rectangle rBounds = getBounds();
-        
-        if (rBounds.isEmpty()) {
-        	return new PointList(new int[]{rBounds.x, rBounds.y});
-        }
-        
-        // similar calculations as those made in paintFigure()
-        int height = (int) (rBounds.height * 0.25);
-        Rectangle rUpperEllipse = new Rectangle( rBounds.x,rBounds.y, rBounds.width, height );
-        Rectangle rMiddle = new Rectangle( rBounds.x, rBounds.y + height/2, rBounds.width, rBounds.height - height + 1 ); 
-        Rectangle rLowerEllipse = new Rectangle( rBounds.x, rBounds.y + rBounds.height - height - 1, rBounds.width, height );   
-        
-        // working our way counter-clockwise, find key points.
-        Point keyPoint1 = new PrecisionPoint(rMiddle.getTopLeft().x, rMiddle.getTopLeft().y);
-        Point keyPoint2 = new PrecisionPoint(rMiddle.getBottomLeft().x, rMiddle.getBottomLeft().y);
-        Point keyPoint3 = new PrecisionPoint(rMiddle.getBottomRight().x, rMiddle.getBottomRight().y);
-        Point keyPoint4 = new PrecisionPoint(rMiddle.getTopRight().x, rMiddle.getTopRight().y);
-               
-        // build point list for upper ellipse
-        PointList upperPointList = new PointList();
-        upperPointList.addPoint(keyPoint4); // top-right
-        
-        // Intermediate segments to estimate the top arc
-        LineSeg lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopRight().x - rUpperEllipse.width/32, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/32, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopRight().x - rUpperEllipse.width/12, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/12, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopRight().x - rUpperEllipse.width/8, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/8, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopRight().x - rUpperEllipse.width/4, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/4, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-                    
-        upperPointList.addPoint(rUpperEllipse.getCenter().x , rUpperEllipse.getCenter().y - rUpperEllipse.height/2); // center.
-                
-        lineSeg = new LineSeg(new Point(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/4, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/4, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/8, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/8, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/12, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/12, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/32, rUpperEllipse.getTopRight().y ), 
-            new PrecisionPoint(rUpperEllipse.getTopLeft().x + rUpperEllipse.width/32, rUpperEllipse.getCenter().y) );
-        upperPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rUpperEllipse).getLastPoint());
-                
-        upperPointList.addPoint(keyPoint1); // top-left
-                       
-        // build point list for lower ellipse
-        PointList lowerPointList = new PointList();
-        lowerPointList.addPoint(keyPoint2); // bottom-left
-       
-        // intermediate segments to estimate the bottom arc
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/32, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/32, rLowerEllipse.getBottomLeft().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/12, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/12, rLowerEllipse.getBottomLeft().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/8, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/8, rLowerEllipse.getBottomLeft().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/4, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomLeft().x + rUpperEllipse.width/4, rLowerEllipse.getBottomLeft().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        
-        lowerPointList.addPoint(rLowerEllipse.getCenter().x , rLowerEllipse.getCenter().y + rLowerEllipse.height/2); // center.
-        
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/4, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/4, rLowerEllipse.getBottomRight().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/8, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/8, rLowerEllipse.getBottomRight().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/12, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/12, rLowerEllipse.getBottomRight().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-        lineSeg = new LineSeg(new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/32, rLowerEllipse.getCenter().y ), 
-            new PrecisionPoint(rUpperEllipse.getBottomRight().x - rUpperEllipse.width/32, rLowerEllipse.getBottomRight().y) );
-        lowerPointList.addPoint(lineSeg.getLineIntersectionsWithEllipse(rLowerEllipse).getFirstPoint());
-                
-        lowerPointList.addPoint(keyPoint3); // bottom-right
-                       
-        // combine all the points and close the polyline moving counter clockwise
-        PointList combinedPointList = new PointList();
-        combinedPointList.addPoint(keyPoint1);
-        combinedPointList.addPoint(keyPoint2);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            lowerPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint3);
-        combinedPointList.addPoint(keyPoint4);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            upperPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint1);
-
-        PointListUtilities.normalizeSegments(combinedPointList);
-
-        return combinedPointList;  
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.draw2d.Figure#setBounds(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    public void setBounds(Rectangle rect) {
-        super.setBounds(rect);
-        anchorBorderPointList = null;
-    }
-
-   /*
-    * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-    */
-    public PointList getPolygonPoints() {
-        if (anchorBorderPointList == null) {
-            anchorBorderPointList = getAnchorBorderPointList();
-        }
-        return anchorBorderPointList.getCopy();
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getPath()
-	 * @since 1.2
-	 */
-	protected Path getPath() {
-		Rectangle r = getBounds().getCopy();
-		r.shrink(getLineWidth() / 2, getLineWidth() / 2);
-		int height = getTopHeight(r);
-		Path path = new Path(null);
-		path.addArc(r.x, r.y, r.width, height, 0, -360);
-		path.addRectangle(r.x, r.y + (height / 2), r.width, r.height - height
-				- 1);
-		path.addArc(r.x, r.y + r.height - height - 1, r.width - 1, height, 0,
-				-360);
-		return path;
-	}
-
-	/**
-	 * @param r
-	 * @return
-	 * @since 1.2
-	 */
-	private int getTopHeight(Rectangle r) {
-		return (int) (r.height * 0.25);
-	}
-
-}
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 640410c..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,125 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-import org.eclipse.swt.graphics.Path;
-
-/**
- * This Figure represents a Ellipse Figure
- * 
- * @author jschofie
- */
-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 = getOvalBounds().getCopy();
-		r.shrink(getLineWidth() / 2, getLineWidth() / 2);
-		
-		g.pushState();
-		// don't apply transparency to the outline
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			// fill the ellipse with the fill color
-			g.fillOval(r);			
-		} else {
-			// gradient		
-			fillGradient(g);			
-		}
-		g.popState();
-		
-		// Set the line type and line width for the outline
-		g.setLineStyle(getLineStyle());
-		g.setLineWidth(getLineWidth());		
-		
-		// Draw the ellipse outline
-		g.drawOval(r);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.figures.IOvalAnchorableFigure#getOvalBounds()
-	 */
-	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)
-			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);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getPath()
-	 * @since 1.2
-	 */
-	protected Path getPath() {
-		Path path = new Path(null);	
-		Rectangle r = getOvalBounds().getCopy();
-		r.shrink(getLineWidth() / 2, getLineWidth() / 2);
-		path.addArc(r.x, r.y, r.width, r.height, 0, 360);
-		return path;
-	}
-}
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 2908eed..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,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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 491f77b..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,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-
-/**
- * @author jschofie
- * @author aboyko
- *
- * 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);
-	}
-	
-	/**
-	 * Constructor - Creates a proper hexagon with a given default height
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeHexagonFigure(int height, int spacing) {
-		super((int) Math.round(2 * height / Math.sqrt(3)), 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 PrecisionPointList();
-		
-		Point p1 = new PrecisionPoint( rect.preciseX() + rect.preciseWidth() - 1, rect.preciseY() + rect.preciseHeight() / 2 );
-		Point p2 = new PrecisionPoint( rect.preciseX() + 0.75 * rect.preciseWidth() , rect.preciseY() );
-		Point p3 = new PrecisionPoint( rect.preciseX() + rect.preciseWidth() / 4, rect.preciseY() );
-		Point p4 = new PrecisionPoint( rect.preciseX(), rect.preciseY() + rect.preciseHeight() / 2 );
-		Point p5 = new PrecisionPoint( p3.preciseX(), rect.preciseY() + rect.preciseHeight() - 1 );
-		Point p6 = new PrecisionPoint( p2.preciseX(), p5.preciseY() );
-
-		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/GeoShapeLineStyleBorder.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java
deleted file mode 100644
index 43a1a84..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Extends {@link org.eclipse.draw2d.LineBorder} to customize painting.
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class GeoShapeLineStyleBorder extends LineBorder {
-
-	/**
-	 * Constructs a default black LineBorder with a width of one pixel.
-	 * 
-	 * @since 2.1
-	 */
-	public GeoShapeLineStyleBorder() {
-		super();
-	}
-
-	/*
-	 * @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) {
-		Rectangle bounds = getPaintRectangle(figure, insets).getCopy();
-		bounds.x = bounds.x + getWidth() / 2;
-		bounds.y = bounds.y + getWidth() / 2;
-		bounds.width = bounds.width - Math.max(1, getWidth());
-		bounds.height = bounds.height - Math.max(1, getWidth());
-		graphics.setLineWidth(getWidth());
-		graphics.setLineStyle(getStyle());
-		if (getColor() != null)
-			graphics.setForegroundColor(getColor());
-		graphics.drawRectangle(bounds);
-	}
-}
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 e97eb91..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,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-
-/**
- * @author jschofie
- * @author aboyko
- *
- * This Figure represents a Octagon Figure
- */
-public class GeoShapeOctagonFigure extends GeoShapePolygonFigure {
-	
-	private static double factor = 1.0 / (2.0 + Math.sqrt(2.0));
-
-	/**
-	 * 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);
-	}
-	
-	/**
-	 * Constructor - Creates a proper octagon with a given Default height
-	 * 
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeOctagonFigure(int size, int spacing) {
-		super(size, size, 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) {
-
-		double xOffset = rect.preciseWidth() * factor;
-		double yOffset = rect.preciseHeight() * factor;
-		
-		PointList points = new PrecisionPointList();
-
-		Point p1 = new PrecisionPoint(rect.preciseX(), rect.preciseY() + yOffset);
-		Point p2 = new PrecisionPoint(rect.preciseX() + xOffset, rect.preciseY());
-		Point p3 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() - xOffset, rect.preciseY());
-		Point p4 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() - 1, rect.preciseY() + yOffset);
-		Point p5 = new PrecisionPoint(p4.preciseX(), rect.preciseY() + rect.preciseHeight() - yOffset);
-		Point p6 = new PrecisionPoint(p3.preciseX(), rect.preciseY() + rect.preciseHeight() - 1);
-		Point p7 = new PrecisionPoint(p2.preciseX(), p6.preciseY());
-		Point p8 = new PrecisionPoint(rect.preciseX(), p5.preciseY());
-	
-		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 357932e..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,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-
-/**
- * @author jschofie
- * @author aboyko
- *
- * This Figure represents a Pentagon Figure
- */
-public class GeoShapePentagonFigure extends GeoShapePolygonFigure {
-	
-	private final static double WIDTH_FACTOR = 2 * Math.sin(0.4 * Math.PI) / (1 + Math.cos(0.2 * Math.PI));
-	private final static double BOTTOM_OFFSET_FACTOR = 1 / (4 * Math.cos(0.2 * Math.PI));
-	private final static double SIDE_OFFSET_FACTOR = (1 - Math.cos(0.4 * Math.PI)) / (1 + Math.cos(0.2 * Math.PI));
-
-	/**
-	 * 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);
-	}
-	
-	/**
-	 * Constructor - Creates a proper pentagon with a given height
-	 * 
-	 * @param height initial height of the figure
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapePentagonFigure(int height, int spacing) {
-		this((int) Math.round(WIDTH_FACTOR * height), 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 PrecisionPointList();
-		
-		Point p1 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() / 2, rect.preciseY());
-		Point p2 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() - 1, rect.preciseY() + rect.preciseHeight() * SIDE_OFFSET_FACTOR);
-		Point p3 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() * (0.5 + BOTTOM_OFFSET_FACTOR), rect.preciseY() + rect.preciseHeight() - 1);
-		Point p4 = new PrecisionPoint(rect.preciseX() + rect.preciseWidth() * (0.5 - BOTTOM_OFFSET_FACTOR), p3.preciseY());
-		Point p5 = new PrecisionPoint(rect.preciseX(), p2.preciseY());
-		
-		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 7cb3d09..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,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.swt.graphics.Path;
-
-/**
- * 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(getWidthSpecificBounds());
-
-		g.pushState();
-		// don't apply transparency to the outline
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			g.fillPolygon(points);
-		} else {
-			fillGradient(g, getPath(points));
-		}
-		g.popState();
-
-		// set the line type and line width
-		g.setLineStyle(getLineStyle());
-		g.setLineWidth(getLineWidth());
-
-		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());
-	}
-	
-	/**
-	 * Returns bounds used for painting the figure. Normally, the bounds decreases as the line width increases
-	 * in order to avoid cropping of shape outline.
-	 * 
-	 * @return customized bounds
-	 */
-	protected Rectangle getWidthSpecificBounds() {
-		return getBounds().getCopy().shrink(getLineWidth() / 2, getLineWidth() / 2);
-	}
-
-	/**
-	 * @param points
-	 * @return
-	 * @since 1.2
-	 */
-	protected Path getPath(PointList points) {
-		Path path = new Path(null);
-		if (points.size() > 2) {
-			Point pt = points.getFirstPoint();
-			path.moveTo(pt.x, pt.y);
-			for (int index = 1; index < points.size(); index++) {
-				pt = points.getPoint(index);
-				path.lineTo(pt.x, pt.y);
-			}
-			path.close();
-		}
-		return path;
-	}
-}
\ 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 2f32a73..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,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * @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)
-	 * @since 1.2
-	 */
-	protected void paintFigure(Graphics g) {
-		applyTransparency(g);
-		if (!isUsingGradient()) {		
-			g.fillRectangle(getClientArea());
-		} else {
-			fillGradient(g);
-		}		
-    }
-	
-
-}
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 52d6d3a..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,206 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.RoundedRectangleBorder;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-import org.eclipse.swt.graphics.Path;
-
-/**
- * @author jschofie
- *
- * This Figure represents a Rounded Rectangle Figure
- */
-public class GeoShapeRoundedRectangleFigure extends GeoShapeFigure implements IPolygonAnchorableFigure {
-    
-    // cache the anchor border point list since the calculation is costly.
-    private PointList anchorBorderPointList;
-    
-	/**
-	 * 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
-	 */
-	public GeoShapeRoundedRectangleFigure( int width, int height, int spacing) {
-		super(width, height, spacing);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		Rectangle r = getBounds().getCopy().shrink(getLineWidth() / 2, getLineWidth() / 2);
-
-		int cornerRadius = getCornerRadius();
-
-		g.pushState();
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			// Draw the rectangle with the fill color
-			g.fillRoundRectangle(r, cornerRadius, cornerRadius);
-		} else {
-			fillGradient(g);
-		}
-		g.popState();
-	}
-
-	/**
-     * Estimate the anchor intersection points by using a polyline smoothed
-     * with bezier curves for the rounded top and bottom arcs.
-     * 
-     * @return PointList of the border of the shape
-     */
-    public PointList getAnchorBorderPointList() {
-    	int arcSize = getCornerRadius();
-        PrecisionRectangle rBounds = new PrecisionRectangle(getBounds());
-        if (arcSize == 0) {
-        	// rectangle, no rounded corners
-    		PrecisionPointList ptList = new PrecisionPointList(5);
-    		ptList.addPoint(new PrecisionPoint(rBounds.preciseX, rBounds.preciseY));
-    		ptList.addPoint(new PrecisionPoint(rBounds.preciseX + rBounds.preciseWidth, rBounds.preciseY));
-    		ptList.addPoint(new PrecisionPoint(rBounds.preciseX + rBounds.preciseWidth, rBounds.preciseY + rBounds.preciseHeight));
-    		ptList.addPoint(new PrecisionPoint(rBounds.preciseX, rBounds.preciseY + rBounds.preciseHeight));
-    		ptList.addPoint(new PrecisionPoint(rBounds.preciseX, rBounds.preciseY));
-    		return ptList;        	
-        }
-
-        // working our way counter-clockwise find key points.
-        Point keyPoint1 = new PrecisionPoint(rBounds.getTopLeft().x + arcSize/2, rBounds.getTopLeft().y);
-        Point keyPoint2 = new PrecisionPoint(rBounds.getTopLeft().x, rBounds.getTopLeft().y  + arcSize/2);
-        Point keyPoint3 = new PrecisionPoint(rBounds.getBottomLeft().x, rBounds .getBottomLeft().y - arcSize/2);
-        Point keyPoint4 = new PrecisionPoint(rBounds.getBottomLeft().x + arcSize/2, rBounds.getBottomLeft().y);
-        Point keyPoint5 = new PrecisionPoint(rBounds.getBottomRight().x - arcSize/2, rBounds.getBottomRight().y);
-        Point keyPoint6 = new PrecisionPoint(rBounds.getBottomRight().x, rBounds.getBottomRight().y - arcSize/2);
-        Point keyPoint7 = new PrecisionPoint(rBounds.getTopRight().x, rBounds.getTopRight().y  + arcSize/2);
-        Point keyPoint8 = new PrecisionPoint(rBounds.getTopRight().x - arcSize/2, rBounds.getTopRight().y);
-        
-        // create point lists for the corners
-        PointList upperLeftPointList = new PointList();
-        upperLeftPointList.addPoint(keyPoint1); 
-        upperLeftPointList.addPoint(rBounds.getTopLeft().x + arcSize/4, rBounds.getTopLeft().y + arcSize/16);
-        upperLeftPointList.addPoint(rBounds.getTopLeft().x + arcSize/16, rBounds.getTopLeft().y + arcSize/4);
-        upperLeftPointList.addPoint(keyPoint2); 
-       
-        PointList lowerLeftPointList = new PointList();
-        lowerLeftPointList.addPoint(keyPoint3);
-        lowerLeftPointList.addPoint(rBounds.getBottomLeft().x + arcSize/16, rBounds.getBottomLeft().y - arcSize/4);
-        lowerLeftPointList.addPoint(rBounds.getBottomLeft().x + arcSize/4, rBounds.getBottomLeft().y - arcSize/16);
-        lowerLeftPointList.addPoint(keyPoint4);
-        
-        PointList lowerRightPointList = new PointList();
-        lowerRightPointList.addPoint(keyPoint5);
-        lowerRightPointList.addPoint(rBounds.getBottomRight().x - arcSize/4, rBounds.getBottomRight().y - arcSize/16);
-        lowerRightPointList.addPoint(rBounds.getBottomRight().x - arcSize/16, rBounds.getBottomRight().y - arcSize/4);
-        lowerRightPointList.addPoint(keyPoint6);
-       
-        PointList upperRightPointList = new PointList();
-        upperRightPointList.addPoint(keyPoint7);
-        upperRightPointList.addPoint(rBounds.getTopRight().x - arcSize/16, rBounds.getTopRight().y + arcSize/4);
-        upperRightPointList.addPoint(rBounds.getTopRight().x - arcSize/4, rBounds.getTopRight().y + arcSize/16);
-        upperRightPointList.addPoint(keyPoint8);
-        
-        // combine all the points and smooth out the corners with bezier curves.
-        PointList combinedPointList = new PointList();
-        combinedPointList.addPoint(keyPoint1);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            upperLeftPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint2);
-        combinedPointList.addPoint(keyPoint3);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            lowerLeftPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint4);
-        combinedPointList.addPoint(keyPoint5);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            lowerRightPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint6);
-        combinedPointList.addPoint(keyPoint7);
-        combinedPointList.addAll(PointListUtilities.calcSmoothPolyline(
-            upperRightPointList, PolylineConnectionEx.SMOOTH_MORE,
-            PointListUtilities.DEFAULT_BEZIERLINES));
-        combinedPointList.addPoint(keyPoint8);
-        combinedPointList.addPoint(keyPoint1); 
-
-        PointListUtilities.normalizeSegments(combinedPointList);
-
-        return combinedPointList;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.draw2d.Figure#setBounds(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    public void setBounds(Rectangle rect) {
-        super.setBounds(rect);
-        anchorBorderPointList = null;
-    }
-    
-    /*
-     * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-     */
-    public PointList getPolygonPoints() {
-        if (anchorBorderPointList == null) {
-            anchorBorderPointList = getAnchorBorderPointList();
-        }
-        return anchorBorderPointList.getCopy();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getPath()
-	 * @since 1.2
-     */
-    protected Path getPath() {
-    	Path path = new Path(null);
-        
-    	int arcSize = getCornerRadius();
-        PrecisionRectangle rBounds = new PrecisionRectangle(getBounds());
-        rBounds.shrink(getLineWidth() / 2, getLineWidth() / 2);
-        int x = rBounds.x;
-        int y = rBounds.y;
-        int width = rBounds.width;
-        int height = rBounds.height;
-        
-        // start from top left "corner" and move clockwise
-        path.addArc(x, y, arcSize, arcSize, 90, 90);
-        path.lineTo(x, y + height - arcSize/2);
-		path.addArc(x, y+height-arcSize, arcSize, arcSize, 180, 90);
-		path.lineTo(x + width - arcSize/2, y + height);
-		path.addArc(x + width - arcSize, y+height-arcSize, arcSize, arcSize, 0, -90);
-		path.lineTo(x + width, y + height - arcSize/2);
-		path.addArc(x + width - arcSize, y, arcSize, arcSize, 0, 90);
-        path.close();        
-        
-    	return path;
-    }
-    
-    /**
-     * @return Radius from RoundedRectangleBorder 
-     */
-    private int getCornerRadius() {
-    	return ((RoundedRectangleBorder)getBorder()).getArcHeight();
-    }
-    
-}
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 d1f6c05..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,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-
-/**
- * @author jschofie
- * @author aboyko
- *
- * This Figure represents a Triangle Figure
- */
-public class GeoShapeTriangleFigure extends GeoShapePolygonFigure {
-
-	/**
-	 * Constructor - Creates a Triangle with a given Default size
-	 * 
-	 * @param height inital height of the bounding square
-	 * @param spacing <code>int</code> that is the margin between children in logical units
-	 */
-	public GeoShapeTriangleFigure(int height, int spacing) {
-		super((int)Math.round(2 * height / Math.sqrt(3)), 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 PrecisionPointList();
-		
-		Point p1 = new PrecisionPoint( rect.preciseX() + rect.preciseWidth() / 2, rect.y );
-		Point p2 = new PrecisionPoint( rect.preciseX(), rect.preciseY() + rect.preciseHeight() - 1 );
-		Point p3 = new PrecisionPoint( rect.preciseX() + rect.preciseWidth() - 1, rect.preciseY() + rect.preciseHeight() - 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 dcc2b83..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/GeoShapeEditPart.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.common.notify.Notification;
-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);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		((NodeFigure) getFigure()).setLineWidth(getMapMode().DPtoLP(width));
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
-			refreshLineWidth();
-		} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(
-				feature)) {
-			refreshLineType();
-		} else {
-			super.handleNotificationEvent(notification);
-		}
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLineWidth();
-		refreshLineType();
-		refreshTransparency();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		((NodeFigure) getFigure()).setLineStyle(lineType);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#supportsGradient()
-	 * @since 1.2
-	 */
-	public boolean supportsGradient() {
-		return true;
-	}	
-}
\ 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/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 1f960da..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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(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 60e2923..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/LineEditPart.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.draw2d.RotatableDecoration;
-import org.eclipse.emf.common.notify.Notification;
-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.NotationPackage;
-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());
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.Literals.LINE_STYLE__LINE_WIDTH.equals(feature)) {
-			refreshLineWidth();
-			refreshArrowSource();
-			refreshArrowTarget();
-		} else if (NotationPackage.Literals.LINE_TYPE_STYLE__LINE_TYPE
-				.equals(feature)) {
-			refreshLineType();
-		} else if (NotationPackage.Literals.ARROW_STYLE__ARROW_SOURCE
-				.equals(feature)) {
-			refreshArrowSource();
-		} else if (NotationPackage.Literals.ARROW_STYLE__ARROW_TARGET
-				.equals(feature)) {
-			refreshArrowTarget();
-		} else {
-			super.handleNotificationEvent(notification);
-		}
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLineWidth();
-		refreshLineType();
-		refreshArrowSource();
-		refreshArrowTarget();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setLineWidth(getMapMode().DPtoLP(width));
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setLineStyle(lineType);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setArrowSource(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	protected void setArrowSource(RotatableDecoration arrowDecoration) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setSourceDecoration(arrowDecoration);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setArrowTarget(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	protected void setArrowTarget(RotatableDecoration arrowDecoration) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setTargetDecoration(arrowDecoration);
-	}
-
-}
\ 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 6cee7ab..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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(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 b3c208d..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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(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 83e1430..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RectangleEditPart.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.diagram.ui.geoshapes.internal.draw2d.figures.GeoShapeLineStyleBorder;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-	
-/**
- * Controls the interactions between the figure and
- * its underlying view 
- *
- * @author jschofie
- */
-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() {
-		NodeFigure nodeFigure = new GeoShapeRectangleFigure( getMapMode().DPtoLP(50), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5) );
-		GeoShapeLineStyleBorder lineBorder = new GeoShapeLineStyleBorder();
-		lineBorder.setWidth(getMapMode().DPtoLP(getLineWidth()));
-		lineBorder.setStyle(getLineType());
-		nodeFigure.setBorder(lineBorder);
-        return nodeFigure;
-    }
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		super.setLineWidth(width);
-		GeoShapeLineStyleBorder lineBorder = (GeoShapeLineStyleBorder)((NodeFigure)getFigure()).getBorder();
-		lineBorder.setWidth(getMapMode().DPtoLP(width));
-		getFigure().revalidate();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		super.setLineType(lineType);
-		GeoShapeLineStyleBorder lineBorder = (GeoShapeLineStyleBorder)((NodeFigure)getFigure()).getBorder();
-		lineBorder.setStyle(lineType);
-	}
-
-}
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 da5ef25..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/RoundedRectangleEditPart.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.Iterator;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-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.draw2d.ui.figures.RoundedRectangleBorder;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RoundedCornersStyle;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author jschofie, lgrahek
- *
- * 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);
-	}
-				
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#createNodeFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-		NodeFigure nodeFigure = new GeoShapeRoundedRectangleFigure(getMapMode()
-				.DPtoLP(100), getMapMode().DPtoLP(50), getMapMode().DPtoLP(5));
-		RoundedRectangleBorder border = new RoundedRectangleBorder(getMapMode()
-				.DPtoLP(8), getMapMode().DPtoLP(8));
-		border.setWidth(getMapMode().DPtoLP(getLineWidth()));
-		border.setStyle(getLineType());
-		nodeFigure.setBorder(border);	
-		return nodeFigure;
-	}	
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
-	 * @since 1.4
-	 */
-	@Override
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.Literals.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS == feature) {
-            refreshRoundedCorners();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#refreshVisuals()
-	 * @since 1.4
-	 */
-	@Override
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshRoundedCorners();
-	}
-
-	/**
-	 * Refreshes radius for rounded corners (radius smaller than 1 indicates
-	 * that corners should not be rounded).
-	 * 
-	 * @since 1.4
-	 */
-    protected void refreshRoundedCorners() {
-		RoundedCornersStyle style = (RoundedCornersStyle) ((View) getModel())
-				.getStyle(NotationPackage.Literals.ROUNDED_CORNERS_STYLE);
-		if (style != null && (getNodeFigure().getBorder() instanceof RoundedRectangleBorder)) {
-			RoundedRectangleBorder border = (RoundedRectangleBorder)getNodeFigure().getBorder();
-			int radius = getMapMode().DPtoLP(style.getRoundedBendpointsRadius());
-			// user enters radius, while diameter is expected when drawing rounded rectangle, so multiply by 2
-			border.setArcWidth(radius*2);
-			border.setArcHeight(radius*2);
-			getFigure().repaint();
-		}
-		refreshConnections();
-    }	
-    
-	/**
-	 * Refreshes all connectors. This is needed when the border changes (corners
-	 * become more or less rounded)
-	 * 
-	 * @since 1.4
-	 */
-    protected void refreshConnections() {
-    	Iterator<?> conns = getTargetConnections().iterator();
-    	while (conns.hasNext()) {
-    		((Connection)((ConnectionEditPart)conns.next()).getFigure()).revalidate();
-    	}
-    	conns = getSourceConnections().iterator();
-    	while (conns.hasNext()) {
-    		((Connection)((ConnectionEditPart)conns.next()).getFigure()).revalidate();
-    	}    	
-    }
-    
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineWidth(int)
-	 * @since 1.4
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		super.setLineWidth(width);
-		LineBorder lineBorder = (LineBorder)getNodeFigure().getBorder();
-		lineBorder.setWidth(getMapMode().DPtoLP(width));
-		getFigure().revalidate();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineType(int)
-	 * @since 1.4
-	 */
-	protected void setLineType(int lineType) {
-		super.setLineType(lineType);
-		LineBorder lineBorder = (LineBorder)getNodeFigure().getBorder();
-		lineBorder.setStyle(lineType);
-	}    
-
-	public IFigure getContentPane() {
-		return ((GeoShapeFigure) getFigure()).getContentPane();
-	}
-
-	@Override
-	public boolean supportsRoundedCorners() {
-		return true;
-	}
-}
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 3ca8f3f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * Controls the interactions between the figure and
- * its underlying view. 
- *
- * @author jschofie
- */
-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();
-	}
-	
-	/**
-	 * Sets the line width to the border as well.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-		((RectangularDropShadowLineBorder)getFigure().getBorder()).setWidth(getMapMode().DPtoLP(width));
-		getFigure().revalidate();
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		super.setLineType(lineType);
-		((RectangularDropShadowLineBorder)getFigure().getBorder()).setStyle(lineType);
-	}	
-
-}
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 cae02e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeContributionItemProvider.java
+++ /dev/null
@@ -1,142 +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
- * 
- * 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 d20eae1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeEditPartProvider.java
+++ /dev/null
@@ -1,86 +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
- *
- * 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;
-	}
-}
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 df318b8..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, 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.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.diagram.ui.geoshapes.type.GeoshapeType;
-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
- */
-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;
-	}
-}
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 b7fd379..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, 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.geoshapes.internal.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Tool;
-
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-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
- */
-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;
-	}
-
-}
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 e9cfa6e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/providers/GeoshapeViewProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.GeoShapeConnectionViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.views.factories.GeoShapeViewFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Notation Provider that registers all the specific Geometric Shapes
- * 
- * @author jschofie
- */
-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, GeoShapeConnectionViewFactory.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/GeoShapeConnectionViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/GeoShapeConnectionViewFactory.java
deleted file mode 100644
index ae3e3c1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/views/factories/GeoShapeConnectionViewFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * View factory for the geometric connection (line).
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class GeoShapeConnectionViewFactory extends ConnectorViewFactory {
-	
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory#createStyles(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		
-		styles.add(NotationFactory.eINSTANCE.createArrowStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineTypeStyle());
-		
-		return styles;
-	}
-
-	@Override
-	protected void decorateView(View containerView, View view,
-			IAdaptable element, String semanticHint, int index,
-			boolean persisted) {
-		ConnectorStyle style = (ConnectorStyle) view.getStyle(NotationPackage.eINSTANCE.getConnectorStyle());
-		if (style != null) {
-			style.setLineWidth(1);
-		}
-		super
-				.decorateView(containerView, view, element, semanticHint, index,
-						persisted);
-	}
-
-}
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 be9eab1..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,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-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.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-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) {
-		ShapeStyle style = (ShapeStyle) view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-		if (style != null) {
-			style.setLineWidth(1);
-			style.setTransparency(0);
-			if (view.getType().equals(GeoshapeType.ROUNDRECTANGLE.getSemanticHint())) { 
-				style.setRoundedBendpointsRadius(20);
-			}
-		}
-		
-		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));
-	}
-	
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory#createStyles(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		
-		styles.add(NotationFactory.eINSTANCE.createTextStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineTypeStyle());
-		return styles;
-	}
-}
\ 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.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/type/GeoshapeType.java b/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/type/GeoshapeType.java
deleted file mode 100644
index d0637f5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/type/GeoshapeType.java
+++ /dev/null
@@ -1,81 +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.geoshapes.type;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-
-/**
- * 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 INotationType OVAL = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.oval"); //$NON-NLS-1$
-
-	public static final INotationType TRIANGLE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.triangle"); //$NON-NLS-1$
-
-	public static final INotationType RECTANGLE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.rectangle"); //$NON-NLS-1$
-
-	public static final INotationType SHADOWRECTANGLE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.shadowRectangle"); //$NON-NLS-1$
-
-	public static final INotationType THREEDRECTANGLE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.3DRectangle"); //$NON-NLS-1$
-
-	public static final INotationType ROUNDRECTANGLE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.roundRectangle"); //$NON-NLS-1$
-
-	public static final INotationType HEXAGON = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.hexagon"); //$NON-NLS-1$
-
-	public static final INotationType OCTAGON = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.octagon"); //$NON-NLS-1$
-
-	public static final INotationType PENTAGON = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.pentagon"); //$NON-NLS-1$
-
-	public static final INotationType DIAMOND = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.diamond"); //$NON-NLS-1$
-
-	public static final INotationType CYLINDER = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.geoshapes.cylinder"); //$NON-NLS-1$
-
-	public static final INotationType LINE = (INotationType) 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.printing.render/.classpath b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.classpath
deleted file mode 100644
index 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 f17a4c6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/.api_filters
deleted file mode 100644
index 2348182..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/.api_filters
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.diagram.ui.printing.render" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/PrintHelper.java" type="org.eclipse.gmf.runtime.diagram.ui.printing.render.util.PrintHelper">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="PrintOptions"/>
-                <message_argument value="PrintHelper"/>
-                <message_argument value="getPrintOptions()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/RenderedDiagramPrinter.java" type="org.eclipse.gmf.runtime.diagram.ui.printing.render.util.RenderedDiagramPrinter">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="SWTDiagramPrinter"/>
-                <message_argument value="RenderedDiagramPrinter"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="MapModeGraphics"/>
-                <message_argument value="RenderedDiagramPrinter"/>
-                <message_argument value="createMapModeGraphics(Graphics)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="PrinterGraphics"/>
-                <message_argument value="RenderedDiagramPrinter"/>
-                <message_argument value="createPrinterGraphics(Graphics)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 347d34a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:01:45 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 2dd9a07..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/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.printing.render
-Bundle-Version: 1.4.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.databinding.beans;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jface.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.printing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 aadcd90..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 Modeling Project
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.printing.render/pom.xml
deleted file mode 100644
index e298281..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.printing.render</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.printing.render</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 518bf47..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,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.core.runtime.Platform;
-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.render.internal.DiagramUIPrintingRenderDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.DiagramUIPrintingRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.JPSDiagramPrinter;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.JPSDiagramPrinterHelper;
-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.gmf.runtime.notation.Diagram;
-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 (Platform.getOS().startsWith(Platform.OS_WIN32)) {
-			DiagramPrinterUtil.printWithSettings(diagramEditor,
-					createDiagramMap(), new RenderedDiagramPrinter(
-							preferencesHint, mapMode));
-		} else {
-			JPSDiagramPrinterHelper.getDiagramPrinterHelper()
-					.printWithSettings(diagramEditor, createDiagramMap(),
-							new JPSDiagramPrinter(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.
-	 */
-	protected Map<String, Diagram> createDiagramMap() {
-		
-		Map<String, Diagram> diagramMap = new HashMap<String, Diagram>();
-		
-		//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/dialogs/ActionsBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ActionsBlock.java
deleted file mode 100644
index f440f8e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ActionsBlock.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-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.gmf.runtime.diagram.ui.printing.internal.util.PrintHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.internal.printpreview.RenderedPrintPreviewHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A section of the JPS print dialog that handles extra actions. In this case,
- * we contribute print preview capabilities.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-class ActionsBlock extends DialogBlock {
-	private final PrintOptions options;
-
-	private Button printPreview;
-	private PrintPreviewHelper printPreviewHelper;
-	private IPrintActionHelper printActionHelper;
-
-	ActionsBlock(IDialogUnitConverter dluConverter, PrintOptions options) {
-		super(dluConverter);
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		printPreview = new Button(parent, SWT.PUSH);
-		printPreview.setData(new Integer(2));
-		printPreview
-				.setText(DiagramUIPrintingMessages.JPSPrintDialog_Button_PrintPreview);
-
-		printPreview.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				buttonPressed(((Integer) event.widget.getData()).intValue());
-			}
-		});
-		layoutVerticalIndent(layoutAlignLeft(printPreview));
-
-		return printPreview;
-	}
-
-	/**
-	 * Bring up the print preview with printing disabled.
-	 * 
-	 * @param buttonId
-	 */
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case -1:
-			break;
-		default:
-			PrintPreviewHelper previewHelper = getPrintPreviewHelper();
-						
-			PrintHelperUtil.setScale(options.getScaleFactor());
-			PrintHelperUtil.setScaleToWidth(options.getFitToPagesWidth());
-			PrintHelperUtil.setScaleToHeight(options.getFitToPagesHeight());
-			previewHelper.enablePrinting(false);
-			
-			if (options.isPercentScaling()) {
-				previewHelper.setPercentScaling(options.getScaleFactor());
-			} else {
-				previewHelper.setFitToPage(options.getFitToPagesWidth(),
-						options.getFitToPagesHeight());
-			}
-			
-			previewHelper.doPrintPreview(getPrintActionHelper());
-			
-			options.setScaleFactor(PrintHelperUtil.getScale());
-			options.setFitToPagesWidth(PrintHelperUtil.getScaleToWidth());
-			options.setFitToPagesHeight(PrintHelperUtil.getScaleToHeight());
-		}
-	}
-
-	/**
-	 * Return the print preview helper responsible for performing the print
-	 * preview.
-	 * 
-	 * @return PrintPreviewHelper the print preview helper.
-	 */
-	private PrintPreviewHelper getPrintPreviewHelper() {
-		if (printPreviewHelper == null) {
-			printPreviewHelper = new RenderedPrintPreviewHelper();
-		}
-		return printPreviewHelper;
-	}
-
-	private IPrintActionHelper getPrintActionHelper() {
-		if (printActionHelper == null) {
-			printActionHelper = new EnhancedPrintActionHelper();
-		}
-		return printActionHelper;
-	}
-
-	@Override
-	public void dispose() {
-		// nothing special to dispose
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ColorBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ColorBlock.java
deleted file mode 100644
index a3c541c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ColorBlock.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import java.util.Locale;
-
-import javax.print.DocFlavor;
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.print.attribute.AttributeSet;
-import javax.print.attribute.HashPrintServiceAttributeSet;
-import javax.print.attribute.PrintServiceAttributeSet;
-import javax.print.attribute.standard.ColorSupported;
-import javax.print.attribute.standard.PrinterName;
-
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A section of the options print dialog that handles the print color options.
- * 
- * @author James Bruck (jbruck)
- */
-public class ColorBlock extends DialogBlock {
-
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-
-	private Button colorRadio;
-	private Button monoRadio;
-	
-	private Binding colorBinding;
-	private Binding monoBinding;
-
-	ColorBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
-			PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSOptionsDialog_Color);
-		layout(result, 2);
-
-		colorRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_ChromaticityColor);
-		layoutSpanHorizontal(colorRadio, 4);
-
-		monoRadio = radio(
-				result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_ChromaticityMonochrome);
-		layoutSpanHorizontal(monoRadio, 4);
-
-		colorBinding = bindings.bindValue(SWTObservables.observeSelection(colorRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_CHROMATICITY_COLOR), null, null);
-
-		monoBinding = bindings.bindValue(SWTObservables.observeSelection(monoRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_CHROMATICITY_MONO), null, null);
-
-		initializeControls(options.getDestination().getName());
-
-		return result;
-	}
-
-	/**
-	 * Initialize the enabled state of the controls based on the printer
-	 * capabilities.
-	 * 
-	 * @param printerName
-	 */
-	private void initializeControls(String printerName) {
-
-		AttributeSet attributes = new HashPrintServiceAttributeSet(
-				new PrinterName(printerName, Locale.getDefault()));
-
-		PrintService[] services = PrintServiceLookup.lookupPrintServices(
-				DocFlavor.SERVICE_FORMATTED.PRINTABLE, attributes);
-
-		PrintService printService = services[0];
-
-		PrintServiceAttributeSet printServiceAttributes = printService
-				.getAttributes();
-
-		ColorSupported colorSupported = (ColorSupported) printServiceAttributes
-				.get(ColorSupported.class);
-		
-		if (colorSupported == ColorSupported.SUPPORTED) {
-			options.setChromaticityColor(true);
-			options.setChromaticityMono(false);
-			colorRadio.setEnabled(true);
-		} else {
-			options.setChromaticityColor(false);
-			options.setChromaticityMono(true);
-			colorRadio.setEnabled(false);
-		}
-	}
-	
-	@Override
-	public void dispose() {
-		bindings.removeBinding(colorBinding);
-		colorBinding.dispose();
-		bindings.removeBinding(monoBinding);
-		monoBinding.dispose();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/CopiesBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/CopiesBlock.java
deleted file mode 100644
index 3492c35..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/CopiesBlock.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-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.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-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.Spinner;
-
-/**
- * A section of the JPS print dialog that handles the number of copies of a
- * diagram to print.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-class CopiesBlock extends DialogBlock {
-
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-
-	private final Image collateOnImage = DiagramUIPrintingPluginImages.COLLATE_ON
-			.createImage();
-	private final Image collateOffImage = DiagramUIPrintingPluginImages.COLLATE_OFF
-			.createImage();
-	
-	CopiesBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
-			PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSPrintDialog_Copies);
-		layout(result, 2);
-
-		label(result, DiagramUIPrintingMessages.JPSPrintDialog_NumberOfCopies);
-		Spinner copiesSpinner = spinner(result, 1, 999);
-
-		bindings.bindValue(SWTObservables.observeSelection(copiesSpinner),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_COPIES), null, null);
-
-		final Label collateImageButton = new Label(result, SWT.CENTER
-				| SWT.SHADOW_NONE);
-
-		layoutAlignRight(collateImageButton);
-		collateImageButton.setImage(collateOffImage);
-
-		Button collateCheck = check(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_Collate);
-
-		bindings.bindValue(SWTObservables.observeSelection(collateCheck),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_COLLATE), null, null);
-
-		collateCheck.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				// do nothing
-			}
-			public void widgetSelected(SelectionEvent arg0) {
-				if (options.isCollate()) {
-					collateImageButton.setImage(collateOnImage);
-				} else {
-					collateImageButton.setImage(collateOffImage);
-				}
-			}
-		});
-
-		return result;
-	}
-		
-	/**
-	 * Dispose of images.
-	 */
-	public void dispose() {
-		collateOnImage.dispose();
-		collateOffImage.dispose();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DiagramPrintRangeBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DiagramPrintRangeBlock.java
deleted file mode 100644
index e725294..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DiagramPrintRangeBlock.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import java.util.List;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A section of the print dialog that handles selection of diagrams to print.
- * 
- * @author James Bruck (jbruck)
- */
-public class DiagramPrintRangeBlock extends DialogBlock {
-
-	private final DataBindingContext bindings;
-
-	private final PrintOptions options;
-
-	private ListViewer diagramList;
-
-	private List<String> availableDiagrams;
-
-	DiagramPrintRangeBlock(IDialogUnitConverter dluConverter,
-			DataBindingContext bindings, PrintOptions options,
-			List<String> availableDiagrams) {
-
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-		this.availableDiagrams = availableDiagrams;
-	}
-
-	/**
-	 * Create the contents of the diagram selection block. It contains 2 radio
-	 * buttons for current or multi-selection and a list box of diagram options.
-	 */
-	@Override
-	public Control createContents(Composite parent) {
-
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSOptionsDialog_DiagramPrintRange);
-		layout(result, 3);
-
-		Button currentDiagramRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_DiagramPrintCurrent);
-		layoutSpanHorizontal(currentDiagramRadio, 4);
-
-		Button selectedDiagramsRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_DiagramPrintSelected);
-		layoutSpanHorizontal(selectedDiagramsRadio, 4);
-
-		diagramList = list(result);
-				
-		layoutFillHorizontal(layoutHeight(diagramList.getControl(),48));
-		diagramList.getControl().setEnabled(options.isDiagramSelection());
-
-		currentDiagramRadio.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				//do nothing
-			}
-			public void widgetSelected(SelectionEvent event) {
-				diagramList.getControl().setEnabled(
-						options.isDiagramSelection());
-			}
-		});
-
-		selectedDiagramsRadio.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				//do nothing
-			}
-			public void widgetSelected(SelectionEvent event) {
-				diagramList.getControl()
-						.setEnabled(!options.isDiagramCurrent());
-			}
-		});
-
-		diagramList
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-
-					@SuppressWarnings("unchecked")
-					public void selectionChanged(SelectionChangedEvent event) {
-						if (event != null) {
-
-							StructuredSelection selection = (StructuredSelection) event
-									.getSelection();
-
-							options.setDiagramsToPrint(selection.toList());
-
-						}
-
-					}
-				});
-
-		diagramList.setContentProvider(new DiagramContentProvider());
-		diagramList.setLabelProvider(new DiagramLabelProvider());
-
-		diagramList.setInput(availableDiagrams);
-
-		bindings.bindValue(
-				SWTObservables.observeSelection(currentDiagramRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_DIAGRAM_CURRENT), null, null);
-
-		bindings.bindValue(SWTObservables
-				.observeSelection(selectedDiagramsRadio), BeansObservables
-				.observeValue(realm, options,
-						PrintOptions.PROPERTY_DIAGRAM_SELECTION), null, null);
-
-		return result;
-	}
-
-	@Override
-	public void dispose() {
-		// nothing special to dispose currently
-	}
-
-	/**
-	 * A helper class used to retrieve label text
-	 * 
-	 * @author James Bruck (jbruck)
-	 */
-	private class DiagramContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			return availableDiagrams.toArray();
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// input never changes
-		}
-
-		public void dispose() {
-			// nothing to dispose
-		}
-	}
-
-	private class DiagramLabelProvider extends LabelProvider {
-		public String getText(Object element) {
-			return (String) element;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DialogBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DialogBlock.java
deleted file mode 100644
index df33e4a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/DialogBlock.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.swt.SWT;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Intended to be used as a base for other specializing dialog blocks.
- * Provides common layout functionality
- *
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-abstract class DialogBlock {
-	private final IDialogUnitConverter dluConverter;
-
-	DialogBlock(IDialogUnitConverter dluConverter) {
-		this.dluConverter = dluConverter;
-	}
-
-	protected Shell getShell() {
-		return dluConverter.getShell();
-	}
-
-	
-	static Composite layout(Composite composite, int columns) {
-		GridLayout g = new GridLayout(columns, false);
-		g.marginLeft = 6;
-		g.marginRight = 6;
-		g.marginTop = 6;
-		g.marginBottom = 3;
-		composite.setLayout(g);
-
-		return composite;
-	}
-
-	GridData getLayoutData(Control control) {
-		GridData result = (GridData) control.getLayoutData();
-
-		if (result == null) {
-			result = new GridData();
-			control.setLayoutData(result);
-		}
-
-		return result;
-	}
-
-	Control layoutFillHorizontal(Control control) {
-		layoutFillHorizontal(control, true);
-
-		return control;
-	}
-
-	Control layoutFillHorizontal(Control control, boolean grab) {
-		GridData data = getLayoutData(control);
-
-		data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = grab;
-
-		return control;
-	}
-
-	Control layoutFillVertical(Control control) {
-		GridData data = getLayoutData(control);
-
-		data.verticalAlignment = SWT.FILL;
-		data.grabExcessVerticalSpace = true;
-
-		return control;
-	}
-
-	Control layoutAlignLeft(Control control) {
-		GridData data = getLayoutData(control);
-
-		data.horizontalAlignment = SWT.BEGINNING;
-		data.grabExcessHorizontalSpace = false;
-
-		return control;
-	}
-
-	Control layoutAlignRight(Control control) {
-		GridData data = getLayoutData(control);
-
-		data.horizontalAlignment = SWT.END;
-		data.grabExcessHorizontalSpace = false;
-
-		return control;
-	}
-
-	Control layoutFillBoth(Control control) {
-		GridData data = getLayoutData(control);
-
-		data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalAlignment = SWT.FILL;
-		data.grabExcessVerticalSpace = true;
-
-		return control;
-	}
-
-	Control layoutSpanHorizontal(Control control, int span) {
-		GridData data = getLayoutData(control);
-
-		data.horizontalSpan = span;
-
-		return control;
-	}
-
-	Control layoutSpanVertical(Control control, int span) {
-		GridData data = getLayoutData(control);
-
-		data.verticalSpan = span;
-
-		return control;
-	}
-
-	Control layoutHorizontalIndent(Control control) {
-		layoutHorizontalIndent(control, 15);
-
-		return control;
-	}
-
-	Control layoutHorizontalIndent(Control control, int inset) {
-		GridData data = getLayoutData(control);
-		data.horizontalIndent = inset;
-
-		return control;
-	}
-
-	Control layoutVerticalIndent(Control control) {
-		layoutVerticalIndent(control, 15);
-
-		return control;
-	}
-
-	Control layoutVerticalIndent(Control control, int inset) {
-		GridData data = getLayoutData(control);
-		data.verticalIndent = inset;
-
-		return control;
-	}
-
-	Control layoutWidth(Control control, int dlus) {
-		if (dlus > 0) {
-			GridData data = getLayoutData(control);
-			data.widthHint = dluConverter.convertHorizontalDLUsToPixels(dlus);
-		}
-
-		return control;
-	}
-	
-	Control layoutHeight(Control control, int dlus) {
-		if (dlus > 0) {
-			GridData data = getLayoutData(control);
-			data.heightHint = dluConverter.convertHorizontalDLUsToPixels(dlus);
-		}
-
-		return control;
-	}
-
-	Group group(Composite parent, String text) {
-		Group result = new Group(parent, SWT.NONE);
-		result.setText(text);
-		layoutFillBoth(result);
-		return result;
-	}
-
-	Label label(Composite parent, String text) {
-		Label result = new Label(parent, SWT.NONE);
-		result.setText(text);
-		return result;
-	}
-
-	Text text(Composite parent, int width) {
-		Text result = new Text(parent, SWT.SINGLE | SWT.BORDER);
-		layoutFillHorizontal(result, false);
-		layoutWidth(result, width);
-
-		return result;
-	}
-
-	ComboViewer combo(Composite parent) {
-		ComboViewer result = new ComboViewer(parent);
-		return result;
-	}
-	
-	ListViewer list(Composite parent){
-		ListViewer result = new ListViewer(parent);
-		return result;
-	}
-
-	Button button(Composite parent, String text) {
-		Button result = new Button(parent, SWT.PUSH);
-		result.setText(text);
-		return result;
-	}
-
-	Button radio(Composite parent, String text) {
-		Button result = new Button(parent, SWT.RADIO);
-		result.setText(text);
-		return result;
-	}
-
-	Button check(Composite parent, String text) {
-		Button result = new Button(parent, SWT.CHECK);
-		result.setText(text);
-		return result;
-	}
-
-	Spinner spinner(Composite parent, int min, int max) {
-		Spinner result = new Spinner(parent, SWT.BORDER);
-		result.setMinimum(min);
-		result.setMaximum(max);
-
-		return result;
-	}
-
-	Control blank(Composite parent) {
-		Label result = new Label(parent, SWT.NONE);
-		return result;
-	}
-
-	public abstract Control createContents(Composite parent);
-	
-	public abstract void dispose();
-
-	public static interface IDialogUnitConverter {
-		int convertHorizontalDLUsToPixels(int dlus);
-
-		Shell getShell();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSOptionsDialog.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSOptionsDialog.java
deleted file mode 100644
index eb9a2a8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSOptionsDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A dialog that presents advanced printer options to the user.
- * 
- * @author James Bruck (jbruck)
- */
-public class JPSOptionsDialog extends TrayDialog {
-
-	private DataBindingContext bindings;
-	public final PrintOptions options;
-
-	private QualityBlock qualityBlock;
-	private ColorBlock colorBlock;
-	private SidesBlock sidesBlock;
-	private JobAttributesBlock jobAttributesBlock;
-
-	private final DialogBlock.IDialogUnitConverter dluConverter = new DialogBlock.IDialogUnitConverter() {
-
-		public int convertHorizontalDLUsToPixels(int dlus) {
-			return JPSOptionsDialog.this.convertHorizontalDLUsToPixels(dlus);
-		}
-
-		public Shell getShell() {
-			return JPSOptionsDialog.this.getShell();
-		}
-	};
-
-	protected JPSOptionsDialog(Shell shell, DataBindingContext bindings,
-			PrintOptions options) {
-		super(shell);
-		this.options = options;
-		this.bindings = bindings;
-	}
-
-	public JPSOptionsDialog(IShellProvider parentShell,
-			DataBindingContext bindings, PrintOptions options) {
-		super(parentShell);
-		this.options = options;
-		this.bindings = bindings;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		
-		super.configureShell(newShell);
-		newShell
-				.setText(DiagramUIPrintingMessages.JPSOptionsDialog_AdvancedOptions);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-
-		Composite result = new Composite(parent, SWT.NONE);
-		DialogBlock.layout(result, 2);
-
-		createColorBlockArea(result);
-		createQualityBlockArea(result);
-		createSidesBlockArea(result);
-		createJobAttributesBlockArea(result);
-
-		return result;
-	}
-
-	protected void createQualityBlockArea(Composite result) {
-		qualityBlock = new QualityBlock(dluConverter, bindings, options);
-		qualityBlock.createContents(result);
-	}
-
-	protected void createColorBlockArea(Composite result) {
-		colorBlock = new ColorBlock(dluConverter, bindings, options);
-		colorBlock.createContents(result);
-	}
-
-	protected void createSidesBlockArea(Composite result) {
-		sidesBlock = new SidesBlock(dluConverter, bindings, options);
-		sidesBlock.createContents(result);
-	}
-
-	protected void createJobAttributesBlockArea(Composite result) {
-		jobAttributesBlock = new JobAttributesBlock(dluConverter, bindings,
-				options);
-		jobAttributesBlock.createContents(result);
-	}
-		
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.TrayDialog#close()
-	 */
-	public boolean close() {
-		qualityBlock.dispose();
-		colorBlock.dispose();
-		sidesBlock.dispose();
-		jobAttributesBlock.dispose();
-		return super.close();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSPrintDialog.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSPrintDialog.java
deleted file mode 100644
index 1b169bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JPSPrintDialog.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import java.util.List;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TrayDialog;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * A dialog that supports platform independent printing based on the 
- * Java Printing Service API.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-public class JPSPrintDialog
-    extends TrayDialog {
-
-    private DataBindingContext bindings;
-    private final PrintOptions options;
-    
-    protected PrinterBlock printerBlock;
-    protected DiagramPrintRangeBlock diagramPrintRangeBlock;
-    protected ScalingBlock scalingBlock;
-    private RangeBlock rangeBlock;
-    private CopiesBlock copiesBlock;
-    private ActionsBlock actionsBlock;
-    
-    private List<String> allDiagrams;
-    
-    private final DialogBlock.IDialogUnitConverter dluConverter = new DialogBlock.IDialogUnitConverter() {
-
-		public int convertHorizontalDLUsToPixels(int dlus) {
-			return JPSPrintDialog.this.convertHorizontalDLUsToPixels(dlus);
-		}
-
-		public Shell getShell() {
-			return JPSPrintDialog.this.getShell();
-		}
-	};
-    
-    public JPSPrintDialog(IShellProvider parentShell, PrintOptions options, List<String> allDiagrams) {
-        super(parentShell);
-        this.options = options;
-        this.allDiagrams = allDiagrams;
-    }
-
-    public JPSPrintDialog(Shell shell, PrintOptions options, List<String> allDiagrams) {
-        super(shell);
-        this.options = options;
-        this.allDiagrams = allDiagrams;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-     */
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-        
-        newShell.setText(DiagramUIPrintingMessages.JPSPrintDialog_Title);
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-     */
-    protected Control createDialogArea(Composite parent) {
-		bindings = new DataBindingContext(SWTObservables.getRealm(parent
-				.getDisplay()));
-
-		Composite result = new Composite(parent, SWT.NONE);
-		DialogBlock.layout(result, 2);
-
-		createPrinterBlockArea(result);
-		createDiagramPrintRangeBlockArea(result);
-		createScalingBlockArea(result);
-		createRangeBlockArea(result);
-		createCopiesBlockArea(result);
-		createActionsBlockArea(result);
-		createExtensibleBlockArea(result);
-
-		return result;
-	}
-    
-    protected void createPrinterBlockArea(Composite result) {
-		printerBlock = new PrinterBlock(dluConverter, bindings, options);
-		printerBlock.layoutSpanHorizontal(printerBlock.createContents(result),
-				2);
-	}
-    
-    protected void createScalingBlockArea(Composite result) {
-    	 scalingBlock = new ScalingBlock(dluConverter, bindings, options);
-         scalingBlock.layoutSpanHorizontal(scalingBlock.createContents(result), 2);
-	}
-    
-    protected void createRangeBlockArea(Composite result) {
-    	 rangeBlock = new RangeBlock(dluConverter, bindings, options);
-         rangeBlock.createContents(result);
-	}
-    
-    protected void createCopiesBlockArea(Composite result) {
-    	  copiesBlock = new CopiesBlock(dluConverter, bindings, options);
-          copiesBlock.createContents(result);
-	}
-    
-    protected void createActionsBlockArea(Composite result) {
-    	 actionsBlock = new ActionsBlock(dluConverter, options);
-         actionsBlock.layoutSpanHorizontal(actionsBlock.createContents(result), 2);
-	}
-    
-    protected void createDiagramPrintRangeBlockArea(Composite result){
-    	diagramPrintRangeBlock = new DiagramPrintRangeBlock(dluConverter,bindings,options, allDiagrams);
-    	diagramPrintRangeBlock.layoutSpanHorizontal(diagramPrintRangeBlock.createContents(result),
-				2);
-    }
-    
-    protected void createExtensibleBlockArea(Composite result) {
-    	  // meant to be overridden by subclasses to add additional blocks.
-  	}
-    
-        
-    protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-        createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-    }
-    
-    protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-		case -1:
-			break;
-		default:
-			super.buttonPressed(buttonId);
-		}
-	}
-
-	public boolean close() {
-		bindings.dispose();
-		copiesBlock.dispose();
-		printerBlock.dispose();
-		diagramPrintRangeBlock.dispose();
-		scalingBlock.dispose();
-		rangeBlock.dispose();
-		actionsBlock.dispose();
-		return super.close();
-	}
-
-	protected void cancelPressed() {
-		super.cancelPressed();
-	}
-    
-    /**
-	 * Obtains the user's selected printing options, or <code>null</code> if
-	 * the user canceled the print operation.
-	 * 
-	 * @return the printing options, or <code>null</code> if canceled
-	 */
-    public PrintOptions getPrintOptions() {
-        return options;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JobAttributesBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JobAttributesBlock.java
deleted file mode 100644
index b909f80..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/JobAttributesBlock.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A section of the options print dialog that handles the job attributes.
- * 
- * @author James Bruck (jbruck)
- */
-public class JobAttributesBlock extends DialogBlock {
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-	private Binding jobNameBinding;
-
-	JobAttributesBlock(IDialogUnitConverter dluConverter,
-			DataBindingContext bindings, PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSOptionsDialog_JobAttributes);
-		layout(result, 2);
-
-		layoutHorizontalIndent(layoutAlignRight(label(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_JobName)));
-		Text jobName = text(result, 80);
-
-		jobNameBinding = bindings.bindValue(SWTObservables.observeText(jobName, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_JOB_NAME), null, null);
-
-		return result;
-	}
-	
-	@Override
-	public void dispose() {
-		bindings.removeBinding(jobNameBinding);
-		jobNameBinding.dispose();	
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/PrinterBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/PrinterBlock.java
deleted file mode 100644
index 383e167..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/PrinterBlock.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import java.util.List;
-
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintDestination;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A section of the JPS print dialog that adds printer options.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-class PrinterBlock extends DialogBlock {
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-
-	private List<PrintDestination> destinations = new java.util.ArrayList<PrintDestination>();
-
-	private ComboViewer combo;
-
-	PrinterBlock(IDialogUnitConverter dluConverter,
-			DataBindingContext bindings, PrintOptions options) {
-
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSPrintDialog_Printer);
-		layout(result, 3);
-
-		label(result, DiagramUIPrintingMessages.JPSPrintDialog_Name);
-		combo = combo(result);
-		//
-		// The JPS API does not correctly return the printer status
-		// information under windows. These options will be temporarily disabled
-		// until a workaround can be discovered.
-		//
-		
-		//		 combo.addSelectionChangedListener(new ISelectionChangedListener() {
-		//		
-		//		 public void selectionChanged(SelectionChangedEvent event) {
-		//				if (event != null) {
-		//					handlePrinterSelectionChanged(event);
-		//				}
-		//			}
-		//		});
-
-		layoutFillHorizontal(combo.getControl());
-
-		Button propertiesButton = button(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_Properties);
-		propertiesButton.setEnabled(true);
-
-		propertiesButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				 openPrintOptionsDialog();
-			}
-		});
-
-		IObservableValue destination = BeansObservables.observeValue(realm,
-				options, PrintOptions.PROPERTY_DESTINATION);
-		bindings.bindValue(ViewersObservables.observeSingleSelection(combo),
-				destination, null, null);
-		
-		// Label statusLabel = label(result, "Status:");
-		// layoutAlignLeft(statusLabel);
-		// resultStatusLabel = label(result, "");
-		// layoutFillHorizontal(layoutSpanHorizontal(resultStatusLabel, 2));
-		//				
-		// Label typeLabel = label(result, "Type:");
-		// layoutAlignLeft(typeLabel);
-		// resultTypeLabel = label(result, "");
-		// layoutFillHorizontal(layoutSpanHorizontal(resultTypeLabel, 2));
-		// 
-		// Label whereLabel = label(result, "Where:");
-		// layoutAlignLeft(whereLabel);
-		// resultWhereLabel = label(result, "");
-		// layoutFillHorizontal(layoutSpanHorizontal(resultWhereLabel, 2));
-		// 
-		// Label commentLabel = label(result, "Comment:");
-		// layoutAlignLeft(commentLabel);
-		// resultCommentLabel = label(result, "");
-		// layoutFillHorizontal(resultCommentLabel);
-
-		// The Destination attribute is not IPP compatible. 
-		
-		// Button printToFile = check(result,
-		// DiagramUIPrintingMessages.JPSPrintDialog_PrintToFile);
-		// layoutSpanHorizontal(printToFile, 3);
-		// printToFile.setEnabled(false);
-
-		initializePrinters();
-
-		return result;
-	}
-
-	/**
-	 * At initialization time, we lookup all the print services and select the default one.
-	 */
-	private void initializePrinters() {
-		PrintService[] printServices = PrintServiceLookup.lookupPrintServices(
-				null, null);
-		
-		for (PrintService printService : printServices) {
-			destinations.add(new PrintDestination(printService.getName()));
-		}
-		combo.setContentProvider(new PrinterContentProvider());
-		combo.setLabelProvider(new PrinterLabelProvider());
-		
-		// Locate a default printer if one is explicitly marked as such.
-		PrintDestination defaultPrintDestination = null;
-		PrintService defaultPrintService = PrintServiceLookup
-			.lookupDefaultPrintService();
-		
-		if (defaultPrintService != null) {
-			defaultPrintDestination = getPrinterByName(defaultPrintService
-				.getName());
-		} else {
-			if( destinations.size() > 0 ){
-				defaultPrintDestination = destinations.get(0);
-			}
-		}
-		
-		combo.setInput(destinations);
-		if(defaultPrintDestination != null){
-			combo.setSelection(new StructuredSelection(defaultPrintDestination));
-		}
-	}
-
-	
-	/**
-	 * Obtain the proper print destination based on the name of the printer.
-	 * 
-	 * @param name 
-	 * 		The printer Name.
-	 * @return
-	 * 		 The print destination corresponding to the specified print name.
-	 */	
-	private PrintDestination getPrinterByName(String name) {
-
-		PrintDestination result = null;
-		for (PrintDestination printDestination : destinations) {
-			if (printDestination.getName().equals(name)) {
-				result = printDestination;
-				break;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * A helper class used to retrieve label text
-	 * 
-	 * @author Christian Damus (cdamus)
-	 * @author James Bruck (jbruck)
-	 */
-	private class PrinterContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			return destinations.toArray();
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// input never changes
-		}
-
-		public void dispose() {
-			// nothing to dispose
-		}
-	}
-
-	private class PrinterLabelProvider extends LabelProvider {
-		public String getText(Object element) {
-			return ((PrintDestination) element).getName();
-		}
-	}
-		
-	private void openPrintOptionsDialog() {
-
-		JPSOptionsDialog dlg = new JPSOptionsDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell(), bindings, options);
-		dlg.open();
-
-	}
-
-	@Override
-	public void dispose() {
-		// nothing special to dispose currently	
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/QualityBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/QualityBlock.java
deleted file mode 100644
index 5d6ea48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/QualityBlock.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A section of the options print dialog that handles the print quality.
- * 
- * @author James Bruck (jbruck)
- */
-public class QualityBlock extends DialogBlock {
-
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-	
-	private Binding qualityHighBinding;
-	private Binding qualityMedBinding;
-	private Binding qualityLowBinding;
-
-	QualityBlock(IDialogUnitConverter dluConverter,
-			DataBindingContext bindings, PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSOptionsDialog_Quality);
-		layout(result, 2);
-
-		Button highRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_QualityHigh);
-		layoutSpanHorizontal(highRadio, 4);
-
-		Button mediumRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_QualityMedium);
-		layoutSpanHorizontal(mediumRadio, 4);
-
-		Button lowRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_QualityLow);
-		layoutSpanHorizontal(lowRadio, 4);
-
-		qualityHighBinding = bindings.bindValue(SWTObservables.observeSelection(highRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_QUALITY_HIGH), null, null);
-
-		qualityMedBinding = bindings.bindValue(SWTObservables.observeSelection(mediumRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_QUALITY_MED), null, null);
-
-		qualityLowBinding = bindings.bindValue(SWTObservables.observeSelection(lowRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_QUALITY_LOW), null, null);
-
-		return result;
-	}
-	
-	@Override
-	public void dispose() {
-		bindings.removeBinding(qualityHighBinding);
-		qualityHighBinding.dispose();
-		bindings.removeBinding(qualityLowBinding);
-		qualityLowBinding.dispose();
-		bindings.removeBinding(qualityMedBinding);
-		qualityMedBinding.dispose();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/RangeBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/RangeBlock.java
deleted file mode 100644
index 340eeeb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/RangeBlock.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.core.databinding.observable.value.ComputedValue;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * A section of the JPS print dialog that adds range checking.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-class RangeBlock extends DialogBlock {
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-
-	RangeBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
-			PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSPrintDialog_PrintRange);
-		layout(result, 4);
-
-		Button allRadio = radio(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_All);
-		layoutSpanHorizontal(allRadio, 4);
-
-		final IObservableValue allValue = BeansObservables.observeValue(realm,
-				options, PrintOptions.PROPERTY_ALL_PAGES);
-		bindings.bindValue(SWTObservables.observeSelection(allRadio), allValue,
-				null, null);
-
-		Button rangeRadio = radio(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_Pages);
-		layoutSpanHorizontal(rangeRadio, 4);
-
-		IObservableValue rangeValue = new ComputedValue(realm) {
-			protected Object calculate() {
-				return Boolean.valueOf(!((Boolean) allValue.getValue())
-						.booleanValue());
-			}
-		};
-		bindings.bindValue(SWTObservables.observeSelection(rangeRadio),
-				rangeValue, null, null);
-
-		layoutHorizontalIndent(label(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_From));
-		Text textFrom = text(result, 20);
-		
-		layoutHorizontalIndent(label(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_To));
-		Text textTo = text(result, 20);
-
-		bindings.bindValue(SWTObservables.observeText(textFrom, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_RANGE_FROM), null, null);
-		bindings.bindValue(SWTObservables.observeEnabled(textFrom), rangeValue,
-				null, null);
-		bindings.bindValue(SWTObservables.observeText(textTo, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_RANGE_TO), null, null);
-		bindings.bindValue(SWTObservables.observeEnabled(textTo), rangeValue,
-				null, null);
-
-		return result;
-	}
-	
-	@Override
-	public void dispose() {
-		// nothing special to dispose currently		
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ScalingBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ScalingBlock.java
deleted file mode 100644
index 725e540..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/ScalingBlock.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.core.databinding.observable.value.ComputedValue;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * A section of the JPS print dialog that adds scaling support.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-class ScalingBlock extends DialogBlock {
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-
-	ScalingBlock(IDialogUnitConverter dluConverter,
-			DataBindingContext bindings, PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSPrintDialog_Scaling);
-		layout(result, 5);
-
-		Button adjustRadio = radio(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_Adjust);
-		layoutSpanHorizontal(adjustRadio, 2);
-		Text textScale = text(result, 20);
-		layoutSpanHorizontal(blank(result), 2);
-
-		final IObservableValue scalingValue = BeansObservables.observeValue(
-				realm, options, PrintOptions.PROPERTY_PERCENT_SCALING);
-		
-		bindings.bindValue(SWTObservables.observeSelection(adjustRadio),
-				scalingValue, null, null);
-
-		bindings.bindValue(SWTObservables.observeText(textScale, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_SCALE_FACTOR), null, null);
-		bindings.bindValue(SWTObservables.observeEnabled(textScale),
-				scalingValue, null, null);
-
-		Button fitToRadio = radio(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_FitTo);
-		
-		IObservableValue fitToValue = new ComputedValue(realm) {
-			protected Object calculate() {
-				return Boolean.valueOf(!((Boolean) scalingValue.getValue())
-						.booleanValue());
-			}
-		};
-		
-		bindings.bindValue(SWTObservables.observeSelection(fitToRadio),
-				fitToValue, null, null);
-
-		layoutHorizontalIndent(layoutAlignRight(label(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_PagesWide)));
-		
-		Text textWide = text(result, 20);
-		
-		layoutHorizontalIndent(layoutAlignRight(label(result,
-				DiagramUIPrintingMessages.JPSPrintDialog_PagesTall)));
-		Text textTall = text(result, 20);
-
-		bindings.bindValue(SWTObservables.observeText(textWide, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_FIT_TO_WIDTH), null, null);
-		
-		bindings.bindValue(SWTObservables.observeEnabled(textWide), fitToValue,
-				null, null);
-		
-		bindings.bindValue(SWTObservables.observeText(textTall, SWT.Modify),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_FIT_TO_HEIGHT), null, null);
-		
-		bindings.bindValue(SWTObservables.observeEnabled(textTall), fitToValue,
-				null, null);
-
-		return result;
-	}
-	
-	@Override
-	public void dispose() {
-		// nothing special to dispose currently	
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/SidesBlock.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/SidesBlock.java
deleted file mode 100644
index bc29c79..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/dialogs/SidesBlock.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs;
-
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.Realm;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.l10n.DiagramUIPrintingMessages;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A section of the options print dialog that handles the duplex/single sided printing.
- * 
- * @author James Bruck (jbruck)
- */
-public class SidesBlock extends DialogBlock {
-
-	private final DataBindingContext bindings;
-	private final PrintOptions options;
-	private Binding oneSidedBinding;
-	private Binding tumbleBinding;
-	private Binding duplexBinding;
-
-	SidesBlock(IDialogUnitConverter dluConverter, DataBindingContext bindings,
-			PrintOptions options) {
-		super(dluConverter);
-
-		this.bindings = bindings;
-		this.options = options;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.internal.dialogs.DialogBlock#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createContents(Composite parent) {
-		final Realm realm = bindings.getValidationRealm();
-
-		Composite result = group(parent,
-				DiagramUIPrintingMessages.JPSOptionsDialog_Sides);
-		layout(result, 2);
-
-		Button oneSideRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_SidesOneSided);
-		layoutSpanHorizontal(oneSideRadio, 4);
-
-		Button tumbleRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_SidesTumble);
-		layoutSpanHorizontal(tumbleRadio, 4);
-
-		Button duplexRadio = radio(result,
-				DiagramUIPrintingMessages.JPSOptionsDialog_SidesDuplex);
-		layoutSpanHorizontal(duplexRadio, 4);
-
-		oneSidedBinding = bindings.bindValue(SWTObservables.observeSelection(oneSideRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_SIDES_ONESIDED), null, null);
-
-		tumbleBinding = bindings.bindValue(SWTObservables.observeSelection(tumbleRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_SIDES_TUMBLE), null, null);
-
-		duplexBinding = bindings.bindValue(SWTObservables.observeSelection(duplexRadio),
-				BeansObservables.observeValue(realm, options,
-						PrintOptions.PROPERTY_SIDES_DUPLEX), null, null);
-
-		return result;
-	}
-
-	@Override
-	public void dispose() {
-		bindings.removeBinding(oneSidedBinding);
-		oneSidedBinding.dispose();
-		bindings.removeBinding(tumbleBinding);
-		tumbleBinding.dispose();	
-		bindings.removeBinding(duplexBinding);
-		duplexBinding.dispose();
-	}
-
-}
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 0adddee..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,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.ui.printing.render.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author cmahoney
- *  
- */
-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$  
-}
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 0a0992c..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,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.diagram.ui.printing.render.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author cmahoney
- *  
- */
-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;
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinter.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinter.java
deleted file mode 100644
index 100e7f8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinter.java
+++ /dev/null
@@ -1,683 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.awt.BasicStroke;
-import java.awt.Graphics2D;
-import java.awt.print.PageFormat;
-import java.awt.print.PrinterException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import javax.print.Doc;
-import javax.print.DocFlavor;
-import javax.print.DocPrintJob;
-import javax.print.PrintException;
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.print.SimpleDoc;
-import javax.print.attribute.AttributeSet;
-import javax.print.attribute.HashDocAttributeSet;
-import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.print.attribute.HashPrintServiceAttributeSet;
-import javax.print.attribute.PrintRequestAttributeSet;
-import javax.print.attribute.standard.Chromaticity;
-import javax.print.attribute.standard.Copies;
-import javax.print.attribute.standard.JobName;
-import javax.print.attribute.standard.Media;
-import javax.print.attribute.standard.MediaPrintableArea;
-import javax.print.attribute.standard.MediaSize;
-import javax.print.attribute.standard.MediaSizeName;
-import javax.print.attribute.standard.OrientationRequested;
-import javax.print.attribute.standard.PrintQuality;
-import javax.print.attribute.standard.PrinterName;
-import javax.print.attribute.standard.SheetCollate;
-import javax.print.attribute.standard.Sides;
-
-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.printing.IPrintHelper;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-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.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType;
-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.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.diagram.ui.printing.internal.util.PrintHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.util.PrintHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;
-import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
-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.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
-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.notation.Diagram;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-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.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This class supports printing using the Java Print Service API. The logic of
- * calculating page break etc. follows that of SWT printing but the actual
- * printing is done asynchronously in a platform independent way.
- * 
- * Much of the paging code was derived from the previous DiagramPrinter.
- * 
- * @author James Bruck (jbruck)
- */
-public class JPSDiagramPrinter extends DiagramPrinter implements java.awt.print.Printable {
-
-	// A constant that takes into account screen display DPI and the graphic DPI
-	// 72.0 DPI is an AWT constant @see java.awt.Graphics2D
-	private static double AWT_DPI_CONST = 72.0;
-
-	// The print service used during printing.
-	private PrintService printService;
-
-	// Page information that is collected up front and used during the async
-	// printing calls.
-	private PageData[] pages;
-
-	// The print helper contains page information.
-	private IPrintHelper printHelper;
-
-	public JPSDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
-		super(preferencesHint, mm);
-		this.preferencesHint = preferencesHint;
-		this.mapMode = mm;
-	}
-
-	public JPSDiagramPrinter(PreferencesHint preferencesHint) {
-		this(preferencesHint, MapModeUtil.getMapMode());
-	}
-
-	public void setPrintHelper(IPrintHelper helper) {
-		this.printHelper = helper;
-	}
-
-	/**
-	 * Create a new print service given a printer name.
-	 * 
-	 * @param printerName
-	 */
-	public void setPrinter(String printerName) {
-		AttributeSet attributes = new HashPrintServiceAttributeSet(new PrinterName(printerName, Locale.getDefault()));
-		PrintService[] services = PrintServiceLookup.lookupPrintServices(DocFlavor.SERVICE_FORMATTED.PRINTABLE, attributes);
-		printService = services[0];
-	}
-
-	/**
-	 * Prints the contents of the diagram editor part.
-	 */
-	public void run() {
-
-		Iterator<Diagram> it = diagrams.iterator();
-		Shell shell = new Shell();
-		try {
-			while (it.hasNext()) {
-				Diagram diagram = it.next();
-				DiagramEditor openedDiagramEditor = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-				DiagramEditPart dgrmEP = openedDiagramEditor == null ? PrintHelperUtil.createDiagramEditPart(diagram, preferencesHint, shell) : openedDiagramEditor.getDiagramEditPart();
-
-				boolean loadedPreferences = openedDiagramEditor != null || PrintHelperUtil.initializePreferences(dgrmEP, preferencesHint);
-
-				RootEditPart rep = dgrmEP.getRoot();
-				if (rep instanceof DiagramRootEditPart) {
-					this.mapMode = ((DiagramRootEditPart) rep).getMapMode();
-				}
-
-				IPreferenceStore preferenceStore = ((DiagramGraphicalViewer) dgrmEP.getViewer()).getWorkspaceViewerPreferenceStore();
-				if (preferenceStore.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS)) {
-					if (dgrmEP.getDiagramPreferencesHint().getPreferenceStore() != null) {
-						preferenceStore = (IPreferenceStore) dgrmEP.getDiagramPreferencesHint().getPreferenceStore();
-					}
-				}
-				doPrintDiagram(printService.createPrintJob(), dgrmEP, loadedPreferences, preferenceStore);
-			}
-		} finally {
-			dispose();
-			shell.dispose();
-		}
-	}
-
-	/**
-	 * Print the diagram figure using specified scale factor.
-	 * 
-	 * @param dgrmEP
-	 *            The diagram edit part to print
-	 * @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) {
-
-		Rectangle figureBounds = PrintHelperUtil.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 = adjustMarginsToScale(PageInfoHelper.getPageMargins(fPreferences, getMapMode()));
-
-		FontData fontData = JFaceResources.getDefaultFont().getFontData()[0];
-
-		org.eclipse.draw2d.geometry.Point pageCount = getPageCount(dgrmEP, figureBounds, pageBounds, true);
-
-		numCols = pageCount.x;
-		numRows = pageCount.y;
-
-		int row = 1, col = 1, finalRow = 0, finalColumn = 0;
-
-		List<PageData> pageList = new java.util.ArrayList<PageData>();
-
-		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);
-		}
-		//
-		// Print the pages in row, column order
-		//
-		for (; row <= numRows; row++) {
-			for (; col <= numCols; col++) {
-
-				pageList.add(new PageData(pageList.size(), row, col, dgrmEP, figureBounds, margins, fontData, fPreferences));
-
-				if (row == finalRow && col == finalColumn && this.printRangePageSelection == true) {
-					break;
-				}
-			}
-			if (row == finalRow && col == finalColumn && this.printRangePageSelection == true) {
-				break;
-			}
-			col = 1;
-		}
-		pages = pageList.toArray(new PageData[pageList.size()]);
-	}
-
-	/**
-	 * Print the diagram figure to fit the number and rows and columns specified
-	 * by the user.
-	 * 
-	 * @param dgrmEP
-	 *            The diagram edit part to print
-	 * @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) {
-
-		Rectangle figureBounds = PrintHelperUtil.getPageBreakBounds(dgrmEP, loadedPreferences);
-
-		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);
-
-		PageMargins margins = adjustMarginsToScale(PageInfoHelper.getPageMargins(fPreferences, getMapMode()));
-
-		translated = new Point((int) (-figureBounds.x * userScale), (int) (-figureBounds.y * userScale));
-
-		FontData fontData = JFaceResources.getDefaultFont().getFontData()[0];
-
-		int row = 1, col = 1, finalRow = 0, finalColumn = 0;
-		List<PageData> pageList = new java.util.ArrayList<PageData>();
-
-		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);
-		}
-
-		for (; row <= rows; row++) {
-			for (; col <= columns; col++) {
-
-				pageList.add(new PageData(pageList.size(), row, col, dgrmEP, figureBounds, margins, fontData, fPreferences));
-
-				if (row == finalRow && col == finalColumn && this.printRangePageSelection == true) {
-					break;
-				}
-			}
-			if (row == finalRow && col == finalColumn && this.printRangePageSelection == true) {
-				break;
-			}
-			col = 1;
-		}
-		pages = pageList.toArray(new PageData[pageList.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.awt.print.Printable#print(java.awt.Graphics,
-	 * java.awt.print.PageFormat, int)
-	 */
-	public int print(java.awt.Graphics printGraphics, PageFormat pageFormat, int pageIndex) throws PrinterException {
-
-		if (pageIndex >= pages.length) {
-			return java.awt.print.Printable.NO_SUCH_PAGE;
-		}
-
-		try {
-			printGraphics.setClip(0, 0, (int) pageFormat.getWidth(), (int) pageFormat.getHeight());
-
-			swtGraphics = new PrinterGraphicsToGraphics2DAdapter((java.awt.Graphics2D) printGraphics, new Rectangle(0, 0, (int) pageFormat.getWidth(), (int) pageFormat.getHeight()));
-
-			graphics = createMapModeGraphics(createPrinterGraphics(swtGraphics));
-			graphics.scale(AWT_DPI_CONST / display_dpi.x);
-			drawPage(pages[pageIndex]);
-		} finally {
-			dispose();
-
-		}
-
-		return java.awt.print.Printable.PAGE_EXISTS;
-	}
-
-	/*
-	 * (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());
-	}
-
-	protected ScaledGraphics createPrinterGraphics(Graphics theGraphics) {
-		return new RenderedScaledGraphics(theGraphics);
-	}
-
-	/**
-	 * Set printing options in a format that is suitable for the Java print
-	 * service
-	 * 
-	 * @param jobName
-	 *            The printer job name to use
-	 * @param fPreferences
-	 *            obtain page information from preferences
-	 * @return PrintRequestAttribute set suitable for Java print service
-	 */
-	protected PrintRequestAttributeSet initializePrintOptions(DocPrintJob printJob, String jobName, IPreferenceStore fPreferences) {
-
-		PrintOptions advancedOptions = ((PrintHelper) (printHelper)).getPrintOptions();
-
-		PrintRequestAttributeSet printRequestAttributeSet = new HashPrintRequestAttributeSet();
-
-		if (fPreferences.getBoolean(WorkspaceViewerProperties.PREF_USE_PORTRAIT)) {
-			printRequestAttributeSet.add(OrientationRequested.PORTRAIT);
-		} else {
-			printRequestAttributeSet.add(OrientationRequested.LANDSCAPE);
-		}
-
-		String pageSize = fPreferences.getString(WorkspaceViewerProperties.PREF_PAGE_SIZE);
-
-		if (pageSize.compareToIgnoreCase(PageSetupPageType.LETTER.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.NA_LETTER);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.LEGAL.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.NA_LEGAL);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.EXECUTIVE.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.EXECUTIVE);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.A3.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.ISO_A3);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.A4.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.ISO_A4);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.B4.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.ISO_B4);
-		} else if (pageSize.compareToIgnoreCase(PageSetupPageType.B5.getName()) == 0) {
-			printRequestAttributeSet.add(MediaSizeName.ISO_B5);
-		}
-		if (advancedOptions.isQualityLow()) {
-			printRequestAttributeSet.add(PrintQuality.DRAFT);
-		} else if (advancedOptions.isQualityMed()) {
-			printRequestAttributeSet.add(PrintQuality.NORMAL);
-		} else if (advancedOptions.isQualityHigh()) {
-			printRequestAttributeSet.add(PrintQuality.HIGH);
-		}
-		if (advancedOptions.isSideDuplex()) {
-			printRequestAttributeSet.add(Sides.DUPLEX);
-		} else if (advancedOptions.isSideOneSided()) {
-			printRequestAttributeSet.add(Sides.ONE_SIDED);
-		} else if (advancedOptions.isSideTumble()) {
-			printRequestAttributeSet.add(Sides.TUMBLE);
-		}
-		if (advancedOptions.isChromaticityColor()) {
-			printRequestAttributeSet.add(Chromaticity.COLOR);
-		} else {
-			printRequestAttributeSet.add(Chromaticity.MONOCHROME);
-		}
-
-		final MediaSize mediaSize = getMediaSize(pageSize, printRequestAttributeSet, fPreferences);
-
-		printRequestAttributeSet.add(new MediaPrintableArea(0f, 0f, (mediaSize.getX(MediaSize.INCH)), (mediaSize.getY(MediaSize.INCH)), MediaPrintableArea.INCH));
-
-		printRequestAttributeSet.add(new Copies(printHelper.getDlgNumberOfCopies()));
-
-		if (printHelper.getDlgCollate()) {
-			printRequestAttributeSet.add(SheetCollate.COLLATED);
-		} else {
-			printRequestAttributeSet.add(SheetCollate.UNCOLLATED);
-		}
-
-		String userJobName = advancedOptions.getJobName();
-		if (userJobName != null && userJobName.length() > 0) {
-			jobName = userJobName;
-		}
-		printRequestAttributeSet.add(new JobName(jobName, Locale.getDefault()));
-
-		return printRequestAttributeSet;
-	}
-
-	/**
-	 * Get the media size to use for printing.
-	 * 
-	 * @return the media size. <code>null</code> is never returned.
-	 */
-	private MediaSize getMediaSize(String pageSize, PrintRequestAttributeSet printRequestAttributeSet, IPreferenceStore fPreferences) {
-
-		MediaSize mediaSize;
-
-		if (pageSize.compareToIgnoreCase(PageSetupPageType.USER_DEFINED.getName()) == 0) {
-			float width = (float) fPreferences.getDouble(WorkspaceViewerProperties.PREF_PAGE_WIDTH);
-			float height = (float) fPreferences.getDouble(WorkspaceViewerProperties.PREF_PAGE_HEIGHT);
-			int units = fPreferences.getBoolean(WorkspaceViewerProperties.PREF_USE_INCHES) ? MediaSize.INCH : MediaSize.MM;
-			mediaSize = new MediaSize(width, height, units);
-		} else {
-			MediaSizeName media = (MediaSizeName) printRequestAttributeSet.get(Media.class);
-			mediaSize = MediaSize.getMediaSizeForName(media);
-		}
-		/* we were not able to find the media size, use the default one */
-		if (mediaSize == null) {
-			mediaSize = MediaSize.ISO.A4;
-		}
-		return mediaSize;
-	}
-
-	/**
-	 * Prints to scale or prints to rows x columns pages
-	 * 
-	 * @param printJob
-	 * @param diagramEditPart
-	 * @param loadedPreferences
-	 * @param fPreferences
-	 */
-	protected void doPrintDiagram(DocPrintJob printJob, DiagramEditPart diagramEditPart, boolean loadedPreferences, IPreferenceStore fPreferences) {
-
-		PrintRequestAttributeSet printRequestAttributeSet = initializePrintOptions(printJob, diagramEditPart.getDiagramView().getName(), fPreferences);
-
-		if (isScaledPercent) {
-			printToScale(diagramEditPart, loadedPreferences, fPreferences);
-		} else {
-			printToPages(diagramEditPart, loadedPreferences, fPreferences);
-		}
-
-		Doc doc = new SimpleDoc(this, DocFlavor.SERVICE_FORMATTED.PRINTABLE, new HashDocAttributeSet());
-
-		try {
-			printJob.print(doc, printRequestAttributeSet);
-		} catch (PrintException e) {
-
-			Trace.catching(DiagramPrintingPlugin.getInstance(), DiagramPrintingDebugOptions.EXCEPTIONS_CATCHING, DiagramPrinterUtil.class, e.getMessage(), e);
-			Log.warning(DiagramPrintingPlugin.getInstance(), DiagramPrintingStatusCodes.RESOURCE_FAILURE, e.getMessage(), e);
-
-			Display display = diagramEditPart.getViewer().getControl().getDisplay();
-			if (display == null) {
-				display = DisplayUtils.getDisplay();
-			}
-
-			MessageDialog.openError(display.getActiveShell(), DiagramUIPrintingMessages.JPSDiagramPrinterUtil_ErrorTitle, DiagramUIPrintingMessages.JPSDiagramPrinterUtil_ErrorMessage);
-		}
-	}
-
-	/**
-	 * 
-	 * This method paints a portion of the diagram. (The area painted
-	 * representing one page.)
-	 * 
-	 * @param page
-	 *            indicates which page to print.
-	 */
-	protected void drawPage(PageData page) {
-
-		this.graphics.pushState();
-
-		Display display = DisplayUtils.getDisplay();
-
-		int shellStyle = display.getActiveShell().getStyle();
-		boolean rtlEnabled = (shellStyle & SWT.MIRRORED) != 0;
-
-		if (rtlEnabled) {
-
-			org.eclipse.draw2d.geometry.Point pageSize = PageInfoHelper.getPageSize(page.preferences, false, getMapMode());
-
-			Image image = new Image(display, getMapMode().LPtoDP(pageSize.x), getMapMode().LPtoDP(pageSize.y));
-
-			GC imgGC = new GC(image, SWT.RIGHT_TO_LEFT);
-			SWTGraphics tempSWTGraphic = new SWTGraphics(imgGC);
-			ScaledGraphics tempScaledGraphic = new RenderedScaledGraphics(tempSWTGraphic);
-			MapModeGraphics tempMapModeGraphic = createMapModeGraphics(tempScaledGraphic);
-
-			imgGC.setFont(tempMapModeGraphic.getFont());
-
-			internalDrawPage(page.diagram, page.bounds, page.preferences, page.margins, tempMapModeGraphic, page.row, page.column, true);
-
-			this.graphics.drawImage(image, 0, 0);
-
-			tempMapModeGraphic.dispose();
-			tempScaledGraphic.dispose();
-			tempSWTGraphic.dispose();
-			imgGC.dispose();
-			image.dispose();
-
-		} else {
-
-			internalDrawPage(page.diagram, page.bounds, page.preferences, page.margins, graphics, page.row, page.column, false);
-		}
-
-		this.graphics.popState();
-	}
-
-	/**
-	 * The real rendering of the page to the given graphical object occurs here.
-	 */
-	protected 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();
-	}
-
-	/**
-	 * Adjust the page margins to be compatible with the user scale.
-	 * 
-	 * @param margins
-	 *            the page margins to adjust
-	 * @return adjusted page margins
-	 */
-	private PageMargins adjustMarginsToScale(PageMargins margins) {
-
-		margins.left /= userScale;
-		margins.top /= userScale;
-		margins.bottom /= userScale;
-		margins.right /= userScale;
-
-		return margins;
-	}
-
-	/**
-	 * A specialized graphics adapter used in printing.
-	 * 
-	 * There are several issues with the base adapter such as incorrect line
-	 * width settings and issues with gradient fill causing printing to be
-	 * offset wich are concerns specific to printing.
-	 * 
-	 * @author James Bruck (jbruck)
-	 * 
-	 */
-	private class PrinterGraphicsToGraphics2DAdapter extends GraphicsToGraphics2DAdaptor {
-
-		public PrinterGraphicsToGraphics2DAdapter(Graphics2D graphics, Rectangle viewPort) {
-			super(graphics, viewPort);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.
-		 * GraphicsToGraphics2DAdaptor#setLineWidth(int)
-		 */
-		public void setLineWidth(int width) {
-			super.setLineWidth(width);
-
-			BasicStroke scaledStroke = getStroke();
-			//
-			// Make a special case for line thickness to take the
-			// printer resolution into account.
-			//
-			scaledStroke = new BasicStroke((float) (width * AWT_DPI_CONST / 100), scaledStroke.getEndCap(), scaledStroke.getLineJoin(), scaledStroke.getMiterLimit(), scaledStroke.getDashArray(), 0);
-
-			getGraphics2D().setStroke(scaledStroke);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.
-		 * GraphicsToGraphics2DAdaptor#fillGradient(int, int, int, int, boolean)
-		 */
-		public void fillGradient(int x, int y, int w, int h, boolean vertical) {
-			//
-			// A bug in the draw2d layer causes printed output to be
-			// offset if we use gradient fill. We will use an image
-			// instead.
-			//
-			Image tempImage = new Image(DisplayUtils.getDisplay(), new org.eclipse.swt.graphics.Rectangle(x, y, w, h));
-			GC gc = new GC(tempImage);
-			SWTGraphics tempGraphics = new SWTGraphics(gc);
-
-			tempGraphics.setForegroundColor(swtGraphics.getForegroundColor());
-			tempGraphics.setBackgroundColor(swtGraphics.getBackgroundColor());
-			tempGraphics.fillGradient(new org.eclipse.draw2d.geometry.Rectangle(0, 0, w, h), vertical);
-			drawImage(tempImage, 0, 0, w, h, x, y, w, h);
-
-			tempGraphics.dispose();
-			gc.dispose();
-			tempImage.dispose();
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinterHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinterHelper.java
deleted file mode 100644
index bd1d334..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/JPSDiagramPrinterHelper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 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.common.ui.util.DisplayUtils;
-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.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.DiagramPrinterHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.util.PrintHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * 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. 
- * 
- * This class uses the java print service API to accomplish its task.
- * This class was derived from @see org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil
- * 
- * 
- * @author James Bruck (jbruck)
- */
-public class JPSDiagramPrinterHelper extends DiagramPrinterHelper {
-
-	private static JPSDiagramPrinterHelper jpsDiagramPrinterHelper;
-
-	public static JPSDiagramPrinterHelper getDiagramPrinterHelper() {
-		if(jpsDiagramPrinterHelper == null){
-			jpsDiagramPrinterHelper = new JPSDiagramPrinterHelper();
-		}
-		return jpsDiagramPrinterHelper;
-	}
-
-	/**
-	 * Prevent instantiation.
-	 */
-	private JPSDiagramPrinterHelper() {
-		super();
-	}
-
-	/**
-	 * 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 jpsDiagramPrinter
-	 *            the diagram printer that does the work of actually printing the diagrams
-	 */
-	public void printWithSettings(IEditorPart editorPart,
-			Map<String, Diagram> diagramMap, JPSDiagramPrinter jpsDiagramPrinter) {
-		
-		Display display = DisplayUtils.getDisplay(); 
-			
-		try {
-			IPrintHelper helper = new PrintHelper();
-			List<String> diagramNames = new ArrayList<String>(diagramMap
-					.keySet());
-
-			PrinterData printerData = collectPrintInformation(
-					jpsDiagramPrinter, helper, diagramNames, editorPart,
-					diagramMap);
-
-			if (printerData != null) {
-		
-				jpsDiagramPrinter.setPrinter(printerData.name);
-				jpsDiagramPrinter.setDisplayDPI(display.getDPI());
-				jpsDiagramPrinter.setPrintHelper(helper);
-
-				if (helper.getDlgDiagramPrintRangeCurrent()) {
-					DiagramEditPart dgrmEP = ((IDiagramWorkbenchPart) editorPart)
-							.getDiagramEditPart();
-					assert dgrmEP != null;
-					jpsDiagramPrinter
-							.setDiagrams(Collections.singletonList(dgrmEP
-									.getDiagramView().getDiagram()));
-				} else if (helper.getDlgDiagramPrintRangeAll()) {
-					jpsDiagramPrinter.setDiagrams(diagramMap.values());
-				} else if (helper.getDlgDiagramPrintRangeSelection()) {
-					Object obj;
-					List<Diagram> list = new ArrayList<Diagram>();
-					for (int i = 0; i < diagramNames.size(); i++) {
-						if (helper.isDlgDiagramSelected(i)) {
-							obj = diagramMap.get(diagramNames.get(i));
-							if (obj instanceof Diagram) {
-								list.add((Diagram) obj);
-							}
-						}
-					}
-					jpsDiagramPrinter.setDiagrams(list);
-				}
-				printDiagrams(jpsDiagramPrinter, helper);
-			}
-		} catch (Throwable e) {
-
-			Trace.catching(DiagramPrintingPlugin.getInstance(),
-					DiagramPrintingDebugOptions.EXCEPTIONS_CATCHING,
-					DiagramPrinterUtil.class, e.getMessage(), e);
-			Log.warning(DiagramPrintingPlugin.getInstance(),
-					DiagramPrintingStatusCodes.RESOURCE_FAILURE,
-					e.getMessage(), e);
-
-			MessageDialog
-					.openError(
-							display.getActiveShell(),
-							DiagramUIPrintingMessages.JPSDiagramPrinterUtil_ErrorTitle,
-							DiagramUIPrintingMessages.JPSDiagramPrinterUtil_ErrorMessage);
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/PageData.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/PageData.java
deleted file mode 100644
index 9283405..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/internal/PageData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper.PageMargins;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.graphics.FontData;
-
- 
- /**
- * PageData is used during the JPS printing process to cache
- * information that will be used later when printing is invoked
- * through a call-back mechanism.
- *  
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- *
- */
- 
-public class PageData {
-	
-	final int index;
-	final int row;
-	final int column;
-
-	final DiagramEditPart diagram;
-	final Rectangle bounds;
-	final PageMargins margins;
-	final FontData font;
-	final IPreferenceStore preferences;
-
-	PageData(int index, int row, int column, DiagramEditPart diagram,
-			Rectangle bounds, PageMargins margins, FontData font,
-			IPreferenceStore preferences) {
-		
-		this.index = index;
-		this.row = row;
-		this.column = column;
-		this.diagram = diagram;
-		this.bounds = bounds;
-		this.margins = margins;
-		this.font = font;
-		this.preferences = preferences;
-	}
-}
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/model/PrintDestination.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintDestination.java
deleted file mode 100644
index c07aeaa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintDestination.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.model;
-
-import org.eclipse.swt.printing.PrinterData;
-
-
-/**
- * This class is used as part of the infrastructure required for data-bindings
- * used with the JPS dialog.
- *
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-public class PrintDestination extends PrintModelElement {
-    public static String PROPERTY_NAME = "name"; //$NON-NLS-1$
-    public static String PROPERTY_PRINT_TO_FILE = "printToFile"; //$NON-NLS-1$
-    public static String PROPERTY_FILE_PATH = "filePath"; //$NON-NLS-1$
-    
-   
-    protected PrinterData printerData;
-           
-    public PrinterData getPrinterData(){
-    	if(printerData == null){
-    		printerData = new PrinterData();
-    	}
-    	return printerData;
-    }
-    
-    public PrintDestination(String printerName) {
-    	getPrinterData().name = printerName;
-    }
-    
-    public String getName() {
-        return getPrinterData().name;
-    }
-    
-    public void setName(String name) {
-        String oldName = this.getPrinterData().name;
-        this.getPrinterData().name = name;
-        firePropertyChange(PROPERTY_NAME, oldName, name);
-    }
-    
-    public boolean isPrintToFile() {
-        return getPrinterData().printToFile;
-    }
-    
-    public void setPrintToFile(boolean printToFile) {
-        boolean oldToFile = getPrinterData().printToFile;
-        getPrinterData().printToFile = printToFile;
-        firePropertyChange(PROPERTY_PRINT_TO_FILE, oldToFile, printToFile);
-    }
-    
-    public String getFilePath() {
-        return getPrinterData().fileName;
-    }
-    
-    public void setFilePath(String filePath) {
-        String oldPath = getPrinterData().fileName;
-        getPrinterData().fileName = filePath;
-        firePropertyChange(PROPERTY_FILE_PATH, oldPath, filePath);
-    }
-      
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintModelElement.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintModelElement.java
deleted file mode 100644
index 8cff79d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintModelElement.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.model;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-/**
- * This class is used as the model in the MVC infrastructure required for databindings
- * used with the JPS dialog.
- *
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-abstract class PrintModelElement {
-    protected final PropertyChangeSupport bean = new PropertyChangeSupport(this);
-    
-    public PrintModelElement() {
-        super();
-    }
-
-    public void addPropertyChangeListener(PropertyChangeListener listener) {
-        bean.addPropertyChangeListener(listener);
-    }
-
-    public void addPropertyChangeListener(String propertyName,
-            PropertyChangeListener listener) {
-        bean.addPropertyChangeListener(propertyName, listener);
-    }
-
-    public PropertyChangeListener[] getPropertyChangeListeners() {
-        return bean.getPropertyChangeListeners();
-    }
-
-    public PropertyChangeListener[] getPropertyChangeListeners(
-            String propertyName) {
-        return bean.getPropertyChangeListeners(propertyName);
-    }
-
-    public boolean hasListeners(String propertyName) {
-        return bean.hasListeners(propertyName);
-    }
-
-    public void removePropertyChangeListener(PropertyChangeListener listener) {
-        bean.removePropertyChangeListener(listener);
-    }
-
-    public void removePropertyChangeListener(String propertyName,
-            PropertyChangeListener listener) {
-        bean.removePropertyChangeListener(propertyName, listener);
-    }
-    
-    protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
-        bean.firePropertyChange(propertyName, oldValue, newValue);
-    }
-    
-    protected void firePropertyChange(String propertyName, int oldValue, int newValue) {
-        bean.firePropertyChange(propertyName, oldValue, newValue);
-    }
-    
-    protected void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
-        bean.firePropertyChange(propertyName, oldValue, newValue);
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintOptions.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintOptions.java
deleted file mode 100644
index 5ad2cfb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/model/PrintOptions.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.model;
-
-import java.util.List;
-
-/**
- * This class is used as part of the infrastructure required for data-bindings
- * used with the JPS dialog.
- * 
- * @author Christian Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-public class PrintOptions extends PrintModelElement {
-	public static String PROPERTY_DESTINATION = "destination"; //$NON-NLS-1$
-
-	public static String PROPERTY_PERCENT_SCALING = "percentScaling"; //$NON-NLS-1$
-	public static String PROPERTY_SCALE_FACTOR = "scaleFactor"; //$NON-NLS-1$
-	public static String PROPERTY_FIT_TO_WIDTH = "fitToPagesWidth"; //$NON-NLS-1$
-	public static String PROPERTY_FIT_TO_HEIGHT = "fitToPagesHeight"; //$NON-NLS-1$
-
-	public static String PROPERTY_ALL_PAGES = "allPages"; //$NON-NLS-1$
-	public static String PROPERTY_RANGE_FROM = "rangeFrom"; //$NON-NLS-1$
-	public static String PROPERTY_RANGE_TO = "rangeTo"; //$NON-NLS-1$
-
-	public static String PROPERTY_COPIES = "copies"; //$NON-NLS-1$
-	public static String PROPERTY_COLLATE = "collate"; //$NON-NLS-1$
-
-	public static String PROPERTY_QUALITY_HIGH = "qualityHigh"; //$NON-NLS-1$
-	public static String PROPERTY_QUALITY_LOW = "qualityLow"; //$NON-NLS-1$
-	public static String PROPERTY_QUALITY_MED = "qualityMed"; //$NON-NLS-1$
-	public static String PROPERTY_CHROMATICITY_MONO = "chromaticityMono"; //$NON-NLS-1$
-	public static String PROPERTY_CHROMATICITY_COLOR = "chromaticityColor"; //$NON-NLS-1$
-	public static String PROPERTY_SIDES_ONESIDED = "sideOneSided"; //$NON-NLS-1$
-	public static String PROPERTY_SIDES_TUMBLE = "sideTumble"; //$NON-NLS-1$
-	public static String PROPERTY_SIDES_DUPLEX = "sideDuplex"; //$NON-NLS-1$
-
-	public static String PROPERTY_JOB_NAME = "jobName"; //$NON-NLS-1$
-	public static String PROPERTY_USER_NAME = "userName"; //$NON-NLS-1$
-
-	public static String PROPERTY_DIAGRAM_CURRENT = "diagramCurrent"; //$NON-NLS-1$
-	public static String PROPERTY_DIAGRAM_SELECTION = "diagramSelection"; //$NON-NLS-1$
-
-	private PrintDestination destination;
-
-	private boolean percentScaling;
-	private int scaleFactor;
-	private int fitToPagesWidth;
-	private int fitToPagesHeight;
-
-	private boolean allPages;
-	private int rangeFrom;
-	private int rangeTo;
-
-	private int copies;
-	private boolean collate;
-
-	private boolean qualityHigh;
-	private boolean qualityLow;
-	private boolean qualityMed;
-
-	private boolean chromaticityColor;
-	private boolean chromaticityMono;
-
-	private boolean sideOneSided;
-	private boolean sideTumble;
-	private boolean sideDuplex;
-
-	private String jobName;
-	private String userName;
-
-	private boolean diagramCurrent;
-	private boolean diagramSelection;
-
-	private List<String> diagramsToPrint;
-
-	public PrintOptions() {
-		super();
-	}
-
-	public PrintDestination getDestination() {
-		return destination;
-	}
-
-	public void setDestination(PrintDestination destination) {
-		PrintDestination oldDestination = this.destination;
-		this.destination = destination;
-		firePropertyChange(PROPERTY_DESTINATION, oldDestination, destination);
-	}
-
-	public boolean isPercentScaling() {
-		return percentScaling;
-	}
-
-	public void setPercentScaling(boolean percentScaling) {
-		boolean oldScaling = this.percentScaling;
-		this.percentScaling = percentScaling;
-		firePropertyChange(PROPERTY_PERCENT_SCALING, oldScaling, percentScaling);
-	}
-
-	public String getJobName() {
-		return jobName;
-	}
-
-	public void setJobName(String name) {
-		String oldName = this.jobName;
-		this.jobName = name;
-		firePropertyChange(PROPERTY_JOB_NAME, oldName, name);
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String name) {
-		String oldName = this.userName;
-		this.userName = name;
-		firePropertyChange(PROPERTY_USER_NAME, oldName, name);
-	}
-
-	public void setDiagramsToPrint(List<String> diagramsToPrint) {
-		this.diagramsToPrint = diagramsToPrint;
-	}
-
-	public List<String> getDiagramsToPrint() {
-		return diagramsToPrint;
-	}
-
-	public boolean isDiagramCurrent() {
-		return this.diagramCurrent;
-	}
-
-	public void setDiagramCurrent(boolean diagramCurrent) {
-		boolean oldDiagramCurrent = this.diagramCurrent;
-		this.diagramCurrent = diagramCurrent;
-		firePropertyChange(PROPERTY_DIAGRAM_CURRENT, oldDiagramCurrent,
-				diagramCurrent);
-	}
-
-	public boolean isDiagramSelection() {
-		return this.diagramSelection;
-	}
-
-	public void setDiagramSelection(boolean diagramSelection) {
-		boolean oldDiagramSelection = this.diagramSelection;
-		this.diagramSelection = diagramSelection;
-		firePropertyChange(PROPERTY_DIAGRAM_SELECTION, oldDiagramSelection,
-				diagramSelection);
-	}
-
-	public boolean isQualityHigh() {
-		return this.qualityHigh;
-	}
-
-	public void setQualityHigh(boolean qualityHigh) {
-		boolean oldQualityHigh = this.qualityHigh;
-		this.qualityHigh = qualityHigh;
-		firePropertyChange(PROPERTY_QUALITY_HIGH, oldQualityHigh, qualityHigh);
-	}
-
-	public boolean isQualityLow() {
-		return this.qualityLow;
-	}
-
-	public void setQualityLow(boolean qualityLow) {
-		boolean oldQualityLow = this.qualityLow;
-		this.qualityLow = qualityLow;
-		firePropertyChange(PROPERTY_QUALITY_LOW, oldQualityLow, this.qualityLow);
-	}
-
-	public boolean isQualityMed() {
-		return this.qualityMed;
-	}
-
-	public void setQualityMed(boolean qualityMed) {
-		boolean oldQualityMed = this.qualityMed;
-		this.qualityMed = qualityMed;
-		firePropertyChange(PROPERTY_QUALITY_MED, oldQualityMed, this.qualityMed);
-	}
-
-	public int getScaleFactor() {
-		return scaleFactor;
-	}
-
-	public void setScaleFactor(int scaleFactor) {
-		int oldFactor = this.scaleFactor;
-		this.scaleFactor = scaleFactor;
-		firePropertyChange(PROPERTY_SCALE_FACTOR, oldFactor, scaleFactor);
-	}
-
-	public int getFitToPagesWidth() {
-		return fitToPagesWidth;
-	}
-
-	public void setFitToPagesWidth(int fitToPagesWidth) {
-		int oldWidth = this.fitToPagesWidth;
-		this.fitToPagesWidth = fitToPagesWidth;
-		firePropertyChange(PROPERTY_FIT_TO_WIDTH, oldWidth, fitToPagesWidth);
-	}
-
-	public int getFitToPagesHeight() {
-		return fitToPagesHeight;
-	}
-
-	public void setFitToPagesHeight(int fitToPagesHeight) {
-		int oldHeight = this.fitToPagesHeight;
-		this.fitToPagesHeight = fitToPagesHeight;
-		firePropertyChange(PROPERTY_FIT_TO_HEIGHT, oldHeight, fitToPagesHeight);
-	}
-
-	public boolean isAllPages() {
-		return allPages;
-	}
-
-	public void setAllPages(boolean allPages) {
-		boolean oldAll = this.allPages;
-		this.allPages = allPages;
-		firePropertyChange(PROPERTY_ALL_PAGES, oldAll, allPages);
-	}
-
-	public int getRangeFrom() {
-		return rangeFrom;
-	}
-
-	public void setRangeFrom(int rangeFrom) {
-		int oldFrom = this.rangeFrom;
-		this.rangeFrom = rangeFrom;
-		firePropertyChange(PROPERTY_RANGE_FROM, oldFrom, rangeFrom);
-	}
-
-	public int getRangeTo() {
-		return rangeTo;
-	}
-
-	public void setRangeTo(int rangeTo) {
-		int oldTo = this.rangeTo;
-		this.rangeTo = rangeTo;
-		firePropertyChange(PROPERTY_RANGE_TO, oldTo, rangeTo);
-	}
-
-	public int getCopies() {
-		return copies;
-	}
-
-	public void setCopies(int copies) {
-		int oldCopies = this.copies;
-		this.copies = copies;
-		firePropertyChange(PROPERTY_COPIES, oldCopies, copies);
-	}
-
-	public boolean isCollate() {
-		return collate;
-	}
-
-	public void setCollate(boolean collate) {
-		boolean oldCollate = this.collate;
-		this.collate = collate;
-		firePropertyChange(PROPERTY_COLLATE, oldCollate, collate);
-	}
-
-	public boolean isChromaticityColor() {
-		return this.chromaticityColor;
-	}
-
-	public void setChromaticityColor(boolean chromaticityColor) {
-		boolean oldChromaticityColor = this.chromaticityColor;
-		this.chromaticityColor = chromaticityColor;
-		firePropertyChange(PROPERTY_CHROMATICITY_COLOR, oldChromaticityColor,
-				this.chromaticityColor);
-	}
-
-	public boolean isChromaticityMono() {
-		return this.chromaticityMono;
-	}
-
-	public void setChromaticityMono(boolean chromaticityMono) {
-		boolean oldChromaticityMono = this.chromaticityMono;
-		this.chromaticityMono = chromaticityMono;
-		firePropertyChange(PROPERTY_CHROMATICITY_MONO, oldChromaticityMono,
-				this.chromaticityMono);
-	}
-
-	public boolean isSideOneSided() {
-		return this.sideOneSided;
-	}
-
-	public void setSideOneSided(boolean sideOneSided) {
-		boolean oldSideOneSided = this.sideOneSided;
-		this.sideOneSided = sideOneSided;
-		firePropertyChange(PROPERTY_SIDES_ONESIDED, oldSideOneSided,
-				this.sideOneSided);
-	}
-
-	public boolean isSideTumble() {
-		return this.sideTumble;
-	}
-
-	public void setSideTumble(boolean sideTumble) {
-		boolean oldSideTumble = this.sideTumble;
-		this.sideTumble = sideTumble;
-		firePropertyChange(PROPERTY_SIDES_TUMBLE, oldSideTumble,
-				this.sideTumble);
-	}
-
-	public boolean isSideDuplex() {
-		return this.sideDuplex;
-	}
-
-	public void setSideDuplex(boolean sideDuplex) {
-		boolean oldSideDuplex = this.sideDuplex;
-		this.sideDuplex = sideDuplex;
-		firePropertyChange(PROPERTY_SIDES_DUPLEX, oldSideDuplex,
-				this.sideDuplex);
-	}
-}
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/PrintHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/PrintHelper.java
deleted file mode 100644
index 104be82..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing.render/src/org/eclipse/gmf/runtime/diagram/ui/printing/render/util/PrintHelper.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.printing.IPrintHelper;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.PrintHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.dialogs.JPSPrintDialog;
-import org.eclipse.gmf.runtime.diagram.ui.printing.render.model.PrintOptions;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Default implementation of a print-helper.
- * 
- * @author Christian W. Damus (cdamus)
- * @author James Bruck (jbruck)
- */
-public class PrintHelper implements IPrintHelper {
-	private final PrintOptions options = new PrintOptions();
-
-	List<String> diagramList;
-
-	public PrintHelper() {
-		initPrintOptions();
-	}
-
-	/**
-	 * Initialize the default options.
-	 */
-	private void initPrintOptions() {
-		options.setPercentScaling(true);
-				
-		options.setScaleFactor(PrintHelperUtil.getScale());
-		options.setFitToPagesWidth(PrintHelperUtil.getScaleToWidth());
-		options.setFitToPagesHeight(PrintHelperUtil.getScaleToHeight());
-
-		options.setAllPages(true);
-		options.setRangeFrom(1);
-		options.setRangeTo(1);
-
-		options.setCopies(1);
-		options.setCollate(false);
-
-		options.setQualityHigh(true);
-		options.setSideOneSided(true);
-		options.setChromaticityColor(true);
-
-		options.setDiagramCurrent(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.printing.IPrintHelper#openPrintDlg(java.util.List)
-	 */
-	@SuppressWarnings("unchecked")
-	public PrinterData openPrintDlg(List availableDiagramList) {
-		PrinterData result = null;
-		this.diagramList = availableDiagramList;
-
-		JPSPrintDialog dlg = new JPSPrintDialog(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow(), options, this.diagramList);
-
-		if (dlg.open() == IDialogConstants.OK_ID) {
-			if (options.getDestination() != null) {
-				result = options.getDestination().getPrinterData();
-			}
-		} else {
-			// revert
-			initPrintOptions();
-		}
-		return result;
-	}
-
-	public boolean getDlgCollate() {
-		return options.isCollate();
-	}
-
-	public int getDlgNumberOfCopies() {
-		return options.getCopies();
-	}
-
-	public int getDlgPagesFrom() {
-		return options.getRangeFrom();
-	}
-
-	public int getDlgPagesTo() {
-		return options.getRangeTo();
-	}
-
-	public boolean getDlgPrintRangeAll() {
-		return options.isAllPages();
-	}
-
-	public boolean getDlgPrintRangePages() {
-		return !getDlgPrintRangeAll();
-	}
-
-	public int getDlgScaleFitToM() {
-		return options.getFitToPagesWidth();
-	}
-
-	public int getDlgScaleFitToN() {
-		return options.getFitToPagesHeight();
-	}
-
-	public int getDlgScalePercent() {
-		return options.isPercentScaling() ? options.getScaleFactor() : -1;
-	}
-
-	public void setDlgOrientation(boolean landscape) {
-		// TODO Auto-generated method stub
-	}
-
-	public void setDlgPaperSize(int index, double width, double length) {
-		// TODO Auto-generated method stub
-	}
-
-	public boolean getDlgDiagramPrintRangeCurrent() {
-		return options.isDiagramCurrent();
-	}
-
-	public boolean getDlgDiagramPrintRangeSelection() {
-		return options.isDiagramSelection();
-	}
-
-	public boolean isDlgDiagramSelected(int index) {
-		String diagramToPrint = diagramList.get(index);
-		if (options.getDiagramsToPrint() != null) {
-			return options.getDiagramsToPrint().contains(diagramToPrint);
-		}
-		return false;
-	}
-
-	public boolean getDlgDiagramPrintRangeAll() {
-		// TODO Not supported by the JPS dialog
-		return false;
-	}
-
-	public PrintOptions getPrintOptions() {
-		return options;
-	}
-	
-	public void setScaleFactor(int scaleFactor) {
-	 	options.setScaleFactor(scaleFactor)	;
-	}
-
-	public void setScaleToWidthHeight(int width, int height) {
-		options.setFitToPagesWidth(width);
-		options.setFitToPagesHeight(height);
-	}
-
-}
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 67c6bcf..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,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.SWTDiagramPrinter;
-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 SWTDiagramPrinter {
-
-	/**
-	 * 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 b95d181..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/.api_filters
deleted file mode 100644
index 8f72d16..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/.api_filters
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.diagram.ui.printing" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/DefaultPrintActionHelper.java" type="org.eclipse.gmf.runtime.diagram.ui.printing.actions.DefaultPrintActionHelper">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="SWTDiagramPrinter"/>
-                <message_argument value="DefaultPrintActionHelper"/>
-                <message_argument value="doRun(IEditorPart, SWTDiagramPrinter)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/PrintPreviewAction.java" type="org.eclipse.gmf.runtime.diagram.ui.printing.actions.PrintPreviewAction">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="PrintPreviewHelper"/>
-                <message_argument value="PrintPreviewAction"/>
-                <message_argument value="setPrintPreviewHelper(PrintPreviewHelper)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="PrintPreviewHelper"/>
-                <message_argument value="PrintPreviewAction"/>
-                <message_argument value="PrintPreviewAction(IPrintActionHelper, PrintPreviewHelper)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/printing/util/DiagramPrinterUtil.java" type="org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="SWTDiagramPrinter"/>
-                <message_argument value="DiagramPrinterUtil"/>
-                <message_argument value="printWithSettings(IEditorPart, Map, SWTDiagramPrinter)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48f021a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:01:35 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 79a6ecd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/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.printing
-Bundle-Version: 1.4.1.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.printing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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/collate.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/collate.gif
deleted file mode 100644
index 6a49a84..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/collate.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/no_collate.gif b/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/no_collate.gif
deleted file mode 100644
index f4249e6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/icons/etool16/no_collate.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 9f654db..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.printing/pom.xml
deleted file mode 100644
index cce4268..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.printing</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.printing</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 c1fab70..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/DefaultPrintActionHelper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.SWTDiagramPrinter;
-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.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, SWTDiagramPrinter 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(dialog.getParent().getDisplay().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 fe70640..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/actions/PrintPreviewAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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;
-	}    
-    
-}
\ 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 077b25f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 PrintPreview_FitToPage_DialogTitle;
-	public static String PrintPreview_FitToPage_ButtonText;
-	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;
-	public static String JPSPrintDialog_Title;
-	public static String JPSPrintDialog_Button_PrintPreview;
-	public static String JPSPrintDialog_Copies;
-	public static String JPSPrintDialog_NumberOfCopies;
-	public static String JPSPrintDialog_Collate;
-	public static String JPSPrintDialog_Printer;
-	public static String JPSPrintDialog_Name;
-	public static String JPSPrintDialog_Properties;
-	public static String JPSPrintDialog_PrintToFile;
-	public static String JPSPrintDialog_PrintRange;
-	public static String JPSPrintDialog_All;
-	public static String JPSPrintDialog_Pages;
-	public static String JPSPrintDialog_From;
-	public static String JPSPrintDialog_To;
-	public static String JPSPrintDialog_Scaling;
-	public static String JPSPrintDialog_Adjust;
-	public static String JPSPrintDialog_FitTo;
-	public static String JPSPrintDialog_PagesWide;
-	public static String JPSPrintDialog_PagesTall;
-	public static String JPSDiagramPrinterUtil_ErrorTitle;
-	public static String JPSDiagramPrinterUtil_ErrorMessage;
-	public static String JPSOptionsDialog_Quality;
-	public static String JPSOptionsDialog_QualityHigh;
-	public static String JPSOptionsDialog_QualityMedium;
-	public static String JPSOptionsDialog_QualityLow;
-	public static String JPSOptionsDialog_Color;
-	public static String JPSOptionsDialog_ChromaticityColor;
-	public static String JPSOptionsDialog_ChromaticityMonochrome;
-	public static String JPSOptionsDialog_JobAttributes;
-	public static String JPSOptionsDialog_JobName;
-	public static String JPSOptionsDialog_Sides;
-	public static String JPSOptionsDialog_SidesOneSided;
-	public static String JPSOptionsDialog_SidesTumble;
-	public static String JPSOptionsDialog_SidesDuplex;
-	public static String JPSOptionsDialog_AdvancedOptions;
-	public static String JPSOptionsDialog_DiagramPrintRange;
-	public static String JPSOptionsDialog_DiagramPrintCurrent;
-	public static String JPSOptionsDialog_DiagramPrintSelected;
-	
-	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 075db7b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingMessages.properties
+++ /dev/null
@@ -1,93 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2008  IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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.
-PrintPreview_FitToPage_DialogTitle=Scale Settings
-PrintPreview_FitToPage_ButtonText=Fit To Pages...
-Print_MessageDialogTitle=Print Diagram
-Print_MessageDialogMessage=Print to fit the diagram?
-
-
-
-# ==============================================================================
-# Print Dialog - Translation Instruction : section to be translated
-# ==============================================================================
-JPSPrintDialog_Title=Print Diagram
-JPSPrintDialog_Button_PrintPreview=Print Preview...
-JPSPrintDialog_Copies=&Copies
-JPSPrintDialog_NumberOfCopies=&Number of copies:
-JPSPrintDialog_Collate=C&ollate
-JPSPrintDialog_Printer=Printer
-JPSPrintDialog_Name=&Name:
-JPSPrintDialog_Properties=Properties...
-JPSPrintDialog_PrintToFile=Print to &file
-JPSPrintDialog_PrintRange=Print &range
-JPSPrintDialog_All=A&ll
-JPSPrintDialog_Pages=&Pages
-JPSPrintDialog_From=Fr&om:
-JPSPrintDialog_To=&To:
-JPSPrintDialog_Scaling=&Scaling
-JPSPrintDialog_Adjust=A&djust to percentage of normal size:
-JPSPrintDialog_FitTo=Fit &to:
-JPSPrintDialog_PagesWide=Pages &wide:
-JPSPrintDialog_PagesTall=Pages &tall:
-
-JPSOptionsDialog_Quality=Quality
-JPSOptionsDialog_QualityHigh=&High
-JPSOptionsDialog_QualityMedium=&Medium
-JPSOptionsDialog_QualityLow=&Low
-JPSOptionsDialog_Color=Color
-JPSOptionsDialog_ChromaticityColor=&Color
-JPSOptionsDialog_ChromaticityMonochrome=&Monochrome
-JPSOptionsDialog_JobAttributes=Job Attributes
-JPSOptionsDialog_JobName=Job &Name
-JPSOptionsDialog_Sides=Sides
-JPSOptionsDialog_SidesOneSided=&One Sided
-JPSOptionsDialog_SidesTumble=&Tumble
-JPSOptionsDialog_SidesDuplex=&Duplex
-JPSOptionsDialog_AdvancedOptions=Advanced Options
-JPSOptionsDialog_DiagramPrintRange=Diagram Print Range
-JPSOptionsDialog_DiagramPrintCurrent=&Current diagram
-JPSOptionsDialog_DiagramPrintSelected=&Selected diagrams:
-
-
-# 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 ================================================
-
-JPSDiagramPrinterUtil_ErrorTitle=Error printing
-JPSDiagramPrinterUtil_ErrorMessage=Please ensure that at least one printer is installed and retry.
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 80c42cd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/l10n/DiagramUIPrintingPluginImages.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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$
-	
-	public static final ImageDescriptor COLLATE_ON = create(PREFIX_ENABLED
-			+ "collate.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor COLLATE_OFF = create(PREFIX_ENABLED
-			+ "no_collate.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 4b7b6b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/printpreview/PrintPreviewHelper.java
+++ /dev/null
@@ -1,1788 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-
-import org.eclipse.core.runtime.Assert;
-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.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.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.PrintHelperUtil;
-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.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-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.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-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.Text;
-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.
- *  
- * This class should be combined with the DiagramPrinter to reuse functionality.
- * 
- * @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;
-	
-	/**
-	 * Enable or disable the print option
-	 */
-	protected boolean enablePrinting = true;
-
-	/**
-	 * 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;
-	
-	/**
-	 * The print preview helper is capable of showing zoom input.
-	 * userScale is a value between 0 and 1.
-	 */
-	protected double userScale = 1;
-	
-	/**
-	 * Determine if we should consider fit to page options or not.
-	 */
-	private boolean fitToPage = false;
-	
-	/**
-	 *  Initial zoom levels.
-	 */
-	private int[] zoomLevels = { 25, 50, 75, 100, 150, 200, 250, 300, 400 };
-	
-	/**
-	 * A constant used in the combo box for scaling.
-	 */
-	private static final String FIT_TO_PAGES = DiagramUIPrintingMessages.PrintPreview_FitToPage_ButtonText;
-		
-	/**
-	 * A minimum scale percentage.
-	 */
-	private static int MINIMUM_SCALE_FACTOR = 5;
-	
-	/**
-	 * 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();
-	}
-
-	/**
-	 * Enable or disable printing depending on where the print preview is invoked from.
-	 * 
-	 * @param enablePrinting
-	 */
-	public void enablePrinting(boolean enablePrinting){
-		this.enablePrinting = enablePrinting;
-	}
-	
-	/**
-	 * 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 (!fitToPage) {
-			setUserScale(PrintHelperUtil.getScale());
-		}
-		
-		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 = PlatformUI.getWorkbench().getDisplay();
-		
-        //check for rtl Torientation...
-        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 || !enablePrinting) {
-			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;
-				}
-				
-				refreshComposite();
-
-			}
-
-			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--;
-					refreshComposite();
-				}
-			}
-
-			/**
-			 * @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++;
-					refreshComposite();
-				}
-			}
-
-			/**
-			 * @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--;
-					refreshComposite();
-				}
-			}
-
-			/**
-			 * @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++;
-					refreshComposite();
-				}
-			}
-
-			/**
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		});
-				
-		new ToolItem(bar, SWT.SEPARATOR);
-							
-		ToolItem separator = new ToolItem(bar, SWT.SEPARATOR);
-		final Combo zoomCombo = new Combo(bar, SWT.DROP_DOWN);
-			
-		zoomCombo.add(FIT_TO_PAGES);
-		for (int i = 0; i < zoomLevels.length; i++) {
-			zoomCombo.add(getDisplayScale(zoomLevels[i]));
-		}
-		
-		if (this.fitToPage) {
-			zoomCombo.setText(FIT_TO_PAGES);
-			zoomCombo.select(0);
-		} else {
-			zoomCombo.setText(getDisplayScale(PrintHelperUtil.getScale()));
-		}
-						
-		zoomCombo.addSelectionListener(new SelectionAdapter() {
-
-			/**
-			 * Apply the zoom scale as indicated by the text in the combo-box selection.
-			 * 
-			 * @param combo Obtain zoom information from the combo-box.
-			 */
-			private void doZoom(Combo combo) {
-				String scaleFactor = combo.getText();
-				int percentageIndex = scaleFactor.indexOf("%"); //$NON-NLS-1$
-				if (percentageIndex > 0) {
-					scaleFactor = scaleFactor.substring(0, percentageIndex);
-				}
-				
-				int scalePercentage = PrintHelperUtil.getScale();
-				try {
-					scalePercentage = Integer.parseInt(scaleFactor);
-				} catch (NumberFormatException e) {
-					// Ignore invalid entry; default is last known acceptable value
-				}
-							
-				if(scalePercentage < MINIMUM_SCALE_FACTOR){
-					scalePercentage = MINIMUM_SCALE_FACTOR;
-				}
-				setPercentScaling(scalePercentage);
-				refreshComposite();
-				combo.setText(getDisplayScale(scalePercentage));
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				doZoom((Combo) e.getSource());
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				String selectedString = ((Combo) e.getSource()).getText();
-				if (FIT_TO_PAGES.compareToIgnoreCase(selectedString) == 0) {
-					FitToPagesDialog fitToPages = new FitToPagesDialog(shell);
-					if (fitToPages.open() == Dialog.OK) {
-						int pagesWide = fitToPages.getPagesWide();
-						int pagesTall = fitToPages.getPagesTall();
-						PrintHelperUtil.setScaleToWidth(pagesWide);
-						PrintHelperUtil.setScaleToHeight(pagesTall);
-
-						setFitToPage(pagesWide, pagesTall);
-						refreshComposite();
-					}
-				} else {
-					doZoom((Combo) e.getSource());
-				}
-
-			}
-		});
-						
-		zoomCombo.pack();
-		separator.setWidth(zoomCombo.getSize().x);
-		separator.setControl(zoomCombo);
-										
-		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));
-		
-		refreshComposite();
-
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-		
-		dispose();
-		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 * userScale))
-			/ 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 = PrintHelperUtil.getPageBreakBounds(getDiagramEditPart(), true).getCopy();
-		}
-		
-		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) {
-			diagramEditPart = getDiagramEditorPart().getDiagramEditPart();
-		}
-		if (diagramEditPart == null) {
-			Diagram diagram = getDiagramEditorPart().getDiagram(); //do not getDiagramEditPart
-			PreferencesHint preferencesHint = getPreferencesHint(getDiagramEditorPart());
-			diagramEditPart = PrintHelperUtil.createDiagramEditPart(diagram, preferencesHint, getTempShell());
-			PrintHelperUtil.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 * userScale))
-			/ 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() {
-		try {
-			PrintService[] printServices = PrintServiceLookup.lookupPrintServices(
-					null, null);
-			return printServices.length > 0;
-		} catch (SWTError e) {
-			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;
-		}	
-	}
-
-	/**
-	 * 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);
-		}
-	}
-
-	/**
-	* A convenience method for refreshing the displayed image in the preview.
-    */
-	private void refreshComposite(){
-		
-		updateCompositeForNumberOfColumns(numberOfRowsToDisplay,
-				numberOfColumnsToDisplay);
-		
-		updateLeftRightUpDownButtonsForToolbar();
-	}	
-	
-	/**
-	 * 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 = ( imageHeight / (float) pageSize.y)
-				/ (float) DiagramMapModeUtil.getScale(getMapMode());
-		
-			scale *= userScale;
-			
-			margins.left /= userScale;   
-			margins.right /= userScale;
-			margins.bottom /= userScale;
-			margins.top /= userScale;
-									
-			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(shell.getDisplay(), 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 RenderedScaledGraphics(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;
-	}
-	
-	/**
-	 * 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();
-
-		if (PrintHelperUtil.getScaleToWidth() == 1	&& PrintHelperUtil.getScaleToHeight() == 1 && fitToPage) {
-			bounds = getDiagramEditPart().getChildrenBounds();
-		}		
-							
-		int scaledPageSizeWidth = (int)(pageSize.x/userScale) ;
-		int scaledPageSizeHeight = (int)(pageSize.y/userScale) ;
-						
-		//offset by page break figure bounds, then offset by the row or column we're at, and then take margins into account
-		int translateX = - bounds.x - (scaledPageSizeWidth * (col + userX)) + (margins.left * (col + userX + 1)) + (margins.right * (col + userX));
-		int translateY = - bounds.y - (scaledPageSizeHeight * (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(
-        		(scaledPageSizeWidth - margins.left - margins.right) * (col + userX) + bounds.x, 
-    			(scaledPageSizeHeight - margins.top - margins.bottom)* (row + userY) + bounds.y, 
-    			scaledPageSizeWidth - margins.left - margins.right,
-    			scaledPageSizeHeight - 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();
-	}
-			
-	
-	/**
-	 * 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();
-	}
-	
-
-	/**
-	 * 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);
-		if (tempShell != null) {
-	        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 RenderedMapModeGraphics(scaledGraphics, getMapMode());
-	}
-				
-	/**
-	 * Sets the scale factor.
-	 * 
-	 * @param scale : valid input is an integer larger than 0 representing a scale percentage 
-	 */
-	private void setUserScale(int scale){
-		userScale = scale/100f;
-		PrintHelperUtil.setScale(scale);
-	}
-				
-	/**
-	 * Prepare a string appropriate to show the scale factor to the user.
-	 * 
-	 * @param scale the scale factor, an integer greater than 0.
-	 * @return A string of the scale factor to be displayed to the user.
-	 */
-	private String getDisplayScale(int scale) {
-		return String.valueOf(scale) + "%"; //$NON-NLS-1$
-	}
-
-	
-	/**
-	 * Determine the page count when fit to page is used.
-	 * 
-	 * @param dgrmEP - The diagram edit part
-	 * @param figureBounds - The bounds of the figure
-	 * @param pageSize - Page size  
-	 * @param applyUserScale - The user scale
-	 * @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
-	 */
-	protected 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) {
-
-			DiagramRootEditPart diagramRootEditPart = (DiagramRootEditPart) rootEditPart;
-			PageBreakEditPart pageBreakEditPart = diagramRootEditPart
-					.getPageBreakEditPart();
-
-			double fNumCols = ((PageBreaksFigure) pageBreakEditPart.getFigure())
-					.getPageCount().y
-					* (applyUserScale ? userScale : 1);
-
-			double 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 {
-			double fNumRows = (figureBounds.height * (applyUserScale ? userScale : 1))
-					/ pageSize.y;
-			int numRows = (int) Math.ceil(fNumRows);
-
-			double fNumCols = (figureBounds.width * (applyUserScale ? userScale	: 1))
-					/ pageSize.x;
-			int numCols = (int) Math.ceil(fNumCols);
-
-			return new org.eclipse.draw2d.geometry.Point(numCols, numRows);
-		}
-	}
-
-	/**
-	 * Reset the fit to page flag and set the user scale when the
-	 * preview is triggered from the print dialog.
-	 * 
-	 * @param userScale a whole number greater than zero
-	 */
-	public void setPercentScaling(int userScale){
-		fitToPage = false;
-		setUserScale(userScale);
-	}
-	
-	/**
-	 * Recalculates a zoom ratio that can be used when displaying fit to page.
-	 * 
-	 * @param rows  The number of rows to fit the display to.
-	 * @param columns The number of columns to fit the display to.
-	 */
-	public void setFitToPage(int width, int height) {
-
-		fitToPage = true;
-
-		initializeMapMode();
-		
-		Rectangle figureBounds = PrintHelperUtil.getPageBreakBounds(
-				getDiagramEditPart(), true);
-
-		org.eclipse.draw2d.geometry.Point pageBounds = PageInfoHelper
-				.getPageSize(getPreferenceStore(), getMapMode());
-		org.eclipse.draw2d.geometry.Point pageCount = getPageCount(
-				getDiagramEditPart(), figureBounds, pageBounds, false);
-		int numCols = pageCount.x;
-		int numRows = pageCount.y;
-
-		float actualWidth = 0;
-		float actualHeight = 0;
-
-		if (height == 1 && width == 1) {
-			figureBounds = getDiagramEditPart().getChildrenBounds();
-			actualWidth = figureBounds.width;
-			actualHeight = figureBounds.height;
-		} else {
-			actualWidth = numCols * pageBounds.x;
-			actualHeight = numRows * pageBounds.y;
-		}
-
-		int totalHeight = (height * pageBounds.y);
-		int totalWidth = (width * pageBounds.x);
-
-		int vScale = (int) ((totalHeight * 100) / actualHeight);
-		int hScale = (int) ((totalWidth * 100) / actualWidth);
-
-		userScale = Math.min(hScale, vScale)/100f;
-	}
-	
-	
-	/**
-	 * A dialog that prompts the user for scaling the print settings
-	 * to the number of pages wide and tall.
-	 * Scale to Pages will affect zoom and offsets.  It will maximize the 
-	 * scaling factor and modify offsets to fit the entire image within 
-	 * the pages specified.
-	 * 
-	 * @author James Bruck (jbruck)
-	 *
-	 */
-	private class FitToPagesDialog extends Dialog {
-
-		/**
-		 *  The text field that holds the pages width
-		 */
-		private Text textWide;
-		/**
-		 *  The text field that holds the pages height
-		 */
-		private Text textTall;
-		/**
-		 *  The number of pages wide
-		 */
-		private int pagesWide = PrintHelperUtil.getScaleToWidth();
-		/**
-		 *  The number of pages tall
-		 */
-		private int pagesTall = PrintHelperUtil.getScaleToHeight();
-		
-		public FitToPagesDialog(Shell parent) {
-			super(parent);
-		}
-		
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-		 */
-		protected void configureShell(Shell newShell) {
-			super.configureShell(newShell);
-
-			newShell.setText(DiagramUIPrintingMessages.PrintPreview_FitToPage_DialogTitle);
-		}
-
-		/**
-		 * A helper that creates a label.
-		 * 
-		 * @param parent
-		 * @param text
-		 * @return a newly created label.
-		 */
-		Label label(Composite parent, String text) {
-			Label result = new Label(parent, SWT.NONE);
-			result.setText(text);
-			return result;
-		}
-
-		/**
-		 * A helper that gets layout data or creates 
-		 * it as necessary.
-		 * 
-		 * @param control
-		 * @return GridData for the layout
-		 */
-		GridData getLayoutData(Control control) {
-			GridData result = (GridData) control.getLayoutData();
-
-			if (result == null) {
-				result = new GridData();
-				control.setLayoutData(result);
-			}
-			return result;
-		}
-
-		/**
-		 * A helper to layout items horizontally.
-		 * 
-		 * @param control
-		 * @param inset
-		 * @return The layed out control
-		 */
-		Control layoutHorizontalIndent(Control control, int inset) {
-			GridData data = getLayoutData(control);
-			data.horizontalIndent = inset;
-
-			return control;
-		}
-
-		/**
-		 * A helper to right justify a control.
-		 * 
-		 * @param control
-		 * @return The layed out control
-		 */
-		Control layoutAlignRight(Control control) {
-			GridData data = getLayoutData(control);
-
-			data.horizontalAlignment = SWT.END;
-			data.grabExcessHorizontalSpace = false;
-
-			return control;
-		}
-
-		/**
-		 * A helper to layout a certain number of dialog units wide.
-		 * @param control
-		 * @param dlus
-		 * @return the aligned out control
-		 */
-		Control layoutWidth(Control control, int dlus) {
-			if (dlus > 0) {
-				GridData data = getLayoutData(control);
-				data.widthHint = convertHorizontalDLUsToPixels(dlus);
-			}
-			return control;
-		}
-
-		/**
-		 * A helper that lays out the given control horizontally.
-		 * 
-		 * @param control
-		 * @param grab
-		 * @return The aligned control
-		 */
-		Control layoutFillHorizontal(Control control, boolean grab) {
-			GridData data = getLayoutData(control);
-
-			data.horizontalAlignment = SWT.FILL;
-			data.grabExcessHorizontalSpace = grab;
-
-			return control;
-		}
-
-		/**
-		 * A helper that creates a new text field.
-		 * 
-		 * @param parent
-		 * @param width
-		 * @return a newly created text field
-		 */
-		Text text(Composite parent, int width) {
-			Text result = new Text(parent, SWT.SINGLE | SWT.BORDER);
-			layoutFillHorizontal(result, false);
-			layoutWidth(result, width);
-
-			return result;
-		}
-
-		/**
-		 * A helper that lays out a control grabbing both horizontal and
-		 * vertical extra spacing.
-		 * 
-		 * @param control
-		 * @return 
-		 */
-		Control layoutFillBoth(Control control) {
-			GridData data = getLayoutData(control);
-
-			data.horizontalAlignment = SWT.FILL;
-			data.grabExcessHorizontalSpace = true;
-			data.verticalAlignment = SWT.FILL;
-			data.grabExcessVerticalSpace = true;
-
-			return control;
-		}
-
-		/**
-		 * A helper that creates a new group.
-		 * 
-		 * @param parent
-		 * @param text
-		 * @return A newly created group.
-		 */
-		Group group(Composite parent, String text) {
-			Group result = new Group(parent, SWT.NONE);
-			result.setText(text);
-			layoutFillBoth(result);
-			return result;
-		}
-
-		/**
-		 * Layout the given control with the number of columns specified.
-		 * 
-		 * @param composite
-		 * @param columns
-		 * @return The aligned out control
-		 */
-		Composite layout(Composite composite, int columns) {
-			GridLayout g = new GridLayout(columns, false);
-			g.marginLeft = 6;
-			g.marginRight = 6;
-			g.marginTop = 6;
-			g.marginBottom = 3;
-			composite.setLayout(g);
-
-			return composite;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-		 */
-		protected Control createDialogArea(Composite parent) {
-
-			Composite composite = new Composite(parent, SWT.NONE);
-			layout(composite, 1);
-			Composite scaleGroup = group(composite,
-					DiagramUIPrintingMessages.JPSPrintDialog_Scaling);
-			layout(scaleGroup, 5);
-
-			layoutHorizontalIndent(layoutAlignRight(label(scaleGroup,
-					DiagramUIPrintingMessages.JPSPrintDialog_PagesWide)), 15);
-
-			textWide = text(scaleGroup, 20);
-			textWide.setText(String.valueOf(PrintHelperUtil.getScaleToWidth()));
-
-			layoutHorizontalIndent(layoutAlignRight(label(scaleGroup,
-					DiagramUIPrintingMessages.JPSPrintDialog_PagesTall)), 15);
-			textTall = text(scaleGroup, 20);
-			textTall
-					.setText(String.valueOf(PrintHelperUtil.getScaleToHeight()));
-
-			return composite;
-		}
-
-		public int getPagesWide() {
-			return pagesWide;
-		}
-
-		public int getPagesTall() {
-			return pagesTall;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		@Override
-		protected void okPressed() {
-
-			try {
-				pagesWide = Integer.parseInt(textWide.getText());
-			} catch (NumberFormatException e) {
-				// Ignore invalid entry; default is last known acceptable value
-			} 
-			if(pagesWide < 1) {
-				pagesWide = 1;
-			}
-			
-			try {
-				pagesTall = Integer.parseInt(textTall.getText());
-			} catch (NumberFormatException e) {
-				// Ignore invalid entry; default is last known acceptable value
-			}
-			if(pagesTall < 1){
-				pagesTall = 1;
-			}
-			
-			super.okPressed();
-		}
-	}
-		
-}
\ 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 a1a3a7a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinter.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-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.draw2d.ui.internal.graphics.MapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.swt.graphics.Point;
-
-
-/**
- * Basic page calculation operations have been factored out into this class.
- * This class was derived from the previous DiagramPrinter.
- * 
- * @author Wayne Diu, wdiu
- */
-public abstract class DiagramPrinter implements Runnable {
-
-	protected Point display_dpi;
-	protected Collection<Diagram> diagrams;
-	protected PreferencesHint preferencesHint;
-	protected IMapMode mapMode;
-	protected Point translated;
-
-	protected float userScale;
-	protected boolean isScaledPercent = false;
-	protected boolean fitToPage = false;
-	protected boolean printRangePageSelection = false;
-
-	protected int pageFrom = 1, pageTo = 1;
-	protected int rows = 1;
-
-	protected int columns = 1;
-
-	protected Graphics swtGraphics;
-	protected Graphics graphics;
-
-	public DiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
-		super();
-		this.preferencesHint = preferencesHint;
-		this.mapMode = mm;
-	}
-
-	/**
-	 * 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
-	 */
-	protected 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) {
-
-			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 {
-
-			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);
-		}
-	}
-
-	/**
-	 * 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.
-	 */
-	protected 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.
-	 */
-	protected int calculateColumnFromPage(int pageNum, int totalNumColumns,
-			int cRow) {
-
-		return (pageNum - ((cRow - 1) * totalNumColumns));
-	}
-
-	
-	/**
-	 * Disposes of the resources.
-	 */
-	protected void dispose() {
-		if (this.graphics != null) {
-			try {
-				this.graphics.dispose();
-			} catch (NullPointerException e) {
-				//do nothing
-			} finally {
-				this.graphics = null;
-			}
-		}
-
-		if (this.swtGraphics != null) {
-			try {
-				this.swtGraphics.dispose();
-			} catch (NullPointerException e) {
-				//do nothing
-			} finally {
-				this.swtGraphics = 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());
-    }
-    
-	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;
-	}
-
-	public Point getDisplayDPI() {
-		return display_dpi;
-	}
-
-	public void setDisplayDPI(Point display_dpi) {
-		this.display_dpi = display_dpi;
-	}
-
-	public PreferencesHint getPreferencesHint() {
-		return preferencesHint;
-	}
-
-	public void setPreferencesHint(PreferencesHint preferencesHint) {
-		this.preferencesHint = preferencesHint;
-	}
-
-	public IMapMode getMapMode() {
-		return mapMode;
-	}
-
-	public void setMapMode(IMapMode mm) {
-		this.mapMode = mm;
-	}
-
-	public Point getTranslated() {
-		return translated;
-	}
-
-	public void setTranslated(Point translated) {
-		this.translated = translated;
-	}
-
-	public float getUserScale() {
-		return userScale;
-	}
-
-	public void setScaledPercent(int scalePercent) {
-		this.isScaledPercent = true;
-		this.userScale = (scalePercent) / 100.0f;
-	}
-
-	public void setScaledPercent(boolean isScaledPercent) {
-		this.isScaledPercent = isScaledPercent;
-	}
-
-	public boolean isFitToPage() {
-		return fitToPage;
-	}
-
-	public void setFitToPage(boolean fitToPage) {
-		this.fitToPage = fitToPage;
-	}
-
-	public boolean isPrintRangePageSelection() {
-		return printRangePageSelection;
-	}
-
-	public void setPrintRangePageSelection(boolean printRangePageSelection) {
-		this.printRangePageSelection = printRangePageSelection;
-	}
-
-	public int getPageFrom() {
-		return pageFrom;
-	}
-
-	public void setPageFrom(int pageFrom) {
-		this.pageFrom = pageFrom;
-	}
-
-	public int getPageTo() {
-		return pageTo;
-	}
-
-	public void setPageTo(int pageTo) {
-		this.pageTo = pageTo;
-	}
-
-	public int getRows() {
-		return rows;
-	}
-
-	public void setRows(int rows) {
-		this.rows = rows;
-	}
-
-	public int getColumns() {
-		return columns;
-	}
-
-	public void setColumns(int columns) {
-		this.columns = columns;
-	}
-
-	public Graphics getSwtGraphics() {
-		return swtGraphics;
-	}
-
-	public void setSwtGraphics(Graphics swtGraphics) {
-		this.swtGraphics = swtGraphics;
-	}
-
-	public Graphics getGraphics() {
-		return graphics;
-	}
-
-	public void setGraphics(Graphics graphics) {
-		this.graphics = graphics;
-	}
-
-	public void setDiagrams(Collection<Diagram> diagrams) {
-		this.diagrams = diagrams;
-	}
-
-	public Collection<Diagram> getDiagrams() {
-		return diagrams;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinterHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinterHelper.java
deleted file mode 100644
index bd092bf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/DiagramPrinterHelper.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.text.NumberFormat;
-import java.text.ParseException;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.ui.printing.IPrintHelper;
-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.internal.DiagramPrintingPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.DiagramPrintingStatusCodes;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * 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. 
- * 
- * Basic functionality was factored into this class from the DiagramPrinterUtil.
- * This class and its specializing classes:
- * 
- * @author James Bruck (jbruck)
- */
-public class DiagramPrinterHelper {
-
-	/**
-	 * 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
-	 */
-	protected 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();
-	}
-
-	/**
-	 *   A helper that simply collects printing information.
-	 *  
-	 * @param diagramPrinter
-	 * @param helper
-	 * @param diagramNames
-	 * @param editorPart
-	 * @param diagramMap
-	 * @return
-	 */
-	protected PrinterData collectPrintInformation(
-			DiagramPrinter diagramPrinter, IPrintHelper helper,
-			List diagramNames, IEditorPart editorPart, Map diagramMap) {
-
-		PrinterData printerData;
-
-		IPreferenceStore pref = null;
-
-		if (editorPart instanceof IDiagramWorkbenchPart) {
-
-			IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart) editorPart)
-					.getDiagramGraphicalViewer();
-			if (viewer instanceof DiagramGraphicalViewer) {
-
-				pref = ((DiagramGraphicalViewer) viewer)
-						.getWorkspaceViewerPreferenceStore();
-
-				if (pref
-						.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS)) {
-
-					if (((IDiagramWorkbenchPart) editorPart)
-							.getDiagramEditPart().getDiagramPreferencesHint()
-							.getPreferenceStore() != null) {
-						pref = (IPreferenceStore) ((IDiagramWorkbenchPart) editorPart)
-								.getDiagramEditPart()
-								.getDiagramPreferencesHint()
-								.getPreferenceStore();
-					}
-				}
-			}
-		}
-		if (pref != null) {
-			helper.setDlgOrientation(pref
-					.getBoolean(WorkspaceViewerProperties.PREF_USE_LANDSCAPE));
-
-			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()) {
-
-				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);
-			}
-		}		
-		helper.setScaleFactor(PrintHelperUtil.getScale());
-		helper.setScaleToWidthHeight(PrintHelperUtil.getScaleToWidth(), PrintHelperUtil.getScaleToHeight());
-
-		printerData = helper.openPrintDlg(diagramNames);
-
-		if (printerData != null) {
-			if (helper.getDlgScalePercent() != -1) {
-				PrintHelperUtil.setScale(helper.getDlgScalePercent());
-			}					
-			if (helper.getDlgScaleFitToM() != -1) {
-				PrintHelperUtil.setScaleToWidth(helper.getDlgScaleFitToM());
-			}
-			if (helper.getDlgScaleFitToN() != -1) {
-				PrintHelperUtil.setScaleToHeight(helper.getDlgScaleFitToN());
-			}
-		}
-		
-		return printerData;
-	}
-
-}
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 afe4d60..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/HeaderAndFooterHelper.java
+++ /dev/null
@@ -1,105 +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
- */
-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/PrintHelperUtil.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/PrintHelperUtil.java
deleted file mode 100644
index 3800981..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/PrintHelperUtil.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 org.eclipse.core.runtime.IPath;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.RootEditPart;
-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.diagram.ui.util.DiagramEditorUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Helper to assist in making an off screen diagram suitable for printing or
- * previewing.
- * 
- * @author James Bruck (jbruck)
- */
-public class PrintHelperUtil {
-	
-	// 
-	// The following printing attributes are saved across
-	// the preview and print dialogs.
-	//
-	private static int scaleFactor = 100;
-	private static int scaleWidth = 1;
-	private static int scaleHeight = 1;
-
-	public static int getScale() {
-		return scaleFactor;
-	}
-	
-	public static void setScale(int scale) {
-		scaleFactor = scale;
-	}
-	
-	public static int getScaleToWidth() {
-		return scaleWidth;
-	}
-
-	public static void setScaleToWidth(int width) {
-		scaleWidth = width;
-	}
-
-	public static int getScaleToHeight() {
-		return scaleHeight;
-	}
-
-	public static void setScaleToHeight(int height) {
-		scaleHeight = height;
-	}
-	
-	/**
-     * 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) {			
-            return createDiagramEditPart(diagram, preferencesHint, new Shell());
-        }
-    
-    /**
-     * 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 before we
-        // continue; check bugzilla 170332
-        while (shell.getDisplay().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) {
-
-		DiagramEditor diagramEditor = DiagramEditorUtil.findOpenedDiagramEditorForID(id);
-		if (diagramEditor != null) {
-			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();
-			}
-		}
-
-		// 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;
-	}	
-		
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinter.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinter.java
deleted file mode 100644
index 8c20d5a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinter.java
+++ /dev/null
@@ -1,755 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Iterator;
-
-import org.eclipse.core.runtime.Assert;
-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.ui.util.DisplayUtils;
-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.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-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.util.DiagramEditorUtil;
-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.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-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.printing.PrinterData;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class supports printing using the SWT printing constructs.
- * Much of the paging code was derived from the previous <code> DiagramPrinter </code>.
- *
- * @author Wayne Diu, wdiu
- */
-public class SWTDiagramPrinter extends DiagramPrinter
-    implements Runnable {
-
-	protected Printer printer;
-    
-    private GC gc;
-        
-    private PrinterGraphics printerGraphics;
-    
-    private Point printerOffset;
-
-    private Rectangle logicalClientArea;
-        
-  
-    /**
-     * 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 SWTDiagramPrinter(PreferencesHint preferencesHint, IMapMode mm) {
-		super(preferencesHint, 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 mapMode <code>IMapMode</code> to do the coordinate mapping
-     */
-    public SWTDiagramPrinter(PreferencesHint preferencesHint) {
-        this(preferencesHint, MapModeUtil.getMapMode());
-  }
-     /**
-     * Sets the printer.
-     * 
-     * @param printer
-     *            The printer to set.
-     */
-    public void setPrinter(Printer printer) {
-        this.printer = printer;
-    }
-     
-
-    /**
-     * 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<Diagram> 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);
-                Diagram diagram = (Diagram)obj;
-                DiagramEditor openedDiagramEditor = DiagramEditorUtil
-						.findOpenedDiagramEditorForID(ViewUtil
-								.getIdStr(diagram));
-				DiagramEditPart dgrmEP = openedDiagramEditor == null ? PrintHelperUtil
-						.createDiagramEditPart(diagram, preferencesHint, shell)
-						: openedDiagramEditor.getDiagramEditPart();
-                
-                boolean loadedPreferences = openedDiagramEditor != null || PrintHelperUtil.initializePreferences(dgrmEP, preferencesHint);
-
-                RootEditPart rep = dgrmEP.getRoot();
-                if (rep instanceof DiagramRootEditPart) 
-                    this.mapMode = ((DiagramRootEditPart)rep).getMapMode();
-                
-                initialize();
-                
-                
-                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();
-                    }
-                }
-                
-            	// Ensure the preference value is properly updated when the
-				// user overrides the preference store with values from the
-				// print settings.
-				// Printing and preview use the preference settings, to
-				// calculate page size.
-				PrinterData printerData = printer.getPrinterData();
-				if (printerData != null) {
-					boolean useLandscape = (printerData.orientation == PrinterData.LANDSCAPE);
-					if (pref.getBoolean(WorkspaceViewerProperties.PREF_USE_LANDSCAPE) != useLandscape) {
-						pref.setValue(
-								WorkspaceViewerProperties.PREF_USE_LANDSCAPE,
-								useLandscape);
-					}
-					if (pref.getBoolean(WorkspaceViewerProperties.PREF_USE_PORTRAIT) == useLandscape) {
-						pref.setValue(
-								WorkspaceViewerProperties.PREF_USE_PORTRAIT,
-								!useLandscape);
-					}
-				}
-                
-                doPrintDiagram(dgrmEP, loadedPreferences, pref);
-                
-                dispose();
-            }
-            printer.endJob();
-        } finally {
-            shell.dispose();
-        }        
-    }
-       
-
-    /**
-     * Prints to scale or prints to rows x columns pages
-     */
-    protected 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();
-    }
-
-    protected 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 = PrintHelperUtil.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(DisplayUtils.getDisplay(), 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 !=null) && ((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(DisplayUtils.getDisplay(), 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 RenderedScaledGraphics(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);
-        }
-    }
-    
-    protected 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 = PrintHelperUtil.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(DisplayUtils.getDisplay());
-
-        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.
-     */
-    protected 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>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);
-    }
-    
-       
-    /**
-     * 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;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinterHelper.java b/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinterHelper.java
deleted file mode 100644
index 4c47e06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/internal/util/SWTDiagramPrinterHelper.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.common.ui.util.DisplayUtils;
-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.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.util.DiagramPrinterUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.printing.Printer;
-import org.eclipse.swt.printing.PrinterData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * 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.
- * 
- * This class uses the SWT printing to accomplish its task. This class was
- * derived from 
- * @see org.eclipse.gmf.runtime.diagram.ui.printing.util.DiagramPrinterUtil
- *  
- * @author James Bruck (jbruck)
- */
-public class SWTDiagramPrinterHelper extends DiagramPrinterHelper {
-
-	private static SWTDiagramPrinterHelper diagramPrinterHelper;
-
-	public static SWTDiagramPrinterHelper getDiagramPrinterHelper() {
-		if (diagramPrinterHelper == null) {
-			diagramPrinterHelper = new SWTDiagramPrinterHelper();
-		}
-		return diagramPrinterHelper;
-	}
-
-	/**
-	 * Prevent instantiation.
-	 */
-	private SWTDiagramPrinterHelper() {
-	}
-
-	/**
-	 * 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 void printWithSettings(IEditorPart editorPart, Map<String, Diagram> diagramMap,
-			SWTDiagramPrinter diagramPrinter) {
-
-		List diagramNames;
-		PrinterData printerData;
-		IPrintHelper helper;
-
-		Display display = DisplayUtils.getDisplay();
-		
-		try {
-			Class printhelperClass = Class
-					.forName(IPrintHelper.PRINT_HELPER_CLASS_NAME);
-			helper = (IPrintHelper) printhelperClass.newInstance();
-			diagramNames = new ArrayList(diagramMap.keySet());
-
-			printerData = collectPrintInformation(diagramPrinter, helper,
-					diagramNames, editorPart, diagramMap);
-
-			if (printerData != null) {
-				
-				final Printer printer = new Printer(printerData);
-
-				diagramPrinter.setPrinter(printer);
-				diagramPrinter.setDisplayDPI(display.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));
-							if (obj instanceof Diagram) {
-
-								list.add(obj);
-							}
-						}
-					}
-					diagramPrinter.setDiagrams(list);
-				}
-
-				printDiagrams(diagramPrinter, helper);
-
-				printer.dispose();
-			}
-		} 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.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);
-			}
-
-			return;
-		}
-
-	}
-
-	/**
-	 * A helper that simply collects printing information.
-	 * 
-	 * @param diagramPrinter
-	 * @param helper
-	 * @param diagramNames
-	 * @param editorPart
-	 * @param diagramMap
-	 * @return
-	 */
-	private PrinterData collectPrintInformation(
-			SWTDiagramPrinter diagramPrinter, IPrintHelper helper,
-			List diagramNames, IEditorPart editorPart, Map diagramMap) {
-
-		PrinterData printerData = null;
-		try {
-			printerData = super.collectPrintInformation(diagramPrinter, helper,
-					diagramNames, editorPart, diagramMap);
-		} 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(
-							DisplayUtils.getDisplay().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);
-			}
-		}
-		return printerData;
-	}
-}
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 31fbde9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/providers/DiagramWithPrintGlobalActionHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.SWTDiagramPrinter;
-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 SWTDiagramPrinter(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 1c75804..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.printing/src/org/eclipse/gmf/runtime/diagram/ui/printing/util/DiagramPrinterUtil.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util.Map;
-
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.SWTDiagramPrinter;
-import org.eclipse.gmf.runtime.diagram.ui.printing.internal.util.SWTDiagramPrinterHelper;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * 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. 
- * 
- * This class now delegates its functionality to helpers that isolate out the 
- * printing via SWT printing. 
- * 
- * 
- * @author wdiu, Wayne Diu
- */
-public class DiagramPrinterUtil {
-
-	/**
-	 * 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, SWTDiagramPrinter diagramPrinter) {
-
-		SWTDiagramPrinterHelper.getDiagramPrinterHelper().printWithSettings(
-				editorPart, diagramMap, diagramPrinter);
-	}
-}
\ 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 14ec4d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ae998ad..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:01:54 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 65d41b7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +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.4.2.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.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.ui.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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/aligncenter.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/aligncenter.gif
deleted file mode 100644
index 9a57a08..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/aligncenter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignleft.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignleft.gif
deleted file mode 100644
index a9e12b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignleft.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignright.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignright.gif
deleted file mode 100644
index f50ea48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/alignright.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_none.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_none.gif
deleted file mode 100644
index 2bc4cc7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_none.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_both.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_both.gif
deleted file mode 100644
index bc15526..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_both.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_source.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_source.gif
deleted file mode 100644
index 83b086d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_target.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_target.gif
deleted file mode 100644
index 9ed8708..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_open_target.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_both.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_both.gif
deleted file mode 100644
index a0bcb9c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_both.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_source.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_source.gif
deleted file mode 100644
index f627bff..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_target.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_target.gif
deleted file mode 100644
index ae1848c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_solid_target.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_type.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_type.gif
deleted file mode 100644
index bf2f6b7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/arrow_type.gif
+++ /dev/null
Binary files differ
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/icons/line_dash.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash.gif
deleted file mode 100644
index ffc836b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot.gif
deleted file mode 100644
index 6546335..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot_dot.gif
deleted file mode 100644
index d3cc46d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dash_dot_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dot.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dot.gif
deleted file mode 100644
index 8b7c0d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_dot.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_solid.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_solid.gif
deleted file mode 100644
index 82cf3d6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_solid.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_type.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_type.gif
deleted file mode 100644
index 9a0dc2e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_type.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width.gif
deleted file mode 100644
index fc3eb8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_five.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_five.gif
deleted file mode 100644
index 0d2c564..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_five.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_four.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_four.gif
deleted file mode 100644
index 863c963..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_four.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_one.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_one.gif
deleted file mode 100644
index 2bc4cc7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_one.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_three.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_three.gif
deleted file mode 100644
index 6bd01d9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_three.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_two.gif b/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_two.gif
deleted file mode 100644
index 82cf3d6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/icons/line_width_two.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 874e4f4..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 Modeling Project
-
-# ===============================================================================
-# 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 9536a8c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/plugin.xml
+++ /dev/null
@@ -1,101 +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
-        afterSection="property.section.ShapeColorAndFontPropertySection"
-        class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.TextAlignmentPropertySection"
-        filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.TextAlignmentPropertySectionFilter"
-        id="property.section.TextAlignmentPropertySection"
-        tab="property.tab.AppearancePropertySection">
-	 </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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.properties/pom.xml
deleted file mode 100644
index 345d4fb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.properties</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.properties</artifactId>
-  <version>1.4.2.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 020a0d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/FlattenedContainmentListPropertyValue.java
+++ /dev/null
@@ -1,98 +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
- */
-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);
-
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/GradientCellEditor.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/GradientCellEditor.java
deleted file mode 100644
index e259423..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/GradientCellEditor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.StringTokenizer;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.dialogs.GradientSelectionDialog;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.GradientStyle;
-import org.eclipse.gmf.runtime.notation.datatype.GradientData;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-
-/**
- * A cell editor that manages the gradient field.
- * 
- * @author lgrahek
- * @since 1.2
- */
-public class GradientCellEditor extends DialogCellEditor {
-
-    /**
-     * The composite widget containing the color and RGB label widgets
-     */
-    private Composite composite;
-
-    /**
-     * The label widget showing the current gradient. Format:
-     * RGB {x, x, x},RGB {x, x, x},style
-     * Format has to be the same as in NotationPropertyDescriptor.getPropertyValue()
-     */
-    private Label gradientLabel;
-    
-    /**
-     * Internal class for laying out this cell editor.
-     */
-    private class GradientCellLayout extends Layout {
-        public Point computeSize(Composite editor, int wHint, int hHint,
-                boolean force) {
-            if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) {
-				return new Point(wHint, hHint);
-			}
-            Point labelSize = gradientLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT,
-                    force);
-            return new Point(labelSize.x, labelSize.y);
-        }
-
-        public void layout(Composite editor, boolean force) {
-            Point gradientSize = gradientLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT,
-                    force);
-            gradientLabel.setBounds(0, 0, gradientSize.x, gradientSize.y);
-        }
-    }
-    
-    /**
-     * Creates a new GradientCellEditor with the given control as the parent.
-     *
-     * @param parent the parent control
-     */
-    public GradientCellEditor(Composite parent) {
-        this(parent, SWT.NONE);
-    }
-
-    /**
-     * Creates a new GradientCellEditor with the given control as the parent. 
-     * 
-     * @param parent the parent control
-     * @param style the style bits
-     */
-    public GradientCellEditor(Composite parent, int style) {
-        super(parent, style);
-        doSetValue(null);
-    }    
-    
-	/** 
-	 * Opens GradientSelectionDialog without transparency setting available, receives the
-	 * return values and uses them to create the resulting GradientData object. 
-	 * 
-	 * @see org.eclipse.jface.viewers.DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
-	 */
-	protected Object openDialogBox(Control cellEditorWindow) {
-		String value = (String)getValue();
-		RGB color1 = null, color2 = null;
-		int gradientStyle = -1;
-		// value is in format: RGB {x, x, x},RGB {x, x, x},style
-		// parse it
-        if (value != null) {
-			StringTokenizer st = new StringTokenizer(value, ",{}"); //$NON-NLS-1$
-			try {
-				int red, green, blue;
-				st.nextToken().trim(); // RGB string				
-				// color1
-				red = Integer.parseInt(st.nextToken().trim());
-				green = Integer.parseInt(st.nextToken().trim());
-				blue = Integer.parseInt(st.nextToken().trim());
-				if (red > -1 && green > -1 && blue > -1) {
-					color1 = new RGB(red, green, blue);
-				}
-				st.nextToken().trim(); // RGB string				
-				// color2
-				red = Integer.parseInt(st.nextToken().trim());
-				green = Integer.parseInt(st.nextToken().trim());
-				blue = Integer.parseInt(st.nextToken().trim());
-				if (red > -1 && green > -1 && blue > -1) {
-					color2 = new RGB(red, green, blue);
-				}				
-				// style
-				GradientStyle gradientStyleObj = GradientStyle.get(value.substring(value.lastIndexOf(',')+1).trim());
-				if (gradientStyleObj != null) {
-					gradientStyle = gradientStyleObj.getValue();
-				}
-			} finally {
-				if (color1 == null || color2 == null || gradientStyle == -1) {
-					value = null;
-				}				
-			}
-        }
-		if (value == null) {
-			// use default
-			GradientData def = GradientData.getDefaultGradientData();
-			color1 = FigureUtilities.integerToRGB(def.getGradientColor1());
-			color2 = FigureUtilities.integerToRGB(def.getGradientColor2());
-			gradientStyle = def.getGradientStyle();
-		}       
-		GradientSelectionDialog dialog = new GradientSelectionDialog(
-				cellEditorWindow.getShell(), SWT.APPLICATION_MODAL,
-				color1, color2, gradientStyle, 0);
-		int result = dialog.open();	
-		if (result == SWT.OK) { 
-			return new GradientData(
-					FigureUtilities.RGBToInteger(dialog.getGradientColor1()), 
-					FigureUtilities.RGBToInteger(dialog.getGradientColor2()), 
-					dialog.getGradientStyle());
-		} else if (result == -1){ // user selected Clear button
-			// make the calls here, since parent ignores null, and we need to clear gradient
-			markDirty();
-            doSetValue(null);
-            fireApplyEditorValue();
-		}
-		return null;
-	}
-	
-
-	/**
-	 * Creates gradientLabel
-	 * 
-	 * @see org.eclipse.jface.viewers.DialogCellEditor#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite cell) {
-		Color bg = cell.getBackground();
-		composite = new Composite(cell, getStyle());
-		composite.setBackground(bg);
-		composite.setLayout(new GradientCellLayout());
-		gradientLabel = new Label(composite, SWT.LEFT);
-		gradientLabel.setBackground(bg);
-		gradientLabel.setFont(cell.getFont());
-		return composite;
-	}	
-
-	/**
-	 * Updates the contents of this cell editor, i.e. the value of gradientLabel with the given value. 
-	 * Parameter value is a string if this method is called when user selects the editor.
-	 * Parameter value is GradientData if this method is called after user changed gradient 
-	 * (after opening GradientSelectionDialog from this cell editor)
-	 * 
-	 * @see org.eclipse.jface.viewers.DialogCellEditor#updateContents(java.lang.Object)
-	 */
-	protected void updateContents(Object value) {
-		if (value == null) {
-			gradientLabel.setText(StringStatics.BLANK); 
-		} else if (value instanceof String) {
-			gradientLabel.setText((String)value);
-		} else {
-			// format GradientData to string:
-			//  RGB {x,x,x),RGB {x,x,x},style
-			// (the same as in NotationPropertyDescriptor.getPropertyValue())
-			GradientData gradient = (GradientData)value;
-			StringBuffer sf = new StringBuffer();
-			sf.append(FigureUtilities.integerToRGB(gradient.getGradientColor1()));
-			sf.append(',');
-			sf.append(FigureUtilities.integerToRGB(gradient.getGradientColor2()));
-			sf.append(',');
-			sf.append(GradientStyle.get(gradient.getGradientStyle()));
-			gradientLabel.setText(sf.toString());
-		}
-	}	
-
-}
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 e92f5ee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationItemLabelProvider.java
+++ /dev/null
@@ -1,135 +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
- */
-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;
-	}
-}
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 9b5ff63..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertyDescriptor.java
+++ /dev/null
@@ -1,280 +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.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.GradientStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.datatype.GradientData;
-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;
-
-/**
- * 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);
-        }        
-        if (isGradient()) {
-        	return new GradientCellEditor(composite);
-        }
-        
-        CellEditor cellEditor = super.createDataTypeCellEditor(composite);
-        
-        if (isFontHeight()) {
-        	cellEditor.setValidator(getPositiveIntegerValidator());
-        }
-        
-        if (getFeature() == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
-        	cellEditor.setValidator(getIntegerIntervalValidator());
-        }        
-        	
-        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;
-    }
-    
-    /**
-     * Create a cell validator that ensures integers in the range [0, 100]
-     * 
-     * @return cell editor validator
-	 * @since 1.2
-     */
-    private ICellEditorValidator getIntegerIntervalValidator() {
-		ICellEditorValidator cellValidator = new ICellEditorValidator() {
-			public String isValid(Object value) {
-				String error = null;
-				if (value instanceof String) {
-					String strValue = (String) value;
-					boolean valid = false;
-					try {
-						int intValue = Integer.parseInt(strValue);
-						if (intValue >= 0 && intValue <= 100) {
-							valid = true;
-						}
-					} catch (NumberFormatException e) {}						
-					if (!valid) {
-						error = DiagramUIPropertiesMessages.Number_Interval_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()) {
-        	if (getEditableValue() instanceof EObjectContainmentEList) {
-                EObjectContainmentEList list = (EObjectContainmentEList) getEditableValue();
-                EObjectContainmentListPropertyValue value = new FlattenedContainmentListPropertyValue(
-                        list);
-                //value.setLabelProvider(getLabelProvider());
-                return value;        		
-        	} else {
-        		return getEditableValue();
-        	}
-        }
-
-        if (isColor()) {
-            Integer color = (Integer) getEditableValue();
-            return FigureUtilities.integerToRGB(color);
-        }
-        
-        if (isGradient()) {
-        	// For gradient, create a string that represents it, in the form:
-        	// RGB {x,x,x),RGB {x,x,x},style
-           GradientData gradient = (GradientData) getEditableValue();
-           if (gradient != null) {
-        	   StringBuffer sf = new StringBuffer();
-        	   sf.append(FigureUtilities.integerToRGB(gradient.getGradientColor1()));
-        	   sf.append(',');
-        	   sf.append(FigureUtilities.integerToRGB(gradient.getGradientColor2()));
-        	   sf.append(',');
-        	   sf.append(GradientStyle.get(gradient.getGradientStyle()));
-        	   return sf.toString();
-           } else {
-        	   return null;
-           }        	
-        }        
-
-        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());
-    }
-    
-    /**
-     * @return
-     * @since 1.2
-     */
-    private boolean isGradient() {
-    	return getFeature() == NotationPackage.eINSTANCE.getFillStyle_Gradient();
-    }
-
-    /*
-     * (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 2182fcf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/descriptors/NotationPropertySource.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.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
- */
-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 b3436f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/ModelElementTypeMapper.java
+++ /dev/null
@@ -1,64 +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 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/TextAlignmentPropertySectionFilter.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/TextAlignmentPropertySectionFilter.java
deleted file mode 100644
index 4bb4949..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/filters/TextAlignmentPropertySectionFilter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is applicable to the
- * text alignment property.
- * 
- * @author Anthony Hunter
- */
-public class TextAlignmentPropertySectionFilter implements IFilter {
-
-	/*
-	 * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object)
-	 */
-	public boolean select(Object object) {
-		if (object instanceof IGraphicalEditPart) {
-			IGraphicalEditPart node = (IGraphicalEditPart) object;
-			if (node.getModel() != null) {
-				View view = (View) node.getModel();
-				TextStyle style = (TextStyle) view.getStyle(
-						NotationPackage.Literals.TEXT_STYLE);
-				if (style != null) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-}
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 feb2637..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesImages.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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$
-
-	public static final String IMG_TEXT_ALIGNMENT_LEFT = PREFIX_ROOT
-			+ "alignleft.gif"; //$NON-NLS-1$
-
-	public static final String IMG_TEXT_ALIGNMENT_CENTER = PREFIX_ROOT
-			+ "aligncenter.gif"; //$NON-NLS-1$
-
-	public static final String IMG_TEXT_ALIGNMENT_RIGHT = PREFIX_ROOT
-			+ "alignright.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_SOLID = PREFIX_ROOT
-			+ "line_solid.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_DASH = PREFIX_ROOT
-			+ "line_dash.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_DOT = PREFIX_ROOT
-			+ "line_dot.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_DASH_DOT = PREFIX_ROOT
-	+ "line_dash_dot.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_DASH_DOT_DOT = PREFIX_ROOT
-	+ "line_dash_dot_dot.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_SOLID_BOTH = PREFIX_ROOT
-	+ "arrow_solid_both.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_SOLID_SOURCE = PREFIX_ROOT
-	+ "arrow_solid_source.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_SOLID_TARGET = PREFIX_ROOT
-	+ "arrow_solid_target.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_OPEN_BOTH = PREFIX_ROOT
-	+ "arrow_open_both.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_OPEN_SOURCE = PREFIX_ROOT
-	+ "arrow_open_source.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_OPEN_TARGET = PREFIX_ROOT
-	+ "arrow_open_target.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_NONE = PREFIX_ROOT
-	+ "arrow_none.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH = PREFIX_ROOT
-	+ "line_width.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_TYPE = PREFIX_ROOT
-	+ "line_type.gif"; //$NON-NLS-1$
-
-	public static final String IMG_ARROW_TYPE = PREFIX_ROOT
-	+ "arrow_type.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH_ONE = PREFIX_ROOT
-	+ "line_width_one.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH_TWO = PREFIX_ROOT
-	+ "line_width_two.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH_THREE = PREFIX_ROOT
-	+ "line_width_three.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH_FOUR = PREFIX_ROOT
-	+ "line_width_four.gif"; //$NON-NLS-1$
-
-	public static final String IMG_LINE_WIDTH_FIVE = PREFIX_ROOT
-	+ "line_width_five.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);
-
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_LEFT = createAndCache(IMG_TEXT_ALIGNMENT_LEFT);
-
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_CENTER = createAndCache(IMG_TEXT_ALIGNMENT_CENTER);
-
-	public static final ImageDescriptor DESC_TEXT_ALIGNMENT_RIGHT = createAndCache(IMG_TEXT_ALIGNMENT_RIGHT);
-
-	public static final ImageDescriptor DESC_LINE_SOLID = createAndCache(IMG_LINE_SOLID);
-
-	public static final ImageDescriptor DESC_LINE_DASH = createAndCache(IMG_LINE_DASH);
-
-	public static final ImageDescriptor DESC_LINE_DOT = createAndCache(IMG_LINE_DOT);
-
-	public static final ImageDescriptor DESC_LINE_DASH_DOT = createAndCache(IMG_LINE_DASH_DOT);
-
-	public static final ImageDescriptor DESC_LINE_DASH_DOT_DOT = createAndCache(IMG_LINE_DASH_DOT_DOT);
-
-	public static final ImageDescriptor DESC_ARROW_NONE = createAndCache(IMG_ARROW_NONE);
-
-	public static final ImageDescriptor DESC_ARROW_SOLID_BOTH = createAndCache(IMG_ARROW_SOLID_BOTH);
-
-	public static final ImageDescriptor DESC_ARROW_SOLID_SOURCE = createAndCache(IMG_ARROW_SOLID_SOURCE);
-
-	public static final ImageDescriptor DESC_ARROW_SOLID_TARGET = createAndCache(IMG_ARROW_SOLID_TARGET);
-
-	public static final ImageDescriptor DESC_ARROW_OPEN_BOTH = createAndCache(IMG_ARROW_OPEN_BOTH);
-
-	public static final ImageDescriptor DESC_ARROW_OPEN_SOURCE = createAndCache(IMG_ARROW_OPEN_SOURCE);
-
-	public static final ImageDescriptor DESC_ARROW_OPEN_TARGET = createAndCache(IMG_ARROW_OPEN_TARGET);
-
-	public static final ImageDescriptor DESC_LINE_WIDTH = createAndCache(IMG_LINE_WIDTH);
-	
-	public static final ImageDescriptor DESC_LINE_TYPE = createAndCache(IMG_LINE_TYPE);
-	
-	public static final ImageDescriptor DESC_ARROW_TYPE = createAndCache(IMG_ARROW_TYPE);
-	
-	public static final ImageDescriptor DESC_LINE_WIDTH_ONE = createAndCache(IMG_LINE_WIDTH_ONE);
-	
-	public static final ImageDescriptor DESC_LINE_WIDTH_TWO = createAndCache(IMG_LINE_WIDTH_TWO);
-	
-	public static final ImageDescriptor DESC_LINE_WIDTH_THREE = createAndCache(IMG_LINE_WIDTH_THREE);
-	
-	public static final ImageDescriptor DESC_LINE_WIDTH_FOUR = createAndCache(IMG_LINE_WIDTH_FOUR);
-	
-	public static final ImageDescriptor DESC_LINE_WIDTH_FIVE = createAndCache(IMG_LINE_WIDTH_FIVE);
-	
-	/**
-	 * 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 178d3e9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 AppearanceDetails_RoundBendpointsCommand_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 Snap_To_Geometry_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 Number_Interval_Error;
-	public static String AbstractPropertySection_UndoIntervalPropertyString;
-	public static String TextAlignmentPropertySection_AlignLeft;
-	public static String TextAlignmentPropertySection_AlignCenter;
-	public static String TextAlignmentPropertySection_AlignRight;
-	public static String TextAlignmentPropertySection_TextAlignment;
-	public static String LineStylesPropertySection_LineStyles;
-	public static String LineStylesPropertySection_LineWidth;
-	public static String LineStylesPropertySection_LineType;
-	public static String LineStylesPropertySection_ArrowType;
-	public static String LineStylesPropertySection_SourceArrow_Type;
-	public static String LineStylesPropertySection_TargetArrow_Type;
-
-	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 00b84fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/internal/l10n/DiagramUIPropertiesMessages.properties
+++ /dev/null
@@ -1,116 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2009 IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-AppearanceDetails_RoundBendpointsCommand_Text=Set Rounded Bendpoints Radius
-
-# ==================================== 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
-Snap_To_Geometry_Label_Text=Snap To Shapes
-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
-
-Number_Interval_Error=Input must be a number between 0 and 100
-
-# Color Paletter Popup strings
-# ============================== BEGIN ====================================================
-ColorPalettePopup_default=Default
-ColorPalettePopup_custom=Custom ...
-# ==================================== END ================================================
-
-# ===============================================================================
-# Appearance Tab: Text Alignment
-# ================================ BEGIN ========================================
-TextAlignmentPropertySection_TextAlignment=Text Alignment:
-TextAlignmentPropertySection_AlignLeft=Align Left
-TextAlignmentPropertySection_AlignCenter=Align Center
-TextAlignmentPropertySection_AlignRight=Align Right
-# ==================================== END ================================================
-
-# ===============================================================================
-# Appearance Tab: Line Styles
-# ================================ BEGIN ========================================
-LineStylesPropertySection_LineStyles=Lines and Arrows:
-LineStylesPropertySection_LineWidth=Line Width
-LineStylesPropertySection_LineType=Lines Type
-LineStylesPropertySection_ArrowType=Arrow Type
-LineStylesPropertySection_SourceArrow_Type=Source Arrow Type
-LineStylesPropertySection_TargetArrow_Type=Target Arrow Type
-# ==================================== 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 8919605..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/providers/ReadOnlyDiagramPropertiesModifier.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-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
- */
-
-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) {
-                        IWorkbenchPart part = page.getActivePart();
-
-                        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);
-			}
-
-		}
-
-	}
-
-}
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 2acd33b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractBasicTextPropertySection.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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;
-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;
-
-/**
- * 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.Modify :
-					textModified = !isNonUserChange();
-					break;
-				case SWT.KeyDown :
-					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 c2f0127..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AbstractModelerPropertySection.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-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.command.UnexecutableCommand;
-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.editparts.GroupEditPart;
-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;
-
-        /*
-         * Update editing domain
-         */
-		IEditingDomainProvider provider = (IEditingDomainProvider) part
-				.getAdapter(IEditingDomainProvider.class);
-		if (provider != null) {
-			EditingDomain theEditingDomain = provider.getEditingDomain();
-			if (theEditingDomain instanceof TransactionalEditingDomain) {
-				setEditingDomain((TransactionalEditingDomain) theEditingDomain);
-			}
-		}
-		
-		input = new ArrayList();
-
-		eObjectList = new ArrayList();
-		for (Iterator it = ((IStructuredSelection) selection).iterator(); it
-			.hasNext();) {
-			Object next = it.next();
-			
-            if (digIntoGroups() && next instanceof GroupEditPart) {
-                for (Iterator iter = ((GroupEditPart) next)
-                    .getShapeChildren().iterator(); iter.hasNext();) {
-                    Object childEP = iter.next();
-                    // unwrap down to EObject and add to the eObjects list
-                    if (addToEObjectList(childEP)) {
-                        input.add(childEP);
-                    }
-                    continue;
-                }
-            }
-            
-            // 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));
-
-	}
-	
-    /**
-     * Override to return true to have this property section work on the shapes
-     * in a <code>GroupEditPart</code> as if the shapes were multi-selected.
-     * 
-     * @return true if this property section is to dig into the shapes of groups
-     */
-    protected boolean digIntoGroups() {
-        return false;
-    }
-    
-	/**
-	 * 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 (notification.getFeature() == EcorePackage.Literals.EANNOTATION__EMODEL_ELEMENT) {
-                Object oldObj = notification.getOldValue();
-                Object newObj = notification.getNewValue();
-                if (oldObj instanceof EObject && newObj == null) {
-                    // the annotation has been removed - check the old owner
-                    eventObject = (EObject) oldObj;
-                }
-            }
-
-			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
-					|| status.getSeverity() == IStatus.CANCEL
-					|| status.getSeverity() == IStatus.ERROR) {
-				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) {
-		
-		if (res == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-
-        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() {
-		ITabbedPropertySheetPageContributor contributor = null;
-		if (tabbedPropertySheetPage instanceof PropertiesBrowserPage) {
-			contributor = ((PropertiesBrowserPage) tabbedPropertySheetPage).getContributor();
-		} else if (tabbedPropertySheetPage instanceof IAdaptable) {
-			contributor = (ITabbedPropertySheetPageContributor) 
-								((IAdaptable)tabbedPropertySheetPage).getAdapter(ITabbedPropertySheetPageContributor.class);
-		}
-        if (contributor != null && 
-        		(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 3f6abb4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/AdvancedPropertySection.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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) {
-        if (actionBars != null) {
-        	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 90fa536..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/DiagramGeneralSection.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-	/**
-	 * @since 1.3
-	 */
-	protected static final String DESCRIPTION_PROPERTY_CHANGE_COMMAND_NAME = DESCRIPTION
-		+ VALUE_CHANGED_STRING;
-
-	/**
-	 * The Type label field
-	 * @since 1.3
-	 */
-	protected CLabel typeLabel;
-	
-	/**
-	 * The description label field
-	 * @since 1.3
-	 */
-	protected CLabel descriptionLabel;
-	
-	/**
-	 * The Type label text field.
-	 * @since 1.3
-	 */
-	protected CLabel typeText;
-
-	/**
-	 * The description label text field
-	 * @since 1.3
-	 */
-	protected 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() {
-		if ( descriptionText != null ) {
-			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() {
-		if ( descriptionText != null ) {
-			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();
-		if ( typeText != null ) {
-			typeText.setText(getDiagramType(diagram));
-		}
-		DescriptionStyle description = (DescriptionStyle) diagram
-			.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());
-
-		if (description != null && descriptionText != 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);
-
-		doCreateType(getSectionComposite(), aTabbedPropertySheetPage);
-		doCreateDescription(getSectionComposite(), aTabbedPropertySheetPage);
-
-	}
-
-	/**
-	 * @param parent
-	 * @param aTabbedPropertySheetPage
-	 * @since 1.3
-	 */
-	protected void doCreateType(Composite parent, 
-			TabbedPropertySheetPage 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);
-
-		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);
-	}
-
-	/**
-	 * @param parent
-	 * @param aTabbedPropertySheetPage
-	 * @since 1.3
-	 */
-	protected void doCreateDescription(Composite parent, 
-			TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		descriptionText = getWidgetFactory().createText(getSectionComposite(),
-			StringStatics.BLANK,
-			SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.WRAP);
-		FormData 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);
-
-		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/ArrowTypePopup.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ArrowTypePopup.java
deleted file mode 100644
index 9168ab5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ArrowTypePopup.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.notation.ArrowType;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The menu-like pop-up widget that allows the user to select an arrow type.
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class ArrowTypePopup extends LineStylesPopup {
-
-	private static class Ends {
-		private ArrowType source;
-		private ArrowType target;
-
-		public Ends(ArrowType source, ArrowType target) {
-			this.source = source;
-			this.target = target;
-		}
-
-		public ArrowType getSource() {
-			return source;
-		}
-
-		public ArrowType getTarget() {
-			return target;
-		}
-	}
-
-	private static final Ends ARROW_NONE = new Ends(ArrowType.NONE_LITERAL,
-			ArrowType.NONE_LITERAL);
-
-	private static final Ends ARROW_SOLID_BOTH = new Ends(
-			ArrowType.SOLID_ARROW_LITERAL, ArrowType.SOLID_ARROW_LITERAL);
-
-	private static final Ends ARROW_SOLID_SOURCE = new Ends(
-			ArrowType.SOLID_ARROW_LITERAL, ArrowType.NONE_LITERAL);
-
-	private static final Ends ARROW_SOLID_TARGET = new Ends(
-			ArrowType.NONE_LITERAL, ArrowType.SOLID_ARROW_LITERAL);
-
-	private static final Ends ARROW_OPEN_BOTH = new Ends(
-			ArrowType.OPEN_ARROW_LITERAL, ArrowType.OPEN_ARROW_LITERAL);
-
-	private static final Ends ARROW_OPEN_SOURCE = new Ends(
-			ArrowType.OPEN_ARROW_LITERAL, ArrowType.NONE_LITERAL);
-
-	private static final Ends ARROW_OPEN_TARGET = new Ends(
-			ArrowType.NONE_LITERAL, ArrowType.OPEN_ARROW_LITERAL);
-
-	/**
-	 * Constructor for ArrowTypePopup.
-	 * 
-	 * @param parent
-	 *            the parent shell.
-	 */
-	public ArrowTypePopup(Shell parent) {
-		super(parent);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.LineStylesPopup#initializeImageMap()
-	 */
-	protected void initializeImageMap() {
-		imageMap.put(ARROW_NONE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_NONE));
-		imageMap.put(ARROW_OPEN_BOTH, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_OPEN_BOTH));
-		imageMap.put(ARROW_OPEN_SOURCE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_OPEN_SOURCE));
-		imageMap.put(ARROW_OPEN_TARGET, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_OPEN_TARGET));
-		imageMap.put(ARROW_SOLID_BOTH, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_SOLID_BOTH));
-		imageMap.put(ARROW_SOLID_SOURCE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_SOLID_SOURCE));
-		imageMap.put(ARROW_SOLID_TARGET, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_SOLID_TARGET));
-	}
-
-	/**
-	 * Gets the arrow decoration type for the source the user selected. Could
-	 * return null as the user may cancel the gesture.
-	 * 
-	 * @return the selected arrow type or null.
-	 */
-	public ArrowType getSelectedArrowTypeSource() {
-		if (getSelectedItem() == null) {
-			return null;
-		} else {
-			Ends selectedEnds = (Ends) getSelectedItem();
-			return selectedEnds.getSource();
-		}
-	}
-
-	/**
-	 * Gets the arrow decoration type for the target the user selected. Could
-	 * return null as the user may cancel the gesture.
-	 * 
-	 * @return the selected arrow type or null.
-	 */
-	public ArrowType getSelectedArrowTypeTarget() {
-		if (getSelectedItem() == null) {
-			return null;
-		} else {
-			Ends selectedEnds = (Ends) getSelectedItem();
-			return selectedEnds.getTarget();
-		}
-	}
-}
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 cab20bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorPalettePopup.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.jface.dialogs.IDialogConstants;
-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.FillLayout;
-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 {
-
-	/** variable to store previous color */
-	private int previousColor;
-	private Button customColorButton;
-	private HashMap buttonMap = new HashMap();
-	
-	/**
-	 * 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(IDialogConstants.BUTTON_BAR_HEIGHT, 
-			IDialogConstants.BUTTON_BAR_HEIGHT);
-
-	/** 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));
-		shell.setLayout(new FillLayout());
-		GridLayout layout = new GridLayout(4, true);
-		shell.setLayout(layout);
-
-		for (Iterator e = imageColorMap.keySet().iterator(); e.hasNext();) {
-			Button button = new Button(shell, SWT.PUSH | SWT.FLAT);
-			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();
-				}
-			});
-			buttonMap.put(rgb , button);
-		}	
-		Button defaultButton = new Button(shell, SWT.PUSH | SWT.FLAT);
-		defaultButton.setText(DEAFULT_COLOR_STRING);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 4;
-		defaultButton.setLayoutData(data);
-
-		defaultButton.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent event) {
-                useDefaultColor = true;
-                shell.dispose();
-            }
-        });
-
-		Button moreColors = new Button(shell, SWT.PUSH | SWT.FLAT);
-		moreColors.setText(CUSTOM_COLOR_STRING);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 4;
-		moreColors.setLayoutData(data);
-
-		moreColors.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent event) {
-
-				ColorDialog dialog = new ColorDialog(Display.getCurrent()
-					.getActiveShell());	
-				dialog.setRGB(FigureUtilities.integerToRGB(getPreviousColor()));
-				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);
-			}
-		});
-		customColorButton = moreColors;
-
-	}
-
-	/**
-	 * @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();
-		Button prevButton = (Button)buttonMap.get(FigureUtilities.integerToRGB(getPreviousColor()));
-		if (prevButton != null){
-			shell.setDefaultButton(prevButton);
-		}	
-		else{
-			shell.setDefaultButton(customColorButton);
-		}
-		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;
-    }
-    
-	public int getPreviousColor() {
-		return previousColor;
-	}
-
-	public void setPreviousColor(int previousColor) {
-		this.previousColor = previousColor;
-	}
-}
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 0e57d5d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColorsAndFontsPropertySection.java
+++ /dev/null
@@ -1,728 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-	
-	/** 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;
-
-	protected int previousColor;
-
-	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;
-		}
-	}   	
-	
-	/* (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) {
-		if (lineColor != null){
-			previousColor = FigureUtilities.RGBToInteger(lineColor);	
-		}	
-		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) {
-		if (fontColor != null){
-			previousColor = FigureUtilities.RGBToInteger(fontColor);
-		}
-		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);        
-        popup.setPreviousColor(previousColor);
-        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((ep.getNotationView().getStyle(NotationPackage.eINSTANCE.getLineStyle()) != null) && !isReadOnly);
-                    fillColorButton.setEnabled((ep.getNotationView().getStyle(NotationPackage.eINSTANCE.getFillStyle()) != null) && !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();
-    }
-    
-    protected boolean digIntoGroups() {
-        return true;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColoursAndFontsAndLineStylesPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColoursAndFontsAndLineStylesPropertySection.java
deleted file mode 100644
index edbd5ea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ColoursAndFontsAndLineStylesPropertySection.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ecore.ENamedElement;
-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.properties.internal.l10n.DiagramUIPropertiesImages;
-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.ArrowType;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-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;
-
-/**
- * Tabbed property section to add line styles to the colours and fonts property
- * section.
- * 
- * @author ahunter
- */
-public class ColoursAndFontsAndLineStylesPropertySection extends
-		ColorsAndFontsPropertySection {
-
-	protected static final String LINE_WIDTH_COMMAND_NAME = DiagramUIPropertiesMessages.LineStylesPropertySection_LineWidth
-			+ StringStatics.SPACE + VALUE_CHANGED_STRING;
-
-	protected static final String LINE_TYPE_COMMAND_NAME = DiagramUIPropertiesMessages.LineStylesPropertySection_LineType
-			+ StringStatics.SPACE + VALUE_CHANGED_STRING;
-
-	protected static final String ARROW_TYPE_COMMAND_NAME = DiagramUIPropertiesMessages.LineStylesPropertySection_ArrowType
-			+ StringStatics.SPACE + VALUE_CHANGED_STRING;
-
-	protected static final String SOURCE_ARROW_TYPE_COMMAND_NAME = DiagramUIPropertiesMessages.LineStylesPropertySection_SourceArrow_Type
-			+ StringStatics.SPACE + VALUE_CHANGED_STRING;
-
-	protected static final String TARGET_ARROW_TYPE_COMMAND_NAME = DiagramUIPropertiesMessages.LineStylesPropertySection_TargetArrow_Type
-			+ StringStatics.SPACE + VALUE_CHANGED_STRING;
-
-	protected Group lineStylesGroup;
-
-	protected Button lineWidthButton;
-
-	protected Button lineTypeButton;
-
-	protected Button arrowTypeButton;
-
-	/*
-	 * @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));
-		createLineStylesGroup(groups);
-		lineStylesGroup.setLayoutData(new GridData(
-				GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-
-	/**
-	 * Create the line styles group.
-	 * 
-	 * @param parent -
-	 *            parent composite
-	 */
-	protected void createLineStylesGroup(Composite parent) {
-		lineStylesGroup = getWidgetFactory()
-				.createGroup(
-						parent,
-						DiagramUIPropertiesMessages.LineStylesPropertySection_LineStyles);
-		GridLayout layout = new GridLayout(3, false);
-		lineStylesGroup.setLayout(layout);
-
-		lineWidthButton = new Button(lineStylesGroup, SWT.PUSH);
-		lineWidthButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH));
-		lineWidthButton
-				.setToolTipText(DiagramUIPropertiesMessages.LineStylesPropertySection_LineWidth);
-		lineWidthButton.getAccessible().addAccessibleListener(
-				new AccessibleAdapter() {
-					public void getName(AccessibleEvent e) {
-						e.result = DiagramUIPropertiesMessages.LineStylesPropertySection_LineWidth;
-					}
-				});
-		lineWidthButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				changeLineWidth(lineWidthButton);
-			}
-		});
-
-		lineTypeButton = new Button(lineStylesGroup, SWT.PUSH);
-		lineTypeButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_TYPE));
-		lineTypeButton
-				.setToolTipText(DiagramUIPropertiesMessages.LineStylesPropertySection_LineType);
-		lineTypeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				changeLineType(lineTypeButton);
-			}
-		});
-		lineTypeButton.getAccessible().addAccessibleListener(
-				new AccessibleAdapter() {
-					public void getName(AccessibleEvent e) {
-						e.result = DiagramUIPropertiesMessages.LineStylesPropertySection_LineType;
-					}
-				});
-
-		arrowTypeButton = new Button(lineStylesGroup, SWT.PUSH);
-		arrowTypeButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_ARROW_TYPE));
-		arrowTypeButton
-				.setToolTipText(DiagramUIPropertiesMessages.LineStylesPropertySection_ArrowType);
-		arrowTypeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				changeArrowType(arrowTypeButton);
-			}
-		});
-		arrowTypeButton.getAccessible().addAccessibleListener(
-				new AccessibleAdapter() {
-					public void getName(AccessibleEvent e) {
-						e.result = DiagramUIPropertiesMessages.LineStylesPropertySection_ArrowType;
-					}
-				});
-	}
-
-	/**
-	 * Change the arrow type.
-	 * 
-	 * @param button
-	 *            the button used to place the menu.
-	 */
-	protected void changeArrowType(Button button) {
-
-		ArrowTypePopup popup = new ArrowTypePopup(button.getParent().getShell());
-		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.getSelectedArrowTypeSource() == null) {
-			return;
-		}
-		final ArrowType selectedArrowTypeSource = popup
-				.getSelectedArrowTypeSource();
-		final EStructuralFeature arrowTypeSourceFeature = (EStructuralFeature) PackageUtil
-				.getElement(Properties.ID_ARROW_SOURCE);
-		final ArrowType selectedArrowTypeTarget = popup
-				.getSelectedArrowTypeTarget();
-		final EStructuralFeature arrowTypeTargetFeature = (EStructuralFeature) PackageUtil
-				.getElement(Properties.ID_ARROW_TARGET);
-
-		List commands = new ArrayList();
-		Iterator it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-
-			commands.add(createCommand(SOURCE_ARROW_TYPE_COMMAND_NAME,
-					((View) ep.getModel()).eResource(), new Runnable() {
-
-						public void run() {
-							ENamedElement element = PackageUtil
-									.getElement(Properties.ID_ARROW_SOURCE);
-							if (element instanceof EStructuralFeature)
-								ep.setStructuralFeatureValue(
-										arrowTypeSourceFeature,
-										selectedArrowTypeSource);
-						}
-					}));
-			commands.add(createCommand(TARGET_ARROW_TYPE_COMMAND_NAME,
-					((View) ep.getModel()).eResource(), new Runnable() {
-
-						public void run() {
-							ENamedElement element = PackageUtil
-									.getElement(Properties.ID_ARROW_TARGET);
-							if (element instanceof EStructuralFeature)
-								ep.setStructuralFeatureValue(
-										arrowTypeTargetFeature,
-										selectedArrowTypeTarget);
-						}
-					}));
-		}
-
-		if (!commands.isEmpty()) {
-			executeAsCompositeCommand(ARROW_TYPE_COMMAND_NAME, commands);
-		}
-	}
-
-	/**
-	 * Change the line type.
-	 * 
-	 * @param button
-	 *            the button used to place the menu.
-	 */
-	protected void changeLineType(Button button) {
-
-		LineTypePopup popup = new LineTypePopup(button.getParent().getShell());
-		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.getSelectedLineType() == null) {
-			return;
-		}
-		final LineType selectedLineType = popup.getSelectedLineType();
-		final EStructuralFeature feature = (EStructuralFeature) PackageUtil
-				.getElement(Properties.ID_LINE_TYPE);
-
-		List commands = new ArrayList();
-		Iterator it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-
-			commands.add(createCommand(LINE_TYPE_COMMAND_NAME, ((View) ep
-					.getModel()).eResource(), new Runnable() {
-
-				public void run() {
-					ENamedElement element = PackageUtil
-							.getElement(Properties.ID_LINE_TYPE);
-					if (element instanceof EStructuralFeature)
-						ep.setStructuralFeatureValue(feature, selectedLineType);
-				}
-			}));
-		}
-		if (!commands.isEmpty()) {
-			executeAsCompositeCommand(LINE_TYPE_COMMAND_NAME, commands);
-		}
-	}
-
-	/**
-	 * Change the line width.
-	 * 
-	 * @param button
-	 *            the button used to place the menu.
-	 */
-	protected void changeLineWidth(Button button) {
-
-		LineWidthPopup popup = new LineWidthPopup(button.getParent().getShell());
-		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.getSelectedLineWidth() == -1) {
-			return;
-		}
-		final int selectedLineWidth = popup.getSelectedLineWidth();
-		final EStructuralFeature feature = (EStructuralFeature) PackageUtil
-				.getElement(Properties.ID_LINE_WIDTH);
-
-		List commands = new ArrayList();
-		Iterator it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-
-			commands.add(createCommand(LINE_WIDTH_COMMAND_NAME, ((View) ep
-					.getModel()).eResource(), new Runnable() {
-
-				public void run() {
-					ENamedElement element = PackageUtil
-							.getElement(Properties.ID_LINE_WIDTH);
-					if (element instanceof EStructuralFeature)
-						ep
-								.setStructuralFeatureValue(feature,
-										selectedLineWidth);
-				}
-			}));
-		}
-		if (!commands.isEmpty()) {
-			executeAsCompositeCommand(LINE_WIDTH_COMMAND_NAME, commands);
-		}
-	}
-
-	/*
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-		if (!isDisposed()) {
-			executeAsReadAction(new Runnable() {
-
-				public void run() {
-
-					IGraphicalEditPart graphicalEditPart = getSingleInput();
-					if (graphicalEditPart != null) {
-						boolean isReadOnly = isReadOnly();
-
-						LineStyle lineStyle = (LineStyle) graphicalEditPart
-								.getNotationView().getStyle(
-										NotationPackage.eINSTANCE
-												.getLineStyle());
-						boolean enableLineWidth = (lineStyle != null)
-								&& !isReadOnly
-								&& (lineStyle.getLineWidth() != -1);
-						lineWidthButton.setEnabled(enableLineWidth);
-
-						Style lineTypeStyle = graphicalEditPart
-								.getNotationView().getStyle(
-										NotationPackage.eINSTANCE
-												.getLineTypeStyle());
-						boolean enableLineType = (lineTypeStyle != null)
-								&& !isReadOnly;
-						lineTypeButton.setEnabled(enableLineType);
-
-						Style arrowTypeStyle = graphicalEditPart
-								.getNotationView().getStyle(
-										NotationPackage.eINSTANCE
-												.getArrowStyle());
-						boolean enableArrowType = (arrowTypeStyle != null)
-								&& !isReadOnly;
-						arrowTypeButton.setEnabled(enableArrowType);
-					}
-				}
-			});
-		}
-	}
-}
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 be43981..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ConnectionAppearancePropertySection.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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 ColoursAndFontsAndLineStylesPropertySection {
-
-	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 ConnectionEditPart ep = (ConnectionEditPart) 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);
-
-		// left composite for line styles and smoothness
-		Composite left = getWidgetFactory().createComposite(groups);
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginWidth = 0;
-		left.setLayout(layout);
-		data = new GridData(GridData.FILL_BOTH);
-		left.setLayoutData(data);
-		
-		// line styles
-		createLineStylesGroup(left);
-		lineStylesGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		// smoothness
-		createRadioGroup(left, Smoothness.VALUES.iterator(),
-			Properties.ID_SMOOTHNESS, DiagramUIPropertiesMessages.
-				AppearanceDetails_SmoothnessCommand_Text,
-			SMOOTHNESS_NAME_LABEL, 2);
-
-		// 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 f38770e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/DiagramColorsAndFontsPropertySection.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-import org.eclipse.swt.widgets.Composite;
-
-public class DiagramColorsAndFontsPropertySection extends
-		ShapeColorsAndFontsPropertySection {
-	/**
-	 * @return - an iterator 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;
-	}
-
-	protected void createLineStylesGroup(Composite parent) {
-		/*
-		 * Do not show the line styles section when the diagram root is
-		 * selected. Clients can override.
-		 */
-		super.createLineStylesGroup(parent);
-		lineStylesGroup.setVisible(false);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineStylesPopup.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineStylesPopup.java
deleted file mode 100644
index 6575cc3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineStylesPopup.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.ui.util.WindowUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The menu-like pop-up widget that allows the user to select a value for the line styles.
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public abstract class LineStylesPopup {
-
-	/**
-	 * The map of items in the popup. The key is the return value of the popup
-	 * and the value in the map is the image.
-	 */
-	protected Map imageMap = new LinkedHashMap();
-
-	protected Shell shell;
-
-	protected Object selectedItem = null;
-
-	/**
-	 * Creates a LineStylesPopup below the specified shell.
-	 * 
-	 * @param parent
-	 *            a widget which will be the parent of the new instance (cannot
-	 *            be null)
-	 */
-	public LineStylesPopup(Shell parent) {
-		shell = new Shell(parent, SWT.FLAT);
-		shell.setLayout(new GridLayout(1, true));
-
-		initializeImageMap();
-
-		for (Iterator e = imageMap.keySet().iterator(); e.hasNext();) {
-			Button button = new Button(shell, SWT.PUSH | SWT.FLAT);
-			GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			data.heightHint = 20;
-			data.widthHint = 67;
-			button.setLayoutData(data);
-
-			final Object item = e.next();
-			final Image image = (Image) imageMap.get(item);
-			button.setImage(image);
-			button.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent e1) {
-					selectedItem = item;
-					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);
-			}
-		});
-
-	}
-
-	/**
-	 * Initialize the image map by adding items and images to the imageMap.
-	 */
-	protected abstract void initializeImageMap();
-
-	/**
-	 * Open the popup, waits for an item to be selected and then closes popup.
-	 * 
-	 * @param location
-	 *            the initial location of the popup; the popup will be
-	 *            positioned so that it does not run off the screen and the
-	 *            largest number of items are visible
-	 */
-	public void open(Point location) {
-		open(location, -1);
-		return;
-	}
-	
-	/**
-	 * Opens the popup ensuring that it doesn't run of the screen and doesn't
-	 * hide the launching button
-	 * 
-	 * @param location
-	 *            the initial location of the popup
-	 * @param lowerY
-	 *            if the final y is above location.y, then the popup is moved
-	 *            above lowerY
-	 * @since 1.2
-	 */
-	public void open(Point location, int lowerY) {
-
-		Point listSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		shell.setBounds(location.x, location.y, listSize.x, listSize.y);
-		// Ensure the popup doesn't run off the screen and doesn't hide the
-		// launching button.
-		Point newLocation = WindowUtil.constrainWindowLocation(shell,
-				location, lowerY);
-		shell.setLocation(newLocation.x, newLocation.y);
-		shell.open();
-		shell.setFocus();
-		Display display = shell.getDisplay();
-		while (!shell.isDisposed() && shell.isVisible()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-		return;
-	}	
-
-	/**
-	 * Gets the item the user selected. Could be null as the user may cancel the
-	 * gesture.
-	 * 
-	 * @return the selected item or null.
-	 */
-	public Object getSelectedItem() {
-		return selectedItem;
-	}
-	
-	/**
-	 * Gets the image corresponding to the item the user selected.  Could be null.
-	 * 
-	 * @return Image corresponding to the item the user selected or null.
-	 * @since 1.4
-	 */
-	public Image getSelectedItemImage() {
-		if (getSelectedItem() == null) {
-			return null;
-		} else {
-			return (Image) imageMap.get(getSelectedItem());
-		}
-	}
-	
-}
\ 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/LineTypePopup.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineTypePopup.java
deleted file mode 100644
index 0c40057..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineTypePopup.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The menu-like pop-up widget that allows the user to select a line type.
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class LineTypePopup extends LineStylesPopup {
-
-	/**
-	 * Constructor for LineTypePopup.
-	 * 
-	 * @param parent
-	 *            the parent shell.
-	 */
-	public LineTypePopup(Shell parent) {
-		super(parent);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.LineStylesPopup#initializeImageMap()
-	 */
-	protected void initializeImageMap() {
-		imageMap.put(LineType.SOLID_LITERAL, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_SOLID));
-		imageMap.put(LineType.DASH_LITERAL, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_DASH));
-		imageMap.put(LineType.DOT_LITERAL, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_DOT));
-		imageMap.put(LineType.DASH_DOT_LITERAL, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_DASH_DOT));
-		imageMap.put(LineType.DASH_DOT_DOT_LITERAL, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_DASH_DOT_DOT));
-	}
-
-	/**
-	 * Gets the line type the user selected. Could return null as the user may
-	 * cancel the gesture.
-	 * 
-	 * @return the selected line type or null.
-	 */
-	public LineType getSelectedLineType() {
-		if (getSelectedItem() == null) {
-			return null;
-		} else {
-			LineType selectedLineType = (LineType) getSelectedItem();
-			return selectedLineType;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineWidthPopup.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineWidthPopup.java
deleted file mode 100644
index ae145e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/LineWidthPopup.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.properties.internal.l10n.DiagramUIPropertiesImages;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The menu-like pop-up widget that allows the user to select a line width.
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class LineWidthPopup extends LineStylesPopup {
-
-	private static class LineWidth {
-		private int width;
-
-		public LineWidth(int width) {
-			this.width = width;
-		}
-
-		public int getLineWidth() {
-			return width;
-		}
-	}
-
-	private static final LineWidth LINE_WIDTH_ONE = new LineWidth(1);
-
-	private static final LineWidth LINE_WIDTH_TWO = new LineWidth(2);
-
-	private static final LineWidth LINE_WIDTH_THREE = new LineWidth(3);
-
-	private static final LineWidth LINE_WIDTH_FOUR = new LineWidth(4);
-
-	private static final LineWidth LINE_WIDTH_FIVE = new LineWidth(5);
-
-	/**
-	 * Constructor for LineWidthPopup.
-	 * 
-	 * @param parent
-	 *            the parent shell.
-	 */
-	public LineWidthPopup(Shell parent) {
-		super(parent);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.LineStylesPopup#initializeImageMap()
-	 */
-	protected void initializeImageMap() {
-		imageMap.put(LINE_WIDTH_ONE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH_ONE));
-		imageMap.put(LINE_WIDTH_TWO, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH_TWO));
-		imageMap.put(LINE_WIDTH_THREE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH_THREE));
-		imageMap.put(LINE_WIDTH_FOUR, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH_FOUR));
-		imageMap.put(LINE_WIDTH_FIVE, DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_WIDTH_FIVE));
-	}
-
-	/**
-	 * Gets the line width the user selected. Could return -1 as the user may cancel the
-	 * gesture.
-	 * 
-	 * @return the selected line width or -1.
-	 */
-	public int getSelectedLineWidth() {
-		if (getSelectedItem() == null) {
-			return -1;
-		} else {
-			LineWidth selectedLineWidth = (LineWidth)getSelectedItem();
-			return selectedLineWidth.getLineWidth();
-		}
-	}
-
-}
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 422ec9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/ShapeColorsAndFontsPropertySection.java
+++ /dev/null
@@ -1,105 +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 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 ColoursAndFontsAndLineStylesPropertySection {
-
-
-	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
-		if (fillColor != null){
-			previousColor = FigureUtilities.RGBToInteger(fillColor);
-		}
-		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/appearance/TextAlignmentPropertySection.java b/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/TextAlignmentPropertySection.java
deleted file mode 100644
index 05c1ac2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/appearance/TextAlignmentPropertySection.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.FontHelper;
-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.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-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.Group;
-
-/**
- * Property section to represent text alignment properties for a shape.
- * 
- * @author Anthony Hunter
- */
-public class TextAlignmentPropertySection extends
-		AbstractNotationPropertiesSection {
-
-	protected static final String ALIGN_LEFT = DiagramUIPropertiesMessages.TextAlignmentPropertySection_AlignLeft;
-
-	protected static final String ALIGN_CENTER = DiagramUIPropertiesMessages.TextAlignmentPropertySection_AlignCenter;
-
-	static protected final String ALIGN_RIGHT = DiagramUIPropertiesMessages.TextAlignmentPropertySection_AlignRight;
-
-	protected static final String TEXT_ALIGNMENT = DiagramUIPropertiesMessages.TextAlignmentPropertySection_TextAlignment;
-
-	protected Button alignLeftButton;
-
-	protected Button alignRightButton;
-
-	protected Button alignCenterButton;
-
-	protected Group textAlignmentGroup;
-
-	/**
-	 * Center align the text for the selected editparts.
-	 */
-	protected void alignCenter() {
-
-		setSelectedButton(TextAlignment.CENTER_LITERAL);
-
-		List<ICommand> commands = new ArrayList<ICommand>();
-		Iterator<?> it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-			commands.add(createCommand(ALIGN_CENTER, ((View) ep.getModel())
-					.eResource(), new Runnable() {
-
-				public void run() {
-					ep.setStructuralFeatureValue(NotationPackage.eINSTANCE
-							.getTextStyle_TextAlignment(),
-							TextAlignment.CENTER_LITERAL);
-				}
-			}));
-		}
-
-		executeAsCompositeCommand(ALIGN_CENTER, commands);
-
-	}
-
-	/**
-	 * Left align the text for the selected editparts.
-	 */
-	protected void alignLeft() {
-
-		setSelectedButton(TextAlignment.LEFT_LITERAL);
-
-		List<ICommand> commands = new ArrayList<ICommand>();
-		Iterator<?> it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-			commands.add(createCommand(ALIGN_LEFT, ((View) ep.getModel())
-					.eResource(), new Runnable() {
-
-				public void run() {
-					ep.setStructuralFeatureValue(NotationPackage.eINSTANCE
-							.getTextStyle_TextAlignment(),
-							TextAlignment.LEFT_LITERAL);
-				}
-			}));
-		}
-
-		executeAsCompositeCommand(ALIGN_LEFT, commands);
-
-	}
-
-	/**
-	 * Right align the text for the selected editparts.
-	 */
-	protected void alignRight() {
-
-		setSelectedButton(TextAlignment.RIGHT_LITERAL);
-
-		List<ICommand> commands = new ArrayList<ICommand>();
-		Iterator<?> it = getInput().iterator();
-
-		while (it.hasNext()) {
-			final IGraphicalEditPart ep = (IGraphicalEditPart) it.next();
-			commands.add(createCommand(ALIGN_RIGHT, ((View) ep.getModel())
-					.eResource(), new Runnable() {
-
-				public void run() {
-					ep.setStructuralFeatureValue(NotationPackage.eINSTANCE
-							.getTextStyle_TextAlignment(),
-							TextAlignment.RIGHT_LITERAL);
-				}
-			}));
-		}
-
-		executeAsCompositeCommand(ALIGN_RIGHT, commands);
-
-	}
-
-	/**
-	 * Create the text alignment group.
-	 * 
-	 * @param parent -
-	 *            parent composite
-	 */
-	protected void createTextAlignmentGroup(Composite parent) {
-		textAlignmentGroup = getWidgetFactory().createGroup(parent,
-				TEXT_ALIGNMENT);
-		GridLayout layout = new GridLayout(3, false);
-		textAlignmentGroup.setLayout(layout);
-
-		alignLeftButton = new Button(textAlignmentGroup, SWT.TOGGLE);
-		alignLeftButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_TEXT_ALIGNMENT_LEFT));
-		alignLeftButton.setToolTipText(ALIGN_LEFT);
-		alignLeftButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				alignLeft();
-			}
-		});
-
-		alignCenterButton = new Button(textAlignmentGroup, SWT.TOGGLE);
-		alignCenterButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_TEXT_ALIGNMENT_CENTER));
-		alignCenterButton.setToolTipText(ALIGN_CENTER);
-		alignCenterButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				alignCenter();
-			}
-		});
-
-		alignRightButton = new Button(textAlignmentGroup, SWT.TOGGLE);
-		alignRightButton.setImage(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_TEXT_ALIGNMENT_RIGHT));
-		alignRightButton.setToolTipText(ALIGN_RIGHT);
-		alignRightButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				alignRight();
-			}
-		});
-
-		setGroupWidth();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractModelerPropertySection#digIntoGroups()
-	 */
-	protected boolean digIntoGroups() {
-		return true;
-	}
-	
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.properties.sections.AbstractNotationPropertiesSection#initializeControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void initializeControls(Composite parent) {
-		super.initializeControls(parent);
-		createTextAlignmentGroup(composite);
-	}
-
-	/*
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-		if (!isDisposed()) {
-			IGraphicalEditPart ep = getSingleInput();
-			if (ep != null) {
-				Object object = ep
-						.getStructuralFeatureValue(NotationPackage.eINSTANCE
-								.getTextStyle_TextAlignment());
-				if (object instanceof TextAlignment) {
-					setSelectedButton((TextAlignment) object);
-				}
-			}
-		}
-	}
-
-	/**
-	 * We want the width of the text alignment group to match the width of the
-	 * colors and fonts group. Unfortunately there is a limitation of the tabbed
-	 * properties framework not being able to make sections the same width when
-	 * displayed on the same tab. To do this, we create the same widest widgets
-	 * same that appear on the colors and fonts group and hide them to be 100%
-	 * sure the widths of the two groups match.
-	 */
-	private void setGroupWidth() {
-		Composite familySize = getWidgetFactory().createComposite(
-				textAlignmentGroup);
-		GridData gridData = new GridData();
-		gridData.horizontalSpan = 3;
-		gridData.heightHint = 0;
-		familySize.setLayoutData(gridData);
-		familySize.setVisible(false);
-		GridLayout layout = new GridLayout(2, false);
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		familySize.setLayout(layout);
-		CCombo fontFamilyCombo = getWidgetFactory().createCCombo(familySize,
-				SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		fontFamilyCombo.setItems(FontHelper.getFontNames());
-		CCombo fontSizeCombo = getWidgetFactory().createCCombo(familySize,
-				SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		fontSizeCombo.setItems(FontHelper.getFontSizes());
-	}
-
-	/**
-	 * Set the state of the text alignment buttons based on the selected text
-	 * alignment.
-	 * 
-	 * @param textAlignment
-	 *            the selected text alignment.
-	 */
-	private void setSelectedButton(TextAlignment textAlignment) {
-		if (TextAlignment.LEFT_LITERAL.equals(textAlignment)) {
-			alignLeftButton.setSelection(true);
-			alignCenterButton.setSelection(false);
-			alignRightButton.setSelection(false);
-		} else if (TextAlignment.CENTER_LITERAL.equals(textAlignment)) {
-			alignLeftButton.setSelection(false);
-			alignCenterButton.setSelection(true);
-			alignRightButton.setSelection(false);
-		} else if (TextAlignment.RIGHT_LITERAL.equals(textAlignment)) {
-			alignLeftButton.setSelection(false);
-			alignCenterButton.setSelection(false);
-			alignRightButton.setSelection(true);
-		}
-	}
-}
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 b0745fa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/sections/grid/RulerGridPropertySection.java
+++ /dev/null
@@ -1,911 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.grid;
-
-import java.text.ParseException;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-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.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.CompositeImageDescriptor;
-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.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.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 snapToGeometryButton;
-	private Button restoreButton;
-
-	private Button rulerVisibilityButton;
-
-	/**
-	 * @since 1.2
-	 */
-	protected 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 SNAP_TO_GEOMETRY_LABEL = DiagramUIPropertiesMessages.Snap_To_Geometry_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.
-	/**
-	 * @since 1.2
-	 */
-	protected 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;
-
-    private 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;
-	}
-}  
-		
-    /* (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 snap to geometry checkbox
-        snapToGeometryButton = getWidgetFactory().createButton(
-            extraComposite, SNAP_TO_GEOMETRY_LABEL, SWT.CHECK);
-        snapToGeometryButton.addSelectionListener(new SelectionAdapter() {
-
-            public void widgetSelected(SelectionEvent event) {
-                // Set the snap to geometry workspace property
-                setWorkspaceProperty(WorkspaceViewerProperties.SNAPTOGEOMETRY, snapToGeometryButton.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.getBoolean(WorkspaceViewerProperties.SNAPTOGEOMETRY) != preferenceStore.getBoolean(IPreferenceConstants.PREF_SNAP_TO_GEOMETRY)) {
-                    wsPrefStore.setValue(WorkspaceViewerProperties.SNAPTOGEOMETRY, preferenceStore.getBoolean(IPreferenceConstants.PREF_SNAP_TO_GEOMETRY));         
-                }
-                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) ((IDiagramWorkbenchPart) getPart()).getDiagramEditPart().getDiagramPreferencesHint().getPreferenceStore();
-		return preferenceStore;
-	}
-
-	/**
-	 * @since 1.2
-	 */
-	protected 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,
-						getWorkspacePropertyInt(WorkspaceViewerProperties.GRIDLINECOLOR));
-				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, int previousColor) {
-
-		ColorPalettePopup popup = new ColorPalettePopup(button.getParent()
-				.getShell(), IDialogConstants.BUTTON_BAR_HEIGHT);
-
-		popup.setPreviousColor(previousColor);
-		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()) {
-			Image overlyedImage = new ColorOverlayImageDescriptor(
-					imageDescriptor.getImageData(), FigureUtilities.integerToRGB(new Integer(LIGHT_GRAY_RGB)))
-					.createImage();
-			disposeImage(button.getImage());
-			button.setImage(overlyedImage);
-			return FigureUtilities.integerToRGB(new Integer(LIGHT_GRAY_RGB));
-		}
-
-		if (popup.getSelectedColor() != null) {
-			Image overlyedImage = new ColorOverlayImageDescriptor(
-					imageDescriptor.getImageData(), popup.getSelectedColor())
-					.createImage();
-			disposeImage(button.getImage());
-			button.setImage(overlyedImage);
-		}
-
-		return popup.getSelectedColor();
-
-	}
-
-	private void disposeImage(Image image) {
-		if (image == null) {
-			return;
-		}
-
-		if (image.equals(DiagramUIPropertiesImages
-				.get(DiagramUIPropertiesImages.IMG_LINE_COLOR))) {
-			return;
-		}
-
-		if (!image.isDisposed()) {
-			image.dispose();
-		}
-	}
-
-	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;
-		Display display = DisplayUtils.getDisplay();
-		switch (fromUnits) {
-		case INCHES:
-			pixelValue = value.doubleValue() * display.getDPI().x;
-			break;
-		case CENTIMETERS:
-                pixelValue = value.doubleValue() * display.getDPI().x / INCH2CM;
-			break;
-		case PIXELS:
-			pixelValue = value.intValue();
-		}
-
-		double returnValue = 0;
-
-		switch (toUnits) {
-		case INCHES:
-			returnValue = pixelValue / display.getDPI().x;
-			break;
-		case CENTIMETERS:
-                returnValue = pixelValue * INCH2CM / display.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 / DisplayUtils.getDisplay().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));
-        snapToGeometryButton.setSelection(getBooleanWorkspaceProperty(WorkspaceViewerProperties.SNAPTOGEOMETRY));
-
-		int rulerValue = getValue(WorkspaceViewerProperties.RULERUNIT);
-		int styleValue = getValue(WorkspaceViewerProperties.GRIDLINESTYLE) - 1;
-		rulerUnitCombo.setText(getUnits()[rulerValue]);
-		lineStyleCombo.setText(getStyles()[styleValue]);
-		setLineColorButtonImage();
-	}
-	
-	/**
-	 * @since 1.2
-	 */
-	protected void setLineColorButtonImage() {
-		Image overlyedImage = new ColorOverlayImageDescriptor(
-				(DiagramUIPropertiesImages.DESC_LINE_COLOR).getImageData(),
-				FigureUtilities
-						.integerToRGB(getWorkspacePropertyInt(WorkspaceViewerProperties.GRIDLINECOLOR)))
-				.createImage();
-		disposeImage(lineColorButton.getImage());
-		lineColorButton.setImage(overlyedImage);
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * @since 1.2
-	 */
-	protected 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);
-	}
-
-	/**
-	 * @since 1.2
-	 */
-	protected 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 property 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.SNAPTOGEOMETRY.equals(event.getProperty())) {          
-            if (!snapToGeometryButton.isDisposed()) {
-                snapToGeometryButton.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 f7bf6b9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.properties/src/org/eclipse/gmf/runtime/diagram/ui/properties/util/SectionUpdateRequestCollapser.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.gmf.runtime.common.core.util.RequestCollapser;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-
-/**
- * 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) {
-		DisplayUtils.getDisplay().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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 4037750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-org
-target
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 b25db85..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5a239c2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:02:14 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 7de404a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.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.diagram.ui.providers.ide; singleton:=true
-Bundle-Version: 1.2.0.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.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 4122ce8..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 Modeling Project
-
-# ==============================================================================
-#  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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.providers.ide/pom.xml
deleted file mode 100644
index 99adfd6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers.ide/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.providers.ide</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.providers.ide</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 717dc9d..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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,ViewUtil.getSourceConnections(tmpView)); 
-    		if(view !=null) return view;
-    			view = getViewByIdStr(elementId,ViewUtil.getTargetConnections(tmpView));
-    		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.providers/.classpath b/org.eclipse.gmf.runtime.diagram.ui.providers/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui.providers/.cvsignore
deleted file mode 100644
index e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.options b/org.eclipse.gmf.runtime.diagram.ui.providers/.options
deleted file mode 100644
index 7798d1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.options
+++ /dev/null
@@ -1,15 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.diagram.ui.providers plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.diagram.ui.providers plug-in
-org.eclipse.gmf.runtime.diagram.ui.providers/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.diagram.ui.providers/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.diagram.ui.providers/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.diagram.ui.providers/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.diagram.ui.providers/debug/methods/exiting=false
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.project b/org.eclipse.gmf.runtime.diagram.ui.providers/.project
deleted file mode 100644
index 2424983..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.ui.providers</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/.api_filters
deleted file mode 100644
index e64eef0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/.api_filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.diagram.ui.providers" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeLeftRightProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.providers.CompositeLeftRightProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="CompositeLayoutProvider"/>
-                <message_argument value="CompositeLeftRightProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeTopDownProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.providers.CompositeTopDownProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="CompositeLayoutProvider"/>
-                <message_argument value="CompositeTopDownProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/providers/LeftRightProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.providers.LeftRightProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="DefaultProvider"/>
-                <message_argument value="LeftRightProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/providers/TopDownProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.providers.TopDownProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="DefaultProvider"/>
-                <message_argument value="TopDownProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index de1667a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:02:03 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.providers/META-INF/MANIFEST.MF
deleted file mode 100644
index d22248a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/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.diagram.ui.providers; singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.internal;x-friends:="org.eclipse.gmf.runtime.diagram.ui.geoshapes",
- org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n;x-internal:=true,
- org.eclipse.gmf.runtime.diagram.ui.providers.internal.parsers;x-friends:="org.eclipse.gmf.runtime.diagram.ui.geoshapes",
- org.eclipse.gmf.runtime.diagram.ui.providers.parsers
-Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/about.html b/org.eclipse.gmf.runtime.diagram.ui.providers/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.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, 2007</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/build.properties b/org.eclipse.gmf.runtime.diagram.ui.providers/build.properties
deleted file mode 100644
index 25ff950..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.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,\
-               icons/,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/blank.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/blank.gif
deleted file mode 100644
index e7abcb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/blank.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/bookmark.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/bookmark.gif
deleted file mode 100644
index 82c7fbd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/bookmark.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/error.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/error.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/error.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note.gif
deleted file mode 100644
index 1bb5c21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note_24x24.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note_24x24.gif
deleted file mode 100644
index 83bcd35..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/note_24x24.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment.gif
deleted file mode 100644
index d2108c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment_24x24.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment_24x24.gif
deleted file mode 100644
index f1aa7e7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/noteattachment_24x24.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text.gif
deleted file mode 100644
index 5990f5f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text_24x24.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text_24x24.gif
deleted file mode 100644
index 49af8e9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/text_24x24.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus.gif
deleted file mode 100644
index dd2c92f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus_24x24.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus_24x24.gif
deleted file mode 100644
index 216491f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomminus_24x24.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif
deleted file mode 100644
index 466d756..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus_24x24.gif b/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus_24x24.gif
deleted file mode 100644
index 87d8047..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/icons/zoomplus_24x24.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.properties
deleted file mode 100644
index a92d471..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.properties
+++ /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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram Providers - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Diagram Providers
-Plugin.providerName = Eclipse Modeling Project
-
-# ===============================================================================
-# Diagram Providers Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-
-
-# ==============================================================================
-#  Diagram Providers - section to be translated
-# ==============================================================================
-ext.presentationParserProviders = Presentation Parser Provider
-ext.presentationSemanticProvider = Presentation Semantic Provider
-ext.presentationPropertiesProvider = Presentation Properties Provider
-ext.presentationDecoratorProvider = Presentation Decorator Provider
-ext.presentationContributionItemProvider = Presentation Contribution Item Provider
-ext.printingContributionItemProvider = Presentation Printing Contribution Item Provider
-ext.presentationViewProviders = Presentation View Provider
-ext.presentationEditPartProviders = Presentation EditPart Provider
-ext.actionSets = Diagram Action Sets
-
-#preference pages
-PreferencePage.Root.Modeling=Modeling
-PreferencePage.Appearance=Appearance
-PreferencePage.RulerGrid=Rulers and Grid
-
-ext.presentationLayoutProvider = Presentation Layout Provider
-ext.presentationPaletteProviders = Presentation Palette Provider
-
-ZoomInTool.Label = Zoom In
-ZoomInTool.Description = Left click to zoom in, shift+left click to zoom out, drag to zoom to selection.
-ZoomOutTool.Label = Zoom Out
-ZoomOutTool.Description = Left click to zoom out, shift+left click to zoom in.
-NoteStack.Label = Notes
-NoteStack.Description = Notes Stack
-NoteTool.Label = Note
-NoteTool.Description = Create a Note
-TextTool.Label = Text
-TextTool.Description = Create a Text
-NoteAttachmentTool.Label = Note Attachment
-NoteAttachmentTool.Description = Create a Note Attachment
-
-DuplicateActionDelegate.Label = Dup&licate
-DuplicateActionDelegate.Tooltip = Duplicates the selection.
-DuplicateActionDelegate.name = Duplicate
-DuplicateActionDelegate.description = Duplicates the selection.
-
-Diagram.ActionSet.Label = Diagram
-Diagram.ActionSet.Description = Diagram Action Set
-
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.xml
deleted file mode 100644
index f427347..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/plugin.xml
+++ /dev/null
@@ -1,949 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2009  IBM Corporation and others.                       -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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.diagram.ui.providers.internal.DiagramIconProvider">
-         <Priority name="Medium">
-         </Priority>         
-      </IconProvider>
-   </extension>
-   
-    <extension id="presentationParserProviders" name="%ext.presentationParserProviders" point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
-      <ParserProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramParserProvider">
-         <Priority name="Low">
-         </Priority>
-      </ParserProvider>
-   </extension>
-   
-    <extension
-         id="presentationPropertiesProvider"
-         name="%ext.presentationPropertiesProvider"
-         point="org.eclipse.gmf.runtime.common.ui.services.properties.propertiesProviders">
-      <PropertiesProvider
-            verifyPluginLoaded="false"
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramPropertiesProvider">
-         <Priority
-               name="Medium">
-         </Priority>
-      </PropertiesProvider>
-   </extension>
-   
-   <extension id="presentationDecoratorProvider" name="%ext.presentationDecoratorProvider" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-      <decoratorProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramDecoratorProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW">
-         </object>
-         <context decoratorTargets="PRIMARY_VIEW">
-         </context>
-      </decoratorProvider>
-   </extension>
-   
-   <extension id="presentationContributionItemProvider" name="%ext.presentationContributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider" checkPluginLoaded="false">
-         <Priority name="Lowest">
-         </Priority>
-         <partContribution class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart"> 
-            <partMenu menubarPath="/edit" id="diagramMenu">
-            </partMenu>
-            <!-- toolbar menu groups -->
-            <partMenuGroup toolbarPath="/" id="toolbarFontGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarColorLineGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarCopyAppearanceGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolBarViewGroup">
-	        </partMenuGroup>   
-            <partMenuGroup toolbarPath="/" id="toolbarEditGroup">
-            </partMenuGroup>            
-            <partMenuGroup toolbarPath="/" id="toolbarFormatGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarFilterGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarNavigateGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarRestGroup">
-            </partMenuGroup>
-            <partMenuGroup toolbarPath="/" id="toolbarAdditions">
-            </partMenuGroup>
-            <!-- Diagram menu menu groups -->
-            <partMenuGroup menubarPath="/diagramMenu/" id="fontColorLineGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/" id="formatGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/" id="sizeGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/" id="filterGroup">
-            </partMenuGroup>
-            
-            <partMenu menubarPath="/diagramMenu/filterGroup" id="filtersMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/filtersMenu/" id="expandFilterGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/filtersMenu/" id="relationshipsGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/filtersMenu/" id="miscellaneousGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/filtersMenu/" id="additions">
-            </partMenuGroup>            
-            
-            <partMenuGroup menubarPath="/diagramMenu/" id="viewGroup">
-            </partMenuGroup>
-             <partMenuGroup menubarPath="/diagramMenu/" id="copyAppearanceGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/" id="navigateGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/" id="additionsGroup">
-	        </partMenuGroup>   
-            
-            <partAction global="true" id="undo">
-            </partAction>
-            <partAction global="true" id="redo">
-            </partAction>
-            <partAction global="true" id="delete">
-            </partAction>
-            <partAction global="true" id="cut">
-            </partAction>
-            <partAction global="true" id="copy">
-            </partAction>
-            <partAction global="true" id="paste">
-            </partAction>
-            <partAction global="true" id="open">
-            </partAction>
-            <partAction global="true" id="save">
-            </partAction>
-            <partAction global="true" id="print">
-            </partAction>
-            <partAction global="true" id="find">
-            </partAction>
-            <partAction global="true" id="properties">
-            </partAction>
-            <partCustom toolbarPath="/toolbarFontGroup" id="fontNameContributionItem">
-            </partCustom>
-            <partCustom toolbarPath="/toolbarFontGroup" id="fontSizeContributionItem">
-            </partCustom>
-            <partAction toolbarPath="/toolbarFontGroup" id="fontBoldAction">
-            </partAction>
-            <partAction toolbarPath="/toolbarFontGroup" id="fontItalicAction">
-            </partAction>
-            <partCustom toolbarPath="/toolbarColorLineGroup" id="fontColorContributionItem">
-            </partCustom>
-            <partAction menubarPath="/diagramMenu/fontColorLineGroup" id="fontDialogAction">
-            </partAction>            
-            <partCustom menubarPath="/diagramMenu/fontColorLineGroup" toolbarPath="/toolbarColorLineGroup" id="fillColorContributionItem">
-            </partCustom>
-            <partCustom menubarPath="/diagramMenu/fontColorLineGroup" toolbarPath="/toolbarColorLineGroup" id="lineColorContributionItem">
-            </partCustom>
-            <partMenu menubarPath="/diagramMenu/fontColorLineGroup" id="lineTypeMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/lineTypeMenu/" id="lineTypeGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup" id="lineTypeSolidAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDotAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashDotAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashDotDotAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/fontColorLineGroup" id="lineWidthMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/lineWidthMenu/" id="lineWidthGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup" id="lineWidthOneAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup" id="lineWidthTwoAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup" id="lineWidthThreeAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup" id="lineWidthFourAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/lineWidthMenu/lineWidthGroup" id="lineWidthFiveAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/fontColorLineGroup" id="arrowTypeMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/arrowTypeMenu/" id="arrowTypeGroup">
-            </partMenuGroup>
-            <partMenu menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeGroup" id="arrowTypeSourceMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/" id="arrowTypeSourceGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceNoneAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceSolidAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceOpenAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeGroup" id="arrowTypeTargetMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/" id="arrowTypeTargetGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetNoneAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetSolidAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetOpenAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/fontColorLineGroup" toolbarPath="/toolbarColorLineGroup" id="routerMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/routerMenu/" toolbarPath="/routerMenu/" id="routerGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/routerMenu/routerGroup" toolbarPath="/routerMenu/routerGroup" id="rectilinearRouterAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/routerMenu/routerGroup" toolbarPath="/routerMenu/routerGroup" id="obliqueRouterAction">
-            </partAction> 
-            <partAction menubarPath="/diagramMenu/routerMenu/routerGroup" toolbarPath="/routerMenu/routerGroup" id="treeRouterAction">
-            </partAction>          
-            <partAction menubarPath="/diagramMenu/sizeGroup" toolbarPath="/toolbarFormatGroup" id="autoSizeAction">
-            </partAction>
-            <partAction toolbarPath="/toolbarFilterGroup" id="showConnectorLabels">
-            </partAction>
-            <partAction toolbarPath="/toolbarFilterGroup" id="hideConnectorLabels">
-            </partAction>
-            
-            <partAction menubarPath="/diagramMenu/filtersMenu/expandFilterGroup" id="sortfilterAction">
-            </partAction>           
-            <partAction menubarPath="/diagramMenu/copyAppearanceGroup" toolbarPath="/toolbarCopyAppearanceGroup" id="copyAppearancePropertiesAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/formatGroup" id="selectMenu">
-            </partMenu>
-            <partMenu toolbarPath="/toolbarViewGroup" id="selectMenuToolbar">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/selectMenu/" toolbarPath="/selectMenu/" id="selectGroup">
-            </partMenuGroup>
-            <partAction global="true" menubarPath="/diagramMenu/selectMenu/selectGroup" id="selectAll">
-            </partAction>
-            <partAction global="true" toolbarPath="/selectMenu/selectGroup" id="toolbarSelectAllAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/selectMenu/selectGroup" id="selectAllShapesAction">
-            </partAction>
-            <partAction toolbarPath="/selectMenu/selectGroup" id="toolbarSelectAllShapesAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/selectMenu/selectGroup" id="selectAllConnectorsAction">
-            </partAction>
-            <partAction toolbarPath="/selectMenu/selectGroup" id="toolbarSelectAllConnectorsAction">
-            </partAction>
-
-            <partMenu
-            	  menubarPath="/diagramMenu/filtersMenu/expandFilterGroup"
-                  toolbarPath="/toolbarFilterGroup"
-                  id="compartmentMenu">
-            </partMenu>
-            <partMenuGroup
-                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/"
-                  toolbarPath="/compartmentMenu/"
-                  id="allCompartmentsGroup">
-            </partMenuGroup>
-            <partAction
-                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"
-                  toolbarPath="/compartmentMenu/allCompartmentsGroup"
-                  id="allCompartmentsAction">
-            </partAction>
-            <partAction
-                  menubarPath="/diagramMenu/filtersMenu/compartmentMenu/allCompartmentsGroup"
-                  toolbarPath="/compartmentMenu/allCompartmentsGroup"
-                  id="noCompartmentsAction">
-            </partAction> 
-
-            <partMenu menubarPath="/diagramMenu/formatGroup" id="arrangeMenu">
-            </partMenu>
-            <partMenu toolbarPath="/toolbarViewGroup" id="arrangeMenuToolbar">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/arrangeMenu/" toolbarPath="/arrangeMenu/" id="arrangeGroup">
-            </partMenuGroup>            
-             <partAction menubarPath="/diagramMenu/arrangeMenu/arrangeGroup" id="arrangeAllAction">
-            </partAction>
-            <partAction toolbarPath="/arrangeMenu/arrangeGroup" id="toolbarArrangeAllAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/arrangeMenu/arrangeGroup" id="arrangeSelectionAction">
-            </partAction>  
-            <partAction toolbarPath="/arrangeMenu/arrangeGroup" id="toolbarArrangeSelectionAction">
-            </partAction>                
-            <partMenu menubarPath="/diagramMenu/formatGroup" toolbarPath="/toolbarViewGroup" id="alignMenu">
-            </partMenu><partMenuGroup menubarPath="/diagramMenu/alignMenu/" toolbarPath="/alignMenu/" id="alignHorizontalGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/alignMenu/" toolbarPath="/alignMenu/" id="alignVerticalGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup" toolbarPath="/alignMenu/alignHorizontalGroup" id="org.eclipse.gef.align_left">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup" toolbarPath="/alignMenu/alignHorizontalGroup" id="org.eclipse.gef.align_center">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignHorizontalGroup" toolbarPath="/alignMenu/alignHorizontalGroup" id="org.eclipse.gef.align_right">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignVerticalGroup" toolbarPath="/alignMenu/alignVerticalGroup" id="org.eclipse.gef.align_top">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignVerticalGroup" toolbarPath="/alignMenu/alignVerticalGroup" id="org.eclipse.gef.align_middle">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/alignMenu/alignVerticalGroup" toolbarPath="/alignMenu/alignVerticalGroup" id="org.eclipse.gef.align_bottom">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/formatGroup" id="textAlignmentMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/textAlignmentMenu/" id="textAlignmentGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentLeftAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentCenterAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentRightAction">
-            </partAction>
-            <partMenu menubarPath="/diagramMenu/formatGroup" id="zorderMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/zorderMenu/" id="zorderGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/zorderMenu/zorderGroup" id="bringToFrontAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/zorderMenu/zorderGroup" id="sendToBackAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/zorderMenu/zorderGroup" id="bringForwardAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/zorderMenu/zorderGroup" id="sendBackwardAction">
-            </partAction>     
-            
-            <partMenu menubarPath="/diagramMenu/viewGroup" id="viewMenu">
-            </partMenu> 
-            <partMenuGroup menubarPath="/diagramMenu/viewMenu/" id="gridGroup">
-            </partMenuGroup>                        
-            <partMenuGroup menubarPath="/diagramMenu/viewMenu/" id="pageBreaksGroup">
-            </partMenuGroup>
-            <partMenuGroup menubarPath="/diagramMenu/viewMenu/" id="snapToGroup">
-            </partMenuGroup>            
-            <partAction menubarPath="/diagramMenu/viewMenu/gridGroup" id="viewGridAction">
-            </partAction>            
-            <partAction menubarPath="/diagramMenu/viewMenu/gridGroup" id="viewRulerAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/viewMenu/pageBreaksGroup" id="viewPageBreaks">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/viewMenu/pageBreaksGroup" id="recalcPageBreaks">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/viewMenu/snapToGroup" id="snapToGridAction">
-            </partAction>            
-            <partCustom menubarPath="/diagramMenu/viewGroup" toolbarPath="/toolbarNavigateGroup" id="zoomContributionItem">
-            </partCustom>
-               
-            <partMenu menubarPath="/diagramMenu/sizeGroup" id="makeSameSizeMenu">
-            </partMenu>
-            <partMenuGroup menubarPath="/diagramMenu/makeSameSizeMenu/" id="sameSizeGroup">
-            </partMenuGroup>
-            <partAction menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup" id="makeSameSizeBothAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup" id="makeSameHeightAction">
-            </partAction>
-            <partAction menubarPath="/diagramMenu/makeSameSizeMenu/sameSizeGroup" id="makeSameWidthAction">
-            </partAction>                
-         </partContribution>         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-<!-- main context menu groups -->
-			<popupMenuGroup id="umlAddGroup">
-            </popupMenuGroup>			
-            <popupMenuGroup id="addGroup">
-            </popupMenuGroup>
-            <popupMenuGroup id="navigateGroup">
-            </popupMenuGroup>  
-            <popupMenuGroup id="fileGroup">
-            </popupMenuGroup>          
-            <popupMenuGroup id="editGroup">
-            </popupMenuGroup>
-            <popupMenuGroup id="findGroup">
-            </popupMenuGroup>
-            <popupMenuGroup id="filterFormatGroup">
-            </popupMenuGroup> 
-            <popupMenuGroup id="viewGroup">
-            </popupMenuGroup>            
-            <popupMenuGroup id="restGroup">
-            </popupMenuGroup>
-            <popupMenuGroup id="additions">
-            </popupMenuGroup>
-            <popupMenuGroup id="propertiesGroup">
-            </popupMenuGroup>
-<!-- main context menu submenus and their groups -->		
-            <popupMenu path="/navigateGroup" id="navigateMenu">
-            </popupMenu>
-            <popupMenu path="/fileGroup" id="fileMenu">
-            </popupMenu>
-            <popupMenuGroup path="/fileMenu/" id="saveGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/fileMenu/" id="printGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/navigateMenu/" id="openGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/navigateMenu/" id="showGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/navigateMenu/" id="diagramGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/navigateMenu/" id="additions">
-            </popupMenuGroup>            
-            <popupMenu path="/editGroup" id="editMenu">
-            </popupMenu>
-            <popupMenuGroup path="/editMenu/" id="undoGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/editMenu/" id="copyGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/editMenu/" id="additions">
-            </popupMenuGroup>       
-       	</popupContribution> 
-       	
-       	<!-- added here for display ordering purposes -->
-       	<popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-            </popupStructuredContributionCriteria>
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
-            </popupStructuredContributionCriteria>
-            <popupMenu path="/filterFormatGroup" id="selectMenu">
-            </popupMenu>
-            <popupMenuGroup path="/selectMenu/" id="selectGroup">
-            </popupMenuGroup>
-            <popupAction path="/selectMenu/selectGroup" id="selectAll">
-            </popupAction>
-            <popupAction path="/selectMenu/selectGroup" id="selectAllShapesAction">
-            </popupAction>
-            <popupAction path="/selectMenu/selectGroup" id="selectAllConnectorsAction">
-            </popupAction>
-            <popupAction path="/filterFormatGroup" id="toolbarArrangeAllAction">
-            </popupAction>             
-        </popupContribution>  
-          
-        <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-           <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart">        
-            </popupStructuredContributionCriteria> 
-            <popupMenu path="/filterFormatGroup" id="formatMenu">
-            </popupMenu>
-         </popupContribution>    
-         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart">
-            </popupStructuredContributionCriteria>
-            <popupMenu path="/filterFormatGroup" id="formatMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/" id="miscellaneousGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/miscellaneousGroup" id="snapBackAction">
-            </popupAction>
-          </popupContribution>          
-       
-        <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">            
-            <popupMenu path="/filterFormatGroup" id="filtersMenu">
-            </popupMenu>
-            <popupMenuGroup path="/filtersMenu/" id="expandFilterGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/filtersMenu/" id="relationshipsGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/filtersMenu/" id="miscellaneousGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/filtersMenu/" id="additions">
-            </popupMenuGroup>             
-            <popupMenuGroup path="/formatMenu/" id="fontFillLineGroup">
-            </popupMenuGroup>                
-            <popupMenuGroup path="/formatMenu/" id="miscellaneousGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/formatMenu/" id="additions">
-            </popupMenuGroup>
-            <popupMenuGroup path="/formatMenu/" id="sizeGroup">
-            </popupMenuGroup>
-             <popupMenuGroup path="/formatMenu/" id="applyAppearanceGroup">
-            </popupMenuGroup>
-<!-- global actions -->  	
-			<popupAction path="/editMenu/copyGroup" id="cut">
-            </popupAction>
-            <popupAction path="/editMenu/copyGroup" id="copy">
-            </popupAction>   
-			<popupAction path="/editMenu/copyGroup" id="paste">
-            </popupAction>                    
-            <popupAction path="/propertiesGroup" id="showPropertiesViewAction">
-            </popupAction>
-            <popupAction path="/propertiesGroup" id="properties">
-            </popupAction>           
-<!-- navigate menu actions -->
-            <popupMenu path="/navigateMenu/showGroup" id="showInMenu">
-            </popupMenu>   
-            <popupMenuGroup path="/navigateMenu/showInMenu/" id="additions">
-            </popupMenuGroup>       
-        </popupContribution>
-        
-<!-- format menu actions -->           
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart">
-            </popupStructuredContributionCriteria>     
-            <popupAction path="/formatMenu/applyAppearanceGroup" id="copyAppearancePropertiesAction">
-            </popupAction>
-            <popupAction path="/formatMenu/fontFillLineGroup" id="fontDialogAction">
-            </popupAction>
-             <popupCustom path="/formatMenu/fontFillLineGroup" id="fillColorContributionItem">
-            </popupCustom>
-            <popupCustom path="/formatMenu/fontFillLineGroup" id="lineColorContributionItem">
-            </popupCustom>                               
-            <popupMenu path="/formatMenu/fontFillLineGroup" id="lineWidthMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/lineWidthMenu/" id="lineWidthGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/lineWidthMenu/lineWidthGroup" id="lineWidthOneAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineWidthMenu/lineWidthGroup" id="lineWidthTwoAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineWidthMenu/lineWidthGroup" id="lineWidthThreeAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineWidthMenu/lineWidthGroup" id="lineWidthFourAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineWidthMenu/lineWidthGroup" id="lineWidthFiveAction">
-            </popupAction>
-            <popupMenu path="/formatMenu/fontFillLineGroup" id="lineTypeMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/lineTypeMenu/" id="lineTypeGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/lineTypeMenu/lineTypeGroup" id="lineTypeSolidAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDotAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashDotAction">
-            </popupAction>
-            <popupAction path="/formatMenu/lineTypeMenu/lineTypeGroup" id="lineTypeDashDotDotAction">
-            </popupAction>
-            <popupMenu path="/formatMenu/fontFillLineGroup" id="arrowTypeMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/arrowTypeMenu/" id="arrowTypeGroup">
-            </popupMenuGroup>
-            <popupMenu path="/formatMenu/arrowTypeMenu/arrowTypeGroup" id="arrowTypeSourceMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/" id="arrowTypeSourceGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceNoneAction">
-            </popupAction>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceSolidAction">
-            </popupAction>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeSourceMenu/arrowTypeSourceGroup" id="arrowTypeSourceOpenAction">
-            </popupAction>
-            <popupMenu path="/formatMenu/arrowTypeMenu/arrowTypeGroup" id="arrowTypeTargetMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/" id="arrowTypeTargetGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetNoneAction">
-            </popupAction>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetSolidAction">
-            </popupAction>
-            <popupAction path="/formatMenu/arrowTypeMenu/arrowTypeTargetMenu/arrowTypeTargetGroup" id="arrowTypeTargetOpenAction">
-            </popupAction>
-            <popupMenu path="/formatMenu/miscellaneousGroup" id="arrangeMenu">
-            </popupMenu>    
-            <popupMenuGroup path="/formatMenu/arrangeMenu/" id="arrangeGroup">
-            </popupMenuGroup>             
-            <popupAction path="/formatMenu/arrangeMenu/arrangeGroup" id="arrangeAllAction">
-            </popupAction>   
-             <popupAction path="/formatMenu/arrangeMenu/arrangeGroup" id="arrangeSelectionAction">
-            </popupAction>              
-         </popupContribution>
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.INotableEditPart">
-            </popupStructuredContributionCriteria>           
-            <popupAction path="/addGroup" id="addNoteLinkAction">   
-            </popupAction>    
-         </popupContribution>  
-         
-<!-- format and filter menu actions -->         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart">
-            </popupStructuredContributionCriteria>                    
-            <popupMenu path="/formatMenu/miscellaneousGroup" id="alignMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/alignMenu/" id="alignHorizontalGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/formatMenu/alignMenu/" id="alignVerticalGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/alignMenu/alignHorizontalGroup" id="alignLeftAction">
-            </popupAction>
-            <popupAction path="/formatMenu/alignMenu/alignHorizontalGroup" id="alignCenterAction">
-            </popupAction>
-            <popupAction path="/formatMenu/alignMenu/alignHorizontalGroup" id="alignRightAction">
-            </popupAction>
-            <popupAction path="/formatMenu/alignMenu/alignVerticalGroup" id="alignTopAction">
-            </popupAction>
-            <popupAction path="/formatMenu/alignMenu/alignVerticalGroup" id="alignMiddleAction">
-            </popupAction>
-            <popupAction path="/formatMenu/alignMenu/alignVerticalGroup" id="alignBottomAction">
-            </popupAction>  
-            <popupMenu path="/formatMenu/miscellaneousGroup" id="textAlignmentMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/textAlignmentMenu/" id="textAlignmentGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentLeftAction">
-            </popupAction>
-            <popupAction path="/formatMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentCenterAction">
-            </popupAction>
-            <popupAction path="/formatMenu/textAlignmentMenu/textAlignmentGroup" id="textAlignmentRightAction">
-            </popupAction>
-            <popupMenu path="/formatMenu/miscellaneousGroup" id="zorderMenu">
-            </popupMenu>
-            <popupMenuGroup path="/formatMenu/zorderMenu/" id="zorderGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/zorderMenu/zorderGroup" id="bringToFrontAction">
-            </popupAction>
-            <popupAction path="/formatMenu/zorderMenu/zorderGroup" id="sendToBackAction">
-            </popupAction>
-            <popupAction path="/formatMenu/zorderMenu/zorderGroup" id="bringForwardAction">
-            </popupAction>
-            <popupAction path="/formatMenu/zorderMenu/zorderGroup" id="sendBackwardAction">
-            </popupAction>                        			
-            <popupAction path="/formatMenu/sizeGroup" id="autoSizeAction">
-            </popupAction>  
-            
-            <popupMenu path="/filtersMenu/expandFilterGroup" id="compartmentMenu">
-            </popupMenu>
-            <popupMenuGroup path="/filtersMenu/compartmentMenu/" id="individualCompartmentsGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/filtersMenu/compartmentMenu/" id="allCompartmentsGroup">
-            </popupMenuGroup>  
-         </popupContribution>       
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart">
-               <method
-                     name="getResizableNotationViews().isEmpty()"
-                     value="false">
-               </method>
-            </popupStructuredContributionCriteria>                    
-            <popupAction path="/filtersMenu/compartmentMenu/allCompartmentsGroup" id="allCompartmentsAction">
-            </popupAction>
-            <popupAction path="/filtersMenu/compartmentMenu/allCompartmentsGroup" id="noCompartmentsAction">
-            </popupAction>     
-            <popupAction path="/filtersMenu/expandFilterGroup" id="sortfilterAction">
-            </popupAction>
-         </popupContribution>          
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-            </popupStructuredContributionCriteria>
-            <popupAction path="/navigateMenu/openGroup" id="open">
-            </popupAction>
-            <popupAction path="/fileMenu/printGroup" id="print">
-            </popupAction>            
-  			<popupMenu path="/navigateMenu/openGroup" id="openWithMenu">
-            </popupMenu>       
-            <popupMenuGroup path="/navigateMenu/openWithMenu/" id="additions">
-            </popupMenuGroup>           
-            <popupAction path="/editMenu/undoGroup" id="undo">
-            </popupAction>
-            <popupAction path="/editMenu/undoGroup" id="redo">
-            </popupAction>             
-            <popupMenu path="/addGroup" id="diagramAddMenu">
-            </popupMenu>
-            <popupMenuGroup path="/diagramAddMenu/" separator="true" id="addDiagramGeneralGroup">
-            </popupMenuGroup>                       
-            <popupAction path="/diagramAddmenu/addDiagramGeneralGroup" id="addNoteAction">
-            </popupAction>
-            <popupAction path="/diagramAddmenu/addDiagramGeneralGroup" id="addTextAction">
-            </popupAction>
-         </popupContribution>
-        
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart">
-            </popupStructuredContributionCriteria>
-             <popupMenu path="/formatMenu/fontFillLineGroup" id="routerMenu">
-            </popupMenu>            
-            <popupMenuGroup path="/formatMenu/routerMenu/" id="routerGroup">
-            </popupMenuGroup>
-            <popupAction path="/formatMenu/routerMenu/routerGroup" id="rectilinearRouterAction">
-            </popupAction>
-            <popupAction path="/formatMenu/routerMenu/routerGroup" id="obliqueRouterAction">
-            </popupAction>
-         </popupContribution>
-         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-         	<popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart">
-         	</popupStructuredContributionCriteria>
-         	<popupAction path="/formatMenu/routerMenu/routerGroup" id="treeRouterAction">
-            </popupAction>
-         </popupContribution>
-         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart">
-            </popupStructuredContributionCriteria>
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-            </popupStructuredContributionCriteria>
-         	<popupMenu path="/filtersMenu/expandFilterGroup" id="connectorLabelMenu"/>
-            <popupMenuGroup path="/filtersMenu/connectorLabelMenu/" id="individualConnectorLabelsGroup"/>
-            <popupMenuGroup path="/filtersMenu/connectorLabelMenu/" id="allConnectorLabelsGroup"/>
-            <popupAction path="/filtersMenu/connectorLabelMenu/allConnectorLabelsGroup" id="showConnectorLabels">
-            </popupAction>
-            <popupAction path="/filtersMenu/connectorLabelMenu/allConnectorLabelsGroup" id="hideConnectorLabels">
-            </popupAction>
-         </popupContribution>
-         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
-            </popupStructuredContributionCriteria>
-            <popupAction path="/formatMenu/arrangeMenu" id="arrangeAllAction">
-            </popupAction>
-            <popupAction path="/formatMenu/arrangeMenu" id="arrangeSelectionAction">
-            </popupAction>
-         </popupContribution>
-
-         <!-- View Menu Contributions -->
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-                  <method name="isSupportingViewActions()" value="true">
-               </method>
-            </popupStructuredContributionCriteria>
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
-                  <method name="isSupportingViewActions()" value="true">
-               </method>
-            </popupStructuredContributionCriteria>            
-            <popupMenu path="/viewGroup" id="viewMenu">
-            </popupMenu>
-            <popupCustom path="/viewMenu" id="zoomContributionItem">
-            </popupCustom>
-            <popupMenuGroup path="/viewMenu/" id="gridGroup">
-            </popupMenuGroup>                        
-            <popupMenuGroup path="/viewMenu/" id="pageBreaksGroup">
-            </popupMenuGroup>
-            <popupMenuGroup path="/viewMenu/" id="snapToGroup">
-            </popupMenuGroup>            
-            <popupAction path="/viewMenu/gridGroup" id="viewGridAction">
-            </popupAction>            
-            <popupAction path="/viewMenu/gridGroup" id="viewRulerAction">
-            </popupAction>
-            <popupAction path="/viewMenu/pageBreaksGroup" id="viewPageBreaks">
-            </popupAction>
-            <popupAction path="/viewMenu/pageBreaksGroup" id="recalcPageBreaks">
-            </popupAction>
-            <popupAction path="/viewMenu/snapToGroup" id="snapToGridAction">
-            </popupAction>
-         </popupContribution>
-         
-         <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart"/>
-            <popupAction path="/filtersMenu/miscellaneousGroup" id="showCompartmentTitle"/>
-         </popupContribution>  
-            
-        <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IContainedEditPart">              
-            </popupStructuredContributionCriteria> 
-            <popupAction path="/editGroup" id="deleteFromDiagramAction">
-            </popupAction>            
-          </popupContribution>                   
-          <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-            <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IContainedEditPart">
-               <method name="getNotationView().getElement()" notValue="null">                  
-               </method>               
-            </popupStructuredContributionCriteria>
-            <popupAction path="/editGroup" id="deleteFromModelAction">
-            </popupAction>            
-          </popupContribution>
-           <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-           <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart" objectCount="1">
-            </popupStructuredContributionCriteria> 
-           <popupStructuredContributionCriteria objectClass="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart" objectCount="1">
-            </popupStructuredContributionCriteria> 
-            <popupAction path="/navigateMenu/openGroup" id="OpenAction">
-            </popupAction>
-         </popupContribution>   
-		   <popupContribution
-                 class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-              <popupStructuredContributionCriteria
-                    objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart"
-                    objectCount="1">
-              </popupStructuredContributionCriteria>
-              <popupAction
-                    id="selectConnectionSource"
-                    path="/navigateMenu/showGroup">
-              </popupAction>
-           </popupContribution>
-           <popupContribution
-                 class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
-              <popupStructuredContributionCriteria
-                    objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart"
-                    objectCount="1">
-              </popupStructuredContributionCriteria>
-              <popupAction
-                    id="selectConnectionTarget"
-                    path="/navigateMenu/showGroup">
-              </popupAction>
-           </popupContribution>    
-                                                    
-      </contributionItemProvider>
-   </extension> 
-   
-   <extension id="printingContributionItemProvider" name="%ext.printingContributionItemProvider" point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
-      <contributionItemProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.PrintingContributionItemProvider">
-         <Priority name="High">
-         </Priority>
-         <partContribution class="org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart">
-            <partAction menubarPath="/file/print" id="pageSetupAction">
-            </partAction>
-         </partContribution>
-      </contributionItemProvider>
-   </extension>
-   
-   <extension id="actionSets" name="%ext.actionSets" point="org.eclipse.ui.actionSets">
-      <actionSet label="%Diagram.ActionSet.Label" description="%Diagram.ActionSet.Description" visible="false" id="org.eclipse.gmf.runtime.diagram.ui.DiagramActionSet">
-         <action
-               class="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate"
-               definitionId="org.eclipse.gmf.runtime.diagram.ui.providers.duplicateNode"
-               id="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate"
-               label="%DuplicateActionDelegate.Label"
-               menubarPath="edit/cut.ext"
-               tooltip="%DuplicateActionDelegate.Tooltip">
-         	<enablement>
-            	<objectState name="@canDuplicate" value="enablement">
-            	</objectState>
-         	</enablement>
-         </action>      
-      </actionSet>
-   </extension>  
-   
-  <extension id="actionFilterProviders" name="%ext.actionFilterProviders" point="org.eclipse.gmf.runtime.common.ui.services.action.actionFilterProviders">
-     <ActionFilterProvider class="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DiagramActionFilterProvider">
-        <Priority name="Lowest"/>
-        <Attribute name="canDuplicate" value="enablement"/>
-        <Attribute name="canDuplicate" value="visibility"/>
-     </ActionFilterProvider>
-  </extension>
-         
-  <extension id="presentationViewProvider" name="%ext.presentationViewProvider" point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramViewProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)" id="DiagramLink_VP">
-            <method name="getProxyClassID()" value="notation.Diagram">
-            </method>
-         </object>                    
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Note, Text, Description, DiagramName">
-         </context>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="" elements="DiagramLink_VP">
-         </context>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="NoteAttachment">
-         </context>
-         <object class="org.eclipse.gmf.runtime.emf.type.core.IMetamodelType(org.eclipse.gmf.runtime.emf.type.core)" id="DiagramLink">
-            <method name="getEClass().getName()" value="Diagram">
-            </method>
-         </object>         
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="" elements="DiagramLink">
-         </context>                  
-      </viewProvider>
-   </extension> 
-   
-   <extension id="presentationEditPartProvider" name="%ext.presentationEditPartProvider" point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramEditPartProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.View" id="ShapesByType">
-            <method name="getType()" value="Note, Text, NoteAttachment, DiagramName, Description, Group">
-            </method>
-         </object>
-         <context views="ShapesByType">
-         </context>
-         <context providesRootEditPart="true"/>
-      </editpartProvider>
-   </extension>  
-   <!--
-    &lt;extension
-         point=&quot;org.eclipse.ui.preferencePages&quot;&gt;
-      &lt;page
-            name=&quot;%PreferencePage.Root.Diagrams&quot;            
-            class=&quot;org.eclipse.gmf.runtime.diagram.ui.providers.internal.preferences.DiagramsPreferencePage&quot;
-            id=&quot;presentation.diagram&quot;&gt;
-      &lt;/page&gt;
-      &lt;page
-            name=&quot;%PreferencePage.Appearance&quot;
-            category=&quot;presentation.diagram&quot;
-            class=&quot;org.eclipse.gmf.runtime.diagram.ui.providers.internal.preferences.AppearancePreferencePage&quot;
-            id=&quot;presentation.diagram&quot;&gt;
-      &lt;/page&gt;     
-      &lt;page
-            name=&quot;%PreferencePage.RulerGrid&quot;
-            category=&quot;presentation.diagram&quot;
-            class=&quot;org.eclipse.gmf.runtime.diagram.ui.providers.internal.preferences.RulerGridPreferencePage&quot;
-            id=&quot;presentation.rulergrid&quot;&gt;
-      &lt;/page&gt;
-   &lt;/extension&gt;
-   -->
-   
-   <extension id="presentationLayoutProvider" name="%ext.presentationLayoutProvider" point="org.eclipse.gmf.runtime.diagram.ui.layoutProviders">
-      <layoutProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.TopDownProvider">
-         <Priority name="Lowest">
-         </Priority>
-      </layoutProvider>
-      <layoutProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.RadialProvider">
-         <Priority name="Lowest">
-         </Priority>
-      </layoutProvider>
-	  <layoutProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.CompositeTopDownProvider">
-         <Priority name="Lowest"/>
-      </layoutProvider>
-   </extension>
-   
-      <extension id="presentationPaletteProvider" name="%ext.presentationPaletteProvider" point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <editor class="org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor">
-         </editor>
-         <contribution factoryClass="org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.DiagramPaletteFactory">
-            <entry label="%ZoomOutTool.Label" kind="tool" description="%ZoomOutTool.Description" large_icon="icons/zoomminus_24x24.gif" small_icon="icons/zoomminus.gif" path="/standardGroup/selectionTool" id="zoomOutTool">
-         	</entry>
-            <entry label="%ZoomInTool.Label" kind="tool" description="%ZoomInTool.Description" large_icon="icons/zoomplus_24x24.gif" small_icon="icons/zoomplus.gif" path="/standardGroup/selectionTool" id="zoomInTool">
-         	</entry>
-            <entry label="%NoteStack.Label" kind="stack" description="%NoteStack.Description" small_icon="icons/note.gif" path="/standardGroup/" id="noteStack">
-            </entry>
-            <entry label="%NoteTool.Label" kind="tool" description="%NoteTool.Description" path="/standardGroup/noteStack/" large_icon="icons/note_24x24.gif" small_icon="icons/note.gif" id="noteTool">
-            </entry>
-            <entry label="%TextTool.Label" kind="tool" description="%TextTool.Description" path="/standardGroup/noteStack/" large_icon="icons/text_24x24.gif" small_icon="icons/text.gif" id="textTool">
-            </entry>
-            <entry label="%NoteAttachmentTool.Label" kind="tool" description="%NoteAttachmentTool.Description" path="/standardGroup/noteStack/" large_icon="icons/noteattachment_24x24.gif" small_icon="icons/noteattachment.gif" id="noteattachmentTool">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension id="popupMenus" name="%ext.popupMenus" point="org.eclipse.ui.popupMenus">
-      <objectContribution objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart" id="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate">
-         <visibility>
-             <objectState name="@canDuplicate" value="visibility">
-            </objectState>
-         </visibility>
-         <action enablesFor="+" label="%DuplicateActionDelegate.Label" tooltip="%DuplicateActionDelegate.Tooltip" class="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate" menubarPath="editMenu/additions" id="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate">
-         	<enablement>
-               <objectState name="@canDuplicate" value="enablement">
-               </objectState>
-            </enablement>
-         </action>
-      </objectContribution>
-   </extension>  
-   
-   <extension id="DiagramModelingAssistantProvider" name="%ext.modelingAssistantProvider" point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
-      <modelingAssistantProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramModelingAssistantProvider">
-         <Priority name="Lowest"/>
-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="NODE">
-         </object>
-         <context elements="NODE">
-         </context>
-      </modelingAssistantProvider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.ui.category.edit"
-            defaultHandler="org.eclipse.gmf.runtime.diagram.ui.actions.internal.DuplicateActionDelegate"
-            description="%DuplicateActionDelegate.description"
-            id="org.eclipse.gmf.runtime.diagram.ui.providers.duplicateNode"
-            name="%DuplicateActionDelegate.name"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.gmf.runtime.diagram.ui.providers.duplicateNode"
-            contextId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M2+D"/>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.providers/pom.xml
deleted file mode 100644
index 812b2d6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.providers</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.providers</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeLeftRightProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeLeftRightProvider.java
deleted file mode 100644
index 9168ea7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeLeftRightProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.CompositeLayoutProvider;
-
-/**
- * @author mmostafa
- *
- * Custom provider that lays out the composite directed graph in a left to right fashion.
- */
-
-public class CompositeLeftRightProvider
-    extends CompositeLayoutProvider {
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateToGraph(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    protected Rectangle translateToGraph(Rectangle r) {
-        Rectangle rDP = r.getCopy();
-        return rDP;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateFromGraph(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    protected Rectangle translateFromGraph(Rectangle rect) {
-        Rectangle rLP = rect.getCopy();
-        return rLP;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.CompositeLayoutProvider#createGraph()
-	 */
-	protected DirectedGraph createGraph() {
-		DirectedGraph g = super.createGraph();
-		g.setDirection(PositionConstants.EAST);
-		return g;
-	}
-
-	protected int getLayoutDirection(GraphicalEditPart ep) {
-		return PositionConstants.EAST;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeTopDownProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeTopDownProvider.java
deleted file mode 100644
index 64e4b09..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/CompositeTopDownProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.CompositeLayoutProvider;
-
-/**
- * @author mmostafa
- *
- * Custom provider that lays out the composite directed graph in a top to down fashion.
- */
-
-public class CompositeTopDownProvider
-    extends CompositeLayoutProvider {
-    
-	/* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateToGraph(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    protected Rectangle translateToGraph(Rectangle r) {
-        Rectangle rDP = r.getCopy();
-        return rDP;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateFromGraph(org.eclipse.draw2d.geometry.Rectangle)
-     */
-    protected Rectangle translateFromGraph(Rectangle rect) {
-        Rectangle rLP = rect.getCopy();
-        return rLP;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DefaultPaletteProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DefaultPaletteProvider.java
deleted file mode 100644
index 70b9080..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DefaultPaletteProvider.java
+++ /dev/null
@@ -1,720 +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.providers;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteRoot;
-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.AbstractProviderConfiguration.ObjectDescriptor;
-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.ActivityUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteTemplateEntry;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteDrawer;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteSeparator;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * The defaul palette provider. It reads XML palette contributions from the
- * provider's extension point and contributes them to an editor's palette
- * based on different contribution criteria
- * 
- * The provider class should not be subclassed since it does its contribution totally from XML
- * However, if programatic contribution is required, then the <code>IPaletteProvider</code>
- * interface should be implemented directly instead 
- * 
- * @author melaasar
- */
-public class DefaultPaletteProvider
-    extends AbstractProvider
-    implements IPaletteProvider {
-
-    /** constants corresponding to different symbols in the extention schema */
-    private static final String CONTRIBUTION = "contribution"; //$NON-NLS-1$
-    private static final String FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
-    private static final String ENTRY = "entry"; //$NON-NLS-1$
-    private static final String KIND = "kind"; //$NON-NLS-1$
-    private static final String ID = "id"; //$NON-NLS-1$
-    private static final String PATH = "path"; //$NON-NLS-1$
-    private static final String LABEL = "label"; //$NON-NLS-1$
-    private static final String DESCRIPTION = "description"; //$NON-NLS-1$
-    private static final String SMALL_ICON = "small_icon"; //$NON-NLS-1$
-    private static final String LARGE_ICON = "large_icon"; //$NON-NLS-1$
-//  private static final String PERMISSION = "permission"; //$NON-NLS-1$
-    private static final String EXPAND = "expand"; //$NON-NLS-1$
-    private static final String FORCE = "force"; //$NON-NLS-1$
-    private static final String CONTENT = "content"; //$NON-NLS-1$
-    private static final String DEFINE_ONLY = "defineOnly"; //$NON-NLS-1$
-    private static final String PREDEFINED_ENTRY = "predefinedEntry"; //$NON-NLS-1$
-    private static final String REMOVE = "remove"; //$NON-NLS-1$
-
-    /** palette entry kind enumeration */
-    private static final String DRAWER = "drawer"; //$NON-NLS-1$
-    private static final String STACK = "stack"; //$NON-NLS-1$
-    private static final String SEPARATOR = "separator"; //$NON-NLS-1$
-    private static final String TEMPLATE = "template"; //$NON-NLS-1$
-    private static final String TOOL = "tool"; //$NON-NLS-1$
-    private static final int ENUM_DRAWER = 0;
-    private static final int ENUM_STACK = 1;
-    private static final int ENUM_SEPARATOR = 2;
-    private static final int ENUM_TEMPLATE = 3;
-    private static final int ENUM_TOOL = 4;
-
-    /** palette entry permission enumeration */
-    private static final String NONE = "None"; //$NON-NLS-1$
-    private static final String HIDEONLY = "HideOnly"; //$NON-NLS-1$
-    private static final String LIMITED = "limited"; //$NON-NLS-1$
-    private static final String FULL = "full"; //$NON-NLS-1$
-
-    /**
-     * A descriptor for XML-based palette contribution
-     */
-    private static class ContributionDescriptor {
-
-        private PaletteFactoryProxy paletteFactory;
-        private List entries = new ArrayList();
-
-        /**
-         * Reads XML entries for a contribution 
-         * @param configElement
-         */
-        public ContributionDescriptor(IConfigurationElement configElement) {
-            paletteFactory = new PaletteFactoryProxy(configElement);
-
-            // read the palette entries
-            IConfigurationElement configChildren[] =
-                configElement.getChildren(ENTRY);
-
-            for (int i = 0; i < configChildren.length; i++) {
-                entries.add(new EntryDescriptor(configChildren[i]));
-            }
-            
-            configChildren =
-                configElement.getChildren(PREDEFINED_ENTRY);
-
-            for (int i = 0; i < configChildren.length; i++) {
-                entries.add(new PredefinedEntryDescriptor(configChildren[i]));
-            }
-        }
-
-        /**
-         * Contributes to the given palette root based on the given editor's
-         * content
-         * 
-         * @param content
-         * @param root
-         * @param predefinedEntries
-         *            map of predefined palette entries where the key is the
-         *            palette entry id and the value is the palette entry
-         */
-        public void contribute(Object content, PaletteRoot root, Map predefinedEntries, String pluginID) {
-            Iterator iter = entries.iterator();
-            while (iter.hasNext()) {
-                IEntryDescriptor descriptor = (IEntryDescriptor) iter.next();
-                if (ActivityUtil.isEnabled(descriptor.getID(), pluginID)) {
-                    descriptor.contribute(content, root, paletteFactory,
-                        predefinedEntries);
-                }
-            }
-        }
-    }
-    
-    /**
-     * An interface describing the types of palette entries in the schema.
-     * 
-     * @author cmahoney
-     */
-    private static interface IEntryDescriptor {
-
-        /**
-         * Contributes the palette entry based on the given content, starting
-         * from the given root and into the given path
-         * 
-         * @param content
-         * @param root
-         * @param paletteFactory
-         * @param predefinedEntries
-         *            map of predefined palette entries where the key is the
-         *            palette entry id and the value is the palette entry
-         */
-        public void contribute(Object content, PaletteRoot root,
-                PaletteFactoryProxy paletteFactory, Map predefinedEntries);
-        
-        /**
-         * Gets the ID of this entry descriptor.
-         * 
-         * @return the id
-         */
-        public String getID();
-    }
-
-    /**
-     * A descriptor for an XML-based palette entry
-     */
-    private static class EntryDescriptor implements IEntryDescriptor {
-        private Integer kind;
-        private String id;
-        private String path;
-        private String label;
-        private String description;
-        private Integer permission;
-        private ImageDescriptor small_icon;
-        private ImageDescriptor large_icon;
-        private boolean noIcon = false;
-        private DrawerExpandHelper expandHelper;
-        private boolean defineOnly;
-
-        /**
-         * Reads an XML palette entry and its attributes
-         * @param configElement
-         */
-        public EntryDescriptor(IConfigurationElement configElement) {
-            String kindStr = configElement.getAttribute(KIND);
-            if (DRAWER.equals(kindStr))
-                kind = new Integer(ENUM_DRAWER);
-            else if (STACK.equals(kindStr))
-                kind = new Integer(ENUM_STACK);
-            else if (SEPARATOR.equals(kindStr))
-                kind = new Integer(ENUM_SEPARATOR);
-            else if (TEMPLATE.equals(kindStr))
-                kind = new Integer(ENUM_TEMPLATE);
-            else if (TOOL.equals(kindStr))
-                kind = new Integer(ENUM_TOOL);
-            else
-                Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$
-
-            id = configElement.getAttribute(ID);
-            if (id == null)
-                Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$
-
-            defineOnly = Boolean.valueOf(
-                configElement.getAttribute(DEFINE_ONLY)).booleanValue();
-
-            path = configElement.getAttribute(PATH);
-            if (path == null && !defineOnly)
-                Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "Path must be provided when contributing a palette entry"); //$NON-NLS-1$
-
-            label = configElement.getAttribute(LABEL);
-            if (label == null)
-                label = DiagramUIMessages.PaletteEntry_DefaultLabel;
-
-            description = configElement.getAttribute(DESCRIPTION);
-
-            if (NONE.equals(kindStr))
-                permission =
-                    new Integer(PaletteEntry.PERMISSION_NO_MODIFICATION);
-            if (HIDEONLY.equals(kindStr))
-                permission = new Integer(PaletteEntry.PERMISSION_HIDE_ONLY);
-            if (LIMITED.equals(kindStr))
-                permission =
-                    new Integer(PaletteEntry.PERMISSION_LIMITED_MODIFICATION);
-            if (FULL.equals(kindStr))
-                permission =
-                    new Integer(PaletteEntry.PERMISSION_FULL_MODIFICATION);
-
-            String smallIconPath = configElement.getAttribute(SMALL_ICON);
-            if (NONE.equals(smallIconPath)) {
-                noIcon = true;
-            } else {
-                small_icon = findIconImageDescriptor(configElement, smallIconPath);
-            }
-            
-            String largeIconPath = configElement.getAttribute(LARGE_ICON);
-            large_icon = findIconImageDescriptor(configElement, largeIconPath);
-
-            if (kind.intValue() == ENUM_DRAWER) {
-                IConfigurationElement[] configChildren =
-                    configElement.getChildren(EXPAND);
-                if (configChildren.length > 0)
-                    expandHelper = new DrawerExpandHelper(configChildren[0]);
-                else
-                    expandHelper = new DrawerExpandHelper(Boolean.FALSE);
-            }
-        }
-
-        /**
-         * Finds the image descriptor that is associated with the icon path.
-         * @param configElement
-         * @param smallIconPath
-         * @return
-         */
-        private ImageDescriptor findIconImageDescriptor(IConfigurationElement configElement, String iconPath) {
-            String pluginId = configElement.getDeclaringExtension().getNamespaceIdentifier();
-            Bundle bundle = Platform.getBundle(pluginId);
-            try
-            {
-                if (iconPath != null) {
-                    URL fullPathString = FileLocator.find(bundle, new Path(iconPath), null);
-                    fullPathString = fullPathString != null ? fullPathString : new URL(iconPath);
-                    if (fullPathString != null) {
-                        return ImageDescriptor.createFromURL(fullPathString);
-                    }
-                }
-            }
-            catch (MalformedURLException e)
-            {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                    DefaultPaletteProvider.class, e.getLocalizedMessage(), e); 
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.RESOURCE_FAILURE, e.getMessage(), e);
-            }
-            
-            return null;
-        }
-
-        public void contribute(
-            Object content,
-            PaletteRoot root,
-            PaletteFactoryProxy paletteFactory, Map predefinedEntries) {
-            if (kind == null || id == null || label == null)
-                return;
-
-            PaletteEntry paletteEntry = null;
-
-            switch (kind.intValue()) {
-                case ENUM_DRAWER :
-                    PaletteDrawer drawer = new PaletteDrawer(id, label);
-                    if (expandHelper.expand(content)) {
-                        drawer.setInitialState(
-                            PaletteDrawer.INITIAL_STATE_OPEN);
-                    }
-                    if (noIcon) {
-                        drawer.setShowDefaultIcon(false);
-                    }
-                    paletteEntry = drawer;
-                    break;
-                case ENUM_STACK:
-                    paletteEntry = new PaletteStack(id, label, description,
-                        small_icon);
-                    break;
-                case ENUM_SEPARATOR :
-                    paletteEntry = new PaletteSeparator(id);
-                    break;
-                case ENUM_TEMPLATE :
-                    paletteEntry =
-                        new PaletteTemplateEntry(id, label, paletteFactory);
-                    break;
-                case ENUM_TOOL :
-                    paletteEntry =
-                        new PaletteToolEntry(id, label, paletteFactory);
-                    break;
-            }
-
-            if (paletteEntry != null) {
-                paletteEntry.setDescription(description);
-                paletteEntry.setSmallIcon(small_icon);
-                paletteEntry.setLargeIcon(large_icon);
-                if (permission != null)
-                    paletteEntry.setUserModificationPermission(
-                        permission.intValue());
-
-                if (defineOnly) {
-                    predefinedEntries.put(id, paletteEntry);
-                } else {
-                    appendPaletteEntry(root, predefinedEntries, path, paletteEntry);
-                }
-            }
-        }
-
-        public String getID() {
-            return id;
-        }
-
-    }
-
-    /**
-     * A descriptor for an XML-based predefined palette entry. 
-     */
-    private static class PredefinedEntryDescriptor
-        implements IEntryDescriptor {
-
-        private String id;
-        private String path;
-        private DrawerExpandHelper expandHelper;
-        private boolean remove;
-
-        /**
-         * Reads an XML palette entry and its attributes
-         * @param configElement
-         */
-        public PredefinedEntryDescriptor(IConfigurationElement configElement) {
-            id = configElement.getAttribute(ID);
-            if (id == null) {
-                Log.info(DiagramProvidersPlugin.getInstance(),
-                    DiagramProvidersStatusCodes.SERVICE_FAILURE,
-                    "No ID provided"); //$NON-NLS-1$
-            }
- 
-            path = configElement.getAttribute(PATH);
- 
-            IConfigurationElement[] configChildren = configElement
-                .getChildren(EXPAND);
-            if (configChildren.length > 0)
-                expandHelper = new DrawerExpandHelper(configChildren[0]);
-            else
-                expandHelper = new DrawerExpandHelper(Boolean.FALSE);
-            
-            remove = Boolean.valueOf(configElement.getAttribute(REMOVE))
-                .booleanValue();
-        }
-
-        public void contribute(
-            Object content,
-            PaletteRoot root,
-            PaletteFactoryProxy paletteFactory, Map predefinedEntries) {
-            
-            if (id == null)
-                return;
-            
-            // first try to find it in the palette root
-            PaletteEntry paletteEntry = findPaletteEntry(root, id);
-            
-            if (paletteEntry != null) {
-
-                if (remove) {
-                    paletteEntry.getParent().remove(paletteEntry);
-                    return;
-                }
-                
-                // Set expand state on drawers.
-                if (paletteEntry instanceof PaletteDrawer
-                    && expandHelper.expand(content)) {
-                    ((PaletteDrawer) paletteEntry)
-                        .setInitialState(PaletteDrawer.INITIAL_STATE_OPEN);
-                }
-
-            }
-            
-            // now check to see if it has been predefined only
-            if (paletteEntry == null) {
-                paletteEntry = findPredefinedEntry(predefinedEntries, id);
-            }
-            
-            if (paletteEntry != null) {
-                
-                if (path != null) {
-                    appendPaletteEntry(root, predefinedEntries, path,
-                        paletteEntry);
-                    
-                    // Set expand state on drawers.
-                    if (paletteEntry instanceof PaletteDrawer
-                        && expandHelper.expand(content)) {
-                        ((PaletteDrawer) paletteEntry)
-                            .setInitialState(PaletteDrawer.INITIAL_STATE_OPEN);
-                    }
-                }
-            }
-        }
-
-        public String getID() {
-            return id;
-        }
-    }
-
-    /**
-     * Searches the predefined entries for a palette entry given the full path
-     * as it was predefined.
-     * 
-     * @param predefinedEntries
-     *            map of predefined palette entries where the key is the palette
-     *            entry id and the value is the palette entry
-     * @param path
-     *            the path to the palette entry starting as it was predefined
-     * @return the palette entry if one exists; null otherwise.
-     */
-    private static PaletteEntry findPredefinedEntry(Map predefinedEntries,
-            String path) {
-        StringTokenizer tokens = new StringTokenizer(path, "/"); //$NON-NLS-1$
-
-        PaletteEntry root = (PaletteEntry) predefinedEntries.get(tokens
-            .nextToken());
-
-        while (tokens.hasMoreElements()) {
-            if (root instanceof PaletteContainer)
-                root = findChildPaletteEntry((PaletteContainer) root, tokens
-                    .nextToken());
-            else
-                return null;
-        }
-        return root;
-    }
-    
-    /**
-     * Finds a palette container starting from the given root and using the
-     * given path
-     * 
-     * @param root
-     * @param aPath
-     * @return the container or <code>null</code> if not found
-     */
-    private static PaletteEntry findPaletteEntry(PaletteEntry root, String aPath) {
-        StringTokenizer tokens = new StringTokenizer(aPath, "/"); //$NON-NLS-1$
-        while (tokens.hasMoreElements()) {
-            if (root instanceof PaletteContainer)
-                root =
-                    findChildPaletteEntry(
-                        (PaletteContainer) root,
-                        tokens.nextToken());
-            else
-                return null;
-        }
-        return root;
-    }
-
-    /**
-     * Finds a palette entry starting from the given container
-     * and using the given path
-     * @param root
-     * @param path
-     * @return the entry or <code>null</code> if not found
-     */
-    private static PaletteEntry findChildPaletteEntry(
-        PaletteContainer container,
-        String childId) {
-        Iterator entries = container.getChildren().iterator();
-        while (entries.hasNext()) {
-            PaletteEntry entry = (PaletteEntry) entries.next();
-            if (entry.getId().equals(childId))
-                return entry;
-        }
-        return null;
-    }
-    
-    /**
-     * Appends the given palette entry to the appropriate location in either a
-     * predefined palette entry or the palette root.
-     * 
-     * @param root
-     * @param predefinedEntries
-     *            map of predefined palette entries where the key is the palette
-     *            entry id and the value is the palette entry
-     * @param path
-     * @param paletteEntry
-     */
-    private static void appendPaletteEntry(PaletteRoot root,
-            Map predefinedEntries, String path, PaletteEntry paletteEntry) {
-        PaletteEntry fEntry = findPaletteEntry(root, path);
-        if (fEntry == null) {
-            fEntry = findPredefinedEntry(predefinedEntries, path);
-        }
-        if (fEntry == null) 
-            Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "Invalid palette entry path"); //$NON-NLS-1$                
-        else if (fEntry instanceof PaletteContainer)
-             ((PaletteContainer) fEntry).add(paletteEntry);
-        else if (fEntry instanceof PaletteSeparator)
-            appendTo((PaletteSeparator) fEntry, paletteEntry);
-        else
-            fEntry.getParent().add(
-                fEntry.getParent().getChildren().indexOf(fEntry) + 1,
-                paletteEntry);
-    }
-    
-    /**
-     * Appends the given entry to the end of the group of the given separator.
-     * 
-     * @param separator
-     * @param entry
-     */
-    private static void appendTo(PaletteSeparator separator, PaletteEntry entry) {
-        List children = separator.getParent().getChildren();
-        int index = children.indexOf(separator);
-        for (index++; index < children.size(); index++) {
-            if (children.get(index) instanceof PaletteSeparator)
-                break;
-        }
-        separator.getParent().add(index, entry);
-    }
-
-    /**
-     * A proxy for a palette factory that instantiates the real factory
-     * on demand (when a palette entry is selcted)
-     */
-    private static class PaletteFactoryProxy extends PaletteFactory.Adapter {
-
-        private IConfigurationElement configElement;
-        private PaletteFactory factory;
-
-        public PaletteFactoryProxy(IConfigurationElement configElement) {
-            this.configElement = configElement;
-        }
-
-        /**
-         * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory#getTemplate(java.lang.String)
-         */
-        public Object getTemplate(String templateId) {
-            if (factory == null) {
-                try {
-                    Object ext =
-                        configElement.createExecutableExtension(FACTORY_CLASS);
-                    factory = (PaletteFactory) ext;
-                } catch (CoreException e) {
-                    Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$                  
-                }
-            }
-            if (factory != null) {
-                Object template = factory.getTemplate(templateId);
-                if (template == null)
-                    Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$
-                return template;
-            }
-            return null;
-        }
-
-        /**
-         * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory#createTool(java.lang.String)
-         */
-        public Tool createTool(String toolId) {
-            if (factory == null) {
-                try {
-                    Object ext =
-                        configElement.createExecutableExtension(FACTORY_CLASS);
-                    factory = (PaletteFactory) ext;
-                } catch (CoreException e) {
-                    Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$                  
-                }
-            }
-            if (factory != null) {
-                Tool tool = factory.createTool(toolId);
-                if (tool == null)
-                    Log.info(DiagramProvidersPlugin.getInstance(), DiagramProvidersStatusCodes.SERVICE_FAILURE, "No factory class name is provided"); //$NON-NLS-1$
-                return tool;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * A helper class in expanding palette drawer. It reads
-     * the relavent XML entries for that.
-     */
-    private static class DrawerExpandHelper {
-
-        private Boolean force;
-        private ObjectDescriptor content;
-
-        /**
-         * Initialize the helper with a foced value
-         * @param force
-         */
-        public DrawerExpandHelper(Boolean force) {
-            this.force = force;
-        }
-
-        /**
-         * Initialize the helper from the config element in the XML
-         * @param configElement
-         */
-        public DrawerExpandHelper(IConfigurationElement configElement) {
-            String forceStr = configElement.getAttribute(FORCE);
-            force =
-                forceStr == null ? Boolean.FALSE : Boolean.valueOf(forceStr);
-
-            IConfigurationElement[] configChildren =
-                configElement.getChildren(CONTENT);
-            if (configChildren.length > 0)
-                content = new ObjectDescriptor(configChildren[0]);
-        }
-
-        /**
-         * Determines whether to initially expand the palette drawer
-         * @param targetContent
-         * @return
-         */
-        public boolean expand(Object targetContent) {
-            if (Boolean.TRUE.equals(force))
-                return true;
-            if (content != null && content.sameAs(targetContent))
-                return true;
-            return false;
-        }
-    }
-
-    /**
-     * The list of palette provider XML contributions
-     */
-    private List contributions = new ArrayList();
-    
-    /**
-     * The pluginID of the XML contributions
-     */
-    private String pluginID;
-
-    /**
-     * 
-     * Adds the configuration elements to the 
-     * list of palette provider XML contributions 
-     * 
-     * @param configElement
-     */
-    public void setContributions(IConfigurationElement configElement) {
-        
-        pluginID = configElement.getContributor().getName();
-        IConfigurationElement configChildren[] =
-            configElement.getChildren(CONTRIBUTION);
-
-        for (int i = 0; i < configChildren.length; i++) {
-            contributions.add(new ContributionDescriptor(configChildren[i]));
-        }
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider#contributeToPalette(org.eclipse.ui.IEditorPart, java.lang.Object)
-     */
-    public void contributeToPalette(
-        IEditorPart editor,
-        Object content,
-        PaletteRoot root, Map predefinedEntries) {
-        Iterator iter = contributions.iterator();
-        while (iter.hasNext()) {
-            ((ContributionDescriptor) iter.next()).contribute(content, root, predefinedEntries, pluginID);
-        }
-    }
-
-    /* (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 false; // all logic is done in the service
-    }
-    
-    
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContributionItemProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContributionItemProvider.java
deleted file mode 100644
index eeae07d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContributionItemProvider.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-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.common.ui.services.action.contributionitem.AbstractContributionItemProvider;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-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.AddNoteAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.AlignAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ShowPropertiesViewAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AddMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AlignMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AllCompartmentsAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrangeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrangeMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrowTypeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrowTypeMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrowTypeSourceMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrowTypeTargetMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.AutoSizeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ColorPropertyContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CompartmentMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ConnectionLabelMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CopyAppearancePropertiesAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CreateShapeViewAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.CreateViewAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.EditMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FileMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FiltersMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontDialogAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontNameContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontSizeContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.FontStyleAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.GroupAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.HideConnectionLabelsAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.LineTypeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.LineTypeMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.LineWidthAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.LineWidthMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.MakeSameSizeMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.OpenWithMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.PromptingDeleteFromDiagramAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.RecalculatePageBreaksAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.RouterAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.RouterMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SelectAllAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SelectConnectionEndAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SelectMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ShowCompartmentTitleAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ShowConnectionLabelsAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ShowInMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SizeBothAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SizeHeightAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SizeWidthAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SnapBackAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SnapToGridAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SortFilterAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.TextAlignmentAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.TextAlignmentMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.UngroupAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ViewGridAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ViewMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ViewPageBreaksAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ViewRulersAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ZOrderAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ZOrderMenuManager;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.OpenAction;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PromptingDeleteFromModelAction;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.ZoomContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n.DiagramUIProvidersMessages;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The core diagram contribution item provider.
- * It provides contributions generic to all diagram editors
-
- * @author melaasar
- */
-public class DiagramContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	protected IContributionItem createCustomContributionItem(
-		String customId,
-		IWorkbenchPartDescriptor partDescriptor) {
-
-		IWorkbenchPage workbenchPage = partDescriptor.getPartPage();
-
-		if (customId.equals(ActionIds.CUSTOM_FONT_NAME))
-			return new FontNameContributionItem(workbenchPage);
-		if (customId.equals(ActionIds.CUSTOM_FONT_SIZE))
-			return new FontSizeContributionItem(workbenchPage);
-		if (customId.equals(ActionIds.CUSTOM_FONT_COLOR))
-			return ColorPropertyContributionItem
-				.createFontColorContributionItem(
-				workbenchPage);
-		if (customId.equals(ActionIds.CUSTOM_LINE_COLOR))
-			return ColorPropertyContributionItem
-				.createLineColorContributionItem(
-				workbenchPage);
-		if (customId.equals(ActionIds.CUSTOM_FILL_COLOR))
-			return ColorPropertyContributionItem
-				.createFillColorContributionItem(
-				workbenchPage);
-		if (customId.equals(ActionIds.CUSTOM_ZOOM))
-			return new ZoomContributionItem(workbenchPage);
-
-		return super.createCustomContributionItem(customId, partDescriptor);
-	}
-
-	protected IMenuManager createMenuManager(
-		String menuId,
-		IWorkbenchPartDescriptor partDescriptor) {
-
-		if (menuId.equals(ActionIds.MENU_DIAGRAM))
-			return new MenuManager(DiagramUIProvidersMessages.DiagramMainMenu_DiagramMainMenuText, ActionIds.MENU_DIAGRAM);
-		if (menuId.equals(ActionIds.MENU_DIAGRAM_ADD))
-			return new AddMenuManager(menuId); 
-		if (menuId.equals(ActionIds.MENU_NAVIGATE))
-			// Should use a custom ActionMenuManager, but some actions are
-			// contributed using the org.eclipse.ui.popupMenus causing problems.
-			return new MenuManager(DiagramUIProvidersMessages.NavigateMenuManager_Navigate_ActionLabelText, ActionIds.MENU_NAVIGATE);
-		if (menuId.equals(ActionIds.MENU_FILE))
-			return new FileMenuManager();
-		if (menuId.equals(ActionIds.MENU_EDIT))
-			return new EditMenuManager();
-		if (menuId.equals(ActionIds.MENU_FILTERS))
-			return new FiltersMenuManager();
-		if (menuId.equals(ActionIds.MENU_VIEW))
-			return new ViewMenuManager();
-		if (menuId.equals(ActionIds.MENU_FORMAT))
-			// Should use a custom ActionMenuManager, but the color menu
-			// is causing "out of index" problems.  Will investigate.			
-			return new MenuManager(DiagramUIProvidersMessages.FormatMenuManager_Format_ActionLabelText, ActionIds.MENU_FORMAT);
-        if (menuId.equals(ActionIds.MENU_ARRANGE))
-            return new ArrangeMenuManager();
-        if (menuId.equals(ActionIds.MENU_ARRANGE_TOOLBAR))
-            return new ArrangeMenuManager(getAction(ActionIds.ACTION_TOOLBAR_ARRANGE_ALL, partDescriptor));
-        if (menuId.equals(ActionIds.MENU_SELECT))
-            return new SelectMenuManager();
-        if (menuId.equals(ActionIds.MENU_SELECT_TOOLBAR))
-            return new SelectMenuManager(getAction(ActionIds.ACTION_TOOLBAR_SELECT_ALL, partDescriptor));
-		if (menuId.equals(ActionIds.MENU_ALIGN))
-			return new AlignMenuManager();
-		if (menuId.equals(ActionIds.MENU_COMPARTMENT))
-			return new CompartmentMenuManager();
-		if (menuId.equals(ActionIds.MENU_CONNECTION_LABEL))
-			return new ConnectionLabelMenuManager();
-		if (menuId.equals(ActionIds.MENU_ROUTER))
-			return new RouterMenuManager();
-		if (menuId.equals(ActionIds.MENU_SHOW_IN))
-			return new ShowInMenuManager();
-		if (menuId.equals(ActionIds.MENU_OPEN_WITH))
-			return new OpenWithMenuManager();
-		if (menuId.equals(ActionIds.MENU_ZORDER))
-			return new ZOrderMenuManager();
-		if (menuId.equals(ActionIds.MENU_MAKE_SAME_SIZE))
-			return new MakeSameSizeMenuManager();
-		if (menuId.equals(ActionIds.MENU_TEXT_ALIGNMENT))
-			return new TextAlignmentMenuManager();
-		if (menuId.equals(ActionIds.MENU_LINE_TYPE))
-			return new LineTypeMenuManager();
-		if (menuId.equals(ActionIds.MENU_LINE_WIDTH))
-			return new LineWidthMenuManager();
-		if (menuId.equals(ActionIds.MENU_ARROW_TYPE))
-			return new ArrowTypeMenuManager();
-		if (menuId.equals(ActionIds.MENU_ARROW_TYPE_SOURCE))
-			return new ArrowTypeSourceMenuManager();
-		if (menuId.equals(ActionIds.MENU_ARROW_TYPE_TARGET))
-			return new ArrowTypeTargetMenuManager();
-
-		return super.createMenuManager(menuId, partDescriptor);
-	}
-
-	protected IAction createAction(
-		String actionId,
-		IWorkbenchPartDescriptor partDescriptor) {
-
-		IWorkbenchPage workbenchPage = partDescriptor.getPartPage();
-
-		if (actionId.equals(ActionIds.ACTION_FONT_BOLD))
-			return FontStyleAction.createBoldFontStyleAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_FONT_ITALIC))
-			return FontStyleAction.createItalicFontStyleAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ARRANGE_ALL))
-			return ArrangeAction.createArrangeAllAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ARRANGE_SELECTION))
-			return ArrangeAction.createArrangeSelectionAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_TOOLBAR_ARRANGE_ALL))
-			return ArrangeAction.createToolbarArrangeAllAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION))
-			return ArrangeAction.createToolbarArrangeSelectionAction(workbenchPage);
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId()))
-			return SelectAllAction.createSelectAllAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SELECT_ALL_SHAPES))
-			return SelectAllAction.createSelectAllShapesAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SELECT_ALL_CONNECTIONS))
-			return SelectAllAction.createSelectAllConnectionsAction(
-				workbenchPage);		
-		if (actionId.equals(ActionIds.ACTION_TOOLBAR_SELECT_ALL))
-			return SelectAllAction.createToolbarSelectAllAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_TOOLBAR_SELECT_ALL_SHAPES))
-			return SelectAllAction.createToolbarSelectAllShapesAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_TOOLBAR_SELECT_ALL_CONNECTIONS))
-			return SelectAllAction.createToolbarSelectAllConnectionsAction(
-				workbenchPage);		
-		if (actionId.equals(GEFActionConstants.ALIGN_LEFT))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.LEFT);
-		if (actionId.equals(GEFActionConstants.ALIGN_CENTER))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.CENTER);
-		if (actionId.equals(GEFActionConstants.ALIGN_RIGHT))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.RIGHT);
-		if (actionId.equals(GEFActionConstants.ALIGN_TOP))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.TOP);
-		if (actionId.equals(GEFActionConstants.ALIGN_MIDDLE))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.MIDDLE);
-		if (actionId.equals(GEFActionConstants.ALIGN_BOTTOM))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.BOTTOM);		
-		if (actionId.equals(ActionIds.ACTION_ALIGN_LEFT))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.LEFT, false);
-		if (actionId.equals(ActionIds.ACTION_ALIGN_CENTER))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.CENTER, false);
-		if (actionId.equals(ActionIds.ACTION_ALIGN_RIGHT))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.RIGHT, false);
-		if (actionId.equals(ActionIds.ACTION_ALIGN_TOP))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.TOP, false);
-		if (actionId.equals(ActionIds.ACTION_ALIGN_MIDDLE))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.MIDDLE, false);
-		if (actionId.equals(ActionIds.ACTION_ALIGN_BOTTOM))
-			return new AlignAction(workbenchPage, actionId, PositionConstants.BOTTOM, false);		
-		
-		if (actionId.equals(ActionIds.ACTION_AUTOSIZE))
-			return new AutoSizeAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_COMPARTMENT_ALL))
-			return AllCompartmentsAction.createShowAllCompartmentsAction(
-				workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_COMPARTMENT_NONE))
-			return AllCompartmentsAction.createHideAllCompartmentsAction(
-				workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ROUTER_RECTILINEAR))
-			return RouterAction.createRectilinearRouterAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ROUTER_OBLIQUE))
-			return RouterAction.createObliqueRouterAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ROUTER_TREE))
-			return RouterAction.createTreeRouterAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_COPY_APPEARANCE_PROPERTIES))
-			return new CopyAppearancePropertiesAction(workbenchPage);
-		if (actionId.equals(ActionFactory.UNDO.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.UNDO);
-		if (actionId.equals(ActionFactory.REDO.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.REDO);
-		if (actionId.equals(ActionFactory.DELETE.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.DELETE);
-		if (actionId.equals(ActionFactory.PROPERTIES.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.PROPERTIES);
-		if (actionId.equals(ActionFactory.CUT.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.CUT);
-		if (actionId.equals(ActionFactory.COPY.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.COPY);
-		if (actionId.equals(ActionFactory.PASTE.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.PASTE);
-		if (actionId.equals("open")) //$NON-NLS-1$
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.OPEN);
-		if (actionId.equals(ActionFactory.PRINT.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.PRINT);
-		if (actionId.equals(ActionFactory.SAVE.getId()))
-			return GlobalActionManager.getInstance().createActionHandler(
-				workbenchPage,
-				GlobalActionId.SAVE);
-		if (actionId.equals(ActionIds.ACTION_FONT_DIALOG))
-			return new FontDialogAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_DELETE_FROM_MODEL)){
-			return new PromptingDeleteFromModelAction(workbenchPage, true);
-		}	
-		if (actionId.equals(ActionIds.ACTION_DELETE_FROM_DIAGRAM)){	
-			return new PromptingDeleteFromDiagramAction(workbenchPage);
-		}	
-		if (actionId.equals(ActionIds.ACTION_RECALC_PAGEBREAKS))
-			return new RecalculatePageBreaksAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SORT_FILTER))
-			return new SortFilterAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SNAP_BACK))
-			return new SnapBackAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SHOW_PROPERTIES_VIEW))
-			return new ShowPropertiesViewAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_ADD_NOTE))
-			return new CreateShapeViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_NOTE, ViewType.NOTE,
-				DiagramUIProvidersMessages.Note_menuItem,
-				SharedImages.DESC_NOTE);
-		if (actionId.equals(ActionIds.ACTION_ADD_TEXT))
-			return new CreateViewAction(workbenchPage,
-				ActionIds.ACTION_ADD_TEXT, ViewType.TEXT,
-				DiagramUIProvidersMessages.Text_menuItem,
-				SharedImages.DESC_TEXT);
-		if (actionId.equals(ActionIds.ACTION_ADD_NOTELINK))
-			return new AddNoteAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SHOW_CONNECTION_LABELS))
-			return new ShowConnectionLabelsAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_HIDE_CONNECTION_LABELS))
-			return new HideConnectionLabelsAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SHOW_COMPARTMENT_TITLE))
-			return new ShowCompartmentTitleAction(workbenchPage);
-
-		// Handle Z-Order Actions
-		if (actionId.equals(ActionIds.ACTION_BRING_TO_FRONT))
-			return ZOrderAction.createBringToFrontAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SEND_TO_BACK))
-			return ZOrderAction.createSendToBackAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_BRING_FORWARD))
-			return ZOrderAction.createBringForwardAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SEND_BACKWARD))
-			return ZOrderAction.createSendBackwardAction(workbenchPage);
-	
-		// Handle View Actions
-		if (actionId.equals(ActionIds.ACTION_VIEW_GRID))
-			return new ViewGridAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_SNAP_TO_GRID))
-			return new SnapToGridAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_VIEW_PAGEBREAKS))
-			return new ViewPageBreaksAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_VIEW_RULERS))
-			return new ViewRulersAction(workbenchPage);
-		
-		// Handle Make Same Size Actions
-		if (actionId.equals(ActionIds.ACTION_MAKE_SAME_SIZE_BOTH))
-			return new SizeBothAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_MAKE_SAME_SIZE_HEIGHT))
-			return new SizeHeightAction(workbenchPage);
-		if (actionId.equals(ActionIds.ACTION_MAKE_SAME_SIZE_WIDTH))
-			return new SizeWidthAction(workbenchPage);
-		if (actionId.equals(ActionIds.OPEN))
-			return new OpenAction(workbenchPage);
-        if (actionId.equals(ActionIds.SELECT_CONNECTION_SOURCE))
-            return new SelectConnectionEndAction(workbenchPage,true);
-        if (actionId.equals(ActionIds.SELECT_CONNECTION_TARGET))
-            return new SelectConnectionEndAction(workbenchPage,false);
-        
-        if (actionId.equals(ActionIds.ACTION_GROUP))
-            return new GroupAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_UNGROUP))
-            return new UngroupAction(workbenchPage);
-        
-        if (actionId.equals(ActionIds.ACTION_TEXT_ALIGNMENT_LEFT))
-            return TextAlignmentAction.createTextAlignmentLeftAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_TEXT_ALIGNMENT_CENTER))
-            return TextAlignmentAction.createTextAlignmentCenterAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_TEXT_ALIGNMENT_RIGHT))
-            return TextAlignmentAction.createTextAlignmentRightAction(workbenchPage);
-        
-        if (actionId.equals(ActionIds.ACTION_LINE_WIDTH_ONE))
-            return LineWidthAction.createLineWidthOneAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_WIDTH_TWO))
-            return LineWidthAction.createLineWidthTwoAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_WIDTH_THREE))
-            return LineWidthAction.createLineWidthThreeAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_WIDTH_FOUR))
-            return LineWidthAction.createLineWidthFourAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_WIDTH_FIVE))
-            return LineWidthAction.createLineWidthFiveAction(workbenchPage);
-        
-        if (actionId.equals(ActionIds.ACTION_LINE_TYPE_SOLID))
-            return LineTypeAction.createLineTypeSolidAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_TYPE_DASH))
-            return LineTypeAction.createLineTypeDashAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_TYPE_DOT))
-            return LineTypeAction.createLineTypeDotAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_TYPE_DASH_DOT))
-            return LineTypeAction.createLineTypeDashDotAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_LINE_TYPE_DASH_DOT_DOT))
-            return LineTypeAction.createLineTypeDashDotDotAction(workbenchPage);
-        
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_SOURCE_NONE))
-            return ArrowTypeAction.createArrowTypeSourceNoneAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_SOURCE_OPEN))
-            return ArrowTypeAction.createArrowTypeSourceOpenAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_SOURCE_SOLID))
-            return ArrowTypeAction.createArrowTypeSourceSolidAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_TARGET_NONE))
-            return ArrowTypeAction.createArrowTypeTargetNoneAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_TARGET_OPEN))
-            return ArrowTypeAction.createArrowTypeTargetOpenAction(workbenchPage);
-        if (actionId.equals(ActionIds.ACTION_ARROW_TYPE_TARGET_SOLID))
-            return ArrowTypeAction.createArrowTypeTargetSolidAction(workbenchPage);
-
-        return super.createAction(actionId, partDescriptor);
-	}
-		
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandler.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandler.java
deleted file mode 100644
index 0098329..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandler.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.GroupRequest;
-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.Trace;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardContentsHelper;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
-import org.eclipse.gmf.runtime.common.ui.action.global.GlobalActionId;
-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.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.CopyCommand;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.requests.PasteViewRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.ui.properties.actions.PropertyPageViewAction;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Class that implements the <code>IGlobalActionHandler</code> interface.
- * Contains behaviour common to GMF diagrams.
- * 
- * @author Vishy Ramaswamy
- */
-public class DiagramGlobalActionHandler
-	extends AbstractGlobalActionHandler {
-
-	/** Remember the "open" commands associated with the selected edit parts. */
-	private ICommand openCommand = null;
-
-	/**
-	 * Constructor for DiagramGlobalActionHandler.
-	 */
-	public DiagramGlobalActionHandler() {
-		super();
-	}
-
-	/*
-	 * (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) {
-		/* Check if the active part is a IDiagramWorkbenchPart */
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			return null;
-		}
-
-		/* Get the model operation context */
-		IDiagramWorkbenchPart diagramPart = (IDiagramWorkbenchPart) part;
-
-		/* Create a command */
-		ICommand command = null;
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.DELETE)) {
-			CompoundCommand deleteCC = getDeleteCommand(diagramPart, cntxt);
-			/* Set the command */
-			if (deleteCC != null && deleteCC.canExecute())
-				command = new CommandProxy(deleteCC);
-		} else if (actionId.equals(GlobalActionId.COPY)) {
-			command = getCopyCommand(cntxt, diagramPart, false);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			command = getCutCommand(cntxt, diagramPart);
-		} else if (actionId.equals(GlobalActionId.OPEN)) {
-			// Open command: use the previously cached command.
-			command = openCommand;
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-
-			PasteViewRequest pasteReq = createPasteViewRequest();
-
-			/* Get the selected edit parts */
-			Object[] objects = ((IStructuredSelection) cntxt.getSelection())
-				.toArray();
-
-			if (objects.length == 1) {
-				/* Send the request to the target edit part of the paste command for the currently selected part */
-				EditPart targetEP = ((EditPart) objects[0]).getTargetEditPart(pasteReq);
-				Command paste = targetEP.getCommand(pasteReq);
-				if (paste != null) {
-					/* Set the command */
-					CommandStack cs = diagramPart.getDiagramEditDomain()
-						.getDiagramCommandStack();
-					cs.execute(paste);
-					diagramPart.getDiagramEditPart().getFigure().invalidate();
-					diagramPart.getDiagramEditPart().getFigure().validate();
-					selectAddedObject(diagramPart.getDiagramGraphicalViewer(),
-						DiagramCommandStack.getReturnValues(paste));
-					return null;
-				}
-			}
-		} else if (actionId.equals(GlobalActionId.SAVE)) {
-			part.getSite().getPage().saveEditor((IEditorPart) diagramPart,
-				false);
-		} else if (actionId.equals(GlobalActionId.PROPERTIES)) {
-			new PropertyPageViewAction().run();
-		}
-
-		return command;
-	}
-
-	/**
-	 * Returns a command to copy the context's selection to the clipboard.
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> from which the label
-	 *            and selection are retrieved.
-	 * @param diagramPart
-	 *            the <code>IDiagramWorkbenchPart</code> from which the
-	 *            diagram is retrieved.
-	 * @param isUndoable
-	 *            true if this command should be undoable/redoable; false
-	 *            otherwise
-	 * @return the copy command
-	 */
-	protected ICommand getCopyCommand(IGlobalActionContext cntxt,
-			IDiagramWorkbenchPart diagramPart, final boolean isUndoable) {
-
-        TransactionalEditingDomain editingDomain = getEditingDomain(diagramPart);
-        
-        if (editingDomain == null) {
-            return null;
-        }
-        
-        return new CopyCommand(editingDomain, cntxt.getLabel(), diagramPart.getDiagram(),
-			getSelectedViews(cntxt.getSelection())) {
-
-			public boolean canUndo() {
-				return isUndoable;
-			}
-
-			public boolean canRedo() {
-				return isUndoable;
-			}
-
-		
-            protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-                if (isUndoable) {
-                    return Status.OK_STATUS;
-			}
-                return super.doUndo(monitor, info);
-            }
-
-			protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-                if (isUndoable) {
-                    return Status.OK_STATUS;
-			}
-                return super.doRedo(monitor, info);
-            }
-		};
-	}
-
-	/**
-	 * Returns a command to copy the context's selection to the clipboard and to
-	 * delete it.
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> from which the label
-	 *            and selection are retrieved.
-	 * @param diagramPart
-	 *            the <code>IDiagramWorkbenchPart</code> from which the
-	 *            diagram is retrieved.
-	 * @return the cut command
-	 */
-	protected ICommand getCutCommand(IGlobalActionContext cntxt,
-			IDiagramWorkbenchPart diagramPart) {
-
-        TransactionalEditingDomain editingDomain = getEditingDomain(diagramPart);
-
-        if (editingDomain == null) {
-            return null;
-        }
-        
-        CompositeTransactionalCommand cut = new CompositeTransactionalCommand(editingDomain, cntxt
-            .getLabel());
-
-		// Add a copy command - the cut must be undoable/redoable
-		cut.compose(getCopyCommand(cntxt, diagramPart, true));
-
-		/* Get the selected edit parts */
-		Object[] objects = ((IStructuredSelection) cntxt.getSelection())
-			.toArray();
-		for (int i = 0; i < objects.length; i++) {
-			/* Get the next part */
-			EditPart editPart = (EditPart) objects[i];
-
-			/* Create the delete request */
-			GroupRequest deleteReq = new GroupRequest(
-				RequestConstants.REQ_DELETE);
-
-			/* Send the request to the edit part */
-			Command deleteCommand = editPart.getCommand(deleteReq);
-
-			/* Add to the compound command */
-			if (deleteCommand != null) {
-				cut.compose(new CommandProxy(deleteCommand));
-			}
-		}
-
-		if (!cut.isEmpty() && cut.canExecute())
-			return cut;
-
-		return null;
-	}
-
-	/**
-	 * Creates and returns the appropriate <code>PasteViewRequest</code> that
-	 * is to be used to get the appropriate paste <code>Command</code> from
-	 * the <code>EditPart</code>. The returned <code>PasteViewRequest</code>
-	 * contains data from the clipboard
-	 * 
-	 * @return PasteViewRequest
-	 */
-	protected PasteViewRequest createPasteViewRequest() {
-		PasteViewRequest pasteReq;
-		ICustomData[] data = ClipboardManager.getInstance().getClipboardData(
-			ClipboardCommand.DRAWING_SURFACE,
-			ClipboardContentsHelper.getInstance());
-		if (data == null) {
-			data = ClipboardManager.getInstance().getClipboardData(
-				ClipboardManager.COMMON_FORMAT,
-				ClipboardContentsHelper.getInstance());
-		}
-		/* Create the paste request */
-		pasteReq = new PasteViewRequest(data);
-		return pasteReq;
-	}
-
-	/**
-	 * Returns appropriate delete command for this context.
-	 * 
-     * @param part the workbench part
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return CompoundCommand command
-	 */
-	private CompoundCommand getDeleteCommand(IDiagramWorkbenchPart part,
-            IGlobalActionContext cntxt) {
-		/* Create the delete request */
-		GroupRequest deleteReq = new GroupRequest(RequestConstants.REQ_DELETE);
-
-		CompoundCommand deleteCC = new CompoundCommand(cntxt.getLabel());
-
-        TransactionalEditingDomain editingDomain = getEditingDomain(part);
-        
-        if (editingDomain == null) {
-            return deleteCC;
-        }
-
-		CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(editingDomain, 
-			cntxt.getLabel());
-		/* Get the selected edit parts */
-		Object[] objects = ((IStructuredSelection) cntxt.getSelection())
-			.toArray();
-		for (int i = 0; i < objects.length; i++) {
-			/* Get the next part */
-			EditPart editPart = (EditPart) objects[i];
-
-			/* Send the request to the edit part */
-			Command command = editPart.getCommand(deleteReq);
-			if (command != null)
-				compositeCommand.compose(new CommandProxy(command));
-			// deleteCC.add(editPart.getCommand(deleteReq));
-		}
-		if (!compositeCommand.isEmpty()) {
-			deleteCC.add(new ICommandProxy(compositeCommand));
-		}
-
-		return deleteCC;
-	}
-
-	private boolean isContainedInViews(List views, View view) {
-		while (view != null) {
-			if (views.contains(view)) {
-				return true;
-			}
-			if (view.eContainer() instanceof View)
-				view = (View) view.eContainer();
-			else
-				break;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the selected <code>View</code> objects, only if the selection
-	 * is an <code>IStructuredSelection</code>. and only the
-	 * <code>View</code> object of an <code>INodeEditPart</code> or a
-	 * <code>ShapeEditPart</code>
-	 * 
-	 * @param sel
-	 *            the selection from which to extract the View objects
-	 * @return List the selected View. Could be empty if the selection doesn't
-	 *         contain proper edit parts, or, could be the original if the
-	 *         selection is not an <code>IStructuredSelection</code>
-	 */
-	protected List getSelectedViews(ISelection sel) {
-		final ArrayList views = new ArrayList();
-		final ArrayList editParts = new ArrayList();
-
-		/* Check if the selection is a structured selection */
-		if (!(sel instanceof IStructuredSelection)) {
-			return views;
-		}
-
-		/* Get the relevant Views */
-		for (Iterator i = ((IStructuredSelection) sel).iterator(); i.hasNext();) {
-			Object object = i.next();
-
-			if (!((object instanceof INodeEditPart) || (object instanceof ShapeEditPart))) {
-				continue;
-			}
-
-			View view = (object instanceof IAdaptable) ? (View) ((IAdaptable) object)
-				.getAdapter(View.class)
-				: null;
-
-			/* Make sure that view is not deleted */
-			if (view != null && view.eResource() != null) {
-				views.add(view);
-				editParts.add(object);
-			}
-		}
-
-		/* Get rid of dangling connections */
-		if (!views.isEmpty()) {
-			try {
-				TransactionUtil.getEditingDomain(views.get(0)).runExclusive(
-					new Runnable() {
-	
-						public void run() {
-							ArrayList objects = (ArrayList) views.clone();
-							for (Iterator i = objects.iterator(); i.hasNext();) {
-								Object object = i.next();
-								if (object instanceof Edge) {
-									Edge view = (Edge) object;
-									View fromView = view.getSource();
-									View toView = view.getTarget();
-									if (fromView == null || toView == null
-										|| !isContainedInViews(views, fromView)
-										|| !isContainedInViews(views, toView)) {
-										views.remove(view);
-									}
-								}
-							}
-						}
-					});
-			} catch (Exception e) {
-				Trace.catching(DiagramProvidersPlugin.getInstance(),
-					DiagramProvidersDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"getSelectedViews()", //$NON-NLS-1$
-					e);
-			}
-		}
-
-		/* Make sure that the selection contains atleast one IShapeView */
-		boolean doesSelectionContainAShapeView = false;
-		for (Iterator i = editParts.iterator(); i.hasNext();) {
-			if (i.next() instanceof ShapeEditPart) {
-				doesSelectionContainAShapeView = true;
-				break;
-			}
-		}
-
-		/* Clear the selection if no shape views are present */
-		if (!doesSelectionContainAShapeView) {
-			views.clear();
-		}
-		return views;
-	}
-
-	/**
-	 * Checks to determine if the selected edit part can be opened.
-	 * <p>
-	 * In order to truly verify that the edit part can be opened, the
-	 * corresponding "open" command must be obtained and tested for execution.
-	 * This command can then be cached for the getCommand() method.
-	 * <p>
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean - indicates an "open" command exists and can be executed
-	 */
-	private boolean canOpen(IGlobalActionContext cntxt) {
-		// Reset any information about the elements to be opened.
-		boolean canOpenAll = true;
-		openCommand = new CompositeCommand(cntxt.getLabel());
-
-		// Since all edit parts are associated with the smae edit domain,
-		// get the model operation context from the first selected edit part.
-		Object[] objects = ((IStructuredSelection) cntxt.getSelection())
-			.toArray();
-
-		// For all of the selected objects until one cannot be opened
-		for (int i = 0; canOpenAll && i < objects.length; i++) {
-			if (objects[i] instanceof EditPart) {
-				// Get the edit part's command for the "open" request.
-				EditPart editPart = (EditPart) objects[i];
-				Request request = new Request(RequestConstants.REQ_OPEN);
-				Command cmd = editPart.getCommand(request);
-
-				// If a command is not available or cannot be executed,
-				if (cmd == null || !cmd.canExecute()) {
-					// Do not allow any of the selected parts to be opened.
-					canOpenAll = false;
-				}
-
-				// else add the command to the composite command.
-				else {
-					openCommand.compose(new CommandProxy(cmd));
-				}
-			}
-
-		}
-
-		if (!canOpenAll) {
-			openCommand = null;
-		}
-		return canOpenAll;
-	}
-
-	/**
-	 * Checks if the selected IViews can be deleted.
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the delete action
-	 */
-	private boolean canDelete(IGlobalActionContext cntxt) {
-
-		// The selectedObjects are not in a container
-		// that is set to canonical, so do a regular check that the
-		// command is not null.
-		return getCommand(cntxt) != null;
-	}
-
-	/**
-	 * Checks if the selected IViews can be copied to the clipboard
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the copy action
-	 */
-	protected boolean canCopy(IGlobalActionContext cntxt) {
-		List elements = getSelectedViews(cntxt.getSelection());
-		/* Make sure the selection is not empty */
-		if (elements.isEmpty()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Checks if the selected IViews can be cut
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the cut action
-	 */
-	protected boolean canCut(IGlobalActionContext cntxt) {
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.CUT)) {
-			ICommand command = getCommand(cntxt);
-			if (command != null && command.canExecute()) {
-				return canCopy(cntxt);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if the paste can occur
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the paste action
-	 */
-	protected boolean canPaste(IGlobalActionContext cntxt) {
-		/* Check if the clipboard has data for the drawing surface */
-		return ClipboardManager.getInstance().doesClipboardHaveData(
-			ClipboardCommand.DRAWING_SURFACE,
-			ClipboardContentsHelper.getInstance())
-			|| (ClipboardManager.getInstance().doesClipboardHaveData(
-				ClipboardManager.COMMON_FORMAT, ClipboardContentsHelper
-					.getInstance()));
-	}
-
-	/**
-	 * Checks if the selected IElements will allow a print
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the print action
-	 */
-	private boolean canPrint() {
-		return true;
-	}
-
-	/**
-	 * Checks if the selected IElements will allow a save. Save should only be
-	 * enabled when no shapes are selected to avoid clutter on the context menu
-	 * and if the editor is dirty.
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return boolean indicating the enablement of the save action
-	 */
-	protected boolean canSave(IGlobalActionContext cntxt) {
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (part instanceof IDiagramWorkbenchPart
-			&& part instanceof IEditorPart && ((IEditorPart) part).isDirty()) {
-			return true;
-		}
-		return false;
-	}
-
-	/*
-	 * (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(final IGlobalActionContext cntxt) {
-		boolean result = false;
-
-		/* 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 result;
-		}
-
-		/* Check the action id */
-		String actionId = cntxt.getActionId();
-		if (actionId.equals(GlobalActionId.DELETE)) {
-			result = canDelete(cntxt);
-		} else if (actionId.equals(GlobalActionId.COPY)) {
-			result = canCopy(cntxt);
-		} else if (actionId.equals(GlobalActionId.CUT)) {
-			result = canCut(cntxt);
-		} else if (actionId.equals(GlobalActionId.OPEN)) {
-			result = canOpen(cntxt);
-		} else if (actionId.equals(GlobalActionId.PASTE)) {
-			result = canPaste(cntxt);
-		} else if (actionId.equals(GlobalActionId.PRINT)) {
-			result = canPrint();
-		} else if (actionId.equals(GlobalActionId.SAVE)) {
-			result = canSave(cntxt);
-		} else if (actionId.equals(GlobalActionId.PROPERTIES)) {
-			result = true;
-		}
-
-		return result;
-	}
-
-	/**
-	 * Select the newly added shape view by default.
-	 * 
-	 * @param viewer
-	 *            the viewer owning the edit parts to be selected
-	 * @param objects
-	 *            the collection of object from which to extract the
-	 *            <code>EditPart</code> to select
-	 */
-	protected void selectAddedObject(EditPartViewer viewer, Collection objects) {
-		final List editparts = new ArrayList();
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			EditPart editPart = getEditPart(viewer, i.next());
-			if (editPart != null && editPart.isSelectable())
-				editparts.add(editPart);
-		}
-		if (!editparts.isEmpty()) {
-			viewer.setSelection(new StructuredSelection(editparts));
-			viewer.reveal((EditPart) editparts.get(0));
-		}
-	}
-
-	private EditPart getEditPart(EditPartViewer viewer, Object object) {
-		if (object instanceof View) {
-			return (EditPart) viewer.getEditPartRegistry().get(object);
-		} else if (object instanceof IAdaptable) {
-			return (EditPart) viewer.getEditPartRegistry().get(
-				((IAdaptable) object).getAdapter(View.class));
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieve the <code>IMapMode</code> object from the
-	 * <code>DiagramRootEditPart</code>
-	 * 
-	 * @param cntxt
-	 *            the <code>IGlobalActionContext</code> holding the necessary
-	 *            information needed by this action handler
-	 * @return <code>IMapMode</code> object that performs coordinate mapping
-	 *         from device to logical. Returns null if the context isn't valid.
-	 */
-	protected IMapMode getMapMode(IGlobalActionContext cntxt) {
-
-		IWorkbenchPart part = cntxt.getActivePart();
-		if (!(part instanceof IDiagramWorkbenchPart)) {
-			RootEditPart rootEP = ((IDiagramWorkbenchPart) part)
-				.getDiagramGraphicalViewer().getRootEditPart();
-			if (rootEP instanceof DiagramRootEditPart) {
-				return ((DiagramRootEditPart) part).getMapMode();
-			}
-		}
-
-		return MapModeUtil.getMapMode();
-	}
-    
-    /**
-     * Gets the transactional editing domain associated with the workbench
-     * <code>part</code>.
-     * 
-     * @param part
-     *            the diagram workbench part
-     * @return the editing domain, or <code>null</code> if there is none.
-     */
-    private TransactionalEditingDomain getEditingDomain(
-            IDiagramWorkbenchPart part) {
-
-        TransactionalEditingDomain result = null;
-
-        IEditingDomainProvider provider = (IEditingDomainProvider) part
-            .getAdapter(IEditingDomainProvider.class);
-
-        if (provider != null) {
-            EditingDomain domain = provider.getEditingDomain();
-
-            if (domain != null && domain instanceof TransactionalEditingDomain) {
-                result = (TransactionalEditingDomain) domain;
-}        }
-
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandlerProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandlerProvider.java
deleted file mode 100644
index 64594fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramGlobalActionHandlerProvider.java
+++ /dev/null
@@ -1,118 +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.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>.
- * 
- * @author Vishy Ramaswamy
- */
-public final class DiagramGlobalActionHandlerProvider
-	extends AbstractGlobalActionHandlerProvider {
-
-	/**
-	 * List that contains all the IGlobalActionHandlers mapped to the
-	 * IWorkbenchParts
-	 */
-	private Hashtable handlerList = new Hashtable();
-
-	/**
-	 * Constructor for DiagramGlobalActionHandlerProvider.
-	 */
-	public DiagramGlobalActionHandlerProvider() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerProvider#getGlobalActionHandler(org.eclipse.gmf.runtime.common.ui.services.action.global.IGlobalActionHandlerContext)
-	 */
-	public IGlobalActionHandler getGlobalActionHandler(
-			final IGlobalActionHandlerContext context) {
-		/* create the handler */
-		if (!getHandlerList().containsKey(context.getActivePart())) {
-			getHandlerList().put(context.getActivePart(),
-				new DiagramGlobalActionHandler());
-			/*
-			 * 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 (DiagramGlobalActionHandler) getHandlerList().get(
-			context.getActivePart());
-	}
-
-	/**
-	 * Returns the handlerList.
-	 * 
-	 * @return Hashtable
-	 */
-	private Hashtable getHandlerList() {
-		return handlerList;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/LeftRightProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/LeftRightProvider.java
deleted file mode 100644
index fd21b74..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/LeftRightProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider;
-
-/**
- * @author sshaw
- *
- * Custom provider that lays out the directed graph in a left to right fashion.
- */
-public class LeftRightProvider extends DefaultProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateToGraph(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	protected Rectangle translateToGraph(Rectangle r) {
-		Rectangle rDP = r.getCopy();
-		return rDP;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateFromGraph(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	protected Rectangle translateFromGraph(Rectangle rect) {
-		Rectangle rLP = rect.getCopy();
-		return rLP;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createGraph()
-	 */
-	protected DirectedGraph createGraph() {
-		DirectedGraph g = super.createGraph();
-		g.setDirection(PositionConstants.WEST);
-		return g;
-	}
-	
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/TopDownProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/TopDownProvider.java
deleted file mode 100644
index 27b8941..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/TopDownProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-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.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider;
-
-/**
- * @author sshaw
- *
- * Custom provider that lays out the directed graph in a top to down fashion.
- */
-public class TopDownProvider extends DefaultProvider {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateToGraph(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	protected Rectangle translateToGraph(Rectangle r) {
-		Rectangle rDP = r.getCopy();
-		return rDP;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#translateFromGraph(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	protected Rectangle translateFromGraph(Rectangle rect) {
-		Rectangle rLP = rect.getCopy();
-		return rLP;
-	}
-	
-	public Command layoutEditParts(List selectedObjects, IAdaptable layoutHint) {
-		return super.layoutEditParts(selectedObjects, layoutHint);
-	}
-	
-	protected Command createEdgesChangeBoundsCommands(DirectedGraph g, Point diff) {
-		return super.createEdgesChangeBoundsCommands(g, diff);
-	}
-	
-	protected Command createNodeChangeBoundCommands(DirectedGraph g, Point diff) {
-		return super.createNodeChangeBoundCommands(g, diff);
-	}
-	
-	protected Rectangle getNodeMetrics(Node n) {
-		return super.getNodeMetrics(n);
-	}
-	
-	protected void setLayoutDefaultMargin(int newMargin) {
-		layoutDefaultMargin = newMargin;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/BookmarkDecorator.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/BookmarkDecorator.java
deleted file mode 100644
index 8df9257..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/BookmarkDecorator.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-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.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.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-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.common.ui.resources.FileChangeManager;
-import org.eclipse.gmf.runtime.common.ui.resources.IFileObserver;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n.DiagramUIProvidersPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;
-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.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Provides bookmark decorations for views 
- * 
- * @author Michael Yee
- */
-public class BookmarkDecorator
-	extends AbstractDecorator {
-
-	/**
-	 * Listner class for bookmark decorators
-	 */
-	public class BookmarkObserver
-		implements IFileObserver {
-		/**
-		 * Map of id's and their list of decorators
-		 */
-		private HashMap mapOfIdsToDecorators = null;
-
-		/**
-		 * Flag to indicate if already registered with the file change manager
-		 */
-		private boolean isRegistered = false;
-		
-		/**
-		 * Registers the specified decorator. Nothing happens if already
-		 * registered. The decorator is registered against its view id
-		 * 
-		 * @param decorator the input bookmark decorator
-		 */
-		private void registerDecorator(BookmarkDecorator decorator) {
-			/* Return if invalid decorator */
-			if ( decorator == null ) {
-				return;
-			}
-			
-			/* Initialize the map */
-			if ( mapOfIdsToDecorators == null ) {
-				mapOfIdsToDecorators = new HashMap();
-			}			
-
-			/* Return if the decorator has invalid view id */
-			String decoratorViewId = decorator.getViewId();
-			if ( decoratorViewId == null ) {
-				return;
-			}
-			
-			/* Add to the list */
-			List list = (List)mapOfIdsToDecorators.get(decoratorViewId);
-			if (list == null) {
-				list = new ArrayList(2);
-				list.add(decorator);
-				mapOfIdsToDecorators.put(decoratorViewId, list);
-			} else if (!list.contains(decorator)) {
-				list.add(decorator);
-			}
-			
-			/* Register with the file change manager */
-			if ( !isRegistered() ) {
-				FileChangeManager.getInstance().addFileObserver(this);
-				isRegistered = true;
-			}
-		}
-
-		/**
-		 * Unregisters the specified decorator. Nothing happens if already
-		 * unregistered.
-		 * 
-		 * @param decorator the input bookmark decorator
-		 */
-		private void unregisterDecorator(BookmarkDecorator decorator) {
-			/* Return if invalid decorator */
-			if ( decorator == null ) {
-				return;
-			}
-			
-			/* Return if the decorator has invalid view id */
-			String decoratorViewId = decorator.getViewId();
-			if ( decoratorViewId == null ) {
-				return;
-			}
-			
-			if (mapOfIdsToDecorators != null) {
-				List list = (List)mapOfIdsToDecorators.get(decoratorViewId);
-				if ( list != null ) {
-					list.remove(decorator);
-					if ( list.isEmpty()) {
-						mapOfIdsToDecorators.remove(decoratorViewId);
-					}				
-				}
-				
-				if ( mapOfIdsToDecorators.isEmpty() ) {
-					mapOfIdsToDecorators = null;
-				}			
-			}
-			
-			if (mapOfIdsToDecorators == null) {
-				/* Unregister with the file change manager */
-				if ( isRegistered() ) {
-					FileChangeManager.getInstance().removeFileObserver(this);
-					isRegistered = false;
-				}			
-			}			
-		}
-		
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleFileRenamed(org.eclipse.core.resources.IFile, org.eclipse.core.resources.IFile)
-		 */
-		public void handleFileRenamed(IFile oldFile, IFile file) {
-			//Empty Code
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleFileMoved(org.eclipse.core.resources.IFile, org.eclipse.core.resources.IFile)
-		 */
-		public void handleFileMoved(IFile oldFile, IFile file) {
-			//Empty Code
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleFileDeleted(org.eclipse.core.resources.IFile)
-		 */
-		public void handleFileDeleted(IFile file) {
-			//Empty Code
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleFileChanged(org.eclipse.core.resources.IFile)
-		 */
-		public void handleFileChanged(IFile file) {
-			//Empty Code
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleMarkerAdded(org.eclipse.core.resources.IMarker)
-		 */
-		public void handleMarkerAdded(IMarker marker) {
-			//Empty Code
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleMarkerDeleted(org.eclipse.core.resources.IMarker, java.util.Map)
-		 */
-		public void handleMarkerDeleted(IMarker marker, final Map attributes) {
-			if ( mapOfIdsToDecorators == null || attributes == null) {
-				return;
-			}
-			
-			Assert.isTrue(!marker.exists());
-			// Extract the element guid from the marker and retrieve
-			// corresponding view
-            String elementId = (String) attributes
-            .get(IBookmark.ELEMENT_ID);
-            List list = elementId != null ? (List)mapOfIdsToDecorators.get(elementId) : null;
-            if ( list != null && !list.isEmpty() ) {
-                refreshDecorators(list);
-            }
-		}
-
-		/*
-		 * @see org.eclipse.gmf.runtime.common.ui.resources.IFileObserver#handleMarkerChanged(org.eclipse.core.resources.IMarker)
-		 */
-		public void handleMarkerChanged(final IMarker marker) {
-			if ( mapOfIdsToDecorators == null ) {
-				return;
-			}
-			
-			Assert.isTrue(marker.exists());
-			// Extract the element ID list from the marker and retrieve
-			// corresponding view
-            
-            String elementId = marker.getAttribute(
-                IBookmark.ELEMENT_ID, StringStatics.BLANK);
-            List list = elementId != null ? (List)mapOfIdsToDecorators.get(elementId) : null;
-            
-            if ( list != null && !list.isEmpty() ) {
-                refreshDecorators(list);
-            }
-		}
-        
-        /**
-         * Refreshes decorators asynchronously on the UI thread (required
-         * because GEF can only be used on the UI thread) so that getting a read
-         * transaction won't contribute to deadlock while the workspace is
-         * locked.
-         * 
-         * @param decorators
-         *            the decorators to be refreshed
-         */
-        private void refreshDecorators(final List decorators) {
-            DisplayUtils.getDisplay().asyncExec(new Runnable() {
-                public void run() {
-                    try {
-                        TransactionUtil.getEditingDomain(
-                            getDecoratorTarget().getAdapter(View.class)).runExclusive(
-                            new Runnable() {
-    
-                            public void run() {
-                                Iterator iter = decorators.iterator();
-                                while (iter.hasNext()) {
-                                    IDecorator decorator = (IDecorator)iter.next();
-                                    if ( decorator != null ) {
-                                        decorator.refresh();
-                                    }
-                                }
-                            }
-                        });
-                    } catch (Exception e) {
-                        Trace.catching(DiagramProvidersPlugin.getInstance(),
-                            DiagramProvidersDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                            "refreshDecorators()", //$NON-NLS-1$
-                            e);
-                    }
-                }
-            });
-        }
-		
-		/**
-		 * Returns the flag if this observer is registered
-		 * @return the isRegistered.
-		 */
-		private boolean isRegistered() {
-			return isRegistered;
-		}
-	}
-	
-	/**
-	 * Resource listener for bookmark creation and removal 
-	 */
-	private static BookmarkObserver fileObserver = null;
-	
-	/**
-	 * Attribute for the view id
-	 */
-	private String viewId = null;
-	
-	/**
-	 * Creates a new <code>BookmarkDecorator</code>.
-	 * @param decoratorTarget
-	 */
-	public BookmarkDecorator(IDecoratorTarget decoratorTarget) {
-		super(decoratorTarget);
-
-		/* Set the id */		
-		try {
-			final View view = (View) getDecoratorTarget().getAdapter(View.class);
-			TransactionUtil.getEditingDomain(view).runExclusive(new Runnable() {
-
-				public void run() {
-
-					BookmarkDecorator.this.viewId = view != null ? ViewUtil
-						.getIdStr(view)
-						: null;
-				}
-				});
-		} catch (Exception e) {
-			Trace.catching(DiagramProvidersPlugin.getInstance(),
-				DiagramProvidersDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"BookmarkDecorator::Constructor", //$NON-NLS-1$
-				e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#refresh()
-	 */
-	public void refresh() {
-		removeDecoration();
-
-		View view = (View) getDecoratorTarget().getAdapter(View.class);
-		EditPart editPart = (EditPart) getDecoratorTarget().getAdapter(
-			EditPart.class);
-		if (!(editPart instanceof IPrimaryEditPart) || view == null || view.eResource()==null) {
-			return;
-		}
-
-		IResource resource = getResource(view);
-		// make sure we have a resource and that it exists in an open project
-		if (resource == null || !resource.exists()) {
-			return;
-		}
-
-		// query for all the bookmarks of the current resource
-		IMarker[] bookmarks = null;
-		try {
-			bookmarks = resource.findMarkers(IBookmark.TYPE, true,
-				IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-			Trace.catching(DiagramProvidersPlugin.getInstance(),
-				DiagramProvidersDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getDecorations", e); //$NON-NLS-1$
-			Log.error(DiagramProvidersPlugin.getInstance(), IStatus.ERROR, e
-				.getMessage());
-		}
-		if (bookmarks == null) {
-			return;
-		}
-
-		// find the bookmark containing the element's GUID
-		IMarker foundMarker = null;
-		String elementId = ((XMLResource) view.eResource()).getID(view);
-		if (elementId == null) {
-			return;
-		}
-		
-		for (Iterator i = Arrays.asList(bookmarks).iterator(); i.hasNext();) {
-			IMarker marker = (IMarker) i.next();
-			String attribute = marker.getAttribute(IBookmark.ELEMENT_ID,
-				StringStatics.BLANK);
-			if (attribute.equals(elementId)) {
-				foundMarker = marker;
-				break;
-			}
-		}
-		if (foundMarker == null) {
-			return;
-		}
-
-		// add the bookmark decoration
-		if (editPart instanceof ShapeEditPart) {
-			IMapMode mm = MapModeUtil.getMapMode(((ShapeEditPart)editPart).getFigure());
-			setDecoration(getDecoratorTarget().addShapeDecoration(
-				DiagramUIProvidersPluginImages.get(DiagramUIProvidersPluginImages.IMG_BOOKMARK),
-				IDecoratorTarget.Direction.NORTH_EAST, mm.DPtoLP(-4), true));
-		} else if (view instanceof Edge) {
-			setDecoration(getDecoratorTarget().addConnectionDecoration(
-				DiagramUIProvidersPluginImages.get(DiagramUIProvidersPluginImages.IMG_BOOKMARK), 50, true));
-		}
-	}
-
-	/**
-	 * Gets the underlying resource of the given view
-	 * @param view the given view
-	 * @return the view's resource, otherwise <code>null</code>
-	 */
-	private static IResource getResource(View view) {
-		Resource model = view.eResource();
-		if (model != null) {
-           return WorkspaceSynchronizer.getFile(model);
-		}
-		return null;
-	}
-
-	/** 
-	 * Starts listening to events on the decoratorTarget element's container.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#activate()
-	 */
-	public void activate() {
-		View view = (View) getDecoratorTarget().getAdapter(View.class);
-		if (view == null) return;
-		Diagram diagramView = view.getDiagram();
-		if (diagramView == null) return;
-		IFile file = WorkspaceSynchronizer.getFile(diagramView.eResource());
-		// It does not make sense to add a file observer if the resource
-		//  is not persisted or the uri is not in the form of file:///
-		if (file != null) {
-			if ( fileObserver == null ) {
-				fileObserver = new BookmarkObserver();
-			}
-
-			fileObserver.registerDecorator(this);
-		}
-	}
-
-	/**
-	 * Stops the listener and removes the decoration if it is being displayed.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#deactivate()
-	 */
-	public void deactivate() {
-		if ( fileObserver != null ) {
-			fileObserver.unregisterDecorator(this);
-			if (!fileObserver.isRegistered()) {
-				fileObserver = null;
-			}
-		}
-	
-		super.deactivate();
-	}
-	
-	/**
-	 * Returns the view id
-	 * @return the viewId.
-	 */
-	private String getViewId() {
-		return viewId;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompositeLayoutProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompositeLayoutProvider.java
deleted file mode 100644
index 09ed3d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompositeLayoutProvider.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 243888
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.internal;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-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.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.CompoundDirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.draw2d.graph.Subgraph;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-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.draw2d.ui.graph.ConstantSizeNode;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graph.AdvancedSubGraph;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graph.CompositeDirectedGraphLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graph.VirtualNode;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Provider that creates a command for the CompoundDirectedGraph layout in GEF.
- * 
- * @author mmostafa
- * 
- */
-
-public abstract class CompositeLayoutProvider
-    extends DefaultProvider {
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#build_nodes(java.util.List, java.util.Map, org.eclipse.draw2d.graph.Subgraph)
-     * @deprecated
-     */
-    protected NodeList build_nodes(List selectedObjects,
-            Map editPartToNodeDict, Subgraph rootGraph) {
-    	return buildNodes(selectedObjects, editPartToNodeDict, rootGraph);
-    }
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#buildNodes(java.util.List, java.util.Map, org.eclipse.draw2d.graph.Subgraph)
-     */
-    protected NodeList buildNodes(List selectedObjects,
-            Map editPartToNodeDict, Subgraph rootGraph) {
-        ListIterator li = selectedObjects.listIterator();
-        NodeList nodes = new NodeList();
-        while (li.hasNext()) {
-            IGraphicalEditPart gep = (IGraphicalEditPart) li.next();
-            boolean hasChildren = hasChildren(gep);
-            if (!(gep instanceof IBorderItemEditPart)
-                && (gep instanceof ShapeEditPart || gep instanceof ShapeCompartmentEditPart)) {
-                GraphicalEditPart ep = (GraphicalEditPart) gep;
-                Point position = ep.getFigure().getBounds().getLocation();
-                if (minX == -1) {
-                    minX = position.x;
-                    minY = position.y;
-                } else {
-                    minX = Math.min(minX, position.x);
-                    minY = Math.min(minY, position.y);
-                }
-                Node n = null;
-                if (hasChildren && !(gep instanceof GroupEditPart)) {
-                    AdvancedSubGraph subGraph = null;
-                    if (rootGraph != null)
-                        subGraph = new AdvancedSubGraph(ep, rootGraph);
-                    else
-                        subGraph = new AdvancedSubGraph(ep);
-                    subGraph.setAutoSize(isAutoSizeOn(subGraph,ep));
-                    if (gep instanceof CompartmentEditPart){
-                        subGraph.setHasBufferedZone(true);
-                    }
-                    subGraph.setDirection(getLayoutDirection(ep));
-                    n = subGraph;
-                } else {
-                    if (rootGraph != null)
-                        n = new ConstantSizeNode(ep, rootGraph);
-                    else
-                        n = new ConstantSizeNode(ep);
-                }
-                adjustNodePadding(n, editPartToNodeDict);
-                Dimension size = ep.getFigure().getBounds().getSize();
-                setNodeMetrics(n, new Rectangle(position.x, position.y,
-                    size.width, size.height));
-                editPartToNodeDict.put(ep, n);
-                nodes.add(n);
-                if (hasChildren && !(gep instanceof GroupEditPart)) {
-                    buildNodes(gep.getChildren(), editPartToNodeDict,
-                        (Subgraph) n);
-                }
-                if (n instanceof ConstantSizeNode) {
-                    buildBorderNodes(gep, (ConstantSizeNode)n, editPartToNodeDict);                	
-                }
-            }
-        }
-        return nodes;
-    }
-    
-    /**
-     * Gets the layout direction for an editpart. Every editpart mapped to 
-     * <code>AdvancedSubGraph</code> will be asked for its desired layout direction
-     * such that children of the subgraph are laid out accordingly to that direction.
-     * 
-     * @param ep the editpart
-     */
-    protected int getLayoutDirection(GraphicalEditPart ep) {
-    	return PositionConstants.SOUTH;
-    }
-
-    private boolean isAutoSizeOn(AdvancedSubGraph subGraph, IGraphicalEditPart gEP) {
-        if (gEP instanceof CompartmentEditPart && subGraph.getParent() instanceof AdvancedSubGraph){
-            if (((AdvancedSubGraph)subGraph.getParent()).isAutoSize())
-                return true;
-        }else {
-            View notationView = gEP.getNotationView();
-            if (notationView !=null && notationView instanceof org.eclipse.gmf.runtime.notation.Node){
-                org.eclipse.gmf.runtime.notation.Node node = (org.eclipse.gmf.runtime.notation.Node)notationView;
-                LayoutConstraint contraint = node.getLayoutConstraint();
-                if (contraint instanceof Size){
-                    Size size = (Size)contraint;
-                    if (size.getHeight() != -1 || size.getWidth()!=-1){
-                        return false;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createGraphLayout()
-     */
-    protected DirectedGraphLayout createGraphLayout() {
-        return new CompositeDirectedGraphLayout();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createNodeChangeBoundCommands(org.eclipse.draw2d.graph.DirectedGraph, org.eclipse.draw2d.geometry.Point)
-     */
-    protected Command createNodeChangeBoundCommands(DirectedGraph g, Point diff) {
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-        NodeList list = new NodeList();
-        NodeList subGraphs = ((CompoundDirectedGraph) g).nodes;
-        list.addAll(subGraphs);
-        for (Iterator iter = subGraphs.iterator(); iter.hasNext();) {
-            Node element = (Node) iter.next();
-            if (element instanceof Subgraph)
-                list.addAll(getAllMembers((Subgraph) element));
-        }
-        createSubCommands(diff, list.listIterator(), cc);
-        if (cc.isEmpty())
-            return null;
-        return cc;
-    }
-
-    private Collection getAllMembers(Subgraph element) {
-        NodeList list = new NodeList();
-        list.addAll(element.members);
-        for (Iterator iter = element.members.iterator(); iter.hasNext();) {
-            Node node = (Node) iter.next();
-            if (node instanceof Subgraph)
-                list.addAll(getAllMembers((Subgraph) node));
-        }
-        return list;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#getNodeMetrics(org.eclipse.draw2d.graph.Node)
-     */
-    protected Rectangle getNodeMetrics(Node n) {
-        Rectangle rect = null;
-        if (n.getParent() instanceof VirtualNode) {
-            Node parent = n.getParent();
-            rect = new Rectangle(n.x + parent.x, n.y + parent.y, n.width,
-                n.height);
-        } else
-            rect = new Rectangle(n.x, n.y, n.width, n.height);
-        return translateFromGraph(rect);
-    }
-    
-    protected void postProcessGraph(DirectedGraph g, Hashtable editPartToNodeDict) {
-        //default do nothing
-    }
-    
-    /**
-     * @param gep
-     * @return
-     */
-    protected boolean hasChildren(IGraphicalEditPart gep) {
-        List children = gep.getChildren();
-        boolean hasChildren = false;
-        if (!children.isEmpty()){
-            for (Iterator iter = children.iterator(); iter.hasNext() && !hasChildren;) {
-                Object element = iter.next();
-                if (!(element instanceof IBorderItemEditPart) &&
-                        ( element instanceof ShapeEditPart ||
-                          element instanceof ShapeCompartmentEditPart)){
-                    hasChildren = true;
-                }else
-                    hasChildren = hasChildren((IGraphicalEditPart)element);
-            }
-        }
-        return hasChildren;
-    }
-    
-    /**
-     * this method will adjust the passed node Padding; the default implementatio 
-     * will use a fixed Padding then it will consider adding extra Padding if the 
-     * node parent is not a direct parent
-     * clients can override this method to change the behaviour
-     * @param node the node to adust the padding for
-     */
-    protected void adjustNodePadding(Node node,Map editPartToNodeDict) {
-        Insets padding  = new Insets(getMapMode().DPtoLP(NODE_PADDING));
-        GraphicalEditPart ep = (GraphicalEditPart)node.data;
-        // check if the direct parent is added already to the graph
-        GraphicalEditPart parent = (GraphicalEditPart)ep.getParent();
-        if (parent != null &&
-            node.getParent() != null &&
-            editPartToNodeDict.get(parent)!=node.getParent()){
-            // now the direct parent is not added to the graph so, we had 
-            // to adjust the padding of the node to consider the parent
-            IFigure thisFigure = parent.getFigure();
-            IFigure parentFigure = ((GraphicalEditPart)node.getParent().data).getFigure();
-            Point parentLocation = parentFigure.getBounds().getLocation();
-            Point nodeLocation = thisFigure.getBounds().getLocation();
-            thisFigure.translateToAbsolute(nodeLocation);
-            parentFigure.translateToAbsolute(parentLocation);
-            Dimension delta = nodeLocation.getDifference(parentLocation);
-            Rectangle rect = translateToGraph(new Rectangle(delta.width , delta.height , 0 , 0));
-            padding.top  += rect.y ;
-            padding.left += rect.x;
-        }
-        node.setPadding(padding);
-        if (node instanceof ConstantSizeNode) {
-        	ConstantSizeNode cn = (ConstantSizeNode) node;
-            cn.setMinIncomingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-            cn.setMinOutgoingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-        }
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createGraph()
-     */
-    protected DirectedGraph createGraph(){
-        return new CompoundDirectedGraph();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#shouldHandleConnectableListItems()
-     */
-    protected boolean shouldHandleConnectableListItems() {
-        return true;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#routeThrough(org.eclipse.draw2d.graph.Edge, org.eclipse.gef.ConnectionEditPart, org.eclipse.draw2d.graph.Node, org.eclipse.draw2d.graph.Node, org.eclipse.draw2d.geometry.PointList, org.eclipse.draw2d.geometry.Point)
-	 */
-	protected Command routeThrough(Edge edge, ConnectionEditPart connectEP,
-			Node source, Node target, PointList points, Point diff) {
-		Node parent = source.getParent();
-		if (parent == null) {
-			parent = target.getParent();
-		}
-		if (parent != null) {
-			Point parentLocation = getNodeMetrics(parent).getLocation();
-			points.translate(parentLocation.x, parentLocation.y);
-		}
-		return super
-				.routeThrough(edge, connectEP, source, target, points, diff);
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompoundLayoutProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompoundLayoutProvider.java
deleted file mode 100644
index d601531..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/CompoundLayoutProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-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.draw2d.graph.CompoundDirectedGraph;
-import org.eclipse.draw2d.graph.CompoundDirectedGraphLayout;
-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;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-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;
-
-public abstract class CompoundLayoutProvider
-    extends CompositeLayoutProvider {
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#build_nodes(java.util.List, java.util.Map, org.eclipse.draw2d.graph.Subgraph)
-     */
-    protected NodeList build_nodes(List selectedObjects, Map editPartToNodeDict, Subgraph rootGraph) {
-        ListIterator li = selectedObjects.listIterator();
-        NodeList nodes = new NodeList();
-        while (li.hasNext()) {
-            IGraphicalEditPart gep = (IGraphicalEditPart) li.next();
-            boolean hasChildren  = hasChildren(gep);
-            if (!(gep instanceof IBorderItemEditPart) &&
-                 ( gep instanceof ShapeEditPart ||
-                   gep instanceof ShapeCompartmentEditPart)) {
-                GraphicalEditPart ep = (GraphicalEditPart) gep;
-                Point position = ep.getFigure().getBounds().getLocation();
-                if (minX == -1) {
-                    minX = position.x;
-                    minY = position.y;
-                } else {
-                    minX = Math.min(minX, position.x);
-                    minY = Math.min(minY, position.y);
-                }
-                Node n = null;
-                if (hasChildren){
-                    if (rootGraph!=null)
-                        n = new Subgraph(ep,rootGraph);
-                    else
-                        n = new Subgraph(ep);
-                }
-                else{
-                    if (rootGraph!=null)
-                        n = new Node(ep,rootGraph);
-                    else
-                        n = new Node(ep);
-                }
-                adjustNodePadding(n,editPartToNodeDict);
-                Dimension size = ep.getFigure().getBounds().getSize();
-                setNodeMetrics(n, new Rectangle(position.x, position.y,
-                    size.width, size.height));
-                editPartToNodeDict.put(ep, n);
-                nodes.add(n);
-                if (hasChildren){
-                    nodes.addAll(build_nodes(gep.getChildren(),editPartToNodeDict,(Subgraph)n));
-                }
-            }
-        }
-        return nodes;
-    }
-
-    
-
-       /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createGraphLayout()
-     */
-    protected DirectedGraphLayout createGraphLayout() {
-        return new CompoundDirectedGraphLayout();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.internal.DefaultProvider#createChangeBoundsCommands(org.eclipse.draw2d.graph.DirectedGraph, org.eclipse.draw2d.geometry.Point)
-     */
-    protected Command createNodeChangeBoundCommands(DirectedGraph g, Point diff) {
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-        ListIterator vi = ((CompoundDirectedGraph)g).subgraphs.listIterator();
-        createSubCommands(diff, vi, cc);
-        vi = g.nodes.listIterator();
-        createSubCommands(diff, vi, cc);
-        if (cc.isEmpty())
-            return null;
-        return cc;
-    }
-
-    protected void postProcessGraph(DirectedGraph g, Hashtable editPartToNodeDict) {
-        EdgeList edges = g.edges;
-        NodeList nodes = g.nodes;
-        virtualNodesToNodes virtualNodesNodes = new virtualNodesToNodes();
-        for (Iterator edgeIter = edges.iterator(); edgeIter.hasNext();) {
-            Edge element = (Edge) edgeIter.next();
-            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 Subgraph(null,source.getParent());
-                sg.setPadding(new Insets(0));
-                nodes.add(sg);
-            }
-            if (!sourceHandled){
-                addNode(sg, source);
-                virtualNodesNodes.addNode(sg, source);
-            }
-            if (!targetHandled){
-                addNode(sg, target);
-                virtualNodesNodes.addNode(sg, target);
-            }
-        }
-        
-        for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-            Node element = (Node) iter.next();
-            if (element.getParent() !=null &&
-                element instanceof Subgraph &&
-                element.data == null &&
-                element.getParent().members.size()==1){
-                Subgraph sg = (Subgraph)element;
-                sg.getParent().members.remove(0);
-                sg.getParent().members.addAll(sg.members);
-                for (Iterator iterator = sg.getParent().members.iterator(); iterator
-                    .hasNext();) {
-                    Node node = (Node) iterator.next();
-                    node.setParent(sg.getParent());
-                }
-                
-                iter.remove();
-            }
-        }
-    }
-    
-    private void addNode(Subgraph parent, Node node) {
-        if (node.getParent()!=null){
-            node.getParent().members.remove(node);
-        }
-        node.setParent(parent);
-        parent.addMember(node);
-    }
-        
-    private class virtualNodesToNodes extends HashMap {
-		private static final long serialVersionUID = 8408938537765815482L;
-		
-		Set virtualNodes = new HashSet();
-        public void addNode(Subgraph sg, Node node){
-            virtualNodes.add(sg);
-            put(node, sg);
-        }
-        
-        public Subgraph getVirtualContainer(Node node){
-            return (Subgraph)get(node);
-        }
-        
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DefaultProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DefaultProvider.java
deleted file mode 100644
index 485c608..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DefaultProvider.java
+++ /dev/null
@@ -1,1310 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 243888
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.providers.internal;
-
-import java.security.InvalidParameterException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionDimension;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-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;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-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.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-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.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionAnchorsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart;
-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.editparts.ListItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutNodesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.SetAllBendpointRequest;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-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.PrecisionPointList;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.BorderNode;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.ConstantSizeNode;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.ConstrainedEdge;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.GMFDirectedGraphLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Provider that creates a command for the DirectedGraph layout in GEF.
- * 
- * @author sshaw
- * 
- */
-public abstract class DefaultProvider
-    extends AbstractLayoutEditPartProvider {
-
-    // Minimum sep between icon and bottommost horizontal arc
-    protected int minX = -1;
-    protected int minY = -1;
-    protected int layoutDefaultMargin = 0;
-    protected IMapMode mm;
-    
-    protected static final int NODE_PADDING = 30;
-    protected static final int MIN_EDGE_PADDING = 15;
-    protected static final int MAX_EDGE_PADDING = NODE_PADDING * 3;
-    protected static final int MIN_EDGE_END_POINTS_PADDING = 5;
-    
-
-    
-    /**
-     * @return the <code>IMapMode</code> that maps coordinates from
-     * device to logical and vice-versa.
-     */
-    protected IMapMode getMapMode() {
-        return mm;
-    }
-
-    /* (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) {
-        Assert.isNotNull(operation);
-
-        View cview = getContainer(operation);
-        if (cview == null)
-            return false;
-
-        IAdaptable layoutHint = ((LayoutNodesOperation) operation)
-            .getLayoutHint();
-        String layoutType = (String) layoutHint.getAdapter(String.class);
-        return LayoutType.DEFAULT.equals(layoutType);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider#layoutEditParts(org.eclipse.gef.GraphicalEditPart, org.eclipse.core.runtime.IAdaptable)
-     */
-    public Command layoutEditParts(GraphicalEditPart containerEditPart,
-            IAdaptable layoutHint) {
-        if (containerEditPart == null) {
-            InvalidParameterException ipe = new InvalidParameterException();
-            Trace.throwing(DiagramProvidersPlugin.getInstance(),
-                DiagramProvidersDebugOptions.EXCEPTIONS_THROWING, getClass(),
-                "layout()", //$NON-NLS-1$
-                ipe);
-            throw ipe;
-        }
-        mm = MapModeUtil.getMapMode(containerEditPart.getFigure());
-        // setup graph
-        DirectedGraph g = createGraph();
-        buildGraph(g, containerEditPart.getChildren());
-        createGraphLayout().visit(g);
-        // update the diagram based on the graph
-        Command cmd = update_diagram(containerEditPart, g, false);
-        
-        // reset mm mapmode to avoid memory leak
-        mm = null;
-        return cmd;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider#layoutEditParts(java.util.List, org.eclipse.core.runtime.IAdaptable)
-     */
-    public Command layoutEditParts(List selectedObjects, IAdaptable layoutHint) {
-
-        if (selectedObjects.size() == 0) {
-            return null;
-        }
-
-        // get the container edit part for the children
-        GraphicalEditPart editPart = (GraphicalEditPart) selectedObjects.get(0);
-        GraphicalEditPart containerEditPart = (GraphicalEditPart) editPart
-            .getParent();
-
-        mm = MapModeUtil.getMapMode(containerEditPart.getFigure());
-        
-        DirectedGraph g = createGraph();
-        buildGraph(g, selectedObjects);
-        createGraphLayout().visit(g);
-        // update the diagram based on the graph
-        Command cmd = update_diagram(containerEditPart, g, true);
-        
-        // reset mm mapmode to avoid memory leak
-        mm = null;
-        return cmd;
-    }
-
-    /**
-     * layoutTopDown Utility function that is commonly subclasses by domain
-     * specific layouts to determine whether a specific connection type is layed
-     * out in a top down manner.
-     * 
-     * @param poly
-     *            <code>ConnectionEditPart</code> to determine whether it is to be layed
-     *            out in a top-down fashion.
-     * @return true if connection is to be layed out top-down, false otherwise.
-     */
-    protected boolean layoutTopDown(ConnectionEditPart poly) {
-        return false;
-    }
-
-    /**
-     * build_nodes Method to build up the nodes in the temporary Graph structure
-     * which the algorithm is executed on.
-     * 
-     * @param selectedObjects
-     *            List of selected objects to be layed out.
-     * @param editPartToNodeDict
-     *            Map of editparts from the GEF to the temporary Nodes used for
-     *            layout.
-     * @return NodeList list of Nodes that is passed to the graph structure.
-     * @deprecated
-     * @see DefaultProvider#buildNodes(List, Map, Subgraph)
-     */
-    protected NodeList build_nodes(List selectedObjects, Map editPartToNodeDict, Subgraph root) {
-        return buildNodes(selectedObjects, editPartToNodeDict, root);
-    }
- 
-    /**
-     * build_nodes Method to build up the nodes in the temporary Graph structure
-     * which the algorithm is executed on.
-     * 
-     * @param selectedObjects
-     *            List of selected objects to be layed out.
-     * @param editPartToNodeDict
-     *            Map of editparts from the GEF to the temporary Nodes used for
-     *            layout.
-     * @return NodeList list of Nodes that is passed to the graph structure.
-     */
-    protected NodeList buildNodes(List selectedObjects, Map editPartToNodeDict, Subgraph root) {
-        ListIterator li = selectedObjects.listIterator();
-
-        NodeList nodes = new NodeList();
-
-        while (li.hasNext()) {
-
-            IGraphicalEditPart gep = (IGraphicalEditPart) li.next();
-            if (gep instanceof ShapeEditPart) {
-
-                ShapeEditPart shapeEP = (ShapeEditPart) gep;
-
-                Point position = shapeEP.getLocation();
-
-                // determine topleft most point, layout of items will be placed
-                // starting at topleft point
-                if (minX == -1) {
-                    minX = position.x;
-                    minY = position.y;
-                } else {
-                    minX = Math.min(minX, position.x);
-                    minY = Math.min(minY, position.y);
-                }
-                
-
-                ConstantSizeNode n = new ConstantSizeNode(shapeEP);
-                n.setPadding(new Insets(getMapMode().DPtoLP(NODE_PADDING)));
-                n.setMinIncomingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-                n.setMinOutgoingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-                Dimension size = shapeEP.getSize();
-
-                setNodeMetrics(n, new Rectangle(position.x, position.y,
-                    size.width, size.height));
-
-                editPartToNodeDict.put(shapeEP, n);
-                nodes.add(n);
-                
-                buildBorderNodes(shapeEP, n, editPartToNodeDict);
-                
-            }
-        }
-
-        return nodes;
-    }
-    
-    /**
-	 * Since an editpart may contain border items that may need be laid out,
-	 * this is the place where border nodes can be created and added to the map
-	 * of editparts to nodes. If border items locations don't have much
-	 * semantical meaning and their locations are valubale notationally it's
-	 * best that border nodes are created here in this method. The
-	 * infrastructure for creating commands to move border items around is all
-	 * in place already. Creates border nodes for an editpart.
-	 * 
-	 * @param parentEP
-	 *            the editopart
-	 * @param parentNode
-	 *            the node for the editpart
-	 * @param editPartToNodeDict
-	 *            the map of editparts to nodes
-	 * @since 2.1
-	 * @deprecated
-	 * @see DefaultProvider#buildBorderNodes(GraphicalEditPart, ConstantSizeNode, Map)
-	 */
-    protected void build_borderNodes(GraphicalEditPart parentEP, ConstantSizeNode parentNode, Map editPartToNodeDict) {
-    	buildBorderNodes(parentEP, parentNode, editPartToNodeDict);
-    }
-    
-    /**
-	 * Since an editpart may contain border items that may need be laid out,
-	 * this is the place where border nodes can be created and added to the map
-	 * of editparts to nodes. If border items locations don't have much
-	 * semantical meaning and their locations are valubale notationally it's
-	 * best that border nodes are created here in this method. The
-	 * infrastructure for creating commands to move border items around is all
-	 * in place already. Creates border nodes for an editpart.
-	 * 
-	 * @param parentEP
-	 *            the editopart
-	 * @param parentNode
-	 *            the node for the editpart
-	 * @param editPartToNodeDict
-	 *            the map of editparts to nodes
-	 * @since 2.1
-	 */
-    protected void buildBorderNodes(GraphicalEditPart parentEP, ConstantSizeNode parentNode, Map editPartToNodeDict) {
-    	if (!supportsBorderNodes()) {
-    		return;
-    	}
-    	boolean borderNodesAdded = false;
-    	Rectangle parentRect = new Rectangle(parentNode.x, parentNode.y, parentNode.width, parentNode.height);
-    	Rectangle extendedRect = parentRect.getCopy();
-    	for (Iterator itr = parentEP.getChildren().iterator(); itr.hasNext();) {
-    		EditPart ep = (EditPart) itr.next();
-    		if (ep instanceof IBorderItemEditPart && canCreateBorderNode((IBorderItemEditPart)ep)) {
-    			IBorderItemEditPart bep = (IBorderItemEditPart) ep; 
-    			BorderNode bn = new BorderNode(bep, parentNode);
-    			setNodeMetrics(bn, bep.getFigure().getBounds());
-    			/*
-    			 * Border item bounding rectangle = b
-    			 * Border item parent rectangle = p
-    			 * outsideRatio = ( 1.0 - Area(Intersection(b, p))) / Area(p)
-    			 */
-    			bn.setOutsideRatio(1f - ((float) bep.getFigure().getBounds().getCopy().intersect(parentEP.getFigure().getBounds()).getSize().getArea()) / bep.getFigure().getSize().getArea());
-    			editPartToNodeDict.put(bep, bn);
-    			borderNodesAdded = true;
-    			extendedRect.union(new Rectangle(bn.x, bn.y, bn.width, bn.height));
-    			bn.setMinIncomingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-    			bn.setMinOutgoingPadding(getMapMode().DPtoLP(MIN_EDGE_END_POINTS_PADDING));
-    		}
-    	}
-    	if (borderNodesAdded) {
-    		parentNode.getPadding().add(new Insets(Math.max(extendedRect.width - parentRect.width, extendedRect.height - parentRect.height)));
-    	}
-    }
-    
-    /**
-     * Returns <code>true</code> if a border node for the given border item editpart needs to be created.
-     * By default we just need to know if the border item is movable (can change its x,y coordinate), which
-     * means that a non resizable edit policy have to be installed on the editpart. 
-     * 
-     * @param ep the border item editpart
-     * @return <code>true</code> if border node needs to be created for the editpart
-     */
-    protected boolean canCreateBorderNode(IBorderItemEditPart ep) {
-    	return ep.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) instanceof NonResizableEditPolicy;
-    }
-    
-    /**
-     * Returns <code>true</code> if the layout provider supports creation of border nodes.
-     * The default behavior for the layout provider is not to support arranging border items.
-     * Clients must override if this support is needed.
-     * 
-     * @return <code>true</code> if border items layout is supported by the layout provider
-     */
-    protected boolean supportsBorderNodes() {
-    	return false;
-    }
-
-    /**
-     * setNodeMetrics Sets the extend and position into the node object. Defined
-     * as abstract to allow subclasses to implement to perform a transformation
-     * on the values stored in the node. i.e. support for Left-Right layout as
-     * opposed to Top-Down.
-     * 
-     * @param n
-     *            Node that will receive the metrics values to be set.
-     * @param r
-     *            Rectangle that represents the location and extend of the Node.
-     */
-    final protected void setNodeMetrics(Node n, Rectangle r) {
-        Rectangle rectGraph = translateToGraph(r);
-        n.x = rectGraph.x;
-        n.y = rectGraph.y;
-        n.width = rectGraph.width;
-        n.height = rectGraph.height;
-    }
-
-    /**
-     * getNodeMetrics Retrieves the node extend and position from the node
-     * object. Defined as abstract to allow subclasses to implement to perform a
-     * transformation on the values stored in the node. i.e. support for
-     * Left-Right layout as opposed to Top-Down.
-     * 
-     * @param n
-     *            Node that has the metrics values to be retrieved.
-     * @return Rectangle that represents the location and extend of the Node.
-     */
-     protected Rectangle getNodeMetrics(Node n) {
-        Rectangle rect = new Rectangle(n.x, n.y, n.width, n.height);
-        PrecisionRectangle preciseRect = new PrecisionRectangle(rect);
-        return translateFromGraph(preciseRect);
-    }
-
-    /**
-     * Retrieves the extent and position from the given logical rectangle in 
-     * GEF graph coordinates. Defined as abstract to allow subclasses to implement 
-     * to perform a transformation on the values stored in the node. i.e. support for 
-     * Left-Right layout as opposed to Top-Down.
-     * 
-     * @param rect
-     *            <code>Rectangle</code> that has the values to be translated in 
-     *            logical (relative) coordinates.
-     *      
-     * @return <code>Rectangle</code> in graph coordinates.
-     */
-    abstract protected Rectangle translateToGraph(Rectangle r);
-
-    /**
-     * Retrieves the logical extent and position from the given rectangle.
-     * Defined as abstract to allow subclasses to implement to perform a
-     * transformation on the values stored in the node. i.e. support for
-     * Left-Right layout as opposed to Top-Down.
-     * 
-     * @param rect
-     *            <code>Rectangle</code> that has the values to be translated in
-     *            graph (pixel) coordinates.
-     * @return <code>Rectangle</code> in logical coordinates.
-     */
-    abstract protected Rectangle translateFromGraph(Rectangle rect);
-    
-    /**
-     * build_edges Method to build up the edges in the temporary Graph structure
-     * which the algorithm is executed on.
-     * 
-     * selectedObjects List of selected objects to be layed out.
-     * 
-     * @param editPartToNodeDict
-     *            Map of editparts from the GEF to the temporary Nodes used for
-     *            layout.
-     * @return EdgeList list of Edges that is passed to the graph structure.
-     * @deprecated
-     * @see DefaultProvider#buildEdges(List, Map)
-     */
-    protected EdgeList build_edges(List selectedObjects, Map editPartToNodeDict) {
-    	return buildEdges(selectedObjects, editPartToNodeDict);
-    }
-    
-    /**
-     * build_edges Method to build up the edges in the temporary Graph structure
-     * which the algorithm is executed on.
-     * 
-     * selectedObjects List of selected objects to be layed out.
-     * 
-     * @param editPartToNodeDict
-     *            Map of editparts from the GEF to the temporary Nodes used for
-     *            layout.
-     * @return EdgeList list of Edges that is passed to the graph structure.
-     */
-    protected EdgeList buildEdges(List selectedObjects, Map editPartToNodeDict) {
-
-        EdgeList edges = new EdgeList();
-
-        // Do "topdown" relationships first. Since they traditionally
-        // go upward on a diagram, they are reversed when placed in the graph
-        // for
-        // layout. Also, layout traverses the arcs from each node in the order
-        // of their insertion when finding a spanning tree for its constructed
-        // hierarchy. Therefore, arcs added early are less likely to be
-        // reversed.
-        // In fact, since there are no cycles in these arcs, adding
-        // them to the graph first should guarantee that they are never
-        // reversed,
-        // i.e., the inheritance hierarchy is preserved graphically.
-        ArrayList objects = new ArrayList();
-        objects.addAll(selectedObjects);
-        ListIterator li = objects.listIterator();
-        ArrayList notTopDownEdges = new ArrayList();
-        boolean shouldHandleListItems = shouldHandleConnectableListItems();
-        while (li.hasNext()) {
-            EditPart gep = (EditPart) li.next();
-            if (gep instanceof ConnectionEditPart) {
-                ConnectionEditPart poly = (ConnectionEditPart) gep;
-
-                if (layoutTopDown(poly)) {
-                    EditPart from = poly.getSource();
-                    EditPart to = poly.getTarget();
-                    if (from instanceof IBorderItemEditPart && !editPartToNodeDict.containsKey(from))
-                        from = from.getParent();
-                    else if (shouldHandleListItems && from instanceof ListItemEditPart)
-                        from = getFirstAnscestorinNodesMap(from, editPartToNodeDict);
-                    if (to instanceof IBorderItemEditPart && !editPartToNodeDict.containsKey(to))
-                        to = to.getParent();
-                    else if (shouldHandleListItems && to instanceof ListItemEditPart)
-                        to = getFirstAnscestorinNodesMap(to, editPartToNodeDict);
-        			Node fromNode = null;
-        			if (from != null) {
-        				fromNode = (Node) editPartToNodeDict.get(from);
-        			}
-        			Node toNode = null;
-        			if (to != null) {
-        				toNode = (Node) editPartToNodeDict.get(to);
-        			}
-                    
-                    if (fromNode != null && toNode != null
-                        && !checkSelfEdge(from, to, editPartToNodeDict)) {
-                        addEdge(edges, poly, toNode, fromNode);
-                    }
-                }else{
-                    notTopDownEdges.add(poly);
-                }
-            }
-        }
-
-        // third pass for all other connections
-        li = notTopDownEdges.listIterator();
-        while (li.hasNext()) {
-            ConnectionEditPart poly = (ConnectionEditPart) li.next();
-            EditPart from = poly.getSource();
-            EditPart to = poly.getTarget();
-            if (from instanceof IBorderItemEditPart && !editPartToNodeDict.containsKey(from))
-                from = from.getParent();
-            else if (shouldHandleListItems && from instanceof ListItemEditPart)
-                from = getFirstAnscestorinNodesMap(from, editPartToNodeDict);
-            if (to instanceof IBorderItemEditPart && !editPartToNodeDict.containsKey(to))
-                to = to.getParent();
-            else if (shouldHandleListItems && to instanceof ListItemEditPart)
-                to = getFirstAnscestorinNodesMap(to, editPartToNodeDict);
-            
-			Node fromNode = null;
-			if (from != null) {
-				fromNode = (Node) editPartToNodeDict.get(from);
-			}
-			Node toNode = null;
-			if (to != null) {
-				toNode = (Node) editPartToNodeDict.get(to);
-			}
-            
-            if (fromNode != null && toNode != null
-                && !checkSelfEdge(from, to, editPartToNodeDict)) {
-                addEdge(edges, poly, fromNode, toNode);
-            }
-        }
-        return edges;
-    }
-    
-    private boolean checkSelfEdge(EditPart from, EditPart to, Map dictionary) {
-   		Node graphSource = from instanceof IBorderItemEditPart ? (Node) dictionary.get(from.getParent()) : (Node) dictionary.get(from); 
-   		Node graphTarget = to instanceof IBorderItemEditPart ? (Node) dictionary.get(to.getParent()) : (Node) dictionary.get(to);
-    	return graphSource != null && graphTarget != null && graphSource.equals(graphTarget);
-    }
-    
-    /**
-     * @param edges
-     * @param gep
-     * @param fromNode
-     * @param toNode
-     */
-    private void addEdge(EdgeList edges, ConnectionEditPart connectionEP,
-            Node fromNode, Node toNode) {
-    	ConstrainedEdge edge = new ConstrainedEdge(connectionEP, fromNode, toNode);
-        initializeEdge(connectionEP, edge);
-        
-        edges.add(edge);
-    }
-
-    /**
-     * initializeEdge Method used as a hook to initialize the Edge layout
-     * object. LayoutProvider subclasses may wish to initialize the edge
-     * different to customize the layout for their diagram domain.
-     * 
-     * @param connectionEP
-     *            EditPart used as a seed to initialize the edge properties
-     * @param edge
-     *            Edge to initialize with default values for the layout
-     */
-    protected void initializeEdge(ConnectionEditPart connectionEP, Edge edge) {
-        List affectingChildren = getAffectingChildren(connectionEP);
-        
-        // set the padding based on the extent of the children.
-        edge.setPadding(Math.max(edge.getPadding(), calculateEdgePadding(connectionEP, affectingChildren)));
-        edge.setDelta(Math.max(edge.getDelta(), affectingChildren.size() / 2));
-        if (edge instanceof ConstrainedEdge && ((Connection)connectionEP.getFigure()).getConnectionRouter() instanceof OrthogonalRouter) {
-        	((ConstrainedEdge)edge).setStyle(ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE);
-        }
-    }
-        
-    /**
-     * Calculates the edge padding needed to initialize edge with.  Uses the number of children as a factor in
-     * determine the dynamic padding value.
-     */
-    private int calculateEdgePadding(ConnectionEditPart connectionEP, List affectingChildren) {
-        ListIterator li = affectingChildren.listIterator();
-        
-        int padding = 0;
-        
-        // union the children widths 
-        while (li.hasNext()) {
-            GraphicalEditPart gep = (GraphicalEditPart)li.next();
-            
-            padding = Math.max(padding, Math.max(gep.getFigure().getBounds().width, gep.getFigure().getBounds().height));
-        }
-        
-        Rectangle.SINGLETON.x = 0;
-        Rectangle.SINGLETON.y = 0;
-        Rectangle.SINGLETON.width = padding;
-        Rectangle.SINGLETON.height = padding;
-        return Math.min(Math.max(Math.round(translateToGraph(Rectangle.SINGLETON).width * 1.5f), getMapMode().DPtoLP(MIN_EDGE_PADDING)), getMapMode().DPtoLP(MAX_EDGE_PADDING));
-    }
-    
-    /**
-     * Retrieve the associated children from the given connection editpart that will affect
-     * the layout.
-     * 
-     * @param conn the <code>ConnectionEditPart</code> to retrieve the children from
-     * @return a <code>List</code> that contains <code>GraphicalEditPart</code> objects
-     */
-    private List getAffectingChildren(ConnectionEditPart conn) {
-        List children = conn.getChildren();
-        ListIterator lli = children.listIterator();
-        List affectingChildrenList = new ArrayList();
-        while (lli.hasNext()) {
-            Object obj = lli.next();
-            if (obj instanceof GraphicalEditPart) {
-                GraphicalEditPart lep = (GraphicalEditPart)obj;
-                Rectangle lepBox = lep.getFigure().getBounds().getCopy();
-                
-                if (!lep.getFigure().isVisible() || 
-                    lepBox.width == 0 || lepBox.height == 0)
-                    continue;
-                
-                affectingChildrenList.add(lep);
-            }
-        }
-        return affectingChildrenList;
-    }
-    
-    /**
-     * getRelevantConnections Given the editpart to Nodes Map this will
-     * calculate the connections in the diagram that are important to the
-     * layout.
-     * 
-     * @param editPartToNodeDict
-     *            Hashtable of editparts from the GEF to the temporary Nodes
-     *            used for layout.
-     * @return List of ConnectionEditPart that are to be part of the layout
-     *         routine.
-     */
-    protected List getRelevantConnections(Hashtable editPartToNodeDict) {
-        Enumeration enumeration = editPartToNodeDict.keys();
-        ArrayList connectionsToMove = new ArrayList();
-        while (enumeration.hasMoreElements()) {
-            Object e = enumeration.nextElement();
-            GraphicalEditPart shapeEP = (GraphicalEditPart) e;
-            Set sourceConnections = new HashSet(shapeEP.getSourceConnections());
-            if (shapeEP instanceof IBorderedShapeEditPart){
-                List borderItems = getBorderItemEditParts(shapeEP, editPartToNodeDict);
-                for (Iterator iter = borderItems.iterator(); iter.hasNext();) {
-                    GraphicalEditPart element = (GraphicalEditPart) iter.next();
-                    sourceConnections.addAll(element.getSourceConnections());
-                }
-            }
-            
-            for (Iterator iter = sourceConnections.iterator();
-                    iter.hasNext();) {
-                ConnectionEditPart connectionEP = (ConnectionEditPart) iter.next();
-                EditPart target = connectionEP.getTarget();
-                // check to see if the toView is in the shapesDict, if yes,
-                // the associated connectionView should be included on graph
-                if (target instanceof IBorderItemEditPart)
-                    target = target.getParent();
-                if (target != null) {
-                	Object o = editPartToNodeDict.get(target);
-                    if (o != null) {
-                        connectionsToMove.add(connectionEP);
-                    }
-                }
-            }
-            
-            if (shouldHandleConnectableListItems()){
-                handleConnectableListItems(shapeEP,editPartToNodeDict,connectionsToMove);
-            }
-        }
-
-        return connectionsToMove;
-    }
-    
-    private void handleConnectableListItems(GraphicalEditPart shapeEP, Map editPartToNodeDict, ArrayList connectionsToMove) {
-        List children = shapeEP.getChildren();
-        for (Iterator iter = children.iterator(); iter.hasNext();) {
-            EditPart ep = (EditPart) iter.next();
-            if (ep instanceof ListCompartmentEditPart){
-                List listItems = ep.getChildren();
-                for (Iterator iterator = listItems.iterator(); iterator
-                    .hasNext();) {
-                    GraphicalEditPart listItem = (GraphicalEditPart) iterator.next();
-                    List connections =listItem.getSourceConnections();
-                    for (Iterator connectionIterator = connections.iterator(); connectionIterator
-                        .hasNext();) {
-                        ConnectionEditPart connectionEP = (ConnectionEditPart) connectionIterator.next();
-                        EditPart ancestor = getFirstAnscestorinNodesMap(connectionEP.getTarget(),editPartToNodeDict);
-                        if (ancestor!=null)
-                            connectionsToMove.add(connectionEP);
-                    }
-                }
-            }
-            
-        }
-        
-    }
-
-    private EditPart getFirstAnscestorinNodesMap(EditPart editPart,Map editPartToNodeDict) {
-        EditPart ancestor =  editPart;
-        while (ancestor!=null){
-            if (editPartToNodeDict.get(ancestor)!=null)
-                return ancestor;
-            ancestor = ancestor.getParent();
-        }
-        return null;
-    }
-
-    /**
-     * 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 List getBorderItemEditParts(EditPart parent, Hashtable editPartToNodeDict ) {
-        Iterator iter = parent.getChildren().iterator();
-        List list = new ArrayList();
-        while(iter.hasNext()) {
-            EditPart child = (EditPart)iter.next();
-            if (!editPartToNodeDict.containsKey(child) && child instanceof IBorderItemEditPart) {
-                list.add(child);
-            }
-        }
-        return list;
-    }
-
-    /**
-     * Method build_graph. This method will build the proxy graph that the
-     * layout is based on.
-     * 
-     * @param g
-     *            DirectedGraph structure that will be populated with Nodes and
-     *            Edges in this method.
-     * @param selectedObjects
-     *            List of editparts that the Nodes and Edges will be calculated
-     *            from.
-     * @deprecated
-     * @see DefaultProvider#buildGraph(DirectedGraph, List)
-     */
-    protected void build_graph(DirectedGraph g, List selectedObjects) {
-    	buildGraph(g, selectedObjects);
-     }
-    
-    /**
-     * Method build_graph. This method will build the proxy graph that the
-     * layout is based on.
-     * 
-     * @param g
-     *            DirectedGraph structure that will be populated with Nodes and
-     *            Edges in this method.
-     * @param selectedObjects
-     *            List of editparts that the Nodes and Edges will be calculated
-     *            from.
-     */
-    protected void buildGraph(DirectedGraph g, List selectedObjects) {
-        Hashtable editPartToNodeDict = new Hashtable(500);
-        this.minX = -1;
-        this.minY = -1;
-        NodeList nodes = buildNodes(selectedObjects, editPartToNodeDict,null);
-
-        // append edges that should be added to the graph
-        ArrayList objects = new ArrayList();
-        objects.addAll(selectedObjects);
-        objects.addAll(getRelevantConnections(editPartToNodeDict));
-        EdgeList edges = buildEdges(objects, editPartToNodeDict);
-        g.nodes = nodes;
-        g.edges = edges;
-        postProcessGraph(g,editPartToNodeDict);
-        //printGraph(g);
-     }
-    
-    protected void postProcessGraph(DirectedGraph g, Hashtable editPartToNodeDict) {
-        //default do nothing
-    }
-
-    /**
-     * reverse Utility function to reverse the order of points in a list.
-     * 
-     * @param c
-     *            PointList that is passed to the routine.
-     * @param rc
-     *            PointList that is reversed.
-     */
-    private void reverse(PointList c, PointList rc) {
-        rc.removeAllPoints();
-
-        for (int i = c.size() - 1; i >= 0; i--) {
-            rc.addPoint(c.getPoint(i));
-        }
-    }
-
-    /**
-     * Computes the command that will route the given connection editpart with the given points.
-     */
-    protected Command routeThrough(Edge edge, ConnectionEditPart connectEP, Node source, Node target, PointList points, Point diff) {
-
-        if (connectEP == null)
-            return null;
-
-        PointList routePoints = points;
-        if (source.data == connectEP.getTarget()) {
-            routePoints = new PointList(points.size());
-            reverse(points, routePoints);
-            Node tmpNode = source;
-            source = target;
-            target = tmpNode;
-        }
-        
-        double totalEdgeDiffX = diff.preciseX() ;
-        double totalEdgeDiffY = diff.preciseY() ;
-        
-        PrecisionPointList allPoints = new PrecisionPointList(routePoints.size());
-        for (int i = 0; i < routePoints.size(); i++) {
-            allPoints.addPrecisionPoint(routePoints.getPoint(i).preciseX() + totalEdgeDiffX, routePoints
-                .getPoint(i).preciseY()
-                + totalEdgeDiffY);
-        }
-
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-        
-        LineSeg anchorReferencePoints = addAnchorsCommands(cc, allPoints.getFirstPoint(), allPoints.getLastPoint(), source, target, connectEP, diff);
-        		
-        SetAllBendpointRequest request = new SetAllBendpointRequest(
-                RequestConstants.REQ_SET_ALL_BENDPOINT, allPoints,
-                anchorReferencePoints.getOrigin(), anchorReferencePoints.getTerminus());
-
-        Command cmd = connectEP.getCommand(request);
-        if (cmd != null)
-            cc.add(cmd);
-        
-        // set the snapback position for all children owned by the connection
-        List affectingChildren = getAffectingChildren(connectEP);
-        Request snapBackRequest = new Request(RequestConstants.REQ_SNAP_BACK);
-        ListIterator li = affectingChildren.listIterator();
-        while (li.hasNext()) {
-            EditPart ep = (EditPart)li.next();
-            cmd = ep.getCommand(snapBackRequest);
-            if (cmd != null)
-                cc.add(cmd);
-        }
-        
-        if (cc.isEmpty())
-            return null;
-        return cc;
-    }
-    
-    /**
-	 * Creates source and target anchor commands and appends them to the
-	 * compound command passed in. Returns a line segment ends of which are the
-	 * new source and target anchor reference points for further use in the
-	 * command setting the bend points.
-	 * 
-	 * @param cc
-	 *            command to add anchors commands to
-	 * @param sourceAnchorLocation
-	 *            the source anchor location coordinates
-	 * @param targetAnchorLocation
-	 *            the target anchor location coordinates
-	 * @param source
-	 *            source node
-	 * @param target
-	 *            target node
-	 * @param cep
-	 *            connection editpart
-	 * @param diffX
-	 *            x axis offset
-	 * @param diffY
-	 *            y axis offset
-	 * @return <code>LineSeg</code> origin is the new source anchor reference
-	 *         point and origin is the new target anchor reference point
-	 */
-	protected LineSeg addAnchorsCommands(CompoundCommand cc,
-			Point sourceAnchorLocation, Point targetAnchorLocation,
-			Node source, Node target, ConnectionEditPart cep, Point diff) {
-		Rectangle sourceExt = getNodeMetrics(source);
-		Rectangle targetExt = getNodeMetrics(target);
-		sourceExt.translate(diff);
-		targetExt.translate(diff);
-		
-		/*
-		 * If source or target anchor command won't be created or will be non-executable,
-		 * source or target reference point is assumed to be the geometric centre of a shape.
-		 */
-		Point resultantSourceAnchorReference = sourceExt.getCenter();
-		Point resultantTargetAnchorReference = targetExt.getCenter();
-
-		PrecisionPoint sourceRatio = new PrecisionPoint((sourceAnchorLocation
-				.preciseX() - sourceExt.preciseX())
-				/ sourceExt.preciseWidth(),
-				(sourceAnchorLocation.preciseY() - sourceExt.preciseY())
-						/ sourceExt.preciseHeight());
-		PrecisionPoint targetRatio = new PrecisionPoint((targetAnchorLocation
-				.preciseX() - targetExt.preciseX())
-				/ targetExt.preciseWidth(),
-				(targetAnchorLocation.preciseY() - targetExt.preciseY())
-						/ targetExt.preciseHeight());
-		
-		/*
-		 * Need to fake reconnection of the ends of the connection. Currently
-		 * existing figure coordinates (old coordinates) needs to be used for
-		 * this, since the reconnection location is passed in absolute
-		 * coordinates.
-		 */
-		if (cep.getSource().equals(source.data)) {
-			ReconnectRequest reconnectRequest = new ReconnectRequest(
-					org.eclipse.gef.RequestConstants.REQ_RECONNECT_SOURCE);
-			reconnectRequest.setConnectionEditPart(cep);
-			reconnectRequest.setTargetEditPart(cep.getSource());
-			IFigure sourceFig = ((GraphicalEditPart)cep.getSource()).getFigure();
-			Point sourceAnchorReference = new PrecisionPoint(
-					sourceFig.getBounds().preciseX() + sourceRatio.preciseX()
-							* sourceFig.getBounds().preciseWidth(), sourceFig
-							.getBounds().preciseY()
-							+ sourceRatio.preciseY()
-							* sourceFig.getBounds().preciseHeight());
-			sourceFig.translateToAbsolute(sourceAnchorReference);
-			reconnectRequest.setLocation(sourceAnchorReference);
-			Command sourceAnchorCommand = cep.getSource()
-					.getCommand(reconnectRequest);
-			if (sourceAnchorCommand != null && sourceAnchorCommand.canExecute()) {
-				cc.add(sourceAnchorCommand);
-				if (((Connection)cep.getFigure()).getSourceAnchor() instanceof BaseSlidableAnchor) {
-					if (sourceAnchorCommand instanceof ICommandProxy) {
-						updateNewSlidingAnchorReferenceRatio((ICommandProxy) sourceAnchorCommand, true, sourceRatio);
-					}
-					resultantSourceAnchorReference = new PrecisionPoint(sourceExt
-							.preciseWidth()
-							* sourceRatio.preciseX() + sourceExt.preciseX(), sourceExt
-							.preciseHeight()
-							* sourceRatio.preciseY() + sourceExt.preciseY());
-				}
-			}
-		} else {
-			resultantSourceAnchorReference = getNewAnchorReferencePoint(source, sourceExt, ((Connection)cep.getFigure()).getSourceAnchor().getReferencePoint());
-		}
-
-		if (cep.getTarget().equals(target.data)) {
-			ReconnectRequest reconnectRequest = new ReconnectRequest(
-					org.eclipse.gef.RequestConstants.REQ_RECONNECT_TARGET);
-			reconnectRequest.setConnectionEditPart(cep);
-			reconnectRequest.setTargetEditPart(cep.getTarget());
-			IFigure targetFig = ((GraphicalEditPart) cep.getTarget()).getFigure();
-			Point targetAnchorReference = new PrecisionPoint(
-					targetFig.getBounds().preciseX() + targetRatio.preciseX()
-							* targetFig.getBounds().preciseWidth(), targetFig
-							.getBounds().preciseY()
-							+ targetRatio.preciseY()
-							* targetFig.getBounds().preciseHeight());
-			targetFig.translateToAbsolute(targetAnchorReference);
-			reconnectRequest.setLocation(targetAnchorReference);
-			Command targetAnchorCommand = cep.getTarget()
-					.getCommand(reconnectRequest);
-			if (targetAnchorCommand != null && targetAnchorCommand.canExecute()) {
-				cc.add(targetAnchorCommand);
-				if (((Connection)cep.getFigure()).getTargetAnchor() instanceof BaseSlidableAnchor) {
-					if (targetAnchorCommand instanceof ICommandProxy) {
-						updateNewSlidingAnchorReferenceRatio((ICommandProxy) targetAnchorCommand, false, targetRatio);
-					}
-					resultantTargetAnchorReference = new PrecisionPoint(targetExt
-							.preciseWidth()
-							* targetRatio.preciseX() + targetExt.preciseX(), targetExt
-							.preciseHeight()
-							* targetRatio.preciseY() + targetExt.preciseY());
-				}
-			}
-		} else {
-			resultantTargetAnchorReference = getNewAnchorReferencePoint(target, targetExt, ((Connection)cep.getFigure()).getTargetAnchor().getReferencePoint());
-		}
-		return new LineSeg(resultantSourceAnchorReference,
-				resultantTargetAnchorReference);
-	}
-	
-	private void updateNewSlidingAnchorReferenceRatio(ICommandProxy setAnchorCommand, boolean source, PrecisionPoint ratio) {
-		/*
-		 * Find the SetConnectionAnchorsCommand
-		 */
-		SetConnectionAnchorsCommand cmd = findSetConnectionAnchorsCommand(setAnchorCommand.getICommand());
-		if (cmd != null) {
-			PrecisionPoint newRatio = null;
-			if (source) {
-				newRatio = cmd.getNewSourceTerminal() == null ? new PrecisionPoint(0.5, 0.5) : BaseSlidableAnchor.parseTerminalString(cmd.getNewSourceTerminal());
-			} else {
-				newRatio = cmd.getNewTargetTerminal() == null ? new PrecisionPoint(0.5, 0.5) : BaseSlidableAnchor.parseTerminalString(cmd.getNewTargetTerminal());
-			}
-			if (newRatio != null) {
-				ratio.preciseX = newRatio.preciseX;
-				ratio.preciseY = newRatio.preciseY;
-				ratio.updateInts();
-			}
-		}
-	}
-	
-	private SetConnectionAnchorsCommand findSetConnectionAnchorsCommand(ICommand cmd) {
-		if (cmd instanceof SetConnectionAnchorsCommand) {
-			return (SetConnectionAnchorsCommand) cmd;
-		} else if (cmd instanceof CompositeCommand) {
-			for (Iterator itr = ((CompositeCommand)cmd).listIterator(); itr.hasNext();) {
-				ICommand childCmd = (ICommand) itr.next();
-				SetConnectionAnchorsCommand setAnchorsCmd = findSetConnectionAnchorsCommand(childCmd);
-				if (setAnchorsCmd != null) {
-					return setAnchorsCmd;
-				}
-			}
-		}
-		return null;
-	}
-	
-	private Point getNewAnchorReferencePoint(Node node, Rectangle nodeBoundsOnDiagram, Point oldAbsReference) {
-		GraphicalEditPart gep = (GraphicalEditPart)node.data;
-		PrecisionPoint parentLocation = new PrecisionPoint(gep.getFigure().getBounds().getLocation());
-		gep.getFigure().translateToAbsolute(parentLocation);
-		PrecisionDimension diff = new PrecisionDimension(oldAbsReference.preciseX() - parentLocation.preciseX(), oldAbsReference.preciseY() - parentLocation.preciseY());
-		getMapMode().DPtoLP(diff);
-		return nodeBoundsOnDiagram.getLocation().translate(diff);
-	}
-
-    /**
-     * Method update_diagram. Once the layout has been calculated with the GEF
-     * graph structure, the new layout values need to be propogated into the
-     * diagram. This is accomplished by creating a compound command that
-     * contains sub commands to change shapes positions and connection bendpoints
-     * positions. The command is subsequently executed by the calling action and
-     * then through the command infrastructure is undoable and redoable.
-     * 
-     * @param diagramEP
-     *            IGraphicalEditPart container that is target for the commands.
-     * @param g
-     *            DirectedGraph structure that contains the results of the
-     *            layout operation.
-     * @param isLayoutForSelected
-     *            boolean indicating that the layout is to be performed on
-     *            selected objects only. At this stage this is relevant only to
-     *            calculate the offset in the diagram where the layout will
-     *            occur.
-     * @return Command usually a command command that will set the locations of
-     *         nodes and bendpoints for connections.
-     */
-    protected Command update_diagram(GraphicalEditPart diagramEP, DirectedGraph g,
-            boolean isLayoutForSelected) {
-        
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-
-        Point diff = getLayoutPositionDelta(g, isLayoutForSelected);
-        Command cmd = createNodeChangeBoundCommands(g, diff);
-        if (cmd != null)
-            cc.add(cmd);
-        
-        cmd = createEdgesChangeBoundsCommands(g, diff);
-        if (cmd != null)
-            cc.add(cmd);
-        
-        return cc;
-    }
-    
-    /*
-     * Find all of the arcs and set their intermediate points. This
-     * loop does not set the icon positions yet, because that causes
-     * recalculation of the arc connection points. The intermediate
-     * points of both outgoing and incomping arcs must be set before
-     * recalculating connection points.
-     */ 
-    protected Command createEdgesChangeBoundsCommands(DirectedGraph g, Point diff) {
-        
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-        PointList points = new PrecisionPointList(10);
-        
-        ListIterator vi = g.edges.listIterator();
-        while (vi.hasNext()) {
-            Edge edge = (Edge) vi.next();
-            
-            if (edge.data == null || edge.getPoints()==null)
-                continue;
-            
-            points.removeAllPoints();
-
-            ConnectionEditPart cep = null;
-            Node source = null, target = null;
-            
-            collectPoints(points, edge);
-            cep = (ConnectionEditPart)edge.data;
-            source = edge.source;
-            target = edge.target;
-            
-            if (cep != null) {
-                PointListUtilities.normalizeSegments(points, MapModeUtil.getMapMode(cep.getFigure()).DPtoLP(3));
-                    
-                // Reset the points list
-                Command cmd = routeThrough(edge, cep, source, target, points, diff);
-                if (cmd != null)
-                    cc.add(cmd);
-            }
-        }
-        
-        if (cc.isEmpty())
-            return null;
-        return cc;
-    }
-        
-    private void collectPoints(PointList points, Edge edge) {
-        PointList pointList = edge.getPoints();
-        for (int i = 0; i < pointList.size(); i++) {
-        	Rectangle pt = translateFromGraph(new Rectangle(pointList.getPoint(i), new Dimension()));
-        	points.addPoint(pt.getLocation());
-        }
-    }
-
-    protected Command createNodeChangeBoundCommands(DirectedGraph g, Point diff) {
-        ListIterator vi = g.nodes.listIterator();
-        CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-        createSubCommands(diff, vi, cc);
-        if (cc.isEmpty())
-            return null;
-        return cc;
-    }
-
-    protected void createSubCommands(Point diff, ListIterator vi, CompoundCommand cc) {
-        // Now set the position of the icons. This causes the
-        // arc connection points to be recalculated
-        while (vi.hasNext()) {
-            Node node = (Node) vi.next();
-            if (node.data instanceof ShapeEditPart) {
-                IGraphicalEditPart gep = (IGraphicalEditPart)node.data;
-                
-                ChangeBoundsRequest request = new ChangeBoundsRequest(
-                    RequestConstants.REQ_MOVE);
-                Rectangle nodeExt = getNodeMetrics(node);
-                Point ptLocation = new PrecisionPoint(nodeExt.preciseX() + diff.preciseX(), nodeExt.preciseY()
-                    + diff.preciseY());
-
-                PrecisionPoint ptOldLocation = new PrecisionPoint(gep.getFigure().getBounds().getLocation());
-                gep.getFigure().translateToAbsolute(ptOldLocation);
-                
-                gep.getFigure().translateToAbsolute(ptLocation);
-                PrecisionPoint delta = new PrecisionPoint(ptLocation.preciseX()
-                    - ptOldLocation.preciseX(), ptLocation.preciseY()
-                    - ptOldLocation.preciseY());
-
-                request.setEditParts(gep);
-                request.setMoveDelta(delta);
-                request.setLocation(ptLocation);
-                
-                Command cmd = gep.getCommand(request);
-                if (cmd != null && cmd.canExecute()) {
-                    cc.add(cmd);
-                }
-            }
-        	if (node instanceof ConstantSizeNode) {
-        		ConstantSizeNode cn = (ConstantSizeNode) node;
-        		for (Iterator<BorderNode> itr = cn.borderNodes.iterator(); itr.hasNext();) {
-        			createBorderItemChangeBoundsCommand(itr.next(), cn, cc);
-        		}
-        	}
-        }
-    }
-    
-    private void createBorderItemChangeBoundsCommand(BorderNode bn, ConstantSizeNode parentNode, CompoundCommand cc) {
-        ChangeBoundsRequest request = new ChangeBoundsRequest(
-                RequestConstants.REQ_MOVE);
-        Rectangle parentRect = getNodeMetrics(parentNode);
-        Rectangle borderItemRect = getNodeMetrics(bn);
-        Dimension offset = borderItemRect.getLocation().getDifference(parentRect.getLocation());
-        
-        IFigure parentFigure = ((GraphicalEditPart)parentNode.data).getFigure();
-        IFigure borderItemFigure = ((GraphicalEditPart)bn.data).getFigure();
-        
-        PrecisionPoint oldParentLocation = new PrecisionPoint(parentFigure.getBounds().getLocation());
-        PrecisionPoint oldBorderItemLocation = new PrecisionPoint(borderItemFigure.getBounds().getLocation());        
-        PrecisionPoint newBorderItemLocation = new PrecisionPoint(oldParentLocation.preciseX() + offset.preciseWidth(), oldParentLocation.preciseY() + offset.preciseHeight());
-        parentFigure.translateToAbsolute(oldParentLocation);
-        parentFigure.translateToAbsolute(newBorderItemLocation);
-        borderItemFigure.translateToAbsolute(oldBorderItemLocation);
-        
-        PrecisionPoint delta = new PrecisionPoint(newBorderItemLocation.preciseX() - oldBorderItemLocation.preciseX(), newBorderItemLocation.preciseY() - oldBorderItemLocation.preciseY());
-        GraphicalEditPart gep = (GraphicalEditPart) bn.data;
-        request.setEditParts(gep);
-        request.setMoveDelta(delta);
-        request.setLocation(newBorderItemLocation);
-        
-        Command cmd = gep.getCommand(request);
-        if (cmd != null && cmd.canExecute()) {
-            cc.add(cmd);
-        }
-    }
-
-    private Point getLayoutPositionDelta(DirectedGraph g, boolean isLayoutForSelected) {
-        // If laying out selected objects, use diff variables to
-        // position objects at topleft corner of enclosing rectangle.
-        if (isLayoutForSelected) {
-            ListIterator vi;
-            vi = g.nodes.listIterator();
-            Point ptLayoutMin = new Point(-1, -1);
-            while (vi.hasNext()) {
-                Node node = (Node) vi.next();
-                // ignore ghost node
-                if (node.data != null) {
-                    Rectangle nodeExt = getNodeMetrics(node);
-                    if (ptLayoutMin.x == -1) {
-                        ptLayoutMin.x = nodeExt.x;
-                        ptLayoutMin.y = nodeExt.y;
-                    } else {
-                        ptLayoutMin.x = Math.min(ptLayoutMin.x, nodeExt.x);
-                        ptLayoutMin.y = Math.min(ptLayoutMin.y, nodeExt.y);
-                    }
-                }
-            }
-    
-            return new Point(this.minX - ptLayoutMin.x, this.minY - ptLayoutMin.y);
-        }
-        
-        return new Point(layoutDefaultMargin, layoutDefaultMargin);
-    }
-    
-    /**
-     * Creates the graph that will be used by the layouy provider
-     * Clients can override this method create different kind of graphs
-     * This method is called by {@link DefaultProvider#layoutEditParts(GraphicalEditPart, IAdaptable) } 
-     * and {@link DefaultProvider#layoutEditParts(List, IAdaptable)}  
-     * @return the Graph that will be used by the layout algorithm
-     */
-    protected DirectedGraph createGraph(){
-        return new DirectedGraph();
-    }
-    
-    /**
-     * Creates the graph layout algorithm that will be used to layout the diagram
-     * This method is called by {@link DefaultProvider#layoutEditParts(GraphicalEditPart, IAdaptable) } 
-     * and {@link DefaultProvider#layoutEditParts(List, IAdaptable)}  
-     * @return the graph layout 
-     */
-    protected DirectedGraphLayout createGraphLayout() {
-        return new GMFDirectedGraphLayout();
-    }
-    
-    /** 
-     * Allows "Arrange all" for 1 node, but doesn't allow "arrange selection" for 1 node
-     */
-    @Override
-	public boolean canLayoutNodes(List layoutNodes,
-			boolean shouldOffsetFromBoundingBox, IAdaptable layoutHint) {
-    	if (super.canLayoutNodes(layoutNodes, shouldOffsetFromBoundingBox, layoutHint)) {
-    		return !shouldOffsetFromBoundingBox || (shouldOffsetFromBoundingBox && layoutNodes.size() > 1);
-    	}
-    	return false;
-	}
-
-	/**
-     * Indicates if the provider will consider the connections between ListItems 
-     * while doing the arrange action
-     * @return true or false
-     */
-    protected boolean shouldHandleConnectableListItems() {
-        return false;
-    }
-    
-   /* private void printGraph(DirectedGraph g){
-        int depth = 0;
-        if (g instanceof CompoundDirectedGraph){
-            NodeList subGraphs = ((CompoundDirectedGraph)g).nodes;
-            for (Iterator iter = subGraphs.iterator(); iter.hasNext();) {
-                Node node = (Node)iter.next();
-                if (node.getParent()!=null)
-                    continue;
-                if (node instanceof Subgraph){
-                    printSubGraph((Subgraph)node,depth);
-                }else {
-                    printNode(node,depth);
-                }
-            }
-        }
-    }
-
-    private void printNode(Node node, int depth) {
-        StringBuffer buffer = new StringBuffer();
-        for (int i =0 ; i<depth ; i++)
-            buffer.append("\t");
-        buffer.append("Node");
-        System.out.println(buffer);
-    }
-
-    private void printSubGraph(Subgraph subgraph, int depth) {
-        StringBuffer buffer = new StringBuffer();
-        for (int i =0 ; i<depth ; i++)
-            buffer.append("\t");
-        buffer.append("SubGraph");
-        if (!subgraph.members.isEmpty()){
-            buffer.append(" : ");
-            System.out.println(buffer);
-            NodeList nodes = subgraph.members;
-            depth++;
-            for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-                Node element = (Node) iter.next();
-                if (element instanceof Subgraph){
-                    printSubGraph((Subgraph)element,depth);
-                }else {
-                    printNode(element,depth);
-                }
-            }
-        }else {
-            System.out.println(buffer);
-        }
-            
-    }*/
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramDecoratorProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramDecoratorProvider.java
deleted file mode 100644
index f7cc696..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramDecoratorProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.EditPart;
-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.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorKeys;
-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.View;
-
-/**
- * Provides decorators for the GMF diagram layer.
- *
- * @author cmahoney
- */
-public class DiagramDecoratorProvider
-	extends AbstractProvider
-	implements IDecoratorProvider {
-
-	public void createDecorators(IDecoratorTarget decoratorTarget) {
-		EditPart ep = (EditPart)decoratorTarget.getAdapter(EditPart.class);
-		if (ep != null && ep instanceof IPrimaryEditPart) {
-			decoratorTarget.installDecorator(IDecoratorKeys.BOOKMARK,
-				new BookmarkDecorator(decoratorTarget));
-			Object model = ep.getModel();
-			if(!(model instanceof View))
-				return;
-			if (((View)model).getElement() != null) {
-				// needs to have a reference that isn't null (i.e. have a semantic element)
-				decoratorTarget.installDecorator(IDecoratorKeys.UNRESOLVED_VIEW,
-					new UnresolvedViewDecorator(decoratorTarget));
-			}
-		}
-	}
-
-	public boolean provides(IOperation operation) {
-		Assert.isNotNull(operation);
-
-		if (!(operation instanceof CreateDecoratorsOperation)) {
-			return false;
-		}
-
-		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)
-			.getDecoratorTarget();
-		return decoratorTarget.getAdapter(View.class) != null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java
deleted file mode 100644
index 856219f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DescriptionCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DiagramNameCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.TextEditPart;
-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;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * 
- * Supports the creation of <b>diagram</b> editparts elements.  
- * Diagram elements are commonly used by all plugins.
- *  
- * @author schafe
- * 
- */
-public class DiagramEditPartProvider extends AbstractEditPartProvider {
-
-	/** list of supported shape editparts. */
-	private Map shapeMap = new HashMap();
-	{
-		shapeMap.put(ViewType.NOTE, NoteEditPart.class);
-		shapeMap.put(ViewType.TEXT, TextEditPart.class);
-        shapeMap.put(ViewType.GROUP, GroupEditPart.class);
-	}
-	/** list of supportted text editparts. */
-	private Map textCompartmentMap = new HashMap();
-	{
-		textCompartmentMap.put(ViewType.DIAGRAM_NAME, DiagramNameCompartmentEditPart.class);
-		textCompartmentMap.put(CommonParserHint.DESCRIPTION, DescriptionCompartmentEditPart.class);
-	}
-	
-	/** list of supported connection editparts. */
-	private Map connectionMap = new HashMap();
-	{
-		connectionMap.put(ViewType.NOTEATTACHMENT, NoteAttachmentEditPart.class);
-	}
-	
-	/**
-	 * Set the editpart class to the editpart mapped to the supplied view's semantic hint.
-	 */
-	protected Class getEdgeEditPartClass(View view) {
-		return((Class) connectionMap.get(view.getType()));
-	}
-	
-	/**
-	 * 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 type = view.getType();
-		Class clazz = null;
-		if(type!=null && type.length()>0){
-			clazz = (Class)textCompartmentMap.get(type);
-			if(clazz==null)
-				clazz = (Class)shapeMap.get(type);
-		} else {
-			if(NotationPackage.eINSTANCE.getDiagram().isSuperTypeOf(getReferencedElementEClass(view))){
-				clazz = NoteEditPart.class;
-			}
-		}
-	    return clazz;
-	}
-	
-	/*
-	 * (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 CreateRootEditPartOperation) {
-			return true;
-		}
-		return super.provides(operation);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider#createDiagramRootEditPart()
-	 */
-	public RootEditPart createRootEditPart(Diagram diagram) {
-		return new DiagramRootEditPart(diagram.getMeasurementUnit());
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramIconProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramIconProvider.java
deleted file mode 100644
index 5727152..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramIconProvider.java
+++ /dev/null
@@ -1,100 +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.providers.internal;
-
-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.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Provides Geoshape Icons
- * 
- *  @author jschofie
- */
-public class DiagramIconProvider extends AbstractProvider
-implements IIconProvider {
-		
-	/** map for storing icon images based on type */
-	private static HashMap typeIconMap = new HashMap();
-	static {
-  		typeIconMap.put(DiagramNotationType.NOTE, SharedImages.IMG_NOTE);
-    	typeIconMap.put(DiagramNotationType.TEXT, SharedImages.IMG_TEXT);		
-	}
-
-
-
-	/* (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) {
-            if (DiagramViewProvider.isTextView(view)) {
-                return SharedImages.get(SharedImages.IMG_TEXT);
-            } else if (DiagramViewProvider.isNoteView(view)) {
-
-                return SharedImages.get(SharedImages.IMG_NOTE);
-            } else if (ViewType.GROUP.equals(view.getType())) {
-                 return DiagramUIPluginImages
-                    .get(DiagramUIPluginImages.IMG_GROUP);
-            }
-        } else if (hint.getAdapter(IElementType.class) != null) {
-            String fileName = (String) typeIconMap.get(hint);
-            return SharedImages.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) {
-
-		IIconOperation oper = (IIconOperation)operation;
-		
-		IAdaptable adapter = oper.getHint();
-		
-		if (adapter == null){
-			return false;
-		}
-				
-        View view = (View) adapter.getAdapter(View.class);
-        if (view != null
-            && (DiagramViewProvider.isNoteView(view)
-                || DiagramViewProvider.isTextView(view) || ViewType.GROUP
-                .equals(view.getType()))) {
-            return true;
-        }
-		
-		if (oper.getHint().getAdapter(IElementType.class) != null) {
-			String fileName = (String) typeIconMap.get(oper.getHint());
-				return (fileName != null);				
-		}
-				
-		return false;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramModelingAssistantProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramModelingAssistantProvider.java
deleted file mode 100644
index 8b405a2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramModelingAssistantProvider.java
+++ /dev/null
@@ -1,183 +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.providers.internal;
-
-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.diagram.ui.editparts.INotableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-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;
-
-/**
- * Provides modeling assistant functionality for diagram shapes (i.e. connection
- * handles, connection creation to a new shape).
- * 
- * @author cmahoney
- */
-public class DiagramModelingAssistantProvider
-	extends ModelingAssistantProvider {
-
-	/** List containing the connection types. */
-	private static List connectionTypes = null;
-
-	/** List containing the shape 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(DiagramNotationType.NOTE_ATTACHMENT);
-		}
-		return connectionTypes;
-	}
-
-	/**
-	 * Gets the list of shape types initialized lazily.
-	 * 
-	 * @return the list of shape types
-	 */
-	private static List getShapeTypes() {
-		if (shapeTypes == null) {
-			shapeTypes = Collections
-				.singletonList(DiagramNotationType.NOTE);
-		}
-		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) {
-		if (source != null) {
-			INotableEditPart noteable = (INotableEditPart) source
-				.getAdapter(INotableEditPart.class);
-			if (noteable != null && noteable.canAttachNote()) {
-				return getConnectionTypes();
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.IModelingAssistantProvider#getRelTypesOnTarget(org.eclipse.core.runtime.IAdaptable)
-	 */
-	public List getRelTypesOnTarget(IAdaptable target) {
-		if (target != null) {
-			INotableEditPart noteable = (INotableEditPart) target
-				.getAdapter(INotableEditPart.class);
-			if (noteable != null && noteable.canAttachNote()) {
-				return getConnectionTypes();
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (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) {
-
-		if (source.getAdapter(NoteEditPart.class) != null) {
-			INotableEditPart noteable = (INotableEditPart) target
-				.getAdapter(INotableEditPart.class);
-			if (noteable != null && noteable.canAttachNote()) {
-				return getConnectionTypes();
-			}
-		} else if (target.getAdapter(NoteEditPart.class) != null) {
-			INotableEditPart noteable = (INotableEditPart) source
-				.getAdapter(INotableEditPart.class);
-			if (noteable != null && noteable.canAttachNote()) {
-				return getConnectionTypes();
-			}
-		}
-
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * (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) {
-
-		// Attaching a note to another note is unnecessary.
-		if (target.getAdapter(NoteEditPart.class) != null
-			|| !relationshipType
-				.equals(DiagramNotationType.NOTE_ATTACHMENT)) {
-			return Collections.EMPTY_LIST;
-		}
-
-		return getShapeTypes();
-	}
-
-	/*
-	 * (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) {
-
-		// Attaching a note to another note is unnecessary.
-		if (source.getAdapter(NoteEditPart.class) != null
-			|| !relationshipType
-				.equals(DiagramNotationType.NOTE_ATTACHMENT)) {
-			return Collections.EMPTY_LIST;
-		}
-
-		return getShapeTypes();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramParserProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramParserProvider.java
deleted file mode 100644
index 7fe0650..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramParserProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2005, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.internal;

-

-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.parser.CommonParserHint;

-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

-import org.eclipse.gmf.runtime.diagram.ui.providers.parsers.DescriptionParser;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-

-/**

- * @author melaasar

- */

-public class DiagramParserProvider 

-	extends AbstractProvider

-	implements IParserProvider {

-

-	/**

-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider#getParser(org.eclipse.core.runtime.IAdaptable)

-	 */

-	public IParser getParser(IAdaptable hint) {

-		String stringHint = (String) hint.getAdapter(String.class);

-		if (stringHint.equals(CommonParserHint.DESCRIPTION))

-			return DescriptionParser.getInstance();

-		return null;

-	}

-

-	/**

-	 * @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 GetParserOperation) {

-			IAdaptable hint = ((GetParserOperation) operation).getHint();

-

-			String stringHint = (String) hint.getAdapter(String.class);

-			if( stringHint == null ) {

-				return false;

-			}

-

-			EObject object = (EObject) hint.getAdapter(EObject.class);

-			if (object instanceof View && ((View) object).getStyle(NotationPackage.eINSTANCE.getDescriptionStyle()) != null) {

-				if (CommonParserHint.DESCRIPTION.equals(stringHint))

-					return true;

-			}

-		}

-		return false;

-	}

-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramPropertiesProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramPropertiesProvider.java
deleted file mode 100644
index 987abe2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramPropertiesProvider.java
+++ /dev/null
@@ -1,131 +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.providers.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.gef.EditPart;
-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.common.ui.services.properties.PropertiesService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.properties.descriptors.NotationPropertySource;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n.DiagramUIProvidersMessages;
-import org.eclipse.gmf.runtime.emf.ui.properties.providers.GenericEMFPropertiesProvider;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * @author Tauseef A. Israr Created: Nov 15, 2002
- * 
- * This is a properties provider class based on Properties Service Provider
- * infrastructure.
- */
-public class DiagramPropertiesProvider
-	extends GenericEMFPropertiesProvider
-	implements IPropertiesProvider {
-
-	public static String VIEW_CATEGORY = DiagramUIProvidersMessages.DiagramPropertiesProvider_viewCategory;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.emf.ui.properties.providers.GenericEMFPropertiesProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	public boolean provides(IOperation operation) {
-
-		if (operation == null)
-			return false;
-
-		if (operation instanceof GetPropertySourceOperation) {
-			Object object = ((GetPropertySourceOperation) operation)
-				.getObject();
-
-			if (object == null)
-				return false;
-
-			if (object instanceof View)
-				return true;
-			
-			if(object instanceof Style)
-				return true;
-			
-			if (object instanceof GraphicalEditPart &&
-					!((GraphicalEditPart)object).hasNotationView())
-					return false;
-			
-			return object instanceof EditPart && ((EditPart) object).getModel() instanceof View;
-
-		}
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.services.internal.properties.XToolsAbstractPropertiesProvider#getPropertySource(org.eclipse.ui.views.properties.IPropertySource,
-	 *      java.lang.Object)
-	 */
-	public ICompositePropertySource getPropertySource(Object object) {
-
-		if (object instanceof View || object instanceof Style )
-			return super.getPropertySource(object);
-		
-		if (object instanceof EditPart) {
-			Object model = ((EditPart) object).getModel();
-			if (model instanceof View) {
-				View view = (View) model;
-				return super.getPropertySource(view);
-			}
-		}
-
-		return null;
-	}
-
-	/*
-	 * @param eObject @return
-	 */
-	protected ICompositePropertySource getElementPropertySource(EObject eObject) {
-
-		IPropertySource elementPropertySource = null;
-
-		if (eObject instanceof IAdaptable)
-			elementPropertySource = (IPropertySource) Platform
-				.getAdapterManager().getAdapter(eObject, IPropertySource.class);
-
-		if (elementPropertySource == null)
-			elementPropertySource = PropertiesService.getInstance()
-				.getPropertySource(eObject);
-
-		return (elementPropertySource instanceof ICompositePropertySource) ? (ICompositePropertySource) elementPropertySource
-			: null;
-
-	}
-
-	/*
-	 * (non-Javadoc) Instantiates and returns property source instance
-	 * appropriate for this provider
-	 *  
-	 */
-	protected ICompositePropertySource createPropertySource(Object object,
-			IItemPropertySource itemPropertySource) {
-
-		return new NotationPropertySource(object, itemPropertySource,
-			VIEW_CATEGORY);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersDebugOptions.java
deleted file mode 100644
index 0f41fb1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersDebugOptions.java
+++ /dev/null
@@ -1,43 +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.providers.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- *  @author Yasser Lulu
- *
- */
-public final class DiagramProvidersDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramProvidersDebugOptions() {
-		//static class: prevent instatiation
-	}
-
-	public static final String DEBUG = DiagramProvidersPlugin.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.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersPlugin.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersPlugin.java
deleted file mode 100644
index 618af07..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersPlugin.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.providers.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Yasser Lulu
- */
-public class DiagramProvidersPlugin
-	extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static DiagramProvidersPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public DiagramProvidersPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DiagramProvidersPlugin 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/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersStatusCodes.java
deleted file mode 100644
index 5b162ad..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramProvidersStatusCodes.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.diagram.ui.providers.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- *  @author Yasser Lulu
- *
- */
-public final class DiagramProvidersStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramProvidersStatusCodes() {
-		//static class: prevent instatiation
-	}
-
-	public static final int OK = 0;	
-	
-	/**
-	 * 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 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.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramViewProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramViewProvider.java
deleted file mode 100644
index 18c6ed2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramViewProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.NoteAttachmentViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.NoteViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.TextShapeViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.BasicDecorationViewFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Supports the creation of <b>diagram</b> view elements.  
- * Diagram elements are commonly used by all plugins.
- * 
- * @author schafe, cmahoney
- */
-public class DiagramViewProvider extends AbstractViewProvider {
-
-	/** list of supported shape views. */
-    static private final Map nodeMap = new HashMap();
-	static {
-		nodeMap.put(CommonParserHint.DESCRIPTION, BasicDecorationViewFactory.class);
-		nodeMap.put(ViewType.DIAGRAM_NAME, BasicDecorationViewFactory.class);
-		nodeMap.put(ViewType.NOTE, NoteViewFactory.class);
-		nodeMap.put(ViewType.TEXT, TextShapeViewFactory.class);
-	}
-	/** list of supported connection views. */
-	static private final Map connectionMap = new HashMap();
-    static {
-		connectionMap.put(
-			ViewType.NOTEATTACHMENT,
-			NoteAttachmentViewFactory.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) {
-		if (semanticHint != null && semanticHint.length() > 0)
-			return (Class)nodeMap.get(semanticHint);
-		if (semanticAdapter != null) {
-			EClass semanticEClass = getSemanticEClass(semanticAdapter);			
-			if (semanticEClass != null && NotationPackage.eINSTANCE.getDiagram().isSuperTypeOf(semanticEClass)) {
-				return NoteViewFactory.class;
-			}
-			return (Class)nodeMap.get(semanticEClass);
-		}
-		return null;
-	}
-
-	/**
-	 * 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);
-	}
-	
-	public static boolean isNoteView(View view) {
-		if ((view != null)) {
-			return (NoteViewFactory.class.equals(nodeMap.get(view.getType())));
-		}
-		return false;
-	}
-
-    public static boolean isTextView(View view){
-		if ((view != null)) {
-			return (TextShapeViewFactory.class.equals(nodeMap.get(view.getType())));
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/PrintingContributionItemProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/PrintingContributionItemProvider.java
deleted file mode 100644
index 5b8ccd6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/PrintingContributionItemProvider.java
+++ /dev/null
@@ -1,40 +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.providers.internal;
-
-import org.eclipse.jface.action.IAction;
-
-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.PageSetupAction;
-
-/**
- * Add the page setup action.
- * 
- * @author Wayne Diu, wdiu
- */
-public class PrintingContributionItemProvider
-	extends AbstractContributionItemProvider {
-
-	/**
-	 * @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) {
-
-		if (actionId.equals(PageSetupAction.ID))
-			return new PageSetupAction();
-
-		return super.createAction(actionId, partDescriptor);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/RadialProvider.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/RadialProvider.java
deleted file mode 100644
index 4d3e583..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/RadialProvider.java
+++ /dev/null
@@ -1,1169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import java.security.InvalidParameterException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.emf.transaction.TransactionalEditingDomain;
-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.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.IPropertyValueDeferred;
-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.commands.ICommandProxy;
-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.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.ChangeBoundsDeferredRequest;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutNodesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n.DiagramUIProvidersMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.SetAllBendpointRequest;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author sshaw
- * 
- * RadialProvider class that provides for LayoutType.RADIAL.
- */
-public class RadialProvider
-	extends AbstractLayoutEditPartProvider {
-
-	/* (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) {
-		Assert.isNotNull(operation);
-
-		View cview = getContainer(operation);
-		if (cview == null)
-			return false;
-		
-		IAdaptable layoutHint = ((LayoutNodesOperation) operation).getLayoutHint(); 
-		String layoutType = (String) layoutHint.getAdapter(String.class);
-		return LayoutType.RADIAL.equals(layoutType);		
-	} 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider#layoutEditParts(org.eclipse.gef.GraphicalEditPart, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public Command layoutEditParts(
-		GraphicalEditPart containerEP,
-		IAdaptable layoutHint) {
-
-		List children = containerEP.getChildren();
-		return layout(containerEP, children, findRootView(children), layoutHint);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutEditPartProvider#layoutEditParts(java.util.List, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public Command layoutEditParts(
-		List selectedObjects,
-		IAdaptable layoutHint) {
-
-		if (selectedObjects.size()== 0){
-			return null;
-		}
-		
-		GraphicalEditPart editPart = (GraphicalEditPart) selectedObjects.get(0);		
-		GraphicalEditPart containerEditPart = (GraphicalEditPart) editPart.getParent();
-		
-		return layout(containerEditPart, selectedObjects, findRootView(selectedObjects), layoutHint);
-	}
-
-	/**
-	 * Method layout.
-	 * 
-	 * @param layoutType
-	 * @param containerEP
-	 * @param selectedObjects
-	 * @param rootEP
-	 * @return Command
-	 * @throws InvalidParameterException
-	 *             if either parameter is null.
-	 */
-	public Command layout(
-		GraphicalEditPart containerEP,
-		List selectedObjects,
-		ShapeEditPart rootEditPart,
-		IAdaptable layoutHint) {
-
-		if (containerEP == null || selectedObjects == null) {
-			InvalidParameterException ipe = new InvalidParameterException();
-			Trace.throwing(DiagramProvidersPlugin.getInstance(), DiagramActionsDebugOptions.EXCEPTIONS_THROWING, getClass(), "layout()", //$NON-NLS-1$
-			ipe);
-			throw ipe;
-		}
-
-		if (rootEditPart == null)
-			rootEditPart = findRootView(selectedObjects);
-
-		List parts = new ArrayList(selectedObjects.size());
-
-		// Only add IShapeView to the master list
-		ListIterator li = selectedObjects.listIterator();
-		while (li.hasNext()) {
-			EditPart ep = (EditPart) li.next();
-			if (!ep.equals(rootEditPart)
-				&& (ep instanceof ShapeEditPart
-					|| ep instanceof ConnectionNodeEditPart)) {
-				parts.add(ep);
-			}
-		}
-
-		Command cmd = null;
-		CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-		RadialLayout radialLayout =
-			new RadialLayout(rootEditPart, parts, 0, Math.PI * 2, false);
-
-		cmd = radialLayout.getPrelayoutCommand();
-		if (cmd != null)
-			cc.add(cmd);
-		
-		try {
-			cmd = radialLayout.getCommand();
-			parts.add(rootEditPart);
-		} catch (LayoutEstheticsException e) {
-			// since the Layout esthetics have been violated, use the default layout
-			// instead.
-			parts.add(rootEditPart);
-			
-			ArrangeRequest request = new ArrangeRequest(
-				RequestConstants.REQ_ARRANGE_DEFERRED);
-			request.setViewAdaptersToArrange(parts);
-			cmd = containerEP.getCommand(request);
-		}
-		
-		if (cmd != null)
-			cc.add(cmd);
-		
-		Request req = new Request(RequestConstants.REQ_REFRESH);
-		cmd = rootEditPart.getParent().getCommand(req);
-		if (cmd != null)
-			cc.add(cmd);
-		
-		// position the entire radial circle
-		OffsetRadialPartsCommand orpc = new OffsetRadialPartsCommand(
-            rootEditPart.getEditingDomain(), parts);
-        cmd = new ICommandProxy(orpc);
-		if (cmd != null)
-			cc.add(cmd);
-		
-		return cc;
-	}
-
-	/**
-	 * @author sshaw
-	 *
-	 * Command to update the entire position of the Radial circle.
-	 */
-	static protected class OffsetRadialPartsCommand extends AbstractTransactionalCommand {
-		private List editParts;
-		private Rectangle origRect;
-		
-		/**
-		 * @param editParts
-		 * @param ptRoot
-		 */
-		public OffsetRadialPartsCommand(TransactionalEditingDomain editingDomain, List editParts) {
-			super(editingDomain, "", null); //$NON-NLS-1$
-			this.editParts = editParts;
-			origRect = calcBoundBox();
-		}
-		
-		protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            
-			if (null == editParts)
-				return CommandResult.newCancelledCommandResult();
-			
-			Rectangle radialRect = calcBoundBox();
-			
-			IGraphicalEditPart firstEP = (IGraphicalEditPart)editParts.get(0);
-			IMapMode mm = MapModeUtil.getMapMode(firstEP.getFigure());
-			
-			// consider ideal location
-			Rectangle newRadialRect = new Rectangle(radialRect);
-			newRadialRect.translate( -radialRect.getTopLeft().x + mm.DPtoLP(50),
-							 -radialRect.getTopLeft().y + mm.DPtoLP(50));
-			
-			if (origRect.x > newRadialRect.x && origRect.y > newRadialRect.y) {
-				newRadialRect = new Rectangle( Math.max(newRadialRect.x, origRect.x - (radialRect.width / 2)), 
-											   Math.max(newRadialRect.y, origRect.y - (radialRect.height / 2)), 
-											radialRect.width, radialRect.height);
-			}
-			
-			final Point translate = new Point(newRadialRect.getTopLeft().x - radialRect.getTopLeft().x,
-										newRadialRect.getTopLeft().y - radialRect.getTopLeft().y);
-			 
-			ListIterator li = editParts.listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				View view = gep.getNotationView();
-				if (view!=null){
-					Integer pos = (Integer)ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X());
-					ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X(), new Integer(pos.intValue() + translate.x));
-					pos = (Integer)ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y());
-					ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y(), new Integer(pos.intValue() + translate.y));
-				}
-			}
-			
-			// clear for garbage collection;
-			editParts = null;
-			return CommandResult.newOKCommandResult();
-		}
-
-		/**
-		 * @return
-		 */
-		private Rectangle calcBoundBox() {
-			Rectangle radialRect = null;
-			ListIterator li = editParts.listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				if (null == radialRect) {
-					radialRect = new Rectangle(gep.getFigure().getBounds());
-				}
-				else {
-					radialRect.union(gep.getFigure().getBounds());
-				}
-			}
-			return null == radialRect ?  new Rectangle() : radialRect;
-		}
-	}
-	
-	/**
-	 * Method findRootView. Given a list of views, calculate the root view that
-	 * all other views are ultimately related to.
-	 * 
-	 * @param views
-	 *            List of editparts to determine the root view from.
-	 * @return ShapeEditPart shape editpart object that represents the root
-	 *         view.
-	 */
-	protected ShapeEditPart findRootView(List editparts) {
-		if (editparts == null)
-			throw new InvalidParameterException();
-
-		// TodoKit: I am sure we must find better ways to dig up the root of a
-		// tree, for now I assume it to be
-		// the first in the collection as I know it was the first view created.
-		int count = editparts.size(); 
-		if (count > 0) {
-			EditPart ep = (EditPart) editparts.get(0);
-			if (ep instanceof ShapeEditPart) {
-				return (ShapeEditPart) editparts.remove(0);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @author sshaw
-	 *
-	 * Nested RuntimeException class thrown when the esthetics of the RadialLayout
-	 * are violated.  i.e. when certain conditions are met that ensure that the RadialLayout
-	 * will not look good.
-	 */
-	static protected class LayoutEstheticsException extends RuntimeException {
-		
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 3084395663087786098L;
-
-		/**
-		 * @param message
-		 */
-		public LayoutEstheticsException(String message) {
-			super(message);
-		}
-	}
-	
-	/**
-	 * @author sshaw
-	 * 
-	 * Helper class to build the radial layout based on a root editpart.
-	 */
-	static protected class RadialLayout {
-
-		private ShapeEditPart rootEP;
-		private List allEditparts = new ArrayList();
-		private double startTheta;
-		private double totalTheta;
-		private boolean rootPositionLocked;
-
-		public RadialLayout(
-			ShapeEditPart rootEP,
-			List shapeViews,
-			double startTheta,
-			double totalTheta,
-			boolean rootPositionLocked) {
-			this.rootEP = rootEP;
-			this.allEditparts.addAll(shapeViews);
-			this.startTheta = startTheta;
-			this.totalTheta = totalTheta;
-			this.rootPositionLocked = rootPositionLocked;
-		}
-
-		/**
-		 * Method getRootEditPart.
-		 * 
-		 * @return ShapeEditPart
-		 */
-		public ShapeEditPart getRootEditPart() {
-			return rootEP;
-		}
-
-		/**
-		 * Method getCommand.
-		 * 
-		 * @return Command
-		 */
-		public Command getCommand() throws LayoutEstheticsException {
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			Command cmd = null;
-			List restViews = new ArrayList();
-			
-			List firstCircleParts = new ArrayList();
-			
-			int innerRingCount =
-				findChildViews(rootEP, allEditparts, firstCircleParts, restViews);
-
-			double theta = Math.PI;
-			if (innerRingCount > 1) {
-				theta = totalTheta / innerRingCount;
-			} 
-						
-			// initialize the childAndSectionViewMap structure
-			Map childAndSectionMap = new Hashtable(firstCircleParts.size());
-			List circleSectionParts = null;
-			List firstCircleShapes = new ArrayList(childAndSectionMap.keySet().size());
-			
-			for (int i = 0; i < firstCircleParts.size(); i++) {
-				EditPart ep = (EditPart) firstCircleParts.get(i);
-				if (ep instanceof ShapeEditPart) {
-					ShapeEditPart shapeEP = (ShapeEditPart) ep;
-					circleSectionParts =
-						new ArrayList(firstCircleParts.size());
-
-					List restRestViews = new ArrayList();
-					findChildViews(
-						shapeEP,
-						restViews,
-						circleSectionParts,
-						restRestViews);
-
-					firstCircleShapes.add(ep);
-					childAndSectionMap.put(ep, circleSectionParts);
-					childAndSectionMap.put(circleSectionParts, restRestViews);
-				} 
-			}
-			
-			CalculateRadialInfoCommand radialInfoCmd = 
-				new CalculateRadialInfoCommand(rootEP, firstCircleShapes, theta);
-			cc.add(radialInfoCmd);
-			
-			cmd = positionRings(firstCircleParts, childAndSectionMap, theta, radialInfoCmd);
-			if (cmd != null)
-				cc.add(cmd);
-			
-			// route any extra connection, restViews should only contain
-			// connections by now, all other views has
-			// better be placed already.
-			cmd = routeConnection(firstCircleParts);
-			if (cmd != null)
-				cc.add(cmd);
-			
-			double increaseTheta = theta;
-			cmd = positionNextRings(firstCircleParts, childAndSectionMap, increaseTheta );
-			if (cmd != null)
-				cc.add(cmd);
-			
-			return cc;
-		}
-		
-		/**
-		 * getPrelayoutCommand
-		 * Initializes the set of shapes for the layout operation.
-		 * @return Cpmmand that will initialize the shapes for the layout operation.
-		 */
-		private Command getPrelayoutCommand() {
-			List restViews = new ArrayList();
-			List firstCircleParts = new ArrayList();
-			
-			findChildViews(rootEP, allEditparts, firstCircleParts, restViews);
-			Command cmd = diminishCircle(firstCircleParts);
-				
-			int size = getFontSize(rootEP);
-			int fontAdjust = size / 8;
-
-			size -= fontAdjust;
-
-			Command c2 = diminishCircle(restViews, size);
-			if (c2 != null) {
-				if (cmd != null)
-					cmd.chain(c2);
-				else
-					cmd = c2;
-			}
-
-			Request req = new Request(RequestConstants.REQ_REFRESH);
-			Command c3 = rootEP.getParent().getCommand(req);
-			if (c3 != null) {
-				if (cmd != null)
-					cmd.chain(c3);
-				else
-					cmd = c3;
-			}
-			
-			return cmd;
-		}
-
-		/**
-		 * positionNextRings
-		 * Method to handle the recursion of the RadialLayout.  
-		 * 
-		 * @param firstCircleParts
-		 * @param childAndSectionMap
-		 * @param theta
-		 * @return
-		 */
-		private Command positionNextRings(List firstCircleParts, Map childAndSectionMap, double theta ) {
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			int n = 0;
-			
-			for (int i = 0; i < firstCircleParts.size(); i++) {
-				double totalThetaPrim = theta;
-				EditPart part = (EditPart) firstCircleParts.get(i);
-				if (part instanceof ShapeEditPart) {
-					List parts = (List)childAndSectionMap.get(part);
-					
-					if (parts != null
-						&& !parts.isEmpty()) {
-						int posViewCount = 0;
-						
-						n = i;
-						// check next in list to see if we can increase theta
-						while (i + 1 < firstCircleParts.size()) {
-							Object key = firstCircleParts.get(i+1);
-							List nextViews = (List)childAndSectionMap.get(key);
-							if (null != nextViews && nextViews.size() == 0) {
-								totalThetaPrim = Math.min(Math.PI, totalThetaPrim + theta);
-								i++;
-							}
-							else
-								break;
-						}
-						
-						// count the ShapeEditParts
-						ListIterator li = parts.listIterator();
-						while (li.hasNext()) {
-							if (li.next() instanceof ShapeEditPart)
-								posViewCount++;
-						}
-
-						double dTheta = startTheta + (n * theta);
-						double thetaPrim = totalThetaPrim / posViewCount;
-						double startThetaPrim;
-						if (posViewCount < 2) {
-							startThetaPrim = dTheta;
-						} else {
-							startThetaPrim = dTheta - totalThetaPrim / 2 + thetaPrim / 2;
-						}
-
-						List restRestViews = (List)childAndSectionMap.get(parts);
-						parts.addAll(restRestViews);
-						
-						RadialLayout radialLayout =
-							new RadialLayout((ShapeEditPart)part, parts, startThetaPrim, totalThetaPrim, true);
-						Command cmd = radialLayout.getCommand();
-						if (cmd != null)
-							cc.add(cmd);
-					}
-				}
-			}
-			
-			if (!cc.isEmpty())
-				return cc;
-			
-			return null;
-		}
-
-		/**
-		 * @author sshaw
-		 * 
-		 * This class implements IAdaptable so that a deferred point can be
-		 * calculated for an edit part.
-		 */
-		static protected class RadialPosition implements IAdaptable {
-
-			private ShapeEditPart sep;
-			private CalculateRadialInfoCommand radialInfo;
-			private double theta;
-			private boolean useDelta;
-			private Point ptLocation = null;
-
-			/**
-			 * Method RadialPosition. Constructor for the inner ring elements.
-			 * 
-			 * @param sep
-			 * @param innerIndex
-			 */
-			public RadialPosition(ShapeEditPart sep, double theta, CalculateRadialInfoCommand radialInfo, boolean useDelta) {
-				this.sep = sep;
-				this.theta = theta;
-				this.radialInfo = radialInfo;
-				this.useDelta = useDelta;
-			}
-
-			/**
-			 * Method getAdapter.
-			 * 
-			 * @param adapterType
-			 * @return Object
-			 */
-			public Object getAdapter(Class adapterType) {
-				if (adapterType == IPropertyValueDeferred.class) {
-					return getPosition();
-				}
-
-				return null;
-			}
-
-			/**
-			 * Method getPosition. Calculates the point based on stored
-			 * information about the radius and index of the edit part.
-			 * 
-			 * @return Point
-			 */
-			public Point getPosition() {
-				if (null == ptLocation) {
-					ptLocation = new Point(0, 0);
-					
-					if (null != radialInfo) {
-						ptLocation.x =
-							Math.round(
-								radialInfo.getRadius() * ((float) Math.cos(theta)) ); 
-						ptLocation.y =
-							Math.round(
-								radialInfo.getRadius() * ((float) Math.sin(theta)) );
-						
-						if (useDelta)
-							ptLocation.translate(radialInfo.getDelta());
-					}
-					
-					ptLocation.translate(
-							-sep.getSize().width / 2,
-							-sep.getSize().height / 2);
-					
-					sep = null;
-					radialInfo = null;
-				}
-				
-				return ptLocation;
-			}
-		}
-
-		/**
-		 * Method findChildViews. This method finds all of the child views
-		 * relative to a given root view and a set of views.
-		 * 
-		 * @param rootEditPart
-		 *            ShapeEditPart to be compared against. If a connection ends
-		 *            on this root editpart the end must be related.
-		 * @param editparts
-		 *            List of a editparts that are used to compare against the
-		 *            root editpart.
-		 * @param childEPs
-		 *            List that is passed in and populated by the method. It
-		 *            will be populated the editparts that are related to the
-		 *            rootView.
-		 * @param restEPs
-		 *            List that is passed in and populated by the method. It
-		 *            will be populated with the editparts are not related to
-		 *            the rootView.
-		 * @return int number of related shape editparts in the childViews
-		 *         list.
-		 */
-		protected int findChildViews(
-			ShapeEditPart rootEditPart,
-			List editparts,
-			List childEPs,
-			List restEPs) {
-			if (rootEditPart == null)
-				throw new InvalidParameterException();
-
-			if (childEPs == null)
-				throw new InvalidParameterException();
-
-			if (restEPs == null)
-				throw new InvalidParameterException();
-
-			Set allSet = new HashSet(editparts.size());
-			int posViewCount = 0;
-			int count = editparts.size();
-			for (int i = 0; i < count; i++) {
-				EditPart ep = (EditPart) editparts.get(i);
-				allSet.add(ep);
-			}
-
-			//get a list of the selected connections and the selected
-			//shapes connections
-			List connectionEPs = new ArrayList();
-			for (int i = 0; i < count; i++) {
-				EditPart ep = (EditPart) editparts.get(i);
-				if (ep instanceof ShapeEditPart) {
-					ShapeEditPart shapeEP = (ShapeEditPart) ep;
-					connectionEPs.addAll(shapeEP.getSourceConnections());
-					connectionEPs.addAll(shapeEP.getTargetConnections());
-				} else if (ep instanceof ConnectionNodeEditPart) {
-					connectionEPs.add(ep);
-				}
-			}
-
-			for (int i = 0; i < connectionEPs.size(); i++) {
-				EditPart ep = (EditPart) connectionEPs.get(i);
-				if (ep instanceof ConnectionNodeEditPart) {
-					ConnectionNodeEditPart connectionEP =
-						(ConnectionNodeEditPart) ep;
-					EditPart fromEP = connectionEP.getSource();
-					EditPart toEP = connectionEP.getTarget();
-
-					EditPart el = null;
-					if (fromEP.equals(rootEditPart)) {
-						el = toEP;
-					} else if (toEP.equals(rootEditPart)) {
-						el = fromEP;
-					} 
-
-					if (el != null && allSet.contains(el)) {
-						childEPs.add(el);
-						posViewCount++;
-						childEPs.add(connectionEP);
-
-						allSet.remove(el);
-					}
-				}
-
-			}
-
-			// If the rest collection was requested, pick out all views that
-			// was not in the child collection.
-			restEPs.addAll(allSet);
-
-			return posViewCount;
-		}
-
-		/**
-		 * Method getFontSize. Returns the size of the associated font with the
-		 * viewEl,
-		 * 
-		 * @param sep
-		 *            ShapeEditPart element to retrieve the fontdata from.
-		 * @return int value of the font size (height).
-		 */
-		protected int getFontSize(ShapeEditPart sep) {
-			if (sep == null)
-				throw new InvalidParameterException();
-			View view = sep.getNotationView();
-			if (view!=null){
-				FontStyle style = (FontStyle) view.getStyle(NotationPackage.eINSTANCE.getFontStyle());
-				if (style != null)
-					return style.getFontHeight();
-			}
-			return 9;
-		}
-
-		/**
-		 * Method setFontSize. Sets the new font size for a given view element.
-		 * This is a convenience wrapper. The same functionality can be
-		 * achieved by using the setPropertyValue api.
-		 * 
-		 * @param viewEl
-		 *            IView element to retrieve and set the fontdata from.
-		 * @param size
-		 *            value of the new font size (height).
-		 * @return Command
-		 */
-		protected Command setFontSize(ShapeEditPart sep, int size) {
-			if (sep == null)
-				throw new InvalidParameterException();
-
-			ChangePropertyValueRequest cpvr = new ChangePropertyValueRequest(
-				DiagramUIProvidersMessages.RadialProvider_changeFontRequest_label,
-				Properties.ID_FONTSIZE, new Integer(size));
-		
-			return getCommand(sep, cpvr, true);
-		}
-
-		/**
-		 * Method diminishInnerCircle. Given a list of views this method will
-		 * parse through them and diminish their size by setting the font.
-		 * 
-		 * @param editparts
-		 *            List of editparts to diminish the size of.
-		 * @param fontSize
-		 *            int value of the new font size.
-		 * @return Command
-		 *  
-		 */
-		protected Command diminishCircle(List editparts) {
-			if (editparts == null)
-				throw new InvalidParameterException();
-
-			int count = editparts.size();
-
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			
-			//diminish by collapsing all compartments and hiding
-			// connection labels.
-			for (int i = 0; i < count; i++) {
-				EditPart editpart = (EditPart) editparts.get(i);
-				ChangePropertyValueRequest request = null;
-
-				if (editpart instanceof ShapeEditPart) {
-					request = new ChangePropertyValueRequest(
-						DiagramUIProvidersMessages.RadialProvider_changeVisibilityRequest_label,
-						Properties.ID_ISVISIBLE, Boolean.FALSE);
-
-					ShapeEditPart shapeEditPart = (ShapeEditPart) editpart;
-					
-					Iterator compartments = shapeEditPart
-						.getResizableCompartments().iterator();
-					while (compartments.hasNext()) {
-						cc.add(((EditPart) compartments.next())
-							.getCommand(request));
-					}
-					
-					
-				}
-			}
-
-			if (!cc.isEmpty())
-				return cc;
-
-			return null;
-		}
-
-		/**
-		 * Method diminishCircle. Given a list of views this method will
-		 * parse through them and diminish their size by setting the font and
-		 * also by hiding all compartments.
-		 * 
-		 * @param editparts
-		 *            List of editparts to diminish the size of.
-		 * @param fontSize
-		 *            int value of the new font size.
-		 * @return Command
-		 *  
-		 */
-		protected Command diminishCircle(List editparts, int fontSize) {
-			if (editparts == null)
-				throw new InvalidParameterException();
-
-			long count = editparts.size();
-
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-
-			// diminish the same as the inner circle first.
-			Command cmd = diminishCircle(editparts);
-			if (cmd != null)
-				cc.add(cmd);
-			
-			//diminish font for outer circle
-			for (int i = 0; i < count; i++) {
-				EditPart ep = (EditPart) editparts.get(i);
-				if (ep instanceof ShapeEditPart) {
-					cmd = setFontSize((ShapeEditPart) ep, fontSize);
-					if (cmd != null)
-						cc.add(cmd);
-				}
-			}
-
-			if (!cc.isEmpty())
-				return cc;
-
-			return null;
-		}
-
-        /**
-         * sortFirstCircleParts
-         * Sort the circle views in a pattern such that the next iteration of radial 
-         * views will be positioned evenly w.r.t. each other.
-         * 
-         * @param firstCircleViews List of circle views
-         * @param childAndSectionViewMap Map of next level views.
-         */
-        protected void sortFirstCircleParts(List firstCircleParts, Map childAndSectionMap) {
-        	List firstCircleShapeParts = new ArrayList(firstCircleParts.size());
-        	List rest = new ArrayList(firstCircleParts.size());
-        	ListIterator li = firstCircleParts.listIterator();
-        	while (li.hasNext()) {
-        		Object obj = li.next();
-        		if (obj instanceof ShapeEditPart) {
-        			firstCircleShapeParts.add(obj);
-        		}
-        		else
-        			rest.add(obj);
-        	}
-        	
-            // figure out how many empty 2nd line children there are
-            List emptyNextCircleList = new ArrayList(firstCircleParts.size());
-            List nextCircleList = new ArrayList(firstCircleParts.size());
-            for (int i = 0; i < firstCircleShapeParts.size(); i++) {
-            	List circleList = (List)childAndSectionMap.get(firstCircleShapeParts.get(i));
-        		if (null != circleList && circleList.size() == 0)
-        			emptyNextCircleList.add(firstCircleShapeParts.get(i));
-        		else
-        			nextCircleList.add(firstCircleShapeParts.get(i));
-            }
-            
-            firstCircleParts.clear();
-            if (nextCircleList.size() > 1) {
-            	int addInc = firstCircleShapeParts.size() / nextCircleList.size();
-	            int i = 0;
-	            while (nextCircleList.size() > 0 || emptyNextCircleList.size() > 0) {
-	            	if (i % addInc == 0 && nextCircleList.size() > 0) {
-	            		firstCircleParts.add(nextCircleList.remove(0));
-	            	}
-	            	else {
-	            		if (emptyNextCircleList.size() > 0)
-	            			firstCircleParts.add(emptyNextCircleList.remove(0));
-	            	}
-	            	i++;
-	            }
-            }
-            else
-            	firstCircleParts.addAll(firstCircleShapeParts);
-            
-            firstCircleParts.addAll(rest);
-        }
-        
-		/**
-		 * Method positionRings. This method positions the view rings around
-		 * the root view.
-		 * 
-		 * @return Command
-		 */
-		protected Command positionRings(List firstCircleParts, Map childAndSectionMap, 
-										double theta, CalculateRadialInfoCommand radialInfo) {
-			int n = 0;
- 
-			if (theta < Math.PI / 32 && isRootPositionLocked())
-				throw new LayoutEstheticsException("Angle is too small to resulting in very large radius");//$NON-NLS-1$
-			
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			List editParts = new ArrayList();
-			editParts.add(rootEP);
-			
-			sortFirstCircleParts(firstCircleParts, childAndSectionMap);
-			
-			ListIterator li = firstCircleParts.listIterator();
-			while (li.hasNext()) {
-				EditPart editpart = (EditPart) li.next();
-
-				if (editpart instanceof ShapeEditPart) {
-					ShapeEditPart sep = (ShapeEditPart) editpart;
-					editParts.add(sep);
-					
-					IAdaptable deferredPos = new RadialPosition(sep, startTheta + n * theta, radialInfo, isRootPositionLocked());
-
-					ChangeBoundsDeferredRequest request =
-						new ChangeBoundsDeferredRequest(deferredPos);
-					
-					Command cmd = sep.getCommand(request);
-					
-					if (cmd != null)
-						cc.add(cmd);
-
-					n++;
-				}
-			}
-			
-			if (!isRootPositionLocked()) {
-				IAdaptable deferredRootPos = new RadialPosition(getRootEditPart(), 0, null, isRootPositionLocked());
-				ChangeBoundsDeferredRequest request = new ChangeBoundsDeferredRequest(deferredRootPos);
-				Command cmd = rootEP.getCommand(request);
-				if (cmd != null)
-					cc.add(cmd);
-			}
-			
-			if (!cc.isEmpty())
-				return cc;
-
-			return null;
-		}
-
-		/**
-		 * Method routeConnections.
-		 * 
-		 * @param connections
-		 *            List of connections that need to be routed.
-		 * @return Command
-		 */
-		protected Command routeConnection(List connections) {
-
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			ListIterator li = connections.listIterator();
-
-			while (li.hasNext()) {
-				EditPart editpart = (EditPart) li.next();
-				if (editpart instanceof ConnectionNodeEditPart) {
-					Command cmd =
-						routeConnection((ConnectionNodeEditPart) editpart);
-					if (cmd != null)
-						cc.add(cmd);
-				}
-			}
-
-			if (!cc.isEmpty())
-				return cc;
-
-			return null;
-		}
-
-		/**
-		 * Method routeConnection. Route the given connection accordingly to the
-		 * layout algorithm. TBD utilize the "avoid obstructions" routing.
-		 * 
-		 * @param connectionEP
-		 *            ConnectionNodeEditPart connection to be routed.
-		 * @return Command
-		 */
-		protected Command routeConnection(ConnectionNodeEditPart connectionEP) {
-			if (connectionEP == null)
-				throw new InvalidParameterException();
-
-			// reset connections
-
-			Connection connection = connectionEP.getConnectionFigure();
-			PointList newPoints = new PointList(2);
-			newPoints.addPoint(connection.getPoints().getFirstPoint());
-			newPoints.addPoint(connection.getPoints().getLastPoint());
-			SetAllBendpointRequest request =
-				new SetAllBendpointRequest(
-					RequestConstants.REQ_SET_ALL_BENDPOINT,
-					newPoints);
-
-			// recurse through the children to get the compound command
-			return connectionEP.getCommand(request);
-		}
-
-		/**
-		 * Method getCommand. Utility function to optionally recurse through
-		 * all child edit parts to send the request to.
-		 * 
-		 * @param editpart
-		 *            EditPart at the Top level to send the command request to.
-		 * @param request
-		 *            Request that is sent to the EditPart and it's children.
-		 * @param bRecursive
-		 *            boolean true if the method is to send the request to all
-		 *            the children of the editpart as well, false otherwise.
-		 * @return Command that is the result of the request to be executed.
-		 */
-		protected Command getCommand(
-			EditPart editpart,
-			Request request,
-			boolean bRecursive) {
-			List children = editpart.getChildren();
-			ListIterator li = children.listIterator();
-
-			CompoundCommand cc = new CompoundCommand(""); //$NON-NLS-1$
-			Command cmd = editpart.getCommand(request);
-			
-			if (cmd != null)
-				cc.add(cmd);
-
-			if (bRecursive) {
-				while (li.hasNext()) {
-					IGraphicalEditPart childEP = (IGraphicalEditPart) li.next();
-					cmd = getCommand(childEP, request, bRecursive);
-					if (cmd != null)
-						cc.add(cmd);
-				}
-			}
-
-			if (!cc.isEmpty())
-				return cc;
-
-			return null;
-		}
-		
-		/**
-		 * @author sshaw
-		 * 
-		 * This will perform some interim calculation that depends on the
-		 * previous command execution for setting the proper sizes for the view
-		 * elements.
-		 */
-		static protected class CalculateRadialInfoCommand extends Command {
-
-			//	deferred calculation values
-			private int radius;
-			private double theta;
-			private ShapeEditPart rootEP;
-			private List firstCircleViews;
-			
-			public CalculateRadialInfoCommand(ShapeEditPart rootEP, List firstCircleViews, double theta) {
-				this.rootEP = rootEP;
-				this.firstCircleViews = firstCircleViews;
-				this.theta = theta;
-			}
-	        
-			public void execute() {
-				radius =
-					calculateNeededRadius(firstCircleViews, firstCircleViews.size() * theta);
-
-				// if innerradius is less than the 2 times the diagonal of the
-				// RootView extend it some.
-				double rootDiagonal = getViewWorstExtent(rootEP);
-				if (2 * rootDiagonal > radius) {
-					radius += rootDiagonal;
-				}
-				
-				radius = Math.max(MapModeUtil.getMapMode(rootEP.getFigure()).DPtoLP(180), radius);
-			}
-
-			/**
-			 * Method calculateNeededRadius. This method calculates the minimum
-			 * radius needed to fully extent the given views away from a center
-			 * point.
-			 * 
-			 * @param circleEPs
-			 *            List of editparts that the radius will be calculated
-			 *            from.
-			 * @param sectionAngle
-			 *            This is the angle in radians that the views will
-			 *            extent around.
-			 * @return int value of the calculated radius.
-			 */
-			protected int calculateNeededRadius(
-				List circleEPs,
-				double sectionAngle) {
-				if (circleEPs == null)
-					throw new InvalidParameterException();
-
-				double neededDiameter = 0;
-				int count = circleEPs.size();
-				double maxDiagonal = 0;
-
-				for (int i = 0; i < count; i++) {
-
-					EditPart ep = (EditPart) circleEPs.get(i);
-					if (ep instanceof ShapeEditPart) {
-						ShapeEditPart sep = (ShapeEditPart) ep;
-
-						double diagonal = getViewWorstExtent(sep);
-
-						neededDiameter += diagonal;
-
-						if (diagonal > maxDiagonal)
-							maxDiagonal = diagonal;
-					}
-
-				}
-
-				double rad;
-
-				rad = neededDiameter / sectionAngle;
-
-				return (int) Math.round(rad);
-			}
-
-			/**
-			 * Method getViewWorstExtent. Determines the worst case extent of a
-			 * given view to ensure no intersection occurs. The diagonal of the
-			 * view extent is used to for this value.
-			 * 
-			 * @param sep
-			 *            ShapeEditPart to calcualte to the worst case extent
-			 *            from.
-			 * @return double value of the biggest extent where no intersection
-			 *         will occur with the view.
-			 */
-			protected double getViewWorstExtent(ShapeEditPart sep) {
-				if (sep == null)
-					throw new InvalidParameterException();
-
-				Dimension ext = sep.getSize();				
-				return Math.sqrt( 
-					(ext.width * ext.width) + (ext.height * ext.height)) * 0.80;
-			}
-
-			/**
-			 * @return Returns the radius.
-			 */
-			public int getRadius() {
-				return radius;
-			}
-
-			/**
-			 * @return Returns the delta.
-			 */
-			public Point getDelta() {
-				View view = rootEP.getNotationView();
-				if (view!=null){
-					Integer posX = (Integer)ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X());
-					Integer posY = (Integer)ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y());
-					return new Point(posX.intValue(), posY.intValue());
-				}
-				return new Point(0,0);
-			}
-		}
-		
-		/**
-		 * @return Returns the rootPositionLocked.
-		 */
-		public boolean isRootPositionLocked() {
-			return rootPositionLocked;
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/UnresolvedViewDecorator.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/UnresolvedViewDecorator.java
deleted file mode 100644
index 24631aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/UnresolvedViewDecorator.java
+++ /dev/null
@@ -1,112 +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.providers.internal;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.HashedCircle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Provides the unresolved view adornment for the views 
- * on a diagram that expect a non-null model reference.
- * 
- * @author cmahoney
- */
-public class UnresolvedViewDecorator
-	extends AbstractDecorator {
-
-	/**
-	 * Creates a new <code>UnresolvedViewDecorator</code>.
-	 * @param decoratorTarget
-	 */
-	public UnresolvedViewDecorator(IDecoratorTarget decoratorTarget) {
-		super(decoratorTarget);
-	}
-
-	/**
-	 * Creates the appropriate unresolved view decoration if all the
-	 * criteria is satisfied by the view passed in.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#refresh()
-	 */
-	public void refresh() {
-		removeDecoration();
-		EditPart editPart  = (EditPart)getDecoratorTarget().getAdapter(EditPart.class);
-		View view = (View) getDecoratorTarget().getAdapter(View.class);
-		if (!(editPart instanceof IPrimaryEditPart)) {
-			return;
-		}
-
-		EObject element = ViewUtil.resolveSemanticElement(view);
-
-		int radius = MapModeUtil.getMapMode(((GraphicalEditPart)editPart).getFigure()).DPtoLP(8);
-
-		if (editPart instanceof ShapeEditPart && element == null) {
-			HashedCircle circle = new HashedCircle(HashedCircle.HashType.X,
-				radius);
-			circle.setFill(false);
-			setDecoration(getDecoratorTarget().addShapeDecoration(circle,
-				IDecoratorTarget.Direction.NORTH_EAST, MapModeUtil.getMapMode(((ShapeEditPart)editPart).getFigure()).DPtoLP(-4),
-				false));
-
-		} else if (view instanceof Edge) {
-			Edge connectorView = (Edge)view;
-			if (element == null) {
-				HashedCircle circle = new HashedCircle(HashedCircle.HashType.X,
-					radius);
-				circle.setFill(false);
-				setDecoration(getDecoratorTarget().addConnectionDecoration(
-					circle, 50, false));
-			} else if ((connectorView.getTarget() != null)&&(ViewUtil
-				.resolveSemanticElement(connectorView.getTarget()) == null)) {
-				HashedCircle circle = new HashedCircle(
-					HashedCircle.HashType.BACKSLASH, radius);
-				circle.setFill(false);
-				setDecoration(getDecoratorTarget().addConnectionDecoration(
-					circle, 70, false));
-			}
-
-		}
-
-		if (getDecoration() == null) {
-			return;
-		}
-
-		if (ViewUtil.isPropertySupported(view,Properties.ID_LINECOLOR)) {
-			LineStyle style = (LineStyle) view.getStyle(NotationPackage.eINSTANCE.getLineStyle());
-			getDecoration().setForegroundColor(
-				DiagramColorRegistry.getInstance().getColor(new Integer(style.getLineColor())));
-		}
-	}
-
-	/** 
-	 * Adds decoration if applicable.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#activate()
-	 */
-	public void activate() {
-		refresh();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.java
deleted file mode 100644
index 532dc48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.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.providers.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIProvidersMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.providers.internal.l10n.DiagramUIProvidersMessages";//$NON-NLS-1$
-
-	private DiagramUIProvidersMessages() {
-		// Do not instantiate
-	}
-
-	public static String DiagramMainMenu_DiagramMainMenuText;
-	public static String DiagramPropertiesProvider_viewCategory;
-	public static String RadialProvider_changeFontRequest_label;
-	public static String RadialProvider_changeVisibilityRequest_label;
-	public static String NavigateMenuManager_Navigate_ActionLabelText;
-	public static String FormatMenuManager_Format_ActionLabelText;
-	public static String Note_menuItem;
-	public static String Text_menuItem;
-	public static String Add_menuItem;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIProvidersMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.properties b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.properties
deleted file mode 100644
index e676e48..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersMessages.properties
+++ /dev/null
@@ -1,37 +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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# Diagram Providers General - Translation Instruction: section to be translated
-# ==============================================================================
-
-# ===============================================================================
-# Diagram Providers Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-# --- Diagram Main Menu ---
-DiagramMainMenu_DiagramMainMenuText=&Diagram
-
-DiagramPropertiesProvider_viewCategory=View
-
-RadialProvider_changeFontRequest_label=Font
-RadialProvider_changeVisibilityRequest_label=Visibility
-
-NavigateMenuManager_Navigate_ActionLabelText=&Navigate
-FormatMenuManager_Format_ActionLabelText=For&mat
-
-# --- DiagramContributionItemProvider ---
-Note_menuItem = &Note
-Text_menuItem = &Text
-Add_menuItem = &Add
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersPluginImages.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersPluginImages.java
deleted file mode 100644
index d2ff236..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/DiagramUIProvidersPluginImages.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.providers.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.providers.internal.DiagramProvidersPlugin;
-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 DiagramUIProvidersPluginImages {
-
-	/**
-	 * 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_BOOKMARK = PREFIX_ROOT + "bookmark.gif"; //$NON-NLS-1$
-
-	// Image descriptors.
-	
-	public static final ImageDescriptor DESC_BOOKMARK = createAndCache(IMG_BOOKMARK);
-	
-	/**
-	 * 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(DiagramProvidersPlugin
-			.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);
-		DiagramProvidersPlugin.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 DiagramProvidersPlugin.getInstance().getImageRegistry().get(imageName);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/l10n/package.html
deleted file mode 100644
index cf16381..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/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.providers.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/package.html
deleted file mode 100644
index f1340de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/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.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/DescriptionParser.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/DescriptionParser.java
deleted file mode 100644
index 63e4312..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/DescriptionParser.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.parsers;
-
-/**
- * Description parser
- * 
- * @deprecated Use
- *             org.eclipse.gmf.runtime.diagram.ui.providers.parser.DescriptionParser
- *             instead.
- */
-public class DescriptionParser extends
-		org.eclipse.gmf.runtime.diagram.ui.providers.parsers.DescriptionParser {
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/package.html
deleted file mode 100644
index 65cd11c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/parsers/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.providers.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/package.html b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/package.html
deleted file mode 100644
index 4ac37a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/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.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/parsers/DescriptionParser.java b/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/parsers/DescriptionParser.java
deleted file mode 100644
index 1a3568f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/parsers/DescriptionParser.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.parsers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.Notification;
-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.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.ParserEditStatus;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-/**
- * Description parser
- * 
- * @author melaasar
- * @since 1.4
- */
-public class DescriptionParser implements IParser {
-	/** instance of parser */
-	static protected IParser instance = null;
-
-	static final String DESC_DEFAULT_STR = StringStatics.BLANK;
-
-	/**
-	 * Constructor for DescriptionParser.
-	 */
-	protected DescriptionParser() {
-		super();
-	}
-
-	/**
-	 * Gets the instance of the parser
-	 * @return IParser the single instance of the parser
-	 */
-	static public IParser getInstance() {
-		if (instance == null) {
-			instance = new DescriptionParser();
-		}
-		return instance;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#getEditString(org.eclipse.core.runtime.IAdaptable, int)
-	 */
-	public String getEditString(IAdaptable adapter, int flags) {
-		return getPrintString(adapter, flags);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#getParseCommand(org.eclipse.core.runtime.IAdaptable, java.lang.String, int)
-	 */
-	public ICommand getParseCommand(
-		IAdaptable adapter,
-		String newString,
-		int flags) {
-        
-        final View view = (View) adapter.getAdapter(View.class);
-        
-        if (view != null) {
-            TransactionalEditingDomain domain = TransactionUtil
-            .getEditingDomain(view);
-            
-            if (domain != null) {
-                return new SetPropertyCommand(domain, adapter,
-                    Properties.ID_DESCRIPTION, ViewType.TEXT, newString);
-            }
-        }
-        return null;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#getPrintString(org.eclipse.core.runtime.IAdaptable, int)
-	 */
-	public String getPrintString(IAdaptable adapter, int flags) {
-		final View view = (View) adapter.getAdapter(View.class);
-		DescriptionStyle style = (DescriptionStyle) view.getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());
-		if (style != null) {
-			String descString = style.getDescription();
-			if (descString == null || descString.length() == 0)
-				descString = DESC_DEFAULT_STR;
-			return descString;
-		}
-		return StringStatics.BLANK;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#isAffectingEvent(Object, int)
-	 */
-	public boolean isAffectingEvent(Object event, int flags) {
-		if (event instanceof Notification) {
-			Object feature = ((Notification) event).getFeature();
-			if (feature == NotationPackage.eINSTANCE.getDescriptionStyle_Description()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#isValidEditString(org.eclipse.core.runtime.IAdaptable, java.lang.String)
-	 */
-	public IParserEditStatus isValidEditString(IAdaptable element, String editString) {
-		return ParserEditStatus.EDITABLE_STATUS;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.services.parser.IParser#getCompletionProcessor(org.eclipse.core.runtime.IAdaptable)
-	 */
-	public IContentAssistProcessor getCompletionProcessor(IAdaptable element) {
-		return null;
-	}
-}
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 4037750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-org
-target
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 8593d58..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui.render/.settings/.api_filters
deleted file mode 100644
index 0731335..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/.api_filters
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.diagram.ui.render" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramSVGGenerator.java" type="org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramSVGGenerator">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="RenderedImage"/>
-                <message_argument value="DiagramSVGGenerator"/>
-                <message_argument value="getRenderedImage()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.render.editparts.AbstractImageEditPart">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="RenderedImage"/>
-                <message_argument value="AbstractImageEditPart"/>
-                <message_argument value="getRenderedImage()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="RenderedImage"/>
-                <message_argument value="AbstractImageEditPart"/>
-                <message_argument value="regenerateImageFromSource()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.render.editparts.RenderedDiagramRootEditPart$DiagramRenderedScalableFreeformLayeredPane">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="AnimatedZoomListener"/>
-                <message_argument value="DiagramRenderedScalableFreeformLayeredPane"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="MapModeGraphics"/>
-                <message_argument value="DiagramRenderedScalableFreeformLayeredPane"/>
-                <message_argument value="createMapModeGraphics(Graphics)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ScaledGraphics"/>
-                <message_argument value="DiagramRenderedScalableFreeformLayeredPane"/>
-                <message_argument value="createScaledGraphics(MapModeGraphics)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="MapModeGraphics"/>
-                <message_argument value="DiagramRenderedScalableFreeformLayeredPane"/>
-                <message_argument value="createScaledGraphics(MapModeGraphics)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.render.editparts.URLImageEditPart">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="RenderedImage"/>
-                <message_argument value="URLImageEditPart"/>
-                <message_argument value="regenerateImageFromSource()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48a1531..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:02:24 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 75361d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +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.6.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 28c0958..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.render/pom.xml
deleted file mode 100644
index 81c374e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.render</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.render</artifactId>
-  <version>1.6.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 51d5290..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/actions/CopyToImageAction.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editparts.LayerManager;
-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.CopyToHTMLImageUtil;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.DiagramImageUtils;
-import org.eclipse.jface.dialogs.IDialogConstants;
-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);
-		runCopyToImageUI(dialog);
-	}
-	
-	/**
-	 * Displays the dialog and performs <code>OutOfMemoryError</code> checking
-	 * 
-	 * @param dialog the copy to image dialog
-	 */
-	private void runCopyToImageUI(CopyToImageDialog dialog) {
-		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) {
-				if (dialog.exportToHTML()) {
-					openErrorDialog(DiagramUIRenderMessages.CopyToImageAction_outOfMemoryMessage);
-				} else {
-					if (new MessageDialog(dialog.getShell(),
-							DiagramUIRenderMessages.CopyToImageOutOfMemoryDialog_title,
-							null,
-							DiagramUIRenderMessages.CopyToImageOutOfMemoryDialog_message,
-							MessageDialog.ERROR,
-							new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0
-							).open() == 0) {
-						runCopyToImageUI(dialog);
-					}
-				}					
-			} else if (e.getTargetException() instanceof SWTError) {
-				/**
-				 * SWT returns an out of handles error when processing large
-				 * diagrams
-				 */
-				if (dialog.exportToHTML()) {
-					openErrorDialog(DiagramUIRenderMessages.CopyToImageAction_outOfMemoryMessage);
-				} else {
-					if (new MessageDialog(dialog.getShell(),
-							DiagramUIRenderMessages.CopyToImageOutOfMemoryDialog_title,
-							null,
-							DiagramUIRenderMessages.CopyToImageOutOfMemoryDialog_message,
-							MessageDialog.ERROR,
-							new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0
-							).open() == 0) {
-						runCopyToImageUI(dialog);
-					}
-				}					
-			} 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();
-
-					CopyToImageUtil copyToImageUtil = null;
-					if (dialog.exportToHTML()) {
-						copyToImageUtil = new CopyToHTMLImageUtil();
-					} else {
-						copyToImageUtil = new CopyToImageUtil();
-					}
-					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()));
-						copyToImageUtil.copyToImage(
-							(DiagramEditPart) editparts.get(0), dialog
-								.getDestination(), dialog.getImageFormat(),
-							monitor);
-					} else {
-						DiagramImageUtils
-								.zOrderSort(
-										editparts,
-										LayerManager.Helper
-												.find(getDiagramEditPart())
-												.getLayer(
-														LayerConstants.PRINTABLE_LAYERS));
-						monitor.beginTask("", 6); //$NON-NLS-1$
-						monitor.worked(1);
-						monitor
-							.setTaskName(NLS
-								.bind(
-									DiagramUIRenderMessages.CopyToImageAction_copyingSelectedElementsToImageFileMessage,
-									dialog.getDestination().toOSString()));
-						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 ac42005..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java
+++ /dev/null
@@ -1,859 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.Assert;
-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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.LayerManager;
-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.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.diagram.ui.image.PartPositionInfo;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.DiagramImageUtils;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.PartPositionInfoGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.Decoration;
-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.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
-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;
-	
-	private IFigure printableLayer;
-	
-	private Dimension emptyImageSize;
-	
-	private static final int DEFAULT_IMAGE_MARGIN_PIXELS = 10;
-	
-	private static final int DEFAULT_EMPTY_IMAGE_SIZE_PIXELS = 100;
-
-	/**
-	 * Creates a new instance.
-	 * 
-	 * @param dgrmEP
-	 *            the diagram editpart
-	 */
-	public DiagramGenerator(DiagramEditPart dgrmEP) {
-		this._dgrmEP = dgrmEP;
-		this.printableLayer = LayerManager.Helper.find(_dgrmEP).getLayer(LayerConstants.PRINTABLE_LAYERS);
-		IMapMode mm = getMapMode();
-		image_margin = mm.DPtoLP(DEFAULT_IMAGE_MARGIN_PIXELS);
-		emptyImageSize = (Dimension) mm.DPtoLP(new Dimension(
-				DEFAULT_EMPTY_IMAGE_SIZE_PIXELS,
-				DEFAULT_EMPTY_IMAGE_SIZE_PIXELS));
-	}
-
-	/**
-	 * @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
-	 */
-	public Image createAWTImageForParts(List editparts) {
-		org.eclipse.swt.graphics.Rectangle diagramArea = calculateImageRectangle(editparts);
-		return createAWTImageForParts(editparts, diagramArea);
-	}
-
-	/**
-	 * 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);
-		return createSWTImageDescriptorForParts(editparts, sourceRect);
-	}
-
-	/**
-	 * @return
-	 */
-	protected IMapMode getMapMode() {
-		return MapModeUtil.getMapMode(getDiagramEditPart().getFigure());
-	}
-
-	/**
-	 * 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();
-
-		List<GraphicalEditPart> connectionsToPaint = new LinkedList<GraphicalEditPart>();
-
-		Map decorations = findDecorations(editparts);
-
-		for (Iterator editPartsItr = editparts.listIterator(); editPartsItr.hasNext();) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart) editPartsItr.next();
-
-			// do not paint selected connection part
-			if (editPart instanceof ConnectionEditPart) {
-				connectionsToPaint.add(editPart);
-			} else {				
-				connectionsToPaint.addAll(findConnectionsToPaint(editPart));
-				// 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 (Iterator<GraphicalEditPart> connItr = connectionsToPaint.iterator(); connItr.hasNext();) {
-			IFigure figure = connItr.next().getFigure();
-			paintFigure(graphics, figure);
-			paintDecorations(graphics, figure, decorations);
-		}
-	}
-	
-	/**
-	 * Collects all connections contained within the given edit part
-	 * 
-	 * @param editPart the container editpart
-	 * @return connections within it
-	 */
-	private Collection<ConnectionEditPart> findConnectionsToPaint(IGraphicalEditPart editPart) {
-		/*
-		 * Set of node editparts contained within the given editpart
-		 */
-		HashSet<GraphicalEditPart> editParts = new HashSet<GraphicalEditPart>();
-		
-		/*
-		 * All connection editparts that have a source contained within the given editpart
-		 */
-		HashSet<ConnectionEditPart> connectionEPs = new HashSet<ConnectionEditPart>();
-		
-		/*
-		 * Connections contained within the given editpart (or just the connections to paint
-		 */
-		HashSet<ConnectionEditPart> connectionsToPaint = new HashSet<ConnectionEditPart>();
-		
-		/*
-		 * Populate the set of node editparts
-		 */
-		getNestedEditParts(editPart, editParts);
-		
-		/*
-		 * Populate the set of connections whose source is within the given editpart
-		 */
-		for (Iterator<GraphicalEditPart> editPartsItr = editParts.iterator(); editPartsItr.hasNext();) {
-			connectionEPs.addAll(getAllConnectionsFrom(editPartsItr.next()));
-		}
-		
-		/*
-		 * Create a set of connections constained within the given editpart
-		 */
-		while (!connectionEPs.isEmpty()) {
-			/*
-			 * Take the first connection and check whethe there is a path
-			 * through that connection that leads to the target contained within
-			 * the given editpart
-			 */
-			Stack<ConnectionEditPart> connectionsPath = new Stack<ConnectionEditPart>();
-			ConnectionEditPart conn = connectionEPs.iterator().next();
-			connectionEPs.remove(conn);
-			connectionsPath.add(conn);
-			
-			/*
-			 * Initialize the target for the current path
-			 */
-			EditPart target = conn.getTarget();
-			while(connectionEPs.contains(target)) {
-				/*
-				 * If the target end is a connection, check if it's one of the
-				 * connection's whose target is a connection and within the
-				 * given editpart. Append it to the path if it is. Otherwise
-				 * check if the target is within the actual connections or nodes
-				 * contained within the given editpart
-				 */
-				ConnectionEditPart targetConn = (ConnectionEditPart) target;
-				connectionEPs.remove(targetConn);
-				connectionsPath.add(targetConn);
-				
-				/*
-				 * Update the target for the new path
-				 */
-				target = targetConn.getTarget();
-			}
-			
-			/*
-			 * The path is built, check if it's target is a node or a connection
-			 * contained within the given editpart
-			 */
-			if (editParts.contains(target) || connectionsToPaint.contains(target)) {
-				connectionsToPaint.addAll(connectionsPath);
-			}
-		}
-		return connectionsToPaint;
-	}
-	
-	/**
-	 * Returns all connections orginating from a given editpart. All means that
-	 * connections originating from connections that have a source given
-	 * editpart will be included
-	 * 
-	 * @param ep the editpart 
-	 * @return all source connections
-	 */
-	private List<ConnectionEditPart> getAllConnectionsFrom(GraphicalEditPart ep) {
-		LinkedList<ConnectionEditPart> connections = new LinkedList<ConnectionEditPart>();
-		for (Iterator itr = ep.getSourceConnections().iterator(); itr.hasNext();) {
-			ConnectionEditPart sourceConn = (ConnectionEditPart) itr.next();
-			connections.add(sourceConn);
-			connections.addAll(getAllConnectionsFrom(sourceConn));
-		}
-		return connections;
-	}
-
-	/**
-	 * 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() || figure.getBounds().isEmpty())
-			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();
-		DiagramImageUtils.translateTo(abBounds, figure, printableLayer);
-
-		// 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(Collection 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.iterator().next();
-
-			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();
-
-						while (owner != null) {
-    						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);
-    							}
-    							break;
-    						} else {
-    						    owner = owner.getParent();
-    						}
-						}
-					}
-				}
-			}
-		}
-
-		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
-	 */
-	/*
-	 * The 2 commented out methods are not being used currently
-	 */
-//	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,
-			Collection editParts) {
-
-		for (Iterator iter = childEditPart.getChildren().iterator(); iter
-				.hasNext();) {
-
-			IGraphicalEditPart child = (IGraphicalEditPart) iter.next();
-			editParts.add(child);
-			getNestedEditParts(child, editParts);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	public org.eclipse.swt.graphics.Rectangle calculateImageRectangle(
-			List editparts) {
-		Rectangle rect = DiagramImageUtils.calculateImageRectangle(editparts,
-				getImageMargin(), emptyImageSize);
-		return new org.eclipse.swt.graphics.Rectangle(rect.x, rect.y,
-				rect.width, rect.height);
-	}
-	
-	/**
-	 * Get the positional data and the semantic elements for each
-	 * <code>ShapeEditPart</code>, <code>ShapeCompartmentEditPart</code>,
-	 * and <code>ConnectionEditPart</code> on the diagram.
-	 * 
-	 * @return A list of {@link PartPositionInfo}objects with positional data
-	 *         and the semantic element for the relevant editparts on the
-	 *         diagram.
-	 */
-	public List getDiagramPartInfo() {
-		Assert.isNotNull(_dgrmEP);
-		return getDiagramPartInfo(_dgrmEP);
-	}
-
-	/**
-	 * 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) {
-		Map<String, Object> options = new HashMap<String, Object>();
-		Point origin = DiagramImageUtils.calculateImageRectangle(
-				diagramEditPart.getPrimaryEditParts(), getImageMargin(),
-				emptyImageSize).getLocation();
-		options.put(PartPositionInfoGenerator.CONNECTION_MARGIN,
-				new Double(getImageMargin() >> 1));
-		options.put(PartPositionInfoGenerator.DIAGRAM_ORIGIN, origin);
-		return PartPositionInfoGenerator.getDiagramPartInfo(diagramEditPart,
-				options);
-	}
-	
-	public List<PartPositionInfo> getConstrainedDiagramPartInfo(int maxWidth,
-			int maxHeight, boolean useMargins) {
-		return getConstrainedDiagramPartInfo(_dgrmEP, maxWidth, maxHeight,
-				useMargins);
-	}
-	
-	public List<PartPositionInfo> getConstrainedDiagramPartInfo(
-			DiagramEditPart diagramEditPart, int maxWidth, int maxHeight,
-			boolean useMargins) {
-		List<IGraphicalEditPart> children = (List<IGraphicalEditPart>) 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.
-		ConstrainedImageRenderingData data = getConstrainedImageRenderingData(
-				children, maxWidth, maxHeight, useMargins);
-		Rectangle imageRect = data.imageOriginalBounds.getCopy();
-		mm.DPtoLP(imageRect);
-		if (useMargins) {
-			imageRect.shrink(getImageMargin(), getImageMargin());
-		}
-		imageRect.performScale(data.scalingFactor);
-		if (useMargins) {
-			imageRect.expand(getImageMargin(), getImageMargin());
-		}
-
-		Map<String, Object> options = new HashMap<String, Object>();
-		options.put(PartPositionInfoGenerator.CONNECTION_MARGIN,
-				new Double(mm.DPtoLP(5)));
-		options.put(PartPositionInfoGenerator.DIAGRAM_ORIGIN, imageRect.getLocation());
-		options.put(PartPositionInfoGenerator.SCALE_FACTOR, new Double(data.scalingFactor));
-		
-		return PartPositionInfoGenerator.getDiagramPartInfo(diagramEditPart, options);
-	}
-
-	/**
-	 * @return <code>int</code> value that is the margin around the generated
-	 *         image in logical coordinates.
-	 * @since 1.3
-	 */
-	public int getImageMargin() {
-		return image_margin;
-	}
-
-	/**
-	 * Sets the image margin value (width of the white frame around the image).
-	 * The value must be in logical units.
-	 * 
-	 * @param imageMargin
-	 * @since 1.3
-	 */
-	public void setImageMargin(int imageMargin) {
-		Assert.isTrue(imageMargin >= 0);
-		image_margin = imageMargin;
-	}
-
-	/**
-	 * Generates AWT image of specified editparts on the specified rectangle.
-	 * 
-	 * @param editParts editparts
-	 * @param diagramArea clipping rectangle
-	 * @return AWT image
-	 */
-	public Image createAWTImageForParts(List editParts,
-			org.eclipse.swt.graphics.Rectangle diagramArea) {
-		return null;
-	}
-
-	final public ImageDescriptor createSWTImageDescriptorForParts(
-			List editparts, org.eclipse.swt.graphics.Rectangle sourceRect) {
-
-		// 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();
-			
-			PrecisionRectangle rect = new PrecisionRectangle();
-			rect.setX(sourceRect.x);
-			rect.setY(sourceRect.y);
-			rect.setWidth(sourceRect.width);
-			rect.setHeight(sourceRect.height);
-			
-			mm.LPtoDP(rect);
-
-			// Create the graphics and wrap it with the HiMetric graphics object
-			graphics = setUpGraphics((int) Math.round(rect.preciseWidth),
-					(int) Math.round(rect.preciseHeight));
-
-			RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-					graphics, getMapMode());
-
-			renderToGraphics(mapModeGraphics, new Point(sourceRect.x,
-					sourceRect.y), editparts);
-			imageDesc = getImageDescriptor(graphics);
-		} finally {
-			if (graphics != null)
-				disposeGraphics(graphics);
-		}
-
-		return imageDesc;
-	}
-	
-	/**
-	 * Creates an SWT image descriptor for editparts. Editparts are scaled to fit in maxDeviceWidth and maxDeviceHeight
-	 * frame
-	 * 
-	 * @param editParts editparts
-	 * @param maxDeviceWidth max width for the image
-	 * @param maxDeviceHeight max height for the image
-	 * @param useMargins true if 10 pisels margins are required to bound the editparts image
-	 * @return the image descriptor
-	 */
-	final public ImageDescriptor createConstrainedSWTImageDecriptorForParts(
-			List editParts, int maxDeviceWidth, int maxDeviceHeight,
-			boolean useMargins) {
-		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();
-
-			ConstrainedImageRenderingData data = getConstrainedImageRenderingData(
-					editParts, maxDeviceWidth, maxDeviceHeight, useMargins);
-
-			// Create the graphics and wrap it with the HiMetric graphics object
-			graphics = setUpGraphics(data.imageWidth, data.imageHeight);
-
-			ScaledGraphics scaledGraphics = new RenderedScaledGraphics(graphics);
-			
-			RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-					scaledGraphics, getMapMode());
-			
-			graphics.translate(data.margin, data.margin);
-			mapModeGraphics.scale(data.scalingFactor);
-
-			Point location = new PrecisionPoint(data.imageOriginalBounds
-					.preciseX(), data.imageOriginalBounds.preciseY());
-			mm.DPtoLP(location);
-			renderToGraphics(mapModeGraphics, location, editParts);
-			imageDesc = getImageDescriptor(graphics);
-		} finally {
-			if (graphics != null)
-				disposeGraphics(graphics);
-		}
-
-		return imageDesc;
-	}
-	
-	class ConstrainedImageRenderingData {
-		double scalingFactor;
-		int imageWidth; // in pixels
-		int imageHeight; // in pixels
-		Rectangle imageOriginalBounds; // in pixels
-		int margin; // margins size in pixels
-	}
-	
-	ConstrainedImageRenderingData getConstrainedImageRenderingData(
-			List editParts, int maxDeviceWidth, int maxDeviceHeight,
-			boolean useMargins) {
-		ConstrainedImageRenderingData data = new ConstrainedImageRenderingData();
-		IMapMode mm = getMapMode();
-
-		data.imageOriginalBounds = new PrecisionRectangle(new Rectangle(
-				calculateImageRectangle(editParts)));
-		mm.LPtoDP(data.imageOriginalBounds);
-
-		int deviceMargins = mm.LPtoDP(getImageMargin());
-		data.margin = useMargins ? deviceMargins : 0;
-		double xScalingFactor = 1.0, yScalingFactor = xScalingFactor;
-
-		data.imageOriginalBounds.shrink(deviceMargins, deviceMargins);
-
-		if (maxDeviceWidth > data.margin) {
-			xScalingFactor = (maxDeviceWidth - data.margin - data.margin)
-					/ (data.imageOriginalBounds.preciseWidth());
-		}
-		if (maxDeviceHeight > data.margin) {
-			yScalingFactor = (maxDeviceHeight - data.margin - data.margin)
-					/ (data.imageOriginalBounds.preciseHeight());
-		}
-
-		data.scalingFactor = Math.min(Math.min(xScalingFactor, yScalingFactor),
-				1);
-
-		data.imageWidth = data.imageOriginalBounds.width + data.margin
-				+ data.margin;
-		data.imageHeight = data.imageOriginalBounds.height + data.margin
-				+ data.margin;
-
-		if (data.scalingFactor < 1) {
-			data.imageWidth = (int) Math.round(data.imageOriginalBounds
-					.preciseWidth()
-					* data.scalingFactor)
-					+ data.margin + data.margin;
-			data.imageHeight = (int) Math.round(data.imageOriginalBounds
-					.preciseHeight()
-					* data.scalingFactor)
-					+ data.margin + data.margin;
-		} else {
-			data.scalingFactor = 1;
-		}
-		return data;
-	}
-	
-	/**
-	 * Creates an AWT image for editparts. Editparts are scaled to fit in maxDeviceWidth and maxDeviceHeight
-	 * frame
-	 * 
-	 * @param editParts editparts
-	 * @param maxDeviceWidth max width for the image
-	 * @param maxDeviceHeight max height for the image
-	 * @param useMargins true if 10 pisels margins are required to bound the editparts image
-	 * @return the image
-	 */
-	public Image createConstrainedAWTImageForParts(List editParts,
-			int maxDeviceWidth, int maxDeviceHeight, boolean useMargins) {
-		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/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 051accd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramImageGenerator.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-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.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
-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.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-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 = DisplayUtils.getDisplay();
-
-		image = new Image(display, new org.eclipse.swt.graphics.Rectangle(0, 0, width, height));
-		gc = new GC(image);
-		SWTGraphics swtG = new SWTGraphics(gc);
-		swtG.setAdvanced(true);
-		swtG.setAntialias(SWT.ON);
-		
-		/*
-		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.render.clipboard.DiagramGenerator#createAWTImageForParts(java.util.List,
-	 *      org.eclipse.swt.graphics.Rectangle)
-	 */
-	public java.awt.Image createAWTImageForParts(List selectedObjects, org.eclipse.swt.graphics.Rectangle sourceRect) {
-
-		BufferedImage awtImage = null;
-		IMapMode mm = getMapMode();
-		PrecisionRectangle rect = new PrecisionRectangle();
-		rect.setX(sourceRect.x);
-		rect.setY(sourceRect.y);
-		rect.setWidth(sourceRect.width);
-		rect.setHeight(sourceRect.height);
-
-		mm.LPtoDP(rect);
-
-		awtImage = new BufferedImage((int) Math.round(rect.preciseWidth),
-				(int) Math.rint(rect.preciseHeight),
-				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, awtImage.getWidth(), awtImage.getHeight()));
-
-		RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-				graphics, mm);
-
-		renderToGraphics(mapModeGraphics,
-				new Point(sourceRect.x, sourceRect.y), selectedObjects);
-
-		graphics.dispose();
-		g2d.dispose();
-		return awtImage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#createConstrainedAWTImageForParts(java.util.List, int, int, boolean)
-	 */
-	public java.awt.Image createConstrainedAWTImageForParts(List editParts,
-			int maxDeviceWidth, int maxDeviceHeight, boolean useMargins) {
-		BufferedImage awtImage = null;
-		IMapMode mm = getMapMode();
-		
-		ConstrainedImageRenderingData data = getConstrainedImageRenderingData(editParts, maxDeviceWidth, maxDeviceHeight, useMargins);
-		
-		awtImage = new BufferedImage(data.imageWidth, data.imageHeight, 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 org.eclipse.swt.graphics.Rectangle(0, 0, data.imageWidth, data.imageHeight));
-		
-		ScaledGraphics scaledGraphics = new RenderedScaledGraphics(graphics);
-
-		RenderedMapModeGraphics mapModeGraphics = new RenderedMapModeGraphics(
-				scaledGraphics, mm);
-
-		g2d.translate(data.margin, data.margin);
-		mapModeGraphics.scale(data.scalingFactor);
-		
-		Point location = new PrecisionPoint(data.imageOriginalBounds.preciseX(), data.imageOriginalBounds.preciseY());
-		mm.DPtoLP(location);
-		renderToGraphics(mapModeGraphics,
-				location, editParts);
-
-		graphics.dispose();
-		g2d.dispose();
-		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 5108fe4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramSVGGenerator.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 renderedImage = 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();
-
-			setRenderedImage(RenderedImageFactory.getInstance(os.toByteArray()));
-
-			return RenderedImageDescriptor
-				.createFromRenderedImage(getRenderedImage());
-		} 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, org.eclipse.swt.graphics.Rectangle sourceRect) {
-		createSWTImageDescriptorForParts(editparts, sourceRect);
-		if (getRenderedImage() != null) {
-			try {
-				BufferedImage bufImg = (BufferedImage)getRenderedImage().getAdapter(BufferedImage.class);
-				if (bufImg == null)
-					bufImg = ImageConverter.convert(getRenderedImage().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 rendered image created by previous 
-	 * call to createSWTImageDescriptorForParts
-	 */
-	public RenderedImage getRenderedImage() {
-		return renderedImage;
-	}
-
-	/**
-	 * @param svgImage
-	 *            The svgImage to set.
-	 */
-	private void setRenderedImage(RenderedImage renderedImage) {
-		this.renderedImage = 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/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 77a8642..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPart.java
+++ /dev/null
@@ -1,148 +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
- * 
- * 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;
-	}
-}
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 7263772..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.common.ui.util.DisplayUtils;
-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.swt.widgets.Display;
-
-/**
- * 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 {
-
-		@SuppressWarnings("unused")
-		private boolean animatedZoomOn;
-		static final private Dimension MAX_RENDER_SIZE;
-		static {
-			Display display = DisplayUtils.getDisplay();
-			MAX_RENDER_SIZE = new Dimension(display.getBounds().width, display
-					.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 RenderedScaledGraphics(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 3b4557e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPart.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-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
- *
- * 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();
-		if (url != null) {			
-			try {
-				URI uri = URI.createURI(url.toString());
-				
-				InputStream is = getEditingDomain().getResourceSet().getURIConverter().createInputStream(uri);
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				
-				int b = is.read();
-				while (b != -1) {
-					baos.write(b);
-					b = is.read();
-				}
-				
-				// read in the file source specified by the URI, otherwise return null;
-				return RenderedImageFactory.getInstance(baos.toByteArray());
-			} catch (IOException e) {
-				// Ignore and return null;
-			} catch (IllegalArgumentException e) {
-				// Ignore and return null;
-			}
-		}
-		
-		return null;
-	}
-
-
-}
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 67b7d90..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderDebugOptions.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.ui.render.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author cmahoney
- *  
- */
-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$  
-}
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 07688c9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/DiagramUIRenderStatusCodes.java
+++ /dev/null
@@ -1,47 +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
- *  
- */
-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;
-
-}
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 154e1af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/commands/CopyImageCommand.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.LayerManager;
-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.StringStatics;
-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.diagram.ui.render.util.DiagramImageUtils;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Command for copying an image to the clipboard
- * 
- * @author sshaw
- */
-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(StringStatics.BLANK, 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 {
-				DiagramImageUtils.zOrderSort(editParts, LayerManager.Helper
-						.find(diagramEP).getLayer(
-								LayerConstants.PRINTABLE_LAYERS));
-				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;
-    }
-}
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 034316d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/dialogs/CopyToImageDialog.java
+++ /dev/null
@@ -1,781 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-	/**
-	 * true to export to HTML.
-	 */
-	private boolean exportToHTML = false;
-	
-	/**
-	 * the folder text field
-	 */
-	private Text folderText = null;
-
-	/**
-	 * the file name text field
-	 */
-	private Text fileNameText = null;
-
-	/**
-	 * the file name text field
-	 */
-	private Text qualityText = null;
-	
-	/**
-	 * the image format pulldown field
-	 */
-	private Combo imageFormatCombo = null;
-
-	/**
-	 * the overwrite existing file checkbox.
-	 */
-	private Button overwriteExistingCheckbox = null;
-
-	/**
-	 * the export to HTML checkbox.
-	 */
-	private Button exportToHTMLCheckbox = 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 path argument passed into the dialog.
-	 */
-	private IPath path;
-
-	/**
-	 * 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 file name label text
-	 */
-	private static final String QUALITY_LABEL = DiagramUIMessages.CopyToImageDialog_quality_label; 
-
-	/**
-	 * the error message if quality is not a number
-	 */
-	private static final String QUALITY_ERROR_MESSAGE = DiagramUIMessages.CopyToImageDialog_quality_error_message; 
-	
-	/**
-	 * 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 export to HTML file checkbox text
-	 */
-	private static final String EXPORT_TO_HTML_LABEL = DiagramUIMessages.CopyToImageDialog_exportToHTML_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 string with a html file extension.
-	 */
-	private static final String HTML_STRING = "html"; //$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$
-
-	/**
-	 * The id for the persistent overwrite existing setting for this dialog.
-	 */
-	private static final String DIALOG_SETTINGS_HTML = "CopyToImageDialog.exportToHTML"; //$NON-NLS-1$
-	
-	/**
-	 * The root of the filesystem
-	 */
-	private static final String DEFAULT_FILESYSTEM_ROOT = "/"; //$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);
-		
-		this.path = path;
-		
-		initDialogSettings();
-		
-		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);
-		createGenerateHTMLGroup(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);
-		updateFileNameText(false);
-		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, 4);		
-		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());
-				
-				qualityText.setEnabled(imageFormat.equals(ImageFileFormat.JPEG));
-				
-                // update filename to reflect new format
-				if (!exportToHTML) {
-					updateFileNameText(true);
-				}
-			}
-		});
-		GridData gridData =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
-		gridData.widthHint = 200;
-		imageFormatCombo.setLayoutData(gridData);
-		
-		createLabel(composite, QUALITY_LABEL);
-
-		qualityText = new Text(composite, SWT.BORDER);
-		qualityText.setText(convertQualityToString(ImageFileFormat.DEFAULT_QUALITY));
-		qualityText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateQualityText();
-			}
-		});
-		GridData gridData2 =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		gridData.widthHint = 50;
-		qualityText.setEnabled(imageFormat.equals(ImageFileFormat.JPEG));
-		qualityText.setLayoutData(gridData2);
-	}
-	
-	private void updateFileNameText(boolean validate) {
-		String extension = exportToHTML ? HTML_STRING : imageFormat.getName().toLowerCase();
-		fileNameText.setText(fileName + DOT_STRING + extension);
-		if (validate)
-			validateFileNameText();
-	}
-
-	/**
-	 * 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();
-			}
-		});
-	}
-
-	private void createGenerateHTMLGroup(Composite parent) {
-		Composite composite = createComposite(parent, 1);
-		exportToHTMLCheckbox = new Button(composite, SWT.CHECK | SWT.LEFT);
-		exportToHTMLCheckbox.setText(EXPORT_TO_HTML_LABEL);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		exportToHTMLCheckbox.setLayoutData(data);
-		exportToHTMLCheckbox.setSelection(exportToHTML);
-		exportToHTMLCheckbox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				exportToHTML = exportToHTMLCheckbox.getSelection();
-				updateFileNameText(false);
-			}
-		});
-	}
-
-	/**
-	 *	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);
-		if (!exportToHTML) {
-			extension.append(imageFormat.getName().toLowerCase());
-		} else {
-			extension.append(HTML_STRING);
-		}
-		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;
-	}
-	
-	public boolean exportToHTML() {
-		return exportToHTML;
-	}
-
-	/**
-	 * 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 aPath = new File(dirName);
-			if (aPath.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 aPath = new Path(EMPTY_STRING);
-		if (!aPath.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();
-		}
-	}
-
-	private static String convertQualityToString(float f) {
-		return String.valueOf((int) f * 100);
-	}
-	
-	private static float convertQualityToFloat(String integer) throws NumberFormatException {
-		float quality = Float.parseFloat(integer);
-		quality = Math.max(quality, 100);
-		float qualityPercent = quality != 0 ? (quality / (float) 100.0) : 0;
-		return qualityPercent;
-	}
-	
-	/**
-	 * validate the file name text field.
-	 */
-	private void validateQualityText() {
-		try {
-			float qualityPercent = convertQualityToFloat(qualityText.getText());
-			if (imageFormat != null)
-				imageFormat.setQuality(qualityPercent);
-			setDialogOKState();
-		} catch (NumberFormatException e) {
-			setDialogErrorState(qualityText.getText() + QUALITY_ERROR_MESSAGE);
-		}
-	}
-	
-	/**
-	 * 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.
-	 */
-	private void initDialogSettings() {
-		IDialogSettings dialogSettings = getDialogSettings();
-
-		String persistentFolder = dialogSettings.get(DIALOG_SETTINGS_FOLDER);
-		if (persistentFolder != null) {
-			folder = persistentFolder;
-		} else {
-
-			if (path == null) {
-				// By default, the folder will be the root of the filesystem,
-				// where ever that may be on a system.
-				folder = DEFAULT_FILESYSTEM_ROOT;
-			} 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);
-		exportToHTML =
-			dialogSettings.getBoolean(DIALOG_SETTINGS_HTML);
-	}
-
-	/**
-	 * Retrieves the persistent settings for this dialog.
-	 */
-	private void saveDialogSettings() {
-		IDialogSettings dialogSettings = getDialogSettings();
-		if (path == null && !folder.trim().equals(DEFAULT_FILESYSTEM_ROOT))
-			dialogSettings.put(DIALOG_SETTINGS_FOLDER, folder);
-		else {
-			if (!path.toOSString().equals(folder)) {
-				// only persist the folder if the user changed the value.
-				// We like to save diagrams in a folder different to the
-				// <workspace>/project_name folder and have the Save As
-				// Image File dialog remember this setting and display
-				// it as the new default.
-				dialogSettings.put(DIALOG_SETTINGS_FOLDER, folder);
-			}
-		}
-		dialogSettings.put(
-			DIALOG_SETTINGS_IMAGE_FORMAT,
-			imageFormat.getName().toLowerCase());
-		dialogSettings.put(DIALOG_SETTINGS_OVERWRITE, overwriteExisting);
-		dialogSettings.put(DIALOG_SETTINGS_HTML, exportToHTML);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		super.okPressed();
-		saveDialogSettings();
-	}
-
-	@Override
-	protected Control createButtonBar(Composite parent) {
-		Control abuttonBar = super.createButtonBar(parent);
-		validateFolderText();
-		return abuttonBar;
-	}
-
-}
-
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 00546ff..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/editparts/BufferedImageEditPart.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.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
- * 
- * 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;
-	}
-}
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 914f939..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.java
+++ /dev/null
@@ -1,45 +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;
-	public static String CopyToImageOutOfMemoryDialog_title;
-	public static String CopyToImageOutOfMemoryDialog_message;
-
-
-	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 c1861a7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/l10n/DiagramUIRenderMessages.properties
+++ /dev/null
@@ -1,33 +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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-
-# ==============================================================================
-# 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?
-CopyToImageOutOfMemoryDialog_title=Cannot Save Diagram as Image
-CopyToImageOutOfMemoryDialog_message=The application ran out of memory while saving the diagram to a single image file.\n\nPossible solutions:\n1) Increase JVM Heap memory size\n2) Save the diagram as image file with a different image format\n3) Export the diagram to HTML\n\nReturn to "Save As Image File" dialog?\n 
-
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 b8b07c1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/ImageSupportGlobalActionHandler.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.gmf.runtime.diagram.ui.requests.PasteViewRequest;
-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
- */
-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});
-	}
-}
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/CopyToHTMLImageUtil.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToHTMLImageUtil.java
deleted file mode 100644
index 77ede9a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToHTMLImageUtil.java
+++ /dev/null
@@ -1,956 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-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.Assert;
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionDimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-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.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-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.swt.widgets.Shell;
-
-/**
- * Implementation of a utility class able to export specified editparts to
- * multiple image files, i.e. each file containing a tile of the diagram - all
- * tiles combined will compose the complete image of specified editparts. An
- * HTML file is generated which builds a table of tiled images of editparts.
- * HTML file allows clients to view the complete image of specified editparts.
- * The utility is useful to export huge diagrams to an image, when they fail to
- * be exported to a single image file.
- * 
- * <li><b>Note:</b> for tiled images method <code>#copyToImage(Diagram, IPath,
- * ImageFileFormat, IProgressMonitor, PreferencesHint)}</code> returns a matrix, the
- * dimension of which is equal to the total number of tiles rows and columns.
- * Each cell of the matrix is a list of <code>PartPositionInfo</code>
- * corresponding to the tile with the same index.</li>
- * 
- * @author Alex Boyko
- * 
- */
-public class CopyToHTMLImageUtil extends CopyToImageUtil {
-
-	/**
-	 * A Map of image file formats to their corresponding safe tile sizes
-	 */
-	private HashMap<ImageFileFormat, Dimension> imageFormatToTileSizeMap = null;
-
-	/**
-	 * The delimiter for tiled image filename table indices (filename +
-	 * delimiter + row + delimiter + column)
-	 */
-	private String tileImageFileNameIndexDelimiter = StringStatics.UNDER_SCORE;
-
-	{
-		imageFormatToTileSizeMap = new HashMap<ImageFileFormat, Dimension>(
-				ImageFileFormat.VALUES.length);
-		imageFormatToTileSizeMap.put(ImageFileFormat.GIF, new Dimension(3000,
-				3000));
-		imageFormatToTileSizeMap.put(ImageFileFormat.BMP, new Dimension(3000,
-				3000));
-		imageFormatToTileSizeMap.put(ImageFileFormat.JPG, new Dimension(3000,
-				3000));
-		imageFormatToTileSizeMap.put(ImageFileFormat.JPEG, new Dimension(3000,
-				3000));
-		imageFormatToTileSizeMap.put(ImageFileFormat.PNG, new Dimension(3000,
-				3000));
-		imageFormatToTileSizeMap.put(ImageFileFormat.SVG, new Dimension(0, 0));
-		imageFormatToTileSizeMap.put(ImageFileFormat.PDF, new Dimension(0, 0));
-	}
-	
-	/**
-	 * Minimal size of the tile in pixels
-	 */
-	private static Dimension minimalTileSize = new Dimension(2, 2);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil#copyToImage(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart,
-	 *      org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public DiagramGenerator copyToImage(DiagramEditPart diagramEP,
-			IPath destination, ImageFileFormat format, IProgressMonitor monitor)
-			throws CoreException {
-
-		ExportInfo exportInfo = copyToImageAndReturnInfo(diagramEP, diagramEP
-				.getPrimaryEditParts(), destination, format, monitor);
-
-		/*
-		 * Create the HTML file
-		 */
-		createHTMLFileForTiledImage(destination, exportInfo);
-
-		return exportInfo.diagramGenerator;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil#copyToImage(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart,
-	 *      java.util.List, org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void copyToImage(DiagramEditPart diagramEP, List selection,
-			IPath destination, ImageFileFormat format, IProgressMonitor monitor)
-			throws CoreException {
-
-		ExportInfo exportInfo = copyToImageAndReturnInfo(diagramEP, selection,
-				destination, format, monitor);
-
-		/*
-		 * Create the HTML file
-		 */
-		createHTMLFileForTiledImage(destination, exportInfo);
-	}
-	
-	/**
-	 * Generates image files and returns the HTML content as a String
-	 * 
-	 * @param diagram diagram model
-	 * @param destination a path to image files with common image file name
-	 * @param format image format
-	 * @param monitor progress monitor
-	 * @return HTML content as a string
-	 * @throws CoreException
-	 */
-	public String generateHTMLImage(Diagram diagram, IPath destination, ImageFileFormat format, IProgressMonitor monitor) throws CoreException {
-		ExportInfo exportInfo = null;
-		DiagramEditor openedDiagramEditor = DiagramEditorUtil
-				.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-		if (openedDiagramEditor != null) {
-			DiagramEditPart diagramEditPart = openedDiagramEditor
-					.getDiagramEditPart();
-			exportInfo = copyToImageAndReturnInfo(diagramEditPart,
-					diagramEditPart.getPrimaryEditParts(), destination, format,
-					monitor);
-		} else {
-			Shell shell = new Shell();
-			try {
-				DiagramEditPart diagramEditPart = createDiagramEditPart(
-						diagram, shell, null);
-				Assert.isNotNull(diagramEditPart);
-				exportInfo = copyToImageAndReturnInfo(diagramEditPart,
-						diagramEditPart.getPrimaryEditParts(), destination,
-						format, monitor);
-			} finally {
-				shell.dispose();
-			}
-		}
-		return createHTMLString(exportInfo);
-	}
-
-	/**
-	 * Export the editparts to an image file or files of supplied image format
-	 * depending on the logical size of the tile. The method return the number
-	 * of created tiles as a <code>Point</code>, where x represents number of
-	 * columns and y number of rows.
-	 * 
-	 * 
-	 * @param gen
-	 *            diagram generator
-	 * @param editParts
-	 *            editparts
-	 * @param destinationFolder
-	 *            destination folder for image files
-	 * @param fileName
-	 *            common part of image file names
-	 * @param imageFormat
-	 *            image file format
-	 * @param logTileWidth
-	 *            tile width in logical units (not device units)
-	 * @param logTileHeight
-	 *            tile height in logical units (not device units)
-	 * @param monitor
-	 *            progress monitor
-	 * @param mm map-mode used by the diagram
-	 * @return <code>Point</code>, where x represents number of columns and y
-	 *         represents number of rows
-	 * @throws Error
-	 * @throws CoreException
-	 */
-	private ExportInfo exportImage(DiagramGenerator gen, List editParts,
-			IPath destinationFolder, String fileName,
-			ImageFileFormat imageFormat, Dimension logTileSize,
-			IProgressMonitor monitor, IMapMode mm) throws Error, CoreException {
-		org.eclipse.swt.graphics.Rectangle diagramArea = gen
-				.calculateImageRectangle(editParts);
-		org.eclipse.swt.graphics.Rectangle sourceRect = null; 
-		int rows = 1, columns = 1;
-		PrecisionDimension minimalLogicalTileSize = new PrecisionDimension(minimalTileSize);
-		mm.DPtoLP(minimalLogicalTileSize);
-		int logTileWidth = logTileSize.width;
-		int logTileHeight = logTileSize.height;
-		if (logTileWidth <= 0) {
-			logTileWidth = diagramArea.width;
-		}
-		if (logTileHeight <= 0) {
-			logTileHeight = diagramArea.height;
-		}
-		logTileWidth = Math.max(logTileWidth, minimalLogicalTileSize.width);
-		logTileHeight = Math.max(logTileHeight, minimalLogicalTileSize.height);
-		columns = (int) Math.ceil(diagramArea.width / (float)logTileWidth);
-		rows = (int) Math.ceil(diagramArea.height / (float)logTileHeight);
-		int jobsToDo = 6 * columns * rows + 1;
-		monitor
-				.beginTask(
-						DiagramUIMessages.CopyToHTMLImageTask_exportingToHTML,
-						jobsToDo);
-		for (int i = 0; i < rows; i++) {
-			int sourceY =  i * logTileHeight + diagramArea.y;
-			int sourceHeight = i != rows - 1 ? logTileHeight : Math.max(diagramArea.height
-					- logTileHeight * i, minimalLogicalTileSize.height);
-			for (int j = 0; j < columns; j++) {
-				int sourceX = diagramArea.x + j * logTileWidth;
-				int sourceWidth = j != columns - 1 ? logTileWidth : Math.max(diagramArea.width
-						- logTileWidth * j, minimalLogicalTileSize.width);
-				String tileFileName = fileName
-						+ getTileImageFileNameIndexDelimiter() + i
-						+ getTileImageFileNameIndexDelimiter() + j
-						+ StringStatics.PERIOD
-						+ imageFormat.getName().toLowerCase();
-				IPath tilePath = new Path(destinationFolder.toOSString())
-						.append(tileFileName);
-				monitor
-						.subTask(DiagramUIMessages.CopyToHTMLImageTask_generateImageFile
-								+ tilePath);
-				sourceRect = new org.eclipse.swt.graphics.Rectangle(sourceX,
-						sourceY, sourceWidth, sourceHeight);
-				copyToImage(gen, editParts, sourceRect, tilePath, imageFormat, monitor);
-			}
-		}
-		return new ExportInfo(gen, new Point(columns, rows), fileName, destinationFolder, imageFormat, new PrecisionDimension(logTileWidth, logTileHeight));
-	}
-
-	/**
-	 * Creates an HTML file that contains a table of image tiles.
-	 * 
-	 * @param htmlFileLocation
-	 *            location of the HTML file
-	 * @param fileName
-	 *            common part of the file name for image tiles
-	 * @param fileExtension
-	 *            extension of image files
-	 * @param numRows
-	 *            number of rows for the table
-	 * @param numColumns
-	 *            number of columns for the table
-	 * @return <code>Status.OK_STATUS</code> if everything went without errors
-	 */
-	private IStatus createHTMLFileForTiledImage(IPath htmlFileLocation,
-			ExportInfo info) {
-		try {
-			BufferedWriter out = new BufferedWriter(new FileWriter(
-					htmlFileLocation.toOSString()));
-			out
-					.write(createHTMLString(info));
-			out.close();
-			IFile file = ResourcesPlugin.getWorkspace().getRoot()
-					.getFileForLocation(htmlFileLocation);
-			if (file != null) {
-				file.refreshLocal(IResource.DEPTH_ZERO, null);
-				return FileModificationValidator
-						.approveFileModification(new IFile[] { file });
-			}
-		} catch (IOException e) {
-			return Status.CANCEL_STATUS;
-		} catch (CoreException e) {
-			return Status.CANCEL_STATUS;
-		}
-		return Status.OK_STATUS;
-	}
-	
-	private String createHTMLString(ExportInfo info) {
-		Assert.isNotNull(info);
-		StringBuffer buffer = new StringBuffer(
-				"<html>\n<body>\n<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"LEFT\">\n");//$NON-NLS-1$
-		String commonFileNamePath = new Path("file://", info.directory.toString()).append(info.commonTileFileName).makeAbsolute().toString(); //$NON-NLS-1$ 
-		for (int i = 0; i < info.tiles.y; i++) {
-			buffer.append("<tr>\n");//$NON-NLS-1$
-			for (int j = 0; j < info.tiles.x; j++) {
-				String fileName = commonFileNamePath
-						+ getTileImageFileNameIndexDelimiter() + i
-						+ getTileImageFileNameIndexDelimiter() + j
-						+ StringStatics.PERIOD
-						+ info.imageFormat.getName().toLowerCase();
-				if (ImageFileFormat.SVG.equals(info.imageFormat)) {
-					buffer.append("\t<td>\n\t\t<object data=\"");//$NON-NLS-1$
-					buffer.append(fileName);
-					buffer.append("\" type=\"image/svg+xml\" width=\"");//$NON-NLS-1$
-					buffer.append(info.tileSize.width);
-					buffer.append("\" height=\""); //$NON-NLS-1$
-					buffer.append(info.tileSize.height);
-					buffer.append("\">\n");//$NON-NLS-1$
-					buffer.append("\t\t<embed src=\"");//$NON-NLS-1$
-					buffer.append(fileName);
-					buffer.append("\" type=\"image/svg+xml\" width=\"");//$NON-NLS-1$
-					buffer.append(info.tileSize.width);
-					buffer.append("\" height=\"");//$NON-NLS-1$
-					buffer.append(info.tileSize.height);
-					buffer.append("\"/></td>\n"); //$NON-NLS-1$
-				} else {
-					buffer.append("\t<td><img src=\"");//$NON-NLS-1$
-					buffer.append(fileName);
-					buffer.append("\"/></td>\n");//$NON-NLS-1$
-				}
-			}
-			buffer.append("</tr>\n");//$NON-NLS-1$
-		}
-		buffer.append("</table>\n</body>\n</html>");//$NON-NLS-1$
-		return buffer.toString();
-	}
-
-	/**
-	 * Gets the tile image file name indices delimiter
-	 * 
-	 * @return the delimiter
-	 */
-	public String getTileImageFileNameIndexDelimiter() {
-		return tileImageFileNameIndexDelimiter;
-	}
-
-	/**
-	 * Sets the tile image file name indices delimiter. The new value must not
-	 * be empty string or null.
-	 * 
-	 * @param tileImageFileNameIndexDelimiter
-	 *            new delimiter value
-	 */
-	public void setTileImageFileNameIndexDelimiter(
-			String tileImageFileNameIndexDelimiter) {
-		if (tileImageFileNameIndexDelimiter == null
-				|| tileImageFileNameIndexDelimiter.length() == 0)
-			throw new IllegalArgumentException();
-		this.tileImageFileNameIndexDelimiter = tileImageFileNameIndexDelimiter;
-	}
-
-	/**
-	 * Gets the map of image file formats to their corresponding safe tile sizes
-	 * 
-	 * @return the map
-	 */
-	public HashMap<ImageFileFormat, Dimension> getImageFormatToTileSizeMap() {
-		return imageFormatToTileSizeMap;
-	}
-
-	/**
-	 * Defines the data structure for the info of exported diagram
-	 * 
-	 * @author Alex Boyko
-	 * 
-	 */
-	public class ExportInfo {
-		final public DiagramGenerator diagramGenerator;
-		final public Point tiles;
-		final public String commonTileFileName;
-		final public IPath directory;
-		final public ImageFileFormat imageFormat;
-		final public Dimension tileSize;
-
-		ExportInfo(DiagramGenerator diagramGenerator, Point tiles,
-				String commonTileFileName, IPath directory, ImageFileFormat imageFormat, Dimension tileSize) {
-			this.diagramGenerator = diagramGenerator;
-			this.tiles = tiles;
-			this.commonTileFileName = commonTileFileName;
-			this.directory = directory;
-			this.imageFormat = imageFormat;
-			this.tileSize = tileSize;
-		}
-	}
-
-	/**
-	 * Exports the diagram to tiled images files and returns the info about the
-	 * exported diagram (total number of rows and columns for tiles, generator
-	 * and common part of image files name, i.e. without indices)
-	 * 
-	 * @param diagramEP
-	 *            diafram editpart
-	 * @param selection
-	 *            selected editparts
-	 * @param destination
-	 *            destination path
-	 * @param format
-	 *            image format
-	 * @param monitor
-	 *            progress monitor
-	 * @return <code>ExportInfo</code> of images
-	 * @throws CoreException
-	 */
-	public ExportInfo copyToImageAndReturnInfo(DiagramEditPart diagramEP,
-			List selection, IPath destination, ImageFileFormat format,
-			IProgressMonitor monitor) throws CoreException {
-		DiagramGenerator gen = getDiagramGenerator(diagramEP, format);
-		
-		IMapMode mm = MapModeUtil.getMapMode(
-				diagramEP.getFigure()); 
-
-		Dimension dimension = (Dimension) mm.DPtoLP(
-				new PrecisionDimension(imageFormatToTileSizeMap.get(format)));
-
-		/*
-		 * Destination is the destination for HTML file. Hence we need to come
-		 * up with the names for image file(s)
-		 */
-		IPath destinationFolder = destination.removeLastSegments(1);
-		String fileName = destination.removeFileExtension().lastSegment();
-
-		/*
-		 * Create image tile files and get the number of tiles, i.e. number of
-		 * rows and columns
-		 */
-		ExportInfo info  = exportImage(gen, selection, destinationFolder, fileName,
-				format, dimension, monitor, mm);
-		
-		/*
-		 * The tile dimension returned with the ExportInfo object is in logical units. We need to translate it
-		 * to the device units - pixels. We can't simply use the pixel tile size from the imageFormatToTilesSizeMap
-		 * since tile size (x,y), where x<=0 and y<=0 will use the diagram width and/or height 
-		 */
-		mm.LPtoDP(info.tileSize);
-
-		return info;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil#copyToImage(org.eclipse.gmf.runtime.notation.Diagram,
-	 *      org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat,
-	 *      org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 */
-	public List<List<List<PartPositionInfo>>> 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$
-
-		ExportInfo exportInfo = null;
-
-		DiagramEditor openedDiagramEditor = DiagramEditorUtil
-				.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-		if (openedDiagramEditor != null) {
-			DiagramEditPart diagramEditPart = openedDiagramEditor
-					.getDiagramEditPart();
-			exportInfo = copyToImageAndReturnInfo(diagramEditPart,
-					diagramEditPart.getPrimaryEditParts(), destination, format,
-					monitor);
-		} else {
-			Shell shell = new Shell();
-			try {
-				DiagramEditPart diagramEditPart = createDiagramEditPart(
-						diagram, shell, preferencesHint);
-				Assert.isNotNull(diagramEditPart);
-				exportInfo = copyToImageAndReturnInfo(diagramEditPart,
-						diagramEditPart.getPrimaryEditParts(), destination,
-						format, monitor);
-			} finally {
-				shell.dispose();
-			}
-		}
-
-		/*
-		 * Transform the list of partsInfo for a diagram exported to a single
-		 * image into a matrix of partsInfo lists, the rows of columns of which
-		 * correspond to rows and columns of tiled images
-		 */
-		return createTilesPartsInfoList(exportInfo);
-	}
-
-	/**
-	 * Creates and returns a matrix each cell of which correspond to a tiled
-	 * image with the same index. Each cell of a matrix, therefore, is a
-	 * partsInfo list for a tiled image (chunk of a diagram) corresponding to
-	 * the index of the cell.
-	 * 
-	 * @param exportInfo
-	 *            export info
-	 * @param partsInfo
-	 *            partsInfo list for the whole diagram (single image assumed)
-	 * @param format
-	 *            image format
-	 * @return A matrix of partsInfo lists, where each cell contains partsInfo
-	 *         list for a tiled image of the same index
-	 */
-	public static List<List<List<PartPositionInfo>>> createTilesPartsInfoList(
-			ExportInfo exportInfo) {
-		List<PartPositionInfo> partsInfo = exportInfo.diagramGenerator.getDiagramPartInfo();
-		List<List<List<PartPositionInfo>>> tilesPartsInfoList = Collections.emptyList();
-		if (exportInfo.diagramGenerator != null && exportInfo.tiles.x > 0
-				&& exportInfo.tiles.y > 0 && partsInfo != null) {
-			/*
-			 * Create the matrix
-			 */
-			tilesPartsInfoList = initializeTilesPartsInfoList(
-					exportInfo.tiles.y, exportInfo.tiles.x);
-			/*
-			 * If it's 1 tile only than just use partsInfo list already created
-			 * for it
-			 */
-			if (exportInfo.tiles.x == 1 && exportInfo.tiles.y == 1) {
-				tilesPartsInfoList.get(0).set(0, partsInfo);
-			} else {
-				Dimension tileSize = exportInfo.tileSize;
-				Rectangle defaultTile = new Rectangle(new Point(), tileSize);
-				/*
-				 * Iterate through each part and split it in different tiles if
-				 * necessary
-				 */
-				for (PartPositionInfo info : partsInfo) {
-					if (info.getPolyline() == null) {
-						/*
-						 * It's a shape
-						 */
-						Point startCell = new Point();
-						startCell.x = info.getPartX() / tileSize.width;
-						startCell.y = info.getPartY() / tileSize.height;
-						Point endCell = new Point();
-						endCell.x = (info.getPartX() + info.getPartWidth())
-								/ tileSize.width;
-						endCell.y = (info.getPartY() + info.getPartHeight())
-								/ tileSize.height;
-						for (int i = startCell.y; i <= endCell.y; i++) {
-							for (int j = startCell.x; j <= endCell.x; j++) {
-								Rectangle shapeRect = new Rectangle(info
-										.getPartX(), info.getPartY(), info
-										.getPartWidth(), info.getPartHeight());
-								shapeRect.translate(-j * tileSize.width, -i
-										* tileSize.height);
-								Rectangle intersection = shapeRect
-										.intersect(defaultTile);
-								PartPositionInfo newInfo = new PartPositionInfo();
-								newInfo.setView(info.getView());
-								newInfo.setSemanticElement(info
-										.getSemanticElement());
-								newInfo.setPartHeight(intersection.height);
-								newInfo.setPartWidth(intersection.width);
-								newInfo.setPartX(intersection.x);
-								newInfo.setPartY(intersection.y);
-								tilesPartsInfoList.get(i).get(j).add(newInfo);
-							}
-						}
-					} else {
-						/*
-						 * It's a connection. Connections location info is a
-						 * polygon with points in Clock-Wise (CW) order. We need
-						 * to split the connection in line segments to process
-						 * its info. (@see
-						 * DiagramGenerator#getDiagramPartInfo()) First half of
-						 * points in the list are points offset from the
-						 * original connection bend points in the same
-						 * direction. We need to consider line segments of the
-						 * connection. Hence we need to consider original line
-						 * segment and the offset one and split it between
-						 * different tiles
-						 */
-						for (int i = 1; i <= info.getPolyline().size() / 2; i += 2) {
-							/*
-							 * Upper points are the end points of the offset
-							 * line segment
-							 */
-							Point upperStartPt = info.getPolyline().get(i - 1);
-							Point upperEndPt = info.getPolyline().get(i);
-							/*
-							 * Lower points are the end points of the original
-							 * line segment
-							 */
-							Point lowerEndPt = info.getPolyline().get(
-									info.getPolyline().size() - 1 - i);
-							Point lowerStartPt = info.getPolyline().get(
-									info.getPolyline().size() - 1 - (i + 1));
-							/*
-							 * A set of cells laying inside and intersected by
-							 * the polygon formed by the end points of the
-							 * original and offset line segments
-							 */
-							HashSet<Point> cells = new HashSet<Point>();
-							/*
-							 * Create maps of line segments (vectors) created by
-							 * intersections of edges of the polygon with tile
-							 * borders. Cell indices are mapped to line segments
-							 * (vectors). The line segments or vectors
-							 * directions are CW such that they match the
-							 * direction of the polygon points in the polyLine
-							 * list from the single image partsInfo list.
-							 */
-							HashMap<Point, LineSeg> upperLineSegs = getMapOfLineSegments(
-									upperStartPt, upperEndPt, tileSize, cells);
-							HashMap<Point, LineSeg> lowerLineSegs = getMapOfLineSegments(
-									lowerStartPt, lowerEndPt, tileSize, cells);
-							HashMap<Point, LineSeg> upperToLowerLineSegs = getMapOfLineSegments(
-									upperEndPt, lowerStartPt, tileSize, cells);
-							HashMap<Point, LineSeg> lowerToUpperLineSegs = getMapOfLineSegments(
-									lowerEndPt, upperStartPt, tileSize, cells);
-							/*
-							 * Create a connection polygon for each tile
-							 * intersected by the polygon. We assume there are
-							 * no cells completely contained within this
-							 * polygon!!! Tile dimension are much larger than
-							 * the offset of the secondary (referred as offset)
-							 * line segment
-							 */
-							for (Iterator<Point> ptItr = cells.iterator(); ptItr
-									.hasNext();) {
-								Point cell = ptItr.next();
-								LineSeg upperSeg = upperLineSegs.get(cell);
-								LineSeg lowerSeg = lowerLineSegs.get(cell);
-								LineSeg upperToLowerSeg = upperToLowerLineSegs
-										.get(cell);
-								LineSeg lowerToUpperSeg = lowerToUpperLineSegs
-										.get(cell);
-								List<LineSeg> cwListOfLineSegs = new ArrayList<LineSeg>(
-										4);
-								if (upperSeg != null) {
-									cwListOfLineSegs.add(upperSeg);
-								}
-								if (upperToLowerSeg != null) {
-									cwListOfLineSegs.add(upperToLowerSeg);
-								}
-								if (lowerSeg != null) {
-									cwListOfLineSegs.add(lowerSeg);
-								}
-								if (lowerToUpperSeg != null) {
-									cwListOfLineSegs.add(lowerToUpperSeg);
-								}
-								PartPositionInfo newInfo = new PartPositionInfo();
-								newInfo.setSemanticElement(info
-										.getSemanticElement());
-								newInfo.setPolyline(createCellPolyline(
-										tileSize, cwListOfLineSegs));
-								tilesPartsInfoList.get(cell.y).get(cell.x).add(
-										newInfo);
-							}
-						}
-					}
-				}
-			}
-		}
-		return tilesPartsInfoList;
-	}
-
-	/**
-	 * Creates a matrix of the dimension given through rows and columns
-	 * parameters. Each cell of the matrix is a <code>PartPositionInfo</code>
-	 * list
-	 * 
-	 * @param rows
-	 *            roes
-	 * @param columns
-	 *            columns
-	 * @return the matrix
-	 */
-	private static List<List<List<PartPositionInfo>>> initializeTilesPartsInfoList(
-			int rows, int columns) {
-		List<List<List<PartPositionInfo>>> tilesPartsInfoList = new ArrayList<List<List<PartPositionInfo>>>(
-				rows);
-		for (int i = 0; i < rows; i++) {
-			List<List<PartPositionInfo>> row = new ArrayList<List<PartPositionInfo>>(
-					columns);
-			for (int j = 0; j < columns; j++) {
-				row.add(new LinkedList<PartPositionInfo>());
-			}
-			tilesPartsInfoList.add(row);
-		}
-		return tilesPartsInfoList;
-	}
-
-	/**
-	 * A class to make comparisons between points laying on the same line.
-	 * Comparison criteria is the closeness of points to the segmentOrigin point
-	 * 
-	 * @author aboyko
-	 * 
-	 */
-	private static class LineSegmentPointsComparator implements Comparator<Point> {
-
-		private Point segmentOrigin;
-
-		public LineSegmentPointsComparator(Point segmentOrigin) {
-			this.segmentOrigin = segmentOrigin;
-		}
-
-		public int compare(Point p1, Point p2) {
-			if (p1.x == p2.x) {
-				return Math.abs(p1.y - segmentOrigin.y)
-						- Math.abs(p2.y - segmentOrigin.y);
-			}
-			return Math.abs(p1.x - segmentOrigin.x)
-					- Math.abs(p2.x - segmentOrigin.x);
-		}
-
-	}
-
-	/**
-	 * Creates a map of cell indices to line segments. Cell indices stand for
-	 * cells intersected by the line segments originating at parameter
-	 * startPoint and ending at endPoint parameter and line segment is the chunk
-	 * of the original line segment laying within a particular tile. Coordinates
-	 * of the start and end point of the segment are relative to the tile. All
-	 * intersected tiles are inserted into <code>cells</code> set
-	 * 
-	 * @param startPoint
-	 *            line segment's start point
-	 * @param endPoint
-	 *            line segment's end point
-	 * @param tileSize
-	 *            the tile dimension
-	 * @param cells
-	 *            set of cells to be updated
-	 * @return the map of cell indices to line segments contained within
-	 *         corresponding cells
-	 */
-	private static HashMap<Point, LineSeg> getMapOfLineSegments(Point startPoint,
-			Point endPoint, Dimension tileSize, HashSet<Point> cells) {
-		HashMap<Point, LineSeg> map = new HashMap<Point, LineSeg>();
-		Point startCell = new Point();
-		startCell.x = startPoint.x / tileSize.width;
-		startCell.y = startPoint.y / tileSize.height;
-		Point endCell = new Point();
-		endCell.x = endPoint.x / tileSize.width;
-		endCell.y = endPoint.y / tileSize.height;
-		if (startCell.equals(endCell)) {
-			/*
-			 * If within the same cell then just translate the points, update
-			 * the cells set and return
-			 */
-			map.put(startCell, new LineSeg(startPoint.getCopy().translate(
-					-startCell.x * tileSize.width,
-					-startCell.y * tileSize.height), endPoint.getCopy()
-					.translate(-startCell.x * tileSize.width,
-							-startCell.y * tileSize.height)));
-			cells.add(startCell);
-		} else {
-			/*
-			 * If the end points are not within the same cell then calculate the
-			 * line equation and, using that equation, calculate the
-			 * intersection points with tile borders
-			 */
-			double[] equation = LineSeg.getLineEquation(startPoint.x,
-					startPoint.y, endPoint.x, endPoint.y);
-			List<Point> linePoints = new ArrayList<Point>(2
-					+ Math.abs(startCell.x - endCell.x)
-					+ Math.abs(startCell.y - endCell.y));
-			if (equation[1] != 0) {
-				for (int x = tileSize.width
-						* (Math.min(startCell.x, endCell.x) + 1); x <= tileSize.width
-						* Math.max(startCell.x, endCell.x); x += tileSize.width) {
-					linePoints.add(new Point(x, Math
-							.round((equation[2] - equation[0] * x)
-									/ equation[1])));
-				}
-			}
-			if (equation[0] != 0) {
-				for (int y = tileSize.height
-						* (Math.min(startCell.y, endCell.y) + 1); y <= tileSize.height
-						* Math.max(startCell.y, endCell.y); y += tileSize.height) {
-					linePoints.add(new Point(Math
-							.round((equation[2] - equation[1] * y)
-									/ equation[0]), y));
-				}
-			}
-			/*
-			 * Sort the intersection points such that points closer to the start
-			 * of the original line segment are located at the start of the
-			 * list.
-			 */
-			Collections.sort(linePoints, new CopyToHTMLImageUtil.LineSegmentPointsComparator(
-					startPoint));
-			/*
-			 * Add the ends of the original line segments to the start and end
-			 * of the list
-			 */
-			linePoints.add(0, startPoint.getCopy());
-			linePoints.add(endPoint.getCopy());
-			/*
-			 * Now calculate the indices of the cells intersected by the
-			 * original line segment and fill the map with the values of line
-			 * segments laying in the corresponding cells. Line segments are
-			 * relative to the corresponding cell
-			 */
-			Point currentCell = startCell;
-			Iterator<Point> pointsItr = linePoints.iterator();
-			Point originPoint = pointsItr.next();
-			for (; pointsItr.hasNext();) {
-				Point terminusPoint = pointsItr.next();
-				Point translatedOrigin = originPoint.getCopy().translate(
-						-currentCell.x * tileSize.width,
-						-currentCell.y * tileSize.height);
-				Point translatedTerminus = terminusPoint.getCopy().translate(
-						-currentCell.x * tileSize.width,
-						-currentCell.y * tileSize.height);
-				map.put(currentCell.getCopy(), new LineSeg(translatedOrigin,
-						translatedTerminus));
-				cells.add(currentCell.getCopy());
-				if (translatedTerminus.x == 0) {
-					currentCell.x--;
-				}
-				if (translatedTerminus.y == 0) {
-					currentCell.y--;
-				}
-				if (translatedTerminus.x == tileSize.width) {
-					currentCell.x++;
-				}
-				if (translatedTerminus.y == tileSize.height) {
-					currentCell.y++;
-				}
-				originPoint = terminusPoint;
-			}
-		}
-		return map;
-	}
-
-	/**
-	 * It is assumed that segments parameter contains either line segments where
-	 * the end of one segments is the start of the next one or the end of one
-	 * segments and the start of the next one lay on the cell's edges. The
-	 * method in this case will create a polygon by connecting line segments
-	 * that don't meet each other via cell's edges in the clock wise direction
-	 * 
-	 * @param cellSize
-	 *            dimension of the cell
-	 * @param segments
-	 *            list of line segments
-	 * @return a list of polygon points.
-	 */
-	private static List<Point> createCellPolyline(Dimension cellSize,
-			List<LineSeg> segments) {
-		List<Point> result = new LinkedList<Point>();
-		if (segments.size() > 0) {
-			LineSeg currentSegment = segments.get(0);
-			for (int i = 0; i < segments.size(); i++) {
-				LineSeg nextSegment = segments.get((i + 1) % segments.size());
-				result.add(currentSegment.getTerminus());
-				if (!currentSegment.getTerminus().equals(
-						nextSegment.getOrigin())) {
-					List<Point> connectingPoints = connectLineSegmentsEndsViaCellEdges(
-							cellSize, currentSegment, nextSegment);
-					for (Iterator<Point> itr = connectingPoints.iterator(); itr
-							.hasNext();) {
-						result.add(itr.next());
-					}
-					result.add(nextSegment.getOrigin());
-				}
-				currentSegment = nextSegment;
-			}
-			result.add(result.get(0));
-		}
-		return result;
-	}
-
-	/**
-	 * Creates a list of connecting points that help to connect 2 line segments
-	 * via cell's edges clock wise
-	 * 
-	 * @param cellSize
-	 *            dimesnion of the cell
-	 * @param lineSeg1
-	 *            1st line segment
-	 * @param lineSeg2
-	 *            2nd line segment
-	 * @return the list of connecting points
-	 */
-	private static List<Point> connectLineSegmentsEndsViaCellEdges(Dimension cellSize,
-			LineSeg lineSeg1, LineSeg lineSeg2) {
-		Point current = lineSeg1.getTerminus();
-		Point next = lineSeg2.getOrigin();
-		List<Point> result = new LinkedList<Point>();
-		List<Point> cwCellVertices = createClockwiseListOfCellVertices(cellSize);
-		int currentIdx = indexOfCellEdgePointClockwise(cellSize, current);
-		int nextIdx = indexOfCellEdgePointClockwise(cellSize, next);
-		for (int i = currentIdx; i != nextIdx;) {
-			result.add(cwCellVertices.get(i));
-			i = (i + 1) % cwCellVertices.size();
-		}
-		return result;
-	}
-
-	/**
-	 * Creates a list of rectangular cell vertices in the clock wise order
-	 * 
-	 * @param cellSize
-	 *            cell's dimension
-	 * @return a list of vertices in the clock wise order
-	 */
-	private static List<Point> createClockwiseListOfCellVertices(Dimension cellSize) {
-		List<Point> cellVertices = new ArrayList<Point>(4);
-		cellVertices.add(new Point());
-		cellVertices.add(new Point(cellSize.width, 0));
-		cellVertices.add(new Point(cellSize.width, cellSize.height));
-		cellVertices.add(new Point(0, cellSize.height));
-		return cellVertices;
-	}
-
-	/**
-	 * Returns the index of a point in the list of cell's vertices order in the
-	 * clock wise manner
-	 * 
-	 * @param cellSize
-	 *            cell's dimension
-	 * @param pt
-	 *            point
-	 * @return index of the in the list of clock wise vertices
-	 */
-	private static int indexOfCellEdgePointClockwise(Dimension cellSize, Point pt) {
-		if (pt.x == 0) {
-			return 0;
-		} else if (pt.y == 0) {
-			return 1;
-		} else if (pt.x == cellSize.width) {
-			return 2;
-		} else if (pt.y == cellSize.height) {
-			return 3;
-		}
-		return 0;
-	}
-
-}
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 40eee4e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/CopyToImageUtil.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-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.Assert;
-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.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.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.image.PartPositionInfo;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-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.diagram.ui.util.DiagramEditorUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageExporter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImageConverter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-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$
-        
-        List partInfo = Collections.EMPTY_LIST;
-        
-        DiagramEditor openedDiagramEditor = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-        if (openedDiagramEditor != null) {
-            DiagramGenerator generator = copyToImage(openedDiagramEditor.getDiagramEditPart(),
-                    destination, format, monitor);
-                partInfo = generator.getDiagramPartInfo(openedDiagramEditor.getDiagramEditPart());
-        } else {
-	
-	        Shell shell = new Shell();
-	        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;
-    }
-    
-    /**
-     * Creates an image of the diagram in the specified image file format. The diagram image is scaled to fit in
-     * the maxWidth, maxHeight window. The image is returned as a byte array
-     * 
-     * @param diagram diagram model
-     * @param maxWidth the max width of the image
-     * @param maxHeight the max height of the image
-     * @param format image format
-     * @param monitor progress monitor
-     * @param preferencesHint preference hint for the diagram
-     * @param useMargins true if a 10 pixel margin is required around the diagram
-     * @return the image as array of bytes
-     * @throws CoreException
-     */
-    public byte [] copyToImageByteArray(Diagram diagram, int maxWidth, int maxHeight, ImageFileFormat format, IProgressMonitor monitor, PreferencesHint preferencesHint, boolean useMargins) throws CoreException {
-        DiagramEditor openedDiagramEditor = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-        if (openedDiagramEditor != null) {
-            return copyToImageByteArray(openedDiagramEditor.getDiagramEditPart(), null, maxWidth, maxHeight, format, monitor, useMargins);
-        } else {
-	        Shell shell = new Shell();
-	        try {
-	            DiagramEditPart diagramEditPart = createDiagramEditPart(diagram,
-	                shell, preferencesHint);
-	            Assert.isNotNull(diagramEditPart);
-	            return copyToImageByteArray(diagramEditPart, null, maxWidth, maxHeight, format, monitor, useMargins);
-	        } finally {
-	            shell.dispose();
-	        }
-        }
-    }
-    
-    /**
-     * Creates an image of the editparts in the specified image file format. The editparts image is scaled to fit in
-     * the maxWidth, maxHeight window. The image is returned as a byte array
-     * 
-     * @param diagramEP diagram editpart
-     * @param editParts editparts to draw on the image
-     * @param maxHeight the max height of the image
-     * @param format image format
-     * @param monitor progress monitor
-     * @param preferencesHint preference hint for the diagram
-     * @param useMargins true if a 10 pixel margin is required around the diagram
-     * @return the image as array of bytes
-     * @throws CoreException
-     */
-    public byte [] copyToImageByteArray(DiagramEditPart diagramEP, List editParts, int maxWidth, int maxHeight, ImageFileFormat format, IProgressMonitor monitor, boolean useMargins) throws CoreException {
-        Assert.isNotNull(diagramEP);
-    	ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        DiagramGenerator gen = getDiagramGenerator(diagramEP, format);
-        if (editParts == null || editParts.isEmpty()) {
-        	editParts = diagramEP.getPrimaryEditParts() ;
-        }
-		if (format.equals(ImageFileFormat.SVG)
-				|| format.equals(ImageFileFormat.PDF)) {
-			gen.createConstrainedSWTImageDecriptorForParts(editParts, maxWidth, maxHeight, useMargins);
-			monitor.worked(1);
-			saveToOutputStream(stream, (DiagramSVGGenerator)gen, format, monitor);
-		} else {
-			Image image = gen.createConstrainedSWTImageDecriptorForParts(editParts, maxWidth, maxHeight, useMargins).createImage();
-			monitor.worked(1);
-			saveToOutputStream(stream, image, format, monitor);;
-			image.dispose();
-		}
-		monitor.worked(1);
-    	return stream.toByteArray();
-    }
-    
-    public List copyToConstrainedImage(Diagram diagram, IPath destination,
-            ImageFileFormat format, int maxWidth, int maxHeight, IProgressMonitor monitor,
-            PreferencesHint preferencesHint, boolean useMargins)
-        throws CoreException {
-    	
-        List partInfo = Collections.EMPTY_LIST;
-        
-        DiagramEditor openedDiagramEditor = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
-        if (openedDiagramEditor != null) {
-        	DiagramEditPart diagramEP = openedDiagramEditor.getDiagramEditPart();
-            DiagramGenerator generator = copyToConstrainedImage(diagramEP,
-                    destination, diagramEP.getPrimaryEditParts(), format, maxWidth, maxHeight, monitor, useMargins);
-            partInfo = generator.getConstrainedDiagramPartInfo(openedDiagramEditor.getDiagramEditPart(), maxWidth, maxHeight, useMargins);
-        } else {
-	
-	        Shell shell = new Shell();
-	        try {
-	            DiagramEditPart diagramEP = createDiagramEditPart(diagram,
-	                shell, preferencesHint);
-	            Assert.isNotNull(diagramEP);
-	            DiagramGenerator generator = copyToConstrainedImage(diagramEP,
-	                destination, diagramEP.getPrimaryEditParts(), format, maxWidth, maxHeight, monitor, useMargins);
-	            partInfo = generator.getConstrainedDiagramPartInfo(diagramEP, maxWidth, maxHeight, useMargins);
-	        } finally {
-	            shell.dispose();
-	        }
-        }
-
-        return partInfo;
-    }
-    
-    public DiagramGenerator copyToConstrainedImage(DiagramEditPart diagramEP, IPath destination, List editParts, ImageFileFormat format, int maxWidth, int maxHeight, IProgressMonitor monitor, boolean useMargins) throws CoreException {
-    	DiagramGenerator gen = getDiagramGenerator(diagramEP, format);
-    	copyToConstrainedImage(gen, editParts, destination, format, maxWidth, maxHeight, monitor, useMargins);
-        monitor.worked(1);
-        return gen;
-    }
-    
-    private void copyToConstrainedImage(DiagramGenerator gen, List editParts,
-			IPath destination, 
-			ImageFileFormat format, int maxWidth, int maxHeight, IProgressMonitor monitor, boolean useMargins)
-			throws CoreException {
-		boolean found = false;
-		if (format.equals(ImageFileFormat.SVG)
-				|| format.equals(ImageFileFormat.PDF)) {
-			gen.createConstrainedSWTImageDecriptorForParts(editParts, maxWidth, maxHeight, useMargins);
-			monitor.worked(1);
-			saveToFile(destination, (DiagramSVGGenerator) gen, format, 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 = gen.createConstrainedAWTImageForParts(editParts, maxWidth, maxHeight, useMargins);
-			monitor.worked(1);
-			if (image instanceof BufferedImage) {
-				ImageExporter.exportToFile(destination, (BufferedImage) image,
-						exportFormat, monitor, format.getQuality());
-				found = true;
-			}
-		}
-
-		if (!found) {
-			Image image = gen.createConstrainedSWTImageDecriptorForParts(editParts,
-					maxWidth, maxHeight, useMargins).createImage();
-			monitor.worked(1);
-			saveToFile(destination, image, format, monitor);
-			image.dispose();
-		}
-	}
-    
-    /**
-     * 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 {
-        DiagramGenerator gen = getDiagramGenerator(diagramEP, format);
-        List editParts = diagramEP.getPrimaryEditParts();
-        copyToImage(gen, editParts, gen.calculateImageRectangle(editParts), destination, format, monitor);
-        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 {    	
-    	DiagramGenerator gen = getDiagramGenerator(diagramEP, format);
-    	copyToImage(gen, selection, gen.calculateImageRectangle(selection), destination, format, monitor);
-        monitor.worked(1);
-    }
-    
-    /**
-     * Creates the appropriate <code>DiagramGenerator</code> from <code>DiagramEditPart</code>
-     * based on the supplied <code>ImageFileFormat</code>
-     * 
-     * @param diagramEP diagram editpart
-     * @param format image file format
-     * @return appropriate diagram generator
-     */
-    protected DiagramGenerator getDiagramGenerator(DiagramEditPart diagramEP, ImageFileFormat format) {
-        if (format.equals(ImageFileFormat.SVG) || format.equals(ImageFileFormat.PDF)) {
-            return new DiagramSVGGenerator(diagramEP);
-        } else {
-        	return new DiagramImageGenerator(diagramEP);
-        }
-    }
-    
-    /**
-	 * Generates image of editparts with on a given image rectangle and creates
-	 * the specified image file containing this image. The image rectangle may
-	 * be the limitation for the editparts displayed on the image
-	 * 
-	 * @param gen
-	 *            diagram generator
-	 * @param editParts
-	 *            editparts to be present on the image
-	 * @param imageRect
-	 *            clipping rectangle for the image
-	 * @param destination
-	 *            image file path
-	 * @param format
-	 *            image file format
-	 * @param monitor
-	 *            progress monitor
-	 * @throws CoreException
-	 */
-    protected void copyToImage(DiagramGenerator gen, List editParts,
-			org.eclipse.swt.graphics.Rectangle imageRect, IPath destination,
-			ImageFileFormat format, IProgressMonitor monitor)
-			throws CoreException {
-		boolean found = false;
-		if (format.equals(ImageFileFormat.SVG)
-				|| format.equals(ImageFileFormat.PDF)) {
-			gen.createSWTImageDescriptorForParts(editParts, imageRect);
-			monitor.worked(1);
-			saveToFile(destination, (DiagramSVGGenerator) gen, format, 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 = gen.createAWTImageForParts(editParts,
-					imageRect);
-			monitor.worked(1);
-			if (image instanceof BufferedImage) {
-				ImageExporter.exportToFile(destination, (BufferedImage) image,
-						exportFormat, monitor, format.getQuality());
-				found = true;
-			}
-		}
-
-		if (!found) {
-			Image image = gen.createSWTImageDescriptorForParts(editParts,
-					imageRect).createImage();
-			monitor.worked(1);
-			saveToFile(destination, image, format, monitor);
-			image.dispose();
-		}
-	}
-
-    /**
-	 * 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 {
-
-        IStatus fileModificationStatus = createFile(destination);
-        if (!fileModificationStatus.isOK()) {
-        	// can't write to the file
-        	return;
-        }
-        
-        try {
-        	FileOutputStream stream = new FileOutputStream(destination.toOSString());
-            saveToOutputStream(stream, image, imageFormat, monitor);
-            stream.close();
-        } catch (Exception e) {
-            Log.error(Draw2dRenderPlugin.getInstance(), IStatus.ERROR, e
-                    .getMessage(), e);
-                IStatus status =
-                    new Status(IStatus.ERROR, "exportToFile", IStatus.OK, //$NON-NLS-1$
-                        e.getMessage(), null);
-                throw new CoreException(status);
-        }
-        
-        refreshLocal(destination);
-    }
-    
-    private void saveToOutputStream(OutputStream stream, Image image, ImageFileFormat imageFormat, IProgressMonitor monitor) {
-        monitor.worked(1);
-        
-        ImageData imageData = image.getImageData();
-        
-        if (imageFormat.equals(ImageFileFormat.GIF) ||
-                imageFormat.equals(ImageFileFormat.BMP))
-            imageData = createImageData(image); 
-
-        monitor.worked(1);
-        ImageLoader imageLoader = new ImageLoader();
-        imageLoader.data = new ImageData[] {imageData};
-        imageLoader.logicalScreenHeight = image.getBounds().width;
-        imageLoader.logicalScreenHeight = image.getBounds().height;
-        imageLoader.save(stream, imageFormat.getOrdinal());
-        
-        monitor.worked(1);
-    }
-
-    
-    /**
-     * 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 {
-		saveToFile(destination, generator, ImageFileFormat.SVG, monitor);
-	}
-        
-    
-    /**
-	 * Saves an SVG or PDF files.
-	 * 
-	 * @param destination
-	 *            the destination file, including path and file name
-	 * @param generator
-	 *            the svg generator for a diagram, used to write
-	 * @param format
-	 *            currently supports SVG or PDF
-	 * @param monitor
-	 *            the progress monitor
-	 * @exception CoreException
-	 *                if this method fails
-	 */
-    protected void saveToFile(IPath destination,
-            DiagramSVGGenerator generator, ImageFileFormat format, 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);
-			saveToOutputStream(os, generator, format, monitor);
-			os.close();
-			monitor.worked(1);
-			refreshLocal(destination);
-		} catch (IOException ex) {
-			Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
-					.getMessage(), ex);
-			IStatus status = new Status(IStatus.ERROR,
-					"exportToFile", IStatus.OK, //$NON-NLS-1$
-					ex.getMessage(), null);
-			throw new CoreException(status);
-		}
-	}
-        
-    private void saveToOutputStream(OutputStream stream, DiagramSVGGenerator generator, ImageFileFormat format, IProgressMonitor monitor) throws CoreException {
-		if (format == ImageFileFormat.PDF) {
-			SVGImageConverter.exportToPDF((SVGImage) generator.getRenderedImage(), stream);
-		} else if (format == ImageFileFormat.SVG) {
-			generator.stream(stream);
-		} else {
-			throw new IllegalArgumentException(
-					"Unexpected format: " + format.getName()); //$NON-NLS-1$
-		}
-		monitor.worked(1);
-    }
-    
-
-    /**
-     * 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 < 256; ++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/DiagramImageUtils.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java
deleted file mode 100644
index 7a3e3d8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Translatable;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
-
-/**
- * Utility methods used by various diagram image generators
- * 
- * @author aboyko
- * @since 1.3
- *
- */
-public final class DiagramImageUtils {
-
-	/**
-	 * Calculates the bounding box around given editparts. The bounding box is relative to printable layer
-	 * 
-	 * @param editparts given editparts
-	 * @param frameSize frame around the bounding box
-	 * @param defaultSize if there are no editparts, the size of the bounding box will be the default one.
-	 * @return the editparts bounding box
-	 */
-	public static final Rectangle calculateImageRectangle(
-			List<IGraphicalEditPart> editparts, double frameSize, Dimension defaultSize) {
-		double minX = editparts.isEmpty() ? 0 : Double.MAX_VALUE;
-		double maxX = editparts.isEmpty() ? 0 : Double.MIN_VALUE;
-		double minY = editparts.isEmpty() ? 0 : Double.MAX_VALUE;
-		double maxY = editparts.isEmpty() ? 0 : Double.MIN_VALUE;
-
-		IFigure printableLayer = null;
-		if (!editparts.isEmpty()) {
-			printableLayer = LayerManager.Helper.find(editparts.get(0))
-					.getLayer(LayerConstants.PRINTABLE_LAYERS);
-		}
-
-		for (IGraphicalEditPart editPart : editparts) {
-			IFigure figure = editPart.getFigure();
-			Rectangle bounds = null;
-			if (figure instanceof IExpandableFigure)
-				bounds = ((IExpandableFigure) figure).getExtendedBounds().getCopy();
-			else
-				bounds = figure.getBounds().getCopy();
-			translateTo(bounds, figure, printableLayer);
-			
-			minX = Math.min(minX, bounds.preciseX());
-			maxX = Math.max(maxX, bounds.preciseX() + bounds.preciseWidth());
-			minY = Math.min(minY, bounds.preciseY());
-			maxY = Math.max(maxY, bounds.preciseY() + bounds.preciseHeight());
-		}
-
-		PrecisionRectangle rect = new PrecisionRectangle();
-		rect.preciseWidth = maxX - minX;
-		rect.preciseHeight = maxY - minY;
-		
-		if (defaultSize != null) {
-			if (rect.preciseHeight <= 0) {
-				rect.preciseHeight = defaultSize.preciseWidth();
-			}
-			if (rect.preciseHeight <= 0) {
-				rect.preciseHeight = defaultSize.preciseHeight();
-			}
-		}
-		
-		rect.preciseX = minX - frameSize;
-		rect.preciseY = minY - frameSize;
-		rect.preciseWidth += 2 * frameSize;
-		rect.preciseHeight += 2 * frameSize;
-		rect.updateInts();
-		return rect;
-	}
-	
-	/**
-	 * Translates <code>t</code> from one figure coordinate system to its ancestor figure coordinate system 
-	 * 
-	 * @param t the value to translate
-	 * @param translateFrom initial figure
-	 * @param translateTo some ancestor figure
-	 * @return translated <code>t</code>
-	 */
-	public static final Translatable translateTo(Translatable t,
-			IFigure translateFrom, IFigure translateTo) {
-		for (IFigure walker = translateFrom; walker != null
-				&& walker != translateTo; walker = walker.getParent()) {
-			walker.translateToParent(t);
-		}
-		return t;
-	}
-	
-	/**
-	 * Sorts editparts using editparts figures z-order. All figures must be
-	 * ancestors of <code>zOrderRoot</code> figure
-	 * 
-	 * @param editparts
-	 *            list of editparts to sort
-	 * @param zOrderRoot
-	 *            the common parent
-	 * @since 1.3
-	 */
-	public static void zOrderSort(List<? extends GraphicalEditPart> editparts, IFigure zOrderRoot) {
-		if (editparts == null || editparts.size() < 2) {
-			return;
-		}
-		final Map<GraphicalEditPart, List<Integer>> indexMap = new IdentityHashMap<GraphicalEditPart, List<Integer>>(editparts.size());
-		for (GraphicalEditPart ep : editparts) {
-			List<Integer> index = new ArrayList<Integer>();
-			for (IFigure fig = ep.getFigure(); fig != zOrderRoot && fig.getParent() != null; fig = fig.getParent()) {
-				index.add(fig.getParent().getChildren().indexOf(fig));
-			}
-			indexMap.put(ep, index);
-		}
-		Collections.sort(editparts, new Comparator<GraphicalEditPart>() {
-			public int compare(GraphicalEditPart ep1, GraphicalEditPart ep2) {
-				List<Integer> index1 = indexMap.get(ep1);
-				List<Integer> index2 = indexMap.get(ep2);
-				int num1, num2;
-				for (int i = 0; i < index1.size() && i < index2.size(); i++) {
-					num1 = index1.get(index1.size() - 1 - i).intValue();
-					num2 = index2.get(index2.size() - 1 - i).intValue();
-					if (num1 < num2) {
-						return -1;
-					} else if (num1 > num2) {
-						return 1;
-					}
-				}
-				/*
-				 * If we get here then either one editparts figure is the child of another one.
-				 * Child figure will be on top of its parent. 
-				 * Parent figure will have smaller size of the index
-				 */
-				if (index1.size() < index2.size()) {
-					return 1;
-				} else if (index1.size() > index2.size()) {
-					return -1;
-				} else {
-					return 0;
-				}
-			}
-		});
-	}
-	
-}
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 68386da..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, 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.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/PartPositionInfoGenerator.java b/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/PartPositionInfoGenerator.java
deleted file mode 100644
index 14b78bf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/PartPositionInfoGenerator.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.LabelEditPart;
-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.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-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.notation.View;
-
-/**
- * A Utility class to generate the info for images of diagrams
- * 
- * @author aboyko
- * @since 1.3
- *
- */
-public final class PartPositionInfoGenerator {
-
-	/**
-	 * Margin around the connection. <code>Double</code> value is expected. The
-	 * generator picks the maximum between this value and the line width of the
-	 * connection. The value must be in logical units.
-	 * <p>Default value of 0 is taken if options is not provided</p>
-	 */
-	public static final String CONNECTION_MARGIN = "connectionMargin"; //$NON-NLS-1$
-	/**
-	 * Point of the origin of the diagram, this is expected to be a
-	 * {@link org.eclipse.draw2d.geometry.Point} in logical units, relative to
-	 * printable layer.
-	 * <p>Default value of (0,0) is taken if this option is not provided</p>
-	 */
-	public static final String DIAGRAM_ORIGIN = "diagramOrigin"; //$NON-NLS-1$
-	/**
-	 * Scaling factor for generating parts info for scaled down or up diagram.
-	 * Double is expected.
-	 * <p>Default value of 1.0 will be taken if this option is
-	 * not provided</p>
-	 */
-	public static final String SCALE_FACTOR = "scaleFactor";  //$NON-NLS-1$
-
-	/**
-	 * Generates the info for a diagram
-	 * 
-	 * @param diagramEditPart the diagram
-	 * @param options options affecting positional info
-	 * @return a list of <code>PartPositionInfo</code>
-	 */
-	public static final List<PartPositionInfo> getDiagramPartInfo(
-			DiagramEditPart diagramEditPart, Map<String, Object> options) {
-		List<PartPositionInfo> result = new ArrayList<PartPositionInfo>();
-		List<IGraphicalEditPart> editParts = new ArrayList<IGraphicalEditPart>();
-
-		List<IGraphicalEditPart> children = (List<IGraphicalEditPart>) diagramEditPart.getPrimaryEditParts();
-		IMapMode mm = MapModeUtil.getMapMode(diagramEditPart.getFigure());
-		
-		Object optionConnectionMargin = options.get(PartPositionInfoGenerator.CONNECTION_MARGIN);
-		double connectionMargin = optionConnectionMargin != null ? ((Double)optionConnectionMargin).doubleValue() : 0;
-		Object optionDiagramOrigin = options.get(PartPositionInfoGenerator.DIAGRAM_ORIGIN);
-		Point origin = optionDiagramOrigin != null ? (Point)optionDiagramOrigin : new Point();
-		Object optionScaleFactor = options.get(PartPositionInfoGenerator.SCALE_FACTOR);
-		double scale = optionScaleFactor != null ? ((Double)optionScaleFactor).doubleValue() : 1.0;
-		if (scale <= 0) {
-			throw new IllegalArgumentException();
-		}
-
-		for (IGraphicalEditPart part : children) {
-			editParts.add(part);
-			getNestedEditParts(part, editParts);
-		}
-		
-		IFigure printableLayer = LayerManager.Helper.find(diagramEditPart)
-				.getLayer(LayerConstants.PRINTABLE_LAYERS);
-
-		for (IGraphicalEditPart part : editParts) {
-			IFigure figure = part.getFigure();
-
-			// Need to support any kind of shape edit part
-			// and shape compartments, too, because these sometimes
-			// correspond to distinct semantic elements
-			View view = part.getNotationView();
-			if (part instanceof ConnectionEditPart
-					&& figure instanceof PolylineConnection) {
-				// 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.setView(view);
-				position.setSemanticElement(ViewUtil
-						.resolveSemanticElement(view));
-
-				PolylineConnection mainPoly = (PolylineConnection) figure;
-				if (mainPoly.isVisible() && !mainPoly.getBounds().isEmpty()) {
-					PointList mainPts = mainPoly.getPoints().getCopy();
-	
-					DiagramImageUtils.translateTo(mainPts, figure, printableLayer);
-					PointList envelopingPts = calculateEnvelopingPolyline(mainPts,
-							(int) Math.max(connectionMargin, mainPoly
-									.getLineWidth() >> 1));
-					envelopingPts.translate(new PrecisionPoint(-origin.preciseX(),
-							-origin.preciseY()));
-					mm.LPtoDP(envelopingPts);
-					envelopingPts.performScale(scale);
-	
-					List<Point> pts = new ArrayList(envelopingPts.size());
-					for (int i = 0; i < envelopingPts.size(); i++) {
-						pts.add(envelopingPts.getPoint(i));
-					}
-	
-					position.setPolyline(pts);
-				}
-				result.add(0, position);
-			} else if ((view != null && view.isSetElement())
-					|| (part instanceof ShapeEditPart
-							|| part instanceof ShapeCompartmentEditPart || part instanceof LabelEditPart)) {
-				PartPositionInfo position = new PartPositionInfo();
-
-				position.setView(view);
-				position.setSemanticElement(ViewUtil
-						.resolveSemanticElement(view));
-
-				if (figure.isShowing() && !figure.getBounds().isEmpty()) {
-					PrecisionRectangle bounds = new PrecisionRectangle(figure
-							.getBounds());
-					DiagramImageUtils.translateTo(bounds, figure, printableLayer);
-					bounds.translate(new PrecisionPoint(-origin.preciseX(), -origin
-							.preciseY()));
-					mm.LPtoDP(bounds);
-	
-					bounds.performScale(scale);
-	
-					position.setPartHeight(bounds.height);
-					position.setPartWidth(bounds.width);
-					position.setPartX(bounds.x);
-					position.setPartY(bounds.y);
-				}
-				result.add(0, position);
-			}
-		}
-		return result;
-	}
-
-	private static void getNestedEditParts(IGraphicalEditPart childEditPart,
-			Collection editParts) {
-
-		for (Iterator iter = childEditPart.getChildren().iterator(); iter
-				.hasNext();) {
-
-			IGraphicalEditPart child = (IGraphicalEditPart) iter.next();
-			editParts.add(child);
-			getNestedEditParts(child, editParts);
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	private static PointList calculateEnvelopingPolyline(PointList polyPts, int margin) {
-		PointList result = new PrecisionPointList(polyPts.size() << 1);
-		List<LineSeg> mainSegs = (List<LineSeg>) PointListUtilities.getLineSegments(polyPts);
-		removeRedundantSegments(mainSegs);
-		if (mainSegs.size() > 0) {		
-			result = calculateParallelPolyline(mainSegs, margin);
-			PointList pts = calculateParallelPolyline(mainSegs, -margin);
-			for (int i = pts.size() - 1; i >= 0; i--) {
-				result.addPoint(pts.getPoint(i));
-			}
-			result.addPoint(result.getFirstPoint());
-		}
-		return result;
-	}
-	
-	private static void removeRedundantSegments(List<LineSeg> polyPts) {
-		for (Iterator<LineSeg> itr = polyPts.listIterator(); itr.hasNext();) {
-			LineSeg lineSeg = itr.next();
-			if (lineSeg.getOrigin().equals(lineSeg.getTerminus())) {
-				itr.remove();
-			}
-		}
-	}
-	
-	/**
-	 * Calculates polyline offset from the given polyline by the margin value
-	 * 
-	 *  ResultA          ResultB
-	 *     +----------------+
-	 *     |                |<------- MARGIN
-	 *   A *----------------* B
-	 * 
-	 * On the figure above: AB is a given polyline. ResultA-ResultB is the result
-	 * @param polySegs given polyline
-	 * @param margin offset from given poly-line, can be negative.
-	 * @return offset or parallel polyline.
-	 */
-	private static PointList calculateParallelPolyline(List<LineSeg> polySegs, int margin) {
-		PointList result = new PrecisionPointList(polySegs.size() << 2);
-		int index = 0;
-		int absMargin = Math.abs(margin);
-		Sign sign = margin < 0 ? Sign.NEGATIVE : Sign.POSITIVE;
-		LineSeg parallel_1, parallel_2;
-		result.addPoint(polySegs.get(index++).locatePoint(0, absMargin, sign));
-		parallel_1 = polySegs.get(index - 1).getParallelLineSegThroughPoint(result.getLastPoint());
-		for (; index < polySegs.size(); index++) {
-			parallel_2 = polySegs.get(index).getParallelLineSegThroughPoint(
-					polySegs.get(index).locatePoint(0, absMargin, sign));
-			PointList intersections = parallel_1.getLinesIntersections(parallel_2);
-			if (intersections.size() > 0) {
-				result.addPoint(intersections.getFirstPoint());
-			} else {
-				result.addPoint(parallel_1.getTerminus());
-				result.addPoint(parallel_2.getOrigin());
-			}
-			parallel_1 = parallel_2;
-		}
-		result.addPoint(polySegs.get(index - 1).locatePoint(1.0, absMargin, sign));
-		return result;
-	}
-	
-}
-
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 cced723..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/.api_filters
deleted file mode 100644
index 2fa24b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/wizards/EditorCreationWizard.java" type="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.wizards.EditorCreationWizard">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="BasicNewResourceWizard"/>
-                <message_argument value="EditorCreationWizard"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aa86113..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:02:47 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 eba6379..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/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.diagram.ui.resources.editor.ide; singleton:=true
-Bundle-Version: 1.2.1.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.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 b8a5739..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 Modeling Project
\ 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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/pom.xml
deleted file mode 100644
index 2ef4111..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide</artifactId>
-  <version>1.2.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 40b569f..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,391 +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);
-		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 3d5dfed..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,150 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-				/*
-				 * Bugzilla 255264: If nothing was selected on the diagram this
-				 * implies that contents editpart is selected. When the diagram
-				 * is "saved as" to another file new editparts are created and
-				 * old ones disposed. Consequently, views displaying data about
-				 * selected objects on the diaqram must be updated - it a
-				 * another diagram editpart selected now. Threfore, we need to
-				 * call deselectAll() such that the selection event is fired
-				 * with the implicitly selected diagram editpart.
-				 */
-				getGraphicalViewer().deselectAll();
-			}
-		}
-
-		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 1882ef3..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,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.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
- * 
- */
-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 927abb8..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,331 +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
- * 
- * 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 4037750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-org
-target
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 89fee9a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 25f65f6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:02:33 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 09853c3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/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.resources.editor; singleton:=true
-Bundle-Version: 1.4.1.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 a631a64..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 Modeling Project
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/pom.xml b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/pom.xml
deleted file mode 100644
index 272a62b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui.resources.editor</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui.resources.editor</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 ac2f953..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,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.diagram.ui.resources.editor.internal;
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author qili
- *
- */
-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 bcbc8b5..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,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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); 
-			String fileName = file.getLocation().toOSString();
-			
-	        // File exists with contents..
-	        notationModel = editingDomain.loadResource(fileName);
-		     
-		} 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;
-		}
-
-		if (notationModel != null) {
-		    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..
-			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 3c6b3d0..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,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.diagram.ui.resources.editor.internal.notationprovider;
-
-
-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 c382e33..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,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.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
- */
-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 b60e780..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,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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
- */
-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 50d0e8a..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,278 +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) {
-		if (diagram.eResource() != null) {
-			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 578c58e..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,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 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author qili
- */
-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 dd49e76..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,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.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.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @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() {
-		return DisplayUtils.getDisplay();
-	}
-
-
-    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 ac08b48..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,1689 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 java.util.List;
-
-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.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-import org.eclipse.gmf.runtime.common.ui.services.statusline.StatusLineService;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-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.preferences.IPreferenceConstants;
-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.IContributionItem;
-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.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.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette#initializeGraphicalViewer()
-	 */
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-        RootEditPart rootEditPart = getGraphicalViewer().getRootEditPart();
-		if (rootEditPart instanceof DiagramRootEditPart) {
-			DiagramRootEditPart root = (DiagramRootEditPart) rootEditPart;
-			((IPreferenceStore) root
-					.getPreferencesHint().getPreferenceStore()).addPropertyChangeListener(propertyChangeListener);
-		}
-	}
-	
-	/* (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;
-		}
-		
-		if (getGraphicalViewer() != null) {
-			RootEditPart rootEditPart = getGraphicalViewer().getRootEditPart();
-			if (rootEditPart instanceof DiagramRootEditPart) {
-				DiagramRootEditPart root = (DiagramRootEditPart) rootEditPart;
-				((IPreferenceStore) root
-					.getPreferencesHint().getPreferenceStore()).removePropertyChangeListener(propertyChangeListener);
-			}
-		
-			IDocumentProvider provider = getDocumentProvider();
-			IStatus status = provider.getStatus(getEditorInput());
-
-			disposeDocumentProvider();
-		
-			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);
-		if (part == this) {
-			rebuildStatusLine();
-		}
-	}
-
-	/* (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());
-		rebuildStatusLine();
-	}
-
-	/**
-	 * 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 editor's property change listener. */
-	private IPropertyChangeListener propertyChangeListener= new PropertyChangeListener();
-	/** A label provider for the status line (one of the status line contributions). 
-	 * @since 1.2*/
-	protected ILabelProvider statusLineLabelProvider;
-	/** A list of contribution items for the status line. 
-	 * @since 1.2*/
-    protected List<IContributionItem> statusLineContributions;
-	/** 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;
-			handleDeactivation();
-		}
-
-		/*
-		 * @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;
-				}
-			}
-		}
-		
-		/**
-		 * Handles the deactivation triggering status line contribution items removal.
-		 */
-		private void handleDeactivation(){
-			removeStatusLineContributions();
-		}
-
-		/*
-		 * @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) {
-			handleDeactivation();
-		}
-
-		/*
-		 * @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;
-    }
-
-    /**
-	 * Update the status line message contribution. The default status line
-	 * manager provides the ability to display an icon and message.
-	 * 
-	 * @param message The message. 
-	 * @param image The icon image.
-     * @since 1.2
-     */
-	protected void updateStatusLineMessageContribution(String message, Image image) {
-		getEditorSite().getActionBars().getStatusLineManager().setMessage(
-				image, message);
-	}
-
-	/**
-	 * Add the status line contributions to this editor from the status line
-	 * service.
-	 * 
-	 * @since 1.2
-	 */
-	protected void addStatusLineContributions() {
-		if (statusLineContributions != null && !statusLineContributions.isEmpty()) {
-			return;
-		}
-		statusLineContributions = StatusLineService.getInstance()
-				.getStatusLineContributionItems(getSite().getPage());
-		if(statusLineContributions.isEmpty()){
-			return;
-		}
-		for (IContributionItem contrItem : statusLineContributions) {
-			getEditorSite().getActionBars()
-			.getStatusLineManager().add(contrItem);
-			if (contrItem instanceof ILabelProvider) {
-				statusLineLabelProvider = (ILabelProvider)contrItem;
-				
-			}
-		}
-	}
-
-	/**
-	 * Remove the status line contributions from this editor.
-	 * 
-	 * @since 1.2
-	 */
-	protected void removeStatusLineContributions() {
-		if (statusLineContributions == null || statusLineContributions.isEmpty()) {
-			return;
-		}
-		IStatusLineManager statusLineManager = getEditorSite().getActionBars()
-				.getStatusLineManager();
-		for (IContributionItem contrItem : statusLineContributions) {
-			IContributionItem removedItem = statusLineManager.remove(contrItem);
-			if (removedItem != null) {
-				removedItem.dispose();
-			}
-		}
-		statusLineContributions.removeAll(statusLineContributions);
-		statusLineLabelProvider = null;
-		
-		updateStatusLineMessageContribution(null, null);
-		getEditorSite().getActionBars().getStatusLineManager()
-				.update(true);		
-	}
-
-	/**
-	 * Rebuild the status line contributions from this editor.
-	 * 
-	 * @since 1.2
-	 */
-	protected void rebuildStatusLine() {
-		if (isStatusLineOn()) {
-			addStatusLineContributions();
-			handleSelectionChanged();
-			getEditorSite().getActionBars().getStatusLineManager().update(true);
-		}
-	}
-
-	/**
-	 * Determine if the status line should be on based on the global 
-	 * preference.
-	 * 
-	 * @since 1.2
-	 */
-	protected boolean isStatusLineOn() {
-		RootEditPart rep = getGraphicalViewer().getRootEditPart();
-		if (rep instanceof DiagramRootEditPart) {
-			DiagramRootEditPart root = (DiagramRootEditPart) rep;
-			boolean statusLineIsOn = ((IPreferenceStore) root
-					.getPreferencesHint().getPreferenceStore())
-					.getBoolean(IPreferenceConstants.PREF_SHOW_STATUS_LINE);
-			return statusLineIsOn;
-		}
-		return false;
-	}
-
-	/**
-	 * Internal property change listener for handling changes in the editor's
-	 * preferences.
-	 */
-	private class PropertyChangeListener implements IPropertyChangeListener {
-
-		public void propertyChange(PropertyChangeEvent event) {
-			if (PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart() == DiagramDocumentEditor.this) {
-				String property = event.getProperty();
-				if (IPreferenceConstants.PREF_SHOW_STATUS_LINE
-						.equals(property)) {
-					if (!isStatusLineOn()) {
-						removeStatusLineContributions();
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * If the status line is on and the editor has a status line label provider,
-	 * the update.
-	 * 
-	 * @since 1.2
-	 */
-	protected void handleSelectionChanged() {
-		if (isStatusLineOn() && statusLineLabelProvider != null) {
-			IStructuredSelection selection = (IStructuredSelection)getSite().
-				getSelectionProvider().getSelection();
-			
-			updateStatusLineMessageContribution(
-					statusLineLabelProvider.getText(selection), 
-					statusLineLabelProvider.getImage(selection));
-		}
-	}
-}
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 311696b..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,222 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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
- *
- * 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 02a5e09..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,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.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
- * 
- */
-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]);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.cc_meta b/org.eclipse.gmf.runtime.diagram.ui/.cc_meta
deleted file mode 100644
index c998ea3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.cc_meta
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<name>org.eclipse.gmf.runtime.diagram.ui</name>

-</project-description>

diff --git a/org.eclipse.gmf.runtime.diagram.ui/.classpath b/org.eclipse.gmf.runtime.diagram.ui/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.runtime.diagram.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.cvsignore b/org.eclipse.gmf.runtime.diagram.ui/.cvsignore
deleted file mode 100644
index 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.options b/org.eclipse.gmf.runtime.diagram.ui/.options
deleted file mode 100644
index c83528e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.options
+++ /dev/null
@@ -1,26 +0,0 @@
-# Debugging options for the org.eclipse.gmf.runtime.diagram.ui plug-in
-
-# Turn on general debugging for the org.eclipse.gmf.runtime.diagram.ui plug-in
-org.eclipse.gmf.runtime.diagram.ui/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.diagram.ui/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting=false
-
-# Trace DND
-org.eclipse.gmf.runtime.diagram.ui/debug/dnd/tracing=false
-
-# Trace Persistence Manager
-org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr=false
-
-# Trace Canonical EditPolicies
-org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical=false
-
-# Trace Event Broadcasting
-org.eclipse.gmf.runtime.diagram.ui/debug/filter/events=false
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.project b/org.eclipse.gmf.runtime.diagram.ui/.project
deleted file mode 100644
index 8a279b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.diagram.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.settings/.api_filters b/org.eclipse.gmf.runtime.diagram.ui/.settings/.api_filters
deleted file mode 100644
index f127242..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.settings/.api_filters
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.gmf.runtime.diagram.ui" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java" type="org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="PropertyChangeAction"/>
-                <message_argument value="CheckedPropertyAction"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand$LabelProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ElementTypeLabelProvider"/>
-                <message_argument value="LabelProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ClipboardCommand"/>
-                <message_argument value="PasteCommand"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionAndEndLabelProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ElementTypeLabelProvider"/>
-                <message_argument value="ConnectionAndEndLabelProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionLabelProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ElementTypeLabelProvider"/>
-                <message_argument value="ConnectionLabelProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$EndLabelProvider">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ElementTypeLabelProvider"/>
-                <message_argument value="EndLabelProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContainedEditPart"/>
-                <message_argument value="CompartmentEditPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContainedEditPart"/>
-                <message_argument value="ConnectionEditPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ISurfaceEditPart"/>
-                <message_argument value="DiagramEditPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ZoomableEditPart"/>
-                <message_argument value="DiagramRootEditPart"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="DiagramRuler"/>
-                <message_argument value="DiagramRootEditPart"/>
-                <message_argument value="getHorizontalRuler()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="DiagramRuler"/>
-                <message_argument value="DiagramRootEditPart"/>
-                <message_argument value="getVerticalRuler()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="PageBreakEditPart"/>
-                <message_argument value="DiagramRootEditPart"/>
-                <message_argument value="getPageBreakEditPart()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart$DiagramScalableFreeformLayeredPane">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ScalableFreeformLayeredPane"/>
-                <message_argument value="DiagramScalableFreeformLayeredPane"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="MapModeGraphics"/>
-                <message_argument value="DiagramScalableFreeformLayeredPane"/>
-                <message_argument value="createMapModeGraphics(Graphics)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ScaledGraphics"/>
-                <message_argument value="DiagramScalableFreeformLayeredPane"/>
-                <message_argument value="createScaledGraphics(MapModeGraphics)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="MapModeGraphics"/>
-                <message_argument value="DiagramScalableFreeformLayeredPane"/>
-                <message_argument value="createScaledGraphics(MapModeGraphics)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ISurfaceEditPart"/>
-                <message_argument value="ShapeCompartmentEditPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IContainedEditPart"/>
-                <message_argument value="TopGraphicEditPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="ConnectionBendpointEditPolicy"/>
-                <message_argument value="ConnectionBendpointEditPolicy"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="LineMode"/>
-                <message_argument value="ConnectionBendpointEditPolicy"/>
-                <message_argument value="ConnectionBendpointEditPolicy(LineMode)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="GraphicalEditPolicyEx"/>
-                <message_argument value="DecorationEditPolicy"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramPopupBarEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramPopupBarEditPolicy">
-        <filter id="623939596">
-            <message_arguments>
-                <message_argument value="Image"/>
-                <message_argument value="DiagramPopupBarEditPolicy"/>
-                <message_argument value="type"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="ChangeBoundsDeferredRequest"/>
-                <message_argument value="ResizableShapeEditPolicy"/>
-                <message_argument value="getMoveDeferredCommand(ChangeBoundsDeferredRequest)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TetherConnectionEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.TetherConnectionEditPolicy">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="GraphicalEditPolicyEx"/>
-                <message_argument value="TetherConnectionEditPolicy"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IExpandableFigure"/>
-                <message_argument value="BorderedNodeFigure"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="AnimatableScrollPane"/>
-                <message_argument value="ResizableCompartmentFigure"/>
-                <message_argument value="createScrollpane()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="AnimatableScrollPane"/>
-                <message_argument value="ResizableCompartmentFigure"/>
-                <message_argument value="createScrollpane(IMapMode)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="AnimatableScrollPane"/>
-                <message_argument value="ShapeCompartmentFigure"/>
-                <message_argument value="createScrollpane(IMapMode)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java" type="org.eclipse.gmf.runtime.diagram.ui.handles.CompartmentCollapseHandle">
-        <filter id="627060751">
-            <message_arguments>
-                <message_argument value="CollapseFigure"/>
-                <message_argument value="CompartmentCollapseHandle"/>
-                <message_argument value="collapseFigure"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java" type="org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="SuppressibleUIRequest"/>
-                <message_argument value="CreateConnectionViewAndElementRequest"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java" type="org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator">
-        <filter id="338792546">
-            <message_arguments>
-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator"/>
-                <message_argument value="getDecoration()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/AbstractEditPartProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IEditPartProvider"/>
-                <message_argument value="AbstractEditPartProvider"/>
-            </message_arguments>
-        </filter>
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="Properties"/>
-                <message_argument value="AbstractEditPartProvider"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="EditPartOperation"/>
-                <message_argument value="CreateGraphicEditPartOperation"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="EditPartOperation"/>
-                <message_argument value="CreateRootEditPartOperation"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="IEditPartProvider"/>
-                <message_argument value="EditPartService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6aabdf2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:00:16 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
diff --git a/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index aeeea45..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,309 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui; singleton:=true
-Bundle-Version: 1.6.0.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.actions,
- org.eclipse.gmf.runtime.diagram.ui.commands,
- org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter,
- org.eclipse.gmf.runtime.diagram.ui.editparts,
- org.eclipse.gmf.runtime.diagram.ui.editpolicies,
- org.eclipse.gmf.runtime.diagram.ui.figures,
- org.eclipse.gmf.runtime.diagram.ui.handles,
- org.eclipse.gmf.runtime.diagram.ui.image,
- org.eclipse.gmf.runtime.diagram.ui.internal;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.actions;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.commands;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.dialogs;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.sortfilter;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.editparts;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.figures;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.handles;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.l10n;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions,
-   org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.internal.parts;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.properties;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions,
-   org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.diagram.ui.internal.requests;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.resources;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.ruler;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.ruler.commands;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.services.editpolicy;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.services.layout;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.services.palette;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.tools;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.type;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.internal.util;
-  x-friends:="org.eclipse.gmf.tests.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.render,
-   org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-   org.eclipse.gmf.runtime.diagram.ui.providers,
-   org.eclipse.gmf.runtime.diagram.ui.properties,
-   org.eclipse.gmf.runtime.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui.geoshapes,
-   org.eclipse.gmf.runtime.diagram.ui,
-   org.eclipse.gmf.runtime.diagram.ui.actions",
- org.eclipse.gmf.runtime.diagram.ui.l10n,
- org.eclipse.gmf.runtime.diagram.ui.label,
- org.eclipse.gmf.runtime.diagram.ui.layout,
- org.eclipse.gmf.runtime.diagram.ui.menus,
- org.eclipse.gmf.runtime.diagram.ui.parts,
- org.eclipse.gmf.runtime.diagram.ui.preferences,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.requests,
- org.eclipse.gmf.runtime.diagram.ui.services.decorator,
- org.eclipse.gmf.runtime.diagram.ui.services.editpart,
- org.eclipse.gmf.runtime.diagram.ui.services.editpolicy,
- org.eclipse.gmf.runtime.diagram.ui.services.layout,
- org.eclipse.gmf.runtime.diagram.ui.services.palette,
- org.eclipse.gmf.runtime.diagram.ui.tools,
- org.eclipse.gmf.runtime.diagram.ui.type,
- org.eclipse.gmf.runtime.diagram.ui.util,
- org.eclipse.gmf.runtime.diagram.ui.view.factories,
- org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal
-Require-Bundle: org.eclipse.ui.views;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.gef.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.common;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.diagram.ui/ScrapbookPage1.jpage b/org.eclipse.gmf.runtime.diagram.ui/ScrapbookPage1.jpage
deleted file mode 100644
index 2ab03b7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/ScrapbookPage1.jpage
+++ /dev/null
@@ -1,57 +0,0 @@
-GC
-IFigure
-Figure
-Control
-Layer
-GridLayout
-Scrollable
-GC
-setConstraint
-StackLayout
-getActiveFactory
-JavaRefFactoryImpl
-IPackageFragment
-ResourceSet
-JavaMOFNatureRuntime
-TextCompartmentView
-getModel
-getEditPart
-ClassFigure
-Notifier
-AdapterImpl
-ADAPTER_KEY
-removeReference
-JavaPackageImpl
-EPackageGenImpl
-JavaClassImpl
-JavaReflectionSynchronizer
-JavaClassJDOMAdaptor 
-setJavaProject
-JavaJDOMAdapterFactory
-RefReference
-ResourceSetFactory
-RefObject
-StructuredViewer
-Adapter
-IUMLView
-EReference
-EAttribute
-Notifier
-IRMSPoint
-Control
-AbstractEditPartViewer
-IUMLClass
-IUMLStructuralFeature
-IUMLRelationship
-SourceType
-IShell
-IUMLNote
-IUMLPackage
-IUMLOnLineView
-getDiagrams
-makeURI
-RefObject
-IProject
-ClassView
-Key
-RefBaseObjectImpl
diff --git a/org.eclipse.gmf.runtime.diagram.ui/about.html b/org.eclipse.gmf.runtime.diagram.ui/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime.diagram.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, 2007</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/build.properties b/org.eclipse.gmf.runtime.diagram.ui/build.properties
deleted file mode 100644
index 65e5596..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/build.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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               schema/,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = schema/
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateME.gif b/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateME.gif
deleted file mode 100644
index 0f8b520..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateME.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateMenuUseCases.html b/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateMenuUseCases.html
deleted file mode 100644
index 1ee9a7b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateMenuUseCases.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<TITLE>Aurora Use Case Analysis Document: &lt;&lt;Feature Name&gt;&gt;</TITLE>
-<LINK rel="stylesheet" href="technote.css" type="text/css">
-</HEAD>
-<BODY>
-<A name="top"></A><IMG border="0" src="logo.gif" width="629" height="192"><H1 align="center">Aurora Use Case Analysis Document:<BR>
-Duplicate Menu</H1>
-<TABLE border="0" cellspacing="8">
-	<TBODY>
-		<TR>
-			<TD>Version: 1.01</TD>
-			<TD>Date: Mar. 7, 2005</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<H2>Contents</H2>
-<UL>
-	<LI><A href="#intro">Introduction</A></LI>
-	<LI><A href="#refs">References</A></LI>
-	<LI><A href="#trace">Traceability</A></LI>
-	<LI><A href="#reqs">Requirements</A></LI><LI><A href="#constraints">Constraints and Limitations</A></LI>
-	<LI><A href="#usecases">Use Cases</A></LI></UL>
-<HR>
-<H2><A name="intro"></A>Introduction</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'><SPAN
-	style='font-size:11.0pt;mso-bidi-font-size:10.0pt;
-font-family:"Times New Roman";mso-fareast-font-family:"Times New Roman";
-mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'>The duplicate menu creates
-a deep copy of the element(s) or view(s) selected.</SPAN></SPAN> Duplicating a set of model elements will create a copy of the elements and all the relationships between them. Duplicating a set of views on a diagram will create a copy of the underlying elements (if applicable) and create a copy of the views on the diagram that now reference the copied elements. </P>
-<H2><A name="refs"></A>References</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<UL>
-	<LI>Rose RealTime behavior.</LI>
-	<LI><SPAN
-		style='font-size:11.0pt;mso-bidi-font-size:10.0pt;
-font-family:"Times New Roman";mso-fareast-font-family:"Times New Roman";
-mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'>Copy
-	/ Paste behavior in RSA.</SPAN></LI>
-</UL>
-<H2><A name="trace"></A>Traceability</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>RATLC00519284
-Support &quot;Duplicate&quot; functionality</SPAN>.</P>
-<H2><A name="reqs"></A>Requirements</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<UL>
-	<LI>The duplicate behavior can be invoked on a selection in one of
-	three ways:
-	<OL>
-		<LI>By right-clicking and selecting the Duplicate menu. The Duplicate menu will appear near the Copy menu and in an Edit submenu if one is available.</LI>
-		<LI>By selecting the Edit &gt; Duplicate menu on the toolbar.</LI>
-		<LI>By pressing Ctrl Shift D.</LI>
-	</OL>
-	</LI>
-	<LI>The basic duplicate behavior to duplicate UML elements and views on a diagram will be available at the core platform level. Modeler will use this basic behavior. It must be implemented so that if a client wishes to support duplicating custom elements on a diagram, it would be possible to use the default duplicate UML elements functionality or provide their own duplicate elements functionality.</LI></UL><H2><A name="constraints"></A>Constraints and Limitations</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<UL>
-	<LI>Duplicating a diagram will only duplicate the diagram and its views and not duplicate the semantic elements.</LI>
-	<LI>Duplicating a model will do the same as if the user had created a new model using the model they want to duplicate as a template. At this time, this will not be implemented. Further investigation needs to take place to see if this is possible.</LI>
-	<LI>When duplicating model elements, the duplicate menu will only be enabled on elements that support duplication. The following elements do not support duplication at this time:
-	<OL>
-		<LI>Any element in a container that can only have one element of its type (e.g. the expression of a constraint).</LI>
-	</OL>
-	</LI>
-	<LI>When duplicating views on a diagram, the duplicate menu will only be enabled on views that support duplication. The following views to not support duplication at this time:
-	<OL>
-		<LI>Any view for which the underlying semantic element cannot be duplicated.</LI>
-		<LI>Any views on a sequence diagram. (It is much more difficult to implement on sequence diagrams as the location matters in the ordering of messages. At this point it is not deemed beneficial enough to the user to implement.)</LI>
-		<LI>Any connector views for which the ends are not also selected.</LI>
-	</OL>
-	</LI>
-</UL>
-<HR>
-<H2><A name="usecases" href=""></A>Use Cases</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<UL>
-	<LI><A href="#uc1">Duplicate a model element in Model Explorer.</A></LI>
-	<LI><A href="#uc2">Duplicate a notation-only view on a diagram.</A></LI>
-	<LI><A href="#uc3">Duplicate a view with a semantic model element on a diagram.</A></LI></UL><H3><A name="uc1"></A>Duplicate a model element in Model Explorer.</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-<P>Flow of events:</P>
-<OL>
-	<LI>The user selects one or more elements in the Model Explorer.</LI>
-	<LI>The user initiates a duplicate action.</LI>
-	<LI>The selected element(s) are duplicated. </LI></OL>
-<P>Postconditions:</P><UL><LI>The duplicated elements will have Duplicate_X appended to their original name
-	where X is the lowest integer that creates a unique name within its
-	container.</LI>
-	<LI>The duplicated elements are created in the same container as its original element.</LI>
-	<LI>A deep copy of the elements are created. Any references in a
-	duplicated element to other elements that were also duplicated will now
-	reference the new duplicated element (e.g. see generalization
-	relationship below). Any references in a non-duplicated element to an element that was duplicated, will remain the same.</LI>
-</UL>
-<P align="center"><IMG border="0" src="DuplicateME.gif" width="175" height="133"></P>
-<H3><A name="uc2"></A>Duplicate a notation-only view on a diagram.</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P><P>Flow of events:</P>
-<OL>
-	<LI>The user selects one or more notation-only views on a diagram.</LI>
-	<LI>The user initiates a duplicate action.</LI>
-	<LI>The selected views are duplicated. </LI>
-</OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>Connectors are only duplicated if they are selected as well.</LI>
-	<LI>The duplicated views look the same as the original views (i.e. all view properties are also copied).</LI>
-	<LI>The duplicated views are located just below and to the right of the
-	original views.</LI>
-	<LI>The duplicated views are selected.</LI>
-</UL>
-<P align="center"><IMG border="0" src="DuplicateNotationOnly.gif" width="315"
-	height="101"></P>
-<H3><A name="uc3"></A>Duplicate a view with a semantic model element on a diagram.</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P><P>Flow of events:</P>
-<OL>
-	<LI>The user selects one or more views with a semantic model element on a diagram.</LI>
-	<LI>The user initiates a duplicate action.</LI>
-	<LI>The selected views and underlying elements are duplicated. </LI>
-</OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>The underlying model elements are duplicated just as if the user
-	had performed a duplicate on the elements in model explorer. See <A
-		href="#uc1">Use Case 1</A>.</LI>
-	<LI>Connectors are only duplicated if they are selected as well.</LI>
-	<LI>The duplicated views look the same as the original views (i.e. all
-	view properties are also copied) except that they reference the new duplicated elements.</LI>
-	<LI>The duplicated views are located just below and to the right of the
-	original views.</LI>
-	<LI>The duplicated views are selected.</LI>
-</UL>
-<P align="center"><IMG border="0" src="DuplicateViewAndElement.gif" width="384"
-	height="95"></P>
-<HR>
-<P style="margin-left: 0pt"><IMG border="0" src="copyright.gif" width="324" height="14"></P>
-</BODY>
-</HTML>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateNotationOnly.gif b/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateNotationOnly.gif
deleted file mode 100644
index 7ea4011..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateNotationOnly.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateViewAndElement.gif b/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateViewAndElement.gif
deleted file mode 100644
index fd3b2d8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/DuplicateViewAndElement.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/Image display support.html b/org.eclipse.gmf.runtime.diagram.ui/design/Image display support.html
deleted file mode 100644
index 595e82e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/Image display support.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<TITLE>Aurora Use Case Analysis Document: &lt;&lt;Feature Name&gt;&gt;</TITLE>
-<LINK rel="stylesheet" href="technote.css" type="text/css">
-</HEAD>
-<BODY>
-<A name="top"></A><IMG border="0" src="logo.gif" width="629" height="192"><H1 align="center">RMP Use Case Analysis Document:Image Display Support</H1>
-<TABLE border="0" cellspacing="8">
-	<TBODY>
-		<TR>
-			<TD>Version: 0.1</TD>
-			<TD>Date: 05/02/24</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<H2>Contents</H2>
-<UL>
-	<LI><A href="#intro">Introduction</A></LI>
-	<LI><A href="#refs">References</A></LI>
-	<LI><A href="#trace">Traceability</A></LI>
-	<LI><A href="#reqs">Requirements</A></LI><LI><A href="#constraints">Constraints and Limitations</A></LI>
-	<LI><A href="#usecases">Use Cases</A></LI></UL>
-<HR>
-<H2><A name="intro"></A>Introduction</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P>The purpose of this feature is to allow users to adorn their diagram with  images such as GIF / JPG / SVG. The user may wish to demonstrate some information that is not part of the semantic model, either to enhance the cosmetic appeal of the diagram or to help further the point of the diagram to trying to convey. The mechanism to do this would be through copy / paste from an external application or by dragging a URI that points to an image file onto the diagram.</P>
-<H2><A name="refs"></A>References</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P>Microsoft Word 2002</P>
-<H2><A name="trace"></A>Traceability</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>RATLC00532856.- Paste of images / text into diagram from outside applications.<BR>
-RATLC00141447 - EMF and WMF not supported
-</SPAN></P>
-<H2><A name="reqs"></A>Requirements</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN style="mso-bidi-font-family:Arial;font-size:
-13pt">Import
-image/graphics into the model project<BR>
-Drag &amp; Drop of image/graphics onto the drawing surface<BR>
-Copy &amp; past images onto the drawing surface<BR>
-Minor manipulation (resizing and/or cropping) of the image/graphic on
-the drawing surface&#13;</SPAN><BR>
-<SPAN style="mso-bidi-font-family:Arial;font-size:
-13pt">Images added
-as an icon or as a background to the drawing surface<BR>
-UML elements can appear on top or underneath of the image&#13;</SPAN><BR>
-<SPAN style="mso-bidi-font-family:Arial;font-size:
-13pt">Images should
-be inserted by reference. </SPAN><SPAN
-	style="mso-bidi-font-family:Arial;font-size:12pt">If an image is used
-in multiple diagrams &amp; then the image file content is changed, the
-changes automatically appear in all diagrams where it is used&#13;</SPAN></P>
-<H2><A name="constraints"></A>Constraints and Limitations</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>Copy / paste support won't work on Linux due to an existing bugzilla. See &lt;https://bugs.eclipse.org/bugs/show_bug.cgi?id=70437&gt;<BR>
-Copy / paste of WMF/EMF is not supported because there is no vector based transfer flavor supported by JDK 1.4.2. Only image or bitmap based formats can be pasted from outside applications.
-</SPAN></P>
-<HR>
-<H2><A name="usecases" href=""></A>Use Cases</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P>This section describes high-level user interaction use cases. It does not attempt to capture interactions at the code level.</P>
-<P>Mini TOC of use cases:</P>
-<UL>
-	<LI><A href="#uc1">Drag and drop an image file onto the diagram surface</A></LI>
-	<LI><A href="#uc2">Drag and drop a non-image file onto the diagram surface</A></LI>
-	<LI>Copy and paste an image from an outside application</LI>
-	<LI>Resizing an image on the diagram surface</LI>
-</UL><H3><A name="uc1"></A>Drag and drop an image file onto the diagram surface</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-<P>The user wishes to add an image / picture to the drawing surface.</P>
-<P>Preconditions:</P>
-<UL>
-	<LI>An image file exists on the file system and is in one of the following graphic formats: BMP, JPG, GIF, SVG, WMF</LI>
-	<LI>The OS supports drag/drop of files.</LI>
-</UL>
-<P>Flow of events:</P>
-<OL>
-	<LI>The user exports from an outside application to an existing file format.</LI>
-	<LI>The user selects the file in the OS file navigator and drags it onto the RMP drawing surface.</LI>
-	<LI>The cursor changes to an arrow + cursor indicating the drop is permitted.</LI>
-</OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>The file is displayed as an image on the drawing surface and appears selected.</LI>
-	
-</UL>
-<P class="notabene"><B>Note:</B> By default this file will loaded into a buffer and stored explicitely inside the notation file. However, clients may wish to override this behavior to suport a by reference storage mechanism. For instance, in the UML product offering the underlying
-will be reinterpreted as a UML comment which references the file. However, in this case if the model is transported, then the referenced file would have to be as well in order for the image to display.</P>
-
-<H3><A name="uc2"></A>Drag and drop a non-image image onto the diagram surface</H3>
-<UL><LI>
-	<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-	<P>The user wishes to add an image / picture to the drawing surface.</P>
-	<P>Preconditions:</P>
-	<UL>
-		<LI>A  file exists on the file system that is in <B>NOT</B> of the
-		following graphic formats: BMP, JPG, GIF, SVG, WMF</LI>
-		<LI>The OS supports drag/drop of files.</LI>
-	</UL>
-	<P>Flow of events:</P>
-	<OL>
-		<LI>The user exports from an outside application to an existing file
-		format.</LI>
-		<LI>The user selects the file in the OS file navigator and drags it
-		onto the RMP drawing surface.</LI>
-		<LI>The cursor changes to an arrow + cursor indicating the drop is
-		permitted.</LI>
-	</OL>
-	<P>Postconditions:</P>
-	<UL>
-		<LI>The file is displayed as a note on the drawing surface and
-		appears selected.</LI>
-		<LI>The note contains the path of the file.</LI>
-	</UL>
-	</LI>
-</UL><P class="notabene"><B>Note:</B> In the UML product offering the note will be reinterpreted as a UML comment. This allows for the double click gesture where the associated external editor is invoked for the particular file extension.</P>
-<H3><A name="uc3"></A>Copy and paste an image from an outside application</H3>
-<UL>
-	<LI>
-	<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-	<P>The user wishes to add an image / picture to the drawing surface.</P>
-	<P>Preconditions:</P>
-	<UL>
-		<LI>An application exists in the OS that can copy selections to an image on the clipboard (i.e. Paint)</LI>
-		<LI>The OS supports image copy.</LI>
-	</UL>
-	<P>Flow of events:</P>
-	<OL>
-		<LI>The user copies a selection from an outside application.</LI>
-		<LI>The user navigates to the RMP diagram surface, right-clicks on the background and choses, Edit / Paste...</LI>
-	</OL>
-	<P>Postconditions:</P>
-	<UL>
-		<LI>An image is displayed on the drawing surface and appears selected..</LI></UL>
-	</LI>
-</UL>
-<P class="notabene"><B>Note:</B> Copy / paste from outside applications is not a by reference operation. Multiple pastes will increase the file size by the size of the image buffer on the clipboard..</P>
-
-<H3><A name="uc4"></A>Resizing an image on the diagram surface</H3>
-<UL>
-	<LI>
-	<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-	<P>The user wishes to resize on existing image on the drawing surface.</P>
-	<P>Preconditions:</P><UL><LI>The image shape is selected on the drawing surface..</LI>
-	</UL>
-	<P>Flow of events:</P>
-	<OL>
-		<LI>The user grabs the selection handles on the image shape and drags to the desired size..</LI></OL>
-	<P>Postconditions:</P>
-	<UL>
-		<LI>The image is rerendered at the new size specified by the handle feedback..</LI>
-	</UL>
-	</LI>
-	
-</UL>
-<P><BR>
-</P>
-
-<P class="question"><B>Future considerations:<BR></B>- Control over brightness and contrast.<BR>
-- Cropping functionality - ability to crop - top, left, right or bottom.<BR>- Tiled image support. Specifying a tile size and offset and have the image repeat itself within a shape. This is useful for backgrounds.<BR></P>
-<HR>
-<P style="margin-left: 0pt"><IMG border="0" src="copyright.gif" width="324" height="14"></P>
-</BODY>
-</HTML>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/Zoom tool.html b/org.eclipse.gmf.runtime.diagram.ui/design/Zoom tool.html
deleted file mode 100644
index 837998a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/Zoom tool.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<TITLE>Aurora Use Case Analysis Document: &lt;&lt;Feature Name&gt;&gt;</TITLE>
-<LINK rel="stylesheet" href="technote.css" type="text/css">
-</HEAD>
-<BODY>
-<A name="top"></A><IMG border="0" src="logo.gif" width="629" height="192"><H1 align="center">RMP Use Case Analysis Document: <BR>
-Zoom tool</H1>
-<TABLE border="0" cellspacing="8">
-	<TBODY>
-		<TR>
-			<TD>Version: 0.1</TD>
-			<TD>Date: 05/03/09</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<H2>Contents</H2>
-<UL>
-	<LI><A href="#intro">Introduction</A></LI>
-	<LI><A href="#refs">References</A></LI>
-	<LI><A href="#trace">Traceability</A></LI>
-	<LI><A href="#reqs">Requirements</A></LI><LI><A href="#constraints">Constraints and Limitations</A></LI>
-	<LI><A href="#usecases">Use Cases</A></LI></UL>
-<HR>
-<H2><A name="intro"></A>Introduction</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P>This feature introduces the ability to zoom in and out on the diagram surface using a tool to specify the context of where the zoom action will be centered on..</P>
-<H2><A name="refs"></A>References</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>n/a</SPAN></P>
-<H2><A name="trace"></A>Traceability</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'></SPAN>RATLC00532659 - Zoom tool</P>
-<H2><A name="reqs"></A>Requirements</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>- Should be able to zoom in on a specific element or set of elements.<BR>- Ability to zoom-in and zoom-out.<BR>- Integrated with existing zoom functionality via the toolbar and animated zoom.
-</SPAN></P>
-<H2><A name="constraints"></A>Constraints and Limitations</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P><SPAN
-	style='font-size:12.0pt;font-family:"Times New Roman";
-mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
-EN-US;mso-bidi-language:AR-SA'>A keyboard modifier is nescessary in order to access the zoom-out functionality since right mouse click is reservered for context menu invocation.</SPAN></P>
-<HR>
-<H2><A name="usecases" href=""></A>Use Cases</H2>
-<P class="backto"><FONT size="2">[<A href="#top">back to top</A>]</FONT></P>
-<P>This section describes high-level user interaction use cases. It does not attempt to capture interactions at the code level.</P>
-<P>Mini TOC of use cases:</P>
-<UL>
-	<LI><A href="#uc1">Zoom in on a point</A></LI>
-	<LI><A href="#uc2">Zoom out on a point</A></LI>
-	<LI><A href="#uc3">Zoom in to a rectangular area</A></LI></UL><H3><A name="uc1"></A>Zoom in on a point</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-<P>The user wishes to zoom to a particular area of the diagram.</P>
-<P>Preconditions:</P>
-<UL>
-	<LI>Diagram is open.</LI>
-</UL>
-<P>Flow of events:</P>
-<OL>
-	<LI>User selects the zoom tool.</LI>
-	<LI>User left mouse clicks on the diagram surface at a specific location</LI></OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>Diagram zooms in by an incremental percentage with the point location staying at the center of the diagram view port.</LI>
-</UL>
-<H3><A name="uc2"></A>Zoom out on a point </H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-<P>The user wishes to zoom out of a particular area of the diagram.</P>
-<P>Preconditions:</P>
-<UL>
-	<LI>Diagram is open.</LI>
-</UL>
-<P>Flow of events:</P>
-<OL>
-	<LI>User selects the zoom tool.</LI>
-	<LI>User presses down the &lt;SHIFT&gt; key and keeps it depressed.</LI>
-	<LI>User left mouse clicks on the diagram surface at a specific
-	location.</LI>
-</OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>Diagram zooms out by an incremental percentage with the point
-	location staying at the center of the diagram view port.</LI>
-</UL><H3><A name="uc3"></A>Zoom in to a rectangular area</H3>
-<P class="backto"><FONT size="2">[<A href="#usecases">back to use cases</A>]</FONT></P>
-<P>The user wishes to zoom in to a particular rectangular area of the diagram.</P>
-<P>Preconditions:</P>
-<UL>
-	<LI>Diagram is open</LI>
-</UL>
-<P>Flow of events:</P>
-<OL>
-	<LI>User selects the zoom tool.</LI>
-	<LI>User left mouse clicks on the diagram surface and drags the mouse to create a rectangular feedback selection box.</LI>
-	<LI>User releases the mouse button after creating the selection rectangle.</LI></OL>
-<P>Postconditions:</P>
-<UL>
-	<LI>Diagram zooms in completely to the specified rectangle with the rectangle bounds filling out to the bounds of the view port.</LI>
-</UL><HR>
-<P style="margin-left: 0pt"><IMG border="0" src="copyright.gif" width="324" height="14"></P>
-</BODY>
-</HTML>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/copyright.gif b/org.eclipse.gmf.runtime.diagram.ui/design/copyright.gif
deleted file mode 100644
index 56de721..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/copyright.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/logo.gif b/org.eclipse.gmf.runtime.diagram.ui/design/logo.gif
deleted file mode 100644
index 4cf1137..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/logo.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/design/technote.css b/org.eclipse.gmf.runtime.diagram.ui/design/technote.css
deleted file mode 100644
index c5ebe1d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/design/technote.css
+++ /dev/null
@@ -1,51 +0,0 @@
-P.notabene {
-	margin-left: 48pt;
-	margin-right: 48pt;
-	border-bottom-style: solid;
-	padding-top: 4pt;
-	padding-bottom: 4pt;
-	border-top-style: solid;
-	border-top-width: thin;
-	border-bottom-width: thin
-}
-
-P.question {
-	font-style: italic;
-	margin-left: 48pt;
-	margin-right: 48pt;
-	padding-top: 4pt;
-	padding-bottom: 4pt;
-}
-
-H3 {
-	font-style: italic;
-	font-weight: normal
-}
-
-PRE.snippet {
-	margin-left: 48pt;
-	margin-right: 24pt;
-	color: navy;
-	font-family: monospace;
-	padding: 4pt;
-	border-width: thin;
-	border-style: solid
-}
-
-P, PRE, BLOCKQUOTE, TABLE {
-	margin-left: 24pt
-}
-
-TD.snippet {
-	font-family: monospace;
-	color: navy
-}
-
-UL, OL, DL {
-	margin-left: 48pt
-}
-
-.backto {
-	margin-left: 0pt;
-	font-size: small
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionDown.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionDown.gif
deleted file mode 100644
index 12b6767..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionDown.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionUp.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionUp.gif
deleted file mode 100644
index bde1253..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/CollectionUp.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/actionbar_inv.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/actionbar_inv.gif
deleted file mode 100644
index 88a1ae8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/actionbar_inv.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/addnote.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/addnote.gif
deleted file mode 100644
index 8b66589..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/addnote.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/aleft.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/aleft.gif
deleted file mode 100644
index 26ea6bf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/aleft.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/all_comp_vis.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/all_comp_vis.gif
deleted file mode 100644
index 9d4f4d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/all_comp_vis.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeall.gif
deleted file mode 100644
index bdb1a56..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeselected.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeselected.gif
deleted file mode 100644
index 25192e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/arrangeselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/autosize.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/autosize.gif
deleted file mode 100644
index 2988e3d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/autosize.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/blank.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/blank.gif
deleted file mode 100644
index e7abcb8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/blank.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/bold.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/bold.gif
deleted file mode 100644
index 1c354fd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/bold.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/bookmark.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/bookmark.gif
deleted file mode 100644
index 82c7fbd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/bookmark.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxcleared.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxcleared.gif
deleted file mode 100644
index f6b9f8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxcleared.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxselected.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxselected.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/checkboxselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/collapse.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/collapse.gif
deleted file mode 100644
index 895ceb5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/collapse.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/collapsed.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/collapsed.gif
deleted file mode 100644
index 5f4c8bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/collapsed.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/collapsedEmpty.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/collapsedEmpty.gif
deleted file mode 100644
index ba6e703..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/collapsedEmpty.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/copy_appearance_properties.gif
deleted file mode 100644
index 99ce0a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/copy_appearance_properties.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/diagram.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/diagram.gif
deleted file mode 100644
index dac3d8d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/diagram.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeall.gif
deleted file mode 100644
index 99e31f4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeselected.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeselected.gif
deleted file mode 100644
index 724fef9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/arrangeselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/autosize.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/autosize.gif
deleted file mode 100644
index 3604137..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/autosize.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/bold.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/bold.gif
deleted file mode 100644
index 582a779..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/bold.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/copy_appearance_properties.gif
deleted file mode 100644
index 00ae2cd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/copy_appearance_properties.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/fill_color.gif
deleted file mode 100644
index d538130..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/fill_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/font_color.gif
deleted file mode 100644
index ed952d3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/font_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/hideconnector.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/hideconnector.gif
deleted file mode 100644
index 88289ea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/hideconnector.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/italic.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/italic.gif
deleted file mode 100644
index 1abc408..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/italic.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_color.gif
deleted file mode 100644
index e7fad27..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_style_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_style_group.gif
deleted file mode 100644
index aa82766..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/line_style_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_mask.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_mask.gif
deleted file mode 100644
index 12ce70d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_mask.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_source.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_source.gif
deleted file mode 100644
index 967c8f5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noconnectcursor_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_mask.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_mask.gif
deleted file mode 100644
index 640c62e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_mask.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_source.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_source.gif
deleted file mode 100644
index 8dd83a1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/noshapecursor_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/oblique.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/oblique.gif
deleted file mode 100644
index 7da2d71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/oblique.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/recalcpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/recalcpagebreaks.gif
deleted file mode 100644
index f33127b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/recalcpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/rectilinear.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/rectilinear.gif
deleted file mode 100644
index 6d34374..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/rectilinear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectall.gif
deleted file mode 100644
index efc3e49..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectconnectors.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectconnectors.gif
deleted file mode 100644
index e092486..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectconnectors.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectshapes.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectshapes.gif
deleted file mode 100644
index 1a3b7b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/selectshapes.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_compartments_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_compartments_group.gif
deleted file mode 100644
index 11c35c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_compartments_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_connector_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_connector_group.gif
deleted file mode 100644
index 43dde24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/show_connector_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/showconnector.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/showconnector.gif
deleted file mode 100644
index 43dde24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/showconnector.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/sortfilter.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/sortfilter.gif
deleted file mode 100644
index 0035346..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/sortfilter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/tree.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/tree.gif
deleted file mode 100644
index ace8973..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/tree.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/viewpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/viewpagebreaks.gif
deleted file mode 100644
index 2a40750..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/dlcl16/viewpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeall.gif
deleted file mode 100644
index c4f19bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeselected.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeselected.gif
deleted file mode 100644
index 871bd3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/arrangeselected.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/autosize.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/autosize.gif
deleted file mode 100644
index 2988e3d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/autosize.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/bold.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/bold.gif
deleted file mode 100644
index ca8f423..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/bold.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_mask.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_mask.gif
deleted file mode 100644
index 61d5ec5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_mask.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_source.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_source.gif
deleted file mode 100644
index cd2e725..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/connectcursor_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/copy_appearance_properties.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/copy_appearance_properties.gif
deleted file mode 100644
index 99ce0a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/copy_appearance_properties.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/fill_color.gif
deleted file mode 100644
index 93d2da1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/fill_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/font_color.gif
deleted file mode 100644
index 291a7e3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/font_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/hideconnector.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/hideconnector.gif
deleted file mode 100644
index 0ba4147..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/hideconnector.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/italic.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/italic.gif
deleted file mode 100644
index c4f7b39..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/italic.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_color.gif
deleted file mode 100644
index 9dfa28c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_style_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_style_group.gif
deleted file mode 100644
index 3ff08ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/line_style_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/oblique.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/oblique.gif
deleted file mode 100644
index 0abe0b6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/oblique.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/recalcpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/recalcpagebreaks.gif
deleted file mode 100644
index 11f5988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/recalcpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/rectilinear.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/rectilinear.gif
deleted file mode 100644
index b21fcfd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/rectilinear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectall.gif
deleted file mode 100644
index cf46586..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectconnectors.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectconnectors.gif
deleted file mode 100644
index bf4f2b4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectconnectors.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectshapes.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectshapes.gif
deleted file mode 100644
index 9bf0f67..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/selectshapes.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_mask.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_mask.gif
deleted file mode 100644
index d8716f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_mask.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_source.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_source.gif
deleted file mode 100644
index 0e3c411..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/shapecursor_source.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_compartments_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_compartments_group.gif
deleted file mode 100644
index 3ee1498..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_compartments_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_connector_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_connector_group.gif
deleted file mode 100644
index 571c5e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/show_connector_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/showconnector.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/showconnector.gif
deleted file mode 100644
index 571c5e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/showconnector.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/sortfilter.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/sortfilter.gif
deleted file mode 100644
index 26b8276..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/sortfilter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/tree.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/tree.gif
deleted file mode 100644
index 13c758e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/tree.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/viewpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/viewpagebreaks.gif
deleted file mode 100644
index 72a3d08..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/elcl16/viewpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/error.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/error.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/error.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/expand.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/expand.gif
deleted file mode 100644
index 9801db0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/expand.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/expanded.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/expanded.gif
deleted file mode 100644
index 55f120e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/expanded.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/fill_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/fill_color.gif
deleted file mode 100644
index 93d2da1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/fill_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/font_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/font_color.gif
deleted file mode 100644
index a4c0f27..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/font_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif
deleted file mode 100644
index 56b2a59..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_east.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_east.gif
deleted file mode 100644
index dd095d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_east.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_north.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_north.gif
deleted file mode 100644
index 7a187ae..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_north.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_south.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_south.gif
deleted file mode 100644
index 8392af3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_south.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_west.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_west.gif
deleted file mode 100644
index 914a6f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_incoming_west.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_east.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_east.gif
deleted file mode 100644
index 2812ef0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_east.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_north.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_north.gif
deleted file mode 100644
index e148521..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_north.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_south.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_south.gif
deleted file mode 100644
index d92234a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_south.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_west.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_west.gif
deleted file mode 100644
index a08b088..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/handle_outgoing_west.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/hidelabels.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/hidelabels.gif
deleted file mode 100644
index 5868f85..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/hidelabels.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/italic.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/italic.gif
deleted file mode 100644
index bd976b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/italic.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/line_color.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/line_color.gif
deleted file mode 100644
index 9dfa28c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/line_color.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/line_style_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/line_style_group.gif
deleted file mode 100644
index 3ff08ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/line_style_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/none_comp_vis.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/none_comp_vis.gif
deleted file mode 100644
index a2017d0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/none_comp_vis.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/note.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/note.gif
deleted file mode 100644
index 1bb5c21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/note.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/noteattachment.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/noteattachment.gif
deleted file mode 100644
index d2108c0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/noteattachment.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/oblique.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/oblique.gif
deleted file mode 100644
index 0abe0b6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/oblique.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/outline.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/outline.gif
deleted file mode 100644
index 852dc81..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/outline.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/overview.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/overview.gif
deleted file mode 100644
index f302d8c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/overview.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar.gif
deleted file mode 100644
index 51b701e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar_plus.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar_plus.gif
deleted file mode 100644
index 6a6f221..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/popupbar_plus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/properties_view.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/properties_view.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/properties_view.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/recalcpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/recalcpagebreaks.gif
deleted file mode 100644
index 11f5988..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/recalcpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/rectilinear.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/rectilinear.gif
deleted file mode 100644
index b21fcfd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/rectilinear.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/selectall.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/selectall.gif
deleted file mode 100644
index cf46586..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/selectall.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/selectshapes.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/selectshapes.gif
deleted file mode 100644
index 9bf0f67..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/selectshapes.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/show_compartments_group.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/show_compartments_group.gif
deleted file mode 100644
index 3ee1498..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/show_compartments_group.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/showlabels.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/showlabels.gif
deleted file mode 100644
index 966de65..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/showlabels.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control.gif
deleted file mode 100644
index 749644c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_height.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_height.gif
deleted file mode 100644
index 5e06042..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_height.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_width.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_width.gif
deleted file mode 100644
index 478cc1e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/size_to_control_width.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_dn.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_dn.gif
deleted file mode 100644
index b2829c1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_dn.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_up.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_up.gif
deleted file mode 100644
index 0a38ab7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/sm_arrow_up.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/snapback.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/snapback.gif
deleted file mode 100644
index 4bd5c75..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/snapback.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/sortfilter.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/sortfilter.gif
deleted file mode 100644
index 26b8276..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/sortfilter.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/text.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/text.gif
deleted file mode 100644
index 5990f5f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/text.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/tree.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/tree.gif
deleted file mode 100644
index 13c758e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/tree.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/viewpagebreaks.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/viewpagebreaks.gif
deleted file mode 100644
index 72a3d08..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/viewpagebreaks.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif
deleted file mode 100644
index 6ed6785..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/zoom100.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif
deleted file mode 100644
index dd2c92f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomminus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif
deleted file mode 100644
index 466d756..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomplus.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif b/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif
deleted file mode 100644
index 7ce3069..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/icons/zoomtofit.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/plugin.properties b/org.eclipse.gmf.runtime.diagram.ui/plugin.properties
deleted file mode 100644
index 8698d0f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/plugin.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005  IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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 Diagram UI
-Plugin.providerName = Eclipse Modeling Project
-
-# ===============================================================================
-# Diagram UI Internal - Translation Instruction : do not translate this section 
-# ===============================================================================
-
-# The extension point names
-
-extPoint.semanticProviders = Presentation Semantic Providers
-extPoint.viewProviders = Presentation View Providers
-extPoint.editpartProviders = Presentation EditPart Providers
-extPoint.editpolicyProviders = Presentation EditPolicy Providers
-extPoint.paletteProviders = Presentation Palette Providers
-extPoint.layoutProviders = Presentation Layout Providers
-extPoint.decoratorProviders = Presentation Decorator Providers
-
-# The extension names
-
-ext.presentationSemanticProvider = Presentation Semantic Provider
-ext.presentationLayoutProvider = Presentation Layout Provider
-ext.presentationPropertiesProvider = Presentation Properties Provider
-ext.presentationDecoratorProvider = Presentation Decorator Provider
-ext.presentationContributionItemProvider = Presentation Contribution Item Provider
-ext.printingContributionItemProvider = Presentation Printing Contribution Item Provider
-ext.presentationParserProviders = Presentation Parser Provider
-ext.presentationViewProviders = Presentation View Provider
-ext.presentationPaletteProviders = Presentation Palette Provider
-ext.presentationEditPartProviders = Presentation EditPart Provider
-ext.readOnlyPropertiesModifier = Read Only Properties Modifier
-
-
-# ==============================================================================
-#  Diagram UI - section to be translated
-# ==============================================================================
-
-#Diagram - Palette Info
-NoteTool.Label = Note
-NoteTool.Description = Create a Note
-TextTool.Label = Text
-TextTool.Description = Create a Text
-NoteAttachmentTool.Label = Note Attachment
-NoteAttachmentTool.Description = Create a Note Attachment
-NoteStack.Label = Notes
-NoteStack.Description = Notes Stack
-Advanced= Advanced
-GMFDiagramContext.name = Diagram Editing
-GMFDiagramContext.description = GMF Diagram Editing
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/plugin.xml b/org.eclipse.gmf.runtime.diagram.ui/plugin.xml
deleted file mode 100644
index 1890b74..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/plugin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2003, 2009  IBM Corporation and others.          -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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 id="editpartProviders" name="%extPoint.editpartProviders" schema="schema/editpartProviders.exsd"/>
-   <extension-point id="editpolicyProviders" name="%extPoint.editpolicyProviders" schema="schema/editpolicyProviders.exsd"/>
-   <extension-point id="paletteProviders" name="%extPoint.paletteProviders" schema="schema/paletteProviders.exsd"/>
-   <extension-point id="layoutProviders" name="%extPoint.layoutProviders" schema="schema/layoutProviders.exsd"/>
-   <extension-point id="decoratorProviders" name="%extPoint.decoratorProviders" schema="schema/decoratorProviders.exsd"/>
-
-<!-- Icon Provider -->
-   
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-        <elementTypeFactory
-               factory="org.eclipse.gmf.runtime.diagram.ui.internal.type.NotationTypeFactory"
-               kind = "org.eclipse.gmf.runtime.diagram.ui.util.INotationType"
-               params = "semanticHint">
-        </elementTypeFactory>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.presentation.note"     
-                icon="icons/note.gif"
-                name="%NoteTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="Note"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.presentation.noteAttachment"     
-                icon="icons/noteattachment.gif"
-                name="%NoteAttachmentTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="NoteAttachment"/> 
-        </specializationType>
-        <specializationType
-                id="org.eclipse.gmf.runtime.diagram.ui.presentation.text"     
-                icon="icons/text.gif"
-                name="%TextTool.Label"
-                kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType"> 
-             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-             <param name="semanticHint" value="Text"/> 
-        </specializationType>
-   </extension>
-   <extension
-         point="org.eclipse.ui.contexts">
-      <context
-            description="%GMFDiagramContext.description"
-            id="org.eclipse.gmf.runtime.diagram.ui.diagramContext"
-            name="%GMFDiagramContext.name"
-            parentId="org.eclipse.ui.contexts.window">
-      </context>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.gmf.runtime.diagram.ui.preferences.DefaultDiagramPreferencesInitializer">
-      </initializer>
-   </extension>
-</plugin>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/pom.xml b/org.eclipse.gmf.runtime.diagram.ui/pom.xml
deleted file mode 100644
index 3b9b8b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.diagram.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.diagram.ui</artifactId>
-  <version>1.6.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/schema/decoratorProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui/schema/decoratorProviders.exsd
deleted file mode 100644
index d296829..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/schema/decoratorProviders.exsd
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui" id="decoratorProviders" name="Presentation Decorator Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define decorator providers for the decorator service       (&lt;tt&gt;org.eclipse.gmf.runtime.diagram.ui.services.decorator&lt;/tt&gt;).
-
-The Decoration Service gives clients the ability to decorate diagram elements with an image or figure.
-&lt;p&gt;
-&lt;p&gt;
-More specifically, the provider service allows implementors to do the following:
-&lt;p&gt;
--A provider of the decoration service will be able to add an adornment to any diagram element.
-&lt;p&gt;
-   -The decoration is typically an image, but can be any sort of graphics object or figure.  A provider of the decoration service is not restricted to any specific graphic type.
-&lt;p&gt;
-   -The provider can specify any of the following enumerated locations for a decoration on a shape, label, or list compartment item: center, north, northeast, northwest, south, southeast, southwest, east, west.  For a connector, the percentage of the distance from the source end of the connector is used to provide a location for the decoration.
-&lt;p&gt;
-   -The decoration can be any size that fits within the shape or connector boundary.
-&lt;p&gt;
-   -The decoration would be justified accordingly to its position on the shape, i.e. northwest would be left justified with an offset from the top left hand side of the shape and northeast would be right justified with an offset from the top right hand side of the shape.
-&lt;p&gt;
-   -Each decoration can either be included in the printed output of the diagram or not.
-&lt;p&gt;
-   -If more than one provider adds a decoration to the same location, the decoration from the highest priority provider will appear on top of the other decoration(s).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            Describes the extension point.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="decoratorProvider"/>
-         </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.ui.decoratorProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. myDecoratorProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.myDecoratorProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="decoratorProvider">
-      <annotation>
-         <documentation>
-            The decorator 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 decorator provider class, e.g. org.eclipse.gmf.runtime.diagram.ui.providers.MyDecoratorProvider.  
-
-This decoration provider class should implement the org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider 
-interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the decorator 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.
-
-&lt;p&gt;
-If more than one provider adds a decoration to the same location, the decoration(s) from the highest priority provider will appear on top of decoration(s) supplied by lower priority provider(s).
-&lt;/p&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 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 parenthesis &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>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </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;pre&gt;&lt;func(&lt;param&lt;,param&gt;*&gt;?)&lt;.func(&lt;param&lt;,param&gt;*&gt;?)&gt;* &gt;?&lt;/pre&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 contains a list of objects to be decorated using this provider.  
-
-The list defined in decoratorTargets is comprised of items previously defined in the XML using the object element.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="decoratorTargets" type="string">
-            <annotation>
-               <documentation>
-                  The decoratorTargets is a comma-separated list of objects that are supported by this provider.
-
-The xml defined object is specified using its id.
-               </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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         An extension to the decorator service would require the implementation of the IDecorator and IDecoratorProvider interfaces.    
-
-The following is an example plugin.xml entry for a decorator service provider extension:
-
-&lt;pre&gt;
-   &lt;extension
-         id=&quot;myDecoratorProvider&quot;
-         name=&quot;%ext.myDecoratorProvider&quot;
-         point=&quot;org.eclipse.gmf.runtime.diagram.ui.decoratorProviders&quot;&gt;
-      &lt;decoratorProvider              class=&quot;org.eclipse.gmf.runtime.diagram.ui.providers.MyDecoratorProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Lowest&quot;&gt;
-         &lt;/Priority&gt;
-         &lt;object class=&quot;org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)&quot; 
-              id=&quot;NODE&quot;&gt;
-              &lt;method
-                  name=&quot;getType()&quot;
-                  value=&quot;MyNodeType&quot;&gt;
-              &lt;/method&gt;
-         &lt;/object&gt;
-         &lt;context
-               decoratorTargets=&quot;NODE&quot;&gt;
-         &lt;/context&gt;
-      &lt;/decoratorProvider&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.diagram.ui.services.decorator&lt;/tt&gt; package.
-
-&lt;p&gt;
-Clients providing an extension to the decorator service need to create classes 
-that implement the following interfaces:
-&lt;/p&gt;
-&lt;p&gt;
-&lt;tt&gt;org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator&lt;/tt&gt;
-&lt;/p&gt;
-&lt;p&gt;
-&lt;tt&gt;org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider&lt;/tt&gt;
-&lt;/p&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.diagram.ui/schema/editpartProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui/schema/editpartProviders.exsd
deleted file mode 100644
index 77feb85..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/schema/editpartProviders.exsd
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui" id="editpartProviders" name="Presentation Edit Part Providers"/>
-      </appInfo>
-      <documentation>
-         The EditPart service is a factory of editparts given a model and a context. An EditPart provider will extend the service by providing for new editparts or existing ones using a different combination of a model and a context.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="editpartProvider" 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.ui.editpartProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. editpartProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.editpartProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editpartProvider">
-      <annotation>
-         <documentation>
-            The editpart 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 editpart provider class
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the editpart 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;. 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="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"/>
-            <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 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>
-            A context supported by the editpart provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="views" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of view object ids (from the provider XML definition) that are supported by this provider in this context.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="providesRootEditPart" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  
-               </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>
-
-   <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>
-         public interface IEditPartProvider extends IProvider {
-
-  public IGraphicalEditPart createGraphicEditPart(IView view);
-
-}
-      </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.ui/schema/editpolicyProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui/schema/editpolicyProviders.exsd
deleted file mode 100644
index 988b574..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/schema/editpolicyProviders.exsd
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui" id="editpolicyProviders" name="Presentation Edit Policy Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define editpolicy providers for the editpolicy service.  The editpolicy service allows plug-ins to modify or enhance the behavior of an editpart via an editpolicy without modifying the editpart code.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="editpolicyProvider" 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.ui.editpolicyProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. editpolicyProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.editpolicyProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editpolicyProvider">
-      <annotation>
-         <documentation>
-            The editpolicy 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 editpolicy provider class
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the editpolicy 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;. 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="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 editpolicy provider which contains the &lt;editparts&gt; supported by this provider.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-         </sequence>
-         <attribute name="editparts" type="string">
-            <annotation>
-               <documentation>
-                  A comma-separated list of editpart ids (from the provider XML definition) that are supported by this provider.
-               </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>
-
-   <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.ui/schema/layoutProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui/schema/layoutProviders.exsd
deleted file mode 100644
index 8e78aac..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/schema/layoutProviders.exsd
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui" id="layoutProviders" name="Presentation Layout Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to define layout providers for the layout service.  The layout service allows for the arrangement of diagram elements according to a specific layout style.
-&lt;p&gt;
-Extensions to the service can provide additional layout behaviour.  For example, a new provider could implement a specialized inheritance layout.
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="layoutProvider"/>
-         </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.ui.layoutProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. layoutProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.layoutProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="layoutProvider">
-      <annotation>
-         <documentation>
-            The layout provider description tag.
-         </documentation>
-      </annotation>
-      <complexType>
-         <all>
-            <element ref="Priority"/>
-         </all>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the layout provider class.
-
-The specified provider class should implement the org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider 
-interface.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the layout 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. 
-
-&lt;p&gt;Consideration of dependencies has to be done when choosing the priority.  The layout operation is executed on the first provider (in descending order of priority) that is found to provide the operation.
-&lt;/p&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>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an xml entry for a provider extension:
-
-&lt;pre&gt;
- &lt;extension
-         id=&quot;presentationLayoutProvider&quot;
-         name=&quot;RadialProvider&quot;
-         point=&quot;org.eclipse.gmf.runtime.diagram.ui.layoutProviders&quot;&gt;
-      &lt;layoutProvider
-            class=&quot;org.eclipse.gmf.runtime.diagram.ui.providers.layout.RadialProvider&quot;&gt;
-         &lt;Priority
-               name=&quot;Lowest&quot;&gt;
-         &lt;/Priority&gt;
-      &lt;/layoutProvider&gt;
-  &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         For API information, see the interfaces defined in the &lt;tt&gt;org.eclipse.gmf.runtime.diagram.ui.services.layout&lt;/tt&gt; package.
-
-&lt;p&gt;
-Clients providing an extension to the layout service need to create a provider class that implements the &lt;tt&gt;org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider&lt;/tt&gt; interface.
-&lt;/p&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.diagram.ui/schema/paletteProviders.exsd b/org.eclipse.gmf.runtime.diagram.ui/schema/paletteProviders.exsd
deleted file mode 100644
index a536382..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/schema/paletteProviders.exsd
+++ /dev/null
@@ -1,524 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.diagram.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.gmf.runtime.diagram.ui" id="paletteProviders" name="Presentation Palette Providers"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="paletteProvider" 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.ui.paletteProviders&lt;/tt&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The identifier of the extension, e.g. paletteProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The name of the extension, e.g. %ext.paletteProvider.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="paletteProvider">
-      <annotation>
-         <documentation>
-            The palette provider description tag. A provider&apos;s description outlines the targetting context (the editor and the editor&apos;s content) and zero or more palette contributions in that context.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="Priority"/>
-            <element ref="editor" minOccurs="0" maxOccurs="1"/>
-            <element ref="content" minOccurs="0" maxOccurs="1"/>
-            <element ref="contribution" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="class" type="string" use="default" value="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-            <annotation>
-               <documentation>
-                  The fully qualified name of the palette provider class
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="Priority">
-      <annotation>
-         <documentation>
-            The description for the priority of the palette 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;. 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. Similarly, a provider that contributes palette entries that have been predefined 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="editor">
-      <annotation>
-         <documentation>
-            A descriptor for the targetted editor.  The editor is not required when predefining palette entries.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  The published id of the targetted editor. Although this field is optional, at least one of the two fields (id &amp; class) has to be specified.
-               </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 target editor.  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;?
-
-Although this field is optional, at least one of the two fields (id &amp; class) has to be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="content">
-      <annotation>
-         <documentation>
-            A descriptor for the targetted editor&apos;s content.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="method" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="staticMethod" 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 target editor&apos;s content 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="contribution">
-      <annotation>
-         <documentation>
-            A descriptor for a palette contribution.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="entry" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="predefinedEntry" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="factoryClass" type="string">
-            <annotation>
-               <documentation>
-                  The fully qualified name of a class that represents the factory for the contributions. The class has to implemenent the interface : org.eclipse.gmf.runtime.gef.ui.internal.ui.palette.PaletteFactory
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="entry">
-      <annotation>
-         <documentation>
-            A descriptor for a palette contribution entry that will be contributed to the palette.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="expand" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="kind" use="required">
-            <annotation>
-               <documentation>
-                  The kind of the entry (drawer | stack | separator | tool | template)
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="drawer">
-                  </enumeration>
-                  <enumeration value="separator">
-                  </enumeration>
-                  <enumeration value="template">
-                  </enumeration>
-                  <enumeration value="tool">
-                  </enumeration>
-                  <enumeration value="stack">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a user-defined id for the entry (unique within a provider)
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string">
-            <annotation>
-               <documentation>
-                  A fully qualified path of contribution. The format is: 
-/&lt;drawer id&lt;/separator id | entry id&gt;&gt; or /&lt;group id&lt;/separator id | entry id&gt;&gt;
-
-All path ids should have been previously defined. Previous means either earlier in the XML file or another one with a lower priority (order). If a path ends with a separator id, the new entry is appended to the elements following the separator (just before the next separator or at the end of the container if it has no more separators below that one). If a path ends with a normal entry id, the new entry is inserted after that entry.
-
-A path is required unless this palette entry is being defined only so that it can be contributed by another palette provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string">
-            <annotation>
-               <documentation>
-                  the palette entry label (not required for separators)
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  The pallete entry description
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="small_icon" type="string">
-            <annotation>
-               <documentation>
-                  The palette entry small icon file name and path.  A value of &quot;None&quot; on a palette drawer entry indicates that the default icon should not show up on a palette drawer.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="large_icon" type="string">
-            <annotation>
-               <documentation>
-                  The palette entry large icon
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="permission">
-            <annotation>
-               <documentation>
-                  The palette entry permission (None | HideOnly | limited | full). For description of the meaning of those, please refer to GEF&apos;s documentation.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="None">
-                  </enumeration>
-                  <enumeration value="HideOnly">
-                  </enumeration>
-                  <enumeration value="Limited">
-                  </enumeration>
-                  <enumeration value="Full">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-         <attribute name="defineOnly" type="boolean">
-            <annotation>
-               <documentation>
-                  If true, this palette entry is only being defined, but will not be contributed.  In this case, the path is ignored and not required.  When defining a palette drawer or palette stack, this flag need only be set on the palette drawer or stack to indicate that all the entries on the drawer are being defined only.  The palette entry can be contributed by another palette extension using a predefinedEntry.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="expand">
-      <annotation>
-         <documentation>
-            A descriptor for a condition to make palette drawers initially expanded.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="content" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="force" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  
-               </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="predefinedEntry">
-      <annotation>
-         <documentation>
-            A descriptor for a palette contribution entry that has already been defined by another plug-in and will now be contributed.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="expand" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The ID given to the palette entry when it was defined.  If the palette entry is in a palette container (i.e. drawer or stack) the id is considered the full path of this palette entry.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string">
-            <annotation>
-               <documentation>
-                  A fully qualified path describing where this palette entry should appear on the palette. The format is: 
-/&lt;drawer id&lt;/separator id | entry id&gt;&gt; or /&lt;group id&lt;/separator id | entry id&gt;&gt;
-
-All path ids should have been previously defined. Previous means either earlier in the XML file or another one with a lower priority (order). If a path ends with a separator id, the new entry is appended to the elements following the separator (just before the next separator or at the end of the container if it has no more separators below that one). If a path ends with a normal entry id, the new entry is inserted after that entry.
-
-The path is not required if this predefined entry is not being contributed.  That is, a predefined entry can be used to expand an existing drawer, remove an existing entry from the palette.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="remove" type="boolean">
-            <annotation>
-               <documentation>
-                  If true, an existing entry will be removed.
-               </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>
-
-   <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.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramEventBrokerThreadSafe.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramEventBrokerThreadSafe.java
deleted file mode 100644
index 6f88d94..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramEventBrokerThreadSafe.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import java.lang.ref.WeakReference;
-
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This is an extension of the DiagramEventBroker that has special handling for notifications that
- * occurs from a worker thread / non-UI thread.  If the notification occurs on the main thread
- * then execution is delegated to the super class immediately.  If execution is not on the main thread
- * then there are 2 scenarios that have to be considered.  
- * 
- * The first scenario is for a long operation
- * that has been executed with a progress meter, where the progress meter is displaying UI on the main
- * thread and there is a background thread that is being executed that the progress meter is monitoring.
- * For this scenario, the UI updates on the diagram viewer have been disabled so as to avoid concurrency
- * issues.  When notifications are handled, they are synchronized to the main thread to avoid
- * SWTExceptions when UI tries to access SWT resources when updating figures or other UI.
- * 
- * The second scenario is for when a job has been executed on a worker thread, but has not been executed
- * through the OperationHistory.  Consequently, there is no hook for turning off display updates.  This
- * means that if the notifications were to continue on the worker thread, then the display could update
- * at the same time on the main thread thereby causing concurrent modification errors and other errors.
- * In this case, we need to resynchronize the notifications with the main thread.  In order to do this
- * it is necessary to run the notifications in an synchronous runnable that will run immediately
- * on the main thread.
- * 
- * @author sshaw
- * @since 1.2
- */
-public class DiagramEventBrokerThreadSafe extends DiagramEventBroker {
-
-	WeakReference editingDomainRef;
-	
-    public DiagramEventBrokerThreadSafe(TransactionalEditingDomain editingDomain) {
-        super();
-        editingDomainRef = new WeakReference(editingDomain);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
-     */
-    public void resourceSetChanged(ResourceSetChangeEvent event) {
-        if (shouldSynchronizeWithMainThread(event)) {
-           	// force synchronization with the main thread
-            final ResourceSetChangeEvent eventToHandle = event;
-            TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editingDomainRef.get();
-            if (editingDomain != null) {
-	            DisplayUtils.getDisplay().syncExec(editingDomain.createPrivilegedRunnable(new Runnable() { 
-	                public void run() {
-	                    internal_resourceSetChanged(eventToHandle);
-	                }
-	            }));
-	                
-	            return;
-            }
-        }
-        
-        super.resourceSetChanged(event);
-    }
-    
-    private boolean shouldSynchronizeWithMainThread(ResourceSetChangeEvent event) {
-    	if (Display.getCurrent() == null)
-    		return true;
-        
-        return false;
-    }
-    
-    private void internal_resourceSetChanged(ResourceSetChangeEvent event) {
-        super.resourceSetChanged(event);
-    }
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramUtil.java
deleted file mode 100644
index 4ecfef5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramUtil.java
+++ /dev/null
@@ -1,75 +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;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorInput;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Provides miscellaneous diagram utilities
- * 
- * @author melaasar, mmostafa
- */
-
-public class DiagramUtil {
-
-	/**
-	 * Opens an editor for a given diagram
-	 * 
-	 * @param diagram
-	 *            The diagram to be opened
-	 */
-	public static void openDiagramEditor(Diagram diagram) {
-		EditorService.getInstance().openEditor(new DiagramEditorInput(diagram));
-	}
-
-	/**
-	 * Rerturns an open editor for the given diagram in the given workbench
-	 * window if the window is null, the active window in the platform is
-	 * considered
-	 * 
-	 * @param diagram
-	 *            The given diagram
-	 * @param window
-	 *            The given window (or null to mean the active one)
-	 * @return An <code>IDiagramWorkbenchPart</code>
-	 */
-	public static IDiagramWorkbenchPart getOpenedDiagramEditor(Diagram diagram,
-			IWorkbenchWindow window) {
-		if (null == diagram)
-			throw new NullPointerException("Argument 'diagram' is null"); //$NON-NLS-1$
-		if (window == null)
-			window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-
-		List editors = EditorService.getInstance().getRegisteredEditorParts();
-		for (Iterator j = editors.iterator(); j.hasNext();) {
-			IEditorPart editor = (IEditorPart) j.next();
-			if (editor.getEditorSite().getWorkbenchWindow() == window) {
-                if (editor instanceof IDiagramWorkbenchPart) {
-                    IDiagramWorkbenchPart de = (IDiagramWorkbenchPart) editor;
-                    if (de.getDiagram() == diagram)
-                        return de;
-                }
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/OffscreenEditPartFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/OffscreenEditPartFactory.java
deleted file mode 100644
index 30e9725..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/OffscreenEditPartFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-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.IDiagramPreferenceSupport;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author sshaw
- *
- * Utility class to generate editpart containment offscreen without
- * creating an editor.
- */
-public class OffscreenEditPartFactory {
-	
-	private static OffscreenEditPartFactory INSTANCE = new OffscreenEditPartFactory();
-	
-	/**
-	 * gives access to the singleton instance  of <code>OffscreenEditPartFactory</code> 
-	 * @return the singleton instance
-	 */
-	public static OffscreenEditPartFactory getInstance() {
-		return INSTANCE;
-	}
-	
-	/**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-     * @param diagram
-     *            the <code>Diagram</code>
-     * @return the new populated <code>DiagramEditPart</code>
-     * @deprecated Please use {@link #createDiagramEditPart(Diagram, Shell)}
-     *             instead as this method does not dispose the new Shell that it
-     *             creates.
-     */
-	public DiagramEditPart createDiagramEditPart(
-		Diagram diagram) {	
-        
-        return createDiagramEditPart(diagram, new Shell(), null);
-	}
-    
-    /**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-     * @param diagram the <code>Diagram</code>
-     * @param shell
-     *            the shell
-     * @return the new populated <code>DiagramEditPart</code>
-     */
-    public DiagramEditPart createDiagramEditPart(
-        Diagram diagram, Shell shell) {  
-        
-        return createDiagramEditPart(diagram, shell, null);
-    }
-    
-    /**
-     * Creates a <code>DiagramEditPart</code> given the <code>Diagram</code>
-     * without opening an editor.
-     * 
-     * @param diagram
-     *            the <code>Diagram</code>
-     * @param shell
-     *            the shell
-     * @param preferencesHint
-     *            the preferences hint to be used when creating the diagram; if
-     *            null, the preferences hint from the root editpart will be
-     *            used.
-     * @return the new populated <code>DiagramEditPart</code>
-     */
-     public DiagramEditPart createDiagramEditPart(
-        Diagram diagram, Shell shell, PreferencesHint preferencesHint) {     
-        
-        DiagramGraphicalViewer customViewer = new DiagramGraphicalViewer();
-        customViewer.createControl(shell);
-
-        DiagramEditDomain editDomain = new DiagramEditDomain(null);
-        editDomain.setCommandStack(
-            new DiagramCommandStack(editDomain));
-
-        customViewer.setEditDomain(editDomain);
-
-        // hook in preferences
-        RootEditPart rootEP = EditPartService.getInstance().createRootEditPart(
-            diagram);
-        if (rootEP instanceof IDiagramPreferenceSupport) {
-            if (preferencesHint == null) {
-                preferencesHint = ((IDiagramPreferenceSupport) rootEP)
-                    .getPreferencesHint();
-            } else {
-                ((IDiagramPreferenceSupport) rootEP)
-                    .setPreferencesHint(preferencesHint);
-            }
-            customViewer
-                .hookWorkspacePreferenceStore((IPreferenceStore) preferencesHint
-                    .getPreferenceStore());
-        }
-        
-        customViewer.setRootEditPart(rootEP);
-
-        customViewer.setEditPartFactory(EditPartService.getInstance());
-
-        DiagramEventBroker.startListening(TransactionUtil.getEditingDomain(diagram));
-        
-        customViewer.setContents(diagram);
-        customViewer.flush();
-        
-        Assert.isTrue(customViewer.getContents() instanceof DiagramEditPart);
-        
-    	/*
-    	 * We need to flush all the deferred updates. 
-    	 */
-   		while (shell.getDisplay().readAndDispatch()) {
-   			// nothing
-   		}
-        
-        return (DiagramEditPart) customViewer.getContents();
-
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDeleteFromAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDeleteFromAction.java
deleted file mode 100644
index be314e6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/AbstractDeleteFromAction.java
+++ /dev/null
@@ -1,127 +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.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-
-/**
- * Abstract action to be subclassed for various delete from actions.
- * This Action is used to send a request that will destroy a semantic 
- * element.
- * 
- * @author schafe
- */
-public abstract class AbstractDeleteFromAction
-	extends DiagramAction {
-	
-	/**
-	 * Creates an <code>AbstractDeleteFromAction</code> with a default label.
-	 *
-	 * @param part The part this action will be associated with.
-	 */
-	public AbstractDeleteFromAction(IWorkbenchPart part) {
-		super(part);
-		
-		
-	}
- 
-	/**
-	 * Constructor
-	 * @param workbenchPage The workbench page associated with this action
-	 */
-	public AbstractDeleteFromAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		
-	}
-
-	/**
-	 *  Return the semantic request to destroy the element
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return 	new EditCommandRequestWrapper(new DestroyElementRequest(getEditingDomain(), false));
-	}
-
-	/* (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#updateTargetRequest()
-	 */
-	protected void updateTargetRequest() {
-		
-		super.updateTargetRequest();
-
-		DestroyElementRequest deleteReq = getDestroyElementRequest();
-
-		// Reset the element to null
-		deleteReq.setElementToDestroy((EObject)null);
-		
-		// ensure that any parameters are cleared, as well
-		deleteReq.getParameters().clear();
-        
-        deleteReq.setEditingDomain(getEditingDomain());
-	}
-
-	/**
-	 * Helper method for getting the <code>DestroyElementRequest</code>
-	 * @return the DestroyElementRequest
-	 */
-	protected DestroyElementRequest getDestroyElementRequest() {
-
-		EditCommandRequestWrapper theWrapper = (EditCommandRequestWrapper) getTargetRequest();
-
-		DestroyElementRequest theRequest = (DestroyElementRequest) theWrapper
-			.getEditCommandRequest();
-
-		return theRequest;
-	}
-    
-     /**
-     * Gets my editing domain from my workbench part.
-     * 
-     * @return my editing domain
-     */
-    protected TransactionalEditingDomain getEditingDomain() {
-        
-        // try adapting the workbench part
-        IWorkbenchPart part = getWorkbenchPart();
-
-        if (part != null) {
-            IEditingDomainProvider edProvider = (IEditingDomainProvider) part
-                .getAdapter(IEditingDomainProvider.class);
-
-            if (edProvider != null) {
-            	EditingDomain domain = edProvider.getEditingDomain();
-            	
-            	if (domain instanceof TransactionalEditingDomain) {
-            		return (TransactionalEditingDomain) domain;
-            	}
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ActionIds.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ActionIds.java
deleted file mode 100644
index 6e32215..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ActionIds.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-
-/**
- * A list of constants defining the diagram action and menu action ids.
- * <p>
- * This interface defines constants only, it is <EM>not</EM> intended to be
- * implemented by clients.
- * </p>
- */
-public interface ActionIds {
-
-	/* Menu contribution ids */
-	public final String MENU_DIAGRAM = "diagramMenu"; //$NON-NLS-1$
-	
-	public final String MENU_DIAGRAM_ADD = "diagramAddMenu"; //$NON-NLS-1$
-	public final String MENU_NAVIGATE = "navigateMenu"; //$NON-NLS-1$
-	public final String MENU_FILE = "fileMenu"; //$NON-NLS-1$
-	public final String MENU_EDIT = "editMenu"; //$NON-NLS-1$
-	public final String MENU_FILTERS = "filtersMenu"; //$NON-NLS-1$
-	public final String MENU_FORMAT = "formatMenu"; //$NON-NLS-1$
-
-    public final String MENU_ARRANGE = "arrangeMenu"; //$NON-NLS-1$     
-    public final String MENU_ARRANGE_TOOLBAR = "arrangeMenuToolbar"; //$NON-NLS-1$     
-	public final String MENU_SELECT = "selectMenu"; //$NON-NLS-1$
-    public final String MENU_SELECT_TOOLBAR = "selectMenuToolbar"; //$NON-NLS-1$
-    public final String MENU_ALIGN = "alignMenu"; //$NON-NLS-1$
-	public final String MENU_SHOW_IN = "showInMenu"; //$NON-NLS-1$
-	public final String MENU_COMPARTMENT = "compartmentMenu"; //$NON-NLS-1$
-	public final String MENU_CONNECTION_LABEL = "connectorLabelMenu"; //$NON-NLS-1$
-	public final String MENU_ROUTER = "routerMenu"; //$NON-NLS-1$
-	public final String MENU_OPEN_WITH = "openWithMenu"; //$NON-NLS-1$
-
-	/* ZOrder menu and action ids */
-	public final String MENU_ZORDER = "zorderMenu"; //$NON-NLS-1$
-	public final String ACTION_BRING_TO_FRONT = "bringToFrontAction"; //$NON-NLS-1$
-	public final String ACTION_SEND_TO_BACK   = "sendToBackAction"; //$NON-NLS-1$
-	public final String ACTION_BRING_FORWARD  = "bringForwardAction"; //$NON-NLS-1$
-	public final String ACTION_SEND_BACKWARD  = "sendBackwardAction"; //$NON-NLS-1$
-
-	/* View Menu and action ids */
-	public final String MENU_VIEW = "viewMenu"; //$NON-NLS-1$
-	public final String ACTION_VIEW_GRID = "viewGridAction"; //$NON-NLS-1$
-	public final String ACTION_SNAP_TO_GRID = "snapToGridAction"; //$NON-NLS-1$
-	public final String ACTION_VIEW_PAGEBREAKS = "viewPageBreaks";//$NON-NLS-1$
-	public final String ACTION_VIEW_RULERS = "viewRulerAction"; //$NON-NLS-1$
-
-	/* Make Same Size Menu and actions ids */
-	public final String MENU_MAKE_SAME_SIZE = "makeSameSizeMenu"; //$NON-NLS-1$
-	public final String ACTION_MAKE_SAME_SIZE_BOTH = "makeSameSizeBothAction"; //$NON-NLS-1$
-	public final String ACTION_MAKE_SAME_SIZE_HEIGHT = "makeSameHeightAction"; //$NON-NLS-1$
-	public final String ACTION_MAKE_SAME_SIZE_WIDTH = "makeSameWidthAction"; //$NON-NLS-1$
-
-	/* Custom contribution ids */
-	public final String CUSTOM_FONT_NAME = "fontNameContributionItem"; //$NON-NLS-1$
-	public final String CUSTOM_FONT_SIZE = "fontSizeContributionItem"; //$NON-NLS-1$
-	public final String CUSTOM_FONT_COLOR = "fontColorContributionItem"; //$NON-NLS-1$
-	public final String CUSTOM_LINE_COLOR = "lineColorContributionItem"; //$NON-NLS-1$
-	public final String CUSTOM_FILL_COLOR = "fillColorContributionItem"; //$NON-NLS-1$
-	public final String CUSTOM_ZOOM = "zoomContributionItem"; //$NON-NLS-1$
-
-	/* Action contribution ids */
-	public final String ACTION_FONT_DIALOG = "fontDialogAction"; //$NON-NLS-1$
-	public final String ACTION_FONT_BOLD = "fontBoldAction"; //$NON-NLS-1$
-	public final String ACTION_FONT_ITALIC = "fontItalicAction"; //$NON-NLS-1$
-	public final String ACTION_ARRANGE_ALL = "arrangeAllAction"; //$NON-NLS-1$
-	public final String ACTION_ARRANGE_SELECTION = "arrangeSelectionAction"; //$NON-NLS-1$
-	public final String ACTION_TOOLBAR_ARRANGE_ALL = "toolbarArrangeAllAction"; //$NON-NLS-1$
-	public final String ACTION_TOOLBAR_ARRANGE_SELECTION = "toolbarArrangeSelectionAction"; //$NON-NLS-1$
-    public final String SELECT_CONNECTION_SOURCE = "selectConnectionSource"; //$NON-NLS-1$
-    public final String SELECT_CONNECTION_TARGET = "selectConnectionTarget"; //$NON-NLS-1$
-    public final String ACTION_SELECT_ALL_SHAPES = "selectAllShapesAction"; //$NON-NLS-1$
-	public final String ACTION_SELECT_ALL_CONNECTIONS = "selectAllConnectorsAction"; //$NON-NLS-1$
-	public final String ACTION_TOOLBAR_SELECT_ALL = "toolbarSelectAllAction"; //$NON-NLS-1$
-	public final String ACTION_TOOLBAR_SELECT_ALL_SHAPES = "toolbarSelectAllShapesAction"; //$NON-NLS-1$
-	public final String ACTION_TOOLBAR_SELECT_ALL_CONNECTIONS = "toolbarSelectAllConnectorsAction"; //$NON-NLS-1$
-	public final String ACTION_AUTOSIZE = "autoSizeAction"; //$NON-NLS-1$
-	public final String ACTION_COMPARTMENT_ALL = "allCompartmentsAction"; //$NON-NLS-1$
-	public final String ACTION_COMPARTMENT_NONE = "noCompartmentsAction"; //$NON-NLS-1$
-	public final String ACTION_ROUTER_RECTILINEAR = "rectilinearRouterAction"; //$NON-NLS-1$
-	public final String ACTION_ROUTER_OBLIQUE = "obliqueRouterAction"; //$NON-NLS-1$
-	public final String ACTION_ROUTER_TREE = "treeRouterAction"; //$NON-NLS-1$
-	public final String ACTION_TOGGLE_ROUTER = "toggleRouter"; //$NON-NLS-1$
-	public final String ACTION_COPY_APPEARANCE_PROPERTIES = "copyAppearancePropertiesAction"; //$NON-NLS-1$
-	public final String ACTION_SNAP_BACK = "snapBackAction"; //$NON-NLS-1$
-	public final String ACTION_COPY_BITMAP = "copyBitmapAction"; //$NON-NLS-1$
-	public final String ACTION_DELETE_FROM_MODEL = "deleteFromModelAction"; //$NON-NLS-1$	
-	public final String ACTION_DELETE_FROM_DIAGRAM = "deleteFromDiagramAction"; //$NON-NLS-1$	
-	public final String ACTION_RECALC_PAGEBREAKS = "recalcPageBreaks";//$NON-NLS-1$
-	public final String ACTION_SORT_FILTER = "sortfilterAction";//$NON-NLS-1$
-	public final String ACTION_SHOW_PROPERTIES_VIEW = "showPropertiesViewAction";//$NON-NLS-1$
-	public final String ACTION_SHOW_CONNECTION_LABELS = "showConnectorLabels"; //$NON-NLS-1$
-	public final String ACTION_HIDE_CONNECTION_LABELS = "hideConnectorLabels"; //$NON-NLS-1$	
-	public final String ACTION_SHOW_COMPARTMENT_TITLE = "showCompartmentTitle"; //$NON-NLS-1$	
-    public final String ACTION_GROUP = "groupAction"; //$NON-NLS-1$
-    public final String ACTION_UNGROUP = "ungroupAction"; //$NON-NLS-1$
-    
-	/* The menu ID for the diagram editor popup menu */
-	public final String DIAGRAM_EDITOR_CONTEXT_MENU = "org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu"; //$NON-NLS-1$
-	public final String DIAGRAM_OUTLINE_CONTEXT_MENU = "org.eclipse.gmf.runtime.diagram.ui.DiagramOutlineContextMenu"; //$NON-NLS-1$
-	
-	//actions for adding text and note views
-    public final String ACTION_ADD_NOTELINK = "addNoteLinkAction"; //$NON-NLS-1$	
-	public final String ACTION_ADD_TEXT = "addTextAction"; //$NON-NLS-1$
-	public final String ACTION_ADD_NOTE = "addNoteAction"; //$NON-NLS-1$
-	
-	//actions for align in non toolbar menus
-	public final String ACTION_ALIGN_LEFT = "alignLeftAction"; //$NON-NLS-1$	
-	public final String ACTION_ALIGN_RIGHT = "alignRightAction"; //$NON-NLS-1$
-	public final String ACTION_ALIGN_TOP = "alignTopAction"; //$NON-NLS-1$ 
-	public final String ACTION_ALIGN_BOTTOM = "alignBottomAction"; //$NON-NLS-1$
-	public final String ACTION_ALIGN_MIDDLE = "alignMiddleAction"; //$NON-NLS-1$ 
-	public final String ACTION_ALIGN_CENTER = "alignCenterAction"; //$NON-NLS-1$
-
-	// actions for keyboard accelerators
-	public final String ACTION_INSERT_SEMANTIC = "insertSemantic"; //$NON-NLS-1$
-	
-	// Navigate Action Ids
-	public final String OPEN = "OpenAction"; //$NON-NLS-1$
-
-	//actions for text alignment in non toolbar menus
-    public final String MENU_TEXT_ALIGNMENT = "textAlignmentMenu"; //$NON-NLS-1$
-	public final String ACTION_TEXT_ALIGNMENT_LEFT = "textAlignmentLeftAction"; //$NON-NLS-1$	
-	public final String ACTION_TEXT_ALIGNMENT_CENTER = "textAlignmentCenterAction"; //$NON-NLS-1$
-	public final String ACTION_TEXT_ALIGNMENT_RIGHT = "textAlignmentRightAction"; //$NON-NLS-1$
-
-	//actions for line width in non toolbar menus
-    public final String MENU_LINE_WIDTH = "lineWidthMenu"; //$NON-NLS-1$
-	public final String ACTION_LINE_WIDTH_ONE = "lineWidthOneAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_WIDTH_TWO = "lineWidthTwoAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_WIDTH_THREE = "lineWidthThreeAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_WIDTH_FOUR = "lineWidthFourAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_WIDTH_FIVE = "lineWidthFiveAction"; //$NON-NLS-1$	
-
-	//actions for line type in non toolbar menus
-    public final String MENU_LINE_TYPE = "lineTypeMenu"; //$NON-NLS-1$
-	public final String ACTION_LINE_TYPE_SOLID = "lineTypeSolidAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_TYPE_DASH = "lineTypeDashAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_TYPE_DOT = "lineTypeDotAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_TYPE_DASH_DOT = "lineTypeDashDotAction"; //$NON-NLS-1$	
-	public final String ACTION_LINE_TYPE_DASH_DOT_DOT = "lineTypeDashDotDotAction"; //$NON-NLS-1$	
-
-	//actions for line type in non toolbar menus
-    public final String MENU_ARROW_TYPE = "arrowTypeMenu"; //$NON-NLS-1$
-	public final String MENU_ARROW_TYPE_SOURCE = "arrowTypeSourceMenu"; //$NON-NLS-1$	
-	public final String MENU_ARROW_TYPE_TARGET = "arrowTypeTargetMenu"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_SOURCE_NONE = "arrowTypeSourceNoneAction"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_SOURCE_SOLID = "arrowTypeSourceSolidAction"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_SOURCE_OPEN = "arrowTypeSourceOpenAction"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_TARGET_NONE = "arrowTypeTargetNoneAction"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_TARGET_SOLID = "arrowTypeTargetSolidAction"; //$NON-NLS-1$	
-	public final String ACTION_ARROW_TYPE_TARGET_OPEN = "arrowTypeTargetOpenAction"; //$NON-NLS-1$	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java
deleted file mode 100644
index 50567cb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.core.runtime.Assert;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PropertyChangeAction;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- *
- * A generic action for changing and reflecting checked properties
- * 
- */
-public class CheckedPropertyAction extends PropertyChangeAction {
-
-	/**
-	 * The property valye
-	 */
-	private Object propertyValue;
-	
-	/**
-	 * Creates a new boolean property change action isntance
-	 * 
-	 * @param workbenchPage The workbench page
-	 * @param propertyName The property name
-	 * @param propertyId The property id
-	 * @param property the initial value of the property
-	 */
-	protected CheckedPropertyAction(
-		IWorkbenchPage workbenchPage,
-		String propertyId,
-		String propertyName,
-		Object propertyValue) {
-		super(workbenchPage, propertyId, propertyName);
-		Assert.isNotNull(propertyValue);
-		this.propertyValue = propertyValue;
-	}
-    
-    protected boolean isOperationHistoryListener() {
-        return true;
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#getStyle()
-	 */
-	public int getStyle() {
-		return AS_CHECK_BOX;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-		setChecked(calculateChecked());
-	}
-
-	/**
-	 * Calculates the check state of the action
-	 * 
-	 * @return <code>true</code> if action should be checked, <code>false</code> otherwise
-	 */
-	protected boolean calculateChecked() {
-		return propertyValue.equals(getOperationSetPropertyValue(getPropertyId()));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.internal.PropertyChangeAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		return propertyValue;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DeleteFromModelAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DeleteFromModelAction.java
deleted file mode 100644
index 448ab9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DeleteFromModelAction.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This Action is used to send a request that will destroy a semantic element
- * from the model.
- * 
- * @author melaasar
- * @author choang 
- */
-public class DeleteFromModelAction
-	extends AbstractDeleteFromAction {
-    
-    
-	/**
-	 * Creates a <code>DeleteFromModelAction</code> with a default label.
-	 *
-	 * @param part The part this action will be associated with.
-	 */
-	public DeleteFromModelAction(IWorkbenchPart part) {
-		super(part);
-		
-		
-	}
- 
-	/**
-	 * Constructor
-	 * @param workbenchPage
-	 */
-	public DeleteFromModelAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		List operationSet = getOperationSet();
-		if (operationSet.isEmpty()) {
-			return false;
-		}
-		Request request = getTargetRequest();
-		Iterator editParts = operationSet.iterator();
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			// disable on diagram links 
-			if (editPart instanceof IGraphicalEditPart) {
-				IGraphicalEditPart gEditPart = (IGraphicalEditPart) editPart;
-				
-				// disable the action if any of the edit parts are disabled.
-				if (!gEditPart.isEditModeEnabled()) {
-					return false;
-				}
-				
-				View view = (View) gEditPart.getModel();
-				// Disallow diagram deletion from model only if it is the top most diagram
-				EObject container = view.eContainer();
-				EObject element = ViewUtil.resolveSemanticElement(view);
-				if ((element == null) || (element.eIsProxy())
-						|| (element instanceof Diagram)
-						|| (view instanceof Diagram && (container == null || !(container instanceof View)))) {
-					return false;
-				}
-			} else {
-				Command curCommand = editPart.getCommand(request);
-				if (curCommand == null || (curCommand.canExecute() == false)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Initializes this action's text and images.
-	 */
-	public void init() {
-		super.init();
-		setId(ActionIds.ACTION_DELETE_FROM_MODEL);
-		setText(DiagramUIMessages.DiagramEditor_Delete_from_Model);
-		setToolTipText(DiagramUIMessages.DiagramEditor_Delete_from_ModelToolTip);
-		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.diagram.ui.actions.DiagramAction#getCommand(org.eclipse.gef.Request)
-	 */
-	protected Command getCommand(Request request) {	
-		List operationSet = getOperationSet();
-		Iterator editParts = operationSet.iterator();
-		CompositeTransactionalCommand command =
-			new CompositeTransactionalCommand(getEditingDomain(), getCommandLabel());
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			// disable on diagram links 
-			if (editPart instanceof IGraphicalEditPart){
-				IGraphicalEditPart gEditPart = 
-					(IGraphicalEditPart) editPart;
-				View view = (View)gEditPart.getModel();
-				// Don't delete diagram from model only if it is the top most diagram
-				EObject container = view.eContainer();
-				EObject element = ViewUtil.resolveSemanticElement(view);
-				if ((element instanceof Diagram)
-						|| (view instanceof Diagram && (container == null || !(container instanceof View)))) {
-					return null;
-				}
-			}
-			Command curCommand = editPart.getCommand(request);
-			if (curCommand != null) {
-				command.compose(new CommandProxy(curCommand));				
-			}
-		}
-		
-		if ((command.isEmpty())
-			|| (command.size() != operationSet.size())){
-			return UnexecutableCommand.INSTANCE;
-		}
-		return new ICommandProxy(command);
-	}
-    
-    protected String getCommandLabel() {
-        return DiagramUIMessages.DiagramEditor_Delete_from_Model;
-    };
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-     */
-    protected void doRun(IProgressMonitor progressMonitor) {
-    	Command command = getCommand();
-    	//For performance improvement, sometimes, calculateEnable method
-    	//won't disable the action for all valid unexecutable cases. At
-    	//that time, we need this error check here to report delete 
-    	//error to the users.
-    	if (command == null || !command.canExecute()) {
-    		MessageDialog
-			.openError(
-				Display.getCurrent().getActiveShell(),
-				DiagramUIMessages.DeleteFromModelAction_ErrorDialog_Title,
-				DiagramUIMessages.DeleteFromModelAction_ErrorDialog_Text);
-    	}
-		execute(getCommand(), progressMonitor);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DiagramAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DiagramAction.java
deleted file mode 100644
index d0ff33d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/DiagramAction.java
+++ /dev/null
@@ -1,428 +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;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Disposable;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler;
-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.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An abstract implementation of a diagram action that follows the
- * request-command architecture.
- * 
- * Notice: 1) This action retargets to the active workbench part 2) This action
- * can either be contributed programatically or through the
- * <code>ControbutionItemService</code>.
- * 
- * @author melaasar
- */
-public abstract class DiagramAction
-	extends AbstractActionHandler
-	implements Disposable {
-
-	/** the target request */
-	private Request targetRequest;
-
-	/** the cached operation set */
-	private List _operationSet = Collections.EMPTY_LIST;
-
-	/**
-	 * Constructs a new diagram action
-	 * 
-	 * @param workbenchPage
-	 *            The workbench page associated with this action
-	 */
-	public DiagramAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	/**
-	 * Constructs a new diagram action. This constructor is provided just in
-	 * case a derived class needs to support both the construction of a diagram
-	 * action with a workbenchpart. Typically this is only when the diagram
-	 * declares its own action in additional to the one registered with the
-	 * action serivce.
-	 * 
-	 * @param workbenchpart
-	 *            The workbench part associated with this action
-	 */
-	protected DiagramAction(IWorkbenchPart workbenchpart) {
-		super(workbenchpart);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IDisposableAction#dispose()
-	 */
-	public void dispose() {
-		targetRequest = null;
-		_operationSet = null;
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		execute(getCommand(), progressMonitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		_operationSet = null; // invalidate the cached set
-		updateTargetRequest();
-		setEnabled(calculateEnabled());
-	}
-
-	/**
-	 * Calculates the enblement state of the action
-	 * 
-	 * @return <code>true</code> if action should be enabled,
-	 *         <code>false</code> otherwise
-	 */
-	protected boolean calculateEnabled() {
-		Command command = getCommand();
-		return command != null && command.canExecute();
-	}
-
-	/**
-	 * Executes the given {@link Command}.
-	 * 
-	 * @param command
-	 *            the command to execute
-	 * @param progressMonitor
-	 *            the progress monitor to use during execution
-	 */
-	protected final void execute(Command command,
-			IProgressMonitor progressMonitor) {
-		if (command == null || !command.canExecute())
-			return;
-		if (getDiagramCommandStack() != null)
-			getDiagramCommandStack().execute(command, progressMonitor);
-	}
-
-	/**
-	 * gives access to the diagram command stack
-	 * 
-	 * @return the diagram command stack
-	 */
-	protected DiagramCommandStack getDiagramCommandStack() {
-		Object stack = getWorkbenchPart().getAdapter(CommandStack.class);
-		return (stack instanceof DiagramCommandStack) ? (DiagramCommandStack) stack
-			: null;
-	}
-
-	/**
-	 * Gets the associated Command with this action based on the target request
-	 * 
-	 * @return a command
-	 */
-	protected Command getCommand() {
-		return getCommand(getTargetRequest());
-	}
-
-	/**
-	 * Gets a command to execute on the operation set based on a given request
-	 * 
-	 * @param request
-	 *            request to use to get the command
-	 * @return a command
-	 */
-	protected Command getCommand(Request request) {
-		List operationSet = getOperationSet();
-		Iterator editParts = operationSet.iterator();
-		CompoundCommand command = new CompoundCommand(getCommandLabel());
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			Command curCommand = editPart.getCommand(request);
-			if (curCommand != null) {
-				command.add(curCommand);
-			}
-		}
-		return command.isEmpty() || command.size() != operationSet.size() ? UnexecutableCommand.INSTANCE
-			: (Command) command;
-	}
-
-	/**
-	 * Gets an optional label for the action's executed command
-	 * 
-	 * @return An optional label for the action's executed command
-	 */
-	protected String getCommandLabel() {
-		return StringStatics.BLANK;
-	}
-
-	/**
-	 * Gets a request to be addressed to the operation set
-	 * 
-	 * @return a target request
-	 */
-	protected Request getTargetRequest() {
-		if (targetRequest == null)
-			targetRequest = createTargetRequest();
-		return targetRequest;
-	}
-
-	/**
-	 * Creates a new target request
-	 * 
-	 * @return the new target request
-	 */
-	protected abstract Request createTargetRequest();
-
-	/**
-	 * updates the target request. Clients should call this method whenever the
-	 * request is expected to be changed
-	 */
-	protected void updateTargetRequest() {
-		// no def impl
-	}
-
-	/**
-	 * Sets the target request to <tt>null</tt>. This will force the creation
-	 * of a new target request on the next {@link #getTargetRequest()} call.
-	 */
-	protected void clearTargetRequest() {
-		targetRequest = null;
-	}
-
-	/**
-	 * A utility method to return a list of objects in the current structured
-	 * selection
-	 * 
-	 * @return A list of objects in the current structure selection
-	 */
-	protected List getSelectedObjects() {
-		return getStructuredSelection().toList();
-	}
-
-	/**
-	 * Return the list of editparts considered the operation set after caching
-	 * them
-	 * 
-	 * @return A list of editparts conidered the operation set
-	 */
-	protected final List getOperationSet() {
-		if (_operationSet == null) {
-			_operationSet = createOperationSet();
-			if (_operationSet == null)
-				_operationSet = Collections.EMPTY_LIST;
-		}
-		return _operationSet;
-	}
-
-	/**
-	 * Filters the selected objects and returns only 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));
-		}
-		return targetedEPs.isEmpty() ? Collections.EMPTY_LIST
-			: targetedEPs;
-	}
-
-    /**
-     * Given an editpart, returns a list of target editparts to the current
-     * request If no targets could be found, an empty list is returned
-     * 
-     * @param editpart
-     *            The given editpart
-     * @return a list of target editparts, or Empty list if none
-     */
-    protected List getTargetEditParts(EditPart editpart) {
-        EditPart targetEP = editpart.getTargetEditPart(getTargetRequest());
-        return (targetEP == null) ? Collections.EMPTY_LIST
-            : Collections.singletonList(targetEP);
-    }
-    
-	/**
-	 * A utility method to get the <code>IDiagramEditDomain</code> from the
-	 * current part if it adapts to it
-	 * 
-	 * @return The diagram edit domain adapter if it exists; <code>null</code>
-	 *         otherwise
-	 */
-	protected IDiagramEditDomain getDiagramEditDomain() {
-		return (IDiagramEditDomain) getWorkbenchPart().getAdapter(
-			IDiagramEditDomain.class);
-	}
-
-	/**
-	 * A utility method to return the active part if it implements 
-	 * or adapts to the <code>IDiagramWorkbenchPart</code> interface
-	 * 
-	 * @return The current part if it implements or adapts to
-	 *         <code>IDiagramWorkbenchPart</code>; <code>null</code>
-	 *         otherwise
-	 */
-	protected IDiagramWorkbenchPart getDiagramWorkbenchPart() {
-		IDiagramWorkbenchPart diagramPart = null;
-		IWorkbenchPart part = getWorkbenchPart();
-		
-		if (part instanceof IDiagramWorkbenchPart) {
-			diagramPart = (IDiagramWorkbenchPart) part;
-			
-		} else if (part!=null){
-			diagramPart = (IDiagramWorkbenchPart) part
-					.getAdapter(IDiagramWorkbenchPart.class);
-		}
-
-		return diagramPart;
-	}
-
-	/**
-	 * A utility method to return the active <code>DiagramEditPart</code> if
-	 * the current part implements <code>IDiagramWorkbenchPart</code>
-	 * 
-	 * @return The current diagram if the parts implements
-	 *         <code>IDiagramWorkbenchPart</code>; <code>null</code>
-	 *         otherwise
-	 */
-	protected DiagramEditPart getDiagramEditPart() {
-		IDiagramWorkbenchPart part = getDiagramWorkbenchPart();
-		return part != null ? part.getDiagramEditPart()
-			: null;
-	}
-
-	/**
-	 * A utility method to return the active <code>DiagramEditPart</code> if
-	 * the current part implements <code>IDiagramWorkbenchPart</code>
-	 * 
-	 * @return The current diagram if the parts implements
-	 *         <code>IDiagramWorkbenchPart</code>; <code>null</code>
-	 *         otherwise
-	 */
-	protected IDiagramGraphicalViewer getDiagramGraphicalViewer() {
-		IDiagramWorkbenchPart part = getDiagramWorkbenchPart();
-		return part != null ? part.getDiagramGraphicalViewer()
-			: null;
-	}
-
-	/**
-	 * Filters the given list of EditParts so that the list only contains the
-	 * EditParts that matches the given condition.
-	 * 
-	 * @param list
-	 *            the list of edit parts to filter
-	 * @param condition
-	 *            the condition
-	 * @return a modified list containing those editparts that matched the
-	 *         condition
-	 */
-	protected List filterEditPartsMatching(List list,
-			EditPartViewer.Conditional condition) {
-		List matchList = new ArrayList();
-		Iterator iter = list.iterator();
-		while (iter.hasNext()) {
-			EditPart ep = (EditPart) iter.next();
-			if (condition.evaluate(ep))
-				matchList.add(ep);
-		}
-		return matchList;
-	}
-
-	/**
-     * Does this action need to listen to selection change events? If the
-     * enablement state of the context menu or the operation set depends on what
-     * is selected in a diagram, then this needs to return true. If this action
-     * targets the diagram only, then it should return false.
-     * <p>
-     * Actions that are only contributed to the popup menu (and not toolbar or
-     * main menus) will not receive selection events at all. The refresh()
-     * method will be called when the context menu is about to show.
-     * </p>
-     */
-	protected abstract boolean isSelectionListener();
-
-	/**
-	 * @param targetRequest
-	 *            The targetRequest to set.
-	 */
-	protected void setTargetRequest(Request targetRequest) {
-		this.targetRequest = targetRequest;
-	}
-
-	/**
-	 * 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() {
-		if (getDiagramEditPart() != null) {
-			return getDiagramEditPart().getDiagramPreferencesHint();
-		}
-		return PreferencesHint.USE_DEFAULTS;
-	}
-	
-	/**
-	 * Gets the location of the mouse pointer relative to the viewer.
-	 * 
-	 * @return the location of the mouse pointer or null if it cannot be
-	 *         determined
-	 */
-	protected final Point getMouseLocation() {
-		Display display = Display.getCurrent();
-		if (display != null) {
-			IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();
-			if (viewer != null) {
-				return new Point(viewer.getControl().toControl(
-						display.getCursorLocation()));
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ShowPropertiesViewAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ShowPropertiesViewAction.java
deleted file mode 100644
index cc68ac8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/ShowPropertiesViewAction.java
+++ /dev/null
@@ -1,78 +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.core.runtime.IProgressMonitor;
-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.util.WorkbenchPartActivator;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An action to show Eclipse's properties view
- * 
- * @author melaasar
- */
-public class ShowPropertiesViewAction extends AbstractActionHandler {
-
-	/**
-	 * Constructor that takes a IWorkbenchPart.
-	 * 
-	 * @param workbenchPart the work bench associated with this action
-	 */
-	public ShowPropertiesViewAction(IWorkbenchPart workbenchPart) {
-		super(workbenchPart);
-		initialize();
-	}
-	
-	/**
-	 * Constructor the workbench page associated with this action
-	 * @param workbenchPage
-	 */
-	public ShowPropertiesViewAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		initialize();
-	}
-	
-	/**
-	 * Initialize the action
-	 */
-	private void initialize() {
-		setId(ActionIds.ACTION_SHOW_PROPERTIES_VIEW);
-		setText(DiagramUIMessages.ShowPropertiesViewAction_ActionLabelText);
-		setToolTipText(DiagramUIMessages.ShowPropertiesViewAction_ActionToolTipText);
-		setImageDescriptor(DiagramUIPluginImages.DESC_SHOW_PROPERTIES_VIEW);
-		setHoverImageDescriptor(DiagramUIPluginImages.DESC_SHOW_PROPERTIES_VIEW);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractActionHandler#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {
-		Trace.trace(DiagramUIPlugin.getInstance(), DiagramUIDebugOptions.METHODS_ENTERING, "ShowPropertiesView.doRun Entering"); //$NON-NLS-1$
-		WorkbenchPartActivator.showPropertySheet();
-		Trace.trace(DiagramUIPlugin.getInstance(), DiagramUIDebugOptions.METHODS_EXITING, "ShowPropertiesView.doRun Exiting"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.action.IRepeatableAction#refresh()
-	 */
-	public void refresh() {
-		// null implementation
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/actions/package.html
deleted file mode 100644
index 14d92f8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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 %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ArrangeCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ArrangeCommand.java
deleted file mode 100644
index 2059cd7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ArrangeCommand.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-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.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.IInternalLayoutRunnable;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutNode;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutService;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The arrange command implementation
- * <li> Delegates to the layout provider only during the execution of the command.
- * <li> {@link #canExecute()} asks the layout service whether it can layout the nodes
- * (e.g some layouts won't layout if nodes are laid out already)    
- * 
- * @author aboyko
- * @since 1.4
- */
-final public class ArrangeCommand extends AbstractTransactionalCommand {
-	
-	/**
-	 * Nodes to layout
-	 */
-	private List<LayoutNode> nodes;
-	
-	/**
-	 * <code>true</code> if only a part of the graph is being laid out,
-	 * <code>false</code> - the whole graph is being laid out
-	 */
-	private boolean selectionArrange;
-	
-	/**
-	 * The layout hint parameter
-	 */
-	private IAdaptable layoutHint;
-
-	/**
-	 * Constraucts an instance
-	 * 
-	 * @param domain
-	 *            edititng domain
-	 * @param label
-	 *            command label
-	 * @param affectedFiles
-	 *            list of affected files
-	 * @param editparts
-	 *            editoparts to be arranged
-	 * @param layoutHint
-	 *            the layout hint parameter
-	 * @param selectionArrange
-	 *            <code>true</code> for part of the graph to be laid out and
-	 *            <code>false</code> for the whole graph to be laid out
-	 */
-	public ArrangeCommand(TransactionalEditingDomain domain, String label,
-			List affectedFiles, Collection<IGraphicalEditPart> editparts,
-			IAdaptable layoutHint, boolean selectionArrange) {
-		super(domain, label, affectedFiles);
-		this.layoutHint = layoutHint;
-		this.selectionArrange = selectionArrange;
-		initLayoutNodes(editparts);
-	}
-	
-	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-			IAdaptable info) throws ExecutionException {
-		ICommand cmd = getCommandForExecution();
-		if (cmd.canExecute()) {
-			cmd.execute(monitor, info);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-	
-	/**
-	 * Creates the list of nodes to layout from the editparts required to be arranged
-	 * 
-	 * @param editparts the editparts required to be arranged
-	 */
-	private void initLayoutNodes(Collection<IGraphicalEditPart> editparts) {
-        nodes = new ArrayList<LayoutNode>(editparts.size());
-        Iterator<IGraphicalEditPart> li = editparts.iterator();     
-        while (li.hasNext()) {
-            IGraphicalEditPart ep = li.next();      
-            View view = ep.getNotationView();
-            if (ep.isActive() && view != null && view instanceof Node && ep != layoutHint.getAdapter(EditPart.class)) {
-                Rectangle bounds = ep.getFigure().getBounds();
-                nodes.add(new LayoutNode((Node)view, bounds.width, bounds.height));
-            }
-        }
-	}
-	
-	/**
-	 * Creates the actual layout command to execute. The command is created based on the {@link LayoutService} 
-	 * 
-	 * @return the actual graph layout command 
-	 */
-	private ICommand getCommandForExecution() {
-        final Runnable layoutRun = LayoutService.getInstance().layoutLayoutNodes(nodes, selectionArrange, layoutHint);
-        
-        TransactionalEditingDomain editingDomain = getEditingDomain(); 
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(editingDomain, StringStatics.BLANK);        
-        if (layoutRun instanceof IInternalLayoutRunnable) {
-        	Command cmd = ((IInternalLayoutRunnable) layoutRun).getCommand();
-        	if (cmd != null) {
-        		ctc.add(new CommandProxy(cmd));
-        	}
-        }
-        else {
-            ctc.add(new AbstractTransactionalCommand(editingDomain, StringStatics.BLANK, null) {
-                protected CommandResult doExecuteWithResult(
-                            IProgressMonitor progressMonitor, IAdaptable info)
-                        throws ExecutionException {
-                    layoutRun.run();
-                    return CommandResult.newOKCommandResult();
-                }
-            });     
-        }       
-        return ctc;
-	}
-
-	@Override
-	public boolean canExecute() {
-		return LayoutService.getInstance().canLayoutNodes(nodes, selectionArrange, layoutHint);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandProxy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandProxy.java
deleted file mode 100644
index a491a62..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.commands.Command;
-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.StringStatics;
-
-/**
- * {@link ICommand} that delegates to a GEF {@link Command}.
- * 
- * @author sshaw
- */
-public class CommandProxy
-    extends AbstractCommand {
-
-    /** The wrapped command */
-    private Command command;
-
-    /**
-     * Method CommandProxy.
-     * 
-     * @param command
-     */
-    public CommandProxy(Command command) {
-        super((command.getLabel() == null) ? StringStatics.BLANK : command.getLabel(), null);
-        Assert.isNotNull(command);
-        this.command = command;
-    }
-
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        command.execute();
-        return CommandResult.newOKCommandResult();
-    }
-
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        command.redo();
-        return CommandResult.newOKCommandResult();
-    }
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-
-        command.undo();
-        return CommandResult.newOKCommandResult();
-    }
-
-    /**
-     * Returns the wrapped command.
-     * 
-     * @return Command
-     */
-    public Command getCommand() {
-        return command;
-    }
-
-    public boolean canUndo() {
-        return command.canUndo();
-    }
-
-    public boolean canRedo() {
-        return CommandUtilities.canRedo(command);
-    }
-
-    public boolean canExecute() {
-        return command.canExecute();
-    }
-
-    public void dispose() {
-        super.dispose();
-        command.dispose();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandUtilities.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandUtilities.java
deleted file mode 100644
index 755b19c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandUtilities.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-
-/**
- * Class containing commands utility methods.
- * 
- * @author aboyko
- *
- */
-public class CommandUtilities {
-	
-	/**
-	 * This utility function determines whether the command is redoable.
-	 * Since GEF commands API doesn't support for canRedo method, this
-	 * utility will help to travel through the contents of GEF wrapper
-	 * commands and determine redoability of the GEF command based on
-	 * the redoability of the commands it contains.
-	 * 
-	 * @param command The command to be examined
-	 * @return <code>true</code> if the passed command is redoable
-	 */
-	public static boolean canRedo(Command command)
-	{
-		if (command == null)
-			return false;
-		
-		if (command instanceof IUndoableOperation)
-		{
-			return ((IUndoableOperation) command).canRedo();
-		}
-		else if (command instanceof CompoundCommand)
-		{
-			for ( Iterator iter = ((CompoundCommand)command).getCommands().iterator(); iter.hasNext(); )
-			{
-				try
-				{
-					if (!canRedo((Command)iter.next()))
-						return false;
-				}
-				catch (ClassCastException e)
-				{
-					return false;
-				}
-			}
-			return true;
-		}
-		else if (command instanceof ICommandProxy)
-		{
-			return ((ICommandProxy)command).getICommand().canRedo();
-		}
-		return command.canUndo();
-	}
-	
-	/**
-	 * Determines the files affected by <code>command</code>. Since GEF
-	 * command API has no support for #getAffectedFiles, this utility will
-	 * traverse the contents of GEF wrapper commands and determine the files
-	 * affected by the <code>ICommands</code> it contains.
-	 * 
-	 * @param command
-	 *            the command
-	 * @return the affected files
-	 */
-	public static Collection getAffectedFiles(Command command)
-	{
-		if (command == null)
-			return Collections.EMPTY_LIST;
-		
-		if (command instanceof ICommand) {
-			return ((ICommand) command).getAffectedFiles();
-			
-		} else if (command instanceof ICommandProxy) {
-			return ((ICommandProxy)command).getICommand().getAffectedFiles();
-			
-		} else if (command instanceof CompoundCommand) {
-			LinkedHashSet result = new LinkedHashSet();
-			
-			for (Iterator iter = ((CompoundCommand)command).getCommands().iterator(); iter.hasNext();) {
-				result.addAll(getAffectedFiles((Command) iter.next()));
-			}
-			return result;
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	/**
-	 * A helper that inspects the command for the most severe command result.
-	 * 
-	 * @param command
-	 * @return IStatus in the command or null if no result can be obtained from the command.
-	 * @since 1.2
-	 */
-	public static IStatus getMostSevereStatus(Command command) {
-		IStatus status = null;
-
-		ICommand iCommand = null;
-
-		if (command instanceof CompoundCommand) {
-
-			List<IStatus> statusList = new ArrayList<IStatus>(
-					((CompoundCommand) command).size());
-
-			Iterator<?> iter = ((CompoundCommand) command).getCommands()
-					.iterator();
-			while (iter.hasNext()) {
-				Command nextCommand = (Command) iter.next();
-				status = getMostSevereStatus(nextCommand);
-				if (status != null) {
-					statusList.add(status);
-				}
-			}
-			return aggregateStatuses(statusList);
-			
-		} else if (command instanceof ICommand) {
-			iCommand = (ICommand) command;
-			
-		} else if (command instanceof ICommandProxy) {
-			iCommand = ((ICommandProxy) command).getICommand();
-		}
-
-		if (iCommand != null) {
-			CommandResult commandResult = iCommand.getCommandResult();
-			if (commandResult != null) {
-				status = commandResult.getStatus();
-			}
-		}
-		return status;
-	}
-
-	/**
-	 * Creates a suitable aggregate from these statuses. If there are no
-	 * statuses to aggregate, then an null 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 or null
-	 * @since 1.2
-	 */
-	protected static IStatus aggregateStatuses(List<IStatus> statuses) {
-		final IStatus result;
-
-		if (statuses.isEmpty()) {
-			result = null;
-		} 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;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateCommand.java
deleted file mode 100644
index f525e2b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-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.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A view creation command that creates a <code>View</code>.
- * After execution, the command result is a singleton list containing 
- * an <code>IAdatable</code> object that adapts to <code>View</code>.
- * Before execution, after undo or after redo, the returned <code>IAdaptable</code>
- * adapts to nothing (will return <code>null</code> when adapted to <code>View</code>)
- */
-public class CreateCommand extends AbstractTransactionalCommand {
-	
-	/** the view descriptor */
-	protected final CreateViewRequest.ViewDescriptor viewDescriptor;
-	/** The container view */
-	protected final View containerView;
-	
-	/**
-	 * Creates a new CreateCommand
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param viewDescriptor the view descriptor associated with this command
-	 * @param containerView the view that will containe the new view
-	 */
-	public CreateCommand(TransactionalEditingDomain editingDomain, 
-		CreateViewRequest.ViewDescriptor viewDescriptor,
-		View containerView) {
-
-		super(editingDomain, DiagramUIMessages.CreateCommand_Label, getWorkspaceFiles(containerView)); 
-
-		Assert.isNotNull(viewDescriptor);
-		Assert.isNotNull(containerView);
-		
-		this.viewDescriptor = viewDescriptor;
-		this.containerView = containerView;
-				
-		// make sure the return object is available even before executing/undoing/redoing
-		setResult(CommandResult.newOKCommandResult(viewDescriptor));
-	}
-
-	/**
-     * Return the cached view descriprot.
-     * 
-     * @return view descriprot
-     */
-	protected CreateViewRequest.ViewDescriptor getViewDescriptor() {
-		return viewDescriptor;
-	}
-
-
-	/**
-	 * give access to the view, where that will contain the created view
-	 * @return the conatiner view
-	 */
-	protected View getContainerView() {
-		return containerView;
-	}
-
-    protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-        throws ExecutionException {
-
-		View view =
-			ViewService.getInstance().createView(
-				viewDescriptor.getViewKind(),
-				viewDescriptor.getElementAdapter(),
-				containerView,
-				viewDescriptor.getSemanticHint(),
-				viewDescriptor.getIndex(),
-				viewDescriptor.isPersisted(),
-				viewDescriptor.getPreferencesHint());
-		Assert.isNotNull(view, "failed to create a view"); //$NON-NLS-1$
-		viewDescriptor.setView(view);
-        
-        return CommandResult.newOKCommandResult(viewDescriptor);
-	}
-
-    public boolean canExecute() {
-		return ViewService.getInstance().provides(
-			viewDescriptor.getViewKind(),
-			viewDescriptor.getElementAdapter(),
-			containerView,
-			viewDescriptor.getSemanticHint(),
-			viewDescriptor.getIndex(),
-			viewDescriptor.isPersisted(),
-			viewDescriptor.getPreferencesHint());
-	}
-	
-	/**
-	 * returns true if the view that will be created will be a transient view, transient views
-	 * will not dirty the model and will never get serialized in the saved file
-	 * @return true if persisted false if transient
-	 */
-	public boolean isPersisted() {
-	 	return getViewDescriptor().isPersisted(); 
-	 }
-    
-    public List getAffectedFiles() {
-        if (isPersisted())
-            return super.getAffectedFiles();
-        else
-            return Collections.EMPTY_LIST;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java
deleted file mode 100644
index 5aa1740..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.ObjectAdapter;
-import org.eclipse.gmf.runtime.common.ui.dialogs.PopupDialog;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ElementTypeLabelProvider;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.InternalDiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.dialogs.AbstractSelectElementDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * <p>
- * A command that pops up a menu which can allow the user to select whether they
- * want to create a new type, select an existing element, or leave it
- * unspecified.
- * </p>
- * 
- * <p>
- * The content can be customized, one or more of the above options are
- * permitted. The constants <code>UNSPECIFIED</code> and
- * <code>SELECT_EXISTING</code> can be used as the content of a menu item.
- * </p>
- * 
- * <p>
- * The displayed strings can be customized with a custom label provider.
- * </p>
- * 
- * <p>
- * The options are:
- * <li>Unspecified</li>
- * <li>Select Existing Element</li>
- * <li>Create New Type A</li>
- * <li>Create New Type B</li>
- * 
- * <p>
- * If a "Select Existing" menu item is chosen, an additional dialog appears
- * allowing the user to choose an element.
- * 
- * <p>
- * The <code>getResultAdapter()</code> method returns an adaptable to the
- * result.
- * </p>
- * 
- * @author cmahoney
- */
-public class CreateOrSelectElementCommand
-	extends PopupMenuCommand {
-
-	/**
-	 * Add this to the content list of the popup menu to add an 'unspecified'
-	 * option.
-	 */
-	public static final String UNSPECIFIED = InternalDiagramUIMessages.CreateOrSelectElementCommand_PopupMenu_UnspecifiedMenuItem_Text;
-
-	/**
-	 * Add this to the content list of the popup menu to add a 'select existing'
-	 * option.
-	 */
-	public static final String SELECT_EXISTING = InternalDiagramUIMessages.CreateOrSelectElementCommand_PopupMenu_SelectExistingElementMenuItem_Text;
-
-	/**
-	 * Add this to the content list of the popup menu to add a 'create without
-	 * binding' option.
-	 */
-	public static final String CREATE_WITHOUT_BINDING = InternalDiagramUIMessages.CreateOrSelectElementCommand_PopupMenu_CreateWithoutBindingMenuItem_Text;
-
-	/**
-	 * The default label provider for the the menu items used in this command.
-	 * Adds the "Create new " text to the objects of type
-	 * <code>IElementType</code>.
-	 */
-	static public class LabelProvider
-		extends ElementTypeLabelProvider {
-
-		/**
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object object) {
-			String text = super.getText(object);
-			if (object instanceof IElementType) {
-				return NLS
-					.bind(
-						InternalDiagramUIMessages.CreateOrSelectElementCommand_PopupMenu_CreateMenuItem_Text,
-						text);
-			}
-			return text;
-		}
-	}
-
-	/**
-	 * The result to be returned from which the new element or type info can be
-	 * retrieved.
-	 */
-	private ObjectAdapter resultAdapter = new ObjectAdapter();
-
-	/** The dialog to be used if "Select Existing Element" is chosen */
-	private AbstractSelectElementDialog selectElementDialog;
-
-	/**
-	 * Creates a new <code>CreateOrSelectElementCommand</code> that uses a
-	 * popup menu to prompt for the selection.
-	 * 
-	 * @param parentShell
-	 *            the parent shell
-	 * @param content
-	 *            The list of items making up the content of the popup menu.
-	 *            This can include element types (<code>IElementType</code>),
-	 *            <code>UNSPECIFIED</code>, and <code>SELECT_EXISTING</code>.
-	 */
-	public CreateOrSelectElementCommand(Shell parentShell, List content) {
-		this(parentShell, content, POPUP_MENU);
-	}
-
-	/**
-	 * Creates a new <code>CreateOrSelectElementCommand</code>.
-	 * 
-	 * @param parentShell
-	 *            the parent shell
-	 * @param content
-	 *            The list of items making up the content of the popup menu.
-	 *            This can include element types (<code>IElementType</code>),
-	 *            <code>UNSPECIFIED</code>, and <code>SELECT_EXISTING</code>.
-	 * @param style
-	 *            The kind of prompt to use for the selection. One of
-	 *            {@link org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand#POPUP_MENU}
-	 *            or
-	 *            {@link org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand#POPUP_DIALOG}
-	 */
-	public CreateOrSelectElementCommand(Shell parentShell, List content,
-			int style) {
-		this(InternalDiagramUIMessages.CreateOrSelectElementCommand_Label, parentShell,
-			content, style);
-	}
-
-	/**
-	 * Creates a new <code>CreateOrSelectElementCommand</code> that uses a
-	 * popup menu to prompt for the selection.
-	 * 
-	 * @param label
-	 *            the command label
-	 * @param parentShell
-	 *            the parent shell
-	 * @param content
-	 *            The list of items making up the content of the popup menu.
-	 *            This can include element types (<code>IElementType</code>),
-	 *            <code>UNSPECIFIED</code>, and <code>SELECT_EXISTING</code>.
-	 */
-	public CreateOrSelectElementCommand(String label, Shell parentShell,
-			List content) {
-		this(label, parentShell, content, POPUP_MENU);
-	}
-
-	/**
-	 * Creates a new <code>CreateOrSelectElementCommand</code>.
-	 * 
-	 * @param label
-	 *            the command label
-	 * @param parentShell
-	 *            the parent shell
-	 * @param content
-	 *            The list of items making up the content of the popup menu.
-	 *            This can include element types (<code>IElementType</code>),
-	 *            <code>UNSPECIFIED</code>, and <code>SELECT_EXISTING</code>.
-	 * @param style
-	 *            The kind of prompt to use for the selection. One of
-	 *            {@link org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand#POPUP_MENU}
-	 *            or
-	 *            {@link org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand#POPUP_DIALOG}
-	 */
-	public CreateOrSelectElementCommand(String label, Shell parentShell,
-			List content, int style) {
-		super(label, parentShell);
-
-		if (style == POPUP_DIALOG) {
-			setPopupDialog(new PopupDialog(parentShell, content,
-				getLabelProvider()));
-		} else {
-			setPopupMenu(new PopupMenu(content, getLabelProvider()));
-		}
-	}
-
-	/**
-	 * Creates a new <code>CreateOrSelectElementCommand</code>.
-	 * 
-	 * @param parentShell
-	 *            the parent shell
-	 * @param popupMenu
-	 *            the popup menu
-	 */
-	public CreateOrSelectElementCommand(Shell parentShell, PopupMenu popupMenu) {
-		super(InternalDiagramUIMessages.CreateOrSelectElementCommand_Label, parentShell,
-			popupMenu);
-	}
-
-	/**
-	 * Pops up the dialog with the content provided. If the user selects 'select
-	 * existing', then the select elements dialog also appears.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.sandbox.AbstractCommand2#doExecute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor,
-            org.eclipse.core.runtime.IAdaptable info)
-        throws ExecutionException {
-        
-		CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);
-		if (!cmdResult.getStatus().isOK()) {
-			return cmdResult;
-		}
-
-		Object result = cmdResult.getReturnValue();
-		if (result != null) {
-			if (result.equals(SELECT_EXISTING)) {
-				AbstractSelectElementDialog dialog = getSelectElementDialog();
-				Assert.isNotNull(dialog);
-
-				if (dialog.open() != Window.OK) {
-					// user cancelled gesture
-					return CommandResult.newCancelledCommandResult();
-				}
-				List selectedElements = dialog.getSelectedElements();
-				if (selectedElements == null) {
-					// user cancelled gesture
-					progressMonitor.setCanceled(true);
-					return CommandResult.newCancelledCommandResult();
-				} else if (dialog.isMultiSelectable()) {
-					resultAdapter.setObject(selectedElements);
-					return CommandResult.newOKCommandResult(selectedElements);
-				} else {
-					resultAdapter.setObject(selectedElements.get(0));
-					return CommandResult.newOKCommandResult(selectedElements.get(0));
-				}
-			} else {
-				resultAdapter.setObject(result);
-			}
-		}
-		return cmdResult;
-	}
-
-	/**
-	 * Gets the selectElementDialog.
-	 * 
-	 * @return Returns the selectElementDialog.
-	 */
-	protected AbstractSelectElementDialog getSelectElementDialog() {
-		return selectElementDialog;
-	}
-
-	/**
-	 * Sets the selectElementDialog.
-	 * 
-	 * @param dialog
-	 *            The dialog to set.
-	 */
-	public void setSelectElementDialog(AbstractSelectElementDialog dialog) {
-		this.selectElementDialog = dialog;
-	}
-
-	/**
-	 * Gets the resultAdapter.
-	 * 
-	 * @return Returns the resultAdapter.
-	 */
-	public ObjectAdapter getResultAdapter() {
-		return resultAdapter;
-	}
-
-	/**
-	 * Gets the label provider that is to be used to display each item in the
-	 * popup menu.
-	 * 
-	 * @return the label provider
-	 */
-	protected ILabelProvider getLabelProvider() {
-		return new LabelProvider();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateViewAndOptionallyElementCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateViewAndOptionallyElementCommand.java
deleted file mode 100644
index fb3e121..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateViewAndOptionallyElementCommand.java
+++ /dev/null
@@ -1,406 +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.commands;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.ListIterator;
-
-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.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-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.common.core.util.ObjectAdapter;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-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.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-
-/**
- * A command used to optionally create a new view and new element. This command
- * is used when it is not known at command creation time whether or not an
- * element should be created as well. For example, when creating a connection to
- * an unspecified target, did the user want to
- * <li>create a new element for the target (view and element)?</li>
- * <li>use an existing element and its view already on the diagram (nothing
- * created)?</li>
- * <li>use an existing element and add a new view to the diagram (view only)?
- * 
- * <p>
- * Note: This command will pop up a dialog box if the element exists already and
- * there is a view for it on the diagram to ask the user what they want to do.
- * </p>
- * 
- * @author cmahoney
- */
-public class CreateViewAndOptionallyElementCommand
-	extends AbstractCommand {
-
-	/**
-	 * Adapts to the element, if null at command execution time, an element is
-	 * to be created.
-	 */
-	private IAdaptable elementAdapter;
-
-	/** The location to create the new view. */
-	private Point location;
-
-	/** The container editpart to send the view request to. */
-	private IGraphicalEditPart containerEP;
-
-	/** The command executed, saved for undo/redo. */
-	private Command command = null;
-
-	/** The result to be returned from which the new view can be retrieved. */
-	private ObjectAdapter resultAdapter = new ObjectAdapter();
-	
-	/**
-	 * 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;
-
-	/**
-	 * Creates a new <code>CreateViewAndOptionallyElementCommand</code>.
-	 * 
-	 * @param elementAdapter
-	 *            Adapts to the element, if null at command execution time, an
-	 *            element is to be created.
-	 * @param containerEP
-	 *            The container edit part, where the view request is sent.
-	 * @param location
-	 *            The location to create the new view. If null, a default
-	 *            location is used
-	 * @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 CreateViewAndOptionallyElementCommand(IAdaptable elementAdapter,
-		IGraphicalEditPart containerEP, Point location, PreferencesHint preferencesHint) {
-		super(DiagramUIMessages.CreateCommand_Label, null);
-
-		setElementAdapter(elementAdapter);
-		setContainerEP(containerEP);
-		if (location != null) {
-			setLocation(location);
-		} else {
-			setLocation(getContainerEP().getFigure().getBounds().getTopRight()
-				.translate(100, 100));
-		}
-		setPreferencesHint(preferencesHint);
-	}
-
-    public List getAffectedFiles() {
-		if (containerEP != null) {
-			View view = (View)containerEP.getModel();
-			if (view != null) {
-				IFile f = WorkspaceSynchronizer.getFile(view.eResource());
-				return f != null ? Collections.singletonList(f) : Collections.EMPTY_LIST;
-			}
-		}
-
-        return super.getAffectedFiles();
-	}
-	
-	/**
-	 * Searches the container editpart to see if the element passed in already
-	 * has a view.
-	 * 
-	 * @param element
-	 * @return IView the view if found; or null
-	 */
-    protected View getExistingView(EObject element) {
-        IGraphicalEditPart theTarget = (IGraphicalEditPart) findChildEditPart(
-            getContainerEP(), element);
-        if (theTarget != null)
-            return (View) theTarget.getModel();
-        return null;
-    }
-
-    /**
-     * Returns an immediate child editpart of the editpart passed in whose
-     * element is the same as the element passed in if it exists; returns null
-     * if such an editpart does not exist.
-     * 
-     * @param editpart
-     *            the parent editpart
-     * @param theElement
-     *            the element to match
-     * @return an immediate child editpart of the editpart passed in whose
-     *         element is the same as the element passed in if it exists; null
-     *         otherwise
-     */
-    private EditPart findChildEditPart(EditPart editpart, EObject theElement) {
-        if (theElement == null) {
-            return null;
-        }
-
-        ListIterator childLI = editpart.getChildren().listIterator();
-        while (childLI.hasNext()) {
-            EditPart epChild = (EditPart) childLI.next();
-            Object model = epChild.getModel();
-
-            if (model instanceof View) {
-                EObject el = ((View) model).getElement();
-
-                if ((el != null) && el.equals(theElement)) {
-                    return epChild;
-                }
-            }
-        }
-        return null;
-    }
-
-	/**
-     * Prompts the user to see if they would like to use an existing view on the
-     * diagram. Clients may subclass this method to customize the message
-     * dialog.
-     * 
-     * @param view
-     *            the existing view
-     * @return true if this view should be used; false otherwise
-     */
-    protected boolean useExistingView(View view) {
-        MessageBox messageBox = new MessageBox(Display.getCurrent()
-            .getActiveShell(), SWT.YES | SWT.NO);
-        messageBox
-            .setText(DiagramUIMessages.CreateViewAndOptionallyElementCommand_ViewExists_Title);
-        messageBox
-            .setMessage(NLS
-                .bind(
-                    DiagramUIMessages.CreateViewAndOptionallyElementCommand_ViewExists_Message,
-                    EMFCoreUtil.getName(view.getElement())));
-        return messageBox.open() == SWT.YES;
-    }
-	
-	/**
-	 * <li>If the element adapter is empty, this command creates a new element
-	 * and view for it.</li>
-	 * <li>If the element adapter is not empty, and a view for this element
-	 * exists in the container, this command will prompt the user to see if they
-	 * want to use the existing view or create a new view for the element and
-	 * then execute accordingly.</li>
-	 * <li>If the element adapter is not empty, and a view for this element
-	 * does not exist in the container, this command will create a new element
-	 * and view.</li>
-	 * 
-	 */
-    protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		CreateViewRequest createRequest;
-
-		// Create the element first, if one does not exist.
-		EObject element = (EObject) getElementAdapter().getAdapter(
-			EObject.class);
-		if (element == null) {
-			IElementType type = (IElementType) getElementAdapter()
-				.getAdapter(IElementType.class);
-			if (type == null) {
-				return CommandResult.newErrorCommandResult(getLabel());
-			}
-			createRequest = CreateViewRequestFactory
-				.getCreateShapeRequest(type, getPreferencesHint());
-		} else {
-			createRequest = new CreateViewRequest(
-				new CreateViewRequest.ViewDescriptor(
-					new EObjectAdapter(element), getPreferencesHint()));
-		}
-		createRequest.setLocation(getLocation());
-
-		if (createRequest != null) {
-			IGraphicalEditPart target = (IGraphicalEditPart) getContainerEP().getTargetEditPart(createRequest);
-			if ( target != null ) {
-				Command theCmd = target.getCommand(createRequest);
-				setCommand(theCmd);
-
-				View theExistingView = getExistingView(element);            
-                
-                if (theExistingView != null && useExistingView(theExistingView)) {
-                    setResult(new EObjectAdapter(theExistingView));
-                    return CommandResult.newOKCommandResult(getResult());
-                }
-				// Fall-thru and create a new view
-				if (getCommand().canExecute()) {
-					ICommand cmd = DiagramCommandStack.getICommand(getCommand());
-					cmd.execute(progressMonitor, info);					
-					if (progressMonitor.isCanceled()) {
-						return CommandResult.newCancelledCommandResult();
-					}else if (!(cmd.getCommandResult().getStatus().isOK())){
-						return cmd.getCommandResult();
-					}				
-					Object obj = ((List) createRequest.getNewObject()).get(0);										
-					setResult((IAdaptable) obj);
-					return CommandResult.newOKCommandResult(getResult());
-				}
-			}
-		}
-		containerEP = null;// to allow garbage collection
-		return CommandResult.newErrorCommandResult(getLabel());
-	}
-
-    public boolean canUndo() {
-		return getCommand() != null && getCommand().canUndo();
-	}
-
-    public boolean canRedo() {
-		return CommandUtilities.canRedo(command);
-	}
-
-    
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		if (getCommand() != null) {
-			getCommand().redo();
-		}
-        return CommandResult.newOKCommandResult();
-	}
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		if (getCommand() != null) {
-			getCommand().undo();
-		}
-        return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @return the adapter from which the view can be retrieved.
-	 */
-	public IAdaptable getResult() {
-		return resultAdapter;
-	}
-
-	/**
-	 * Sets the result to adapt to the view passed in.
-	 * @param viewAdapter
-	 */
-	protected void setResult(IAdaptable viewAdapter) {
-		View view = (View) viewAdapter.getAdapter(View.class);
-		resultAdapter.setObject(view);
-	}
-
-	/**
-	 * Gets the elementAdapter.
-	 * @return Returns the elementAdapter.
-	 */
-	protected IAdaptable getElementAdapter() {
-		return elementAdapter;
-	}
-
-	/**
-	 * Sets the elementAdapter.
-	 * @param elementAdapter The elementAdapter to set.
-	 */
-	protected void setElementAdapter(IAdaptable elementAdapter) {
-		this.elementAdapter = elementAdapter;
-	}
-
-	/**
-	 * Gets the location.
-	 * @return Returns the location.
-	 */
-	protected Point getLocation() {
-		return location;
-	}
-
-	/**
-	 * Sets the location.
-	 * @param location The location to set.
-	 */
-	protected void setLocation(Point location) {
-		this.location = location;
-	}
-
-	/**
-	 * Gets the containerEP.
-	 * @return Returns the containerEP.
-	 */
-	protected IGraphicalEditPart getContainerEP() {
-		return containerEP;
-	}
-
-	/**
-	 * Sets the containerEP.
-	 * @param containerEP The containerEP to set.
-	 */
-	protected void setContainerEP(IGraphicalEditPart containerEP) {
-		this.containerEP = containerEP;
-	}
-
-	/**
-	 * 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;
-	}
-	
-	/**
-	 * Sets 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>.
-	 * 
-	 * @param preferencesHint the preferences hint
-	 */
-	protected void setPreferencesHint(PreferencesHint preferencesHint) {
-		this.preferencesHint = preferencesHint;
-	}
-
-	/**
-	 * Gets the command.
-	 * @return Returns the command.
-	 */
-	protected Command getCommand() {
-		return command;
-	}
-
-	/**
-	 * Sets the command.
-	 * @param command The command to set.
-	 */
-	protected void setCommand(Command command) {
-		this.command = command;
-	}
-	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewAndElementCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewAndElementCommand.java
deleted file mode 100644
index 14679c5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewAndElementCommand.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 164513
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.commands;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.common.core.command.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.SuppressibleUIRequest;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * a command to create the both of the View and Semantic of the connection, but
- * the editparts of target and source to obtain the command has not been created
- * yet, since we have the ViewAdapter to we can use it to get its editpart once
- * it is created and hence on execution time we can get its editpart to get the
- * command for our request and then execute it.
- * 
- * <p>
- * This command can handle both
- * <code>CreateConnectionViewAndElementRequest</code> and
- * <code>CreateConnectionViewRequest</code>.
- * </p>
- * 
- * @author choang
- */
-public class DeferredCreateConnectionViewAndElementCommand
-	extends AbstractCommand {
-
-	CreateRequest request = null;
-
-	IAdaptable typeInfoAdapter = null;
-
-	IAdaptable sourceViewAdapter = null;
-
-	IAdaptable targetViewAdapter = null;
-
-	Command command = null;
-
-	EditPartViewer viewer = null;
-
-	private DeferredCreateConnectionViewAndElementCommand(
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			EditPartViewer currentViewer) {
-
-		super(DiagramUIMessages.Commands_CreateCommand_Connection_Label, null);
-		Assert.isNotNull(currentViewer, "currentViewer is null"); //$NON-NLS-1$
-		this.sourceViewAdapter = sourceViewAdapter;
-		this.targetViewAdapter = targetViewAdapter;
-		this.viewer = currentViewer;
-	}
-
-	/**
-	 * Constructor for DeferredCreateConnectionViewAndElementCommand.
-	 * 
-	 * @param request
-	 *            the ceate connection request
-	 * @param sourceViewAdapter
-	 *            will adapt to the source view at execution time
-	 * @param targetViewAdapter
-	 *            will adapt to the target view at execution time
-	 * @param currentViewer
-	 *            used to find the editparts for the views
-	 */
-	public DeferredCreateConnectionViewAndElementCommand(
-			CreateConnectionViewAndElementRequest request,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			EditPartViewer currentViewer) {
-		this(sourceViewAdapter, targetViewAdapter, currentViewer);
-		this.request = request;
-	}
-
-	/**
-	 * Constructor for DeferredCreateConnectionViewAndElementCommand.
-	 * 
-	 * @param type
-	 *            the type to be used in a new
-	 *            <code>CreateConnectionViewAndElementRequest</code>
-	 * @param sourceViewAdapter
-	 *            will adapt to the source view at execution time
-	 * @param targetViewAdapter
-	 *            will adapt to the target view at execution time
-	 * @param currentViewer
-	 *            used to find the editparts for the views
-	 */
-	public DeferredCreateConnectionViewAndElementCommand(IElementType type,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			EditPartViewer currentViewer, PreferencesHint preferencesHint) {
-		this(new CreateConnectionViewAndElementRequest(type, preferencesHint),
-			sourceViewAdapter, targetViewAdapter, currentViewer);
-	}
-
-	/**
-	 * Constructor for DeferredCreateConnectionViewAndElementCommand.
-	 * 
-	 * @param request
-	 *            the create connection request
-	 * @param typeInfoAdapter
-	 *            extracts the type to be used in a new
-	 *            <code>CreateConnectionViewAndElementRequest</code> at
-	 *            execution time
-	 * @param sourceViewAdapter
-	 *            will adapt to the source view at execution time
-	 * @param targetViewAdapter
-	 *            will adapt to the target view at execution time
-	 * @param currentViewer
-	 *            used to find the editparts for the views
-	 */
-	public DeferredCreateConnectionViewAndElementCommand(CreateRequest request,
-			IAdaptable typeInfoAdapter, IAdaptable sourceViewAdapter,
-			IAdaptable targetViewAdapter, EditPartViewer currentViewer) {
-		this(sourceViewAdapter, targetViewAdapter, currentViewer);
-		this.request = request;
-		this.typeInfoAdapter = typeInfoAdapter;
-	}
-
-    public List getAffectedFiles() {
-		if (viewer != null) {
-			EditPart editpart = viewer.getRootEditPart().getContents();
-			if (editpart instanceof IGraphicalEditPart) {
-				View view = (View) editpart.getModel();
-				if (view != null) {
-					IFile f = WorkspaceSynchronizer.getFile(view.eResource());
-					return f != null ? Collections.singletonList(f)
-						: Collections.EMPTY_LIST;
-				}
-			}
-		}
-        return super.getAffectedFiles();
-	}
-
-	public boolean canUndo() {
-		return command != null && command.canUndo();
-	}
-
-	public boolean canRedo() {
-		return CommandUtilities.canRedo(command);
-	}
-
-	/**
-	 * gives access to the connection source edit part, which is the edit part
-	 * of the connection's source <code>View</code>
-	 * 
-	 * @return the source edit part
-	 */
-	protected EditPart getSourceEditPart() {
-		return (IGraphicalEditPart) viewer.getEditPartRegistry().get(
-			sourceViewAdapter.getAdapter(View.class));
-	}
-
-	/**
-	 * gives access to the connection target edit part, which is the edit part
-	 * of the connection's target <code>View</code>
-	 * 
-	 * @return the source edit part
-	 */
-	protected EditPart getTargetEditPart() {
-		return (IGraphicalEditPart) viewer.getEditPartRegistry().get(
-			targetViewAdapter.getAdapter(View.class));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#canExecute()
-	 */
-	public boolean canExecute() {
-		if (!(request instanceof CreateConnectionViewRequest) && !(request instanceof CreateUnspecifiedTypeConnectionRequest))
-			return false;
-		if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-			if (typeInfoAdapter == null)
-				return false;
-			final IElementType typeInfo = (IElementType) typeInfoAdapter.getAdapter(IElementType.class);
-			if (typeInfo != null) {
-				 if (((CreateUnspecifiedTypeConnectionRequest) request).getRequestForType(typeInfo) == null)
-					 return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Finds the source and target editparts by extracting the views from the
-	 * view adapters and searching in the editpart viewer. Creates a connection
-	 * view and element using the request.
-	 * 
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-    
-		CreateConnectionViewRequest req = null;
-		if (request != null) {
-			if (request instanceof CreateConnectionViewRequest) {
-				req = (CreateConnectionViewRequest) request;
-			}
-		} else {
-			return CommandResult.newErrorCommandResult(getLabel());
-		}
-		if (typeInfoAdapter != null) {
-			IElementType typeInfo = (IElementType) typeInfoAdapter
-				.getAdapter(IElementType.class);
-			if (typeInfo == null) {
-				return CommandResult.newErrorCommandResult(getLabel());
-			}
-
-			if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-				req = ((CreateConnectionViewRequest) ((CreateUnspecifiedTypeConnectionRequest) request)
-					.getRequestForType(typeInfo));
-			}
-		}
-
-		req.setLocation(null);
-
-		// Suppressing UI if the target edit part has not been created yet
-		// this is so that if we are creating a new target the connection
-		// creation will just take default data instead of prompting
-		// For Defect RATLC00524293
-		if (targetViewAdapter.getAdapter(IGraphicalEditPart.class) == null
-			&& req instanceof SuppressibleUIRequest)
-			((SuppressibleUIRequest) req).setSuppressibleUI(true);
-
-		EditPart sourceEP = getSourceEditPart();
-
-		EditPart targetEP = getTargetEditPart();
-
-		// There are situations where src or target can be null and we must
-		// check for these
-		// ie. When a Select Existing Dialog is presnetd to the user and the
-		// user presses
-		// cancel either the src or target can be null.
-		// So the following assertions have been replaced with a check for null
-		// on the editparts.
-		// old code ... Assert.isNotNull(sourceEP); Assert.isNotNull(targetEP);
-		if ((sourceEP == null) || (targetEP == null))
-			return null;
-
-		if (req instanceof CreateConnectionViewAndElementRequest) {
-			command = CreateConnectionViewAndElementRequest.getCreateCommand(
-				req, sourceEP, targetEP);
-		} else {
-			command = CreateConnectionViewRequest.getCreateCommand(req,
-				sourceEP, targetEP);
-		}
-
-		if (command != null && command.canExecute()) {
-			command.execute();
-		}
-		viewer = null;// for garbage collection
-
-		View view = (View) req.getConnectionViewDescriptor().getAdapter(
-			View.class);
-		if (null == view) {
-			return CommandResult.newCancelledCommandResult();
-		}
-		return CommandResult.newOKCommandResult(req.getNewObject());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.command.ICommand#getLabel()
-	 */
-	public String getLabel() {
-		if (command != null) {
-			return command.getLabel();
-		}
-		return null;
-	}
-
-    
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
- 
-		if (command != null) {
-			command.redo();
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		if (command != null) {
-			command.undo();
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewCommand.java
deleted file mode 100644
index b192c2f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewCommand.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-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.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command is used to create a connection view between two editparts, when
- * only the view adapters are available at the time of creating the command. The
- * editparts are required to get the correct create connection command, so this
- * command defers getting the create connection command until execution time at
- * which point it can get the editparts from the editpart registry and the view
- * adapters.
- * 
- * @author cmahoney
- */
-public class DeferredCreateConnectionViewCommand
-	extends AbstractTransactionalCommand {
-
-	/** the element for the connection's semantic element */
-	protected EObject element = null;
-
-	/** the connection's semantic hint */
-	protected String semanticHint = null;
-
-	/** the source adapter from which a View can be retrieved */
-	protected IAdaptable sourceViewAdapter;
-
-	/**
-	 * the target adapter from which a View can be retrieved
-	 */
-	protected IAdaptable targetViewAdapter;
-
-	/** the graphical viewer used to get the editpart registry */
-	protected EditPartViewer viewer;
-
-	/** the command saved for undo and redo */
-	private Command createConnectionCmd;
-
-	/**
-	 * 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}.
-	 */
-	protected PreferencesHint preferencesHint;
-
-	/**
-	 * Constructor for <code>DeferredCreateConnectionViewCommand</code>.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param element
-	 *            the connection's semantic element
-	 * @param sourceViewAdapter
-	 *            adapter from which the source view can be retrieved
-	 * @param targetViewAdapter
-	 *            adapter from which the target view can be retrieved
-	 * @param viewer
-	 *            the viewer used to get the editpart registry
-	 */
-	public DeferredCreateConnectionViewCommand(TransactionalEditingDomain editingDomain, EObject element,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			EditPartViewer viewer, PreferencesHint preferencesHint) {
-
-		super(editingDomain,
-            "Deferred Create Connection View Command", null); //$NON-NLS-1$
-		this.element = element;
-		this.sourceViewAdapter = sourceViewAdapter;
-		this.targetViewAdapter = targetViewAdapter;
-		this.viewer = viewer;
-		this.preferencesHint = preferencesHint;
-	}
-
-	/**
-	 * Constructor for <code>DeferredCreateConnectionViewCommand</code>.
-	 * Passing in the semanticHint allows for the creation of a connection view
-	 * without a semantic element.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param semanticHint
-	 *            the connection's semantic hint
-	 * @param sourceViewAdapter
-	 *            adapter from which the source view can be retrieved
-	 * @param targetViewAdapter
-	 *            adapter from which the target view can be retrieved
-	 * @param viewer
-	 *            the viewer used to get the editpart registry
-	 */
-	public DeferredCreateConnectionViewCommand(TransactionalEditingDomain editingDomain, String semanticHint,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			EditPartViewer viewer, PreferencesHint preferencesHint) {
-
-		super(editingDomain,
-            "Deferred Create Connection View Command", null); //$NON-NLS-1$
-		this.semanticHint = semanticHint;
-		this.sourceViewAdapter = sourceViewAdapter;
-		this.targetViewAdapter = targetViewAdapter;
-		this.viewer = viewer;
-		this.preferencesHint = preferencesHint;
-	}
-
-	public List getAffectedFiles() {
-		if (viewer != null) {
-			EditPart editpart = viewer.getRootEditPart().getContents();
-			if (editpart instanceof IGraphicalEditPart) {
-				View view = (View) ((IGraphicalEditPart) editpart).getModel();
-				if (view != null) {
-					IFile f = WorkspaceSynchronizer.getFile(view.eResource());
-					return f != null ? Collections.singletonList(f)
-						: Collections.EMPTY_LIST;
-				}
-			}
-		}
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * Finds the source and target editparts by extracting the views from the
-	 * view adapaters and searching in the editpart viewer. Creates a connection
-	 * view between the source and target.
-	 * 
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-		Map epRegistry = viewer.getEditPartRegistry();
-		IGraphicalEditPart sourceEP = (IGraphicalEditPart) epRegistry
-			.get(sourceViewAdapter.getAdapter(View.class));
-		IGraphicalEditPart targetEP = (IGraphicalEditPart) epRegistry
-			.get(targetViewAdapter.getAdapter(View.class));
-
-		// If these are null, then the diagram's editparts may not
-		// have been refreshed yet.
-		Assert.isNotNull(sourceEP);
-		Assert.isNotNull(targetEP);
-
-		// If an element exists, create the view using the given
-		// semantic element.
-		// Else if no semantic element is provided
-		// , use the String semanticHint to create a view
-		if (element != null) {
-			createConnectionCmd = CreateConnectionViewRequest.getCreateCommand(
-				this.element, sourceEP, targetEP, preferencesHint);
-		} else {
-			ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(
-				null, this.semanticHint, preferencesHint);
-			CreateConnectionViewRequest createRequest = new CreateConnectionViewRequest(
-				viewDescriptor);
-			createConnectionCmd = CreateConnectionViewRequest.getCreateCommand(
-				createRequest, sourceEP, targetEP);
-		}
-
-		if (createConnectionCmd.canExecute()) {
-			createConnectionCmd.execute();
-		}
-		viewer = null;// for garbage collection
-		return CommandResult.newOKCommandResult();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredLayoutCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredLayoutCommand.java
deleted file mode 100644
index c85ce95..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredLayoutCommand.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Nicolas Rouquette (NASA) - Fix for Bug 260812. 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.commands;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.core.runtime.IStatus;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command is used to arrange editparts on a diagram, when only the view
- * adapters are available at the time of creating the command. It is necessary
- * to have the editparts when creating a layout command so this command defers
- * the creation of the layout command until execution time at which point it can
- * get the editparts from the editpart registry using the view adapters.
- * 
- * @author cmahoney
- */
-public class DeferredLayoutCommand
-	extends AbstractTransactionalCommand {
-
-	/** the type of layout to be performed */
-	protected String layoutType;
-
-	/** the IAdaptables from which an View can be retrieved */
-	protected List viewAdapters;
-
-	/** the diagram editpart used to get the editpart registry */
-	protected IGraphicalEditPart containerEP;
-
-	/**
-	 * Constructor for <code>DeferredLayoutCommand</code>.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param viewAdapters
-	 *            the IAdaptables from which an IView can be retrieved
-	 * @param containerEP
-	 *            the container editpart used to get the editpart registry
-	 */
-	public DeferredLayoutCommand(TransactionalEditingDomain editingDomain, List viewAdapters,
-		IGraphicalEditPart containerEP) {
-		this(editingDomain, viewAdapters, containerEP, LayoutType.DEFAULT);
-	}
-
-	/**
-	 * Constructor for <code>DeferredLayoutCommand</code>.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param viewAdapters
-	 *            the IAdaptables from which an IView can be retrieved
-	 * @param containerEP
-	 *            the container editpart used to get the editpart registry
-	 * @param commandLayoutType
-	 *            the type of layout to be performed
-	 */
-	public DeferredLayoutCommand(TransactionalEditingDomain editingDomain, List viewAdapters,
-		IGraphicalEditPart containerEP, String commandLayoutType) {
-
-		super(editingDomain,
-            DiagramUIMessages.Command_Deferred_Layout, null);
-		if (commandLayoutType != null) {
-			this.layoutType = commandLayoutType;
-		} else {
-			this.layoutType = LayoutType.DEFAULT;
-		}
-		this.viewAdapters = viewAdapters;
-		this.containerEP = containerEP;
-	}
-
-	public List getAffectedFiles() {
-		if (containerEP != null) {
-			View view = (View)containerEP.getModel();
-			if (view != null) {
-				IFile f = WorkspaceSynchronizer.getFile(view.eResource());
-				return f != null ? Collections.singletonList(f)
-					: Collections.EMPTY_LIST;
-			}
-		}
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * Executes a layout command with all the editparts for the view adapters.
-	 * 
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		RunnableWithResult refreshRunnable = new RunnableWithResult() {
-			
-			private IStatus status;
-            private Object result;
-
-            public Object getResult() {
-                return result;
-            }
-
-            public void setStatus(IStatus status) {
-                this.status = status;
-            }
-
-            public IStatus getStatus() {
-                return status;
-            }
-            
-			public void run() {
-				containerEP.refresh();
-				
-				// The layout command requires that the figure world is updated.
-				getContainerFigure().invalidate();
-				getContainerFigure().validate();
-
-				List editParts = new ArrayList(viewAdapters.size());
-				Map epRegistry = containerEP.getRoot().getViewer()
-					.getEditPartRegistry();
-				for (Iterator iter = viewAdapters.iterator(); iter.hasNext();) {
-					IAdaptable ad = (IAdaptable) iter.next();
-					View view = (View) ad.getAdapter(View.class);
-					Object ep = epRegistry.get(view);
-					if (ep != null) {
-						editParts.add(ep);
-					}
-				}
-
-				if (editParts.isEmpty()) {
-					result = editParts;
-					return;
-				}
-
-				Set layoutSet = new HashSet(editParts.size());
-				layoutSet.addAll(editParts);
-				
-				// refresh source and target connections of any shapes in the container not being considered for layout
-				Iterator iter = containerEP.getChildren().iterator();
-				while (iter.hasNext()) {
-					Object obj = iter.next();
-					if (!layoutSet.contains(obj) && obj instanceof IGraphicalEditPart) {
-						IGraphicalEditPart ep = (IGraphicalEditPart)obj;
-						ep.refresh();
-					}
-				}
-				
-				result = editParts;
-			}
-		};
-		
-		EditPartUtil.synchronizeRunnableToMainThread(containerEP, refreshRunnable);
-		List editParts = (List)refreshRunnable.getResult();
-		if (editParts == null || editParts.isEmpty()) {
-			return CommandResult.newOKCommandResult();
-		}
-		
-		//	add an arrange command, to layout the related shapes
-		ArrangeRequest request = new ArrangeRequest(
-			ActionIds.ACTION_ARRANGE_SELECTION, layoutType);
-		request.setPartsToArrange(editParts);
-		Command layoutCmd = containerEP.getCommand(request);
-
-		if (layoutCmd != null && layoutCmd.canExecute()) {
-            ICommand optimizedCommand = optimizeCommand(layoutCmd);
-			optimizedCommand.execute(progressMonitor, info);
-            optimizedCommand = null;
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-    private ICommand optimizeCommand(Command command) {
-        if (command instanceof ICommandProxy) {
-            ICommand icmd = ((ICommandProxy)command).getICommand();
-            return icmd; 
-        } else {
-            if(command instanceof CompoundCommand) {
-                CompositeTransactionalCommand transactionalCommand = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel());
-                transactionalCommand.setTransactionNestingEnabled(false);
-                
-                CompoundCommand compound = (CompoundCommand)command;
-                Iterator commandIter = compound.getCommands().iterator();
-                while(commandIter.hasNext()) {
-                    Command iteredCommand = (Command)commandIter.next();
-                    ICommand iteredICommand = optimizeCommand(iteredCommand);
-                    transactionalCommand.compose(iteredICommand);
-                }
-                return transactionalCommand;
-            }
-            if (null != command)
-            	return new CommandProxy(command);
-            else 
-            	return null;
-        }
-    }
-	protected void cleanup() {
-		containerEP = null;//for garbage collection
-		viewAdapters = null;
-		super.cleanup();
-	}
-
-	/**
-	 * gets the container edit part's figure
-	 * @return the container figure
-	 */
-	protected IFigure getContainerFigure() {
-		return containerEP.getFigure();
-	}
-
-	/**
-	 * gets the container edit part
-	 * @return the container edit part
-	 */
-	protected IGraphicalEditPart getContainerEP() {
-		return containerEP;
-	}
-
-	/**
-	 * gets a list of <code>IAdaptable</code> that can adapt to <code>
-	 * View</code>
-	 * @return view adapters
-	 */
-	protected List getViewAdapters() {
-		return viewAdapters;
-	}
-
-	@Override
-	public boolean canExecute() {
-		return super.canExecute() && containerEP != null;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ICommandProxy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ICommandProxy.java
deleted file mode 100644
index d50b4ce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/ICommandProxy.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.NullProgressMonitor;
-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.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-
-/**
- * A Command Wrapper for a GMF ICommand.
- *
- * @author melaasar
- */
-public class ICommandProxy extends Command {
-
-	/** The wrapped command */
-	private ICommand iCommand;
-		
-	/**
-	 * Constructor
-	 * @param iCommand the command to wrap
-	 */
-	public ICommandProxy(ICommand iCommand) {
-		super(iCommand.getLabel());
-		Assert.isNotNull(iCommand);
-		this.iCommand = iCommand;
-	}
-
-	public void dispose() {
-        super.dispose();
-        iCommand.dispose();
-    }
-
-    /**
-	 * gets the warapped <code>ICommand</code>
-	 * @return the wrapped command
-	 */
-	public ICommand getICommand() {
-		return iCommand;
-	}
-	
-	public boolean canExecute() {
-		return getICommand().canExecute();
-	}
-
-	public boolean canUndo() {
-		return getICommand().canUndo();
-	}
-
-	public void execute() {
-        try {
-            getICommand().execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "execute", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.COMMAND_FAILURE, e.getLocalizedMessage(),
-                e);
-        }
-	}
-
-	public void redo() {
-        try {
-            getICommand().redo(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "redo", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.COMMAND_FAILURE, e.getLocalizedMessage(),
-                e);
-        }
-	}
-    
-	public void undo() {
-        try {
-            getICommand().undo(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "undo", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.COMMAND_FAILURE, e.getLocalizedMessage(),
-                e);
-        }
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/OpenDiagramCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/OpenDiagramCommand.java
deleted file mode 100644
index 4f6dfee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/OpenDiagramCommand.java
+++ /dev/null
@@ -1,153 +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.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.util.TransactionUtil;
-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.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorInput;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditorInput;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * Command to open a diagram.
- * 
- * @author jcorchis
- */
-
-public class OpenDiagramCommand extends AbstractCommand {
-
-	/** Remember the element to be opened. */
-	private EObject _element = null;
-
-	/**
-	 * Create an instance.
-	 * @param label command label
-	 * @param element to be opened.
-	 */
-	public OpenDiagramCommand( String label, EObject element ) {
-		super(label, null);
-		setElement( element );
-	}
-	
-	/**
-	 * returns the element associated with that command
-	 * @return the element associated with that command
-	 */
-	protected EObject getElement() {
-		return _element;
-	}
-	
-	
-	/**
-	 * set the element to open
-	 * @param element the element to open 
-	 */
-	protected void setElement( EObject element ) {
-		_element = element;
-	}
-	
-	/**
-	 * Create an instance.
-	 * @param element to be opened.
-	 */
-	public OpenDiagramCommand( EObject element ) {
-		this(DiagramUIMessages.Command_openDiagram, element);
-	}
-	
-	/**
-	 * This command can only be executed if the element is a diagram.
-	 * @see org.eclipse.gmf.runtime.common.core.command.ICommand#isExecutable()
-	*/
-    public boolean canExecute() {
-		return getElement() instanceof Diagram;
-	}
-
-	/**
-	 * Create a new editor to display the corresponding diagram.
-	 * <p>
-	 * @see org.eclipse.gmf.runtime.common.core.sandbox.AbstractCommand2#doExecute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-
-    protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-        
-		try {
-			TransactionUtil.getEditingDomain(getElement()).runExclusive(new Runnable() {
-				public void run() {
-					Diagram diagram = null;
-					// Obtain the associated diagram if one exists.
-					if (getElement() instanceof Diagram) {
-						diagram = (Diagram) getElement();
-					}
-					// If a diagram element exists, open it in its own editor.
-					if (diagram != null) {
-						IDiagramEditorInput diagramInput = new DiagramEditorInput(diagram);
-						IEditorPart editor = null;
-						editor = EditorService.getInstance().openEditor(diagramInput);
-						if (editor == null) {
-							throw new UnsupportedOperationException();
-						}
-					}					
-				}
-			});
-		} catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"doExecute()", //$NON-NLS-1$
-					e);
-			return new CommandResult(
-					new Status(
-						IStatus.ERROR,
-						DiagramUIPlugin.getPluginId(),
-						DiagramUIStatusCodes.COMMAND_FAILURE,
-						e.getMessage(),
-						e));
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-    
-    public boolean canUndo() {
-		return false;
-	}
-
-    public boolean canRedo() {
-		return false;
-	}
-
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        return null;
-}
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java
deleted file mode 100644
index b146d69..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.gmf.runtime.notation.Bendpoints;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Size;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
-
-/**
- * Paste Command for the views
- * 
- * @author Vishy Ramaswamy
- */
-public class PasteCommand extends ClipboardCommand {
-    /**
-     * The clipboard data
-     */
-    private final ICustomData[] data; 
-    
-    private IMapMode mm;
-
-    /**
-     * Constructor for PasteCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label
-     * @param viewContext
-     * @param data
-     * @param mm
-	 * 			the <code>IMapMode</code> that is used to convert the layout constraint
-	 * 			and calculate the offset in logical coordinates
-     */
-    public PasteCommand(TransactionalEditingDomain editingDomain, 
-        String label,
-        View viewContext,
-        ICustomData[] data, IMapMode mm) {
-        super(editingDomain, label, viewContext);
-
-        Assert.isNotNull(data);
-        this.data = data;
-        this.mm = mm;
-    }
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-	    /* Paste on the target */
-	    if (data != null && data.length > 0) {
-	        List allViews = new ArrayList();
-	    	for (int j = 0; j < data.length; j++) {
-	            /* Get the string from the clipboard data */
-	            String xml = new String(data[j].getData());
-	
-	            /* Paste the xml on to the target view's diagram */
-	            List views = pasteFromString(getViewContext(),xml);
-	            allViews.addAll(views);
-	        }
-	        return CommandResult.newOKCommandResult(allViews);
-	    }
-	    return CommandResult.newOKCommandResult();
-	}
-	
-	/**
-     * Method pasteFromString.
-     * pastes the clipboard contents on to self
-     * @param clipboard The clipboard contents - serialization used during copy
-     * @return List The list of IView resulting from the paste
-     */
-	 protected List pasteFromString(View view, String clipboard) {
-	    ArrayList retval = new ArrayList();
-	    Iterator pastedElements = ClipboardUtil.pasteElementsFromString(clipboard, view, null, null).iterator();
-	    
-	    // get the measurement unit
-	    MeasurementUnit mu = MeasurementUnit.HIMETRIC_LITERAL;
-	    
-	    while( pastedElements.hasNext() ) {
-            Object element = pastedElements.next();
-            if (element instanceof View) {
-	            retval.add(element);
-	        }
-            else if (element instanceof EAnnotation) {
-            	EAnnotation measureUnitAnnotation  = (EAnnotation)element;
-        		String unitName = measureUnitAnnotation.getSource();
-        		mu = MeasurementUnit.get(unitName);
-                view.getEAnnotations().remove(element);
-            }
-        }
-	    
-        /* Set the new bounds for the pasted IShapeView views */
-	    Set edges = convertNodesConstraint(retval, mu, true);
-        // now go through all associated edges and adjust the bendpoints
-        convertEdgeBendpoints(mu, edges);
-        
-        return retval;
-	}
-
-	/**
-	 * @param mu the <code>MeasurementUnit</code> for the notation diagram.
-	 * @param edges the <code>Set</code> of edges to convert the bendpoints of.
-	 */
-	private void convertEdgeBendpoints(MeasurementUnit mu, Set edges) {
-		for (Edge nextEdge : (Set<Edge>) edges) {
-        	Bendpoints bendpoints = nextEdge.getBendpoints();
-        	
-        	if (bendpoints instanceof RelativeBendpoints) {
-    			RelativeBendpoints relBendpoints = (RelativeBendpoints)bendpoints;
-        		List points = relBendpoints.getPoints();
-        		List newpoints = new ArrayList(points.size());
-        		ListIterator li = points.listIterator();
-        		
-        		IMapMode viewMapMode = MeasurementUnitHelper.getMapMode(mu);
-        		
-        		while (li.hasNext()) {
-        			RelativeBendpoint rb = (RelativeBendpoint)li.next();
-        			
-        			Dimension source = new Dimension(rb.getSourceX(), rb.getSourceY());
-        			Dimension target = new Dimension(rb.getTargetX(), rb.getTargetY());
-        			if (!viewMapMode.equals(mm)) {
-        				source = (Dimension)viewMapMode.LPtoDP(source);
-        				source = (Dimension)mm.DPtoLP(source);
-        				
-        				target = (Dimension)viewMapMode.LPtoDP(target);
-        				target = (Dimension)mm.DPtoLP(target);
-        			}
-        			
-        			newpoints.add(new RelativeBendpoint(source.width, source.height, 
-        							target.width, target.height));
-        		}
-        		
-        		relBendpoints.setPoints(newpoints);
-        	}
-        	
-        }
-	}
-
-	/**
-	 * @param retval the <code>List</code> of <code>Node</code> objects to convert the constraint of.
-	 * @param mu the <code>MeasurementUnit</code> for the notation diagram.
-	 * @return the <code>Set</code> of <code>Edge</code> views that are attached to the list of nodes 
-	 */
-	private Set convertNodesConstraint(List retval, MeasurementUnit mu, boolean isProcessOffset) {
-		Set edges = new HashSet();
-        for (Iterator i = retval.iterator(); i.hasNext();) {
-            View nextView = (View) i.next();
-            if (nextView instanceof Node) {
-            	Node node = (Node)nextView;
-        		Point loc = new Point(0, 0);
-        		LayoutConstraint lc = node.getLayoutConstraint();
-        		if (lc instanceof Location) {
-        			Location locC = (Location)lc;
-        			loc = new Point(locC.getX(), locC.getY());
-        		}
-        			
-        		Dimension size = new Dimension(0, 0);
-        		if (lc instanceof Size) {
-        			Size sizeC = (Size)lc;
-        			size = new Dimension(sizeC.getWidth(), sizeC.getHeight());
-        		}
-        		
-        		IMapMode viewMapMode = MeasurementUnitHelper.getMapMode(mu);
-        				
-        		if (!viewMapMode.equals(mm)) {
-        			// convert location to native coordinates
-        			loc = (Point)viewMapMode.LPtoDP(loc);
-        			loc = (Point)mm.DPtoLP(loc);
-        			
-        			// convert size to native coordinates
-        			Dimension origSize = new Dimension(size);
-        			size = (Dimension)viewMapMode.LPtoDP(size);
-        			size = (Dimension)mm.DPtoLP(size);
-        			if (origSize.width == -1)
-        				size.width = -1;
-        			if (origSize.height == -1)
-        				size.height = -1;
-        		}
-        		
-        		Rectangle constraintRect = new Rectangle(loc, size);
-        		if ( isProcessOffset ) {
-        			constraintRect = processNodeOffset(node, constraintRect);
-        		}
-        		ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getLocation_X(), Integer.valueOf(constraintRect.x));
-                ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getLocation_Y(), Integer.valueOf(constraintRect.y));
-                ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getSize_Width(), Integer.valueOf(constraintRect.width));
-                ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getSize_Height(), Integer.valueOf(constraintRect.height));
-                
-                edges.addAll(ViewUtil.getTargetConnections(nextView));
-                edges.addAll(ViewUtil.getSourceConnections(nextView));
-                
-                // recursively perform the same operation on children of the node
-                if (node.eIsSet(NotationPackage.eINSTANCE.getView_PersistedChildren())) {
-                	edges.addAll(convertNodesConstraint(node.getPersistedChildren(), mu, false));
-                }
-            }
-        }
-		return edges;
-	}
-
-	/**
-	 * Add offset node position. 
-	 * @param node
-	 * @param constraintRect
-	 * @return
-	 */
-	protected Rectangle processNodeOffset(Node node, Rectangle constraintRect) {
-		return constraintRect.getTranslated(mm.DPtoLP(10), mm.DPtoLP(10));
-	}
-
-
-	/**
-	 * Get map mode associated with this Paste command. 
-	 * @return
-	 */
-	public IMapMode getMapMode() {
-		return mm;
-	}
-	
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PopupMenuCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PopupMenuCommand.java
deleted file mode 100644
index e222515..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PopupMenuCommand.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.runtime.diagram.ui.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.AbstractCommand;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.ui.dialogs.PopupDialog;
-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A command that pops up a <code>PopupMenu</code> or a
- * <code>PopupDialog</code> when it executes. The result from the
- * <code>PopupMenu</code> or <code>PopupDialog</code> is retrieved via
- * <code>getCommandResult().getReturnValue()</code>.
- * 
- * @author cmahoney
- */
-public class PopupMenuCommand
-	extends AbstractCommand {
-	/**
-	 * The popup menu style for this command.
-	 */
-	public static final int POPUP_MENU = 1;
-	
-	/**
-	 * The popup dialog style for this command.
-	 */
-	public static final int POPUP_DIALOG = 2;
-
-	/** The parent shell for this menu. */
-	private Shell parentShell;
-
-	/**
-	 * The popup menu to appear when this command is executed if the popup menu
-	 * is not <code>null</code>.
-	 */
-	private PopupMenu popupMenu;
-	
-	/**
-	 * The dialog to appear when this command is executed, if the dialog
-	 * is not <code>null</code>.
-	 */
-	private PopupDialog popupDialog;
-
-	/**
-	 * Creates a new <code>PopupMenuCommand</code>.
-	 * @param label the command label
-	 * @param parentShell the parent shell
-	 */
-	public PopupMenuCommand(String label, Shell parentShell) {
-
-		super(label, null);
-		setParentShell(parentShell);
-	}
-
-	/**
-	 * Creates a new <code>PopupMenuCommand</code>.
-	 * @param label the command label
-	 * @param parentShell the parent shell
-	 * @param popupMenu the popup menu
-	 */
-	public PopupMenuCommand(String label, Shell parentShell, PopupMenu popupMenu) {
-
-		super(label, null);
-		setParentShell(parentShell);
-		setPopupMenu(popupMenu);
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		if (getPopupMenu() != null) {
-			if (getPopupMenu().show(getParentShell()) == false) {
-				// user cancelled gesture
-				progressMonitor.setCanceled(true);
-				return CommandResult.newCancelledCommandResult();
-			}
-			return CommandResult.newOKCommandResult(getPopupMenu().getResult());
-			
-		} else if (getPopupDialog() != null) {
-			if (getPopupDialog().open() == Dialog.CANCEL
-				|| getPopupDialog().getResult() == null
-				|| getPopupDialog().getResult().length <= 0) {
-				
-				// user cancelled dialog
-				progressMonitor.setCanceled(true);
-				return CommandResult.newCancelledCommandResult();
-			}
-			return CommandResult.newOKCommandResult(getPopupDialog().getResult()[0]);
-		}
-		
-		return CommandResult.newOKCommandResult();
-	}
-
-    
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		return CommandResult.newOKCommandResult();
-
-	}
-
-    
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		return CommandResult.newOKCommandResult();
-	}
-
-    public boolean canRedo() {
-		return true;
-	}
-    
-    public boolean canUndo() {
-		return true;
-	}
-
-	/**
-	 * Gets the parentShell.
-	 * @return Returns the parentShell.
-	 */
-	protected Shell getParentShell() {
-		return parentShell;
-	}
-
-	/**
-	 * Sets the parentShell.
-	 * @param parentShell The parentShell to set.
-	 */
-	public void setParentShell(Shell parentShell) {
-		this.parentShell = parentShell;
-	}
-
-	/**
-	 * Gets the popupMenu.
-	 * @return Returns the popupMenu.
-	 */
-	protected PopupMenu getPopupMenu() {
-		return popupMenu;
-	}
-
-	/**
-	 * Sets the popupMenu. Sets the popup dialog to null.
-	 * @param popupMenu The popupMenu to set.
-	 */
-	public void setPopupMenu(PopupMenu popupMenu) {
-		this.popupMenu = popupMenu;
-		this.popupDialog = null;
-	}
-	
-	/**
-	 * Gets the popupDialog.
-	 * @return Returns the popupDialog.
-	 */
-	protected PopupDialog getPopupDialog() {
-		return popupDialog;
-	}
-
-	/**
-	 * Sets the popupDialog. Sets the popup menu to null.
-	 * @param popupDialog The popupDialog to set.
-	 */
-	public void setPopupDialog(PopupDialog popupDialog) {
-		this.popupDialog = popupDialog;
-		this.popupMenu = null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java
deleted file mode 100644
index ecdc86f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java
+++ /dev/null
@@ -1,576 +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.commands;
-
-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.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.util.ObjectAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ElementTypeLabelProvider;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.SelectExistingElementForSourceOperation;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.SelectExistingElementForTargetOperation;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * <p>
- * A command that pops up a menu which can allow the user to select the type of
- * connection to be created and whether they want to create a new type or select
- * an existing element for the other end of the connection.
- * </p>
- * 
- * <p>
- * The <code>getRelationshipTypeAdapter()</code> method returns an adaptable
- * to the relationship type result.
- * </p>
- * 
- * <p>
- * The <code>getEndAdapter()</code> method returns an adaptable to the end
- * type result.
- * </p>
- * 
- * @author cmahoney
- */
-public class PromptForConnectionAndEndCommand
-	extends PopupMenuCommand {
-
-	/**
-	 * Label provider of the first popup menu with the relationship types.
-	 */
-	protected class ConnectionLabelProvider
-		extends ElementTypeLabelProvider {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			String theInputStr = null;
-			if (isDirectionReversed())
-				theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXFrom;
-			else
-				theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXTo;
-
-			String text = NLS.bind(theInputStr, super
-				.getText(element));
-
-			return text;
-
-		}
-	}
-
-	/**
-	 * Label provider of the second popup (submenus) for the type of the other
-	 * end.
-	 */
-	protected class EndLabelProvider
-		extends ElementTypeLabelProvider {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			if (element instanceof IElementType) {
-				String theInputStr = DiagramUIMessages.ConnectionHandle_Popup_NewX;
-				String text = NLS.bind(theInputStr,
-					super.getText(element));
-				return text;
-			} else {
-				return element.toString();
-			}
-		}
-	}
-
-	/**
-	 * Label provider of the first and only popup for the type of the other end
-	 * when there is only one connection type (e.g. a single relationship type
-	 * palette tool is used).
-	 */
-	protected class ConnectionAndEndLabelProvider
-		extends ElementTypeLabelProvider {
-
-		/** the known connection item */
-		private Object connectionItem;
-
-		/**
-		 * Creates a new <code>ConnectionAndEndLabelProvider</code>.
-		 * 
-		 * @param connectionType
-		 *            the single known connection type
-		 */
-		protected ConnectionAndEndLabelProvider(Object connectionItem) {
-			this.connectionItem = connectionItem;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			String theInputStr = null;
-			if (element instanceof IElementType) {
-				if (isDirectionReversed())
-					theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXFromNewY;
-				else
-					theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXToNewY;
-				String text = NLS.bind(theInputStr, new Object[] {
-					super.getText(connectionItem), super.getText(element)});
-				return text;
-			} else {
-				if (isDirectionReversed())
-					theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXFromY;
-				else
-					theInputStr = DiagramUIMessages.ConnectionHandle_Popup_CreateXToY;
-				String text = NLS.bind(theInputStr, new Object[] {
-					super.getText(connectionItem), super.getText(element)});
-				return text;
-			}
-		}
-
-		/**
-		 * Gets the connection item.
-		 * 
-		 * @return the connection item
-		 */
-		protected Object getConnectionItem() {
-			return connectionItem;
-		}
-
-	}
-
-	/**
-	 * This can be added to the content list to add a 'select existing' option.
-	 */
-	private static String EXISTING_ELEMENT = DiagramUIMessages.ConnectionHandle_Popup_ExistingElement;
-
-	/** Label provider of the popup menu for the connection types. */
-	private ConnectionLabelProvider connectionLabelProvider;
-
-	/** Label provider of the submenus for the other end element. */
-	private static EndLabelProvider endLabelProvider;
-
-	/** Adapts to the connection type result. */
-	private ObjectAdapter connectionAdapter = new ObjectAdapter();
-
-	/** Adapts to the other end type result. */
-	private ObjectAdapter endAdapter = new ObjectAdapter();
-
-	/**
-	 * The request to create a connection. It may contain the connection type or
-	 * it may be a <code>CreateUnspecifiedTypeConnectionRequest</code>.
-	 */
-	private CreateConnectionRequest request;
-
-	/** The container editpart to send the view request to. */
-	private IGraphicalEditPart containerEP;
-
-	/**
-	 * Creates a new <code>PromptForConnectionAndEndCommand</code>.
-	 * 
-	 * @param request
-	 *            The request to create a connection. It may contain the
-	 *            connection type or it may be a
-	 *            <code>CreateUnspecifiedTypeConnectionRequest</code>.
-	 * @param containerEP
-	 *            The container edit part, where the view and element request to
-	 *            create the other end is sent. This is used only for testing
-	 *            that a type is valid for the other end.
-	 */
-	public PromptForConnectionAndEndCommand(CreateConnectionRequest request,
-			IGraphicalEditPart containerEP) {
-
-		super(DiagramUIMessages.Command_GetRelationshipTypeAndEndFromUser_Label,
-			Display.getCurrent().getActiveShell());
-		this.request = request;
-		this.containerEP = containerEP;
-	}
-
-	/**
-	 * Gets a list of all the connection items that will represent the
-	 * connection choices and will appear in the first part of the popup menu.
-	 * 
-	 * <p>
-	 * If the objects in this are not <code>IElementTypes</code> or they
-	 * require a special label provider, then
-	 * {@link #getConnectionLabelProvider()} should be overridden to provide
-	 * this.
-	 * </p>
-	 * <p>
-	 * When this command has executed, the connection adapter result ({@link #getConnectionAdapter()})
-	 * will be populated with the connection item chosen.
-	 * </p>
-	 * 
-	 * @return the list of connection items to appear in the popup menu
-	 */
-	protected List getConnectionMenuContent() {
-		List validRelTypes = new ArrayList();
-		if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-			List allRelTypes = null;
-			if (((CreateUnspecifiedTypeConnectionRequest) request)
-				.useModelingAssistantService()) {
-				allRelTypes = isDirectionReversed() ? ModelingAssistantService
-					.getInstance().getRelTypesOnTarget(getKnownEnd())
-					: ModelingAssistantService.getInstance()
-						.getRelTypesOnSource(getKnownEnd());
-			} else {
-				allRelTypes = ((CreateUnspecifiedTypeConnectionRequest) request)
-					.getElementTypes();
-			}
-
-			if (isDirectionReversed()) {
-				validRelTypes = allRelTypes;
-			} else {
-				// Cycle through and make sure each connection type is
-				// supported
-				// for starting a connection on the source.
-				for (Iterator iter = allRelTypes.iterator(); iter.hasNext();) {
-					IElementType rType = (IElementType) iter.next();
-					if (((CreateConnectionRequest) ((CreateUnspecifiedTypeConnectionRequest) request)
-						.getRequestForType(rType)).getStartCommand() != null) {
-						validRelTypes.add(rType);
-					}
-				}
-			}
-
-		} else if (request instanceof CreateConnectionViewAndElementRequest) {
-			if (((CreateConnectionViewAndElementRequest) request)
-				.getStartCommand() != null) {
-				validRelTypes
-					.add(((CreateRelationshipRequest) ((CreateConnectionViewAndElementRequest) request)
-						.getConnectionViewAndElementDescriptor()
-						.getCreateElementRequestAdapter().getAdapter(
-							CreateRelationshipRequest.class)).getElementType());
-			}
-		} else if (request instanceof CreateConnectionViewRequest) {
-			if (((CreateConnectionViewRequest) request).getStartCommand() != null) {
-				Object type = ((CreateConnectionViewRequest) request)
-					.getConnectionViewDescriptor().getElementAdapter()
-					.getAdapter(IElementType.class);
-				if (type != null) {
-					validRelTypes.add(type);
-				}
-			}
-		}
-		return validRelTypes;
-	}
-
-	/**
-	 * Gets a list of all the end items that will represent the other end
-	 * choices and will appear in the submenu popup of the given connection
-	 * item.
-	 * 
-	 * <p>
-	 * If the objects in this are not <code>IElementTypes</code> or they
-	 * require a special label provider, then {@link #getEndLabelProvider()}
-	 * should be overridden to provide this.
-	 * </p>
-	 * <p>
-	 * When this command has executed, the end adapter result ({@link #getEndAdapter()})
-	 * will be populated with the end item chosen.
-	 * </p>
-	 * 
-	 * @param connectionItem
-	 *            the connection item for which this will be a submenu
-	 * @return the list of end items to appear in the popup menu
-	 */
-	protected List getEndMenuContent(Object connectionItem) {
-		if (connectionItem instanceof IElementType) {
-			IElementType connectionType = (IElementType) connectionItem;
-			List menuContent = isDirectionReversed() ? ModelingAssistantService
-				.getInstance().getTypesForSource(getKnownEnd(), connectionType)
-				: ModelingAssistantService.getInstance().getTypesForTarget(
-					getKnownEnd(), connectionType);
-
-			menuContent = filterUnsupportedNodeTypes(menuContent);
-
-			if (!menuContent.isEmpty()
-				&& supportsExistingElement(connectionType)) {
-				menuContent.add(EXISTING_ELEMENT);
-			}
-
-			return menuContent;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Gets the content to be used in the popup menu from the Modeling Assistant
-	 * Service and creates the popup menu.
-	 * 
-	 * @return the top-level popup menu
-	 */
-	protected PopupMenu createPopupMenu() {
-
-		final List connectionMenuContent = getConnectionMenuContent();
-
-		if (connectionMenuContent == null || connectionMenuContent.isEmpty()) {
-			return null;
-		} else if (connectionMenuContent.size() == 1) {
-			List menuContent = getEndMenuContent(connectionMenuContent.get(0));
-			if (menuContent == null || menuContent.isEmpty()) {
-				return null;
-			}
-
-			ILabelProvider labelProvider = getConnectionAndEndLabelProvider(connectionMenuContent
-				.get(0));
-			return new PopupMenu(menuContent, labelProvider) {
-
-				/**
-				 * @see org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu#getResult()
-				 */
-				public Object getResult() {
-					Object endResult = super.getResult();
-					if (endResult == null) {
-						return null;
-					} else {
-						List resultList = new ArrayList(2);
-						resultList.add(connectionMenuContent.get(0));
-						resultList.add(endResult);
-						return resultList;
-					}
-				}
-			};
-		} else {
-			List menuContent = new ArrayList();
-			for (Iterator iter = connectionMenuContent.iterator(); iter
-				.hasNext();) {
-				Object connectionItem = iter.next();
-
-				List subMenuContent = getEndMenuContent(connectionItem);
-
-				if (subMenuContent.isEmpty()) {
-					continue;
-				}
-
-				PopupMenu subMenu = new PopupMenu(subMenuContent,
-					getEndLabelProvider());
-
-				menuContent.add(new PopupMenu.CascadingMenu(connectionItem,
-					subMenu));
-			}
-			if (!menuContent.isEmpty()) {
-				return new PopupMenu(menuContent, getConnectionLabelProvider());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a new list with all the types from the list given that can be
-	 * created.
-	 * 
-	 * @param allTypes
-	 *            a list of <code>IElementTypes</code>.
-	 */
-	private List filterUnsupportedNodeTypes(List allTypes) {
-		List validTypes = new ArrayList();
-		for (Iterator iter = allTypes.iterator(); iter.hasNext();) {
-			IElementType type = (IElementType) iter.next();
-			Request createRequest = CreateViewRequestFactory
-				.getCreateShapeRequest(type, containerEP
-					.getDiagramPreferencesHint());
-
-			EditPart target = containerEP.getTargetEditPart(createRequest);
-			if (target != null) {
-				Command cmd = target.getCommand(createRequest);
-				if (cmd != null && cmd.canExecute()) {
-					validTypes.add(type);
-				}
-			}
-		}
-		return validTypes;
-	}
-
-    public boolean canExecute() {
-		return createPopupMenu() != null;
-	}
-
-	/**
-	 * Pops up the dialog with the content provided. If the user selects 'select
-	 * existing', then the select elements dialog also appears.
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor,
-            IAdaptable info)
-        throws ExecutionException {
-        
-		PopupMenu popup = createPopupMenu();
-
-		if (popup == null) {
-			return CommandResult.newErrorCommandResult(getLabel());
-		}
-
-		setPopupMenu(popup);
-
-		CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);
-		if (!cmdResult.getStatus().isOK()) {
-			return cmdResult;
-		}
-
-		Object result = cmdResult.getReturnValue();
-		if (result instanceof List) {
-			List resultList = (List) result;
-			if (resultList.size() == 2) {
-				connectionAdapter.setObject(resultList.get(0));
-
-				Object targetResult = resultList.get(1);
-
-				if (targetResult.equals(EXISTING_ELEMENT)) {
-					targetResult = isDirectionReversed() ? ModelingAssistantService
-						.getInstance().selectExistingElementForSource(
-							getKnownEnd(), (IElementType) resultList.get(0))
-						: ModelingAssistantService.getInstance()
-							.selectExistingElementForTarget(getKnownEnd(),
-								(IElementType) resultList.get(0));
-					if (targetResult == null) {
-						return CommandResult.newCancelledCommandResult();
-					}
-				}
-				endAdapter.setObject(targetResult);
-				return CommandResult.newOKCommandResult();
-			}
-		}
-		return CommandResult.newErrorCommandResult(getLabel());
-	}
-
-	/**
-	 * Checks if the <code>ModelingAssistantService</code> supports the
-	 * ability to open a dialog for the user to select an existing element
-	 * 
-	 * @param connectionType
-	 * @return true if the supported by the modeling assistant service; false
-	 *         otherwise
-	 */
-	private boolean supportsExistingElement(IElementType connectionType) {
-		if (isDirectionReversed()) {
-			if (ModelingAssistantService.getInstance().provides(
-				new SelectExistingElementForSourceOperation(getKnownEnd(),
-					connectionType))) {
-				return true;
-			}
-		} else if (ModelingAssistantService.getInstance().provides(
-			new SelectExistingElementForTargetOperation(getKnownEnd(),
-				connectionType))) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets the connectionAdapter.
-	 * 
-	 * @return Returns the connectionAdapter.
-	 */
-	public ObjectAdapter getConnectionAdapter() {
-		return connectionAdapter;
-	}
-
-	/**
-	 * Gets the endAdapter.
-	 * 
-	 * @return Returns the endAdapter.
-	 */
-	public IAdaptable getEndAdapter() {
-		return endAdapter;
-	}
-
-	/**
-	 * Returns true if the request is a reversed
-	 * <code>CreateUnspecifiedTypeConnectionRequest</code>.
-	 * 
-	 * @return Returns true if the request is a reversed
-	 *         <code>CreateUnspecifiedTypeConnectionRequest</code>; false
-	 *         otherwise
-	 */
-	protected boolean isDirectionReversed() {
-		return (request instanceof CreateUnspecifiedTypeConnectionRequest && ((CreateUnspecifiedTypeConnectionRequest) request)
-			.isDirectionReversed());
-	}
-
-	/**
-	 * Gets the known end, which even in the case of a reversed
-	 * <code>CreateUnspecifiedTypeConnectionRequest</code>, is the source
-	 * editpart.
-	 * 
-	 * @return the known end
-	 */
-	private EditPart getKnownEnd() {
-		return request.getSourceEditPart();
-	}
-
-	/**
-	 * Gets the label provider that is to be used in the first menu of the popup
-	 * where the user is to choose the connection to be created.
-	 * 
-	 * @return the connection label provider
-	 */
-	protected ILabelProvider getConnectionLabelProvider() {
-		if (connectionLabelProvider == null) {
-			connectionLabelProvider = new ConnectionLabelProvider();
-		}
-		return connectionLabelProvider;
-	}
-
-	/**
-	 * Gets the label provider that is to be used in the second menu of the
-	 * popup where the user is to choose the end (could be source or target) to
-	 * be created.
-	 * 
-	 * @return the end label provider
-	 */
-	protected ILabelProvider getEndLabelProvider() {
-		if (endLabelProvider == null) {
-			endLabelProvider = new EndLabelProvider();
-		}
-		return endLabelProvider;
-	}
-
-	/**
-	 * Gets the label provider that is to be used when there is only one option
-	 * for the connection type so the popup menu consists of a single menu
-	 * identifying the connection type to be created and options for the other
-	 * end of which the user must choose
-	 * 
-	 * @param connectionItem
-	 *            the single known connection item
-	 * @return the label provider
-	 */
-	protected ILabelProvider getConnectionAndEndLabelProvider(
-			Object connectionItem) {
-		return new ConnectionAndEndLabelProvider(connectionItem);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SemanticCreateCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SemanticCreateCommand.java
deleted file mode 100644
index 92e77cf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SemanticCreateCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-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.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-
-/**
- * A Wrapper around a real element creation command
- * The main use of this command is to ensure that the semantic
- * adapter is updated appropriately upon undo and redo of the real command
- * 
- * @author melaasar
- */
-public class SemanticCreateCommand extends AbstractCommand {
-
-	/** the request adapter */
-	CreateElementRequestAdapter requestAdapter;
-	/** the real element creation command */
-	private ICommand realSemanticCommand;
-
-	/**
-	 * Creates a new semantic create command that wraps around a real command
-	 * @param requestAdapter
-	 * @param realSemanticCommand
-	 */
-	public SemanticCreateCommand(
-		CreateElementRequestAdapter requestAdapter,
-		Command realSemanticCommand) {
-
-		super((realSemanticCommand.getLabel() == null) ? StringStatics.BLANK : realSemanticCommand.getLabel(), null);
-
-		Assert.isNotNull(requestAdapter);
-		Assert.isNotNull(realSemanticCommand);
-
-		this.requestAdapter = requestAdapter;
-		this.realSemanticCommand =
-			DiagramCommandStack.getICommand(realSemanticCommand);
-		
-		// propagate the contexts from the wrapped command
-		recomputeContexts();
-	}
-
-	/**
-	 * If the command was properly executed, the result will be set during
-	 * execution. If the command failed execution, the result may contain status
-	 * information for feedback purposes.
-	 * 
-	 * @return 
-	 * 		The command result either from this command executed
-	 * 		properly or the wrapped realSemanticCommand in case status information
-	 * 		needs to be returned.
-	 */
-	@Override
-	public CommandResult getCommandResult() {
-		CommandResult result = super.getCommandResult();
-		if (result == null) {
-			return realSemanticCommand.getCommandResult();
-		}
-		return result;
-	}
-	
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		realSemanticCommand.execute(progressMonitor, info); 
-		CommandResult result = realSemanticCommand.getCommandResult();
-		if (result.getStatus().isOK()) {
-			Object object =	result.getReturnValue();
-			if (object instanceof Collection) {
-				Collection col = (Collection) object;
-				object = col.isEmpty() ? null : col.iterator().next();
-			}
-			if (object != null) {
-				Assert.isTrue(object instanceof EObject, "Failed to get an IElement out of the semantic command returned value");//$NON-NLS-1$
-				EObject element = (EObject) object;
-				requestAdapter.setNewElement(element);
-			}
-			result = CommandResult.newOKCommandResult(requestAdapter);
-		}
-		
-		recomputeContexts();
-		return result;
-	}
-
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		realSemanticCommand.redo(progressMonitor, info);
-		CommandResult result = realSemanticCommand.getCommandResult();
-		recomputeContexts();
-		return result;
-	}
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		realSemanticCommand.undo(progressMonitor, info);
-		CommandResult result = realSemanticCommand.getCommandResult();
-		recomputeContexts();
-		return result;
-	}
-
-    public boolean canExecute() {
-		return realSemanticCommand.canExecute();
-	}
-
-    public boolean canUndo() {
-		return realSemanticCommand.canUndo();
-	}
-
-    public boolean canRedo() {
-		return realSemanticCommand.canRedo();
-	}
-    
-    public List getAffectedFiles() {
-        return realSemanticCommand.getAffectedFiles();
-    }
-    
-    /**
-     * Propagates the contexts from my wrapped command.
-     */
-    private void recomputeContexts() {
-    	
-    	// Get my real contexts from my wrapped command
-    	IUndoContext[] realContexts = realSemanticCommand.getContexts();
-    	
-    	// Clear my contexts
-    	IUndoContext[] myContexts = getContexts();
-    	for (int i = 0; i < myContexts.length; i++) {
-    		removeContext(myContexts[i]);
-    	}
-    	
-    	// Add the contexts from my wrapped command
-		for (int i = 0; i < realContexts.length; i++) {
-			addContext(realContexts[i]);
-		}
-    }
-    
-    /**
-     * Adds the context to my wrapped command.
-     */
-    public void addContext(IUndoContext context) {
-    	super.addContext(context);
-    	realSemanticCommand.addContext(context);
-    }
-    
-    /**
-     * Removes the context from my wrapped command.
-     */
-    public void removeContext(IUndoContext context) {
-    	super.removeContext(context);
-    	realSemanticCommand.removeContext(context);
-    }
-
-    public void dispose() {
-        super.dispose();
-        realSemanticCommand.dispose();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetBoundsCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetBoundsCommand.java
deleted file mode 100644
index 0de63af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetBoundsCommand.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-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.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * A command to set the bounds (location/size) of a <code>View</code>
- * 
- * @author melaasar
- */
-public class SetBoundsCommand extends AbstractTransactionalCommand {
-
-	private IAdaptable  adapter;
-	private Point location;
-	private Dimension size;
-	
-	/**
-	 * Creates a <code>SetBoundsCommand</code> for the given view adapter with a given bounds.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label The command label
-	 * @param adapter An adapter to the <code>View</code>
-	 * @param bounds The new bounds
-	 */
-	public SetBoundsCommand(TransactionalEditingDomain editingDomain, String label,IAdaptable adapter, Rectangle bounds) {
-        super(editingDomain, label, null);
-		Assert.isNotNull(adapter, "view cannot be null"); //$NON-NLS-1$
-		Assert.isNotNull(bounds, "bounds cannot be null"); //$NON-NLS-1$
-		this.adapter = adapter;
-		this.location = bounds.getLocation();
-		this.size = bounds.getSize();
-	}
-	
-	/**
-	 * Creates a <code>SetBoundsCommand</code> for the given view adapter with a given location.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label The command label
-	 * @param adapter An adapter to the <code>View</code>
-	 * @param location The new location
-	 */
-	public SetBoundsCommand (TransactionalEditingDomain editingDomain, String label,IAdaptable adapter, Point location) {
-        super(editingDomain, label, null);
-		Assert.isNotNull(adapter, "view cannot be null"); //$NON-NLS-1$
-		Assert.isNotNull(location, "location cannot be null"); //$NON-NLS-1$
-		this.adapter = adapter;
-		this.location = location;
-	}
-
-	/**
-	 * Creates a <code>SetBoundsCommand</code> for the given view adapter with a given size.
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param label The command label
-	 * @param adapter An adapter to the <code>View</code>
-	 * @param size The new size
-	 */
-	public SetBoundsCommand (TransactionalEditingDomain editingDomain, String label, IAdaptable adapter, Dimension size) {
-		super(editingDomain, label, null);
-        Assert.isNotNull(adapter, "view cannot be null"); //$NON-NLS-1$
-		Assert.isNotNull(size, "size cannot be null"); //$NON-NLS-1$
-		this.adapter = adapter;
-		this.size = size;
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		if (adapter == null)
-			return CommandResult.newErrorCommandResult("SetBoundsCommand: viewAdapter does not adapt to IView.class"); //$NON-NLS-1$
-		
-		View view  = (View)adapter.getAdapter(View.class);
-		
-		if (location != null) {
-			ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X(), Integer.valueOf(location.x));
-			ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y(), Integer.valueOf(location.y));
-		}
-		if (size != null) {
-			ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getSize_Width(), Integer.valueOf(size.width));
-			ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getSize_Height(), Integer.valueOf(size.height));
-		}
-		return CommandResult.newOKCommandResult();
-	}
-    
-    public List getAffectedFiles() {
-        if (adapter != null) {
-            View view = (View) adapter.getAdapter(View.class);
-            if (view != null) {
-                return getWorkspaceFiles(view);
-            }
-        }
-        return super.getAffectedFiles();
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetViewMutabilityCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetViewMutabilityCommand.java
deleted file mode 100644
index e07d507..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/SetViewMutabilityCommand.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.commands;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-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.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.commands.Command;
-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.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Command that sets the view's mutability. if a view is Mutability state is used
- * by the Diagram Listener to decide if a view can move from the transient childern 
- * list of its container to the persisted list. so a mutable view will never be persisted
- * keep in mind that the mutability state of the view is a transient state so as soon as the 
- * model is closed and opened again all views will be immutable.
- * @author mhanner
- */
-public class SetViewMutabilityCommand extends Command {
-	
-	/** cached non-persisted views. */
-	private List _viewAdapters = Collections.emptyList();
-	
-	/** immutable flag. */
-	private boolean _immutable = true;
-
-	/**
-	 * Creates a command instance.
-	 * @param viewAdapter an <code>IAdaptable</code> that adapts to <code>View</code>
-	 * @param immutable immutable state
-	 */
-	public SetViewMutabilityCommand(IAdaptable viewAdapter, boolean immutable) {
-		this( Collections.singletonList(viewAdapter), immutable );
-	}
-	
-	/**
-	 * Creates a command instance.
-	 * @param viewAdapters a list of <code>IAdaptable</code> objects that adapts to <code>View</code>
-	 * @param immutable immutable state
-	 */
-	public SetViewMutabilityCommand(List viewAdapters, boolean immutable) {
-		super( DiagramUIMessages.SetViewMutabilityCommand_Label);
-		Assert.isNotNull(viewAdapters);
-		_viewAdapters = viewAdapters;
-		_immutable = immutable;
-	}
-
-	/**
-	 * Convenience method returning a command to make the supplied views mutable.
-	 * @param viewAdapters views to be associated with the command 
-	 * @return <code>SetViewMutabilityCommand</code>
-	 */
-	public static SetViewMutabilityCommand makeMutable( List viewAdapters ) {
-		return new SetViewMutabilityCommand(viewAdapters, false);
-	}
-
-	/**
-	 * Convenience method returning a command to make the supplied view mutable.
-	 * @param viewAdapter view to be associated with the command 
-	 * @return <code>SetViewMutabilityCommand</code>
-	 */
-	public static SetViewMutabilityCommand makeMutable( IAdaptable viewAdapter) {
-		return new SetViewMutabilityCommand(viewAdapter, false);
-	}
-
-	
-	/**
-	 * Convenience method returning a command to make the supplied views immutable. 
-	 * @param viewAdapters views to be associated with the command 
-	 * @return <code>SetViewMutabilityCommand</code>
-	 */
-	public static SetViewMutabilityCommand makeImmutable( List viewAdapters ) {
-		return new SetViewMutabilityCommand(viewAdapters, true);
-	}
-
-	/**
-	 * Convenience method returning a command to make the supplied view immutable. 
-	 * @param viewAdapter views to be associated with the command 
-	 * @return <code>SetViewMutabilityCommand</code>
-	 */
-	public static SetViewMutabilityCommand makeImmutable( IAdaptable viewAdapter) {
-		return new SetViewMutabilityCommand(viewAdapter, true);
-	}
-	
-	/**
-	 * gets an unmodifiable copy of the cached view adapters. 
-	 * @return view adapters
-	 */
-	protected List getViewAdapters() {
-		return Collections.unmodifiableList(_viewAdapters);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.commands.Command#execute()
-	 */
-	public void execute() {
-		setMutability(_immutable);
-	}
-	
-	/** Set the mutability flag on all views. */
-	private void setMutability(final boolean immutable) {
-		if (!_viewAdapters.isEmpty()) {
-			
-			TransactionalEditingDomain editingDomain = TransactionUtil
-				.getEditingDomain(((IAdaptable) _viewAdapters.get(0))
-					.getAdapter(View.class));
-			if (editingDomain != null) {
-
-				Map options = Collections.singletonMap(
-					Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
-				AbstractEMFOperation operation = new AbstractEMFOperation(
-					editingDomain, StringStatics.BLANK, options) {
-
-					protected IStatus doExecute(IProgressMonitor monitor,
-							IAdaptable info)
-						throws ExecutionException {
-						Iterator adapters = _viewAdapters.iterator();
-						while (adapters.hasNext()) {
-							IAdaptable adapter = (IAdaptable) adapters.next();
-							View notationView = (View) adapter
-								.getAdapter(View.class);
-							if (notationView != null) {
-								notationView.setMutable(!immutable);
-							}
-						}
-						return Status.OK_STATUS;
-					}
-				};
-				try {
-					operation.execute(new NullProgressMonitor(), null);
-				} catch (ExecutionException e) {
-					Trace.catching(DiagramUIPlugin.getInstance(),
-						DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-						"setMutability", e); //$NON-NLS-1$
-					Log.warning(DiagramUIPlugin.getInstance(),
-						DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-						"setMutability", e); //$NON-NLS-1$
-
-				}
-
-			}
-		}
-	}
-
-	/** 
-	 * Returns the view that would be affected if this
-	 * command were executed, undone, or redone.
-	 * @return views adapter Collection
-	 */
-	public Collection getAffectedObjects() {
-		return getViewAdapters();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.commands.Command#redo()
-	 */
-	public void redo() {
-		setMutability(_immutable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.commands.Command#undo()
-	 */
-	public void undo() {
-		setMutability(!_immutable);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/commands/package.html
deleted file mode 100644
index fc0edbd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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>
-Diagram ui commands</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterCollectionColumn.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterCollectionColumn.java
deleted file mode 100644
index e029d07..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterCollectionColumn.java
+++ /dev/null
@@ -1,142 +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.dialogs.sortfilter;
-
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-
-/**
- * Wrapper for creating <code>TableColumn</code> column information.
- * 
- * @author jcorchis
- */
-public class SortFilterCollectionColumn {
-
-	/** Column infomation with default values */
-	private int alignment = SWT.LEFT;
-	private int width = 80;
-	private boolean resizable = true;
-	private String caption;
-	private ViewerSorter columnSorter;
-
-	/**
-	 * Constructor for the <code>SortFilterCollectionColumn</code>. All instances 
-	 * must have a column label.
-	 * @param caption the column caption
-	 */
-	public SortFilterCollectionColumn(String caption) {
-		this.caption = caption;
-	}
-
-	/**
-	 * Constructor for the <code>SortFilterCollectionColumn</code>.
-	 * @param caption the column caption
-	 * @param sorter the sorter
-	 */
-	public SortFilterCollectionColumn(String caption, ViewerSorter sorter) {
-		this.caption = caption;
-		this.columnSorter = sorter;
-	}
-
-	/**
-	 * SortFilterCollectionColumn constructor with the specified
-	 * column attributes.
-	 * @param caption the column name
-	 * @param alignment the column's alignment
-	 * @param width the column's width in pixels
-	 * @param sorter the sorter
-	 */
-	public SortFilterCollectionColumn(
-		String caption,
-		int alignment,
-		int width,
-		ViewerSorter sorter) {
-		this.caption = caption;
-		this.alignment = alignment;
-		this.width = width;
-		this.columnSorter = sorter;
-	}
-
-	/**
-	 * Gets the column's display name
-	 * @return String the column's display name
-	 */
-	public String getCaption() {
-		return caption;
-	}
-
-	/**
-	 * Gets the horizontal alignment type
-	 * @return int the horizontal alignment type
-	 */
-	public int getAlignment() {
-		return alignment;
-	}
-
-	/**
-	 * Gets the width column's width.
-	 * @return the width
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/**
-	 * Sets the horizontal alignment type. Use SWT
-	 * @param alignment the horizontal alignment type
-	 */
-	public void setAlignment(int alignment) {
-		this.alignment = alignment;
-	}
-
-	/**
-	 * Determines if column is resizable
-	 * @return boolean <code>true</code> if column is resizable, otherwise <code>false</code>
-	 */
-	public boolean isResizable() {
-		return resizable;
-	}
-
-	/** 
-	 * Returns a sorter which will sort the table by this column.
-	 * @return the <code>ViewerSorter</code> which knows how to sort the <code>Table</code>
-	 * by this column.
-	 */
-	public ViewerSorter getColumnSorter() {
-		return columnSorter;
-	}
-
-	/** 
-	 * Uses the getCaption() to compare the equalvalence of the objects.
-	 * @return true if the <code>SortFilterCollectionColumn</code> have the same name.
-	 * @see java.lang.Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-
-		if (!(obj instanceof SortFilterCollectionColumn)) {
-			return false;
-		}
-
-		return getCaption().equals(
-			((SortFilterCollectionColumn) obj).getCaption());
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getCaption().hashCode();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterElement.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterElement.java
deleted file mode 100644
index 190762a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterElement.java
+++ /dev/null
@@ -1,87 +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.dialogs.sortfilter;
-
-
-/**
- * Wrapper class for CompartmentList item's.  Wraps the item along with a sort
- * ordinal and an visibility flag.
- * 
- * @author jcorchis
- */
-public class SortFilterElement {
-	
-	// The visibility of the element
-	private boolean visible = true;
-	// The view reference
-	private Object data = null;	
-	
-
-	public SortFilterElement(Object data) {
-		this.data = data;
-	}
-	
-	/**
-	 * Constructor for the 
-	 * @param visible visible flag
-	 * @param data the data associated with the filter element
-	 */	
-	public SortFilterElement(boolean visible, Object data) {
-		this.data = data;
-		this.visible = visible;
-	}
-	
-	
-	/**
-	 * Returns <tt>true</tt> if the compartment item is not filtered.
-	 * @return <tt>true</tt> if the compartment item is not filtered.
-	 */	
-	public boolean isVisible() {
-		return visible;
-	}	
-	
-	/**
-	 * Sets the visiblilty of this element
-	 * @param visible
-	 */	
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}
-	
-	/**
-	 * Returns the view associated with this list compartment item.
-	 * @return the view associated with this list compartment item.
-	 */
-	public Object getData() {
-		return data;
-	} 
-	
-	/**
-	 * check if this filter equals the passed filter
-	 * @param other the other sort filter element to check against
-	 * @return <tt>true</tt> if thery are equal other wise <tt>false</tt>
-	 */
-	public boolean equals(Object o) {
-		if (o instanceof SortFilterElement) {
-			SortFilterElement other = (SortFilterElement)o;
-			return visible == other.isVisible() && data.equals(other.getData());
-		}
-		return super.equals(o);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return data.hashCode();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterLabelProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterLabelProvider.java
deleted file mode 100644
index 820be4b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterLabelProvider.java
+++ /dev/null
@@ -1,58 +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.dialogs.sortfilter;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author jcorchis
- */
-public abstract class SortFilterLabelProvider
-	extends LabelProvider
-	implements ITableLabelProvider {
-
-
-	private static Image checkedImage = DiagramUIPluginImages.DESC_CHECKBOX_SELECTED
-		.createImage();
-
-	private static Image uncheckedImage = DiagramUIPluginImages.DESC_CHECKBOX_CLEARED
-		.createImage();
-	
-	/**
-	 * constructor
-	 */
-	public SortFilterLabelProvider() {
-	    // empty ctor
-	}
-
-	/**
-	 * returns the image
-	 * @param isSelected , determin if the returned image will be the selected image or not
-	 * @return the image
-	 */
-	protected Image getImage(boolean isSelected) {
-		return isSelected ? checkedImage : uncheckedImage;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		return (columnIndex == 0)
-			? getImage(((SortFilterElement) element).isVisible())
-			: null;
-	}	
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterPage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterPage.java
deleted file mode 100644
index 387b934..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterPage.java
+++ /dev/null
@@ -1,1404 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.dialogs.sortfilter;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.sortfilter.SortFilterContentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.sortfilter.SortFilterDialog;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangeSortFilterRequest;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.SortingDirection;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-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.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-/**
- * SortFilterPage extends <code>PropertyPage</code> by adding a Table and 
- * Filter controls for SortFilterPage.CHILD_PAGE types and only a Filter control
- * for SortFilterPage.ROOT_PAGE types.  
- * 
- * @author jcorchis
- */
-public class SortFilterPage extends PropertyPage {
-
-	/** Menu strings */
-	static final private String MOVE_UP_TOOL_TIP = DiagramUIMessages.SortFilter_moveItemUp;
-	static final private String MOVE_DOWN_TOOL_TIP = DiagramUIMessages.SortFilter_moveItemDown;
-
-	/** filter list labels */
-	static private final String FILTER_ITEMS_CONTAINING = DiagramUIMessages.SortFilter_filterItemsListLabel;	
-	static private final String FILTER_ITEMS_LIST = DiagramUIMessages.SortFilter_fitlerListLabel;
-
-	/** Tool tips and labels for the filter buttons */
-	static private final String ADD_TO = DiagramUIMessages.SortFilter_addTo;
-	private final String ADD_TO_LABEL = "<"; //$NON-NLS-1$
-	static private final String REMOVE_FROM = DiagramUIMessages.SortFilter_removeFrom;
-	private final String REMOVE_FROM_LABEL = ">"; //$NON-NLS-1$	
-	static private final String ADD_ALL = DiagramUIMessages.SortFilter_addAll;
-	private final String ADD_ALL_LABEL = "<<"; //$NON-NLS-1$
-	static private final String REMOVE_ALL = DiagramUIMessages.SortFilter_removeAll;
-	private final String REMOVE_ALL_LABEL = ">>"; //$NON-NLS-1$	
-
-	/** the collection's elements (rows) */
-	private List elementCollection = null;
-	private List baseElements = null;
-
-	/** table viewer */
-	private TableViewer tableViewer = null;
-
-	/** ToolItem widgets */
-	private ToolItem moveUpToolItem = null;
-	private ToolItem moveDownToolItem = null;
-
-	/** List item widgets */
-	private org.eclipse.swt.widgets.List filterList = null;
-	private org.eclipse.swt.widgets.List filters = null;
-	private Button addTo = null;
-	private Button removeFrom = null;
-	private Button addAllTo = null;
-	private Button removeAllFrom = null;
-
-	/** Filter button IDs */
-	private final int ADD_TO_ID = 0;
-	private final int REMOVE_FROM_ID = 1;
-	private final int ADD_ALL_TO_ID = 2;
-	private final int REMOVE_ALL_FROM_ID = 3;
-
-	/** Height (in list items) for the filter items lists */
-	private int LIST_HEIGHT = 8;
-
-	/** The collection Column list for this page */
-	private List collectionColumns = null;
-	private SortFilterLabelProvider labelProvider = null;
-	private Map filterMap = null;
-	private String[] filterStrings = null;
-	private String filterAppliesTo = null;
-	
-	private Sorting _sorting = Sorting.NONE_LITERAL;
-	private List _sortedObjects = Collections.EMPTY_LIST;	
-	private Map _sortingKeys = Collections.EMPTY_MAP;
-	private String _sortColumn;
-	private SortingDirection _sortingDirection = SortingDirection.ASCENDING_LITERAL;
-
-	private Filtering _filtering = Filtering.NONE_LITERAL;
-	private List _filteredObjects = Collections.EMPTY_LIST;
-	private List _filteringKeys = Collections.EMPTY_LIST;
-	
-	private List elementCollectionBackUp = Collections.EMPTY_LIST;
-	private Sorting _sortingBackUp = _sorting;
-	private Filtering _filteringBackUp = _filtering;
-	
-	
-
-	/**
-	 * List of items that are shown as an alternate view. This is a list of 
-	 * EE that are shown as an alternate view. 
-	 * (e.g. an attribute shown as an association).  These are not to appear 
-	 * in the dialog at all so the user cannot filter/unfilter them.
-	 */
-	private List _shownAsAlternateViewItems = Collections.EMPTY_LIST;
-
-	private GraphicalEditPart editPart = null;
-
-	/**
-	 * the root page
-	 */
-	public static final String ROOT_PAGE = "root_page"; //$NON-NLS-1$
-	/**
-	 * the child page
-	 */
-	public static final String CHILD_PAGE = "child_page"; //$NON-NLS-1$
-
-	private String pageType;
-
-	/**
-	 * Constructor for a Sort/Filter page.
-	 * @param pageType either ROOT_PAGE or CHILD_PAGE
-	 * @param editPart an instance of <code>ListCompartmentEditPart</code>. Null for ROOT_PAGE types.
-	 * @param collectionColumns a list of <code>SortFilterColumns</code> that define 
-	 * the Sort/Filter table. Null for ROOT_PAGE types
-	 * @param labelProvider <code>SorFilterLabelProvider</code> which provides the data for the table
-	 */
-	public SortFilterPage(
-		String pageType,
-		GraphicalEditPart editPart,
-		List collectionColumns,
-		SortFilterLabelProvider labelProvider) {
-
-		this.pageType = pageType;
-		this.editPart = editPart;
-
-		if (pageType.equals(CHILD_PAGE)) {
-			Assert.isTrue(editPart instanceof ListCompartmentEditPart);
-			Assert.isTrue(labelProvider != null);
-			// Loads the current state for the sorting/filtering
-			tokenizeSortProperty();
-			tokenizeFilterProperty();
-		}
-
-		this.collectionColumns = collectionColumns;
-		this.labelProvider = labelProvider;
-	}
-
-	/**
-	 * Adds the filter list and the table for the Table's input.
-	 * @param ancestor the parent <code>Composite</code>
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite ancestor) {
-
-		if (pageType == ROOT_PAGE)
-			noDefaultAndApplyButton();
-
-		// setup layout
-		Composite parent = new Composite(ancestor, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-		// setup child widgets
-		if (filterStrings != null && filterStrings.length != 0)
-			createFilterLists(parent);
-		if (this.pageType == CHILD_PAGE) {
-			createTable(parent);
-			createToolBar(parent);
-
-			// set focus and selection
-			if (elementCollection != null && !elementCollection.isEmpty()) {
-				// set the selection to the first row
-				tableViewer.setSelection(
-					new StructuredSelection(elementCollection.get(0)));
-			}
-
-			if (_filtering == Filtering.AUTOMATIC_LITERAL)
-				refreshList();
-			
-			tableViewer.getTable().setFocus();
-			handleSelection();
-		}
-		if (ROOT_PAGE.equals(pageType)) {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(ancestor,
-					"org.eclipse.gmf.runtime.diagram.ui.egmf0400"); //$NON-NLS-1$
-		} else {
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(ancestor,
-					"org.eclipse.gmf.runtime.diagram.ui.egmf0500"); //$NON-NLS-1$			
-		}
-		return parent;
-	}
-
-	/**
-	 * Creates the filtering list widgets
-	 * @param ancestor the ancestor
-	 */
-	private void createFilterLists(Composite ancestor) {
-		// Do not show the filter lists if not filter criteria 
-		// is defined.
-		if (filterStrings.length == 0)
-			return;
-		//setup layout 
-		Composite parent = new Composite(ancestor, SWT.NULL);
-		Composite dummy = new Composite(ancestor, SWT.NULL);
-		GridData dgd = new GridData();
-		dgd.widthHint = 0;
-		dummy.setLayoutData(dgd);
-
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 3;
-		parent.setLayout(layout);
-
-		// Create the possible filter items list
-		Label filterItemsLabel = new Label(parent, SWT.LEFT);
-		filterItemsLabel.setText(FILTER_ITEMS_CONTAINING);
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-		filterItemsLabel.setLayoutData(gd);
-
-		// Create the possible filter items list
-		//Label emptyLabel = 
-		new Label(parent, SWT.LEFT);
-
-		// Create the possible filter items list		
-		Label filterItemLabel = new Label(parent, SWT.LEFT);
-		filterItemLabel.setText(FILTER_ITEMS_LIST);
-		GridData gd2 = new GridData();
-		gd2.horizontalAlignment = GridData.BEGINNING;
-		filterItemLabel.setLayoutData(gd2);
-
-		// Create the possible filter items list
-		filters =
-			new org.eclipse.swt.widgets.List(
-				parent,
-				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL);
-		gridData.verticalSpan = 1;
-		gridData.widthHint = 80;
-		int listHeight = filters.getItemHeight() * LIST_HEIGHT;
-		Rectangle trim = filters.computeTrim(0, 0, 0, listHeight);
-		gridData.heightHint = trim.height;
-		filters.setLayoutData(gridData);
-
-		// Create a new composite for the buttons and add
-		// stack them vertically	  				  	
-		Composite buttonComposite = new Composite(parent, SWT.NULL);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonLayout.numColumns = 1;
-		buttonComposite.setLayout(buttonLayout);
-
-		GridData buttGD =
-			new GridData(GridData.FILL_VERTICAL | GridData.CENTER);
-		buttGD.horizontalSpan = 1;
-		buttGD.widthHint = 30;
-		buttonComposite.setLayoutData(buttGD);
-
-		removeFrom = new Button(buttonComposite, SWT.PUSH);
-		removeFrom.setText(REMOVE_FROM_LABEL);
-		removeFrom.setToolTipText(REMOVE_FROM);
-		removeFrom.setLayoutData(makeArrowButtonGridData(removeFrom));
-		removeFrom.setData(new Integer(REMOVE_FROM_ID));
-		removeFrom.addSelectionListener(buttonSelectionAdapter);
-		removeFrom.setEnabled(false);
-
-		addTo = new Button(buttonComposite, SWT.PUSH);
-		addTo.setText(ADD_TO_LABEL);
-		addTo.setToolTipText(ADD_TO);
-		addTo.setLayoutData(makeArrowButtonGridData(addTo));
-		addTo.setData(new Integer(ADD_TO_ID));
-		addTo.addSelectionListener(buttonSelectionAdapter);
-		addTo.setEnabled(false);
-
-		removeAllFrom = new Button(buttonComposite, SWT.PUSH);
-		removeAllFrom.setText(REMOVE_ALL_LABEL);
-		removeAllFrom.setToolTipText(REMOVE_ALL);
-		removeAllFrom.setLayoutData(makeArrowButtonGridData(removeAllFrom));
-		removeAllFrom.setData(new Integer(REMOVE_ALL_FROM_ID));
-		removeAllFrom.addSelectionListener(buttonSelectionAdapter);
-		addAllTo = new Button(buttonComposite, SWT.PUSH);
-
-		addAllTo.setText(ADD_ALL_LABEL);
-		addAllTo.setToolTipText(ADD_ALL);
-		addAllTo.setLayoutData(makeArrowButtonGridData(addAllTo));
-		addAllTo.setData(Integer.valueOf(ADD_ALL_TO_ID));
-		addAllTo.addSelectionListener(buttonSelectionAdapter);
-
-		// Add the possible list of filter items
-		this.filterList =
-			new org.eclipse.swt.widgets.List(
-				parent,
-				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData2 = new GridData(GridData.VERTICAL_ALIGN_FILL);
-		gridData2.verticalSpan = 1;
-		gridData2.widthHint = 80;
-		int listHeight2 = filterList.getItemHeight() * LIST_HEIGHT;
-		Rectangle trim2 = filterList.computeTrim(0, 0, 0, listHeight2);
-		gridData.heightHint = trim2.height;
-		filterList.setLayoutData(gridData2);
-
-		filters.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				removeFrom.setEnabled(filters.getSelectionCount() > 0);
-			}
-		});
-
-		filterList.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addTo.setEnabled(filterList.getSelectionCount() > 0);
-			}
-		});
-
-		populateFilterLists();
-	}
-
-	/**
-	 * SelectionAdapter for the filtering buttons. Calls <code>buttonPressed()</code>
-	 * to handle the action.
-	 * 
-	 * @author jcorchis
-	 */
-	class ButtonSelectionAdapter extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent event) {
-			buttonPressed(((Integer) event.widget.getData()).intValue());
-		}
-	}
-
-	/** Instance of the ButtonSelectionAdapter used for all filtering buttons. */
-	private ButtonSelectionAdapter buttonSelectionAdapter =
-		new ButtonSelectionAdapter();
-
-	/**
-	 * Creates GridData for the moveup and movedown toolbar buttons.
-	 * @param control button
-	 * @return the <code>GridData</code>
-	 */
-	protected GridData makeArrowButtonGridData(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		//fill horizontal to make them all the same size
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.heightHint = 24;
-		gc.dispose();
-		return gridData;
-	}
-
-	/**
-	 * Handles the button pressed event on the filter criteria.  Move the items
-	 * between the lists based on the selection and but button pressed.
-	 */
-	private void buttonPressed(int buttonId) {
-		String[] items = {
-		};
-		switch (buttonId) {
-			case ADD_TO_ID :
-				items = filterList.getSelection();
-				for (int i = 0; i < items.length; i++) {
-					filters.add(items[i]);
-					filterList.remove(items[i]);
-				}
-				addTo.setEnabled(false);
-				break;
-			case REMOVE_FROM_ID :
-				items = filters.getSelection();
-				for (int i = 0; i < items.length; i++) {
-					filterList.add(items[i]);
-					filters.remove(items[i]);
-				}
-				removeFrom.setEnabled(false);
-				break;
-			case ADD_ALL_TO_ID :
-				items = filterList.getItems();
-				for (int i = 0; i < items.length; i++) {
-					filters.add(items[i]);
-					filterList.remove(items[i]);
-				}
-				break;
-			case REMOVE_ALL_FROM_ID :
-				items = filters.getItems();
-				for (int i = 0; i < items.length; i++) {
-					filters.remove(items[i]);
-					filterList.add(items[i]);
-				}
-				break;
-		}
-		updateFilteringKeysFromControls();
-		if (pageType == CHILD_PAGE) {
-			refreshList();			
-		} else if (pageType == ROOT_PAGE) {
-			PreferenceManager preferenceManager =
-				((SortFilterDialog) getContainer()).getPreferenceManager();
-			Iterator nodes =
-				preferenceManager
-					.getElements(PreferenceManager.PRE_ORDER)
-					.iterator();
-            while (nodes.hasNext()) {
-				PreferenceNode node = (PreferenceNode) nodes.next();
-				SortFilterPage page = (SortFilterPage) node.getPage();
-				if (page == this) {
-					continue;
-				}
-
-				if (Arrays.equals(filterStrings, page.getFilterList())) {
-					page._filteringKeys = new ArrayList(_filteringKeys.size());
-					page._filteringKeys.addAll(_filteringKeys);
-					page._filtering = _filtering;
-					page.populateFilterLists();
-					page.refreshList();
-					page.updateApplyButton();
-				}				
-				
-            }
-			
-		}
-		updateApplyButton();
-	}
-
-	/**
-	 * Helper method which returns an <code>String[]</code> of column names
-	 * which some of the TableViewer class expects.
-	 * @return the String[] of column names
-	 */
-	private String[] getColumnProperties() {
-		String[] columnProperties =
-			new String[tableViewer.getColumnProperties().length];
-		Object[] columnNames = tableViewer.getColumnProperties();
-		for (int i = 0; i < columnNames.length; i++) {
-			columnProperties[i] = (String) columnNames[i];
-		}
-		return columnProperties;
-	}
-
-	private void updateFilteringKeysFromControls() {
-		String[] theFilterStrings = filters.getItems();
-		
-		if (theFilterStrings.length == 0) {
-			_filtering = Filtering.NONE_LITERAL;
-			_filteringKeys = Collections.EMPTY_LIST;
-		} else {
-			_filtering = Filtering.AUTOMATIC_LITERAL;
-			if (_filteringKeys != null) {				
-				_filteringKeys = new ArrayList();
-			}
-			for (int i = 0; i < theFilterStrings.length; i++) {
-				_filteringKeys.add(theFilterStrings[i]);
-			}
-		}
-	}
-	
-	/**
-	 * Updates the table items to reflect the change in the filtering lists.
-	 */
-	void refreshList() {
-		int filterColumn = findColumnIndexFromProperty(filterAppliesTo);
-		if (filterColumn == -1)
-			return;
-		// Set the matching items in this list as not visible
-		for (int j = 0; j < elementCollection.size(); j++) {
-			String cell = labelProvider.getColumnText(elementCollection.get(j),
-					filterColumn);
-			((SortFilterElement) elementCollection.get(j))
-					.setVisible(!_filteringKeys.contains(cell));
-		}
-		if (tableViewer != null)
-			tableViewer.refresh();
-	}
-
-	/**
-	 * Creates table viewer and builds table contents
-	 * @param parent the parent composite
-	 */
-	private void createTable(Composite parent) {
-		tableViewer =
-			new TableViewer(
-				parent,
-				SWT.MULTI
-					| SWT.FULL_SELECTION
-					| SWT.H_SCROLL
-					| SWT.V_SCROLL
-					| SWT.BORDER);
-		// setup table widget
-		tableViewer.setUseHashlookup(true);
-		Table table = tableViewer.getTable();
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		data.horizontalSpan = 1;
-		data.widthHint = convertWidthInCharsToPixels(30);
-		table.setLayoutData(data);
-		table.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				handleSelection();
-			}
-		});
-
-		// Add the columns to the table
-		final String[] columnNames = new String[collectionColumns.size()];
-		int i = 0;
-		Iterator iter = collectionColumns.iterator();
-		while (iter.hasNext()) {
-			SortFilterCollectionColumn columnInfo =
-				(SortFilterCollectionColumn) iter.next();
-			TableColumn column =
-				new TableColumn(table, columnInfo.getAlignment());
-			column.setText(columnInfo.getCaption());
-			column.setResizable(columnInfo.isResizable());
-			column.setWidth(columnInfo.getWidth());
-			column.setAlignment(columnInfo.getAlignment());
-			if (columnInfo.getColumnSorter() != null) {
-				column.addSelectionListener(
-					new HeaderSelectionListener(
-						(SortFilterViewerSorter) columnInfo.getColumnSorter(),
-						tableViewer));
-				// Intialize the table sorter
-				if (_sortColumn != null && column.getText().equals(_sortColumn)) {
-					SortFilterViewerSorter sorter =
-						(SortFilterViewerSorter) columnInfo.getColumnSorter();
-					if (sorter != null) {
-						if (SortingDirection.ASCENDING_LITERAL
-							.equals(_sortingDirection)) {
-							// Use the ascending image
-							Image image = DiagramUIPluginImages.DESC_SORT_ARROW_UP.createImage();
-							column.setImage(image);
-							column.pack();
-						} else if (SortingDirection.DESCENDING_LITERAL
-							.equals(_sortingDirection)) {
-							sorter.toggleSortingDirection();
-							// Use the descending image
-							Image image = DiagramUIPluginImages.DESC_SORT_ARROW_DN.createImage();
-							column.setImage(image);
-							column.pack();
-						}
-					}
-					tableViewer.setSorter(sorter);
-
-				}
-			}
-			columnNames[i++] = columnInfo.getCaption();
-
-		}
-		// setup table viewer
-		tableViewer.setContentProvider(new SortFilterContentProvider());
-		if (labelProvider != null)
-			tableViewer.setLabelProvider(labelProvider);
-		tableViewer.setColumnProperties(columnNames);
-		tableViewer.setCellModifier(new SortFilterCellModifier());
-
-		// Can only changes the first column - the visible column
-		CellEditor[] editors = new CellEditor[collectionColumns.size()];
-		editors[0] = new CheckboxCellEditor(table);
-		for (i = 1; i < collectionColumns.size(); i++) {
-			editors[i] = null;
-		}
-		tableViewer.setCellEditors(editors);
-
-		if (elementCollection != null && !elementCollection.isEmpty())
-			tableViewer.setInput(elementCollection);
-
-		// Update the model
-		TableItem[] tableItems = tableViewer.getTable().getItems();
-		List newModel = new ArrayList();
-		for (i = 0; i < tableItems.length; i++) {
-			SortFilterElement ey = (SortFilterElement) tableItems[i].getData();
-			newModel.add(i, ey);
-		}
-		tableViewer.setInput(newModel);
-		elementCollection = newModel;
-		createBackUp();
-		// pack column widths
-		TableColumn[] tableColumns = table.getColumns();
-		for (i = 0; i < tableColumns.length; i++) {
-			tableColumns[i].pack();
-		}
-	}
-
-	/**
-	 * Creates toolbar
-	 * @param ancestor the parent composite
-	 */
-	private void createToolBar(Composite ancestor) {
-		Composite parent = new Composite(ancestor, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-		parent.setLayout(layout);
-
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		parent.setLayoutData(gridData);
-
-		//to simulate a vertical toolbar (not possible), create a separate toolbar for each button
-		ToolBar toolBar = new ToolBar(parent, SWT.FLAT);
-		Image imageUp = DiagramUIPluginImages.DESC_UP_PATH.createImage();
-		moveUpToolItem = new ToolItem(toolBar, SWT.PUSH);
-		moveUpToolItem.setEnabled(false);
-		moveUpToolItem.setToolTipText(MOVE_UP_TOOL_TIP);
-		moveUpToolItem.setImage(imageUp);
-		moveUpToolItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				moveUpElements();
-			}
-		});
-		ToolBar toolBarDown = new ToolBar(parent, SWT.FLAT);
-		Image imageDown = DiagramUIPluginImages.DESC_DOWN_PATH.createImage();
-		moveDownToolItem = new ToolItem(toolBarDown, SWT.PUSH);
-		moveDownToolItem.setEnabled(false);
-		moveDownToolItem.setToolTipText(MOVE_DOWN_TOOL_TIP);
-		moveDownToolItem.setImage(imageDown);
-		moveDownToolItem.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				moveDownElements();
-			}
-		});
-	}
-	
-	/**
-	 * Move up the selected items from the table
-	 */
-	private void moveUpElements() {
-		int c = tableViewer.getTable().getSelectionCount();
-		if (c == 0)
-			return;
-
-		int[] selectionIndexes = tableViewer.getTable().getSelectionIndices();
-		List model = (ArrayList) ((ArrayList) tableViewer.getInput());
-		for (int i = 0; i < selectionIndexes.length; i++) {
-			SortFilterElement element =
-				(SortFilterElement) model.get(selectionIndexes[i] - 1);
-			model.set(selectionIndexes[i] - 1, model.get(selectionIndexes[i]));
-			model.set(selectionIndexes[i], element);
-		}
-		tableViewer.setSorter(null);
-		tableViewer.refresh();
-
-		_sorting = isSameOrder(elementCollection, baseElements) ? Sorting.NONE_LITERAL
-				: Sorting.MANUAL_LITERAL;
-		_sortingKeys = Collections.EMPTY_MAP;
-
-		handleSelection();
-
-		updateApplyButton();
-	}
-
-	/**
-	 * Move down the selected items from the table
-	 */
-	private void moveDownElements() {
-
-		int selectionCount = tableViewer.getTable().getSelectionCount();
-		if (selectionCount == 0)
-			return;
-
-		List model = (ArrayList) ((ArrayList) tableViewer.getInput());
-		int[] selectionIndexes = tableViewer.getTable().getSelectionIndices();
-		for (int i = selectionIndexes.length - 1; i >= 0; i--) {
-			SortFilterElement element =
-				(SortFilterElement) model.get(selectionIndexes[i] + 1);
-			model.set(selectionIndexes[i] + 1, model.get(selectionIndexes[i]));
-			model.set(selectionIndexes[i], element);
-		}
-		tableViewer.setSorter(null);
-		tableViewer.refresh();
-		
-		_sorting = isSameOrder(elementCollection, baseElements) ? Sorting.NONE_LITERAL
-				: Sorting.MANUAL_LITERAL;
-		_sortingKeys = Collections.EMPTY_MAP;
-		
-		handleSelection();
-
-		updateApplyButton();
-	}
-
-	/**
-	 * Compares two sort filter element lists based on the equality of data fields
-	 * only. 
-	 * @param elements1 <code>List</code> of sort filter elements
-	 * @param elements2 <code>List</code> of sort filter elements
-	 * @return <code>true</code> if both lists are e
-	 */
-	private boolean isSameOrder(List elements1, List elements2) {
-		Iterator itr1 = elements1.iterator();
-		Iterator itr2 = elements2.iterator();
-		while (itr1.hasNext() && itr2.hasNext()) {
-			SortFilterElement element1 = (SortFilterElement)itr1.next();
-			SortFilterElement element2 = (SortFilterElement)itr2.next();
-			if (!element1.getData().equals(element2.getData()))
-				return false;
-		}
-		return !itr1.hasNext() && !itr2.hasNext();
-	}
-
-	/**
-	 * The table viewer selection has changed. Update the toolbar and menu enablements
-	 */
-	private void handleSelection() {
-		ISelection selection = tableViewer.getSelection();
-		if (selection == null
-			|| !(selection instanceof IStructuredSelection)) {
-			return;
-		}
-		IStructuredSelection structuredSelection =
-			(IStructuredSelection) selection;
-		List selectionList = structuredSelection.toList();
-		boolean selectionEmpty = structuredSelection.isEmpty();
-		boolean firstRowSelected = true;
-		boolean lastRowSelected = true;
-		if (!selectionEmpty) {
-			SortFilterElement element =
-				(SortFilterElement) selectionList.get(0);
-			if (tableViewer.getElementAt(0).equals(element)) {
-				firstRowSelected = true;
-			} else {
-				firstRowSelected = false;
-			}
-			element =
-				(SortFilterElement) selectionList.get(selectionList.size() - 1);
-			if (tableViewer
-				.getElementAt(tableViewer.getTable().getItemCount() - 1)
-				.equals(element)) {
-				lastRowSelected = true;
-			} else {
-				lastRowSelected = false;
-			}
-		}
-		if (moveUpToolItem != null) {
-			moveUpToolItem.setEnabled(!firstRowSelected && !selectionEmpty);
-		}
-		if (moveDownToolItem != null) {
-			moveDownToolItem.setEnabled(!lastRowSelected && !selectionEmpty);
-		}
-	}
-	
-	/**
-	 * Used to populate to
-	 * @return the list used to populate the possible filter list
-	 */
-	private String[] getFilterList() {
-		return filterStrings;
-	}
-
-	/**
-	 * 
-	 * @param filterMap
-	 * @param property
-	 */
-	public void setFilter(Map filterMap, String property) {
-		if (filterMap != null) {
-			this.filterMap = filterMap;
-			Object[] filterArray = filterMap.keySet().toArray();
-			this.filterStrings = new String[filterArray.length];
-			for (int i = 0; i < filterArray.length; i++) {
-				filterStrings[i] = (String) filterArray[i];
-			}
-			this.filterAppliesTo = property;
-		}
-	}
-
-	/**
-	 * find the column index using a property
-	 * @param property the proerty to use
-	 * @return the column index
-	 */
-	private int findColumnIndexFromProperty(String property) {
-		for (int i = 0; i < collectionColumns.size(); i++) {
-			if (((SortFilterCollectionColumn)collectionColumns.get(i)).getCaption().equals(property))
-				return i;
-		}
-		return -1;
-	}
-
-	/**
-	 * Sets the input for the table.
-	 * @param sortFilterElements the semantic children for thie <code>IView</code>
-	 */
-	public void setInput(List sortFilterElements) {
-
-		// Remove elements that are not to be shown in the dialog at all.
-		List updatedSortFilterElements = new ArrayList();
-		for (Iterator iter = sortFilterElements.iterator(); iter.hasNext();) {
-			SortFilterElement element = (SortFilterElement) iter.next();
-				updatedSortFilterElements.add(element);
-		}
-
-		// Cache the provided elements for the Reset Default button
-		baseElements = new ArrayList(updatedSortFilterElements.size());
-		for (Iterator itr = updatedSortFilterElements.iterator(); itr.hasNext();) {
-			baseElements.add(new SortFilterElement(((SortFilterElement)itr.next()).getData()));
-		}
-
-		// For the manual Ahoc sorting and filtering we manually initialize the
-		// items
-		if (_filtering == Filtering.MANUAL_LITERAL) {
-			// Use the list of filtered items to initialize the table.
-			// Any new items will not be filtered.
-			if (!updatedSortFilterElements.isEmpty()) {
-				if (_filteredObjects != null && _filteredObjects.size() > 0) {
-					for (int i = 0; i < _filteredObjects.size(); i++) {
-						EObject eObject = (EObject)_filteredObjects.get(i);
-						for (int j = 0; j < updatedSortFilterElements.size(); j++) {
-							SortFilterElement element = (SortFilterElement) updatedSortFilterElements
-								.get(j);
-							if (eObject.equals(element.getData())) {
-								element.setVisible(false);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (_sorting == Sorting.MANUAL_LITERAL) { // Add hoc sorting
-			if (!updatedSortFilterElements.isEmpty()) {
-				if (_sortedObjects != null && _sortedObjects.size() > 0) {
-					// Order the elements by the specified index
-					elementCollection =
-						new ArrayList(updatedSortFilterElements.size());
-					for (int i = 0; i < _sortedObjects.size(); i++) {
-						EObject element = (EObject) _sortedObjects.get(i);
-						for (int j = 0; j < updatedSortFilterElements.size(); j++) {
-							SortFilterElement e = (SortFilterElement) updatedSortFilterElements
-								.get(j);
-							if (element.equals(e.getData())) {
-								elementCollection.add(e);
-							}
-						}
-					}
-					// Add any new children to the end of the list
-					// so they will appear at the botton of the
-					// list compartment
-                    List missingElements = new ArrayList(updatedSortFilterElements);
-                    missingElements.removeAll(elementCollection);
-                    elementCollection.addAll(missingElements);
-				}
-			}
-
-		} else { // Use semantic order
-			elementCollection = updatedSortFilterElements;
-		}
-		createBackUp();
-	}
-	
-	/**
-	 * 
-	 * @param sortFilterElements
-	 * @param hiddenContents
-	 */
-	public void setContents(List sortFilterElements, List hiddenContents) {
-		setInput(sortFilterElements);
-		// Cache the items not to be shown in the dialog, but are otherwise filtered.
-		this._shownAsAlternateViewItems = hiddenContents;
-	}
-
-	/**
-	 * Resets all element to visible and uses the model storage
-	 * ordering for the sorting.
-	 */
-	protected void performDefaults() {
-		_filtering = Filtering.NONE_LITERAL;
-		_filteredObjects = Collections.EMPTY_LIST;
-			
-		// Reset the filter list if they exist
-		if (filterStrings != null) {
-			if (!_filteringKeys.isEmpty()) {
-				_filteringKeys = Collections.EMPTY_LIST;
-				populateFilterLists();
-			}
-		}
-		
-		_sorting = Sorting.NONE_LITERAL;
-		_sortingKeys = Collections.EMPTY_MAP;
-		_sortedObjects = Collections.EMPTY_LIST;
-		
-		tableViewer.setSorter(null);
-		TableColumn[] columns = tableViewer.getTable().getColumns();
-		for (int i = 0; i < columns.length; i++) {
-			columns[i].setImage(null);
-		}
-
-		List input = (List)tableViewer.getInput();
-		input.clear();
-		for (int i=0; i<baseElements.size(); i++) {
-			input.add(new SortFilterElement( ((SortFilterElement)baseElements.get(i)).getData() ));
-		}
-		tableViewer.refresh();
-
-		updateApplyButton();
-
-	}
-
-	/**
-	 * Writes the sorting/filtering specified by the dialog
-	 */
-	protected void performApply() {
-		Command sortAndFilteringCommand = getApplyCommand();
-		if (sortAndFilteringCommand != null
-				&& sortAndFilteringCommand.canExecute()) {
-			editPart.getRoot().getViewer().getEditDomain().getCommandStack()
-					.execute(sortAndFilteringCommand);
-			createBackUp();
-		}
-		updateApplyButton();            
-	}
-	
-	/**
-	 * Creates the command that needs to be executed for this page when "Ok" is
-	 * pressed. It's different from {@link #getApplyCommand()}, because it checks
-	 * whether the page is dirty or not.
-	 * @return <code>Command</code> to be executed per this page
-	 */
-	public Command getCommand() {
-		if (isDirty())
-			return getApplyCommand();
-		return null;
-	}
-	
-	/**
-	 * Returns a <code>Command</code> that set both the sorting and filtering
-	 * for this particular list compartment.
-	 * 
-	 * @return the command
-	 */
-	public Command getApplyCommand() {
-		Command cmd = UnexecutableCommand.INSTANCE;
-		if (CHILD_PAGE.equals(pageType)) {
-			List newSortedObjects = Collections.EMPTY_LIST; 
-			if (_sorting.equals(Sorting.MANUAL_LITERAL)) {
-					newSortedObjects = new ArrayList();
-					for (Iterator itr = elementCollection.iterator(); itr.hasNext();) {
-						SortFilterElement element = (SortFilterElement) itr.next();
-						newSortedObjects.add(element.getData());
-					}
-			}
-			
-			List newFilteredObjects = Collections.EMPTY_LIST;
-			if (_filtering.equals(Filtering.MANUAL_LITERAL)) {
-				newFilteredObjects = new ArrayList();
-				for (Iterator itr = elementCollection.iterator(); itr.hasNext();) {
-					SortFilterElement element = (SortFilterElement) itr.next();
-					if (!element.isVisible()) {
-						newFilteredObjects.add(element.getData());
-					}
-				}
-				if (_filtering.equals(Filtering.MANUAL_LITERAL) && newFilteredObjects.size() == 0) {
-					_filtering = Filtering.NONE_LITERAL;
-				}
-			}	
-			
-			// Add the objects filtered otherwise.
-			if (!_shownAsAlternateViewItems.isEmpty()
-				&& Collections.EMPTY_LIST.equals(newFilteredObjects)) {
-				newFilteredObjects = new ArrayList();
-			}
-			newFilteredObjects.addAll(_shownAsAlternateViewItems);
-	
-			ChangeSortFilterRequest request = new ChangeSortFilterRequest(
-				_filtering, newFilteredObjects, _filteringKeys, _sorting,
-				newSortedObjects, _sortingKeys);
-			
-			cmd = editPart.getCommand(request);		
-		}
-		return cmd;
-	}
-
-	/**
-	 * Populates the filter lists based on the _filteringKeys
-	 * and the filter criteria.
-	 */
-	private void populateFilterLists() {
-		if (filterMap != null && !filterMap.isEmpty() && filterList != null && filters != null) {
-			filterList.removeAll();
-			filters.removeAll();
-			Set keySet = filterMap.keySet();
-			Iterator i = keySet.iterator();
-			if (_filtering == Filtering.AUTOMATIC_LITERAL) {
-				// Set the values of the filtered and unfiltered string
-				while (i.hasNext()) {
-					String filterString = (String) i.next();
-					if (_filteringKeys.contains(filterString)) {
-						filters.add(filterString);						
-					} else {
-						filterList.add(filterString);
-					}
-				}
-			} else {
-				// Add all filter strings to the possible filter list
-				while (i.hasNext()) {
-					String filterString = (String) i.next();
-					filterList.add(filterString);
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Caches ID_FILTERING, ID_FILTERED_OBJECTS and ID_FILTERING_KEYS values for local access.
-	 */
-	private void tokenizeFilterProperty() {
-		Object model = editPart.getModel();
-		if (model instanceof View){
-			View view = (View)model;
-			FilteringStyle style = (FilteringStyle) view.getStyle(NotationPackage.eINSTANCE.getFilteringStyle());
-			if (style != null) {
-				_filtering = style.getFiltering();	
-				_filteredObjects = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects())
-					? new ArrayList(style.getFilteredObjects())
-					: Collections.EMPTY_LIST;
-				_filteringKeys = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys())
-					? new ArrayList(style.getFilteringKeys())
-					: Collections.EMPTY_LIST;
-			}
-		}
-	}
-
-	/**
-	 * Caches ID_SORTING, ID_SORTED_OBJECTS and ID_SORTING_KEYS values for local access.
-	 */
-	private void tokenizeSortProperty() {
-		Object model = editPart.getModel();
-		if (model instanceof View){
-			View view = (View)model;
-			SortingStyle style = (SortingStyle)view.getStyle(NotationPackage.eINSTANCE.getSortingStyle());
-			if (style != null) {
-				_sorting =	style.getSorting();		
-				_sortedObjects = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortedObjects())
-					? new ArrayList(style.getSortedObjects())
-					: Collections.EMPTY_LIST;
-				_sortingKeys = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortingKeys())
-					? new HashMap(style.getSortingKeys())
-					: Collections.EMPTY_MAP;
-						
-				// Currently, only one sorting column can be defined.
-				if (_sortingKeys.size() > 0) {
-					Set keySet = _sortingKeys.keySet();
-					Iterator iter = keySet.iterator();
-					if (iter.hasNext()) {
-						_sortColumn = (String) iter.next();
-						_sortingDirection = (SortingDirection) _sortingKeys.get(_sortColumn);
-					}
-						
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * SortFilterCellModifiers. Simple cell modifiers for the first column only
-	 * 
-	 * @author jcorchis
-	 */
-	public class SortFilterCellModifier implements ICellModifier {
-
-		/**
-		 * Only allows the visibility property to be modified.
-		 * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
-		 */
-		public boolean canModify(Object element, String property) {
-			int columnIndex = findPropertyIndex(property);
-			if (columnIndex == 0) {
-				return true;
-			}
-			return true;
-		}
-
-		/**
-		 * Gets the value of the table's cell.
-		 * @param element the SortFilterElement
-		 * @param property the table property
-		 * @return the cell's value
-		 * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
-		 */
-		public Object getValue(Object element, String property) {
-			SortFilterElement item = (SortFilterElement) element;
-
-			// Find the index of the column
-			Object result = null;
-			int columnIndex = findPropertyIndex(property);
-			if (columnIndex == 0) {
-				result = Boolean.valueOf(item.isVisible());
-			}
-			return result;
-		}
-
-		/**
-		 * Modifies the visibility of the compartment item.
-		 * @param element the SortFilterElement
-		 * @param property the table property
-		 * @param value the cell's new value
-		 * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
-		 */
-		public void modify(Object element, String property, Object value) {
-			boolean newValue = ((Boolean) value).booleanValue();
-			TableItem tableItem = (TableItem) element;
-			SortFilterElement item = (SortFilterElement) tableItem.getData();
-			int columnIndex = findPropertyIndex(property);
-			if (columnIndex == 0) {
-				TableItem[] tableItems = tableViewer.getTable().getItems();
-				for (int j = 0; j < tableItems.length; j++) {
-					SortFilterElement data =
-						(SortFilterElement) tableItems[j].getData();
-					if (data.equals(item)) {
-						(
-							(SortFilterElement) tableViewer.getElementAt(
-								j)).setVisible(
-							newValue);
-						tableViewer.update(
-							new Object[] { tableViewer.getElementAt(j)},
-							new String[] { getColumnProperties()[0] });
-					}
-				}
-
-				tableViewer.update(
-					new Object[] { element },
-					new String[] { getColumnProperties()[0] });
-
-				// Remove all the filtering criteria since the user
-				// is filtering in an ad hoc manner
-				if (filterStrings != null) {
-					String[] items = filters.getItems();
-					for (int i = 0; i < items.length; i++) {
-						filterList.add(items[i]);
-						filters.remove(items[i]);
-					}
-				}
-				_filteringKeys = Collections.EMPTY_LIST;
-				
-				_filtering = newValue ? Filtering.NONE_LITERAL : Filtering.MANUAL_LITERAL;
-				if (newValue) {
-					Iterator itr = elementCollection.iterator();
-					while (itr.hasNext()) {
-						if (!baseElements.contains(itr.next())) {
-							_filtering = Filtering.MANUAL_LITERAL;
-							break;
-						}
-					}
-				}
-				updateApplyButton();
-			}
-		}
-
-		/**
-		 * Maps the column property to the index the property appears.
-		 * @param property the column property
-		 * @return the appearance index of the property
-		 */
-		private int findPropertyIndex(String property) {
-			Object[] columnNames = tableViewer.getColumnProperties();
-			for (int i = 0; i < columnNames.length; i++) {
-				if (((String) columnNames[i]).equals(property))
-					return i;
-			}
-			return -1;
-
-		}
-
-	}
-
-	/**
-	 * <code>SelectionListener</code> implementation for selection on the Table's column
-	 * headers. Header selection event will sort the table by the column selected,
-	 * both ascending and descending, as well as insert the an image in the selected column
-	 * header to indicate the sort order. This listener treats both a single and double clicks
-	 * as the same to support different OS selection firing.
-	 * 
-	 * @author jcorchis
-	 */
-	class HeaderSelectionListener implements SelectionListener {
-		private SortFilterViewerSorter sorter;
-		private TableViewer _tableViewer;
-		/**
-		 * Constructor for the HeaderSelectionListener
-		 * @param sorter the <code>TableViewer</code> sorter
-		 * @param tableViewer the <code>TableViewer</code>
-		 */
-		public HeaderSelectionListener(
-			SortFilterViewerSorter sorter,
-			TableViewer tableViewer) {
-			this.sorter = sorter;
-			_tableViewer = tableViewer;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			// Handle click to sort
-			handleEvent(e);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetDefaultSelected(SelectionEvent e) {
-			// Handle double click to sort
-			handleEvent(e);
-		}
-
-		private void handleEvent(SelectionEvent e) {
-			// Clear any existing header images
-			TableColumn[] columns = _tableViewer.getTable().getColumns();
-			for (int i = 0; i < columns.length; i++) {
-				columns[i].setImage(null);
-			}
-			// Add the image based on the sort
-			int columnIndex = 0;
-			if (e.widget instanceof TableColumn) {
-				TableColumn column = (TableColumn) e.widget;
-				columnIndex = findColumnIndexFromProperty(column.getText());
-				if (columnIndex != -1) {
-					Image image = null;
-					SortFilterViewerSorter newSorter =
-						(SortFilterViewerSorter) _tableViewer.getSorter();
-					if (newSorter != null) {
-						newSorter.toggleSortingDirection();
-						if (newSorter == null
-							|| SortingDirection.ASCENDING_LITERAL
-								.equals(newSorter.getSortingDirection())) {
-							// Use the ascending image
-							image = DiagramUIPluginImages.DESC_SORT_ARROW_UP
-								.createImage();
-						} else {
-							// Use the descending image
-							image = DiagramUIPluginImages.DESC_SORT_ARROW_DN
-								.createImage();
-						}
-						columns[columnIndex].setImage(image);
-					}
-				}
-			}
-
-			if (sorter != null) {
-				// Does the actual sorting				
-				_tableViewer.setSorter(null);
-				// Necessary to use ascending/descending sorting
-				_tableViewer.setSorter(getSorter());
-
-				// Update the model
-				TableItem[] tableItems = _tableViewer.getTable().getItems();
-				List newModel = new ArrayList();
-				for (int i = 0; i < tableItems.length; i++) {
-					SortFilterElement ey =
-						(SortFilterElement) tableItems[i].getData();
-					newModel.add(i, ey);
-				}
-				elementCollection.clear();
-				elementCollection.addAll(newModel);
-				_tableViewer.refresh();
-
-				_sorting = Sorting.AUTOMATIC_LITERAL;
-				Object[] columnNames = tableViewer.getColumnProperties();
-				if (_sortingKeys != Collections.EMPTY_MAP) {
-					_sortingKeys.clear();
-						
-				} else {
-					_sortingKeys = new HashMap();
-				}
-				_sortingKeys.put(columnNames[columnIndex], getSorter().getSortingDirection());				
-
-				handleSelection();
-
-				updateApplyButton();
-			}
-
-		}
-		
-		/**
-		 * gets the sorter
-		 * @return the sorter
-		 */
-		public SortFilterViewerSorter getSorter() {
-			return sorter;
-		}
-	}
-
-	/** 
-	 * Method to allow the ROOT page to set the possible filter
-	 * items for this page.
-	 * @param filterCriteriaList
-	 */
-	void setFilterCriteria(String[] filterCriteriaList) {
-		filters.setItems(filterCriteriaList);
-	}
-
-	/**
-	 * Checks whether this page is filtering it's contents.
-	 * @return <code>true</code> if this page is filtering it's contents.
-	 */
-	boolean isFiltering() {
-		return filterStrings == null ? false : (filters.getItems().length != 0);
-	}
-
-	/**
-	 * Method to allows the ROOT page to set the filter criteria of a CHILD page.
-	 * @param criteriaList the filter criteria
-	 */
-	void setCriteria(String[] criteriaList) {
-		filterList.setItems(criteriaList);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#updateApplyButton()
-	 */
-	protected void updateApplyButton() {
-		if (getApplyButton() != null)
-			getApplyButton().setEnabled(isValid() && isDirty());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		updateApplyButton();
-	}
-	
-	/**
-	 * Determines whether the page contains changes that can be applied.
-	 * @return <code>true</code> if page is dirty
-	 */
-	protected boolean isDirty() {
-		if (pageType == ROOT_PAGE
-			|| _filteringBackUp != _filtering
-			|| _sortingBackUp != _sorting)
-			return true;
-		
-		return !elementCollection.equals(elementCollectionBackUp);
-	}
-	
-	/**
-	 * Creates the back up of the initial data to determine whether the page
-	 * has applicable changes later on.
-	 */
-	private void createBackUp() {
-		_filteringBackUp = _filtering;
-		_sortingBackUp = _sorting;
-		elementCollectionBackUp = new ArrayList(elementCollection.size());
-		for (Iterator itr = elementCollection.iterator(); itr.hasNext();) {
-			SortFilterElement element = (SortFilterElement) itr.next();
-			elementCollectionBackUp.add(new SortFilterElement(element
-					.isVisible(), element.getData()));
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterViewerSorter.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterViewerSorter.java
deleted file mode 100644
index fb46654..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/SortFilterViewerSorter.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.dialogs.sortfilter;
-
-
-import java.util.Locale;
-
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.gmf.runtime.notation.SortingDirection;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * Provides a <code>ViewerSorter</code> which tracks the type 
- * of sorting to ascending or descending orders.
- * 
- * @author jcorchis
- */
-public class SortFilterViewerSorter extends ViewerSorter {
-	
-	/** The sorting direction for comparator */
-	private SortingDirection sortingDirection = SortingDirection.ASCENDING_LITERAL;
-	/** The hint for the sorting.  Defines the item to sort on  */
-	protected int criteria;
-	/** The locale specific collator */
-	protected Collator collator = Collator.getInstance(Locale.getDefault());	
-	
-
-	/**
-	 * Toggles the sorting direction from its current state.
-	 */
-	public void toggleSortingDirection() {
-		sortingDirection = (SortingDirection.ASCENDING_LITERAL.equals(sortingDirection)) 
-			? SortingDirection.DESCENDING_LITERAL
-			: SortingDirection.ASCENDING_LITERAL;
-	}
-
-	/**
-	 * @return Returns the sortingDirection.
-	 */
-	public SortingDirection getSortingDirection() {
-		return sortingDirection;
-	}
-	/**
-	 * @param sortingDirection The sortingDirection to set.
-	 */
-	public void setSortingDirection(SortingDirection sortingDirection) {
-		this.sortingDirection = sortingDirection;
-	}
-	
-	/**
-	 * @return Returns the criteria.
-	 */
-	public int getCriteria() {
-		return criteria;
-	}
-	
-	/**
-	 * @param criteria The criteria to set.
-	 */
-	public void setCriteria(int criteria) {
-		this.criteria = criteria;
-	}
-	
-	/**
-	 * compares the passed elements based on the current <code>SortingDirection
-	 * </code>
-	 * @param item1	first item
-	 * @param item2 second item
-	 * @return a negative number if the first item is before the 
-     *  second element; the value <code>0</code> if the first element is
-     *  the same order as the second element; and a positive number if the first
-     *  element is after the second element
-     */
-	protected int compareString(String item1, String item2) {
-
-		int result = 0;
-		if (SortingDirection.ASCENDING_LITERAL.equals(getSortingDirection())) {
-			result = collator.compare(item1, item2);
-		} else {
-			result = collator.compare(item2, item1);
-		}
-
-		return result;
-	}
-
-	/**
-	 * compares the passed elements based on the current <code>SortingDirection
-	 * </code>
-	 * @param item1	first item
-	 * @param item2 second item
-	 * @return a negative number if the first item is before the 
-     *  second element; the value <code>0</code> if the first element is
-     *  the same order as the second element; and a positive number if the first
-     *  element is after the second element
-     */	
-	protected int compareVisible(String item1, String item2) {
-		int result = 0;
-		if (SortingDirection.ASCENDING_LITERAL.equals(getSortingDirection())) {
-			result = collator.compare(item1, item2);
-		} else {
-			result = collator.compare(item2, item1);
-		}
-
-		return result;
-	}	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/package.html
deleted file mode 100644
index 3db6fd3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/dialogs/sortfilter/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>
-dialogs for the sort filter</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderItemEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderItemEditPart.java
deleted file mode 100644
index 928164a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderItemEditPart.java
+++ /dev/null
@@ -1,123 +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.editparts;
-
-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.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The class controls the behavior of a border item. It determines the
- * connections coming in and out. Created On: Jul 8, 2003
- * 
- * @author tisrar, jbruck, cmahoney
- */
-public abstract class AbstractBorderItemEditPart
-	extends ShapeNodeEditPart
-	implements IBorderItemEditPart {
-
-	/**
-	 * Create an instance.
-	 * 
-	 * @param view
-	 *            the editpart's model.
-	 */
-	public AbstractBorderItemEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Refresh the bounds using a <tt>locator</tt> if this editpart's lcoator
-	 * is a BorderItemLocatorinstance; otherwise, the <tt>super</tt>
-	 * implementation is used. Locators are used since a
-	 * <tt>border item element</tt> 's position and extent properties are not
-	 * persisted.
-	 */
-	protected void refreshBounds() {
-		if (getBorderItemLocator() != null) {
-			int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_X())).intValue();
-			int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE
-				.getLocation_Y())).intValue();
-			Point loc = new Point(x, y);
-			
-			int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-			int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-			Dimension size = new Dimension(width, height);
-
-			getBorderItemLocator().setConstraint(new Rectangle(
-				loc, size));
-		} else {
-			super.refreshBounds();
-		}
-	}
-
-	/**
-	 * Convenience method to return the locator associated with editpart's
-	 * figure via the parent figure's layout manager.
-	 * 
-	 * @return the <code>Locator</code>
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(
-				getFigure());
-			if (constraint instanceof IBorderItemLocator) {
-				return (IBorderItemLocator) constraint;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the editpolicy to be installed as an
-	 * <code>EditPolicy#PRIMARY_DRAG_ROLE</code> role. This method is
-	 * typically called by <code>LayoutEditPolicy#createChildEditPolicy()</code>
-	 * 
-	 * @return <code>EditPolicy</code>
-	 */
-	public EditPolicy getPrimaryDragEditPolicy() {
-		return new BorderItemSelectionEditPolicy();
-	}
-
-	/**
-	 * 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.NAME);
-	}
-
-	/** Return a {@link DragTracker} instance. */
-	public DragTracker getDragTracker(Request request) {
-		return new DragEditPartsTrackerEx(this) {
-
-			protected boolean isMove() {
-				return true;
-			}
-		};
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderedShapeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderedShapeEditPart.java
deleted file mode 100644
index 3a800a7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderedShapeEditPart.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionLabelsEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This is a shape which may contain border items. It has accessors for the main
- * figure and the bordered figure. It delegates calls to the main figure or
- * bordered figure as appropriate. It handles the adding of border items with a
- * default locator; to change the locator, override the method
- * {@link #addBorderItem(IFigure, IBorderItemEditPart)}.
- * 
- * @author tisrar, jbruck, cmahoney
- */
-public abstract class AbstractBorderedShapeEditPart
-	extends ShapeNodeEditPart
-	implements IBorderedShapeEditPart {
-
-	/**
-	 * Create an instance.
-	 * 
-	 * @param view
-	 *            editpart's model
-	 */
-	public AbstractBorderedShapeEditPart(View view) {
-		super(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart#getElementFigure()
-	 */
-	public IFigure getMainFigure() {
-		return getBorderedFigure().getMainFigure();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart#getBorderedFigure()
-	 */
-	public final BorderedNodeFigure getBorderedFigure() {
-		return (BorderedNodeFigure) getFigure();
-	}
-
-	public void setLayoutConstraint(EditPart child, IFigure childFigure,
-			Object constraint) {
-		getContentPaneFor((IGraphicalEditPart) child).setConstraint(
-			childFigure, constraint);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getContentPaneFor(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		} else {
-			return getMainFigure();
-		}
-	}
-
-	/**
-	 * Adds the supplied child to the editpart's border item container figure if
-	 * it is an instanceof {@link IBorderItemEditPart}.
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		IFigure childFigure = ((GraphicalEditPart) childEditPart).getFigure();
-		if (childEditPart instanceof IBorderItemEditPart) {
-			IFigure borderItemContainer = getContentPaneFor((IGraphicalEditPart) childEditPart);
-			addBorderItem(borderItemContainer,
-				(IBorderItemEditPart) childEditPart);
-		} else {
-			IFigure parent = getContentPaneFor((IGraphicalEditPart) childEditPart);
-
-            // If there are a mixture of border items and other contained
-            // figures, the index may be incorrect and could result in out of
-            // bounds exceptions.
-            index = Math.min(parent.getChildren().size(), index);
-            
-            parent.add(childFigure, index);
-		}
-	}
-	
-	protected void reorderChild(EditPart child, int index) {
-        if (child instanceof IBorderItemEditPart) {
-            // Save the border item locator so that it does not get lost during
-            // the remove and re-add. This is overridden from the parent class
-            // so that the correct content pane is used.
-            IFigure childFigure = ((GraphicalEditPart) child).getFigure();
-            LayoutManager layout = getContentPaneFor((IGraphicalEditPart) child)
-                .getLayoutManager();
-            Object constraint = null;
-            if (layout != null)
-                constraint = layout.getConstraint(childFigure);
-
-            super.reorderChild(child, index);
-
-            setLayoutConstraint(child, childFigure, constraint);
-        } else {
-            super.reorderChild(child, index);
-        }
-    }
-	
-	/**
-	 * Remove the supplied child editpart's figure from this editpart's figure.
-	 */
-	protected void removeChildVisual(EditPart child) {
-		IFigure childFigure = ((GraphicalEditPart) child).getFigure();
-		IFigure fig = getContentPaneFor((IGraphicalEditPart) child);
-		fig.remove(childFigure);
-	}
-
-	/**
-	 * Adds the border item figure to the border item container with a locator.
-	 * 
-	 * @param borderItemContainer
-	 *            the figure to which the border item figure is added
-	 * @param borderItemEditPart
-	 *            the border item editpart from which to retrieve the border
-	 *            item figure and determine which locator to create
-	 */
-	protected void addBorderItem(IFigure borderItemContainer,
-			IBorderItemEditPart borderItemEditPart) {
-		borderItemContainer.add(borderItemEditPart.getFigure(),
-			new BorderItemLocator(getMainFigure()));
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CONNECTION_LABELS_ROLE,
-			new ConnectionLabelsEditPolicy());
-	}
-
-	/**
-	 * Returns a {@link BorderedNodeFigure}that will <i>wrap</i> this
-	 * editpart's main figure.
-	 * 
-	 * @see #createMainFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new BorderedNodeFigure(createMainFigure());
-	}
-
-	/**
-	 * Creates this editpart's main figure.
-	 * 
-	 * @return the created <code>NodeFigure</code>
-	 */
-	protected abstract NodeFigure createMainFigure();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/BorderedBorderItemEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/BorderedBorderItemEditPart.java
deleted file mode 100644
index f52d9ee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/BorderedBorderItemEditPart.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionLabelsEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * A border item shape that can also have border items. This editpart has the
- * behavior of a
- * {@link org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart}
- * and a
- * {@link org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart}.
- * 
- * @author cmahoney
- */
-public abstract class BorderedBorderItemEditPart
-	extends AbstractBorderItemEditPart implements IBorderedShapeEditPart {
-
-	/**
-	 * Create an instance.
-	 * 
-	 * @param view
-	 *            the editpart's model.
-	 */
-	public BorderedBorderItemEditPart(View view) {
-		super(view);
-	}
-	
-	protected NodeFigure createNodeFigure() {
-		return new BorderedNodeFigure(createMainFigure());
-	}
-
-	/**
-	 * Creates this editpart's main figure.
-	 * 
-	 * @return the created <code>NodeFigure</code>
-	 */
-	protected abstract NodeFigure createMainFigure();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart#getElementFigure()
-	 */
-	public IFigure getMainFigure() {
-		return getBorderedFigure().getMainFigure();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart#getBorderedFigure()
-	 */
-	public final BorderedNodeFigure getBorderedFigure() {
-		return (BorderedNodeFigure) getFigure();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getContentPaneFor(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		} else {
-			return getMainFigure();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#addChildVisual(org.eclipse.gef.EditPart, int)
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		IFigure childFigure = ((IGraphicalEditPart) childEditPart).getFigure();
-		if (childEditPart instanceof IBorderItemEditPart) {
-			IFigure borderItemContainer = getContentPaneFor((IGraphicalEditPart) childEditPart);
-			addBorderItem(borderItemContainer,
-				(IBorderItemEditPart) childEditPart);
-		} else {
-			IFigure parent = getContentPaneFor((IGraphicalEditPart) childEditPart);
-
-            // If there are a mixture of border items and other contained
-            // figures, the index may be incorrect and could result in out of
-            // bounds exceptions.
-            index = Math.min(parent.getChildren().size(), index);
-
-            parent.add(childFigure, -1);
-		}
-	}
-	
-	protected void reorderChild(EditPart child, int index) {
-        if (child instanceof IBorderItemEditPart) {
-            // Save the border item locator so that it does not get lost during
-            // the remove and re-add. This is overridden from the parent class
-            // so that the correct content pane is used.
-            IFigure childFigure = ((GraphicalEditPart) child).getFigure();
-            LayoutManager layout = getContentPaneFor((IGraphicalEditPart) child)
-                .getLayoutManager();
-            Object constraint = null;
-            if (layout != null)
-                constraint = layout.getConstraint(childFigure);
-
-            super.reorderChild(child, index);
-
-            setLayoutConstraint(child, childFigure, constraint);
-        } else {
-            super.reorderChild(child, index);
-        }
-    }
-	   
-	protected void removeChildVisual(EditPart child) {
-		IFigure childFigure = ((GraphicalEditPart) child).getFigure();
-		IFigure fig = getContentPaneFor((IGraphicalEditPart) child);
-		fig.remove(childFigure);
-	}
-	
-	/**
-	 * Adds the border item figure to the border item container with a locator.
-	 * 
-	 * @param borderItemContainer
-	 *            the figure to which the border item figure is added
-	 * @param borderItemEditPart
-	 *            the border item editpart from which to retrieve the border
-	 *            item figure and determine which locator to create
-	 */
-	protected void addBorderItem(IFigure borderItemContainer,
-			IBorderItemEditPart borderItemEditPart) {
-		borderItemContainer.add(borderItemEditPart.getFigure(),
-			new BorderItemLocator(getMainFigure()));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.GraphicalEditPart#setLayoutConstraint(org.eclipse.gef.EditPart, org.eclipse.draw2d.IFigure, java.lang.Object)
-	 */
-	public void setLayoutConstraint(EditPart child, IFigure childFigure,
-			Object constraint) {
-		getContentPaneFor((IGraphicalEditPart) child).setConstraint(
-			childFigure, constraint);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CONNECTION_LABELS_ROLE,
-			new ConnectionLabelsEditPolicy()); // enable the +/- for floating
-		// labels.
-
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java
deleted file mode 100644
index 0fbad57..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java
+++ /dev/null
@@ -1,96 +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.diagram.ui.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IContainedEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.DelegatingMouseEventsEditPolicy;
-import org.eclipse.gmf.runtime.gef.ui.internal.tools.DelegatingDragEditPartsTracker;
-
-/**
- * @author melaasar
- * 
- * An editpart that controls a compartment view
- */
-public abstract class CompartmentEditPart extends GraphicalEditPart implements IContainedEditPart {
-
-	/**
-	 * Constructs a new compartment edit part
-	 * @param view
-	 */
-	public CompartmentEditPart(EObject model) {
-		super(model);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE,
-			new DelegatingMouseEventsEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE));
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE,
-			new DelegatingMouseEventsEditPolicy(EditPolicyRoles.POPUPBAR_ROLE));
-	}
-	
-	/**
-	 * By default, all compartment edit parts get selectable only if 
-	 * the compartment's top level container matches the top level
-	 * container of the editpart that currently has the keyboard focus
-	 * i.e: you need to select the shape first before selecting a compartment
-	 * but once a compartment is selected, a peer compartment can also be selected
-	 * @see org.eclipse.gef.EditPart#isSelectable()
-	 */
-	public boolean isSelectable() {
-		if (super.isSelectable()) {
-			EditPart focusPart = getViewer().getFocusEditPart();
-			if (focusPart instanceof IGraphicalEditPart) {
-				TopGraphicEditPart focusTopEP =
-					((IGraphicalEditPart) focusPart).getTopGraphicEditPart();
-				TopGraphicEditPart myTopEP = getTopGraphicEditPart();
-				if (myTopEP == focusTopEP) {
-					// check if the selection contains only editparts belonging to 
-					// the same top level editpart
-					Iterator selection =
-						getViewer().getSelectedEditParts().iterator();
-					while (selection.hasNext()) {
-						Object editPart = selection.next();
-						if (editPart instanceof IGraphicalEditPart
-							&& (((IGraphicalEditPart) editPart)
-								.getTopGraphicEditPart()
-								!= myTopEP))
-							return false;
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPart#getDragTracker(org.eclipse.gef.Request)
-	 */
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest
-			&& ((SelectionRequest) request).getLastButtonPressed() == 3)
-			return null;
-		return new DelegatingDragEditPartsTracker(
-			this,
-			getTopGraphicEditPart());
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java
deleted file mode 100644
index cde98c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java
+++ /dev/null
@@ -1,2064 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-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.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineDecoration;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gef.requests.TargetRequest;
-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.ActionFilterService;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-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.editpolicies.ConnectionBendpointEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionLabelsEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.PropertyHandlerEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ToggleCanonicalModeCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IContainedEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ConnectionLineSegEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.TreeConnectionBendpointEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpolicy.EditPolicyService;
-import org.eclipse.gmf.runtime.diagram.ui.internal.type.NotationTypeUtil;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ConnectionLayerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ForestRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
-import org.eclipse.gmf.runtime.gef.ui.internal.l10n.Cursors;
-import org.eclipse.gmf.runtime.gef.ui.internal.tools.SelectConnectionEditPartTracker;
-import org.eclipse.gmf.runtime.notation.ArrowStyle;
-import org.eclipse.gmf.runtime.notation.ArrowType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.JumpLinkStatus;
-import org.eclipse.gmf.runtime.notation.JumpLinkType;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * the base edit part that controls <code>Edge</code> views, it is the basic
- * controller for the connection's view
- * 
- * @author mmostafa
- */
-abstract public class ConnectionEditPart
-    extends AbstractConnectionEditPart
-    implements IGraphicalEditPart, PropertyChangeListener, IContainedEditPart,
-    IPrimaryEditPart, NotificationListener {
-
-    /** A map of listener filters ids to filter data */
-    private Map listenerFilters;
-
-    /** Used for registering and unregistering the edit part */
-    private String elementGuid;
-
-    /**
-     * Flag to indicate if the edit part is in edit mode
-     */
-    private boolean isEditable = true;
-
-    /** Used for accessibility. */
-    protected AccessibleEditPart accessibleEP;
-
-    /**
-     * Cache the editing domain after it is retrieved.
-     */
-    private TransactionalEditingDomain editingDomain;
-
-     
-    /**
-     * Cache the font data when a font is created so that it can be
-     * disposed later.
-     */
-    private FontData cachedFontData;
-    
-    /**
-	 * Cache the answer to whether or not this is a semantic connection after it
-	 * is retrieved.
-	 */
-    private Boolean semanticConnection;
-    
-    /** counter that tracs the recursive depth of the getCommand() method. */
-    private static volatile int GETCOMMAND_RECURSIVE_COUNT = 0;
-    
-    /** A list of editparts who's canonical editpolicies are to be temporarily disabled. */
-    private static Set _disableCanonicalEditPolicyList = new HashSet();
-    
-    /**
-     * gets a property change command for the passed property, using both of the
-     * old and new values
-     * 
-     * @param property
-     *            the property associated with the command
-     * @param oldValue
-     *            the old value associated with the command
-     * @param newValue
-     *            the new value associated with the command
-     * @return a command
-     */
-    protected Command getPropertyChangeCommand(Object property,
-            Object oldValue, Object newValue) {
-        // by default return null, which means there is no special command to
-        // change the property
-        return null;
-    }
-    
-    
-
-    protected void addChild(EditPart child, int index) {
-        super.addChild(child, index);
-        if (child instanceof GraphicalEditPart){
-            GraphicalEditPart gEP = (GraphicalEditPart)child;
-            boolean editMode = isEditModeEnabled(); 
-            if (editMode != gEP.isEditModeEnabled()){
-                if (editMode)
-                    gEP.enableEditMode();
-                else
-                    gEP.disableEditMode();
-            }
-        }
-    }
-
-
-
-    /**
-     * Register the adapters for the standard properties.
-     */
-    static {
-        registerAdapters();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPart#activate()
-     */
-    public void activate() {
-    	
-    	if (isActive()) {
-            return;
-        }
-    	
-        addNotationalListeners();
-
-        EObject semanticProxy = ((View) getModel()).getElement();
-        EObject semanticElement = EMFCoreUtil.resolve(getEditingDomain(),
-            semanticProxy);
-
-        if (semanticElement != null)
-            addSemanticListeners();
-        else if (semanticProxy != null) {
-            addListenerFilter("SemanticProxy", this, semanticProxy); //$NON-NLS-1$
-        }
-        super.activate();
-    }
-
-    /**
-     * Adds a listener filter by adding the given listener to a passed notifier
-     * 
-     * @param filterId
-     *            A unique filter id (within the same editpart instance)
-     * @param listener
-     *            A listener instance
-     * @param notifier
-     *            An element notifer to add the listener to
-     */
-    protected void addListenerFilter(String filterId,
-            NotificationListener listener, EObject element) {
-
-        if (element == null)
-            return;
-
-    	assert filterId != null;
-    	assert listener != null;
-
-        if (listenerFilters == null)
-            listenerFilters = new HashMap();
-
-        getDiagramEventBroker().addNotificationListener(element, listener);
-        listenerFilters.put(filterId, new Object[] {element, listener});
-    }
-
-    /**
-     * Adds a listener filter by adding the given listener to a passed notifier
-     * 
-     * @param filterId
-     *            A unique filter id (within the same editpart instance)
-     * @param listener
-     *            A listener instance
-     * @param notifier
-     *            An element notifer to add the listener to
-     */
-    protected void addListenerFilter(String filterId,
-            NotificationListener listener, EObject element,
-            EStructuralFeature feature) {
-
-        if (element == null)
-            return;
-
-    	assert filterId != null;
-    	assert listener != null;
-
-        if (listenerFilters == null)
-            listenerFilters = new HashMap();
-
-        getDiagramEventBroker().addNotificationListener(element, feature,
-            listener);
-        listenerFilters
-            .put(filterId, new Object[] {element, feature, listener});
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createChild(java.lang.Object)
-     */
-    final protected EditPart createChild(Object model) {
-        return EditPartService.getInstance()
-            .createGraphicEditPart((View) model);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createConnection(java.lang.Object)
-     */
-    final protected org.eclipse.gef.ConnectionEditPart createConnection(
-            Object connectionView) {
-        return (org.eclipse.gef.ConnectionEditPart) createChild(connectionView);
-    }
-
-    /**
-     * Overridden to support editpolicies installed programmatically and via the
-     * <code>EditPolicyService</code>. Subclasses should override
-     * <code>createDefaultEditPolicies()</code>.
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-     */
-    final protected void createEditPolicies() {
-        createDefaultEditPolicies();
-        EditPolicyService.getInstance().createEditPolicies(this);
-    }
-
-    /**
-     * Should be overridden to install editpolicies programmatically.
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-     */
-    protected void createDefaultEditPolicies() {
-        installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-            new SemanticEditPolicy());
-        installEditPolicy(EditPolicyRoles.PROPERTY_HANDLER_ROLE,
-            new PropertyHandlerEditPolicy());
-        installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
-            new org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy());
-        installEditPolicy(EditPolicy.CONNECTION_ROLE,
-            new ConnectionEditPolicy());
-        installBendpointEditPolicy();
-        installEditPolicy(EditPolicyRoles.DECORATION_ROLE,
-            new DecorationEditPolicy());
-        installEditPolicy(EditPolicyRoles.CONNECTION_LABELS_ROLE,
-            new ConnectionLabelsEditPolicy());
-
-        installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE,
-            new SnapFeedbackPolicy());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPart#deactivate()
-     */
-   public void deactivate() {
-	   
-	   if (!isActive()) {
-           return;
-       }
-	   
-        boolean wasActive = isActive();
-        super.deactivate();
-        if (listenerFilters != null && wasActive != isActive()) {
-            for (Iterator i = listenerFilters.keySet().iterator(); i.hasNext();) {
-                Object[] obj = (Object[]) listenerFilters.get(i.next());
-                if (obj.length > 2) {
-                    getDiagramEventBroker().removeNotificationListener(
-                        (EObject) obj[0], (EStructuralFeature) obj[1],
-                        (NotificationListener) obj[2]);
-                } else {
-                    getDiagramEventBroker().removeNotificationListener(
-                        (EObject) obj[0], (NotificationListener) obj[1]);
-                }
-            }
-        }
-        getConnectionFigure().getConnectionRouter().remove(getConnectionFigure());
-    }
-
-    public void removeNotify() {
-        super.removeNotify();
-        
-        if (cachedFontData != null) {
-            getResourceManager().destroyFont(
-                FontDescriptor.createFrom(cachedFontData));
-            cachedFontData = null;
-        }
-    }
-
-    /**
-     * executes the passed command
-     * 
-     * @param command
-     *            the command to execute
-     */
-    protected void executeCommand(Command command) {
-        getEditDomain().getCommandStack().execute(command);
-    }
-
-    /**
-     * a function that registers this provider with the Eclipse AdapterManager
-     * as an IView and an IActionFilter adapter factory for the
-     * IGraphicalEditPart nodes
-     * 
-     */
-    static private void registerAdapters() {
-        Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
-
-            /**
-             * @see org.eclipse.core.runtime.IAdapterFactory
-             */
-            public Object getAdapter(Object adaptableObject, Class adapterType) {
-
-                IGraphicalEditPart gep = (IGraphicalEditPart) adaptableObject;
-
-                if (adapterType == IActionFilter.class) {
-                    return ActionFilterService.getInstance();
-                } else if (adapterType == View.class) {
-                    return gep.getModel();
-                }
-                return null;
-            }
-
-            /**
-             * @see org.eclipse.core.runtime.IAdapterFactory
-             */
-            public Class[] getAdapterList() {
-                return new Class[] {IActionFilter.class, View.class};
-            }
-
-        }, IGraphicalEditPart.class);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#getAccessibleEditPart()
-     */
-    protected AccessibleEditPart getAccessibleEditPart() {
-        if (accessibleEP == null) {
-            accessibleEP = new AccessibleGraphicalEditPart() {
-
-                private String getSemanticName() {
-                    EObject semanticElement = resolveSemanticElement();
-
-                    if (semanticElement != null) {
-                        String name = semanticElement.getClass().getName();
-                        int startIndex = name.lastIndexOf('.') + 1;
-                        int endIndex = name.lastIndexOf("Impl"); //$NON-NLS-1$
-                        return name.substring(startIndex, endIndex);
-                    }
-
-                    return DiagramUIMessages.Accessible_Connection_Label;
-                }
-
-                public void getName(AccessibleEvent e) {
-
-                    EditPart sourceEP = getSource();
-                    EditPart targetEP = getTarget();
-
-                    // Get the Connection Name
-                    String connectionName = getSemanticName();
-
-                    // Get the Source Name
-                    String sourceName = null;
-                    if (sourceEP != null) {
-                        AccessibleEditPart aEP = (AccessibleEditPart) sourceEP
-                            .getAdapter(AccessibleEditPart.class);
-                        AccessibleEvent event = new AccessibleEvent(this);
-                        aEP.getName(event);
-                        sourceName = event.result;
-                    }
-
-                    // Get the Target Name
-                    String targetName = null;
-                    if (targetEP != null) {
-                        AccessibleEditPart aEP = (AccessibleEditPart) targetEP
-                            .getAdapter(AccessibleEditPart.class);
-                        AccessibleEvent event = new AccessibleEvent(this);
-                        aEP.getName(event);
-                        targetName = event.result;
-                    }
-
-                    if (sourceName != null && targetName != null) {
-                        e.result = NLS
-                            .bind(
-                                DiagramUIMessages.Accessible_Connection_From_Source_To_Target,
-                                new Object[] {connectionName, sourceName,
-                                    targetName});
-                    } else if (sourceName != null) {
-                        e.result = NLS
-                            .bind(
-                                DiagramUIMessages.Accessible_Connection_From_Source,
-                                new Object[] {connectionName, sourceName});
-                    } else if (targetName != null) {
-                        e.result = NLS.bind(
-                            DiagramUIMessages.Accessible_Connection_To_Target,
-                            new Object[] {connectionName, targetName});
-                    } else {
-                        e.result = connectionName;
-                    }
-                }
-            };
-        }
-        return accessibleEP;
-    }
-
-    /**
-     * Adds the ability to adapt to this editpart's view class.
-     */
-    public Object getAdapter(Class key) {
-        Object adapter = Platform.getAdapterManager().getAdapter(this, key);
-        if (adapter != null) {
-            return adapter;
-        }
-
-        if (key == SnapToHelper.class) {   
-            return SnapToHelperUtil.getSnapHelper(
-            		(org.eclipse.gef.GraphicalEditPart) this.getSource());
-        }        
-
-        Object model = getModel();
-
-        if (View.class.isAssignableFrom(key) && key.isInstance(model)) {
-            return model;
-        }
-
-        if (model != null && model instanceof View) {
-            // Adapt to semantic element
-            EObject semanticObject = ViewUtil
-                .resolveSemanticElement((View) model);
-            if (key.isInstance(semanticObject)) {
-                return semanticObject;
-            }else if (key.isInstance(model)) {
-                return model;
-            }
-        }
-        return super.getAdapter(key);
-    }
-
-    /**
-     * Method getChildBySemanticHint.
-     * 
-     * @param semanticHint
-     * @return IGraphicalEditPart
-     */
-    public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-        if (getModel() != null) {
-            View view = ViewUtil.getChildBySemanticHint((View) getModel(),
-                semanticHint);
-            if (view != null)
-                return (IGraphicalEditPart) getViewer().getEditPartRegistry()
-                    .get(view);
-        }
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPart#getCommand(org.eclipse.gef.Request)
-     */
-    public Command getCommand(Request _request) {
-        if (!isEditModeEnabled()) {
-            return UnexecutableCommand.INSTANCE;
-        }
-
-        Command cmd = null;
-        try {
-            GETCOMMAND_RECURSIVE_COUNT++;
-            final Request request = _request;
-            try {
-                cmd = (Command) getEditingDomain().runExclusive(
-                    new RunnableWithResult.Impl() {
-
-                        public void run() {
-                            setResult(ConnectionEditPart.super
-                                .getCommand(request));
-                        }
-                    });
-            } catch (InterruptedException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "getCommand", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "getCommand", e); //$NON-NLS-1$
-            }
-            
-
-            if ( cmd != null ) {
-                _disableCanonicalEditPolicyList.addAll(disableCanonicalFor(_request));
-            }
-            
-            GETCOMMAND_RECURSIVE_COUNT--;
-            
-            if ( GETCOMMAND_RECURSIVE_COUNT == 0 ) {
-                if ( cmd != null 
-                        && !_disableCanonicalEditPolicyList.isEmpty() ) {
-                    CompoundCommand cc = new CompoundCommand();
-                    cc.setLabel( cmd.getLabel() );
-                    ToggleCanonicalModeCommand tcmd = 
-                        ToggleCanonicalModeCommand.getToggleCanonicalModeCommand(_disableCanonicalEditPolicyList, false);
-                    cc.add( tcmd );
-                    cc.add( cmd );
-                    ToggleCanonicalModeCommand tcmd2 = ToggleCanonicalModeCommand.getToggleCanonicalModeCommand(tcmd, true);
-                    if (tcmd2 != null) {
-                        tcmd2.setDomain(getEditingDomain());
-                    }
-                    cc.add( tcmd2 );
-                    _disableCanonicalEditPolicyList.clear();
-                    return cc.unwrap();
-                }
-            }
-        }
-        catch( RuntimeException t ) {
-            GETCOMMAND_RECURSIVE_COUNT = 0;
-            throw t;
-        }
-        return cmd;
-    }
-    
-    /**
-     * Return a list of editparts who's canonical editpolicies should be disabled
-     * prior to executing the commands associated to the supplied request.
-     * This implementation will return the editpart honoring a <code>SemanticWrapperRequest</code>
-     * and a <code>CreateConnectionViewRequest</code>'s source and target editparts.
-     *
-     * @param request a request that has returned a command.
-     * @return list of editparts.
-     */
-    protected Collection disableCanonicalFor( final Request request ) {
-        //
-        // not the most generic of solution; however, it will have to do for now...
-        //
-        // Alternate solutions
-        // 1. common request interface on all the requests
-        //  IRequest#getAffectedEditParts
-        //
-        // 2. Traverse down the command and collect of the ICommand#getAffectedObjects()
-        //  -- this requires that all our commands properly set this value.
-        
-        Set hosts = new HashSet();
-        if ( (request instanceof EditCommandRequestWrapper)  
-                || request instanceof TargetRequest
-                || request instanceof DropRequest ) {
-            hosts.add(this);
-            hosts.add(getParent());
-        }
-        if((request instanceof ReconnectRequest)) {
-            ReconnectRequest reconnect = (ReconnectRequest)request;
-            hosts.add(this);
-            hosts.add(getParent());
-            if(reconnect.getTarget() != null) {
-                EditPart target  = reconnect.getTarget();
-                addEditPartAndParent(hosts, target);
-            }
-            if(reconnect.getConnectionEditPart() != null) {
-                org.eclipse.gef.ConnectionEditPart connectionEditPart = reconnect.getConnectionEditPart();
-                if(connectionEditPart.getSource() != null) {
-                    EditPart srcEP = connectionEditPart.getSource();
-                    addEditPartAndParent(hosts, srcEP);
-                }
-                if(connectionEditPart.getTarget() != null) {
-                    EditPart trgEP = connectionEditPart.getTarget();
-                    addEditPartAndParent(hosts, trgEP);
-                }
-            }
-        }
-        if ((request instanceof CreateConnectionRequest) ) {
-            CreateConnectionRequest ccvr = (CreateConnectionRequest)request;
-            hosts.add(this);
-            hosts.add(getParent());
-            if ( ccvr.getSourceEditPart() != null ) {
-                hosts.add( ccvr.getSourceEditPart());
-                hosts.add( ccvr.getSourceEditPart().getParent());
-            }
-            if ( ccvr.getTargetEditPart() != null ) {
-                hosts.add( ccvr.getTargetEditPart());
-                hosts.add( ccvr.getTargetEditPart().getParent());
-            }
-        }
-        if ((request instanceof GroupRequest)) {
-            List parts = ((GroupRequest)request).getEditParts();
-            hosts.add(this);
-            hosts.add(getParent());
-        
-            Iterator editparts = parts == null ? Collections.EMPTY_LIST.iterator() : parts.iterator();  
-            while ( editparts.hasNext() ) {
-                EditPart ep = (EditPart)editparts.next();
-                addEditPartAndParent(hosts, ep);
-            }
-        }
-        
-        /////////////////////////////////////////////////////////////
-        // This following behavior is specific to BorderItemEditPart and
-        // AbstractBorderItemEditPart, but we do not want to allow clients to
-        // override this method so we do not want to make it protected.
-        
-        if (this instanceof IBorderItemEditPart) {
-            if ((request instanceof CreateConnectionViewRequest)) {
-                CreateConnectionViewRequest ccvr = (CreateConnectionViewRequest) request;
-                if (ccvr.getSourceEditPart() instanceof IBorderItemEditPart) {
-                    hosts.add(ccvr.getSourceEditPart().getParent().getParent());
-                }
-                if (ccvr.getTargetEditPart() instanceof IBorderItemEditPart) {
-                    hosts.add(ccvr.getTargetEditPart().getParent().getParent());
-                }
-            }
-        }
-        /////////////////////////////////////////////////////////////
-
-        return hosts;
-    }
-    
-    private void addEditPartAndParent(Set hosts, EditPart editPart) {
-        hosts.add(editPart);
-        hosts.add(editPart.getParent());
-    }
-
-    
-    
-
-    /**
-     * Convenience method returning the editpart's Diagram, the Diagam that owns
-     * the edit part
-     * 
-     * @return the diagram
-     */
-    protected Diagram getDiagramView() {
-        return ((View) getRoot().getContents().getModel()).getDiagram();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#getPrimaryView()
-     */
-    public View getPrimaryView() {
-    	if (this instanceof IPrimaryEditPart && getModel() instanceof View) {
-    		return (View) getModel();
-    	} else {
-    		for (EditPart ep = getParent(); ep != null; ep = ep.getParent()) {
-    			if (ep instanceof IGraphicalEditPart && ep.getModel() instanceof View) {
-    				return ((IGraphicalEditPart) ep).getPrimaryView();
-    			}
-    		}
-    	}
-    	return null;
-    }
-
-    /**
-     * Convenience method returning the editpart's edit domain. Same as calling
-     * <code>getRoot().getViewer().getEditDomain()</code>
-     * 
-     * @return the edit domain
-     */
-    protected EditDomain getEditDomain() {
-        return getRoot().getViewer().getEditDomain();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#getDiagramEditDomain()
-     */
-    public IDiagramEditDomain getDiagramEditDomain() {
-        return (IDiagramEditDomain) getEditDomain();
-    }
-
-    /**
-     * Return this editpart's view (model) children.
-     * 
-     * @return list of views.
-     */
-    protected List getModelChildren() {
-        return new ArrayList(((View) getModel()).getChildren());
-    }
-
-    /**
-     * Convenience method to retreive the value for the supplied value from the
-     * editpart's associated view element. Same as calling
-     * <code> ViewUtil.getStructuralFeatureValue(getNotationView(),feature)</code>.
-     */
-    public Object getStructuralFeatureValue(EStructuralFeature feature) {
-        return ViewUtil.getStructuralFeatureValue((View) getModel(), feature);
-    }
-
-    /**
-     * try to resolve the semantic element and Return the resolven element; if
-     * the element is unresolvable or null it will return null
-     * 
-     * @return non proxy EObject or NULL
-     */
-    public EObject resolveSemanticElement() {
-        EObject eObj = ((View) getModel()).getElement();
-        if (eObj == null) {
-            return null;
-        }
-
-        if (!eObj.eIsProxy()) {
-            return eObj;
-        }
-
-        try {
-            return (EObject) getEditingDomain().runExclusive(
-                new RunnableWithResult.Impl() {
-
-                    public void run() {
-                        setResult(ViewUtil
-                            .resolveSemanticElement((View) getModel()));
-                    }
-                });
-        } catch (InterruptedException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "resolveSemanticElement", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                "resolveSemanticElement", e); //$NON-NLS-1$
-            return null;
-        }
-    }
-
-    /**
-     * Walks up the editpart hierarchy to find and return the
-     * <code>TopGraphicEditPart</code> instance.
-     */
-    public TopGraphicEditPart getTopGraphicEditPart() {
-        EditPart editPart = this;
-        while (editPart instanceof IGraphicalEditPart) {
-            if (editPart instanceof TopGraphicEditPart)
-                return (TopGraphicEditPart) editPart;
-            editPart = editPart.getParent();
-        }
-        return null;
-    }
-
-    /**
-     * Return the editpart's associated Notation View.
-     * 
-     * @return <code>View</code>, the associated view or null if there is no
-     *         associated Notation View
-     */
-    public View getNotationView() {
-        Object model = getModel();
-        if (model instanceof View)
-            return (View) model;
-        return null;
-    }
-
-    /**
-     * Handles the passed property changed event only if the editpart's view is
-     * not deleted
-     */
-    public final void propertyChange(PropertyChangeEvent event) {
-        if (isActive())
-            handlePropertyChangeEvent(event);
-    }
-
-    /**
-     * Handles the property changed event. Clients should override to respond to
-     * the specific notification events they are interested.
-     * 
-     * Note: This method may get called on a non-UI thread. Clients should
-     * either ensure that their code is thread safe and/or doesn't make
-     * unsupported calls (i.e. Display.getCurrent() ) assuming they are on the
-     * main thread. Alternatively if this is not possible, then the client can
-     * wrap their handler within the Display.synchExec runnable to ensure
-     * synchronization and subsequent execution on the main thread.
-     * 
-     * @param event
-     *            the <code>Notification</code> object that is the property
-     *            changed event
-     */
-    protected void handlePropertyChangeEvent(PropertyChangeEvent event) {
-        if (event.getPropertyName().equals(
-            Connection.PROPERTY_CONNECTION_ROUTER)) {
-            installRouter();
-        }
-    }
-
-    /**
-     * Method reactivateSemanticModel. This method reactivates the edit part's
-     * emantic model by: 1- removing semantic listeners 2- adding semantic
-     * listeners if the semantic reference is resolvable 3- Refreshing it
-     * 
-     * This method is called in response to IView's Properties.ID_SEMANTICREF
-     * property change event However, it will only work under the following
-     * assumptions: 1- The old and new semantic models are compatible in their
-     * kind 2- The deltas between old and new semantic models do not affect
-     * notation 3- Connections are not refereshed since they are maintained by
-     * the diagram
-     */
-    public void reactivateSemanticModel() {
-        removeSemanticListeners();
-        if (resolveSemanticElement() != null)
-            addSemanticListeners();
-        refresh();
-    }
-
-    /** Finds an editpart given a starting editpart and an EObject */
-    public EditPart findEditPart(EditPart epBegin, EObject theElement) {
-        if (theElement == null) {
-            return null;
-        }
-        EditPart epStart = null;
-        if (epBegin == null) {
-            epStart = this;
-        } else {
-            epStart = epBegin;
-        }
-
-        final View view = (View) ((IAdaptable) epStart).getAdapter(View.class);
-
-        if (view != null) {
-            EObject el = ViewUtil.resolveSemanticElement(view);
-
-            if ((el != null) && el.equals(theElement)) {
-                return epStart;
-            }
-        }
-
-        ListIterator childLI = epStart.getChildren().listIterator();
-        while (childLI.hasNext()) {
-            EditPart epChild = (EditPart) childLI.next();
-
-            EditPart elementEP = findEditPart(epChild, theElement);
-            if (elementEP != null) {
-                return elementEP;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Refresh the editpart's figure foreground colour.
-     */
-    protected void refreshForegroundColor() {
-        LineStyle style = (LineStyle) getPrimaryView().getStyle(
-            NotationPackage.Literals.LINE_STYLE);
-        if (style != null)
-            setForegroundColor(DiagramColorRegistry.getInstance().getColor(
-            		Integer.valueOf(style.getLineColor())));
-    }
-
-    /**
-     * Refresh the editpart's figure visibility.
-     */
-    protected void refreshVisibility() {
-        setVisibility(((View) getModel()).isVisible());
-    }
-
-    /**
-     * Removes a listener previously added with the given id
-     * 
-     * @param filterId
-     *            the filiter ID
-     */
-    protected void removeListenerFilter(String filterId) {
-        if (listenerFilters == null)
-            return;
-
-        Object[] objects = (Object[]) listenerFilters.get(filterId);
-        if (objects == null) {
-            return;
-        }
-
-        if (objects.length > 2) {
-            getDiagramEventBroker().removeNotificationListener(
-                (EObject) objects[0], (EStructuralFeature) objects[1],
-                (NotificationListener) objects[2]);
-        } else {
-            getDiagramEventBroker().removeNotificationListener(
-                (EObject) objects[0], (NotificationListener) objects[1]);
-        }
-        listenerFilters.remove(filterId);
-    }
-
-    /**
-     * sets the forefround color of the editpart's figure
-     * 
-     * @param color
-     *            the color
-     */
-    protected void setForegroundColor(Color color) {
-        getFigure().setForegroundColor(color);
-    }
-
-    /**
-     * Sets the passed feature if possible on this editpart's view to the passed
-     * value.
-     * 
-     * @param feature
-     *            the feature to use
-     * @param value
-     *            the value of the property being set
-     */
-    public void setStructuralFeatureValue(EStructuralFeature feature,
-            Object value) {
-        ViewUtil.setStructuralFeatureValue((View) getModel(), feature, value);
-    }
-
-    /**
-     * sets the edit part's visibility
-     * 
-     * @param vis
-     *            the new visibilty value
-     */
-    protected void setVisibility(boolean vis) {
-        if (!vis && getSelected() != SELECTED_NONE)
-            getViewer().deselect(this);
-        getFigure().setVisible(vis);
-        getFigure().revalidate();
-    }
-
-    /**
-     * This method adds all listeners to the notational world (views, figures,
-     * editpart...etc) Override this method to add more notational listeners
-     * down the hierarchy
-     */
-    protected void addNotationalListeners() {
-        addListenerFilter("View", this, (View) getModel());//$NON-NLS-1$
-        getFigure().addPropertyChangeListener(
-            Connection.PROPERTY_CONNECTION_ROUTER, this);
-    }
-
-    /**
-     * This method adds all listeners to the semantic element behind this
-     * EditPart Override this method to add more semantic listeners down the
-     * hierarchy This method is called only if the semantic element is
-     * resolvable
-     */
-    protected void addSemanticListeners() {
-        addListenerFilter("SemanticModel",//$NON-NLS-1$
-            this, resolveSemanticElement());
-    }
-
-    /**
-     * This method removes all listeners to the notational world (views,
-     * figures, editpart...etc) Override this method to remove notational
-     * listeners down the hierarchy
-     */
-    protected void removeNotationalListeners() {
-        getFigure().removePropertyChangeListener(
-            Connection.PROPERTY_CONNECTION_ROUTER, this);
-        removeListenerFilter("View");//$NON-NLS-1$
-    }
-
-    /**
-     * This method removes all listeners to the semantic element behind this
-     * EditPart Override this method to remove semantic listeners down the
-     * hierarchy
-     */
-    protected void removeSemanticListeners() {
-        removeListenerFilter("SemanticModel");//$NON-NLS-1$
-    }
-
-    /**
-     * @see org.eclipse.gef.EditPart#addNotify()
-     */
-    public void addNotify() {
-        super.addNotify();
-        installRouter();
-    }
-
-    /**
-     * a static array of appearance property ids applicable to the connections
-     */
-    protected static final String[] appearanceProperties = new String[] {
-        Properties.ID_FONTNAME, Properties.ID_FONTSIZE, Properties.ID_FONTBOLD,
-        Properties.ID_FONTITALIC, Properties.ID_FONTCOLOR,
-        Properties.ID_LINECOLOR};
-
-    /**
-     * construcotr
-     * 
-     * @param view ,
-     *            the view the edit part will own
-     */
-    public ConnectionEditPart(View view) {
-        setModel(view);
-    }
-
-    /**
-     * Method createConnectionFigure.
-     * 
-     * @return a <code>Connection</code> figure
-     */
-    abstract protected Connection createConnectionFigure();
-
-    final protected IFigure createFigure() {
-        return createConnectionFigure();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPart#refresh()
-     */
-    public void refresh() {
-        if (getSource() != null && getTarget() != null) {
-            try {
-                getEditingDomain().runExclusive(new Runnable() {
-
-                    public void run() {
-                        ConnectionEditPart.super.refresh();
-                        EditPolicyIterator i = getEditPolicyIterator();
-                        while (i.hasNext()) {
-                            EditPolicy policy = i.next();
-                            if (policy instanceof GraphicalEditPolicyEx) {
-                                ((GraphicalEditPolicyEx) policy).refresh();
-                            }
-                        }
-                    }
-                });
-            } catch (InterruptedException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "refresh", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "refresh", e); //$NON-NLS-1$
-            }
-        }
-    }
-
-    /**
-     * utility method to get the <code>Edge</code> view
-     * 
-     * @return the <code>Edge</code>
-     */
-    protected Edge getEdge() {
-        return (Edge) getModel();
-    }
-
-    /*
-     * @see AbstractEditPart#getDragTracker(Request)
-     */
-    public DragTracker getDragTracker(Request req) {
-        return new SelectConnectionEditPartTracker(this);
-    }
-
-    /**
-     * give access to the source of the edit part's Edge
-     * 
-     * @return the source
-     */
-    protected Object getModelSource() {
-        return getEdge().getSource();
-    }
-
-    /**
-     * give access to the target of the edit part's Edge
-     * 
-     * @return the target
-     */
-    protected Object getModelTarget() {
-        return getEdge().getTarget();
-    }
-
-    /**
-     * installes a router on the edit part, depending on the
-     * <code>RoutingStyle</code>
-     */
-    protected void installRouter() {
-        ConnectionLayer cLayer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER);
-        RoutingStyle style = (RoutingStyle) ((View) getModel())
-            .getStyle(NotationPackage.Literals.ROUTING_STYLE);
-
-        if (style != null && cLayer instanceof ConnectionLayerEx) {
-
-            ConnectionLayerEx cLayerEx = (ConnectionLayerEx) cLayer;
-            Routing routing = style.getRouting();
-            if (Routing.MANUAL_LITERAL == routing) {
-                getConnectionFigure().setConnectionRouter(
-                    cLayerEx.getObliqueRouter());
-            } else if (Routing.RECTILINEAR_LITERAL == routing) {
-                getConnectionFigure().setConnectionRouter(
-                    cLayerEx.getRectilinearRouter());
-            } else if (Routing.TREE_LITERAL == routing) {
-                getConnectionFigure().setConnectionRouter(
-                    cLayerEx.getTreeRouter());
-            }
-
-        }
-
-        refreshRouterChange();
-    }
-
-    /**
-     * refresh the pendpoints owned by the EditPart's <code>Edge</code>
-     */
-    protected void refreshBendpoints() {
-        RelativeBendpoints bendpoints = (RelativeBendpoints) getEdge()
-            .getBendpoints();
-        List modelConstraint = bendpoints.getPoints();
-        List figureConstraint = new ArrayList();
-        for (int i = 0; i < modelConstraint.size(); i++) {
-            org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint wbp = (org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint) modelConstraint
-                .get(i);
-            RelativeBendpoint rbp = new RelativeBendpoint(getConnectionFigure());
-            rbp.setRelativeDimensions(new Dimension(wbp.getSourceX(), wbp
-                .getSourceY()), new Dimension(wbp.getTargetX(), wbp
-                .getTargetY()));
-            if (modelConstraint.size() == 1) {
-            	rbp.setWeight(0.5f);
-            } else {
-            	rbp.setWeight(i / ((float) modelConstraint.size() - 1));
-            }
-            figureConstraint.add(rbp);
-        }
-        getConnectionFigure().setRoutingConstraint(figureConstraint);
-    }
-
-    private void installBendpointEditPolicy() {
-        if (getConnectionFigure().getConnectionRouter() instanceof ForestRouter) {
-            installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
-                new TreeConnectionBendpointEditPolicy());
-        } else if (getConnectionFigure().getConnectionRouter() instanceof OrthogonalRouter) {
-            installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
-                new ConnectionLineSegEditPolicy());
-        } else {
-            installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
-                new ConnectionBendpointEditPolicy());
-        }
-
-        EditPartUtil.synchronizeRunnableToMainThread(this, new Runnable() {
-
-            public void run() {
-                if (getConnectionFigure().getConnectionRouter() instanceof ForestRouter) {
-                    getConnectionFigure().setCursor(Cursors.CURSOR_SEG_MOVE);
-                } else if (getConnectionFigure().getConnectionRouter() instanceof OrthogonalRouter) {
-                    getConnectionFigure().setCursor(Cursors.CURSOR_SEG_MOVE);
-                } else {
-                    getConnectionFigure().setCursor(Cursors.CURSOR_SEG_ADD);
-                }
-            };
-        });
-    }
-
-    /**
-     * Method refreshRouterChange.
-     */
-    protected void refreshRouterChange() {
-        refreshBendpoints();
-        installBendpointEditPolicy();
-    }
-
-    /**
-     * Method refreshSmoothness.
-     */
-    protected void refreshSmoothness() {
-        Connection connection = getConnectionFigure();
-        if (!(connection instanceof PolylineConnectionEx))
-            return;
-
-        PolylineConnectionEx poly = (PolylineConnectionEx) connection;
-        RoutingStyle style = (RoutingStyle) ((View) getModel())
-            .getStyle(NotationPackage.Literals.ROUTING_STYLE);
-        if (style != null) {
-            Smoothness smoothness = style.getSmoothness();
-
-            if (Smoothness.LESS_LITERAL == smoothness) {
-                poly.setSmoothness(PolylineConnectionEx.SMOOTH_LESS);
-            } else if (Smoothness.NORMAL_LITERAL == smoothness) {
-                poly.setSmoothness(PolylineConnectionEx.SMOOTH_NORMAL);
-            } else if (Smoothness.MORE_LITERAL == smoothness) {
-                poly.setSmoothness(PolylineConnectionEx.SMOOTH_MORE);
-            } else if (Smoothness.NONE_LITERAL == smoothness) {
-                poly.setSmoothness(PolylineConnectionEx.SMOOTH_NONE);
-            }
-        }
-    }
-    
-	/**
-	 * Refreshes raduis for rounding bendpoints in rectilinear routing (radius
-	 * smaller than 1 indicates that bendpoints should not be rounded).
-	 * 
-	 * @since 1.2
-	 */
-    protected void refreshRoundedBendpoints() {
-        Connection connection = getConnectionFigure();
-        if (!(connection instanceof PolylineConnectionEx))
-            return;
-      	
-        RoutingStyle style = (RoutingStyle) ((View) getModel())
-			.getStyle(NotationPackage.Literals.ROUTING_STYLE);
-        if (style != null) {
-        	PolylineConnectionEx poly = (PolylineConnectionEx) connection;
-        	poly.setRoundedBendpointsRadius(style.getRoundedBendpointsRadius());
-        }
-    }
-
-    /**
-     * Method refreshJumplinks.
-     */
-    protected void refreshJumplinks() {
-        Connection connection = getConnectionFigure();
-        if (!(connection instanceof PolylineConnectionEx))
-            return;
-
-        PolylineConnectionEx poly = (PolylineConnectionEx) connection;
-        RoutingStyle style = (RoutingStyle) ((View) getModel())
-            .getStyle(NotationPackage.Literals.ROUTING_STYLE);
-
-        JumpLinkStatus status = JumpLinkStatus.NONE_LITERAL;
-        JumpLinkType type = JumpLinkType.SEMICIRCLE_LITERAL;
-        boolean reverse = false;
-        if (style != null) {
-            status = style.getJumpLinkStatus();
-            type = style.getJumpLinkType();
-            reverse = style.isJumpLinksReverse();
-        }
-
-        int jumpType = 0;
-        if (JumpLinkStatus.BELOW_LITERAL == status) {
-            jumpType = PolylineConnectionEx.JUMPLINK_FLAG_BELOW;
-        } else if (JumpLinkStatus.ABOVE_LITERAL == status) {
-            jumpType = PolylineConnectionEx.JUMPLINK_FLAG_ABOVE;
-        } else if (JumpLinkStatus.ALL_LITERAL == status) {
-            jumpType = PolylineConnectionEx.JUMPLINK_FLAG_ALL;
-        }
-
-        boolean bCurved = type.equals(JumpLinkType.SEMICIRCLE_LITERAL);
-        boolean bAngleIn = !type.equals(JumpLinkType.SQUARE_LITERAL);
-        boolean bOnBottom = reverse;
-
-        poly.setJumpLinks(jumpType != 0);
-        poly.setJumpLinksStyles(jumpType, bCurved, bAngleIn, bOnBottom);
-    }
-
-    /**
-     * Method refreshRoutingStyles.
-     */
-    protected void refreshRoutingStyles() {
-        Connection connection = getConnectionFigure();
-        if (!(connection instanceof PolylineConnectionEx))
-            return;
-
-        PolylineConnectionEx poly = (PolylineConnectionEx) connection;
-
-        RoutingStyle style = (RoutingStyle) ((View) getModel())
-            .getStyle(NotationPackage.Literals.ROUTING_STYLE);
-        if (style != null) {
-
-            boolean closestDistance = style.isClosestDistance();
-            boolean avoidObstruction = style.isAvoidObstructions();
-
-            poly.setRoutingStyles(closestDistance, avoidObstruction);
-            
-			if (avoidObstruction)
-				installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,null);
-			else
-				installBendpointEditPolicy();
-
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
-     */
-    protected void refreshVisuals() {
-        super.refreshVisuals();
-        refreshVisibility();
-        refreshForegroundColor();
-        refreshRoutingStyles();
-        refreshSmoothness();
-        refreshRoundedBendpoints();
-        refreshJumplinks();
-        refreshBendpoints();
-        refreshFont();
-    }
-
-    /**
-     * Refresh the editpart's figure font.
-     */
-    protected void refreshFont() {
-        FontStyle style = (FontStyle) getPrimaryView().getStyle(
-            NotationPackage.Literals.FONT_STYLE);
-        if (style != null) {
-            setFont(new FontData(style.getFontName(), style.getFontHeight(),
-                (style.isBold() ? SWT.BOLD
-                    : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC
-                    : SWT.NORMAL)));
-        }
-    }
-
-    /**
-     * Sets the font to the label. This method could be overriden to change the
-     * font data of the font overrides typically look like this: super.setFont(
-     * new FontData( fontData.getName(), fontData.getHeight(),
-     * fontData.getStyle() <| &> SWT.????));
-     * 
-     * @param fontData
-     *            the font data
-     */
-    protected void setFont(FontData fontData) {
-        if (cachedFontData != null && cachedFontData.equals(fontData)) {
-            // the font was previously set and has not changed; do nothing.
-            return;
-        }
-
-        try {
-            Font newFont = getResourceManager().createFont(
-                FontDescriptor.createFrom(fontData));
-            getFigure().setFont(newFont);
-            getFigure().repaint();
-
-            if (cachedFontData != null) {
-                getResourceManager().destroyFont(
-                    FontDescriptor.createFrom(cachedFontData));
-            }
-            cachedFontData = fontData;
-        } catch (DeviceResourceException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "setFont", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "setFont", e); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Returns an array of the appearance property ids applicable to the
-     * receiver. Fro this type it is Properties.ID_FONT,
-     * Properties.ID_FONTCOLOR, Properties.ID_LINECOLOR
-     * 
-     * @return - an array of the appearane property ids applicable to the
-     *         receiver
-     */
-    protected String[] getAppearancePropertyIDs() {
-        return appearanceProperties;
-    }
-
-    /**
-     * Perform a request by executing a command from the target editpart of the
-     * request For the Direct_Edit request, we need to show up an editor first
-     * 
-     * @see org.eclipse.gef.EditPart#performRequest(org.eclipse.gef.Request)
-     */
-    public void performRequest(Request request) {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        if (RequestConstants.REQ_DIRECT_EDIT == request.getType()) {
-            performDirectEditRequest(request);
-        } else {
-            EditPart targetEditPart = getTargetEditPart(request);
-            if (targetEditPart != null) {
-                Command command = targetEditPart.getCommand(request);
-                if (command != null) {
-                    getDiagramEditDomain().getDiagramCommandStack().execute(
-                        command);
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Performs a direct edit request (usually by showing some type of editor)
-     * 
-     * @param request
-     *            the direct edit request
-     */
-    protected void performDirectEditRequest(Request request) {
-        try {
-            EditPart primaryChildEditPart = (EditPart) getEditingDomain()
-                .runExclusive(new RunnableWithResult.Impl() {
-
-                    public void run() {
-                        setResult(getPrimaryChildEditPart());
-                    }
-                });
-            if (primaryChildEditPart != null) {
-                primaryChildEditPart.performRequest(request);
-            }
-
-        } catch (InterruptedException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "performDirectEditRequest", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                "performDirectEditRequest", e); //$NON-NLS-1$
-        }
-
-    }
-
-    /**
-     * @see org.eclipse.gef.EditPart#understandsRequest(org.eclipse.gef.Request)
-     */
-    public boolean understandsRequest(Request req) {
-        return RequestConstants.REQ_DIRECT_EDIT == req.getType()
-            || super.understandsRequest(req);
-    }
-
-    /** Adds a [ref, editpart] mapping to the EditPartForElement map. */
-    protected void registerModel() {
-        super.registerModel();
-
-        // Save the elements Guid to use during unregister
-        EObject ref = ((View) getModel()).getElement();
-        if (ref == null) {
-            return;
-        }
-
-        elementGuid = EMFCoreUtil.getProxyID(ref);
-
-        ((IDiagramGraphicalViewer) getViewer()).registerEditPartForElement(
-            elementGuid, this);
-    }
-
-    /** Remove this editpart from the EditPartForElement map. */
-    protected void unregisterModel() {
-        super.unregisterModel();
-
-        ((IDiagramGraphicalViewer) getViewer()).unregisterEditPartForElement(
-            elementGuid, this);
-    }
-
-    /**
-     * Handles the case where the semantic reference has changed.
-     */
-    protected final void handleMajorSemanticChange() {
-        if (getSource() instanceof GraphicalEditPart
-            && getTarget() instanceof GraphicalEditPart) {
-            ((GraphicalEditPart) getSource()).refreshSourceConnection(this);
-            ((GraphicalEditPart) getTarget()).refreshTargetConnection(this);
-        }
-    }
-
-    /**
-     * Refreshes a child editpart by removing it and refreshing children
-     * 
-     * @param child
-     */
-    final void refreshChild(GraphicalEditPart child) {
-        removeChild(child);
-        refreshChildren();
-    }
-
-    /**
-     * check if there is a canonical edit policy installed on the edit part or
-     * not
-     * 
-     * @return <tt>true</tt> if a canonical editpolicy has been installed on
-     *         this editpart; otherwise <tt>false</tt>
-     */
-    public final boolean isCanonical() {
-        return getEditPolicy(EditPolicyRoles.CANONICAL_ROLE) != null;
-    }
-
-    /**
-     * checks if the edit part's figure is visible or not
-     * 
-     * @return <tt>true</tt> if the editpart's figure is visible;
-     *         <tt>false</tt> otherwise.
-     */
-    public boolean isSelectable() {
-        return getFigure().isVisible();
-    }
-
-    /*
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#disableEditMode()
-     */
-    public void disableEditMode() {
-        if (isEditable == false) {
-            return;
-        }
-
-        List l = getSourceConnections();
-        int size = l.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = l.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).disableEditMode();
-            }
-        }
-
-        List c = getChildren();
-        size = c.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = c.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).disableEditMode();
-            }
-        }
-
-        isEditable = false;
-    }
-
-    /*
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#enableEditMode()
-     */
-    public void enableEditMode() {
-        if (isEditable) {
-            return;
-        }
-        isEditable = true;
-        List c = getChildren();
-        int size = c.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = c.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).enableEditMode();
-            }
-        }
-
-        List l = getSourceConnections();
-        size = l.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = l.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).enableEditMode();
-            }
-        }
-    }
-
-    /*
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#isEditModeEnabled()
-     */
-    public boolean isEditModeEnabled() {
-        // protect against deadlock - don't allow any action while write
-        // transaction
-        // is active on another thread
-        if (EditPartUtil.isWriteTransactionInProgress(this, true, true))
-            return false;
-        return isEditable;
-    }
-
-    /*
-     * @see org.eclipse.gef.EditPart#showSourceFeedback(org.eclipse.gef.Request)
-     */
-    public void showSourceFeedback(Request request) {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        super.showSourceFeedback(request);
-    }
-
-    /*
-     * @see org.eclipse.gef.EditPart#showTargetFeedback(org.eclipse.gef.Request)
-     */
-    public void showTargetFeedback(Request request) {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        super.showTargetFeedback(request);
-    }
-
-    /*
-     * @see org.eclipse.gef.EditPart#eraseSourceFeedback(org.eclipse.gef.Request)
-     */
-    public void eraseSourceFeedback(Request request) {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        super.eraseSourceFeedback(request);
-    }
-
-    /*
-     * @see org.eclipse.gef.EditPart#eraseTargetFeedback(org.eclipse.gef.Request)
-     */
-    public void eraseTargetFeedback(Request request) {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        super.eraseTargetFeedback(request);
-    }
-
-    /**
-     * this method will return the primary child EditPart inside this edit part
-     * 
-     * @return the primary child view inside this edit part
-     */
-    public EditPart getPrimaryChildEditPart() {
-        if (getChildren().size() > 0)
-            return (EditPart) getChildren().get(0);
-        return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#getDiagramPreferencesHint()
-     */
-    public PreferencesHint getDiagramPreferencesHint() {
-        RootEditPart root = getRoot();
-        if (root instanceof IDiagramPreferenceSupport) {
-            return ((IDiagramPreferenceSupport) root).getPreferencesHint();
-        }
-        return PreferencesHint.USE_DEFAULTS;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener#notifyChanged(org.eclipse.emf.common.notify.Notification)
-     */
-    public void notifyChanged(Notification notification) {
-        if (isActive()) {
-            handleNotificationEvent(notification);
-        }
-    }
-
-    /**
-     * Handles the property changed event
-     * 
-     * @param event
-     *            the property changed event
-     */
-    protected void handleNotificationEvent(Notification event) {
-        Object feature = event.getFeature();
-        if (NotationPackage.Literals.VIEW__PERSISTED_CHILDREN.equals(
-            feature)
-            || NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN.equals(
-                feature)) {
-            refreshChildren();
-        } else if (NotationPackage.Literals.VIEW__VISIBLE.equals(feature)) {
-            Object notifier = event.getNotifier();
-            if (notifier == getModel())
-                setVisibility(((Boolean) event.getNewValue()).booleanValue());
-            // Reactivating in response to semantic model reference change
-            // However, we need to verify that the event belongs to this
-            // editpart's view
-        } else if (NotationPackage.Literals.ROUTING_STYLE__ROUTING.equals(
-            feature)) {
-            installRouter();
-        } else if (NotationPackage.Literals.ROUTING_STYLE__SMOOTHNESS
-            .equals(feature)
-            || NotationPackage.Literals.ROUTING_STYLE__AVOID_OBSTRUCTIONS
-                .equals(feature)
-            || NotationPackage.Literals.ROUTING_STYLE__CLOSEST_DISTANCE
-                .equals(feature)
-            || NotationPackage.Literals.ROUTING_STYLE__JUMP_LINK_STATUS
-                .equals(feature)
-            || NotationPackage.Literals.ROUTING_STYLE__JUMP_LINK_TYPE.equals(
-                feature)
-            || NotationPackage.Literals.ROUTING_STYLE__JUMP_LINKS_REVERSE
-                .equals(feature)
-            || NotationPackage.Literals.ROUNDED_CORNERS_STYLE__ROUNDED_BENDPOINTS_RADIUS.equals(feature)) {
-            refreshVisuals();
-        } else if (NotationPackage.Literals.LINE_STYLE__LINE_COLOR.equals(
-            feature)) {
-            Integer c = (Integer) event.getNewValue();
-            setForegroundColor(DiagramColorRegistry.getInstance().getColor(c));
-        } else if (NotationPackage.Literals.RELATIVE_BENDPOINTS__POINTS
-            .equals(feature)) {
-            refreshBendpoints();
-        } else if (event.getFeature() == NotationPackage.Literals
-            .VIEW__ELEMENT
-            && ((EObject) event.getNotifier()) == getNotationView()){
-            handleMajorSemanticChange();
-       } else if (event.getEventType() == EventType.UNRESOLVE
-                && event.getNotifier() == ((View) getModel()).getElement())
-                handleMajorSemanticChange();
-    }
-
-    /**
-     * @return <code>IMapMode</code> that allows for the coordinate mapping
-     *         from device to logical units.
-     */
-    protected IMapMode getMapMode() {
-        RootEditPart root = getRoot();
-        if (root instanceof DiagramRootEditPart) {
-            DiagramRootEditPart dgrmRoot = (DiagramRootEditPart) root;
-            return dgrmRoot.getMapMode();
-        }
-
-        return MapModeUtil.getMapMode();
-    }
-
-    /**
-     * Derives my editing domain from my diagram element. Subclasses may
-     * override.
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        if (editingDomain == null) {
-            // try to get the editing domain for the model
-            editingDomain = TransactionUtil.getEditingDomain(getModel());
-
-            if (editingDomain == null) {
-                // try to get the editing domain from the diagram view
-                editingDomain = TransactionUtil
-                    .getEditingDomain(getDiagramView());
-            }
-        }
-        return editingDomain;
-    }
-
-    /**
-     * Gets the diagram event broker from the editing domain.
-     * 
-     * @return the diagram event broker
-     */
-    private DiagramEventBroker getDiagramEventBroker() {
-        TransactionalEditingDomain theEditingDomain = getEditingDomain();
-        if (theEditingDomain != null) {
-            return DiagramEventBroker.getInstance(theEditingDomain);
-        }
-        return null;
-    }
-    
-    
-    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_LINE_COLOR));
-                
-            } else if (feature == NotationPackage.eINSTANCE
-                .getFontStyle_FontColor()) {
-                
-                return FigureUtilities.RGBToInteger(PreferenceConverter
-                    .getColor((IPreferenceStore) preferenceStore,
-                        IPreferenceConstants.PREF_FONT_COLOR));
-                
-            }
-        }
-        return getStructuralFeatureValue(feature);
-    }
-    
-    
-    /**
-     * Gets the resource manager to remember the resources allocated for this
-     * graphical viewer. All resources will be disposed when the graphical
-     * viewer is closed if they have not already been disposed.
-     * 
-     * @return the resource manager
-     */
-    protected ResourceManager getResourceManager() {
-        EditPartViewer viewer = getViewer();
-        if (viewer instanceof DiagramGraphicalViewer) {
-            return ((DiagramGraphicalViewer) viewer).getResourceManager();
-        }
-        return JFaceResources.getResources();
-    } 
-    
-    /**
-	 * Answers whether or not this connection represents a part of the semantic
-	 * model.
-	 * 
-	 * @return <code>true</code> if this connection has semantic meaning,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean isSemanticConnection() {
-
-		if (semanticConnection == null) {
-			if (getEdge() != null && (getEdge().getElement() != null
-					|| !NotationTypeUtil.hasNotationType(getEdge()))) {
-				semanticConnection = Boolean.TRUE;
-			} else {
-				semanticConnection = Boolean.FALSE;
-			}
-		}
-		return semanticConnection.booleanValue();
-	}
-	
-	/**
-	 * Clear the semantic connection value when the model changes.
-	 */
-	public void setModel(Object model) {
-		super.setModel(model);
-		semanticConnection = null;
-	}
-
-	/**
-	 * Set the line width of the connection. Clients need to override if they
-	 * support line width.
-	 * 
-	 * @param width
-	 *            the line width.
-	 */
-	protected void setLineWidth(int width) {
-		/* not implemented */
-	}
-	
-	/**
-	 * Get the line width of the connection.
-	 * 
-	 * @return width
-	 *            the line width.
-	 */
-	protected int getLineWidth() {
-		/* a default of -1 means the diagram does not implement line width */
-		int lineWidth = -1;
-		
-		LineStyle style = (LineStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getLineStyle());
-		if (style != null) {
-			lineWidth = style.getLineWidth();
-		}
-
-		return lineWidth;
-	}
-	
-	/**
-	 * Set the line type of the connection. Clients need to override if they
-	 * support line type.
-	 * 
-	 * @param lineType
-	 *            the line type.
-	 */
-	protected void setLineType(int lineType) {
-		/* not implemented */
-	}
-	
-	/**
-	 * Get the line type of the connection.
-	 * 
-	 * @return the line type.
-	 */
-	protected int getLineType() {
-		// default to Graphics.LINE_SOLID.
-		int lineType = Graphics.LINE_SOLID;
-
-		LineTypeStyle style = (LineTypeStyle) getPrimaryView().getStyle(
-				NotationPackage.eINSTANCE.getLineTypeStyle());
-		if (style != null) {
-			if (style.getLineType() == LineType.SOLID_LITERAL) {
-				lineType = Graphics.LINE_SOLID;
-			} else if (style.getLineType() == LineType.DASH_LITERAL) {
-				lineType = Graphics.LINE_DASH;
-			} else if (style.getLineType() == LineType.DOT_LITERAL) {
-				lineType = Graphics.LINE_DOT;
-			} else if (style.getLineType() == LineType.DASH_DOT_LITERAL) {
-				lineType = Graphics.LINE_DASHDOT;
-			} else if (style.getLineType() == LineType.DASH_DOT_DOT_LITERAL) {
-				lineType = Graphics.LINE_DASHDOTDOT;
-			}
-		}
-		
-		return lineType;
-	}
-
-	/**
-	 * Set the arrow decoration on the connection source end. Clients need to override if they
-	 * support arrow decorations.
-	 * 
-	 * @param arrowDecoration
-	 *            the arrow decoration.
-	 */
-	protected void setArrowSource(RotatableDecoration arrowDecoration) {
-		/* not implemented */
-	}
-	
-	/**
-	 * Set the arrow decoration on the connection target end. Clients need to override if they
-	 * support arrow decorations.
-	 * 
-	 * @param arrowDecoration
-	 *            the arrow type.
-	 */
-	protected void setArrowTarget(RotatableDecoration arrowDecoration) {
-		/* not implemented */
-	}
-	
-	/**
-	 * Get the arrow decoration for the arrow type.
-	 * 
-	 * @param arrowType
-	 *            the arrow type.
-	 */
-	protected RotatableDecoration getArrowDecoration(int arrowType) {
-		RotatableDecoration decoration = null;
-		int width = getLineWidth();
-		if (width < 0) {
-			width = 1;
-		}
-		if (arrowType == ArrowType.OPEN_ARROW) {
-			IMapMode mm = getMapMode();
-			decoration = new PolylineDecoration();
-			((PolylineDecoration)decoration).setScale(
-					mm.DPtoLP(11 + width), mm.DPtoLP(6 + width));
-			((PolylineDecoration)decoration).setTemplate(PolylineDecoration.TRIANGLE_TIP);
-			((PolylineDecoration)decoration).setLineWidth(mm.DPtoLP(width));
-		} else if (arrowType == ArrowType.SOLID_ARROW) {
-			IMapMode mm = getMapMode();
-			decoration = new PolygonDecoration();
-			((PolygonDecoration)decoration).setScale(
-					mm.DPtoLP(11 + width), mm.DPtoLP(6 + width));
-			((PolygonDecoration)decoration).setTemplate(PolygonDecoration.TRIANGLE_TIP);
-			((PolygonDecoration)decoration).setLineWidth(mm.DPtoLP(width));
-			((PolygonDecoration)decoration).setFill(true);
-		}
-		return decoration;
-	}
-	
-	/**
-	 * Refreshes the line type property.
-	 */
-	protected void refreshLineWidth() {
-		setLineWidth(getLineWidth());
-	}
-
-	/**
-	 * Refreshes the line type property.
-	 */
-	protected void refreshLineType() {
-		setLineType(getLineType());
-	}
-
-	/**
-	 * Refreshes the arrow decoration on the source end property.
-	 */
-	protected void refreshArrowSource() {
-		// default to no decoration.
-		int arrowType = ArrowType.NONE;
-		
-		ArrowStyle style = (ArrowStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getArrowStyle());
-		if (style != null) {
-			arrowType = style.getArrowSource().getValue();
-		}
-		
-		setArrowSource(getArrowDecoration(arrowType));
-	}
-
-	/**
-	 * Refreshes the arrow decoration on the target end property.
-	 */
-	protected void refreshArrowTarget() {
-		// default to no decoration.
-		int arrowType = ArrowType.NONE;
-		
-		ArrowStyle style = (ArrowStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getArrowStyle());
-		if (style != null) {
-			arrowType = style.getArrowTarget().getValue();
-		}
-		
-		setArrowTarget(getArrowDecoration(arrowType));
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionNodeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionNodeEditPart.java
deleted file mode 100644
index aadb9df..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionNodeEditPart.java
+++ /dev/null
@@ -1,373 +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.editparts;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-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.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.NoteAttachmentReorientEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
-import org.eclipse.gmf.runtime.notation.Anchor;
-import org.eclipse.gmf.runtime.notation.IdentityAnchor;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Connection Node EditPart, a specialized Connection EditPart that installs 
- * a <code>ditPolicy.GRAPHICAL_NODE_ROLE</code> on this edit part. it also implements
- * INodeEditPart which defines the connectable edit parts
- * @author mmostafa
- */
-abstract public class ConnectionNodeEditPart
-	extends ConnectionEditPart
-	implements INodeEditPart {
-
-	/**
-	 * constructor 
-	 * @param view owned view by this edit part 
-	 */
-	public ConnectionNodeEditPart(View view) {
-		super(view);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		// node edit policy needs to be installed before connection editpolicy from the super
-		// since connections of a node need to be deleted before the node
-		//installEditPolicy(EditPolicy.NODE_ROLE, new NodeEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new GraphicalNodeEditPolicy());
-
-        // Disable note attachment reorient between two shapes where neither is a note.
-        installEditPolicy("NoteAttachmentReorient", //$NON-NLS-1$
-            new NoteAttachmentReorientEditPolicy());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelSourceConnections()
-	 */
-	protected List getModelSourceConnections(){
-		return ViewUtil.getSourceConnections(getEdge());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelTargetConnections()
-	 */
-	protected List getModelTargetConnections(){
-		return ViewUtil.getTargetConnections(getEdge());
-	}
-
-	protected ConnectionAnchor getSourceConnectionAnchor() {
-		if (getSource() != null && getSource() instanceof NodeEditPart) {
-			NodeEditPart editPart = (NodeEditPart) getSource();
-			return editPart.getSourceConnectionAnchor(this);
-		}
-		return super.getSourceConnectionAnchor();
-	}
-
-	/*
-	 * @see NodeEditPart#getSourceConnectionAnchor(ConnectionEditPart)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final ConnectionNodeEditPart connection = (ConnectionNodeEditPart) connEditPart;
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-				public void run() {
-					Anchor a = connection.getEdge().getSourceAnchor();
-					if (a instanceof IdentityAnchor)
-						setResult(((IdentityAnchor) a).getId());
-					else 
-					    setResult(""); //$NON-NLS-1$
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getSourceConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getSourceConnectionAnchor", e); //$NON-NLS-1$
-		}
-		return ((IAnchorableFigure)getFigure()).getConnectionAnchor(t);
-	}
-
-	/*
-	 * @see NodeEditPart#getSourceConnectionAnchor(Request)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		Point center = getFigure().getBounds().getCenter();
-		getFigure().translateToAbsolute(center);
-		Point pt = ((DropRequest)request).getLocation()==null ? 
-			center : new Point(((DropRequest)request).getLocation()); 
-		if (request instanceof CreateRequest) {
-			getFigure().translateToRelative(pt);
-		}
-		return ((IAnchorableFigure)getFigure()).getSourceConnectionAnchorAt(pt);
-	}
-
-	protected ConnectionAnchor getTargetConnectionAnchor() {
-		if (getTarget() instanceof NodeEditPart) {
-			NodeEditPart editPart = (NodeEditPart) getTarget();
-			return editPart.getTargetConnectionAnchor(this);
-		}
-		return super.getTargetConnectionAnchor();
-	}
-
-	/*
-	 * @see NodeEditPart#getTargetConnectionAnchor(ConnectionEditPart)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart connEditPart) {
-		final ConnectionNodeEditPart connection = (ConnectionNodeEditPart) connEditPart;
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-				public void run() {
-					Anchor a = connection.getEdge().getTargetAnchor();
-					if (a instanceof IdentityAnchor)
-						setResult(((IdentityAnchor) a).getId());
-					else 
-					    setResult(""); //$NON-NLS-1$
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getTargetConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getTargetConnectionAnchor", e); //$NON-NLS-1$
-		}
-		return ((IAnchorableFigure)getFigure()).getConnectionAnchor(t);
-	}
-	
-	/*
-	 * @see NodeEditPart#getTargetConnectionAnchor(Request)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		Point center = getFigure().getBounds().getCenter();
-		getFigure().translateToAbsolute(center);
-		Point pt = ((DropRequest)request).getLocation()==null ? 
-			center : new Point(((DropRequest)request).getLocation()); 
-		if (request instanceof CreateRequest) {
-			getFigure().translateToRelative(pt);
-		}
-		return ((IAnchorableFigure)getFigure()).getTargetConnectionAnchorAt(pt);
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapConnectionAnchorToTerminal(org.eclipse.draw2d.ConnectionAnchor)
-     */
-    final public String mapConnectionAnchorToTerminal(ConnectionAnchor c) {
-        return ((IAnchorableFigure) getFigure()).getConnectionAnchorTerminal(c);
-    }
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapTerminalToConnectionAnchor(String)
-	 */
-	final public ConnectionAnchor mapTerminalToConnectionAnchor(String terminal) {
-		return ((IAnchorableFigure) getFigure()).getConnectionAnchor(terminal);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.INoteableEditPart#canAttachNote()
-	 */
-	public boolean canAttachNote() {		
-		return true;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#handleNotificationEvent(org.eclipse.gmf.runtime.diagram.ui.internal.listener.NotificationEvent)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getView_SourceEdges().equals(feature))
-			refreshSourceConnections();
-		else
-		if (NotationPackage.eINSTANCE.getView_TargetEdges().equals(feature))
-			refreshTargetConnections();
-		else
-			super.handleNotificationEvent(notification);
-
-        if (  NotationPackage.eINSTANCE.getIdentityAnchor_Id().equals(feature) ||
-        	  notification.getNewValue() instanceof IdentityAnchor ||
-        	  notification.getOldValue() instanceof IdentityAnchor) {
-        	anchorChange();
-        }
-	}
-
-    /**
-     * updates identity connection anchors
-     */
-	public void anchorChange() {
-		refreshSourceAnchor();
-		refreshTargetAnchor();
-	}
-    
-    /**
-     * Retrieve the list of all source and target connections for the connection.
-     * @param set HashSet to add the connections to.
-     * @param connectionEditPart the connection edit part.
-     */
-    private void getSourceAndTargetConnections(HashSet set, 
-            org.eclipse.gef.ConnectionEditPart connectionEditPart) {
-        
-        if (connectionEditPart == null || set == null)
-            return;
-            
-        for (Iterator i = connectionEditPart.getSourceConnections().iterator(); 
-        i.hasNext();) {
-            
-            org.eclipse.gef.ConnectionEditPart next = 
-                (org.eclipse.gef.ConnectionEditPart) i.next();
-            Connection sourceConnection = (Connection) next.getFigure();
-            set.add(sourceConnection);
-            getSourceAndTargetConnections(set, next);
-        }
-
-        for (Iterator i = connectionEditPart.getTargetConnections().iterator(); 
-        i.hasNext();) {
-            
-            org.eclipse.gef.ConnectionEditPart next = 
-                (org.eclipse.gef.ConnectionEditPart) i.next();
-            Connection targetConnection = (Connection) next.getFigure();
-            set.add(targetConnection);
-            getSourceAndTargetConnections(set, next);
-        }
-    }
-    
-    /**
-     * Figure out if a cyclic dependency will arise if target connection edit part
-     * is connected to the source connection edit part.
-     * @param targetCEP the target connection edit part
-     * @param sourceCEP the source connection edit part
-     * @param checkSourceAndTargetEditParts check both the source and taret edit parts 
-     * for cyclic dependencies
-     * @param doNotCheckSourceEditPart (if checkSourceAndTargetEditParts is false) check 
-     * only the target edit part if true, otherwise check only the source edit part
-     * @return true if a cyclic dependency would be create when targetCEP and 
-     * sourceCEP were to be connected, false otherwise.  
-     */
-    private boolean isCyclicConnectionRequest(org.eclipse.gef.ConnectionEditPart targetCEP,
-            org.eclipse.gef.ConnectionEditPart sourceCEP, 
-            boolean checkSourceAndTargetEditParts, boolean doNotCheckSourceEditPart) {
-        
-        if (targetCEP == null || sourceCEP == null)
-            return false;
-        
-        if (sourceCEP == targetCEP)
-        	return true;
-        
-        // first, do a cyclic check on source and target connections 
-        // of the source connection itself.
-        // (as every connection is also a node).
-        
-        HashSet set = new HashSet();
-        getSourceAndTargetConnections(set, sourceCEP);
-        if (set.contains(targetCEP.getFigure()))
-            return true;
-        
-        
-        // now do the cyclic check on the source and target of the source connection...  
-        EditPart sourceEP = sourceCEP.getSource(),
-                 targetEP = sourceCEP.getTarget();
-                 
-        if ((sourceEP == targetCEP) || (targetEP == targetCEP)) {
-            return true;
-        }
-        else {
-            
-            if (!checkSourceAndTargetEditParts && doNotCheckSourceEditPart) {
-                // .
-            }
-            else
-                if (sourceEP instanceof org.eclipse.gef.ConnectionEditPart && 
-                        isCyclicConnectionRequest(targetCEP, 
-                            (org.eclipse.gef.ConnectionEditPart)sourceEP,
-                            true, doNotCheckSourceEditPart))
-                        return true;
-            
-            if (!checkSourceAndTargetEditParts && !doNotCheckSourceEditPart) {
-                // .
-            }
-            else
-                if (targetEP instanceof org.eclipse.gef.ConnectionEditPart &&
-                     isCyclicConnectionRequest(targetCEP, 
-                         (org.eclipse.gef.ConnectionEditPart)targetEP,
-                         true, doNotCheckSourceEditPart))
-                return true;
-        }
-        
-        return false;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.editparts.AbstractEditPart#getTargetEditPart(org.eclipse.gef.Request)
-     */
-    public EditPart getTargetEditPart(Request request) {
-        EditPart ep = super.getTargetEditPart(request);
-        
-        if (ep != null && ep instanceof org.eclipse.gef.ConnectionEditPart) {
-            if (request instanceof ReconnectRequest) {
-                ReconnectRequest rRequest = (ReconnectRequest)request; 
-                
-                // If this is just moving an anchor point on the same target or
-                // source, then it is fine.  See bugzilla# 208408. 
-                if (rRequest.isMovingStartAnchor()) {
-                    if (rRequest.getConnectionEditPart().getSource() == ep) {
-                        return ep;
-                    } 
-                } else if (rRequest.getConnectionEditPart().getTarget() == ep) {
-                    return ep;
-                }
-                
-                // If source anchor is moved, the connection's source edit part
-                // should not be taken into account for a cyclic dependency
-                // check so as to avoid false checks. Same goes for the target
-                // anchor. See bugzilla# 155243 -- we do not want to target a
-                // connection that is already connected to us so that we do not
-                // introduce a cyclic connection                
-                if (isCyclicConnectionRequest((org.eclipse.gef.ConnectionEditPart)ep, 
-                    rRequest.getConnectionEditPart(), false, rRequest.isMovingStartAnchor()))
-                    return null;
-            }
-        }
-        
-        return ep;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DescriptionCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DescriptionCompartmentEditPart.java
deleted file mode 100644
index 41ba7c5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DescriptionCompartmentEditPart.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-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.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DescriptionDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-
-/**
- * @since 1.2
- */
-public class DescriptionCompartmentEditPart extends TextCompartmentEditPart {
-
-	public DescriptionCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	protected ILabelDelegate createLabelDelegate() {
-        ILabelDelegate labelDelegate = super.createLabelDelegate();
-        labelDelegate.setTextJustification(PositionConstants.LEFT);
-        labelDelegate.setAlignment(PositionConstants.TOP);
-        labelDelegate.setTextAlignment(PositionConstants.TOP);
-        labelDelegate.setTextWrapOn(true);        
-        return labelDelegate;
-    }
-
-    /**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart#isEditable()
-	 */
-	protected boolean isEditable() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-			EditPolicy.DIRECT_EDIT_ROLE,
-			new DescriptionDirectEditPolicy());
-	}
-
-	/**
-	 * Method getParser.
-	 * @return IParser
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			View view = getNotationView();
-			String parserHint = ""; //$NON-NLS-1$
-			if (view!=null)
-				parserHint = view.getType();
-			EObject object = getPrimaryView();
-			ParserHintAdapter hintAdapter =
-				new ParserHintAdapter(object, parserHint);
-			parser = ParserService.getInstance().getParser(hintAdapter);
-
-		}
-		return parser;
-	}
-
-	/**
-	 * Returns a validator for the user's edit text
-	 * @return a validator
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					//final IElement element = resolveModelReference();
-
-					final IParser descParser = getParser();
-					try {
-						IParserEditStatus isValid = (IParserEditStatus) getEditingDomain()
-							.runExclusive(new RunnableWithResult.Impl() {
-
-									public void run() {
-										setResult(descParser.isValidEditString(
-											null, (String) value));
-									}
-								});
-						return isValid.getCode() == ParserEditStatus.EDITABLE ? null
-							: isValid.getMessage();
-					} catch (Exception e) {
-						Log.error(DiagramUIPlugin.getInstance(), IStatus.ERROR,
-							e.getMessage(), e);
-					}
-				}				
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart#getLabelText()
-	 */
-	protected String getLabelText() {
-		return getParser().getPrintString(new EObjectAdapter(getPrimaryView()),
-			getParserOptions().intValue());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart#getEditText()
-	 */
-	public String getEditText() {
-		return getParser().getEditString(new EObjectAdapter(getPrimaryView()),
-			getParserOptions().intValue());
-	}
-	
-	protected void refreshLabel() {
-		super.refreshLabel();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java
deleted file mode 100644
index 6311198..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java
+++ /dev/null
@@ -1,354 +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.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutAnimator;
-import org.eclipse.draw2d.LayoutListener;
-import org.eclipse.draw2d.TreeSearch;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DeselectAllTracker;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramDragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramPopupBarEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-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.internal.tools.RubberbandDragTracker;
-import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Scrollable;
-
-/**
- * Controller for the diagram 
- *  
- * @author jcorchis
- *
- */
-
-public class DiagramEditPart
-	extends GraphicalEditPart
-	implements LayerConstants, ISurfaceEditPart {
-	private boolean shouldUpdatePageBreakLocation = false;
-	private boolean isSupportingViewActions = true;
-    private boolean isActivatingDiagram = false;
-	
-	/**
-	 * construcotr
-	 * @param diagramView the view controlled by this edit part
-	 */
-	public DiagramEditPart(View diagramView) {
-		super(diagramView);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-			EditPolicyRoles.CREATION_ROLE,
-			new CreationEditPolicy());
-		installEditPolicy(EditPolicy.CONTAINER_ROLE, new ContainerEditPolicy());
-		installEditPolicy(
-			EditPolicy.COMPONENT_ROLE,
-			new RootComponentEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutEditPolicy());
-		installEditPolicy(
-			EditPolicyRoles.DRAG_DROP_ROLE,
-			new DiagramDragDropEditPolicy());
-		installEditPolicy(
-			EditPolicy.GRAPHICAL_NODE_ROLE,
-			new ContainerNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE,
-				new SnapFeedbackPolicy());
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE,
-			new DiagramPopupBarEditPolicy());
-	}
-	
-	/**
-	 * @author mmostafa
-	 * PageBreaksLayoutListener Listens to post layout so it can update the page breaks  
-	 */
-	private class PageBreaksLayoutListener extends LayoutListener.Stub {
-
-		public void postLayout(IFigure container) {
-			super.postLayout(container);
-			updatePageBreaksLocation();
-		}
-		
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-
-		// Override the containsPoint and findFigureAt methods
-		// to treat this layer (Primary Layer) as if it were opaque.
-
-		// This is for the grid layer so that it can be seen beneath the
-		// figures.
-		IFigure f = new BorderItemsAwareFreeFormLayer() {	
-			/* (non-Javadoc)
-			 * @see org.eclipse.draw2d.Layer#containsPoint(int, int)
-			 */
-			public boolean containsPoint(int x, int y) {
-				return getBounds().contains(x, y);
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.draw2d.Layer#findFigureAt(int, int, org.eclipse.draw2d.TreeSearch)
-			 */
-			public IFigure findFigureAt(int x, int y, TreeSearch search) {
-				if (!isEnabled())
-					return null;
-				if (!containsPoint(x, y))
-					return null;
-				if (search.prune(this))
-					return null;
-				IFigure child = findDescendantAtExcluding(x, y, search);
-				if (child != null)
-					return child;
-				if (search.accept(this))
-					return this;
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.draw2d.Figure#validate()
-			 */
-			public void validate() {				
-				super.validate();
-				if (shouldUpdatePageBreakLocation){
-					shouldUpdatePageBreakLocation = false;
-					updatePageBreaksLocation();
-				}
-			}
-		};
-		f.setLayoutManager(new FreeFormLayoutEx());
-		f.addLayoutListener(LayoutAnimator.getDefault());
-		f.addLayoutListener(new PageBreaksLayoutListener());
-		return f;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getDiagramView()
-	 */
-	public Diagram getDiagramView() {
-		return (Diagram)getModel();
-	}
-
-	public DragTracker getDragTracker(Request req) {
-		if (req instanceof SelectionRequest
-			&& ((SelectionRequest) req).getLastButtonPressed() == 3)
-			return new DeselectAllTracker(this);
-		return new RubberbandDragTracker();
-	}
-
-	public IFigure getLayer(Object layer) {
-		return super.getLayer(layer);
-	}
-
-	/**
-	 * Return the Scrollable Control of this edit part's Viewer
-	 * @return <code>Scrollable</code>
-	 */
-	public Scrollable getScrollableControl() {
-		return (Scrollable) getViewer().getControl();
-	}
-
-	/**
-	 * getter for this Edit Part's figure <code>Viewport</code>
-	 * @return the view port
-	 */
-	public Viewport getViewport() {
-		IFigure fig = getFigure().getParent();
-		while (fig != null) {
-			if (fig instanceof Viewport)
-				return (Viewport) fig;
-			fig = fig.getParent();
-		}
-		return null;
-	}
-
-	/**
-	 * getter for the connection layer
-	 * @return the connection layer
-	 */
-	protected IFigure getConnectionLayer() {
-		return getLayer(LayerConstants.CONNECTION_LAYER);
-	}
-
-	/**
-	 * returns all connections owned by this diagram, the returned list is a
-	 * list of <code>ConnectionEditPart</code>s
-	 * 
-	 * @return list of <code>ConnectionEditPart</code>s
-	 */
-	public List getConnections() {
-		Iterator views = getDiagramView().getEdges().iterator(); 
-
-		Map registry = getViewer().getEditPartRegistry();
-		List connections = new ArrayList();
-		while (views.hasNext()) {
-			Object connectionEP = registry.get(views.next());
-			if (connectionEP != null)
-				connections.add(connectionEP);
-		}
-		return connections;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart#getPrimaryEditParts()
-	 */
-	public List getPrimaryEditParts() {
-		List connections = getConnections();
-		List shapes = getChildren();
-		if (connections.size() > 0 || shapes.size() > 0) {
-			List myChildren = new ArrayList();
-			myChildren.addAll(shapes);
-			myChildren.addAll(connections);
-			return myChildren;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Adds a figure listener to each figure that is added to the diagram so,
-	 * the the page breaks can be notified of changes.
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#addChildVisual(EditPart, int)
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		final IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
-		getContentPane().add(child, index);
-	}
-	
-	/**
-	 * Updates the Viewer's preference store page breaks location.
-	 */
-	protected void updatePageBreaksLocation() {
-		if ( getParent() == null || getRoot() == null ) {
-			return;
-		}
-		// do not update unless we really need to
-		IPreferenceStore preferenceStore = ((DiagramRootEditPart) getRoot()).getWorkspaceViewerPreferences();
-		// do not update unless we really need to
-		if (preferenceStore == null ||
-			preferenceStore.getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS)==false)
-			return;
-
-		((DiagramRootEditPart) getRoot())
-				.getPageBreakEditPart().resize(getChildrenBounds());
-	}
-
-	/**
-	 * Returns the bounds of the <code>PRINTABLE_LAYERS</code>
-	 * @return rectangle bounds of the diagram's children
-	 */
-	public Rectangle getChildrenBounds() {
-		return PageInfoHelper.getChildrenBounds(this, PageBreaksFigure.class);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-
-		if (adapter == Routing.class) {
-			IPreferenceStore store = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
-			Routing routingVal = Routing.get(store.getInt(IPreferenceConstants.PREF_LINE_STYLE));
-			return routingVal;	
-		}
-
-		return super.getAdapter(adapter);
-	}
-	
-	/**
-	 * gets a list of all children that could affect the zoom capability
-	 * @return list of <code>View</code>s
-	 */
-	public List getChildrenAffectingZoom(){
-		return new ArrayList(getChildren());
-	}
-	
-	/**
-	 * Refreshes the page breaks.
-	 */
-	public void refreshPageBreaks() {
-		if ( getRoot() == null ) {
-			return;
-		}
-		
-		((DiagramRootEditPart)getRoot()).refreshPageBreaks();
-	}
-	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart#isSupportingViewActions()
-	 */
-	public boolean isSupportingViewActions(){
-		return this.isSupportingViewActions;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart#setIsSupportingViewActions(boolean)
-	 */
-	public void setIsSupportingViewActions(boolean supportsViewActions){
-		this.isSupportingViewActions = supportsViewActions;
-	}
-
-    
-    /**
-     * checks if the Diagram is still in the process of activating it self
-     * @return true if activating; false if the activation process is finished
-     */
-    public boolean isActivatingDiagram() {
-        return isActivatingDiagram;
-    }
-
-    public void activate() {
-        isActivatingDiagram = true;
-        try {
-	        super.activate();
-	    }finally{
-        	isActivatingDiagram = false;
-        }
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java
deleted file mode 100644
index d95a06d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.ScalableFigure;
-import org.eclipse.draw2d.ScalableFreeformLayeredPane;
-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.draw2d.geometry.Translatable;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SnapToGeometry;
-import org.eclipse.gef.SnapToGrid;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.GridLayerEx;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.PageBreakEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart;
-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.internal.ruler.DiagramRuler;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ConnectionLayerEx;
-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.IMapModeHolder;
-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.render.internal.graphics.RenderedMapModeGraphics;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics;
-import org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatableZoomManager;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * RootEditPart which manages the Diagram's layers and creates the discrete zoom
- * levels for the <code>ZoomManager</code>.
- * 
- * @author jcorchis
- */
-public class DiagramRootEditPart
-	extends ScalableFreeformRootEditPart
-	implements ZoomableEditPart, IDiagramPreferenceSupport {
-	
-	private WrapperMapMode mm;
-	
-	/**
-	 * @author sshaw
-	 * This pattern is necessary because, the constructor of the ScalableFreeformRootEditPart forces
-	 * the scalable layered pane class to be instantiated where it gets initialized with the MapMode
-	 * of the this root editpart.  However, we haven't had a chance to initialize the mapmode value yet since
-	 * super must be called first.  So, this pattern allows us to set the mapmode into this container after
-	 * super is called, but still have the scalable layered pane initialized with the mapmode value.
-	 */
-	private class WrapperMapMode implements IMapModeHolder {
-
-		public WrapperMapMode() {
-			super();
-		}
-
-		IMapMode containedMM = MapModeTypes.DEFAULT_MM;
-		public void setContainedMapMode(IMapMode mm) {
-			this.containedMM = mm;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(int)
-		 */
-		public int DPtoLP(int deviceUnit) {
-			return containedMM.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 containedMM.DPtoLP(t);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(int)
-		 */
-		public int LPtoDP(int logicalUnit) {
-			return containedMM.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 containedMM.LPtoDP(t);
-		}
-		
-		public IMapMode getMapMode() {
-			return containedMM;
-		}
-		
-	}
-	
-	/**
-	 * Default constructor
-	 */
-	public DiagramRootEditPart() {
-		super();
-	}
-	
-	/**
-	 * @param mu the <code>MeasurementUnit</code> that is used to display all contents
-	 * within the root edit part.
-	 */
-	public DiagramRootEditPart(MeasurementUnit mu) {
-		super();
-		
-		if (getMapMode() != null)
-			mm.setContainedMapMode(MeasurementUnitHelper.getMapMode(mu));
-	}
-
-	/**
-	 * GEF does not scale the FEEDBACK_LAYER but we do.
-	 */
-	class FeedbackLayer
-		extends FreeformLayer
-	{
-		FeedbackLayer() {
-			setEnabled(false);
-		}
-	}
-    
-	/**
-	 * Listener for the workspace preference store.
-	 */
-	private class PreferenceStoreListener implements IPropertyChangeListener {
-		public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
-			handlePreferenceStorePropertyChanged(event);
-		}
-	}
-	
-	static protected class DiagramScalableFreeformLayeredPane extends
-		org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScalableFreeformLayeredPane implements ZoomListener {
-		
-		private static final Dimension MAX_RENDERED_IMAGE_SIZE = new Dimension(1000, 1000);
-	
-        public DiagramScalableFreeformLayeredPane(IMapMode mm) {
-			super(mm);
-		}
-
-        /**
-         * @since 1.3
-         */
-		protected MapModeGraphics createMapModeGraphics(Graphics graphics) {
-			return new RenderedMapModeGraphics(graphics, getMapMode(), true, MAX_RENDERED_IMAGE_SIZE);
-		}
-
-        /**
-         * @since 1.3
-         */
-		protected ScaledGraphics createScaledGraphics(MapModeGraphics gmm) {
-			return new RenderedScaledGraphics(gmm, true, MAX_RENDERED_IMAGE_SIZE);
-		}
-
-		/* 
-		 * (non-Javadoc)
-		 * @see org.eclipse.gef.editparts.ZoomListener#zoomChanged(double)
-		 */
-		public void zoomChanged(double zoom) {
-			ScaledGraphics.resetFontCache();
-		}
-	}
-
-	private DiagramRuler verticalRuler, horizontalRuler;
-	private AnimatableZoomManager zoomManager;
-	private double[] zoomLevels = {.05, .1, .25, .5, .75, 1, 1.25, 1.5, 1.75, 2, 4};
-	private PageBreakEditPart pageBreakEditPart;
-	private PreferenceStoreListener listener = new PreferenceStoreListener();
-		
-	/* Keep layers to enable anti-aliasing */
-	private ScalableFreeformLayeredPane layers;
-
-	/**
-	 * 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 = PreferencesHint.USE_DEFAULTS;
-	private int printableLayerIndex;
-	private GridLayer gridLayer;
-	
-	/**
-	 * Initializes the preferenceStore property change
-	 * listener.
-	 */
-	private void initPreferenceStoreListener() {
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		preferenceStore.addPropertyChangeListener(listener);
-	}
-	
-	/**
-	 * 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 removePreferenceStoreListener() {
-		//		remove preferenceStore listener
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		preferenceStore.removePropertyChangeListener(listener);
-		listener = null;
-	}
-	
-    /**
-     * Identifies the layer containing the page breaks figure.
-     */
-    final public static String PAGE_BREAKS_LAYER = "Page Breaks Layer"; //$NON-NLS-1$   
- 
-	/**
-	 * Identifies the layers containing printable decoration layer.
-	 */
-	final public static String DECORATION_PRINTABLE_LAYER = "Decoration Printable Layer"; //$NON-NLS-1$   
-	/**
-	 * Identifies the layers containing Unprintable decoration layer.
-	 */
-	final public static String DECORATION_UNPRINTABLE_LAYER = "Decoration Unprintable Layer"; //$NON-NLS-1$
-    
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.ui.parts.FreeformGraphicalRootEditPart#createPrintableLayers()
-     */
-    protected LayeredPane createPrintableLayers() {
-    	FreeformLayeredPane layeredPane = new FreeformLayeredPane();
-              
-    	layeredPane.add(new BorderItemsAwareFreeFormLayer(), PRIMARY_LAYER);
-    	layeredPane.add(new ConnectionLayerEx(), CONNECTION_LAYER);
-		layeredPane.add(new FreeformLayer(), DECORATION_PRINTABLE_LAYER);
-
-        return layeredPane;        
-    }
-
-    protected void moveGridLayer(boolean inFront) {
-    	if (layers.getChildren().indexOf(gridLayer) > printableLayerIndex && (! inFront)) {    	
-    		layers.remove(gridLayer);
-    		layers.add(gridLayer,GRID_LAYER, printableLayerIndex);
-    	} else if (layers.getChildren().indexOf(gridLayer) <= printableLayerIndex && inFront) {
-    		layers.remove(gridLayer);
-    		layers.add(gridLayer,GRID_LAYER, printableLayerIndex+1);
-    	}
-    }
-    
-	/**
-    * Creates and returns the scalable layers of this EditPart
-    * 
-    * @return ScalableFreeformLayeredPane Pane that contains the scalable layers
-    */
-    protected ScalableFreeformLayeredPane createScaledLayers() {
-    	
-    	layers = createScalableFreeformLayeredPane();
-
-        layers.add(new FreeformLayer(), PAGE_BREAKS_LAYER);
-        printableLayerIndex = layers.getChildren().size();
-        layers.add(getPrintableLayers(), PRINTABLE_LAYERS);
-                
-        gridLayer = createGridLayer();
-        
-        layers.add(gridLayer, GRID_LAYER);
-        
-        layers.add(new FreeformLayer(), DECORATION_UNPRINTABLE_LAYER);
-        return layers;
-    }
-   
-    /**
-     * Creates the <code>ScalableFreeformLayeredPane</code>.
-	 * @return the new <code>ScalableFreeformLayeredPane</code>
-	 */
-	protected ScalableFreeformLayeredPane createScalableFreeformLayeredPane() {
-		return new DiagramScalableFreeformLayeredPane(getMapMode());
-	}
-
-	/**
-     * Override to set a non-default zoom levels
-     * @return the ZoomManager with the non-default zoom range
-     */
-    public ZoomManager getZoomManager() {
-		if (zoomManager == null) {
-			zoomManager = new AnimatableZoomManager((ScalableFigure)getScaledLayers(),
-											((Viewport)getFigure()));		
-			zoomManager.setZoomLevels(zoomLevels);	
-			refreshEnableZoomAnimation(zoomManager);
-		}
-		
-		return zoomManager;
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomTo(double, org.eclipse.draw2d.geometry.Point)
-	 */
-	public void zoomTo(double zoom, Point center) {
-		zoomManager.zoomTo(zoom, center);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomTo(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public void zoomTo(Rectangle rect) {
-		zoomManager.zoomTo(rect);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomIn()
-	 */
-	public void zoomIn() {
-		zoomManager.zoomIn();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomIn(org.eclipse.draw2d.geometry.Point)
-	 */
-	public void zoomIn(Point center) {
-		zoomManager.zoomTo(zoomManager.getNextZoomLevel(), center);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomOut()
-	 */
-	public void zoomOut() {
-		zoomManager.zoomOut();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart#zoomOut(org.eclipse.draw2d.geometry.Point)
-	 */
-	public void zoomOut(Point center) {
-		zoomManager.zoomTo(zoomManager.getPreviousZoomLevel(), center);
-	}
-	
-    /**
-     * Convience method to access the workspace viewer preferences.
-     * @return PreferenceStore the workspace viewer preference store
-     */
-    protected IPreferenceStore getWorkspaceViewerPreferences() {
-		if (getViewer() == null) return null;
-    	return ((DiagramGraphicalViewer) getViewer())
-			.getWorkspaceViewerPreferenceStore();
-	}
-
-
-	/**
-	 * Get the Grid Spacing from the Plug-ins preference store
-	 * 
-	 * @return grid spacing value.
-	 */
-	public double getGridSpacing() {
-		
-		double gridSpacing = 0;
-		// Check the workspace properties
-		if (getWorkspaceViewerPreferences() != null)
-			gridSpacing = getWorkspaceViewerPreferences().getDouble(WorkspaceViewerProperties.GRIDSPACING);
-		
-		// If the workspace property is not set then get the global preference value
-		if (gridSpacing == 0) {
-			IPreferenceStore pluginStore = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-			gridSpacing = pluginStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING);
-		}
-		return gridSpacing;
-	}
-
-	/**
-	 * Sets the grid line style.  
-	 * @param color 
-	 * 
-	 * @param style
-	 */
-	public void setGridStyle(int style) {
-		if (gridLayer instanceof GridLayerEx) {
-			((GridLayerEx) gridLayer).setLineStyle(style);			
-		}
-		gridLayer.repaint();
-	}
-
-	
-	/**
-	 * Sets the grid line color.  
-	 * @param color 
-	 * 
-	 * @param gridSpacing
-	 */
-	public void setGridColor(Integer rgbValue) {
-		gridLayer.setForegroundColor(DiagramColorRegistry.getInstance().getColor(rgbValue));
-	}
-
-	/**
-	 * This method is called to set the grid spacing.  The units used
-	 * for grid spacing are the same as the rulers current units.
-	 * 
-	 * @param gridSpacing
-	 */
-	public void setGridSpacing(double gridSpacing) {
-		
-		int rulerUnits = RulerProvider.UNIT_INCHES;
-		if (getWorkspaceViewerPreferences() != null)
-			rulerUnits = getWorkspaceViewerPreferences().getInt(WorkspaceViewerProperties.RULERUNIT);
-		
-		// Get the Displays DPIs
-		double dotsPerInch = DisplayUtils.getDisplay().getDPI().x;
-		int spacingInPixels = 0;
-
-		// Evaluate the Grid Spacing based on the ruler units
-		switch( rulerUnits) {
-			case RulerProvider.UNIT_INCHES:
-				spacingInPixels = (int)Math.round(dotsPerInch * gridSpacing);
-				break;
-
-			case RulerProvider.UNIT_CENTIMETERS:
-				spacingInPixels = (int)Math.round( dotsPerInch * gridSpacing / 2.54 );
-				break;
-
-			default:
-				spacingInPixels = (int)gridSpacing;
-		}
-
-		int spacing = getMapMode().DPtoLP(spacingInPixels);
-		getViewer().setProperty(SnapToGrid.PROPERTY_GRID_SPACING,
-			new Dimension(spacing, spacing));
-	}
-
-
-	/**
-	 * Returns the PageBreakEditPart controlled by this RootEditPart.
-	 * @return the <code>PageBreakEditPart</code>
-	 */
-	public PageBreakEditPart getPageBreakEditPart() {
-		if (pageBreakEditPart == null) {
-			pageBreakEditPart = new PageBreakEditPart();
-			pageBreakEditPart.setParent(this);
-		}
-		return pageBreakEditPart;
-	}	
-	
-	/**
-	 * Refreshes the page breaks.
-	 */
-	protected void refreshPageBreaks() {
-		if (getWorkspaceViewerPreferences().getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS))
-			showPageBreaks();
-		else
-			hidePageBreaks();
-	}
-	
-	/**
-	 * Adds the pagebreaks figure to the <code>PAGE_BREAKS_LAYER</code>
-	 */
-	private void showPageBreaks() {
-		getLayer(PAGE_BREAKS_LAYER).add(getPageBreakEditPart().getFigure());
-		Point p =
-			new Point(
-				getWorkspaceViewerPreferences().getInt(
-					WorkspaceViewerProperties.PAGEBREAK_X),
-				getWorkspaceViewerPreferences().getInt(
-					WorkspaceViewerProperties.PAGEBREAK_Y));
-		getPageBreakEditPart().set(
-			p,
-			PageInfoHelper.getChildrenBounds(
-				(DiagramEditPart) getContents(),
-				PageBreaksFigure.class));		
-	}	
-	
-	/**
-	 * Removes the pagebreaks figure from the <code>PAGE_BREAKS_LAYER</code>
-	 */
-	private void hidePageBreaks() {
-		if (getLayer(PAGE_BREAKS_LAYER)
-			.getChildren()
-			.contains(getPageBreakEditPart().getFigure())) {
-			getLayer(PAGE_BREAKS_LAYER).remove(
-				getPageBreakEditPart().getFigure());
-
-			getPageBreakEditPart().updatePreferenceStore();
-		}
-	}	
-	
-	/**
-	 * Handler for the workspace preference store.  Updates the page breaks if 
-	 * WorksapceViewerProperties.VIEWPAGEBREAKS value is modified.
-	 * @param event
-	 */
-	private void handlePreferenceStorePropertyChanged(org.eclipse.jface.util.PropertyChangeEvent event) {
-		if (WorkspaceViewerProperties.VIEWPAGEBREAKS.equals(event.getProperty())) {
-			refreshPageBreaks();
-		} else if (isPageSizeChange(event.getProperty())) {
-			Rectangle diagramBounds = PageInfoHelper.getChildrenBounds(
-					(DiagramEditPart) getContents(),
-					PageBreaksFigure.class);
-			getPageBreakEditPart().resize(diagramBounds);
-			getPageBreakEditPart().updatePreferenceStore();
-			refreshPageBreaks();			
-		} else if (WorkspaceViewerProperties.VIEWGRID.equals(event.getProperty())) {		
-			// Set the state of the Grid Enabled Property
-			getViewer().setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, event.getNewValue());
-		} else if (WorkspaceViewerProperties.SNAPTOGRID.equals(event.getProperty())) {			
-			// Set the state of the Snap to Grid Property
-			getViewer().setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, event.getNewValue());
-		} else if (WorkspaceViewerProperties.SNAPTOGEOMETRY.equals(event.getProperty())) {			
-			// Set the state of the Snap to Geometry Property
-			getViewer().setProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED, event.getNewValue());
-		} else if (WorkspaceViewerProperties.GRIDORDER.equals(event.getProperty())) {
-			// Set the grid level
-			moveGridLayer(((Boolean) event.getNewValue()).booleanValue());
-		} else if (WorkspaceViewerProperties.GRIDSPACING.equals(event.getProperty())) {
-			// Set the grid spacing			
-			Double spacing = (Double) event.getNewValue();
-			setGridSpacing(spacing.doubleValue());
-		} else if (WorkspaceViewerProperties.VIEWRULERS.equals(event.getProperty())) {			
-			// Set the state of the Ruler Enabled Property
-			getViewer().setProperty(RulerProvider.PROPERTY_RULER_VISIBILITY,
-				event.getNewValue()); 
-		} else if (WorkspaceViewerProperties.RULERUNIT.equals(event.getProperty())) { 
-			Object newValue = event.getNewValue();
-			int rulerUnits;
-			
-			if (newValue.getClass() == Integer.class) {
-				rulerUnits = ((Integer) newValue).intValue();
-				setRulers(rulerUnits);
-			} else if (newValue.getClass() == String.class) {
-				try {
-					rulerUnits = Integer.parseInt((String) newValue);
-					setRulers(rulerUnits);
-				} catch (NumberFormatException e) {
-					  Log.error( DiagramUIPlugin.getInstance(),
-					  	DiagramUIStatusCodes.RESOURCE_FAILURE, e.toString() );
-				}				
-			} else {
-				Log.error( DiagramUIPlugin.getInstance(),
-				  	DiagramUIStatusCodes.RESOURCE_FAILURE,
-					newValue.getClass().getName());
-			}
-
-			// Refresh the Rulers
-			Boolean oldValue = (Boolean)getViewer().getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY);
-			getViewer().setProperty(RulerProvider.PROPERTY_RULER_VISIBILITY, Boolean.FALSE);
-			getViewer().setProperty(RulerProvider.PROPERTY_RULER_VISIBILITY, oldValue );
-			
-			// Update the Grids
-			double spacing = getGridSpacing();
-			setGridSpacing(spacing);			
-			
-		} else if (WorkspaceViewerProperties.GRIDLINECOLOR.equals(event.getProperty())) {
-			Integer newValue = (Integer) event.getNewValue();
-			// Set the grid line color
-			setGridColor(newValue);
-		} else if (WorkspaceViewerProperties.GRIDLINESTYLE.equals(event.getProperty())) {
-			Integer newValue = (Integer) event.getNewValue();
-			// Set the grid line style
-			setGridStyle(newValue.intValue());
-		} else if (event.getProperty().equals(IPreferenceConstants.PREF_ENABLE_ANIMATED_ZOOM)){
-			refreshEnableZoomAnimation(getZoomManager());
-		} else if (event.getProperty().equals(IPreferenceConstants.PREF_ENABLE_ANTIALIAS)){
-			refreshEnableAntiAlias();
-		} 
-	}
-	
-	/**
-	 * @param rulerUnits
-	 */
-	private void setRulers(int rulerUnits) {
-		if( getVerticalRuler() != null ) {
-			getVerticalRuler().setUnit( rulerUnits );
-		} else {
-			setVerticalRuler(new DiagramRuler(false, rulerUnits, null));
-		}
-		if( getHorizontalRuler() != null ) {
-			getHorizontalRuler().setUnit( rulerUnits );
-		} else {
-			setHorizontalRuler(new DiagramRuler(true, rulerUnits, null));			
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void refreshEnableZoomAnimation(ZoomManager zoomMangr) {
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		boolean animatedZoom = preferenceStore.getBoolean(
-			IPreferenceConstants.PREF_ENABLE_ANIMATED_ZOOM);
-		zoomMangr.setZoomAnimationStyle(animatedZoom ? ZoomManager.ANIMATE_ZOOM_IN_OUT : ZoomManager.ANIMATE_NEVER);
-	}
-
-	/**
-	 * Refresh visuals in order to enable anti-aliasing
-	 */
-	public void refreshVisuals() {
-        // Set the anti-aliasing
-        refreshEnableAntiAlias();
-	} 
-	
-	/**
-	 * Refreshes anti-alias status on the diagram
-	 */
-	protected void refreshEnableAntiAlias() {
-		IPreferenceStore preferenceStore =
-			(IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		boolean antiAlias = preferenceStore.getBoolean(
-			IPreferenceConstants.PREF_ENABLE_ANTIALIAS);
-		if (getLayers() instanceof org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScalableFreeformLayeredPane)
-			((org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScalableFreeformLayeredPane) layers).setAntiAlias(antiAlias);
-	}
-
-	/**
-	 * Refreshes ruler units on the diagram
-	 */
-	protected void refreshRulerUnits() {
-		if (getWorkspaceViewerPreferences() != null)
-			setRulers(getWorkspaceViewerPreferences().getInt(WorkspaceViewerProperties.RULERUNIT));
-	}
-	
-	/**
-	 * This is a workspace property request.  It does not use a <code>Command</code>
-	 * to execute since it does not change the model.
-	 * @param request 
-	 */
-	public void performRequest(Request request) {
-		if (request.getType().equals(RequestConstants.REQ_RECALCULATE_PAGEBREAKS)) {		
-			getPageBreakEditPart().calculatePageBreakFigureBounds();	
-		} 
-	}
-	
-	/**
-	 * Adds a listener to the workspace preference store for changes related to the
-	 * page breaks and diagram grid.
-	 */
-	public void activate() {
-		super.activate();	
-		
-		if (getWorkspaceViewerPreferences() != null)
-			getWorkspaceViewerPreferences().addPropertyChangeListener(listener);	
-		
-		initPreferenceStoreListener();
-		
-		ScalableFreeformLayeredPane pane = getLayers();
-		
-		refreshEnableAntiAlias();
-		
-		initWorkspaceViewerProperties();
-		
-		refreshRulerUnits();
-		
-		if (pane instanceof ZoomListener) {
-			getZoomManager().addZoomListener((ZoomListener)pane);
-		}
-	}
-	
-	private static final int LIGHT_GRAY_RGB = 12632256;
-	
-	/**
-	 * Initializes the workspace viewer property that are stored per diagram
-	 */
-	private void initWorkspaceViewerProperties() {		
-		IPreferenceStore wsPrefStore = getWorkspaceViewerPreferences();
-		
-		if (wsPrefStore != null) {
-			if (! wsPrefStore.contains(WorkspaceViewerProperties.GRIDORDER)) {
-				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDORDER, true);			
-			} else {
-				moveGridLayer(wsPrefStore.getBoolean(WorkspaceViewerProperties.GRIDORDER));
-			}
-			if (! wsPrefStore.contains(WorkspaceViewerProperties.GRIDLINECOLOR)) {
-				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDLINECOLOR, LIGHT_GRAY_RGB);			
-			} else {
-				setGridColor(Integer.valueOf(wsPrefStore.getInt(WorkspaceViewerProperties.GRIDLINECOLOR)));
-			}
-			if (! wsPrefStore.contains(WorkspaceViewerProperties.GRIDLINESTYLE)) {
-				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDLINESTYLE, SWT.LINE_CUSTOM);			
-			} else {
-				setGridStyle(wsPrefStore.getInt(WorkspaceViewerProperties.GRIDLINESTYLE));
-			}
-			
-			if ((! wsPrefStore.contains(WorkspaceViewerProperties.RULERUNIT)) || 
-					(! wsPrefStore.contains(WorkspaceViewerProperties.GRIDSPACING))) {
-				IPreferenceStore preferenceStore =
-					(IPreferenceStore) getPreferencesHint().getPreferenceStore();			
-				// Set the ruler unit to 999 in order to force the setting 
-				// and then change it to the appropriate value
-				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, 999);						
-				wsPrefStore.setValue(WorkspaceViewerProperties.RULERUNIT, preferenceStore.getInt(IPreferenceConstants.PREF_RULER_UNITS));						
-				wsPrefStore.setValue(WorkspaceViewerProperties.GRIDSPACING, preferenceStore.getDouble(IPreferenceConstants.PREF_GRID_SPACING));			
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void deactivate() {
-		if (getPageBreakEditPart() != null)
-			getPageBreakEditPart().updatePreferenceStore();
-		
-		if (getWorkspaceViewerPreferences() != null)
-			getWorkspaceViewerPreferences().removePropertyChangeListener(listener);
-		removePreferenceStoreListener();
-		
-		ScalableFreeformLayeredPane pane = getLayers();
-		if (pane instanceof ZoomListener) {
-			getZoomManager().removeZoomListener((ZoomListener)pane);
-		}
-		
-		super.deactivate();
-	}
-	
-	/**
-	 * Method that returns <code>true</code> if the given parameter corresponds to a
-	 * workspace viewer property that affects the size of the page breaks.
-	 * @param s workspace viewer property
-	 * @return <code>true</code> if the String corresponds to a <code>WorkspaceViewerProperties</code>
-	 * that affects the size of the <code>PageBreaksFigure</code>
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties
-	 */
-	private boolean isPageSizeChange(String s) {
-		if (WorkspaceViewerProperties.PREF_MARGIN_TOP.equals(s)
-			|| WorkspaceViewerProperties.PREF_MARGIN_LEFT.equals(s)
-			|| WorkspaceViewerProperties.PREF_MARGIN_RIGHT.equals(s)
-			|| WorkspaceViewerProperties.PREF_MARGIN_BOTTOM.equals(s)
-			|| WorkspaceViewerProperties.PREF_PAGE_SIZE.equals(s)
-			|| WorkspaceViewerProperties.PREF_USE_LANDSCAPE.equals(s)
-			|| WorkspaceViewerProperties.PREF_USE_PORTRAIT.equals(s)
-			|| WorkspaceViewerProperties.PREF_PAGE_HEIGHT.equals(s)
-			|| WorkspaceViewerProperties.PREF_PAGE_WIDTH.equals(s)
-			|| WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS.equals(s))
-			return true;
-		else
-			return false;
-	}
-
-	
-	/**
-	 * 
-	 * Accessor for scalable layers. Subclasses can access them in order 
-	 * to update the layer when a relevant preference has been modified
-	 * @return 
-	 */
-	protected ScalableFreeformLayeredPane getLayers() {
-		return layers;
-	}
-
-	
-	protected void setLayers(ScalableFreeformLayeredPane layers) {
-		this.layers = layers;
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport#setPreferencesHint(org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
-	 */
-	public void setPreferencesHint(PreferencesHint preferenceHint) {
-		this.preferencesHint = preferenceHint;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport#getPreferencesHint()
-	 */
-	public PreferencesHint getPreferencesHint() {
-		return preferencesHint;
-	}
-	
-	/**
-	 * Clients must define the measurement unit in the <code>Diagram</code> notation
-	 * object for their editor to affect this mapping mode object value.
-	 * 
-	 * @return <code>IMapMode</code> that is the coordinate mapping for the Editor from device to
-	 * logical coordinates.
-	 */
-	final public IMapMode getMapMode() {
-		if (mm == null)
-			mm = new WrapperMapMode();
-		return mm;
-	}
-
-	public DiagramRuler getHorizontalRuler() {
-		return horizontalRuler;
-}
-	
-	private void setHorizontalRuler(DiagramRuler horizontalRuler) {
-		this.horizontalRuler = horizontalRuler;
-	}
-
-	
-	public DiagramRuler getVerticalRuler() {
-		return verticalRuler;
-	}
-
-	
-	private void setVerticalRuler(DiagramRuler verticalRuler) {
-		this.verticalRuler = verticalRuler;
-	}
-
-	protected GridLayer createGridLayer() {
-		return new GridLayerEx();
-	}
-
-	protected GridLayer createGridLayer(int r, int g, int b) {
-		return new GridLayerEx(new Color(null,r,g,b));
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/EventType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/EventType.java
deleted file mode 100644
index 38b6034..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/EventType.java
+++ /dev/null
@@ -1,21 +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.editparts;
-
-/**
- * This is a HAck to avoid breaking clients who still send the Unresolved event
- * It should be remomved and replaced by a refresh edit policy 
- * that will be installed by the clients
- *
- */
-interface EventType {
-    public static final int UNRESOLVE = 1003;
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java
deleted file mode 100644
index 5cbc29d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java
+++ /dev/null
@@ -1,1716 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-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.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gef.requests.TargetRequest;
-import org.eclipse.gmf.runtime.common.core.util.IAdaptableSelection;
-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.ActionFilterService;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-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.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.PropertyHandlerEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ToggleCanonicalModeCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DummyEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpolicy.EditPolicyService;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.LineType;
-import org.eclipse.gmf.runtime.notation.LineTypeStyle;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-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.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author melaasar,mmostafa
- * 
- * The root of all component graphical edit parts that own a view as a model
- */
-public abstract class GraphicalEditPart
-    extends AbstractGraphicalEditPart
-    implements IGraphicalEditPart, IAdaptableSelection, NotificationListener {
-  
-    /** A map of listener filters ids to filter data */
-    private Map listenerFilters;
-    
-    /** Used for accessibility. */
-    protected AccessibleEditPart accessibleEP;
-
-    /** Used for registering and unregistering the edit part */
-    protected String elementGuid;
-
-    /**
-     * Cache the editing domain after it is retrieved.
-     */
-    private TransactionalEditingDomain editingDomain;
-
-    /**
-     * Cache the font data when a font is created so that it can be
-     * disposed later.
-     */
-    private FontData cachedFontData;
-    
-    /**
-     * Flag to indicate if the edit part is in edit mode
-     * @since 1.2
-     */
-    final protected static int FLAG__IS_EDITABLE = MAX_FLAG << 1;
-    
-    /**
-     * Flag to indicate automatic updates of source/target connections visibility triggered by the change
-     * of this editpart's visibility
-     * @since 1.2
-     */
-    final protected static int FLAG__AUTO_CONNECTIONS_VISIBILITY = MAX_FLAG << 2;
-    
-    /**
-     * The left-most bit that is reserved by this class for setting flags. Subclasses may
-     * define additional flags starting at <code>(GRAPHICAL_EDIT_PART__MAX_FLAG << 1)</code>.
-     * @since 1.2
-     */
-    final protected static int GRAPHICAL_EDIT_PART__MAX_FLAG = FLAG__AUTO_CONNECTIONS_VISIBILITY;
-    
-    /**
-     * Create an instance.
-     * 
-     * @param model
-     *            the underlying model.
-     */
-    public GraphicalEditPart(EObject model) {
-        setModel(model);
-        setFlag(FLAG__IS_EDITABLE, true);
-        setFlag(FLAG__AUTO_CONNECTIONS_VISIBILITY, true);
-    }
-    
-    /** Registers this editpart to recieve notation and semantic events. */
-    public void activate() {
-        if (isActive()) {
-            return;
-        }
-        addNotationalListeners();
-
-        EObject semanticElement;
-        EObject semanticProxy;
-        if (hasNotationView()) {
-            semanticProxy = ((View) super.getModel()).getElement();
-            if ((semanticProxy==null)||semanticProxy.eIsProxy()) {
-                semanticElement = null;
-            } else {
-                semanticElement = semanticProxy;
-            }
-        } else {
-            semanticProxy = (EObject) basicGetModel();
-            if ((semanticProxy!=null) && semanticProxy.eIsProxy()) {
-                semanticElement = EMFCoreUtil.resolve(getEditingDomain(),
-                    semanticProxy);
-            } else {
-                semanticElement = semanticProxy;
-            }
-        }
-
-        if (semanticElement != null)
-            addSemanticListeners();
-        else if (semanticProxy != null) {
-            addListenerFilter("SemanticProxy", this, semanticProxy); //$NON-NLS-1$
-        }
-        GraphicalEditPart.super.activate();
-
-    }
-
-    /**
-     * Adds a listener filter by adding the given listener to a passed notifier
-     * 
-     * @param filterId
-     *            A unique filter id (within the same editpart instance)
-     * @param listener
-     *            A listener instance
-     * @param element
-     *            An element to add the listener to
-     */
-    protected void addListenerFilter(String filterId,
-            NotificationListener listener,
-            EObject element) {
-        if (element == null)
-            return;
-
-        DiagramEventBroker diagramEventBroker = getDiagramEventBroker();
-        if (diagramEventBroker != null) {
-        	assert filterId != null;
-        	assert listener != null;
-            if (listenerFilters == null)
-                listenerFilters = new HashMap();
-            diagramEventBroker.addNotificationListener(element,listener);
-            listenerFilters.put(filterId.intern(), new Object[] {element, listener});
-        }
-    }
-    
-    /**
-     * Adds a listener filter by adding the given listener to a passed notifier
-     * 
-     * @param filterId
-     *            A unique filter id (within the same editpart instance)
-     * @param listener
-     *            A listener instance
-     * @param element
-     *            An element to add the listener to
-     */
-    protected void addListenerFilter(String filterId,
-            NotificationListener listener,
-            EObject element,
-            EStructuralFeature feature) {
-        if (element == null)
-            return;
-                
-        DiagramEventBroker diagramEventBroker = getDiagramEventBroker();
-        if (diagramEventBroker != null) {
-        	assert filterId != null;
-        	assert listener != null;
-            if (listenerFilters == null)
-                listenerFilters = new HashMap();
-
-            diagramEventBroker.addNotificationListener(element,feature,listener);
-
-            listenerFilters.put(filterId.intern(), new Object[] {element,feature, listener});
-        }
-    }
-
-    /** Creates a connection editpart. */
-    final protected org.eclipse.gef.ConnectionEditPart createConnection(
-            Object connectionView) {
-        return (org.eclipse.gef.ConnectionEditPart) createChild(connectionView);
-    }
-
-    /**
-     * Overridden to support editpolicies installed programmatically and via the
-     * <code>EditPolicyService</code>. Subclasses should override
-     * <code>createDefaultEditPolicies()</code>.
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-     */
-    final protected void createEditPolicies() {
-        createDefaultEditPolicies();
-        EditPolicyService.getInstance().createEditPolicies(this);
-    }
-
-    /**
-     * Should be overridden to install editpolicies programmatically.
-     * 
-     * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-     */
-    protected void createDefaultEditPolicies() {
-        installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE,
-            new SemanticEditPolicy());
-        installEditPolicy(EditPolicyRoles.PROPERTY_HANDLER_ROLE,
-            new PropertyHandlerEditPolicy());
-        installEditPolicy(EditPolicyRoles.DECORATION_ROLE,
-            new DecorationEditPolicy());
-    }
-
-    public void deactivate() {
-        if ( !isActive() ) {
-            return;
-        }
-        removeNotationalListeners();
-        removeSemanticListeners();
-        if (listenerFilters != null ) {
-            for (Iterator i = listenerFilters.keySet().iterator(); i.hasNext();) {
-                Object[] obj = (Object[]) listenerFilters.get(i.next());
-                if (obj.length>2){
-                    getDiagramEventBroker().
-                        removeNotificationListener((EObject)obj[0],(EStructuralFeature) obj[1],(NotificationListener) obj[2]);
-                }else {
-                    getDiagramEventBroker().removeNotificationListener((EObject) obj[0],(NotificationListener) obj[1]);
-                }
-            }
-        }
-        super.deactivate();
-    }
-
-    public void removeNotify() {
-        
-        View view = getNotationView();
-        if (view != null && !view.isVisible() && getFlag(FLAG__AUTO_CONNECTIONS_VISIBILITY)){
-            setConnectionsVisibility(false);
-        }
-        
-        super.removeNotify();
-        
-        if (cachedFontData != null) {
-            getResourceManager().destroyFont(
-                FontDescriptor.createFrom(cachedFontData));
-            cachedFontData = null;
-        }
-
-    }
-
-    /**
-     * executes the passed <code>Command</code>
-     * @param command the command to exectue
-     */
-    protected void executeCommand(Command command) {
-        getViewer().getEditDomain().getCommandStack().execute(command);
-    }
-    
-    /**
-     * Access the model member variable
-     * @return
-     */
-    final protected Object basicGetModel(){
-        return super.getModel();
-    }
-
-    /** Adds the ability to adapt to the edit part's view class. */
-    public Object getAdapter(Class key) {       
-
-        // Adapt to IActionFilter
-        if (key == IActionFilter.class) {
-            return ActionFilterService.getInstance();
-        }
-
-        if (View.class.isAssignableFrom(key)) {
-            Object _model = getModel();
-            if (key.isInstance(_model))
-                return _model;
-            else
-                return null;
-        }
-
-        if (key == SnapToHelper.class) {
-            return SnapToHelperUtil.getSnapHelper(this);
-        }
-
-        Object model = basicGetModel();
-        if (model != null &&
-            EObject.class.isAssignableFrom(key)) {
-            // Adapt to semantic element
-            EObject semanticObject = null;
-            if (hasNotationView()){
-                semanticObject = ViewUtil.resolveSemanticElement((View)model);
-            }
-            else{
-                EObject element = (EObject)model;
-                if (element.eIsProxy()){
-                    semanticObject = EMFCoreUtil.resolve(getEditingDomain(), element);
-                }
-            }
-            if ((semanticObject!=null) && key.isInstance(semanticObject)) {
-                return semanticObject;
-            }
-            else if (key.isInstance(model)){
-                return model;
-            }
-            
-        }
-
-        // Delegate
-        return super.getAdapter(key);
-    }
-
-    /**
-     * Utility method to get the primary view and then query for a child based on the
-     * semantic hint
-     * 
-     * @param semanticHint <code>String</code> that is the hint that can retrieved on the getType
-     * method of <code>View</code>
-     * @return <code>IGraphicalEditPart</code> that matches with the given semanticHint
-     */
-    public IGraphicalEditPart getChildBySemanticHintOnPrimaryView(String semanticHint) {
-        View primaryView = getPrimaryView();
-        View childView = ViewUtil.getChildBySemanticHint(primaryView, semanticHint);
-        if (childView != null)
-            return  (IGraphicalEditPart)getViewer().getEditPartRegistry().get(childView);
-
-        return null;
-    }
-    
-    /**
-     * Method getChildBySemanticHint.
-     * 
-     * @param semanticHint
-     * @return IGraphicalEditPart
-     */
-    public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-        View view;
-        if (hasNotationView() && (view = (View) super.getModel()) != null) {
-            view = ViewUtil.getChildBySemanticHint(view,semanticHint);
-            if (view != null){
-                IGraphicalEditPart ep =   (IGraphicalEditPart)getViewer().getEditPartRegistry().get(view);
-                // TODO remove this code after the clients change there code to 
-                // be aware of the on demand editpart creation
-                if (ep == null){
-                    // the ep had not been created yet, create a dummy one 
-                    ep  =  new DummyEditPart(view);
-                }
-                return ep;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Method getChildViewBySemanticHint.
-     * 
-     * @param semanticHint
-     * @return IGraphicalEditPart
-     */
-    public View getChildViewBySemanticHint(String semanticHint) {
-        View view;
-        if (hasNotationView() && (view = (View) super.getModel()) != null) {
-            return ViewUtil.getChildBySemanticHint(view, semanticHint);
-        }
-        return null;
-    }
-
-    
-    /** counter that tracs the recursive depth of the getCommand() method. */
-    private static volatile int GETCOMMAND_RECURSIVE_COUNT = 0;
-    
-    /** A list of editparts who's canonical editpolicies are to be temporarily disabled. */
-    private static Set _disableCanonicalEditPolicyList = new HashSet();
-    
-
-    /** Return a command for the supplied request. */
-    public Command getCommand(Request _request) {
-        if ( !isEditModeEnabled() ) {
-            if (RequestConstants.REQ_OPEN.equals(_request.getType())) {
-                //allowed, continue
-            }
-            else {
-                return UnexecutableCommand.INSTANCE;
-            }           
-        }
-        
-        Command cmd = null;
-        try {
-            GETCOMMAND_RECURSIVE_COUNT++;
-            final Request request = _request;
-            try {
-                cmd = (Command) getEditingDomain().runExclusive(
-                    new RunnableWithResult.Impl() {
-
-                        public void run() {
-                            setResult(GraphicalEditPart.super
-                                .getCommand(request));
-                        }
-                    });
-            } catch (InterruptedException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "getCommand", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "getCommand", e); //$NON-NLS-1$
-            }
-            
-
-            if ( cmd != null ) {
-                _disableCanonicalEditPolicyList.addAll(disableCanonicalFor(_request));
-            }
-            
-            GETCOMMAND_RECURSIVE_COUNT--;
-            
-            if ( GETCOMMAND_RECURSIVE_COUNT == 0 ) {
-                if ( cmd != null 
-                        && !_disableCanonicalEditPolicyList.isEmpty() ) {
-                    CompoundCommand cc = new CompoundCommand();
-                    cc.setLabel( cmd.getLabel() );
-                    ToggleCanonicalModeCommand tcmd = 
-                        ToggleCanonicalModeCommand.getToggleCanonicalModeCommand(_disableCanonicalEditPolicyList, false);
-                    cc.add( tcmd );
-                    cc.add( cmd );
-                    ToggleCanonicalModeCommand tcmd2 = ToggleCanonicalModeCommand.getToggleCanonicalModeCommand(tcmd, true);
-                    if (tcmd2 != null) {
-                        tcmd2.setDomain(getEditingDomain());
-                    }
-                    cc.add( tcmd2 );
-                    _disableCanonicalEditPolicyList.clear();
-                    return cc.unwrap();
-                }
-            }
-        }
-        catch( RuntimeException t ) {
-            GETCOMMAND_RECURSIVE_COUNT = 0;
-            throw t;
-        }
-        return cmd;
-        
-    }
-    
-    /**
-     * Return a list of editparts who's canonical editpolicies should be disabled
-     * prior to executing the commands associated to the supplied request.
-     * This implementation will return the editpart honoring a <code>SemanticWrapperRequest</code>
-     * and a <code>CreateConnectionViewRequest</code>'s source and target editparts.
-     *
-     * @param request a request that has returned a command.
-     * @return list of editparts.
-     */
-    protected Collection disableCanonicalFor( final Request request ) {
-        //
-        // not the most generic of solution; however, it will have to do for now...
-        //
-        // Alternate solutions
-        // 1. common request interface on all the requests
-        //  IRequest#getAffectedEditParts
-        //
-        // 2. Traverse down the command and collect of the ICommand#getAffectedObjects()
-        //  -- this requires that all our commands properly set this value.
-        
-        Set hosts = new HashSet();
-        if ( (request instanceof EditCommandRequestWrapper)  
-                || request instanceof TargetRequest
-                || request instanceof DropRequest ) {
-            hosts.add(this);
-            hosts.add(getParent());
-        }
-        if((request instanceof ReconnectRequest)) {
-            ReconnectRequest reconnect = (ReconnectRequest)request;
-            hosts.add(this);
-            hosts.add(getParent());
-            if(reconnect.getTarget() != null) {
-                EditPart target  = reconnect.getTarget();
-                addEditPartAndParent(hosts, target);
-            }
-            if(reconnect.getConnectionEditPart() != null) {
-                org.eclipse.gef.ConnectionEditPart connectionEditPart = reconnect.getConnectionEditPart();
-                if(connectionEditPart.getSource() != null) {
-                    EditPart srcEP = connectionEditPart.getSource();
-                    addEditPartAndParent(hosts, srcEP);
-                }
-                if(connectionEditPart.getTarget() != null) {
-                    EditPart trgEP = connectionEditPart.getTarget();
-                    addEditPartAndParent(hosts, trgEP);
-                }
-            }
-        }
-        if ((request instanceof CreateConnectionRequest) ) {
-            CreateConnectionRequest ccvr = (CreateConnectionRequest)request;
-            hosts.add(this);
-            hosts.add(getParent());
-            if ( ccvr.getSourceEditPart() != null ) {
-                hosts.add( ccvr.getSourceEditPart());
-                hosts.add( ccvr.getSourceEditPart().getParent());
-            }
-            if ( ccvr.getTargetEditPart() != null ) {
-                hosts.add( ccvr.getTargetEditPart());
-                hosts.add( ccvr.getTargetEditPart().getParent());
-            }
-        }
-        if ((request instanceof GroupRequest)) {
-            List parts = ((GroupRequest)request).getEditParts();
-            hosts.add(this);
-            hosts.add(getParent());
-        
-            Iterator editparts = parts == null ? Collections.EMPTY_LIST.iterator() : parts.iterator();  
-            while ( editparts.hasNext() ) {
-                EditPart ep = (EditPart)editparts.next();
-                addEditPartAndParent(hosts, ep);
-            }
-        }
-        
-        /////////////////////////////////////////////////////////////
-        // This following behavior is specific to BorderItemEditPart and
-        // AbstractBorderItemEditPart, but we do not want to allow clients to
-        // override this method so we do not want to make it protected.
-        
-        if (this instanceof IBorderItemEditPart) {
-            if ((request instanceof CreateConnectionViewRequest)) {
-                CreateConnectionViewRequest ccvr = (CreateConnectionViewRequest) request;
-                if (ccvr.getSourceEditPart() instanceof IBorderItemEditPart) {
-                    hosts.add(ccvr.getSourceEditPart().getParent().getParent());
-                }
-                if (ccvr.getTargetEditPart() instanceof IBorderItemEditPart) {
-                    hosts.add(ccvr.getTargetEditPart().getParent().getParent());
-                }
-            }
-        }
-        /////////////////////////////////////////////////////////////
-
-        return hosts;
-    }
-
-    private void addEditPartAndParent(Set hosts, EditPart editPart) {
-        hosts.add(editPart);
-        hosts.add(editPart.getParent());
-    }
-
-    /**
-     * gets the content pane for the supplied editpart.
-     * @param editPart the edit part to use to get the contents pane
-     * @return <code>IFigure</code>
-     */
-    protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-        return getContentPane();
-    }
-
-    /**
-     * Convenience method returning the editpart's parimary view. 
-     * @return the diagram
-     */
-    protected Diagram getDiagramView() {
-        return ((View) getRoot().getContents().getModel()).getDiagram();
-    }
-
-    /**
-     * Convenience method returning the editpart's parimary view. Same as
-     * calling <code>getView().getPrimaryView()</code>
-     */
-    public View getPrimaryView() {
-    	if (this instanceof IPrimaryEditPart && getModel() instanceof View) {
-    		return (View) getModel();
-    	} else {
-    		for (EditPart ep = getParent(); ep != null; ep = ep.getParent()) {
-    			if (ep instanceof IGraphicalEditPart && ep.getModel() instanceof View) {
-    				return ((IGraphicalEditPart) ep).getPrimaryView();
-    			}
-    		}
-    	}
-    	return null;
-    }
-
-    /**
-     * gets this editpart's edit domain.
-     * @return the edit domain
-     */
-    protected EditDomain getEditDomain() {
-        EditDomain result = null;
-
-        try {
-            result = getRoot().getViewer().getEditDomain();
-        } catch (NullPointerException nullPointerException) {
-            /*
-             * The reason why we would the code in try block throws a NPE is
-             * partly because when the diagram is saved as another diagram, the
-             * an event is generated which forces the refreshing of the
-             * properties and if the selection is this editpart, then in order
-             * to open a read action, properties provider will grab its
-             * editDomain. Since this editPart would be in the state of flux and
-             * may not have the root or the viewer set yet, therefore, a null
-             * pointer exception can be thrown.
-             *  
-             */
-            return null;
-        }
-        return result;
-    }
-
-    /** Return the editpart's diagram edit domain. */
-    public IDiagramEditDomain getDiagramEditDomain() {
-        return (IDiagramEditDomain) getEditDomain();
-    }
-
-    /**
-     * Return this editpart's view (model) children.
-     * 
-     * @return list of views.
-     */
-    protected List getModelChildren() {
-        Object model = getModel();
-        if(model!=null && model instanceof View){
-            return new ArrayList(((View)model).getVisibleChildren());
-        }
-        return Collections.EMPTY_LIST;
-    }
-    
-    /**
-     * Convenience method to retreive the value for the supplied value from the
-     * editpart's associated view element. Same as calling
-     * <code> ViewUtil.getStructuralFeatureValue(getNotationView(),feature)</code>.
-     */
-    public Object getStructuralFeatureValue(EStructuralFeature feature) {
-        if (hasNotationView())
-            return ViewUtil.getPropertyValue((View) super.getModel(), feature,
-                feature.getEContainingClass());
-        else
-            return null;
-    }
-
-    
-    /**
-     * gets the semantic element associated to this editpart.
-     * @return the semantic element or <code>null</code> if the semantic element was
-     * <code>null</code> or unresolvable 
-     */
-    public EObject resolveSemanticElement() {
-        EObject semanticElement = null;
-        Object basicModel = basicGetModel();
-        if (hasNotationView()) {
-            semanticElement = ((View) basicModel).getElement();
-        } else if (basicModel instanceof EObject) {
-            semanticElement = (EObject) basicModel;
-        }
-        if (semanticElement == null) {
-            return null;
-        }
-
-        if (!semanticElement.eIsProxy()) {
-            return semanticElement;
-        }
-
-        try {
-            return (EObject) getEditingDomain().runExclusive(
-                new RunnableWithResult.Impl() {
-
-                    public void run() {
-                        Object model = getModel();
-                        if (model instanceof View) {
-                            setResult(ViewUtil
-                                .resolveSemanticElement((View) getModel()));
-                        } else if (model instanceof EObject) {
-                            EObject element = (EObject) model;
-                            if (element.eIsProxy())
-                                setResult(EMFCoreUtil.resolve(
-                                    getEditingDomain(), element));
-                            else
-                                setResult(element);
-                        }
-                    }
-                });
-        } catch (InterruptedException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "resolveSemanticElement", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                "resolveSemanticElement", e); //$NON-NLS-1$
-            return null;
-        }
-
-    }
-
-    /**
-     * Walks up the editpart hierarchy to find and return the
-     * <code>TopGraphicEditPart</code> instance.
-     */
-    public TopGraphicEditPart getTopGraphicEditPart() {
-        EditPart editPart = this;
-        while (editPart instanceof IGraphicalEditPart) {
-            if (editPart instanceof TopGraphicEditPart)
-                return (TopGraphicEditPart) editPart;
-            editPart = editPart.getParent();
-        }
-        return null;
-    }
-
-    /**
-     * Return the editpart's associated Notation View.
-     * @return <code>View</code>, the associated view or null if there is no associated Notation View
-     */
-    public View getNotationView() {
-        Object model = getModel();
-        if (model instanceof View)
-            return (View)model;
-        return null;
-    }
-
-    /**
-     * Method reactivateSemanticModel. This method reactivates the edit part's
-     * emantic model by: 1- removing semantic listeners 2- adding semantic
-     * listeners if the semantic reference is resolvable 3- Refreshing it
-     * 
-     * This method is called in response to IView's Properties.ID_SEMANTICREF
-     * property change event However, it will only work under the following
-     * assumptions: 1- The old and new semantic models are compatible in their
-     * kind 2- The deltas between old and new semantic models do not affect
-     * notation 3- Connections are not refereshed since they are maintained by
-     * the diagram
-     */
-    protected void reactivateSemanticModel() {
-        removeSemanticListeners();
-        if (resolveSemanticElement() != null)
-            addSemanticListeners();
-    }
-
-    /** Finds an editpart given a starting editpart and an EObject */
-    public EditPart findEditPart(EditPart epBegin, EObject theElement) {
-        if (theElement == null) {
-            return null;
-        }
-        EditPart epStart = null;
-        if (epBegin == null) {
-            epStart = this;
-        } else {
-            epStart = epBegin;
-        }
-
-        final View view = (View) ((IAdaptable) epStart)
-            .getAdapter(View.class);
-
-        if (view != null) {
-            EObject el = ViewUtil.resolveSemanticElement(view);
-
-            if ((el != null) && el.equals(theElement)) {
-                return epStart;
-            }
-        }
-
-        ListIterator childLI = epStart.getChildren().listIterator();
-        while (childLI.hasNext()) {
-            EditPart epChild = (EditPart) childLI.next();
-
-            EditPart elementEP = findEditPart(epChild, theElement);
-            if (elementEP != null) {
-                return elementEP;
-            }
-        }
-        return null;
-    }
-
-    /** Invoke the editpart's refresh mechanism. */
-    public void refresh() {
-        try {
-            getEditingDomain().runExclusive(new Runnable() {
-    
-                public void run() {
-                    EditPolicyIterator i = getEditPolicyIterator();
-                    while (i.hasNext()) {
-                        EditPolicy policy = i.next();
-                        if (policy instanceof GraphicalEditPolicyEx) {
-                            ((GraphicalEditPolicyEx) policy).refresh();
-                        }
-                    }
-                    GraphicalEditPart.super.refresh();
-                }
-            });
-        } catch (InterruptedException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "refresh", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                "refresh", e); //$NON-NLS-1$
-        }
-
-    }
-
-    /** Refresh the editpart's figure background colour. */
-    protected void refreshBackgroundColor() {
-        FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
-        if ( style != null ) {
-            setBackgroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getFillColor())));
-        }
-    }
-
-    /** Refresh the editpart's figure font. */
-    protected void refreshFont() {
-        FontStyle style = (FontStyle) getPrimaryView().getStyle(NotationPackage.Literals.FONT_STYLE);
-        if (style != null) {
-            setFont(new FontData(
-                style.getFontName(), 
-                style.getFontHeight(), 
-                (style.isBold() ? SWT.BOLD : SWT.NORMAL) | 
-                (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)));
-        }
-    }
-
-    /** Refresh the editpart's figure font colour. */
-    protected void refreshFontColor() {
-        FontStyle style = (FontStyle)  getPrimaryView().getStyle(NotationPackage.Literals.FONT_STYLE);
-        if ( style != null ) {
-            setFontColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getFontColor())));
-        }
-    }
-
-    /** Refresh the editpart's figure foreground colour. */
-    protected void refreshForegroundColor() {
-        LineStyle style = (LineStyle)  getPrimaryView().getStyle(NotationPackage.Literals.LINE_STYLE);
-        if ( style != null ) {
-            setForegroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getLineColor())));
-        }
-    }
-
-    /** Refresh the editpart's figure visibility. */
-    protected void refreshVisibility() {
-        Object model = null;
-        EditPart ep = this;
-        while (!(model instanceof View) && ep!=null){
-            model = ep.getModel();
-            ep = ep.getParent();
-        }
-        if (model instanceof View)
-            setVisibility(((View)model).isVisible());
-    }
-
-    /** Refresh the editpart's figure visual properties. */
-    protected void refreshVisuals() {
-        super.refreshVisuals();
-        refreshVisibility();
-    }
-
-    /**
-     * Removes a listener previously added with the given id
-     * 
-     * @param filterId the filter ID
-     */
-    protected void removeListenerFilter(String filterId) {
-        if (listenerFilters == null)
-            return;
-        Object[] objects = (Object[]) listenerFilters.remove(filterId);
-        if (objects == null)
-            return;
-        if (objects.length>2){
-            getDiagramEventBroker().
-                removeNotificationListener((EObject) objects[0],
-                                             (EStructuralFeature) objects[1],
-                                             (NotificationListener) objects[2]);
-        }else{
-            getDiagramEventBroker().removeNotificationListener((EObject) objects[0],(NotificationListener) objects[1]);
-        }
-        
-    }
-
-    /**
-     * sets the back ground color of this edit part
-     * @param color the new value of the back ground color
-     */
-    protected void setBackgroundColor(Color color) {
-        getFigure().setBackgroundColor(color);
-    }
-
-    /**
-     * Sets the font to the label.
-     * This method could be overriden to change the font data of the font
-     * overrides typically look like this:
-     *      super.setFont(
-     *      new FontData(
-     *          fontData.getName(),
-     *          fontData.getHeight(),
-     *          fontData.getStyle() <| &> SWT.????));
-     * @param fontData the font data
-     */
-    protected void setFont(FontData fontData) {
-         if (cachedFontData != null && cachedFontData.equals(fontData)) {
-            // the font was previously set and has not changed; do nothing.
-            return;
-        }
-
-        try {
-            Font newFont = getResourceManager().createFont(
-                FontDescriptor.createFrom(fontData));
-            getFigure().setFont(newFont);
-            getFigure().repaint();
-
-            if (cachedFontData != null) {
-                getResourceManager().destroyFont(
-                    FontDescriptor.createFrom(cachedFontData));
-            }
-            cachedFontData = fontData;
-        } catch (DeviceResourceException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "setFont", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "setFont", e); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * sets the font color
-     * @param color the new value of the font color
-     */
-    protected void setFontColor(Color color) {
-        // NULL implementation
-    }
-
-    /**
-     * sets the fore ground color of this edit part's figure
-     * @param color the new value of the foregroundcolor
-     */
-    protected void setForegroundColor(Color color) {
-        getFigure().setForegroundColor(color);
-    }
-    
-    /**
-     * Sets the passed feature if possible on this editpart's view
-     * to the passed value.
-     * @param feature the feature to use
-     * @param value  the value of the property being set
-     */
-    public void setStructuralFeatureValue(EStructuralFeature feature, Object value) {
-        if (hasNotationView() && (feature != null)) {
-            ViewUtil.setPropertyValue((View) super.getModel(), feature, feature
-                .getEContainingClass(), value);
-        }
-    }
-
-    /**
-     * sets the visibility of this edit part
-     * @param vis the new value of the visibility
-     */
-    protected void setVisibility(boolean vis) {
-        if (!vis && getSelected() != SELECTED_NONE)
-            getViewer().deselect(this);
-        
-        IFigure _figure = getFigure();
-        if (_figure.isVisible()==vis){
-            return;
-        }
-        
-        // if we are going to hide the node then connections coming to the
-        // node or outside it should be hidden as well
-        if (getFlag(FLAG__AUTO_CONNECTIONS_VISIBILITY)) {
-        	setConnectionsVisibility(vis);
-        }
-        _figure.setVisible(vis);
-        _figure.revalidate();
-    }
-    
-    protected void setConnectionsVisibility(boolean visibility) {
-        List _srcConnections = getSourceConnections();
-        for (Iterator iter = _srcConnections.iterator(); iter.hasNext();) {
-            ConnectionEditPart connection = (ConnectionEditPart) iter.next();
-            if (connection.getFigure().isVisible()!=visibility)
-                connection.setVisibility(visibility);
-        }
-        
-        List _targetConnections = getTargetConnections();
-        for (Iterator iter = _targetConnections.iterator(); iter.hasNext();) {
-            ConnectionEditPart connection = (ConnectionEditPart) iter.next();
-            if (connection.getFigure().isVisible()!=visibility)
-                connection.setVisibility(visibility);
-        }
-        
-    }
-
-    /**
-     * This method adds all listeners to the notational world (views, figures,
-     * editpart...etc) Override this method to add more notational listeners
-     * down the hierarchy
-     */
-    protected void addNotationalListeners() {
-        if (hasNotationView()){
-            addListenerFilter("View", this,(View)getModel()); //$NON-NLS-1$
-        }
-    }
-    
-    /**
-     * This method adds all listeners to the semantic element behind this EditPart
-     * Override this method to add more semantic listeners down the hierarchy
-     * This method is called only if the semantic element is resolvable
-     */
-    protected void addSemanticListeners() {
-        addListenerFilter("SemanticElement", this,resolveSemanticElement());//$NON-NLS-1$
-    }
-
-    /**
-     * This method removes all listeners to the notational world (views,
-     * figures, editpart...etc) Override this method to remove notational
-     * listeners down the hierarchy
-     */
-    protected void removeNotationalListeners() {
-        removeListenerFilter("View"); //$NON-NLS-1$
-    }
-
-    /**
-     * This method removes all listeners to the semantic element behind this EditPart
-     * Override this method to remove semantic listeners
-     * down the hierarchy
-     */
-    protected void removeSemanticListeners() {
-        removeListenerFilter("SemanticElement"); //$NON-NLS-1$
-    }
-
-    /**
-     * Perform a request by executing a command from the target editpart of the
-     * request For the Direct_Edit request, we need to show up an editor first
-     * 
-     * @see org.eclipse.gef.EditPart#performRequest(org.eclipse.gef.Request)
-     */
-    public void performRequest(Request request) {
-        if ( !isEditModeEnabled() ) {
-            if (RequestConstants.REQ_OPEN.equals(request.getType())) {
-                //allowed, continue
-            }
-            else {
-                return;
-            }
-        }
-        
-        if (RequestConstants.REQ_DIRECT_EDIT == request.getType()) {
-            performDirectEditRequest(request);
-        } else {
-            EditPart targetEditPart = getTargetEditPart(request);
-            if (targetEditPart != null) {
-                Command command = targetEditPart.getCommand(request);
-                if (command != null) {
-                    getDiagramEditDomain().getDiagramCommandStack().execute(
-                        command);
-                    return;
-                }
-            }
-        }
-    }
-
-    /**
-     * Performs a direct edit request (usually by showing some type of editor)
-     * 
-     * @param request
-     *            the direct edit request
-     */
-    protected void performDirectEditRequest(Request request) {
-        // NULL implementation
-    }
-
-    /**
-     * @see org.eclipse.gef.editparts.AbstractEditPart#getAccessibleEditPart()
-     */
-    protected AccessibleEditPart getAccessibleEditPart() {
-        if (accessibleEP == null)
-            accessibleEP = new AccessibleGraphicalEditPart() {
-
-            private String getSemanticName() {
-                EObject semanticElement = resolveSemanticElement();
-            
-                if( semanticElement != null ) {
-                    String name = semanticElement.getClass().getName();
-                    int startIndex = name.lastIndexOf('.') + 1;
-                    int endIndex = name.lastIndexOf( "Impl" ); //$NON-NLS-1$
-                    return name.substring(startIndex, endIndex);
-                }
-            
-                return null;
-            }
-
-            public void getName(AccessibleEvent e) {
-                IGraphicalEditPart childEP = getChildBySemanticHint(CommonParserHint.NAME);
-                if (childEP == null) {
-                    childEP = getChildBySemanticHint(CommonParserHint.DESCRIPTION);
-                }
-                if (childEP != null) {
-                    ILabelDelegate label = (ILabelDelegate) childEP.getAdapter(ILabelDelegate.class);
-                    if (label != null) {
-                        e.result = label.getText();
-                    }
-                } else {
-                    e.result = getSemanticName();
-                }
-            }
-            };
-
-        return accessibleEP;
-    }
-
-    /** Adds a [ref, editpart] mapping to the EditPartForElement map. */
-    protected void registerModel() {
-        EditPartViewer viewer = getViewer();
-        if (hasNotationView()) {
-            super.registerModel();
-        } else {
-            viewer.getEditPartRegistry().put(basicGetModel(), this);
-        }
-
-        // Save the elements Guid to use during unregister.
-        // If the reference is null, do not register.
-        EObject ref = null;
-        if (hasNotationView())
-            ref = getNotationView().getElement();
-        else
-            ref = (EObject) basicGetModel();
-        if (ref == null) {
-            return;
-        }
-        elementGuid = EMFCoreUtil.getProxyID(ref);
-        ((IDiagramGraphicalViewer) viewer).registerEditPartForElement(
-            elementGuid, this);
-    }
-
-
-    /** Remove this editpart from the EditPartForElement map. */
-    protected void unregisterModel() {
-        EditPartViewer viewer = getViewer();
-        if (hasNotationView())
-            super.unregisterModel();
-        else {
-            Map registry = viewer.getEditPartRegistry();
-            if (registry.get(basicGetModel()) == this)
-                registry.remove(basicGetModel());
-        }
-
-        //Do not need to unregister if the guid is null.
-        if (elementGuid == null) {
-            return;
-        }
-        ((IDiagramGraphicalViewer) viewer).unregisterEditPartForElement(
-            elementGuid, this);
-    }
-
-    /**
-     * Refreshes a child editpart by removing it and refreshing children
-     * @param child the child to refresh
-     */
-    protected final void refreshChild(GraphicalEditPart child) {
-        removeChild(child);
-        refreshChildren();
-    }
-    
-    /**
-     * Refreshes a source connection editpart by removing it and refreshing source connections
-     * @param conn the connection to refresh
-     */
-    protected final void refreshSourceConnection(ConnectionEditPart conn) {
-        removeSourceConnection(conn);
-        refreshSourceConnections();
-    }
-
-    /**
-     * Refreshes a target connection editpart by removing it and refreshing target connections
-     * @param conn the connection to refresh
-     */
-    protected final void refreshTargetConnection(ConnectionEditPart conn) {
-        removeTargetConnection(conn);
-        refreshTargetConnections();
-    }
-
-    /**
-     * Handles the case where the semantic reference has changed.
-     */
-    protected final void handleMajorSemanticChange() {
-        if (getParent() instanceof GraphicalEditPart)
-            ((GraphicalEditPart) getParent()).refreshChild(this);
-        else if (getParent() instanceof ConnectionEditPart)
-            ((ConnectionEditPart) getParent()).refreshChild(this);
-    }
-    
-    /**
-     * @see org.eclipse.gef.EditPart#getDragTracker(org.eclipse.gef.Request)
-     */
-    public DragTracker getDragTracker(Request request) {
-        return new DragEditPartsTrackerEx(this);
-    }
-
-    /**
-     * @return <tt>true</tt> a canonical editpolicy has been installed on this editpart
-     * and it is active; otherwise <tt>false</tt>.
-     */
-    public boolean isCanonical() {
-        CanonicalEditPolicy policy = (CanonicalEditPolicy)getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-        return policy == null ? false : policy.isActive();
-    }
-
-    /**
-     * Return <tt>true</tt> if the editpart's figure is visible;
-     * <tt>false</tt> otherwise.
-     */
-    public boolean isSelectable() {
-        return getFigure().isShowing();
-    }
-
-    /* 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#disableEditMode()
-     */
-    public void disableEditMode() {
-        if (!isEditModeEnabled()) {
-            return;
-        }
-
-        List l = getSourceConnections();
-        int size = l.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = l.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).disableEditMode();
-            }
-        }
-
-        List c = getChildren();
-        size = c.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = c.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).disableEditMode();
-            }
-        }
-
-        setFlag(FLAG__IS_EDITABLE, false);
-    }
-    
-    
-    
-    protected void addChild(EditPart child, int index) {
-        super.addChild(child, index);
-        if (child instanceof GraphicalEditPart){
-            GraphicalEditPart gEP = (GraphicalEditPart)child;
-            boolean editMode = isEditModeEnabled(); 
-            if (editMode != gEP.isEditModeEnabled()){
-                if (editMode)
-                    gEP.enableEditMode();
-                else
-                    gEP.disableEditMode();
-            }
-        }
-    }
-
-    /* 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#enableEditMode()
-     */
-    public void enableEditMode() {
-        if (isEditModeEnabled()) {
-            return;
-        }
-
-        setFlag(FLAG__IS_EDITABLE, true);
-
-        List c = getChildren();
-        int size = c.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = c.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).enableEditMode();
-            }
-        }
-
-        List l = getSourceConnections();
-        size = l.size();
-        for (int i = 0; i < size; i++) {
-            Object obj = l.get(i);
-            if (obj instanceof IEditableEditPart) {
-                ((IEditableEditPart) obj).enableEditMode();
-            }
-        }
-    }
-    
-    /* 
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#isEditModeEnabled()
-     */
-    public boolean isEditModeEnabled() {
-        // protect against deadlock - don't allow any action while write transaction
-        // is active on another thread
-        if (EditPartUtil.isWriteTransactionInProgress(this, true, true))
-            return false;
-        return getFlag(FLAG__IS_EDITABLE);
-    }
-    
-    /* 
-     * @see org.eclipse.gef.EditPart#showSourceFeedback(org.eclipse.gef.Request)
-     */
-    public void showSourceFeedback(Request request) {
-        if ( !isEditModeEnabled()) {
-            return;
-        }
-        
-        super.showSourceFeedback(request);
-    }
-    
-    /* 
-     * @see org.eclipse.gef.EditPart#showTargetFeedback(org.eclipse.gef.Request)
-     */
-    public void showTargetFeedback(Request request) {
-        if ( !isEditModeEnabled()) {
-            return;
-        }
-        
-        super.showTargetFeedback(request);
-    }
-
-    /* 
-     * @see org.eclipse.gef.EditPart#eraseSourceFeedback(org.eclipse.gef.Request)
-     */
-    public void eraseSourceFeedback(Request request) {
-        if ( !isEditModeEnabled()) {
-            return;
-        }
-        
-        super.eraseSourceFeedback(request);
-    }
-    /* 
-     * @see org.eclipse.gef.EditPart#eraseTargetFeedback(org.eclipse.gef.Request)
-     */
-    public void eraseTargetFeedback(Request request) {
-        if ( !isEditModeEnabled()) {
-            return;
-        }
-
-        super.eraseTargetFeedback(request);
-    }
-    
-    /**
-     * this method will return the primary child EditPart  inside this edit part
-     * @return the primary child view inside this edit part
-     */
-    public EditPart getPrimaryChildEditPart(){
-        if (getChildren().size() > 0)
-            return (EditPart) getChildren().get(0);
-        return null;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart#getDiagramPreferencesHint()
-     */
-    public PreferencesHint getDiagramPreferencesHint() {
-        RootEditPart root = getRoot();
-        if (root instanceof IDiagramPreferenceSupport) {
-            return ((IDiagramPreferenceSupport) root).getPreferencesHint();
-        }
-        return PreferencesHint.USE_DEFAULTS;
-    }
-
-    public void notifyChanged(Notification notification) {
-        if (isActive()){
-            handleNotificationEvent(notification);
-        }
-    }
-    
-    public Command transactionAboutToCommit(Notification notification) {
-        return null;
-    }
-
-    
-    /**
-     * Handles the property changed event.  Clients should override to
-     * respond to the specific notification events they are interested.
-     * 
-     * Note: This method may get called on a non-UI thread.  Clients should
-     * either ensure that their code is thread safe and/or doesn't make
-     * unsupported calls (i.e. Display.getCurrent() ) assuming they are on
-     * the main thread.  Alternatively if this is not possible, then the
-     * client can wrap their handler within the Display.synchExec runnable
-     * to ensure synchronization and subsequent execution on the main thread.
-     * 
-     * @param event
-     *            the <code>Notification</code> object that is the property changed event
-     */
-    protected void handleNotificationEvent(Notification event) {        
-        if (NotationPackage.Literals.VIEW__PERSISTED_CHILDREN.equals(event.getFeature())||
-                NotationPackage.Literals.VIEW__TRANSIENT_CHILDREN.equals(event.getFeature())) {
-            refreshChildren();
-        }else if (NotationPackage.Literals.VIEW__VISIBLE.equals(event.getFeature())) {
-            Object notifier = event.getNotifier();
-            if (notifier== getModel())
-                refreshVisibility();
-            else{
-                // refresh the children only if the notificatino is not comming for and edge
-                // sincethe children list had no edges
-                if (!(event.getNotifier() instanceof Edge))
-                    refreshChildren();
-            }
-        }
-        else if (NotationPackage.Literals.VIEW__ELEMENT.equals(event.getFeature())) {
-            handleMajorSemanticChange();
-        } 
-    }
-    
-    /**
-     * @return <code>IMapMode</code> that allows for the coordinate mapping from device to
-     * logical units. 
-     */
-     protected IMapMode getMapMode() {
-        RootEditPart root = getRoot();
-        if (root instanceof DiagramRootEditPart) {
-            DiagramRootEditPart dgrmRoot = (DiagramRootEditPart)root;
-            return dgrmRoot.getMapMode();
-        }
-        
-        return MapModeUtil.getMapMode();
-    }
-    
-    /**
-     * indicates if this edit part's model is a view or not 
-     * @return <code>true</code> or <code>false</code>
-     */
-    public boolean hasNotationView(){
-        return true;
-    }
-    
-    /**
-     * Returns tis edit part's model; the returned values is not granteed to be 
-     * <code>View</code>, the return value could be null or any Object depending
-     * on the edit part implementation 
-     * 
-     */
-    public Object getModel() {
-        if (hasNotationView()){
-            return super.getModel();
-        } else {
-            Object _model = basicGetModel();
-            Node node = NotationFactory.eINSTANCE.createNode();;
-            node.setElement((EObject)_model);
-            return node;
-        }
-    }
-    
-    /**
-     * Derives my editing domain from my model or my diagram element. Subclasses
-     * may override.
-     */
-    public TransactionalEditingDomain getEditingDomain() {
-        if (editingDomain == null) {
-            // try to get the editing domain for the model
-            editingDomain = TransactionUtil.getEditingDomain(getModel());
-            
-            if (editingDomain == null) {
-                // try to get the editing domain from the diagram view
-                editingDomain = TransactionUtil.getEditingDomain(getDiagramView());
-            }
-        }
-        return editingDomain;
-    }
-    
-    protected IFigure createFigure() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setModel(Object model) {
-        // reset the editing domain cache
-        editingDomain = null;
-        super.setModel(model);
-    }
-
-    /**
-     * Gets the diagram event broker from the editing domain.
-     * 
-     * @return the diagram event broker
-     */
-    private DiagramEventBroker getDiagramEventBroker() {
-        TransactionalEditingDomain theEditingDomain = getEditingDomain();
-        if (theEditingDomain != null) {
-            return DiagramEventBroker.getInstance(theEditingDomain);
-        }
-        return null;
-    }
-
-    // documentation copied from superclass
-    public RootEditPart getRoot() {
-        if (getParent() != null) {
-            return super.getRoot();
-        }
-        return null;
-    }
-    
-   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_LINE_COLOR));
-                
-            } else if (feature == NotationPackage.eINSTANCE
-                .getFontStyle_FontColor()) {
-                
-                return FigureUtilities.RGBToInteger(PreferenceConverter
-                    .getColor((IPreferenceStore) preferenceStore,
-                        IPreferenceConstants.PREF_FONT_COLOR));
-                
-            } else if (feature == NotationPackage.eINSTANCE
-                .getFillStyle_FillColor()) {
-                
-                return FigureUtilities.RGBToInteger(PreferenceConverter
-                    .getColor((IPreferenceStore) preferenceStore,
-                        IPreferenceConstants.PREF_FILL_COLOR));
-                
-            }
-        }
-
-        return getStructuralFeatureValue(feature);
-    }    
-    /**
-     * Gets the resource manager to remember the resources allocated for this
-     * graphical viewer. All resources will be disposed when the graphical
-     * viewer is closed if they have not already been disposed.
-     * 
-     * @return the resource manager
-     */
-    protected ResourceManager getResourceManager() {
-        EditPartViewer viewer = getViewer();
-        if (viewer instanceof DiagramGraphicalViewer) {
-            return ((DiagramGraphicalViewer) viewer).getResourceManager();
-        }
-        return JFaceResources.getResources();
-    }    
-    
-	/**
-	 * Set the line width of the shape. Clients need to override if they support
-	 * line width.
-	 * 
-	 * @param width
-	 *            the line width.
-	 */
-	protected void setLineWidth(int width) {
-		/* not implemented */
-	}
-
-	/**
-	 * Get the line width of the shape.
-	 * 
-	 * @return width the line width.
-	 */
-	protected int getLineWidth() {
-		/* a default of -1 means the diagram does not implement line width */
-		int lineWidth = -1;
-
-		LineStyle style = (LineStyle) getPrimaryView().getStyle(
-				NotationPackage.eINSTANCE.getLineStyle());
-		if (style != null) {
-			lineWidth = style.getLineWidth();
-		}
-
-		return lineWidth;
-	}
-
-	/**
-	 * Refresh the line width of the shape.
-	 */
-	protected void refreshLineWidth() {
-		setLineWidth(getLineWidth());
-	}
-
-	/**
-	 * Set the line type of the shape. Clients need to override if they support
-	 * line type.
-	 * 
-	 * @param lineType
-	 *            the line type.
-	 */
-	protected void setLineType(int lineType) {
-		/* not implemented */
-	}
-
-	/**
-	 * Get the line type of the shape.
-	 * 
-	 * @return the line type.
-	 */
-	protected int getLineType() {
-		// default to a solid line.
-		int lineType = Graphics.LINE_SOLID;
-
-		LineTypeStyle style = (LineTypeStyle) getPrimaryView().getStyle(
-				NotationPackage.eINSTANCE.getLineTypeStyle());
-		if (style != null) {
-			if (style.getLineType() == LineType.SOLID_LITERAL) {
-				lineType = Graphics.LINE_SOLID;
-			} else if (style.getLineType() == LineType.DASH_LITERAL) {
-				lineType = Graphics.LINE_DASH;
-			} else if (style.getLineType() == LineType.DOT_LITERAL) {
-				lineType = Graphics.LINE_DOT;
-			} else if (style.getLineType() == LineType.DASH_DOT_LITERAL) {
-				lineType = Graphics.LINE_DASHDOT;
-			} else if (style.getLineType() == LineType.DASH_DOT_DOT_LITERAL) {
-				lineType = Graphics.LINE_DASHDOTDOT;
-			}
-		}
-
-		return lineType;
-	}
-
-	/**
-	 * Refresh the line type of the shape.
-	 */
-	protected void refreshLineType() {
-		setLineType(getLineType());
-	}
-	
-	/**
-	 * Sets the flag for automatically refreshing source/target connections visibility based on the editpart's
-	 * visibility (i.e. {@link #setConnectionsVisibility(boolean) will be called}
-	 * 
-	 * @param autoRefreshConnectionsVisibility <code>true</code> to set automatic refresh to on
-	 * @since 1.2
-	 */
-	public void setAutomaticalRefreshConnectionsVisibility(boolean autoRefreshConnectionsVisibility) {
-		setFlag(FLAG__AUTO_CONNECTIONS_VISIBILITY, autoRefreshConnectionsVisibility);
-	}
-	
-	/**
-	 * Returns <code>true</code if automatic update of source/target connections visibility is triggered by editpart's visibility (i.e. {@link #setConnectionsVisibility(boolean) is being called}
-	 * 
-	 * @return <code>true</code> if automatic visibility refresh for connections is on
-	 * @since 1.2
-	 */
-	public boolean isAutomaticalRefreshConnectionsVisibility() {
-		return getFlag(FLAG__AUTO_CONNECTIONS_VISIBILITY);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GroupEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GroupEditPart.java
deleted file mode 100644
index 8ac98bb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GroupEditPart.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GroupComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GroupXYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.GroupFigure;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The editpart for a group. A group is a special type of container around
- * shapes.
- * 
- * @author crevells, mmostafa
- * @since 2.1
- */
-public class GroupEditPart
-    extends ShapeNodeEditPart {
-
-    /**
-     * A <code>ContainerEditPolicy</code> for a <code>GroupEditPart</code>.
-     * 
-     * @since 2.1
-     */
-    protected static class GroupContainerEditPolicy
-        extends ContainerEditPolicy {
-
-        protected Command getArrangeCommand(ArrangeRequest request) {
-            if (ActionIds.ACTION_ARRANGE_SELECTION.equals(request.getType())
-                || ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION.equals(request
-                    .getType())) {
-                List parts = request.getPartsToArrange();
-                if (parts.size() == 1 && parts.contains(getHost())) {
-                    ArrangeRequest newRequest = createRequest(request,
-                        getHost().getChildren());
-                    return super.getArrangeCommand(newRequest);
-                }
-            }
-            return super.getArrangeCommand(request);
-        }
-
-        private ArrangeRequest createRequest(ArrangeRequest request,
-                List partsToArrange) {
-            ArrangeRequest newRequest = new ArrangeRequest((String) request
-                .getType(), request.getLayoutType());
-            newRequest.setExtendedData(request.getExtendedData());
-            newRequest.setPartsToArrange(partsToArrange);
-            return newRequest;
-        }
-    }
-    
-    /**
-     * Creates a new <code>GroupEditPart</code>.
-     * 
-     * @param view
-     *            the view controlled by this edit part
-     */
-    public GroupEditPart(View view) {
-        super(view);
-    }
-
-    protected NodeFigure createNodeFigure() {
-        return new GroupFigure();
-    }
-
-    public boolean canAttachNote() {
-        return false;
-    }
-
-    public IFigure getContentPane() {
-        return ((GroupFigure) getFigure()).getContainerFigure();
-    }
-
-    public void setLayoutConstraint(EditPart child, IFigure childFigure,
-            Object constraint) {
-        getContentPaneFor((IGraphicalEditPart) child).setConstraint(
-            childFigure, constraint);
-    }
-
-    protected void createDefaultEditPolicies() {
-        installEditPolicy(EditPolicyRoles.DECORATION_ROLE,
-            new DecorationEditPolicy());
-        installEditPolicy(EditPolicy.LAYOUT_ROLE, new GroupXYLayoutEditPolicy());
-        installEditPolicy(EditPolicy.COMPONENT_ROLE,
-            new GroupComponentEditPolicy());
-        installEditPolicy(EditPolicy.CONTAINER_ROLE, new GroupContainerEditPolicy());
-        installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE,
-            new SnapFeedbackPolicy());
-    }
-
-    public EditPolicy getPrimaryDragEditPolicy() {
-        return new NonResizableEditPolicyEx();
-    }
-
-    /**
-     * Gets all the shape children of this group, digging into any nested groups
-     * found.
-     * 
-     * @return all the shape children including shapes in nested groups
-     */
-    public List getShapeChildren() {
-        List flatChildren = new ArrayList(getChildren().size());
-        for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-            Object childEP = iter.next();
-            if (childEP instanceof GroupEditPart) {
-                flatChildren.addAll(((GroupEditPart) childEP)
-                    .getShapeChildren());
-            } else {
-                flatChildren.add(childEP);
-            }
-        }
-        return flatChildren;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderItemEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderItemEditPart.java
deleted file mode 100644
index 56fe516..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderItemEditPart.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-
-/**
- * A border item editpart is added to the border item container of a
- * {@link org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderedShapeEditPart}.
- * The locator is used for setting the location of the border item and for
- * selection feedback.
- * 
- * @author cmahoney
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface IBorderItemEditPart
-	extends IGraphicalEditPart {
-
-	/**
-	 * Gets the locator used for this border item's figure. May return null.
-	 * 
-	 * @return the <code>IBorderItemLocator</code> or null
-	 */
-	public IBorderItemLocator getBorderItemLocator();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderedShapeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderedShapeEditPart.java
deleted file mode 100644
index 09d4805..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderedShapeEditPart.java
+++ /dev/null
@@ -1,39 +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.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-
-
-/**
- * An editpart with support for border items. It has the main shape's figure and
- * a special figure to hold the border item figures.
- * 
- * @author cmahoney
- */
-public interface IBorderedShapeEditPart {
-
-	/**
-	 * Returns the editpart's main figure.
-	 * 
-	 * @return <code>IFigure</code>
-	 */
-	public IFigure getMainFigure();
-
-	/**
-	 * Return the editpart's bordered figure.
-	 * 
-	 * @return <code>IFigure</code>
-	 */
-	public BorderedNodeFigure getBorderedFigure();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IDiagramPreferenceSupport.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IDiagramPreferenceSupport.java
deleted file mode 100644
index acae734..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IDiagramPreferenceSupport.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.runtime.diagram.ui.editparts;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-
-/**
- * Used to identify an editpart as having preference support. A root editpart
- * created in the EditPart Service
- * {@link org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService#createRootEditPart() 
- * should implement this interface if the diagram is to support the common
- * diagram preferences.
- * 
- * @author cmahoney
- */
-public interface IDiagramPreferenceSupport {
-
-	/**
-	 * Sets 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>.
-	 * 
-	 * @param preferencesHint the preferences hint
-	 */
-	public void setPreferencesHint(PreferencesHint preferenceHint);
-
-	/**
-	 * 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 PreferencesHint getPreferencesHint();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IEditableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IEditableEditPart.java
deleted file mode 100644
index 826053e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IEditableEditPart.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-/**
- * The interface to be implemented by all editparts with IView as a model that
- * support editing capabilities
- * 
- * @author Vishy Ramaswamy
- * @since 1.2
- */
-public interface IEditableEditPart {
-	/**
-	 * Returns <code>true</code> if the EditPart is editable. Editparts are
-	 * editable after {@link #enableEditMode()}is called, and until
-	 * {@link #disableEditMode()}is called.
-	 * 
-	 * @return <code>true</code> when editable
-	 */
-	public boolean isEditModeEnabled();
-
-	/**
-	 * Disables edit mode of the EditPart. EditParts that are not editable do
-	 * not provide commands to any requests.
-	 */
-	public void disableEditMode();
-
-	/**
-	 * Enables edit mode of the EditPart. EditParts that are editable provide
-	 * commands to requests.
-	 */
-	public void enableEditMode();
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IGraphicalEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IGraphicalEditPart.java
deleted file mode 100644
index 87703b3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IGraphicalEditPart.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The interface of all editparts with <code>EObject</code> as a model
- * @author melaasar
- * @noimplement This interface is not intended to be implemented by clients, clients should extend
- * GraphicalEditPart
- */
-public interface IGraphicalEditPart
-	extends org.eclipse.gef.GraphicalEditPart, IEditableEditPart {
-
-	/**
-	 * Return the editpart's associated Notation View.
-	 * @return <code>View</code>, the associated view or null if there is no associated Notation View
-	 */
-	public View getNotationView();
-
-	/**
-	 * Gets the associated DiagramEditDomain to the edit part
-	 * @return IDiagramEditDomain
-	 */
-	public IDiagramEditDomain getDiagramEditDomain();
-
-	/**
-	 * Returns the first child inside this edit part that owns a view
-	 * with the same type as the passed hint
-	 * @param semanticHint
-	 * @return IGraphicalEditPart
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint);
-
-	/**
-	 * Method getTopGraphicEditPart.
-	 * @return TopGraphicEditPart
-	 */
-	public TopGraphicEditPart getTopGraphicEditPart();
-	
-	/**
-	 * Convenience method to retreive the value for the supplied feature
-	 * from the editpart's associated view element.
-	 * @param feature the feature to use
-	 * @return Object the value
-	 */
-	public Object getStructuralFeatureValue(EStructuralFeature id);
-
-	/**
-	 * Convenience method to set a feature value.
-	 * @param feature
-	 * @param value
-	 */
-	public void setStructuralFeatureValue(EStructuralFeature feature, Object value);
-
-	/**
-	 * finds an editpart given a starting editpart and an EObject
-	 * @param epBegin starting edit part
-	 * @param theElement	eObject to use
-	 * @return the found edit part if there is any
-	 */
-	public EditPart findEditPart(EditPart epBegin, EObject theElement);
-	
-	/**
-	 * Convenience method returns the editpart's primary view.
-	 * @return the primary view 
-	 */
-	public View getPrimaryView();
-	
-	/**
-	 * this method will return the primary child view inside this edit part
-	 * @return the primary child view inside this edit part
-	 */
-	public EditPart getPrimaryChildEditPart();
-	
-	/**
-	 * 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 PreferencesHint getDiagramPreferencesHint();
-	
-	/**
-	 * Gets the semantic element associated to this editpart's view.
-	 * @return the semantic element or <code>null</code> if the semantic element was
-	 * <code>null</code> or unresolvable 
-	 */
-	public EObject resolveSemanticElement();
-      
-    /**
-     * Gets my transactional EMF editing domain.
-     * 
-     * @return my transactional EMF editing domain
-     */
-    public TransactionalEditingDomain getEditingDomain();
-    
-    /**
-     * Retrieves the preferred value for the supplied feature. This value could
-     * be the current value set in the preference store. Clients may override
-     * this to supply their own preferred values. The type of the return value
-     * will vary depending on the feature.
-     * 
-     * @param feature
-     *            the feature to use
-     * @return Object The preferred value for the supplied feature. The object
-     *         is of the same type as if the value of the feature were retrieved
-     *         directly from the view.
-     */
-    public Object getPreferredValue(EStructuralFeature feature);
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IInsertableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IInsertableEditPart.java
deleted file mode 100644
index 8d32054..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IInsertableEditPart.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.runtime.diagram.ui.editparts;
-
-import org.eclipse.gef.EditPart;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-
-
-/**
- * @author sshaw
- *
- * Interface for an editpart that can support a default insert operation.
- */
-public interface IInsertableEditPart extends EditPart {
-	
-	/**
-	 * getElementType
-	 * Method for returning the semantic type of the element that can be inserted by default
-	 * into this editpart.
-	 * 
-	 * @return IElementType
-	 */
-	IElementType getElementType();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INodeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INodeEditPart.java
deleted file mode 100644
index f15e941..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INodeEditPart.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.diagram.ui.editparts;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.gef.NodeEditPart;
-
-
-
-/**
- * @author melaasar
- *
- * An interface for all connectable editparts
- */
-public interface INodeEditPart 
-	extends NodeEditPart, INotableEditPart {
-
-	/**
-	 * Method mapConnectionAnchorToTerminal.
-	 * @param c
-	 * @return Anchor
-	 */ 
-	public String mapConnectionAnchorToTerminal(ConnectionAnchor c);
-
-	/**
-	 * Method mapTerminalToConnectionAnchor.
-	 * @param terminal
-	 * @return ConnectionAnchor
-	 */
-	public ConnectionAnchor mapTerminalToConnectionAnchor(String terminal);
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INotableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INotableEditPart.java
deleted file mode 100644
index e0ebdc7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/INotableEditPart.java
+++ /dev/null
@@ -1,30 +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.editparts;
-
-/**
- * This interface implemented by editparts to evaluate if a note can be added as
- * a peer connected by a note attachment to it.
- * 
- * @author tisrar, cmahoney
- */
-public interface INotableEditPart {
-
-	/**
-	 * This will return true if a note can be added as a peer connected by a
-	 * note attachment to the editpart which will implement this interface.
-	 * 
-	 * @return True if a note can be attached to it, false otherwise.
-	 */
-	public boolean canAttachNote();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IPrimaryEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IPrimaryEditPart.java
deleted file mode 100644
index 1aff900..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IPrimaryEditPart.java
+++ /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 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editparts;
-
-
-/**
- * @author mmostafa
- */
-public interface IPrimaryEditPart {
-	// marker interface
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IResizableCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IResizableCompartmentEditPart.java
deleted file mode 100644
index 762117b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IResizableCompartmentEditPart.java
+++ /dev/null
@@ -1,30 +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.editparts;
-
-
-/**
- * Interface to let us know that is a Compartment Edit Part that
- * is resizable
- * @author choang@ca.ibm.com
- * @noimplement This interface is not intended to be implemented by clients.
- */
-public interface IResizableCompartmentEditPart extends IGraphicalEditPart {
-	
-	/**
-	 * @return the <code>String</code> that is the title header typically
-	 * displayed at the top of the compartment.  It is used to identity a meaningful
-	 * description of the contents of the compartment.
-	 */
-	public String getCompartmentName();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IRotatableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IRotatableEditPart.java
deleted file mode 100644
index 3567237..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/IRotatableEditPart.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.diagram.ui.editparts;
-
-
-/**
- * Interface checks whether editpart supports rotation. 
- * 
- * @author oboyko
- */
-public interface IRotatableEditPart {
-
-	/**
-	 * This determines if an <code>EditPart</code> can be rotated or not.  By introducing
-	 * an interface, this allows the clients to determine dynamically based on some state whether or
-	 * not the EditPart can be rotated.
-	 * 
-	 * @return <code>booean</code> <code>true</code> if the shape is rotatable, 
-	 * or <code>false</code> otherwise.
-	 */
-	abstract public boolean isRotatable();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITextAwareEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITextAwareEditPart.java
deleted file mode 100644
index 3e94fce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITextAwareEditPart.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2006 Borland Software Corporation
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *	  Steve Shaw (IBM) - added java doc and modified method name
- */
-package org.eclipse.gmf.runtime.diagram.ui.editparts;
-
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-
-/**
- * Edit part that contains editable text.
- * 
- * @author dstadnik
- */
-public interface ITextAwareEditPart extends org.eclipse.gef.GraphicalEditPart {
-
-	/**
-	 * Shortcut method to obtain edit text from parser.
-	 */
-	public String getEditText();
-
-	/**
-	 * Called when edit text was modified and edit part
-	 * should update itself to reflect the changes.
-	 */
-	public void setLabelText(String text);
-
-    /**
-     * Returns a validator for the user's edit text
-     * @return a <code>ICellEditorValidator</code> for validating a cell editor's input.
-     */
-	public ICellEditorValidator getEditTextValidator();
-
-    /**
-     * Gets the parser options. The result is passed as a parameter to the 
-     * parser's getPrintString() and isAffectingEvent() methods
-     * 
-     * @return ParserOptions the parser options
-     */
-	public ParserOptions getParserOptions();
-
-    /**
-     * Method getParser.
-     * @return the <code>IParser</code> that is used to retrieve the proper formating 
-     * of the edit text and to create the actual editing command which will modify the model.
-     */
-	public IParser getParser();
-
-    /**
-     * @return the <code>IContentAssistProcessor</code> that is a content assist processor proposes 
-     * completions and computes context information for a particular content type 
-     */
-	public IContentAssistProcessor getCompletionProcessor();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITreeBranchEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITreeBranchEditPart.java
deleted file mode 100644
index c1e7ebd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ITreeBranchEditPart.java
+++ /dev/null
@@ -1,22 +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.editparts;
-
-/**
- * @author sshaw
- *
- * Interface is merely used to identify Connection EditParts that can contribute
- * to a tree structure.
- */
-public interface ITreeBranchEditPart extends org.eclipse.gef.ConnectionEditPart {
-	// marker interface
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/LabelEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/LabelEditPart.java
deleted file mode 100644
index 4308ad0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/LabelEditPart.java
+++ /dev/null
@@ -1,397 +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.editparts;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.Figure;
-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.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.ResizableEditPolicy;
-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.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.VisibilityComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.LabelLocator;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.LabelSnapBackEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.ResizableLabelLocator;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.LabelViewConstants;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * Controller for all label that deals with interactions bewteen
- * the label figure the underline editpart
- * 
- * @author jcorchis
- */
-public class LabelEditPart extends TopGraphicEditPart {
-		
-	private String semanticHint = null;	
-	
-	/** 
-	 * Map which maintains the default offsets for labels.
-	 * Each plugin which overrides LabelEditPart and wants to have snap back action
-	 * support must provide put an entry into this map.  The entry consists of the view's
-	 * creation hint (key) and a <code>Point</code> (value) which constains the label's default
-	 * offset.
-	 */
-	private static HashMap snapBackMap = new HashMap();
-
-	/**
-	 * Registers the default snap back position for this label that is retrievable from
-	 * the editpolicy that creates the command to move the label back to it's original position.
-	 * Subclasses of <code>LabelEditPart</code> should call this to register their labels default
-	 * position.
-	 * 
-	 * @param propertyName <code>String</code> that is usually the property identifier for the label or
-	 * it can be any unique identifier the label subclass desires.
-	 * @param offset <code>Point</code> that is the offset Point position from the keypoint.
-	 */
-	public static void registerSnapBackPosition(String propertyName, Point offset) {
-		snapBackMap.put(propertyName, offset);
-	}
-	
-	/**
-	 * Retrieves the default snap back position for this label that was registered using using
-	 * the {@link LabelEditPart#registerSnapBackPosition(String, Point)} method.
-	 * 
-	 * @param propertyName <code>String</code> that is usually the property identifier for the label or
-	 * it can be any unique identifier the label subclass desires.
-	 * @return offset <code>Point</code> that is the offset Point position from the keypoint.
-	 */
-	public static Point getSnapBackPosition(String propertyName) {
-		return (Point)snapBackMap.get(propertyName);
-	}
-
-	/**
-	 * constructor 
-	 * @param view this edit part's view
-	 */
-	public LabelEditPart(View view) {
-		super(view);
-	}
-
-	protected IFigure createFigure() {
-		IFigure label = new Figure();
-		label.setCursor(Cursors.ARROW);
-		label.setLayoutManager(new ConstrainedToolbarLayout());
-		return label;
-	}
-	
-	/**
-	 * Returns the model's semantic hint.  This is used to calculate the reference
-	 * point for the label's figure.
-	 * @return the semantic type
-	 */
-	protected String getSemanticType() {
-		if (semanticHint == null) {
-			try {
-				semanticHint = ((String) getEditingDomain().runExclusive(
-					new RunnableWithResult.Impl() {
-
-							public void run() {
-								setResult(((View) getModel()).getType());
-							}
-						}));
-			} catch (InterruptedException e) {
-				Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"getSemanticType", e); //$NON-NLS-1$
-				Log.error(DiagramUIPlugin.getInstance(),
-					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-					"getSemanticType", e); //$NON-NLS-1$
-			}
-
-		}
-		return semanticHint;
-	}
-
-
-	public void refresh() {
-		super.refresh();
-		refreshBounds();
-	}
-	
-	/**
-	 * Updates the locator based on the changes to the offset. 
-	 */
-	public void refreshBounds() {
-		// try to handle both of resizable and nonresizable labels
-		if (isResizable()){
-			handleResizableRefreshBounds();
-		} else {
-			handleNonResizableRefreshBoundS();
-		}
-	}
-
-	/**
-	 * handles non resizable lable refresh bounds
-	 */
-	private void handleNonResizableRefreshBoundS() {
-		int dx = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X()))
-			.intValue();
-		int dy = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y()))
-			.intValue();
-		Point offset = new Point(dx, dy);
-		if (getParent() instanceof AbstractConnectionEditPart) {
-			((AbstractGraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new LabelLocator(
-					((AbstractConnectionEditPart) getParent())
-						.getConnectionFigure(), offset, getKeyPoint()));
-		} else {
-			getFigure().getParent().setConstraint( getFigure(),  new LabelLocator(
-				getFigure().getParent(),
-					offset, getKeyPoint()));
-		}
-		
-	}
-
-	/**
-	 * handles resizable lable refresh bounds
-	 */
-	private void handleResizableRefreshBounds() {
-		int dx = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X()))
-			.intValue();
-		int dy = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y()))
-			.intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width()))
-			.intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height()))
-			.intValue();
-		Rectangle rectangle = new Rectangle(dx,dy,width,height);
-		if (getParent() instanceof AbstractConnectionEditPart) {
-			((AbstractGraphicalEditPart) getParent()).setLayoutConstraint(this,
-				getFigure(), new ResizableLabelLocator(
-					((AbstractConnectionEditPart) getParent())
-						.getConnectionFigure(), rectangle, getKeyPoint()));
-		} else {
-			getFigure().getParent().setConstraint( getFigure(),  new ResizableLabelLocator(
-				getFigure().getParent(),
-				rectangle, getKeyPoint()));
-		}
-	}
-
-	/**
-	 * check if the edit part had a resizable edit policy installed or not 
-	 * @return	true is resizable edit policy is installed otherwise false
-	 */
-	private boolean isResizable() {
-		EditPolicy editPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if(editPolicy instanceof ResizableEditPolicy )
-			return true;
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#createDefaultEditPolicies()
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-			EditPolicy.PRIMARY_DRAG_ROLE,
-			new NonResizableLabelEditPolicy());
-		installEditPolicy(
-			EditPolicy.COMPONENT_ROLE,
-			new VisibilityComponentEditPolicy());
-		installEditPolicy(
-			EditPolicyRoles.SNAP_FEEDBACK_ROLE,
-			new LabelSnapBackEditPolicy());
-	}
-
-	/** Return a {@link DragTracker} instance. */
-	public DragTracker getDragTracker(Request request) {
-		return new DragEditPartsTrackerEx(this) {
-			protected boolean isMove() {
-				return true;
-			}
-		};
-	}
-
-	/**
-	 * Method isSnapBackNeeded.
-	 * @return boolean
-	 *
-	 * returns false only if the current location of the figure
-	 * is not default one
-	 */
-	public boolean isSnapBackNeeded() {
-		return true;
-	}
-
-
-	/**
-	 * 
-	 * @see AbstractEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshForegroundColor();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (   NotationPackage.eINSTANCE.getLocation_X().equals(feature) 
-			|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature) 
-			|| NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-			|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)) {
-			refreshBounds();
-		}else if (NotationPackage.eINSTANCE.getLineStyle_LineColor().equals(feature)){
-			Integer c = (Integer) notification.getNewValue();
-			setForegroundColor(DiagramColorRegistry.getInstance().getColor(c));
-		}
-		else
-			super.handleNotificationEvent(notification);
-	}
-
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#getAccessibleEditPart()
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null)
-			accessibleEP = new AccessibleGraphicalEditPart() {
-			public void getName(AccessibleEvent e) {
-				e.result = getAccessibleText();
-			}
-		};
-		return accessibleEP;
-	}
-
-	/**
-	 * Concatenates the text of all the text compartment children of
-	 * this editpart to be used as the accessible text.
-	 * @return String the string to be used as the accessible text
-	 */
-	protected String getAccessibleText() {
-		StringBuilder accessibleStringBuilder = new StringBuilder();
-		for (Iterator iter = getChildren().iterator(); iter.hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iter.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                accessibleStringBuilder.append(label.getText() + " "); //$NON-NLS-1$
-            }
-        }
-		return accessibleStringBuilder.toString();
-	}
-
-	/**
-	 * Returns an object which is an instance of the given class
-	 * associated with this object.  If there are specific class types
-	 * that should be delegated to the connection editpart they must
-	 * be explicitely handled here (e.g. <code>IPropertySource</code>
-	 * is delegated to the connection editpart so that the property pages
-	 * reflect the connection when the label is selected).  Otherwise, 
-	 * the adapter from this editpart is first retrieved; if this is 
-	 * null, then the adapter from the connection editpart is returned.
-	 * This means if a client asks for <code>IView</code> the label view
-	 * will be returned, but if a client asks for <code>IPrimaryView</code>
-	 * the owner view will be returned.
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == IPropertySource.class) {
-			return getParent().getAdapter(key);
-		}
-		Object adapterFromSuper = super.getAdapter(key);
-		if (adapterFromSuper == null) {
-			return getParent().getAdapter(key);
-		}
-		return adapterFromSuper;
-	}
-	
-	/**
-	 * Returns a ConnectionLocator.MIDDLE as the key point.
-	 * @return the key point
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;		
-	}
-	
-	/**
-	 * Returns a <code>Point</code> located on the parent which is
-	 * used by the LabelEditPart to orient itself.
-	 * @return the anchorPoint
-	 */
-	public Point getReferencePoint() {
-		if (getParent() instanceof AbstractConnectionEditPart) {
-			switch (getKeyPoint()) {
-				case ConnectionLocator.TARGET:
-					return calculateRefPoint(LabelViewConstants.SOURCE_LOCATION);
-				case ConnectionLocator.SOURCE:
-					return calculateRefPoint(LabelViewConstants.TARGET_LOCATION);
-				case ConnectionLocator.MIDDLE:
-					return calculateRefPoint(LabelViewConstants.MIDDLE_LOCATION);
-				default:
-					return calculateRefPoint(LabelViewConstants.MIDDLE_LOCATION);
-			}
-		} 
-		
-		return ((AbstractGraphicalEditPart)getParent()).getFigure().getBounds().getTopLeft();
-	}
-	
-	/**
-	 * Calculates a point located at a percentage of the connection 
-	 * @param percent
-	 * @return the point
-	 */
-	private Point calculateRefPoint(int percent) {
-		if (getParent() instanceof AbstractConnectionEditPart) {
-			PointList ptList = ((Connection)((ConnectionEditPart)getParent()).getFigure()).getPoints();			
-			Point refPoint = PointListUtilities.calculatePointRelativeToLine(ptList, 0, percent, true);
-			return refPoint;
-		} else if (getParent() instanceof GraphicalEditPart) {
-			return ((AbstractGraphicalEditPart)getParent()).getFigure().getBounds().getTopLeft();
-		}
-		return null;			
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListCompartmentEditPart.java
deleted file mode 100644
index 730d91c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListCompartmentEditPart.java
+++ /dev/null
@@ -1,405 +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.editparts;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ListComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.ModifySortFilterEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.NestedResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.SortingDirection;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * An editpart implementation of the ResizableCompartment as a list compartment
- * 
- * @author melaasar
- */
-public abstract class ListCompartmentEditPart
-	extends ResizableCompartmentEditPart {
-	
-	static long count = 0;
-	
-    
-    // semantic chil;dren count
-    protected int  modelChildrenListenersCount = 0 ;
-    
-	/** State of listening */
-	protected boolean listening;
-
-	/**
-	 * @param view The IResizableCompartmentView compartment view
-	 */
-	public ListCompartmentEditPart(EObject model) {
-		super(model);
-	}
-	
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.MODIFY_SORT_FILTER_ROLE, new ModifySortFilterEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListComponentEditPolicy());
-	}
-		
-
-	/** 
-	 * Adds a constrained flow layout algorithm to the content pane of compartment figure
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
-	 */
-	public IFigure createFigure() {
-		ResizableCompartmentFigure rcf;
-		if (getParent() == getTopGraphicEditPart()){
-			rcf = (ResizableCompartmentFigure) super.createFigure();
-		} else {
-			rcf = new NestedResizableCompartmentFigure(getMapMode());
-		}
-		
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setStretchMajorAxis(false);
-			layout.setStretchMinorAxis(false);
-			layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT);
-			rcf.getContentPane().setLayoutManager(layout);
-		
-		
-		return rcf;
-	}
-
-	/**
-	 * Returns a list of sorted / filtered model children.  To get the model children
-	 * in their natural ordering and size use getBaseModelChildren();
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#getModelChildren()
-	 */
-	protected List getModelChildren() {
-		List sortedFilteredChildren = new ArrayList(getSortedChildren());
-		sortedFilteredChildren.removeAll(getFilteredChildren());
-		return sortedFilteredChildren;
-	}
-	
-	/**
-	 * Returns a list of model children in their natural model state.
-	 * @return list of model children of this edit part
-	 */
-	protected List getBaseModelChildren() {
-		return super.getChildren();
-	}
-
-	/**
-	 * Determines if the given event affects the semantic model children
-	 * 
-	 * @param evt The event in question
-	 * @return <code>true</code> if the events affects model children, <code>false</code> otherwise
-	 */
-	abstract protected boolean hasModelChildrenChanged(Notification evt);
-
-	protected void handleNotificationEvent(Notification event ) {
-		// If a child has been added or removed while sorting
-		// or filtering is automatic, re-register the listeners.		
-		if (hasModelChildrenChanged(event) && modeAutomatic()) {
-			removeSemanticChildrenListeners();
-			addSemanticChildrenListeners();
-			refresh();
-		} 
-		
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFilteringStyle_Filtering().equals(feature)
-			|| NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys().equals(feature)
-			|| NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects().equals(feature)
-			|| NotationPackage.eINSTANCE.getSortingStyle_Sorting().equals(feature)
-			|| NotationPackage.eINSTANCE.getSortingStyle_SortingKeys().equals(feature)
-			|| NotationPackage.eINSTANCE.getSortingStyle_SortedObjects().equals(feature)) {
-			refresh();			
-			
-			if (modeAutomatic() && !listening) {  // start listening...
-				removeSemanticChildrenListeners();
-				addSemanticChildrenListeners();
-			} 
-			if (!modeAutomatic() && listening) { // stop listening...
-				removeSemanticChildrenListeners();
-			}
-		} else if  (event.getEventType() == EventType.UNRESOLVE 
-                && event.getNotifier() == ((View)getModel()).getElement()){
-            handleMajorSemanticChange();
-        }  else {
-			super.handleNotificationEvent(event);
-		}
-		
-		// refresh() if one of the children have changed a feature
-		// affecting sorting / filtering.
-		if (isAffectingSortingFiltering(feature) && modeAutomatic())
-			refresh();
-	}
-	
-
-	/**
-	 * Returns a <code>List</code> of model children corresponding appearance order of the list 
-	 * compartment items.
-	 * @return a <code>List</code> of Ids
-	 */
-	protected List getSortedChildren() {
-		SortingStyle style = (SortingStyle)  ((View)getModel()).getStyle(NotationPackage.eINSTANCE.getSortingStyle());
-
-		if (style != null) {
-			Sorting sorting = style.getSorting();
-			if (Sorting.NONE_LITERAL == sorting) {
-				
-				return super.getModelChildren();
-				
-			} else if (Sorting.MANUAL_LITERAL == sorting) {
-	
-				List allChildren = super.getModelChildren();
-				// Return the empty list if the model children have not yet been
-				// created.
-				if (allChildren.isEmpty())
-					return allChildren;
-				
-				List sortedChildren = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortedObjects())
-					? style.getSortedObjects() 
-					: Collections.EMPTY_LIST;
-	
-				List sorted = new ArrayList();
-				
-				// Get the corresponding views...
-				Iterator i = sortedChildren.iterator();
-				while(i.hasNext()) {
-					EObject eObject = (EObject) i.next();
-					View view = getModelChildByID(eObject);
-					if (view != null)
-						sorted.add(view);
-				}	
-				
-				// Add any remaining model children to the end
-				for (int j = 0; j < allChildren.size(); j++) {
-					View view = (View) allChildren.get(j);
-					if (!sorted.contains(view))
-						sorted.add(view);
-				}
-				
-				return sorted;
-				
-			} else if (Sorting.AUTOMATIC_LITERAL == sorting) {
-				Map sortingKeys = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortingKeys())
-					? style.getSortingKeys() 
-					: Collections.EMPTY_MAP;
-				return getChildrenSortedBy(sortingKeys);
-			}
-		}
-		
-		return super.getModelChildren();		
-	}
-	
-	/**
-	 * Returns the model children sorted by the order specified by Properties.ID_SORTING_KEYS.
-	 * This is used to support dynamic list compartment sorting.
-	 * @param sortingKeys
-	 * @return the model children sorted
-	 */
-	protected List getChildrenSortedBy(Map sortingKeys) {
-		
-		List allChildren = new ArrayList(super.getModelChildren());
-		
-		// Currently only one sorting key is supported.
-		if (sortingKeys != null && !sortingKeys.isEmpty()) {
-			Collection keySet = sortingKeys.keySet();
-			Iterator i = keySet.iterator();
-			String name = (String) i.next();
-			SortingDirection direction = (SortingDirection) sortingKeys.get(name);
-			
-			Comparator comparator = getComparator(name, direction);
-			
-			if (comparator != null)
-				Collections.sort(allChildren, getComparator(name, direction));									
-		} 
-		return allChildren;
-	}
-	
-	/**
-	 * Returns a <code>Comparator</code> that is used to sort the list compartment
-	 * children.  Override to provide a <code>Comparator</code> that provides
-	 * for a particular child type.
-	 * @param name
-	 * @param direction
-	 * @return comparator
-	 */
-	protected Comparator getComparator(String name, SortingDirection direction) {
-		return null;
-	}	
-	
-	/**
-	 * Returns a <code>List</code> of <code>View</code> s corresponding
-	 * to the unique id of the semantic elements which are filtered.
-	 * 
-	 * @return list of filtered model children
-	 */
-	protected List getFilteredChildren() {
-		Object model = getModel();
-		if (model instanceof View){
-			View view = (View)model;
-			FilteringStyle style = (FilteringStyle)  view.getStyle(NotationPackage.eINSTANCE.getFilteringStyle());
-			if (style != null) {
-				Filtering filtering = style.getFiltering();
-				if (Filtering.NONE_LITERAL == filtering) {
-					
-					return Collections.EMPTY_LIST;
-					
-				} else if (Filtering.MANUAL_LITERAL == filtering) {
-					
-					List filteredChildren = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects())
-						? style.getFilteredObjects() 
-						: Collections.EMPTY_LIST;
-		
-					List filteredViews = new ArrayList();
-					// Get the corresponding views...
-					Iterator i = filteredChildren.iterator();
-					while(i.hasNext()) {
-						EObject eObject = (EObject) i.next();
-                        View modelChild = getModelChildByID(eObject);
-                        if (modelChild != null) {
-                            filteredViews.add(modelChild);
-                        }
-					}
-					return filteredViews;	
-				
-				} else if (Filtering.AUTOMATIC_LITERAL == filtering) {
-					List filteringKeys = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys())
-						? style.getFilteringKeys() 
-						: Collections.EMPTY_LIST;
-					return getChildrenFilteredBy(filteringKeys);
-				}
-			}
-		}
-		
-		return Collections.EMPTY_LIST;
-	}
-	
-	/**
-	 * Returns a list of model children that are filtered according to 
-	 * Properties.ID_FILTERING_KEYS.  This is used to support dynamic sorting.
-	 * @param filterKeys
-	 * @return list of filtered children
-	 */
-	protected List getChildrenFilteredBy(List filterKeys) {
-		return Collections.EMPTY_LIST;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart#getCompartmentName()
-	 */
-	public String getCompartmentName() {
-		return null;
-	}
-	
-	/**
-	 * Returns the child view given the semantic ID.
-	 * @param eObject the semantic element
-	 * @return the view or null if not found
-	 */
-	protected View getModelChildByID(EObject eObject) {
-        List modelChildren = super.getModelChildren();
-        for (int i = 0; i < modelChildren.size(); i++) {
-            View view = (View) modelChildren.get(i);
-            EObject e = ViewUtil.resolveSemanticElement(view);
-            if (eObject.equals(e))
-                return view;
-        }
-        return null;
-	}
-	
-	/**
-	 * Returns <code>true</code> if sorting or filtering is in automatic mode
-	 * and <code>false</code> otherwise.
-	 * @return <code>true</code> if yes, oherwise <code>false</code> 
-	 */
-	protected boolean modeAutomatic() {
-		View view = getNotationView();
-		if (view!=null){
-			SortingStyle sortingStyle = (SortingStyle) view.getStyle(NotationPackage.eINSTANCE.getSortingStyle());
-			FilteringStyle filteringStyle = (FilteringStyle) view.getStyle(NotationPackage.eINSTANCE.getFilteringStyle());
-			if (sortingStyle != null && Sorting.AUTOMATIC_LITERAL == sortingStyle.getSorting()) 
-				return true;
-			if (filteringStyle != null && Filtering.AUTOMATIC_LITERAL == filteringStyle.getFiltering())
-				return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * checks whether the feature affects the sorting / filtering.
-	 * @param feature the feature to check
-	 * @return <tt>true</tt> if it affects it otherwise <tt>false</tt>
-	 */
-	protected boolean isAffectingSortingFiltering(Object feature) {
-		return false;
-	}
-
-	/**
-	 * Add listeners to the children of this list compartment so changes
-	 * to the children can be pickup and the sorting / filtering may be
-	 * updated.
-	 */
-	protected void addSemanticChildrenListeners() {
-		List modelChildren = super.getModelChildren();
-        modelChildrenListenersCount = modelChildren.size();
-		for (int i = 0; i < modelChildrenListenersCount; i++) {
-			EObject eObject = ViewUtil.resolveSemanticElement((View)modelChildren.get(i));
-			if (eObject != null)
-				addListenerFilter(
-					"SemanticModel" + i, this, eObject); //$NON-NLS-1$
-		}	
-		listening = true;
-	}
-	
-	/**
-	 * Remove the listeners on the children of this list compartment.
-	 */
-	protected void removeSemanticChildrenListeners() {
-		for (int i = 0; i < modelChildrenListenersCount; i++)
-			removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-		listening = false;
-	}
-	
-	/**
-	 * Add semanticChildrenListeners when we activiate, if needed.
-	 */
-	protected void addSemanticListeners() {
-		if (modeAutomatic() && !listening) {
-			addSemanticChildrenListeners();
-		}
-		super.addSemanticListeners();
-	}
-	
-	/**
-	 * Remove semanticChildrenListeners when we stop listening.
-	 */
-	protected void removeSemanticListeners() {
-		removeSemanticChildrenListeners();
-		listening = false;
-		super.removeSemanticListeners();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListItemEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListItemEditPart.java
deleted file mode 100644
index 7a83a40..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListItemEditPart.java
+++ /dev/null
@@ -1,69 +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.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableTextEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-
-/**
- * @author melaasar
- * 
- * EditPart for list items
- */
-public class ListItemEditPart
-	extends TextCompartmentEditPart {
-
-	/**
-	 * Creates a new ListItemEditPart
-	 * 
-	 * @param model
-	 */
-	public ListItemEditPart(EObject model) {
-		super(model);
-	}
-
-	protected IFigure createFigure() {
-	    IFigure theFigure = super.createFigure();
-	    theFigure.setVisible(false);
-		return theFigure;
-	}
-
-	protected ILabelDelegate createLabelDelegate() {
-	    ILabelDelegate labelDelegate = super.createLabelDelegate();
-	    labelDelegate.setAlignment(PositionConstants.LEFT);
-        return labelDelegate;
-    }
-
-    public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest
-			&& ((SelectionRequest) request).getLastButtonPressed() == 3)
-			return null;
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
-			new NonResizableTextEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE,
-			new ListItemComponentEditPolicy());
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NestableListItemEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NestableListItemEditPart.java
deleted file mode 100644
index 59b2650..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NestableListItemEditPart.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.ExposeHelper;
-import org.eclipse.gef.editparts.ViewportExposeHelper;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.NestedResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Ratio;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Extends ListItemEditPart to support nesting of list compartments. This edit
- * part supports a TextCompartmentView that contains children. Should be used if
- * you have a TextCompartment that contains other children such as a list
- * compartment.
- * 
- * @author choang
- * 
- */
-public class NestableListItemEditPart
-	extends ListItemEditPart
-	implements IResizableCompartmentEditPart {
-
-	final static int IS_RESIZABLE_FLAG = MAX_FLAG << 5;
-
-	/**
-	 * @param view
-	 */
-	public NestableListItemEditPart(EObject view) {
-		super(view);
-
-		setFlag(IS_RESIZABLE_FLAG, false);
-		Object model = basicGetModel();
-		if (model instanceof Node) {
-			Node node = (Node) model;
-			Style style = node.getStyle(NotationPackage.Literals
-				.DRAWER_STYLE);
-			if (style != null)
-				setFlag(IS_RESIZABLE_FLAG, true);
-		}
-	}
-
-	WrapLabel textLabel = null;
-
-	/**
-	 * @return Returns the textLabel.
-	 */
-	public WrapLabel getLabel() {
-
-		if (isResizable()) {
-			if (textLabel == null) {
-				textLabel = createWrapLabel();
-			}
-			return textLabel;
-		} else {
-			return super.getLabel();
-		}
-	}
-	
-	/**
-     * The main label figure for this editpart (that is, the only label figure
-     * if this is a regular list item or the header label of the nested list
-     * items if this is a nestable list item. Clients may override to create
-     * other label types.
-     * 
-     * @return the main label figure
-     */
-    protected IFigure getMainLabel() {
-        return getLabel();
-    }
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart#getCompartmentName()
-	 */
-	public String getCompartmentName() {
-		return getLabelDelegate().getText();
-	}
-	
-	/**
-	 * Override to create a figure that will create a figure that contains a
-	 * text compartment and a pane to store the child figures of the text
-	 * compartment.
-	 */
-	protected IFigure createFigure() {
-		if (isResizable()) {
-            IMapMode mm = getMapMode();
-			ResizableCompartmentFigure compartmentFigure = new NestedResizableCompartmentFigure(mm);
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setStretchMajorAxis(false);
-			layout.setStretchMinorAxis(false);
-			layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT);
-			compartmentFigure.getContentPane().setLayoutManager(layout);
-
-			compartmentFigure.getTextPane().add(getMainLabel());
-
-			// if the compartment is resizeable then we need to put a border
-			// around the text compartment so that we have enough room for the
-			// collpase handle.
-			
-			int one = mm.DPtoLP(1);
-            int half_15 = mm.DPtoLP(15) / 2;
-
-			// indent to make room for collapse handle for each nested list item
-			compartmentFigure.getTextPane().setBorder(
-				new MarginBorder(one, half_15, one, half_15));
-			// indent for visual appearance
-			compartmentFigure.getContentPane().setBorder(
-				new MarginBorder(one, mm.DPtoLP(15), one, half_15));
-
-			getMainLabel().setVisible(true);
-			return compartmentFigure;
-		} else {
-			return super.createFigure();
-		}
-
-	}
-    
-	/**
-	 * Adds additional edit policy EditPolicy.PRIMARY_DRAG_ROLE to provide
-	 * collapsiblity for list compartments
-	 */
-	protected void createDefaultEditPolicies() {
-
-		super.createDefaultEditPolicies();
-		if (isResizable()) {
-			installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
-				new ResizableCompartmentEditPolicy());
-		}
-	}
-
-	/**
-	 * This edit part can support either being ListItemListCompartmentEditPart
-	 * or ListItemListCompartmentEditPart that is nested with children and hence
-	 * is resizable. This helper method will help us determine which behavior we
-	 * want.
-	 * 
-	 * @return true iff the TextCompartment is mean to support children.
-	 */
-	final protected boolean isResizable() {
-		return getFlag(IS_RESIZABLE_FLAG);
-	}
-
-	/*
-	 * @return getView()).getChildren() this editpart supports having children.
-	 */
-	protected List getModelChildren() {
-
-		if (getModel() instanceof View) {
-			return ((View) getModel()).getChildren();
-		}
-
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * This method helps in children navigation by scrolling the compartment
-	 * until the child is visible in the viewport
-	 */
-	public Object getAdapter(Class key) {
-
-		if (key == ExposeHelper.class) {
-			ViewportExposeHelper helper = new ViewportExposeHelper(this);
-			return helper;
-		}
-		return super.getAdapter(key);
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-
-		if (isResizable()) {
-			refreshCollapsed();
-			refreshRatio();
-		}
-	}
-
-	/**
-	 * @return The compartment's figure if isResizable() else return null;
-	 */
-	private ResizableCompartmentFigure getCompartmentFigure() {
-		if (isResizable()) {
-			return (ResizableCompartmentFigure) getFigure();
-		} else {
-			return null;
-		}
-	}
-
-	public IFigure getContentPane() {
-		if (getCompartmentFigure() != null) {
-
-			return getCompartmentFigure().getContentPane();
-		} else {
-			return super.getContentPane();
-		}
-	}
-
-	/**
-	 * Handles the following properties: <BR>
-	 * <UL>
-	 * <LI>{@link Properties#ID_RATIO} calls {@link #refreshRatio()}
-	 * <LI>{@link Properties#ID_COLLAPSED} calls {@link #refreshCollapsed()}
-	 * <UL>
-	 * <BR>
-	 * All other properties are forwarded to the parent class for processing.
-	 * 
-	 * @param evt
-	 *            a property change event.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
-	 */
-	protected void handleNotificationEvent(Notification evt) {
-		Object feature = evt.getFeature();
-		if (NotationPackage.Literals.RATIO__VALUE.equals(feature)
-			|| evt.getOldValue() instanceof Ratio
-			|| evt.getNewValue() instanceof Ratio)
-			refreshRatio();
-		else if (NotationPackage.Literals.DRAWER_STYLE__COLLAPSED.equals(
-			feature)) {
-			setCollapsed(((Boolean) evt.getNewValue()).booleanValue(), true);
-			this.getFigure().revalidate();
-		} else
-			super.handleNotificationEvent(evt);
-	}
-
-	/**
-	 * Refreshes the compartment ratio property
-	 */
-	protected void refreshRatio() {
-		if (ViewUtil
-			.isPropertySupported((View) getModel(), Properties.ID_RATIO))
-			setRatio((Double) ViewUtil.getStructuralFeatureValue(
-				(View) getModel(), NotationPackage.Literals.RATIO__VALUE));
-		else
-			setRatio(new Double(-1));
-	}
-
-	/**
-	 * Refreshes the compartment collapse state
-	 */
-	protected void refreshCollapsed() {
-		DrawerStyle style = (DrawerStyle) ((View) getModel())
-			.getStyle(NotationPackage.Literals.DRAWER_STYLE);
-		if (style != null)
-			setCollapsed(style.isCollapsed(), false);
-	}
-
-	/**
-	 * Sets the collapse state of the compartment figure, considering the passed
-	 * animate flag while doing so
-	 * 
-	 * @param collapsed
-	 *            the collapsed state
-	 * @param animate
-	 *            the animate flag
-	 */
-	protected void setCollapsed(boolean collapsed, boolean animate) {
-		if (getCompartmentFigure() != null) {
-			if (collapsed) {
-				if (animate)
-					getCompartmentFigure().collapse();
-				else
-					getCompartmentFigure().setCollapsed();
-			} else {
-				if (animate)
-					getCompartmentFigure().expand();
-				else
-					getCompartmentFigure().setExpanded();
-			}
-		}
-	}
-
-	/**
-	 * Sets the ratio of the resizable compartment
-	 * 
-	 * @param ratio
-	 */
-	protected void setRatio(Double ratio) {
-		((IGraphicalEditPart) getParent()).setLayoutConstraint(this,
-			getFigure(), ratio);
-	}
-
-	/**
-	 * Sets the visibility of the compartment title
-	 * 
-	 * @param showCompartmentTitle
-	 */
-	protected void setShowCompartmentTitle(boolean showCompartmentTitle) {
-		if (getCompartmentFigure() != null)
-			getCompartmentFigure().setTitleVisibility(showCompartmentTitle);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NoteEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NoteEditPart.java
deleted file mode 100644
index c94c30f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/NoteEditPart.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-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.figures.NoteFigure;
-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.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-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.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-
-/**
- * Note shape which provides textual annotations for diagram elements.  Notes are 
- * attachable. 
- * <p>
- * Notes support diagram links.
- * <p>
- * @author jcorchis
- */
-public class NoteEditPart extends ShapeNodeEditPart {
-    
-    // resource listener
-    private ResourceListener listener = null;
-    
-    private boolean diagramLinkMode = false;
-
-	/**
-	 * constructor
-	 * @param view the view controlled by this edit part
-	 */
-	public NoteEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Creates a note figure.
-	 */
-	protected NodeFigure createNodeFigure() {
-		IMapMode mm = getMapMode();
-		int insetSize = mm.DPtoLP(5);
-		Insets insets = new Insets(insetSize, insetSize, insetSize, mm.DPtoLP(NoteFigure.CLIP_MARGIN_DP));
-		NoteFigure noteFigure = new NoteFigure(mm.DPtoLP(100), mm.DPtoLP(56), insets);
-		Object model = getModel();
-		if (model!=null && model instanceof View){
-			View notationView = (View)model;
-			if ( notationView!=null && 
-				 (notationView.getEAnnotation(Properties.DIAGRAMLINK_ANNOTATION)!=null ||
-				  notationView.getType() == null ||
-				  notationView.getType().length() == 0)){
-				diagramLinkMode = true;
-				noteFigure.setDiagramLinkMode(true);
-				insets.right = insetSize; // there is no dangling corner in diagram link, set right margin to be the same as left
-				
-				// The default size is the minimum.
-				noteFigure.setDefaultSize(insetSize, insetSize);
-            }
-		}
-		return noteFigure;
-	}
-
-	/** Adds support for diagram links. */
-	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 Note support for diagram links
-		// 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());
-	}
-	
-	/**
-	 * 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);
-    } 
-    
-    private class ResourceListener extends ResourceSetListenerImpl{
-        private WeakReference resourceRef = null; 
-        private NoteEditPart editPart= null;
-        public ResourceListener(Resource resource, NoteEditPart editPart){
-            resourceRef = new WeakReference(resource);
-            this.editPart = editPart;
-        }
-        
-        /**
-         * Disposes my context from the operation history when a resource is
-         * unloaded from my editing domain.
-         */
-        public void resourceSetChanged(ResourceSetChangeEvent event) {
-            if (editPart ==null || resourceRef.get()==null) {
-                if (editPart != null && editPart.listener!=null) {
-                    getEditingDomain().removeResourceSetListener(editPart.listener);
-                    editPart.listener = null;
-                }
-                return;
-            }
-            boolean unloaded = isResourceUnloaded(event.getNotifications());
-            if (unloaded && editPart.isActive()) {
-                editPart.refresh();
-                if (editPart.listener!=null) {
-                    getEditingDomain().removeResourceSetListener(editPart.listener);
-                    editPart.listener = null;
-                }
-            }
-        }
-        
-        /**
-         * Finds resources that have sent unload notifications.
-         * 
-         * @param notifications
-         *            notifications received from a transaction
-         * @return a set of resources that the notifications indicate have been
-         *         unloaded, or <code>null</code> if none
-         */
-        private boolean isResourceUnloaded(Collection notifications) {
-            for (Iterator iter = notifications.iterator(); iter.hasNext();) {
-                Notification next = (Notification) iter.next();
-                if (next.getNotifier()!=resourceRef.get())
-                    return false;
-                if (NotificationFilter.RESOURCE_UNLOADED.matches(next)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public boolean isPostcommitOnly() {
-            // only interested in post-commit "resourceSetChanged" event
-            return true;
-        }
-
-    }
-    
-    protected void addSemanticListeners() {
-        // the resource listener is needed only in diagram link mode
-        if (diagramLinkMode){
-            if (listener==null){
-                listener = new ResourceListener(getNotationView().getElement().eResource(),this);
-            }
-            getEditingDomain().addResourceSetListener(listener);
-        }
-        super.addSemanticListeners();
-    }
-
-    protected void removeSemanticListeners() {
-        //the resource listener is needed only in diagram link mode
-        if (listener!=null) {
-            getEditingDomain().removeResourceSetListener(listener);
-            listener = null;
-        }
-        super.removeSemanticListeners();
-    }
-
-    protected void handleNotificationEvent(Notification notification) {
-        Object feature = notification.getFeature();
-        if (feature == NotationPackage.eINSTANCE.getView_Element() && notification.getEventType() == Notification.RESOLVE
-                 && ((EObject)notification.getNotifier())== getNotationView() && listener != null) {
-            // skipping the resolve event whenever the editpart is already resolved.
-            return;
-        }
-   		if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)) {
-    			refreshLineWidth();
-   		} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(
-    				feature)) {
-   			refreshLineType();
-   		} else {
-            super.handleNotificationEvent(notification);
-   		}
-    }
-
-    /*
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineWidth(int)
-     */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		((NoteFigure) getFigure()).setLineWidth(getMapMode().DPtoLP(width));
-		getFigure().revalidate();
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		((NoteFigure)getFigure()).setLineStyle(lineType);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLineType();
-		refreshLineWidth();
-		refreshTransparency();
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#supportsGradient()
-	 *
-	 * @since 1.2
-	 */
-	public boolean supportsGradient() {
-		return true;
-	}	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java
deleted file mode 100644
index 331c6ac..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.ExposeHelper;
-import org.eclipse.gef.editparts.ViewportExposeHelper;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Ratio;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-
-/**
- * An editpart for controlling generic resizable compartment views
- * The compartment can be collapsed, hidden, resized, or given a title
- * 
- * @author melaasar
- */
-public abstract class ResizableCompartmentEditPart
-	extends CompartmentEditPart implements IResizableCompartmentEditPart {
-
-	/**
-	 * Constructs a new resizable editpart
-	 * 
-	 * @param model The resizable compartment view
-	 */
-	public ResizableCompartmentEditPart(EObject model) {
-		super(model);
-	}
-
-	/**
-	 * This method helps in children navigation by scrolling the compartment
-	 * until the child is visible in the viewport
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == ExposeHelper.class) {
-			ViewportExposeHelper helper = new ViewportExposeHelper(this);
-			return helper;
-		}
-		return super.getAdapter(key);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshFont();
-		refreshFontColor();
-		refreshShowCompartmentTitle();
-		refreshCollapsed();
-		refreshRatio();
-		refreshLineWidth();
-		refreshLineType();	
-		refreshBackgroundColor();
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-		return new ResizableCompartmentFigure(getCompartmentName(), getMapMode());
-	}
-
-	/**
-	 * @return The compartment's figure
-	 */
-	public ResizableCompartmentFigure getCompartmentFigure() {
-		return (ResizableCompartmentFigure) getFigure();
-	}
-
-	/**
-	 * @see org.eclipse.gef.GraphicalEditPart#getContentPane()
-	 */
-	public IFigure getContentPane() {
-		if (getCompartmentFigure()!=null){
-					
-			return getCompartmentFigure().getContentPane();
-		} else {
-			return null;
-		}
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart#getCompartmentName()
-	 */
-	public String getCompartmentName() {
-		return new String();
-	}
-		
-	/**
-	 * Handles the following properties: <BR>
-	 * <UL>
-	 * <LI>{@link NotationPackage.eINSTANCE.getRatio_Value()} calls {@link #refreshRatio()}
-	 * <LI>{@link NotationPackage.eINSTANCE.getDrawerStyle_Collapsed()} calls {@link #refreshCollapsed()}
-	 * <LI>{@link NotationPackage.eINSTANCE.getTitleStyle_ShowTitle()} calls {@link #refreshShowCompartmentTitle()}
-	 * <UL>
-	 * <BR>
-	 * All other properties are forwarded to the parent class for processing.
-	 * @param evt a property change event.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
-	 */
-	protected void handleNotificationEvent(Notification event ) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getRatio_Value().equals(feature) 
-			|| event.getOldValue()instanceof Ratio
-			|| event.getNewValue() instanceof Ratio)
-			refreshRatio();
-		else if (NotationPackage.eINSTANCE.getDrawerStyle_Collapsed().equals(feature)){		
-			setCollapsed(event.getNewBooleanValue(), true);
-			this.getFigure().revalidate();
-		} else if (NotationPackage.eINSTANCE.getTitleStyle_ShowTitle().equals(feature))
-			setShowCompartmentTitle(event.getNewBooleanValue());
-		else if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)){
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		}
-		else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-                NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-                NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-                NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-        } else if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)){
-			refreshLineWidth();
-		} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
-			refreshLineType();
-		} else if (NotationPackage.eINSTANCE.getFillStyle_Gradient().equals(feature) ||
-				NotationPackage.eINSTANCE.getFillStyle_FillColor().equals(feature)) {				
-			refreshBackgroundColor();			
-		} else 
-			super.handleNotificationEvent(event);
-	}
-		
-	/**
-	 * Refreshes the compartment ratio property
-	 */
-	protected void refreshRatio() {
-		if (ViewUtil.isPropertySupported((View)getModel(), Properties.ID_RATIO))
-			setRatio((Double)getStructuralFeatureValue(NotationPackage.eINSTANCE.getRatio_Value()));
-		else
-			setRatio(new Double(-1));
-	}
-	
-	/**
-	 * Refreshes the compartment's collapsed state
-	 */
-	protected void refreshCollapsed() {
-		DrawerStyle style = (DrawerStyle) ((View)getModel()).getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-		if (style != null)		
-			setCollapsed(style.isCollapsed(), false);
-	}
-
-	/**
-	 * Refreshes the compartment title visibility
-	 */
-	protected void refreshShowCompartmentTitle() {
-		TitleStyle style = (TitleStyle)  ((View)getModel()).getStyle(NotationPackage.eINSTANCE.getTitleStyle());
-		if (style != null)
-			setShowCompartmentTitle(style.isShowTitle());
-	}
-	
-	/**
-	 * Sets the collapse state of the compartment figure, considering the passed
-	 * animate flag while doing so 
-	 * @param collapsed the collapsed state 
-	 * @param animate the animate flag
-	 */
-	protected void setCollapsed(boolean collapsed, boolean animate) {
-		if (getCompartmentFigure()!=null) {
-			if (collapsed) {
-				if (animate)
-					getCompartmentFigure().collapse();
-				else
-					getCompartmentFigure().setCollapsed();
-			}
-			else {
-				if (animate)
-					getCompartmentFigure().expand();
-				else
-					getCompartmentFigure().setExpanded();
-			}
-		}
-	}
-	
-	/**
-	 * Sets the ratio of the resizable compartment
-	 * @param ratio
-	 */
-	protected void setRatio(Double ratio) {
-		((IGraphicalEditPart) getParent()).setLayoutConstraint(
-			this,
-			getFigure(),
-			ratio);
-	}
-
-	/**
-	 * Sets the visibility of the compartment title
-	 * @param showCompartmentTitle
-	 */
-	protected void setShowCompartmentTitle(boolean showCompartmentTitle) {
-		if (getCompartmentFigure()!=null)
-			getCompartmentFigure().setTitleVisibility(showCompartmentTitle);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setFont(org.eclipse.swt.graphics.FontData)
-	 */
-	protected void setFont(FontData fontData) {
-		if (getCompartmentFigure()!=null)
-			fontData.setHeight(fontData.getHeight()-1);
-		super.setFont(fontData);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setFontColor(org.eclipse.swt.graphics.Color)
-	 */
-	protected void setFontColor(Color color) {
-		if (getCompartmentFigure()!=null)
-			getCompartmentFigure().setFontColor(color);
-	}
-	
-	/**
-	 * Sets the line width for the shape's border
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		Border border = getFigure().getBorder();
-		if (border instanceof LineBorder) {
-			((LineBorder) border).setWidth(getMapMode().DPtoLP(width));
-			getFigure().revalidate();
-		}		
-	}
-	
-	/**
-	 * Sets the line type for the shape's border
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineType(int)
-	 */
-	protected void setLineType(int type) {
-		Border border = getFigure().getBorder();
-		if (border instanceof LineBorder) {
-			((LineBorder) border).setStyle(type);
-		}
-	}	
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addNotationalListeners()
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#removeNotationalListeners()
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}	
-
-	/* onl
-	 * @see org.eclipse.gef.EditPart#isSelectable()
-	 */
-	public boolean isSelectable() {
-		
-		if ( super.isSelectable()){
-			return (!(getParent() instanceof ResizableCompartmentEditPart));
-			
-		}
-		return false;
-	}
-	
-    /**
-	 * This method refreshes background color of scroll bars (when they are
-	 * present). Actually, scroll bars inherit background color from their parent shape,
-	 * but in case of gradient we want to set the background to the second color
-	 * of gradient.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#refreshBackgroundColor()
-	 */
-    protected void refreshBackgroundColor() {
-    	if (getPrimaryView() == null) {
-    		return;
-    	}
-        FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
-        ScrollPane scrollPane = getCompartmentFigure().getScrollPane();
-        if (style != null && scrollPane != null) {
-    		Color color = null;
-    		if (style.getGradient() == null) {
-    			color = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getFillColor()));
-    		} else {
-    			color = DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getGradient().getGradientColor2()));
-    		}
-    		if (color != null) {
-    			scrollPane.setBackgroundColor(color);
-    		}
-    	}
-    }		
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/SemanticListCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/SemanticListCompartmentEditPart.java
deleted file mode 100644
index 14771a8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/SemanticListCompartmentEditPart.java
+++ /dev/null
@@ -1,413 +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.editparts;
-
-import java.util.ArrayList;
-import java.util.Collection;
-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.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationUtil;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.FilteringStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Sorting;
-import org.eclipse.gmf.runtime.notation.SortingDirection;
-import org.eclipse.gmf.runtime.notation.SortingStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A List compartment Edit part that contains semantic edit parts. A semantic
- * edit part is an edit part that controls a semantic element, it does not
- * control a Notation <code>View<code>. 
- * This list compartment is canonical by default, to turn off the canonical 
- * support just override the isCanonicalEnabled and return false
- * 
- * To convert your List compartment Edit Part to a semantic List compartment, make the Edit Part 
- * extends <code>SemanticListCompartmentEditPart</code> then implement the abstrtact methods:
- *  
- *  semanticChildAdded(EObject child,int index)
- *   Which will be called when a semantic child is added 
- *  And, getSemanticChildrenList()
- *   Which returns a list of all semantic children inside this editpart's model
- *   
- * Then on the EditPart's you add to this list make sure thathasNotationView 
- * returns <code>false</code> 
- *   
- * @author mmostafa
- */
-
-abstract public class SemanticListCompartmentEditPart
-	extends ListCompartmentEditPart {
-	
-	/**
-	 * constructor
-	 * @param model the mdoel controlled by this edit part
-	 */
-	public SemanticListCompartmentEditPart(EObject model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#refreshChildren()
-	 */
-	protected void refreshChildren() {
-		int i;
-		GraphicalEditPart editPart;		
-		List modelObjects = getModelChildren();
-		List _children = getChildren();
-		
-		if ((modelObjects.size() == 0) && (_children.size() == 0)) {
-			return;
-		}
-		
-		Map modelToEditPart = new HashMap();
-		for (i = 0; i < _children.size(); i++) {
-			editPart = (GraphicalEditPart)_children.get(i);
-			modelToEditPart.put(editPart.basicGetModel(), editPart);
-		}
-
-		
-
-		for (i = 0; i < modelObjects.size(); i++) {
-			EObject element  = (EObject)modelObjects.get(i);
-			//Do a quick check to see if editPart[i] == model[i]
-			if (i < _children.size()
-				&& (((GraphicalEditPart)_children.get(i)).basicGetModel()) == element)
-					continue;
-
-			//Look to see if the EditPart is already around but in the wrong location
-			editPart = (GraphicalEditPart)modelToEditPart.get(element);
-
-			if (editPart != null)
-				reorderChild (editPart, i);
-			else {
-				//An editpart for this model doesn't exist yet.  Create and insert one.
-				semanticChildAdded(element,i);
-			}
-		}
-		List trash = new ArrayList();
-		for (; i < _children.size(); i++)
-			trash.add(_children.get(i));
-		for (i = 0; i < trash.size(); i++) {
-			EditPart ep = (EditPart)trash.get(i);
-			removeChild(ep);
-		}
-	}
-
-
-	/**
-	 * @param child
-	 */
-	protected void semanticChildRemoved(EObject child){
-        if (children==null)
-            return;
-        for (Iterator iter = children.iterator(); iter.hasNext();) {
-			GraphicalEditPart ep = (GraphicalEditPart) iter.next();
-			if (ep.basicGetModel().equals(child)){
-				removeChild(ep);
-				break;
-			}
-		}
-	}
-	
-	/**
-	 * Updates the set of children views so that it
-	 * is in sync with the semantic children. This method is called 
-	 * in response to notification from the model.
-	 * <P>
-	 * The update is performed by comparing the exising views with the set of
-	 * semantic children returned from {@link #getViewChildren()}. Views whose
-	 * semantic element no longer exists are {@link #deleteViews(Iterator) removed}. 
-	 * New semantic children have their View {@link  #createViews(List)
-	 * created}.  Subclasses must override <code>getSemanticChildren()</code>.
-	 * <P>
-	 * Unlike <code>AbstractEditPart#refreshChildren()</code>, this refresh will not
-	 * reorder the view list to ensure both it and the semantic children are
-	 * in the same order since it is possible that this edit policy will handle
-	 * a specifc subset of the host's views.  
-	 * <P>
-	 * The host is refreshed if a view has created or deleted as a result of this
-	 * refresh.
-	 */
-	protected void refreshSemanticChildren() {
-		if (!isCanonicalEnabled())
-			return ; 
-		// Don't try to refresh children if the semantic element
-		// cannot be resolved.
-		if (resolveSemanticElement() == null) {
-			return;		
-		}
-		
-		//
-		// current EditParts
-		List editPartsChildren = getChildren();
-		List modelChildren = getModelChildren();
-		if ((editPartsChildren.size() == 0) && (modelChildren.size() == 0)) {
-			return;
-		}		
-		
-		List semanticChildren = new ArrayList(modelChildren);
-		
-		//View viewChild;
-		EObject semanticChild;
-				
-		
-
-		Iterator childrenIT = editPartsChildren.iterator();		
-		while( childrenIT.hasNext() ) {
-			GraphicalEditPart eP = (GraphicalEditPart)childrenIT.next();
-			semanticChild = (EObject)eP.basicGetModel();
-			semanticChildren.remove(semanticChild);
-		}
-		
-		//
-		// create a view for each remaining semantic element.
-		if ( !semanticChildren.isEmpty()) {
-			for (Iterator iter = semanticChildren.iterator(); iter.hasNext();) {
-				EObject element = (EObject) iter.next();
-				semanticChildAdded(element,-1);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.EditPart#activate()
-	 */
-	public void activate() {
-		super.activate();
-		refreshSemanticChildren();
-	}
-	
-	/**
-	 * This method will be called when a child is added to the
-	 * EditPart's model id Canonical is enabled
-	 * @param child	the child being added, the index where its edit part should be created 
-	 * @param index
-	 */
-	abstract protected void semanticChildAdded(EObject child,int index);
-	
-	/**
-	 * Returns a list of all semantic children inside this editpart's model
-	 * @return
-	 */
-	abstract protected List getSemanticChildrenList();
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (hasModelChildrenChanged(event)){
-			semanticChildrenListChanged(event);
-		}
-		else if ((NotationPackage.eINSTANCE.getDrawerStyle_Collapsed() == feature ||
-				  NotationPackage.eINSTANCE.getView_Visible() == feature&& 
-			       !event.getNewBooleanValue())||
-			      (NotationPackage.eINSTANCE.getView_Visible() == feature && 
-				   event.getNewBooleanValue())){
-			refreshSemanticChildren();
-		}
-		super.handleNotificationEvent(event);
-	}
-	
-	/**
-	 * called by the <code>handlePropertyChangeEvent</code> when the semantic children list 
-	 * is changed, then this method will check if the change was add or delete of an element
-	 * and calls either <code>semanticChildAdded</code> or <code>semanticChildDeleted</code>
-	 * this could be used to implement a canonical list without a canonical edit policy
-	 * @param evt
-	 */
-	protected void semanticChildrenListChanged(Notification event) {
-		if (isCanonicalEnabled()){
-			if (NotificationUtil.isElementAddedToSlot(event) ||
-				NotificationUtil.isMove(event)){
-				refreshChildren();
-			} else if (NotificationUtil.isElementRemovedFromSlot(event)) {
-				if (event.getOldValue() instanceof Collection) {
-					 for (Iterator iter = ((Collection) event
-	                         .getOldValue()).iterator(); iter.hasNext();) {
-	                         EObject removedObject = (EObject) iter.next();
-	                         semanticChildRemoved(removedObject);
-					 }									
-				} else if (event.getOldValue() instanceof  EObject){
-					semanticChildRemoved((EObject)event.getOldValue());
-				}
-		
-			}
-		} else if (NotificationUtil.isElementRemovedFromSlot(event))
-			if (!getChildren().isEmpty()) {
-				if (event.getOldValue() instanceof Collection) {
-					 for (Iterator iter = ((Collection) event
-	                         .getOldValue()).iterator(); iter.hasNext();) {
-	                         EObject removedObject = (EObject) iter.next();
-	                         semanticChildRemoved(removedObject);
-					 }					
-				} else if (event.getOldValue() instanceof  EObject) {
-					semanticChildRemoved((EObject)event.getOldValue()); 
-			    }
-		   }
-	}
-	
-	/**
-     * indicated if canonical is enabled or not Canonical is disabled if the
-     * edit part's view is collapsed or hidden
-     * 
-     * @return
-     */
-    protected boolean isCanonicalEnabled() {
-        DrawerStyle dstyle = (DrawerStyle) ((View) getModel())
-            .getStyle(NotationPackage.Literals.DRAWER_STYLE);
-        boolean isCollapsed = dstyle == null ? false
-            : dstyle.isCollapsed();
-
-        if (isCollapsed) {
-            return false;
-        }
-
-        return ((View) getModel()).isVisible();
-    }
-	
-	/**
-     * indicated if canonical is enabled or not Canonical is disabled if the
-     * edit part's view is collapsed or hidden
-     * 
-     * @return
-     */
-    public boolean isCanonicalOn() {
-        return isCanonicalEnabled();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart#getSortedChildren()
-	 */
-	protected List getSortedChildren() {
-		SortingStyle style = (SortingStyle)  ((View)getModel()).getStyle(NotationPackage.eINSTANCE.getSortingStyle());
-
-		if (style != null) {
-			Sorting sorting = style.getSorting();
-			if (Sorting.NONE_LITERAL == sorting) {
-				
-				return getSemanticChildrenList();
-				
-			} else if (Sorting.MANUAL_LITERAL == sorting) {
-	
-				List allChildren = getSemanticChildrenList();
-				// Return the empty list if the model children have not yet been
-				// created.
-				if (allChildren.isEmpty())
-					return allChildren;
-				
-				List sortedChildren = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortedObjects())
-					? style.getSortedObjects() 
-					: Collections.EMPTY_LIST;
-	
-				List sorted = new ArrayList();
-				
-				// Get the corresponding views...
-				Iterator i = sortedChildren.iterator();
-				while(i.hasNext()) {
-					EObject eObject = (EObject) i.next();
-					if (allChildren.contains(eObject))
-						sorted.add(eObject);
-				}	
-				
-				// Add any remaining model children to the end
-				for (int j = 0; j < allChildren.size(); j++) {
-					EObject element = (EObject) allChildren.get(j);
-					if (!sorted.contains(element))
-						sorted.add(element);
-				}
-				
-				return sorted;
-				
-			} else if (Sorting.AUTOMATIC_LITERAL == sorting) {
-				Map sortingKeys = style.eIsSet(NotationPackage.eINSTANCE.getSortingStyle_SortingKeys())
-					? style.getSortingKeys() 
-					: Collections.EMPTY_MAP;
-				return getChildrenSortedBy(sortingKeys);
-			}
-		}
-		
-		return getSemanticChildrenList();		
-	}
-	
-	/**
-	 * Returns the model children sorted by the order specified by Properties.ID_SORTING_KEYS.
-	 * This is used to support dynamic list compartment sorting.
-	 * @param sortingKeys
-	 * @return the model children sorted
-	 */
-	protected List getChildrenSortedBy(Map sortingKeys) {
-		List allChildren = new ArrayList(getSemanticChildrenList());
-		// Currently only one sorting key is supported.
-		if (sortingKeys != null && !sortingKeys.isEmpty()) {
-			Collection keySet = sortingKeys.keySet();
-			Iterator i = keySet.iterator();
-			String name = (String) i.next();
-			SortingDirection direction = (SortingDirection) sortingKeys.get(name);
-			
-			Comparator comparator = getComparator(name, direction);
-			
-			if (comparator != null)
-				Collections.sort(allChildren, getComparator(name, direction));									
-		} 
-		return allChildren;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart#getFilteredChildren()
-	 */
-	protected List getFilteredChildren() {
-		Object model = getModel();
-		if (model instanceof View){
-			View view = (View)model;
-			FilteringStyle style = (FilteringStyle)  view.getStyle(NotationPackage.eINSTANCE.getFilteringStyle());
-			if (style != null) {
-				Filtering filtering = style.getFiltering();
-				if (Filtering.NONE_LITERAL == filtering) {
-					
-					return Collections.EMPTY_LIST;
-					
-				} else if (Filtering.MANUAL_LITERAL == filtering) {
-					
-					List filteredChildren = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects())
-						? style.getFilteredObjects() 
-						: Collections.EMPTY_LIST;
-					return filteredChildren;	
-				
-				} else if (Filtering.AUTOMATIC_LITERAL == filtering) {
-					List filteringKeys = style.eIsSet(NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys())
-						? style.getFilteringKeys() 
-						: Collections.EMPTY_LIST;
-					return getChildrenFilteredBy(filteringKeys);
-				}
-			}
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	public boolean isCanonical() {
-        return true;
-    }
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java
deleted file mode 100644
index c365e3e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java
+++ /dev/null
@@ -1,799 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutAnimator;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.RangeModel;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DeselectAllTracker;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
-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.editpolicies.ShapeCompartmentDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.DiagramLinkDragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandDragTracker;
-import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;
-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 generic (sub) shape container that holds instances of
- * <code>ShapeNodeEditPart</code>s and manages the display of
- * <code>ConnectionNodeEditPart</code>s anchored to these shape editpart
- * instances.
- * 
- * @author mhanner
- */
-public abstract class ShapeCompartmentEditPart
-	extends ResizableCompartmentEditPart
-	implements ISurfaceEditPart, PropertyChangeListener {
-
-	/** private connection refresh manager. */
-	private ConnectionRefreshMgr _crMgr;
-
-	private boolean _refreshQueued = false;
-
-	private boolean isSupportingViewActions = false;
-    
-    // Listen to editparts being added to or removed from this compartment
-    // editpart so that when a figure moves within the compartment we can call
-    // refreshConnections(). See bugzilla#146581.
-    private EditPartListener editpartListener = new EditPartListener.Stub() {
-
-        private FigureListener childFigureListener = new FigureListener() {
-
-            public void figureMoved(IFigure source) {
-                refreshConnections();
-            }
-        };
-
-        public void childAdded(EditPart child, int index) {
-            ((GraphicalEditPart) child).getFigure().addFigureListener(
-                childFigureListener);
-        }
-
-        public void removingChild(EditPart child, int index) {
-            ((GraphicalEditPart) child).getFigure().removeFigureListener(
-                childFigureListener);
-
-        }
-
-    };
-
-	/**
-	 * Class used to refresh the connections associated to the shape
-	 * compartment's children. This implementation will hide all connections
-	 * whose endpoints are not visible inside the shape compartment.
-	 */
-	public static class ConnectionRefreshMgr {
-		/**
-		 * Cycles through all the connections associated to the editparts
-		 * contained within the passed shape compartment and sets their
-		 * visibility.
-		 * 
-		 * @see ConnectionNodeEditPart#getSourceConnectionAnchor()
-		 * @see ConnectionNodeEditPart#getTargetConnectionAnchor()
-		 * @param scep
-		 *            edit part to consider
-		 */
-		protected void refreshConnections(ShapeCompartmentEditPart scep) {
-			Iterator connectionNodes = getConnectionNodes(scep).iterator();
-			while (connectionNodes.hasNext()) {
-				ConnectionNodeEditPart cep = (ConnectionNodeEditPart) connectionNodes
-					.next();
-				Connection connection = (Connection) cep.getFigure();
-				View connectionView = cep.getNotationView();
-				if (connectionView != null && !connectionView.isVisible()) {
-					/*
-					 * Compartment is not responsible for refreshing a
-					 * connection, the view of which is not visible
-					 */
-					continue;
-				}
-				
-				IGraphicalEditPart source = (IGraphicalEditPart) getSourceEditPart(cep);
-				IGraphicalEditPart target = (IGraphicalEditPart) getTargetEditPart(cep);
-				if (source == null || target == null) {
-					connection.setVisible(false);
-					continue;
-				}
-				
-				if (!source.getFigure().isShowing() || !target.getFigure().isShowing()) {
-					connection.setVisible(false);
-					continue;
-				}
-				
-				ShapeCompartmentEditPart sContainer = getOwningShapeCompartment(source);
-				ShapeCompartmentEditPart tContainer = getOwningShapeCompartment(target);
-				// only deal with items contained within a shape compartment
-				if (sContainer == null && tContainer == null) {
-					continue;
-				}
-				boolean sfVisible = source != null;
-				boolean tfVisible = target != null;
-                
-                ConnectionAnchor sc = cep.getSourceConnectionAnchor();
-                ConnectionAnchor tc = cep.getTargetConnectionAnchor();
-                Point sRefPoint;
-                Point tRefPoint;
-                List bendpoints = (List) connection.getConnectionRouter()
-                    .getConstraint(connection);
-                if (bendpoints != null && bendpoints.size() >= 2) {
-                    sRefPoint = ((Bendpoint) bendpoints.get(0)).getLocation()
-                        .getCopy();
-                    connection.translateToAbsolute(sRefPoint);
-                    tRefPoint = ((Bendpoint) bendpoints
-                        .get(bendpoints.size() - 1)).getLocation().getCopy();
-                    connection.translateToAbsolute(tRefPoint);
-                } else {
-                    sRefPoint = tc.getReferencePoint();
-                    tRefPoint = sc.getReferencePoint();
-                }
-                Point sLoc = sc.getLocation(sRefPoint);
-                Point tLoc = tc.getLocation(tRefPoint);
-               
-				Diagram diagram = ((View) scep.getModel()).getDiagram();
-				Map registry = scep.getViewer().getEditPartRegistry();
-				IGraphicalEditPart dep = (IGraphicalEditPart) registry
-					.get(diagram);
-				IFigure stopFigure = dep == null ? null
-					: dep.getContentPane();
-                boolean noSource = false;
-                boolean noTarget = false;
-
-				//
-				// if sContainer is null, then the source connection is a child
-				// of the diagram and not
-				// a shape compartment. It's visibility is, therefore, true.
-				if (sContainer != null) {
-					ShapeCompartmentFigure fig = sContainer
-						.getShapeCompartmentFigure();
-                    noSource  = !fig.isVisible();
-					sfVisible = isFigureVisible(fig, sLoc, stopFigure);
-					if (!sfVisible) {
-						sfVisible = isBorderItem(sContainer, source);
-					}
-				}
-				//
-				// if tContainer is null, then the source connection is a child
-				// of the diagram and not
-				// a shape compartment. It's visibility is, therefore, true.
-				if (tContainer != null) {
-					ShapeCompartmentFigure fig = tContainer
-						.getShapeCompartmentFigure();
-                    noTarget = !fig.isVisible();
-                    tfVisible = isFigureVisible(fig, tLoc, stopFigure);
-					if (!tfVisible) {
-						tfVisible = isBorderItem(tContainer, target);
-					}
-				}
-				// set connection visibility true iff both anchor points are
-                // visible
-                if (noSource || noTarget){
-                  if (noSource && cep.getTarget()!=null)
-                      cep.getTarget().refresh();
-                  if (noTarget && cep.getSource()!=null)
-                        cep.getSource().refresh();
-                }else{
-                    connection.setVisible(sfVisible && tfVisible);
-                    refreshConnectionEnds(cep);
-                }
-			}
-		}
-        
-        private void refreshConnectionEnds(ConnectionEditPart cEP){
-            EditPart srcEditPart = cEP.getSource();
-            EditPart trgEditPart = cEP.getTarget();
-            Object model = cEP.getModel();
-            if (model instanceof Edge){
-                Edge edge = (Edge)model;
-                View source = edge.getSource();
-                View target = edge.getTarget();
-                if (srcEditPart==null){
-                    refreshEditPart(cEP.getViewer(), source);
-                }
-                if (trgEditPart==null){
-                    refreshEditPart(cEP.getViewer(), target);
-                }
-            }
-        }
-
-        private void refreshEditPart(EditPartViewer  viewer, View view) {
-            EditPart ep = (EditPart)viewer.getEditPartRegistry().get(view);
-            if (ep!=null){
-                ep.refresh();
-            }
-        }
-
-		/**
-		 * Return the set of {@link ConnectionNodeEditPart}s contained in the
-		 * supplied shape compartment.
-		 * 
-		 * @param scep
-		 *            a shape compartment.
-		 * @return a {@link Set} of {@link ConnectionNodeEditPart}.
-		 */
-
-		protected Set getConnectionNodes(ShapeCompartmentEditPart scep) {
-			Set endPoints = new HashSet();
-			Object modelObject = scep.getModel();
-			if (scep.getViewer() == null || modelObject == null 
-				|| !(modelObject instanceof View)) {
-				return endPoints;
-			}
-			
-			if (((View)modelObject).getDiagram()==null)
-				return endPoints;
-
-			Diagram diagram = ((View) modelObject).getDiagram();
-			Map registry = scep.getViewer().getEditPartRegistry();
-			List edges = diagram.getEdges();
-			Iterator edgesIterator = edges.iterator();
-
-			while (edgesIterator.hasNext()) {
-				Edge edge = (Edge) edgesIterator.next();
-				EditPart endPoint = (EditPart) registry.get(edge.getSource());
-				if (isChildOf(scep, endPoint)) {
-					Object cep = registry.get(edge);
-					if (cep != null) {
-						endPoints.add(cep);
-					}
-					continue;
-				}
-				endPoint = (EditPart) registry.get(edge.getTarget());
-				if (isChildOf(scep, endPoint)) {
-					Object cep = registry.get(edge);
-					if (cep != null) {
-						endPoints.add(cep);
-					}
-				}
-			}
-			return endPoints;
-		}
-
-		/**
-		 * Return <tt>true</tt> if <tt>parent</tt> child's ancestor;
-		 * otherwise <tt>false</tt>
-		 * 
-		 * @param parent
-		 *            parent to consider
-		 * @param child
-		 *            child to consider
-		 * @return <tt>true</tt> or <tt>false</tt>
-		 */
-		protected boolean isChildOf(EditPart parent, EditPart child) {
-			EditPart walker = child;
-			while (walker != null && walker != parent) {
-				walker = walker.getParent();
-			}
-			return walker != null;
-		}
-
-		/**
-		 * gets the supplied editparts containing shape compartment.
-		 * 
-		 * @param ep
-		 *            edit part
-		 * @return <code> ShapeCompartmentEditPart</code>
-		 */
-		protected ShapeCompartmentEditPart getOwningShapeCompartment(EditPart ep) {
-			EditPart walker = ep;
-			while (walker != null
-				&& !(walker instanceof ShapeCompartmentEditPart)) {
-				walker = walker.getParent();
-			}
-			return (ShapeCompartmentEditPart) walker;
-		}
-
-		/**
-         * This method can be overridden to allow connections between border
-         * items around the container of the compartment to be drawn to items
-         * within the interior of the compartment. This method should not return
-         * true for all border items, only for those may be outside of the area
-         * within the shape compartment.
-         * 
-         * @param scep
-         * @param itemEditPart
-         * @return true if the itemEditPart is a border item around or outside
-         *         the shape compartment editpart passed in; false otherwise.
-         */
-        protected boolean isBorderItem(ShapeCompartmentEditPart scep,
-                IGraphicalEditPart itemEditPart) {
-            return false;
-        }
-
-		/**
-		 * Returns source edit part.
-		 * 
-		 * @param connectionEditPart
-		 * @return EditPart
-		 */
-		protected EditPart getSourceEditPart(
-				ConnectionEditPart connectionEditPart) {
-			return connectionEditPart.getSource();
-		}
-
-		/**
-		 * Returns target editPart
-		 * 
-		 * @param connectionEditPart
-		 * @return EditPart
-		 */
-		protected EditPart getTargetEditPart(
-				ConnectionEditPart connectionEditPart) {
-			return connectionEditPart.getTarget();
-		}
-
-		/**
-		 * gets the source connections of the passed edit part
-		 * 
-		 * @param editPart
-		 *            edit part to consider
-		 * @return source connections
-		 */
-		protected List getSourceConnections(IGraphicalEditPart editPart) {
-			return editPart.getSourceConnections();
-		}
-
-		/**
-		 * get the target connections of the passed edit part
-		 * 
-		 * @param editPart
-		 *            edit part to consider
-		 * @return target connection
-		 */
-		protected List getTargetConnections(IGraphicalEditPart editPart) {
-			return editPart.getTargetConnections();
-		}
-
-		/**
-		 * Walks up the hierarchy to make sure that supplied figure is visible
-		 * inside its figure hierarchy. <BR>
-		 * Same as calling <code>isFigureVisible(figure, loc, null);</code>
-		 * 
-		 * @param figure
-		 *            The figure under test.
-		 * @param loc
-		 *            the child's location in absolute coordinates.
-		 * @return boolean visibility of the figure by going up the chain.
-		 */
-		protected boolean isFigureVisible(final IFigure figure, final Point loc) {
-			return isFigureVisible(figure, loc, null);
-		}
-
-		/**
-		 * Walks up the hierarchy to make sure that the point <code>loc</code> is visible
-		 * inside its figure hierarchy. <BR>
-		 * 
-		 * @param figure
-		 *            The figure under test.
-		 * @param loc
-		 *            the child's location in absolute coordinates.
-		 * @param stopFigure
-		 *            root figure in the figure hierarchy being tested.
-		 * @return boolean visibility of the figure by going up the chain.
-		 */
-		protected boolean isFigureVisible(final IFigure figure,
-				final Point loc, final IFigure stopFigure) {
-			if (!(figure.isShowing())) {
-				return false;
-			} else {
-				Rectangle bounds = figure.getBounds().getCopy();
-				figure.translateToAbsolute(bounds);
-				if (!(bounds.contains(loc))) {
-					return false;
-				}
-			}
-
-			IFigure parent = figure.getParent();
-			while (parent != null && parent != stopFigure) {
-				return isFigureVisible(parent, loc, stopFigure);
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * Constructor for ShapeCompartmentEditPart.
-	 * 
-	 * @param view
-	 *            the view <code>controlled</code> by this editpart.
-	 */
-	public ShapeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * Returns the connection refresh manager.
-	 * 
-	 * @return <code>ConnectionRefreshMgr</code>
-	 */
-	protected final ConnectionRefreshMgr getConnectionRefreshMgr() {
-		if (_crMgr == null) {
-			_crMgr = createConnectionRefreshMgr();
-		}
-		return _crMgr;
-	}
-
-	/**
-	 * Factory method to create a refresh connection. This implementation
-	 * returns a {@link ShapeCompartmentEditPart.ConnectionRefreshMgr} instance.
-	 * 
-	 * @return <code>ConnectionRefreshMgr</code>
-	 */
-	protected ConnectionRefreshMgr createConnectionRefreshMgr() {
-		return new ConnectionRefreshMgr();
-	}
-
-	/**
-	 * Returns the layout manager to be used by this shape compartment. This
-	 * implemantion returns a {@link FreeformLayout} instance.
-	 * 
-	 * @return a layout manager.
-	 */
-	protected LayoutManager getLayoutManager() {
-		return new FreeFormLayoutEx();
-	}
-
-	/**
-	 * Creates a scrollpane (with auto scrollbars) in which the children are
-	 * drawn. The factory hint property is used to set this compartments label.
-	 */
-	protected IFigure createFigure() {
-		ShapeCompartmentFigure scf = new ShapeCompartmentFigure(getCompartmentName(), getMapMode());
-		scf.getContentPane().setLayoutManager(getLayoutManager());
-        scf.getContentPane().addLayoutListener(LayoutAnimator.getDefault());
-
-		return scf;
-	}
-
-	/**
-	 * Convenience method to retrieve the shape compartment figure. Same as
-	 * calling <code>(ShapeCompartmentFigure)getCompartmentFigure()</code>.
-	 * 
-	 * @return <code>ShapeCompartmentFigure</code>
-	 */
-	public ShapeCompartmentFigure getShapeCompartmentFigure() {
-		return (ShapeCompartmentFigure) getCompartmentFigure();
-	}
-
-	/** Return the container in which shape editparts are added. */
-	public IFigure getContentPane() {
-		return getShapeCompartmentFigure().getContentPane();
-	}
-
-	/**
-	 * Adds the following editpolicies: <BR>
-	 * <UL>
-	 * <LI> {@link EditPolicyRoles#CREATION_ROLE} :: {@link CreationEditPolicy}
-	 * <LI> {@link EditPolicy#LAYOUT_ROLE} :: {@link XYLayoutEditPolicy}
-	 * <LI> {@link EditPolicy#CONTAINER_ROLE} :: {@link ContainerEditPolicy}
-	 * <LI> {@link EditPolicyRoles#DRAG_DROP_ROLE} ::
-	 * {@link DiagramLinkDragDropEditPolicy}
-	 * <LI> {@link EditPolicy#GRAPHICAL_NODE_ROLE} ::
-	 * {@link ContainerNodeEditPolicy}
-	 * 
-	 * <LI> {@link EditPolicyRoles#SNAP_FEEDBACK_ROLE} ::
-	 * {@link SnapFeedbackPolicy}
-	 * <LI> {@link EditPolicyRoles#DRAG_DROP_ROLE} ::
-	 * {@link ShapeCompartmentDropEditPolicy}
-	 * <LI> {@link EditPolicyRoles#POPUPBAR_ROLE} :: {@link PopupBarEditPolicy}
-	 * </UL>
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE,
-			new CreationEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutEditPolicy());
-		installEditPolicy(EditPolicy.CONTAINER_ROLE, new ContainerEditPolicy());
-		// TODO: this edit policy get overriden by code at the end of this
-		// function
-		// may be this breaks some use cases; it needs to be checked
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
-			new DiagramLinkDragDropEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-			new ContainerNodeEditPolicy());
-		// Install an edit policy for snap
-		installEditPolicy(EditPolicyRoles.SNAP_FEEDBACK_ROLE,
-			new SnapFeedbackPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE,
-			new ShapeCompartmentDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE,
-			new PopupBarEditPolicy());
-	}
-
-	/**
-	 * Handles property change callbacks. All unrecognized events are forwarded
-	 * to the parent class.
-	 * 
-	 * @param event
-	 *            a property change event.
-	 */
-	protected void handlePropertyChangeEvent(PropertyChangeEvent event) {
-		String pName = event.getPropertyName();
-		if (RangeModel.PROPERTY_EXTENT.equals(pName)
-			|| RangeModel.PROPERTY_VALUE.equals(pName)) {
-			refreshConnections();
-		}
-	}
-
-	/**
-	 * Refreshes the connections inside the shape compartment if the supplied
-	 * event is for an element inserted or removed from the editpart.
-	 * 
-	 * @see #refreshConnections()
-	 * @param event
-	 *            a model server event.
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-			|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)) {
-			refreshConnections();
-		} else
-			super.handleNotificationEvent(event);
-
-		if (NotificationUtil.isElementAddedToSlot(event)
-			|| NotificationUtil.isElementRemovedFromSlot(event)) {
-			refreshConnections();
-		}
-	}
-
-	/**
-	 * Refresh the connections associated the the children of this shape
-	 * compartment.
-	 */
-	protected void refreshConnections() {
-		if (!_refreshQueued) {
-			_refreshQueued = true;
-			DisplayUtils.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					forceRefreshConnections();
-				}
-			});
-		}
-	}
-    
-    /**
-     * Refresh the connections associated the the children of this shape
-     * compartment.
-     */
-    protected void forceRefreshConnections() {
-      try {
-            //
-            // test if active since the editpartg may have been
-            // deleted
-            // by the time this method is executed.
-            if (ShapeCompartmentEditPart.this.isActive()) {
-                getConnectionRefreshMgr().refreshConnections(
-                    ShapeCompartmentEditPart.this);
-            }
-        } finally {
-            ShapeCompartmentEditPart.this._refreshQueued = false;
-        }
-        
-    }
-
-	/** Unregisters this instance as a PropertyChangeListener on its figure. */
-	protected void unregister() {
-		super.unregister();
-		getShapeCompartmentFigure().removePropertyChangeListener(this);
-		EditPartViewer viewer = getViewer();
-		if (viewer != null && viewer.getControl() instanceof FigureCanvas) {
-			FigureCanvas figureCanvas = (FigureCanvas) viewer.getControl();
-			figureCanvas.getViewport().getVerticalRangeModel()
-				.removePropertyChangeListener(this);
-			figureCanvas.getViewport().getHorizontalRangeModel()
-				.removePropertyChangeListener(this);
-		}
-	}
-
-	/** Registers this instance as a PropertyChangeListener on its figure. */
-	protected void registerVisuals() {
-		super.registerVisuals();
-		getShapeCompartmentFigure().addPropertyChangeListener(this);
-
-		EditPartViewer viewer = getViewer();
-		if (viewer != null && viewer.getControl() instanceof FigureCanvas) {
-			FigureCanvas figureCanvas = (FigureCanvas) viewer.getControl();
-			figureCanvas.getViewport().getVerticalRangeModel()
-				.addPropertyChangeListener(this);
-			figureCanvas.getViewport().getHorizontalRangeModel()
-				.addPropertyChangeListener(this);
-		}
-	}
-
-	/**
-	 * Determines if the shape compartment supports drag selection of it's
-	 * children. Otherwise, it will default to the core behavior of selecting
-	 * the compartment itself on click on the compartment background surface.
-	 * 
-	 * @return <code>boolean</code> <code>true</code> if shape compartment
-	 *         supports drag selection of it's children, <code>false</code>
-	 *         otherwise.
-	 */
-	protected boolean supportsDragSelection() {
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPart#getDragTracker(org.eclipse.gef.Request)
-	 */
-	public DragTracker getDragTracker(Request req) {
-		if (!supportsDragSelection())
-			return super.getDragTracker(req);
-
-		if (req instanceof SelectionRequest
-			&& ((SelectionRequest) req).getLastButtonPressed() == 3)
-			return new DeselectAllTracker(this) {
-
-				protected boolean handleButtonDown(int button) {
-					getCurrentViewer().select(ShapeCompartmentEditPart.this);
-					return true;
-				}
-			};
-		return new RubberbandDragTracker() {
-
-			protected void handleFinished() {
-				if (getViewer().getSelectedEditParts().isEmpty())
-					getViewer().select(ShapeCompartmentEditPart.this);
-			}
-		};
-	}
-
-	/** Also calls {@link #refreshConnections()}. */
-	protected void refreshVisibility() {
-		super.refreshVisibility();
-        View view  = getNotationView();
-        if (view !=null && !view.isVisible())
-            forceRefreshConnections();
-        else
-            refreshConnections();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	public boolean isSupportingViewActions() {
-		return this.isSupportingViewActions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart#setIsSupportingViewActions(boolean)
-	 */
-	public void setIsSupportingViewActions(boolean supportsViewActions) {
-		this.isSupportingViewActions = supportsViewActions;
-	}
-
-	/**
-	 * Handles the passed property changed event only if the editpart's view is
-	 * not deleted.
-	 */
-	public final void propertyChange(PropertyChangeEvent event) {
-		if (isActive())
-			handlePropertyChangeEvent(event);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart#getPrimaryEditParts()
-	 */
-	public List getPrimaryEditParts() {
-		List connections = new ArrayList();
-
-		Object diagramEditPart = getViewer().getEditPartRegistry().get(
-			getDiagramView());
-
-		List shapes = getChildren();
-		Set connectableEditParts = new HashSet(shapes);
-		Iterator iter = shapes.iterator();
-		while (iter.hasNext()) {
-			getBorderItemEditParts((EditPart) iter.next(), connectableEditParts);
-		}
-
-		if (diagramEditPart instanceof DiagramEditPart) {
-			Iterator diagramConnections = ((DiagramEditPart) diagramEditPart)
-				.getConnections().iterator();
-			while (diagramConnections.hasNext()) {
-				ConnectionEditPart connection = (ConnectionEditPart) diagramConnections
-					.next();
-				if (connectableEditParts.contains(connection.getSource())
-					|| connectableEditParts.contains(connection.getTarget()))
-					connections.add(connection);
-			}
-		}
-
-		if (connections.size() > 0 || shapes.size() > 0) {
-			List primaryEditParts = new ArrayList();
-			primaryEditParts.addAll(shapes);
-			primaryEditParts.addAll(connections);
-			return primaryEditParts;
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	/**
-	 * 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);
-		}
-	}
-    
-    public void addNotify() {
-        addEditPartListener(editpartListener);
-        super.addNotify();
-    }
-
-    public void removeNotify() {
-        removeEditPartListener(editpartListener);
-        super.removeNotify();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart#setCollapsed(boolean, boolean)
-	 */
-	protected void setCollapsed(boolean collapsed, boolean animate) {
-		super.setCollapsed(collapsed, animate);
-		refreshConnections();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeEditPart.java
deleted file mode 100644
index 3cd766e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeEditPart.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.XYLayout;
-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.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-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.SelectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ContainerEditPolicy;
-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.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * the base controler for shapes
- * @author mmostafa, crevells
- *
- */
-public abstract class ShapeEditPart extends TopGraphicEditPart implements IPrimaryEditPart {
-
-    /**
-	 * A <code>ContainerEditPolicy</code> for a <code>ShapeEditPart</code> that
-	 * lays out compartments contained by the host editpart for
-	 * "arrange selection" request.
-	 * <p>
-	 * <b>Note:</b> it is not used by default, because a graph layout algorithm
-	 * may support arrange of 1 node in a graph. Therefore, the expected
-	 * behaviour is non-deterministic and is up to the API client
-	 * 
-	 * @since 2.1
-	 */
-    protected static class ShapeContainerEditPolicy
-        extends ContainerEditPolicy {
-    	
-    	/**
-    	 * Constructor for ShapeContainerEditPolicy
-		 * @since 1.4
-		 */
-    	public ShapeContainerEditPolicy() {
-			super();			
-		}
-    	
-        protected Command getArrangeCommand(ArrangeRequest request) {
-            if (ActionIds.ACTION_ARRANGE_SELECTION.equals(request.getType())
-                || ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION.equals(request
-                    .getType())) {
-                List parts = request.getPartsToArrange();
-                if (parts.size() == 1 && parts.contains(getHost())) {
-                    // Create arrange commands for the compartments within this shape.
-                    CompoundCommand cc = new CompoundCommand();
-                    for (Iterator iterator = getHost().getChildren().iterator(); iterator
-                        .hasNext();) {
-                        Object childEP = iterator.next();
-                        if (childEP instanceof CompartmentEditPart
-                            && ((CompartmentEditPart) childEP).getContentPane()
-                                .getLayoutManager() instanceof XYLayout) {
-                            ArrangeRequest newRequest = createRequest(request,
-                                ((CompartmentEditPart) childEP).getChildren());
-                            cc.add(super.getArrangeCommand(newRequest));
-                        }
-                    }
-                    return cc;
-                }
-            }
-            return super.getArrangeCommand(request);
-        }
-
-        private ArrangeRequest createRequest(ArrangeRequest request,
-                List partsToArrange) {
-            ArrangeRequest newRequest = new ArrangeRequest((String) request
-                .getType(), request.getLayoutType());
-            newRequest.setExtendedData(request.getExtendedData());
-            newRequest.setPartsToArrange(partsToArrange);
-            return newRequest;
-        }
-
-		@Override
-		public EditPart getTargetEditPart(Request request) {
-			return understandsRequest(request) ? getHost() : null;
-		}
-		
-    }
-    
-	/**
-	 * copnstructor
-	 * @param view the view controlled by this edit part
-	 */
-	public ShapeEditPart(View view) {
-		super(view);
-	}
-    
-    
-    protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.CONTAINER_ROLE, new ContainerEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy());
-		installEditPolicy(EditPolicyRoles.POPUPBAR_ROLE, new PopupBarEditPolicy());
-	}
-
-	/**
-	 * gets the location of this edit part's Figure
-	 * @return <code>Point</code>
-	 */
-	final public Point getLocation() {
-		return getFigure().getBounds().getLocation();
-	}
-
-	/**
-	 * gets the size of this edit part's Figure 
-	 * @return <code>Dimension</code>
-	 */
-	final public Dimension getSize() {
-		return getFigure().getBounds().getSize();
-	}
-
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-			|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-			|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-			|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		} 
-		else if (NotationPackage.eINSTANCE.getFillStyle_FillColor().equals(feature)) {
-			Integer c = (Integer) notification.getNewValue();
-			setBackgroundColor(DiagramColorRegistry.getInstance().getColor(c));
-		} 
-		else if (NotationPackage.eINSTANCE.getLineStyle_LineColor().equals(feature)) {
-			Integer c = (Integer) notification.getNewValue();
-			setForegroundColor(DiagramColorRegistry.getInstance().getColor(c));
-		} 
-		else if (NotationPackage.eINSTANCE.getFontStyle().getEAllAttributes().contains(feature))
-			refreshFont();
-		else if (notification.getFeature() == NotationPackage.eINSTANCE.getView_Element()
-		 && ((EObject)notification.getNotifier())== getNotationView())
-			handleMajorSemanticChange();
-        else if (notification.getEventType() == EventType.UNRESOLVE && hasNotationView()){
-            // make sure we refresh if the unresolved element is the edit
-            // part's semantic element the comparison should be id based not
-            // instance based, since get element will resolve the element
-            // and resolving the element will  result in returning a different
-            // instance than the proxy we had as a notifier
-            EObject notifier = (EObject) notification.getNotifier();
-            EObject viewElement = getNotationView().getElement();
-            if (viewElement!=null){
-                String id1 = EMFCoreUtil.getProxyID(notifier);
-                String id2 = EMFCoreUtil.getProxyID(viewElement);
-                if (id1.equals(id2)) {
-                    handleMajorSemanticChange();
-                }
-            }
-         }
-         else
-			super.handleNotificationEvent(notification);
-	}
-
-	
-	/**
-	 * refresh the bounds 
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		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));
-	}
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-		refreshBackgroundColor();
-		refreshForegroundColor();
-		refreshFont();
-	}
-
-	/**
-	 * Return the editpolicy to be installed as an <code>EditPolicy#PRIMARY_DRAG_ROLE</code>
-	 * role.  This method is typically called by <code>LayoutEditPolicy#createChildEditPolicy()</code>
-	 * @return EditPolicy
-	 */
-	public EditPolicy getPrimaryDragEditPolicy() {
-		EditPolicy policy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		return policy != null ? policy : new ResizableShapeEditPolicy();
-	}
-
-    public EditPart getTargetEditPart(Request request) {
-
-        if (RequestConstants.REQ_SELECTION == request.getType()
-            && getParent() instanceof GroupEditPart) {
-            
-            // If the shape is already selected then do not give up selection to
-            // the group.
-            if (getSelected() != SELECTED_NONE) {
-                return super.getTargetEditPart(request);
-            }
-
-            GroupEditPart groupEP = (GroupEditPart) getParent();
-
-            // Normally when a shape is not selected, the right-mouse button
-            // will cause the shape to be selected and the context menu to show.
-            // If the shape is in a group, we do not want this behavior as we
-            // want the context menu of the group to show.
-            if (getSelected() == SELECTED_NONE
-                && (request instanceof SelectionRequest)
-                && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-                return groupEP.getTargetEditPart(request);
-            }
-          
-            // If the group is currently selected, then this is the second click
-            // then the shape should be selected.
-            if (groupEP.getSelected() != SELECTED_NONE) {
-                return super.getTargetEditPart(request);
-            }
-
-            // If any of the group's children are currently selected then the
-            // selection of another child of the group will result in the child
-            // being selected and not the group.
-            for (Iterator iter = groupEP.getChildren().iterator(); iter
-                .hasNext();) {
-                EditPart childEP = (EditPart) iter.next();
-                if (childEP.getSelected() != SELECTED_NONE) {
-                    return super.getTargetEditPart(request);
-                }
-
-            }
-
-            // otherwise we want the group to get selected
-            return groupEP.getTargetEditPart(request);
-        }
-
-        return super.getTargetEditPart(request);
-    }
-
-     
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeNodeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeNodeEditPart.java
deleted file mode 100644
index 077d5ec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeNodeEditPart.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-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.editpolicies.ConnectionHandleEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SortFilterCompartmentItemsEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.NoteAttachmentReorientEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Anchor;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.IdentityAnchor;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.datatype.GradientData;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * The shape node controller
- * @author mmostafa
- */
-public abstract class ShapeNodeEditPart
-	extends ShapeEditPart
-	implements INodeEditPart {
-
-	/**
-	 * constructor
-	 * @param view the view controlled by this edit part
-	 */
-	public ShapeNodeEditPart(View view) {
-		super(view);
-	}
-
-	protected List getModelSourceConnections() {
-        return ViewUtil.getSourceConnectionsConnectingVisibleViews((View)getModel());
-	}
-
-	protected List getModelTargetConnections() {
-        return ViewUtil.getTargetConnectionsConnectingVisibleViews((View)getModel());
-	}
-
-	protected void createDefaultEditPolicies() {
-		// node edit policy needs to be installed before component editpolicy
-		// from the super
-		// since connections of a node need to be deleted before the node
-		//installEditPolicy(EditPolicy.NODE_ROLE, new NodeEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-			new GraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.SORT_FILTER_ROLE,
-			new SortFilterCompartmentItemsEditPolicy());
-			installEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE,
-				new ConnectionHandleEditPolicy());
-
-        // Disable note attachment reorient between two shapes where neither is a note.
-        installEditPolicy("NoteAttachmentReorient", //$NON-NLS-1$
-            new NoteAttachmentReorientEditPolicy());
-	}
-
-	protected final IFigure createFigure() {
-		return createNodeFigure();
-	}
-
-	/**
-	 * creates a node figure
-	 * @return <code>NodeFigure</code>
-	 */
-	abstract protected NodeFigure createNodeFigure();
-
-	/**
-	 * getter for the node Figure
-	 * @return <code>NodeFigure</code>
-	 */
-	protected NodeFigure getNodeFigure() {
-		return (NodeFigure) getFigure();
-	}
-
-	/*
-	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(
-			ConnectionEditPart connEditPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = 
-            (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart)connEditPart;
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-				public void run() {
-					Anchor a = connection.getEdge().getSourceAnchor();
-					if (a instanceof IdentityAnchor)
-						setResult(((IdentityAnchor) a).getId());
-                    else
-                        setResult(""); //$NON-NLS-1$
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getSourceConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getSourceConnectionAnchor", e); //$NON-NLS-1$
-		}
-		return getNodeFigure().getConnectionAnchor(t);
-	}
-
-	/*
-	 * @see org.eclipse.gef.NodeEditPart#getSourceConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	public ConnectionAnchor getSourceConnectionAnchor(Request request) {
-		if (request instanceof ReconnectRequest) {
-			if (((DropRequest) request).getLocation() == null) {
-				return getNodeFigure().getSourceConnectionAnchorAt(null);
-			}
-			Point pt = ((DropRequest) request).getLocation().getCopy();
-			return getNodeFigure().getSourceConnectionAnchorAt(pt);
-		}
-		else if (request instanceof DropRequest){
-			return getNodeFigure().getSourceConnectionAnchorAt(
-				((DropRequest) request).getLocation());
-		}
-		return getNodeFigure().getSourceConnectionAnchorAt(null);
-	}
-
-	/*
-	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.ConnectionEditPart)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(
-			ConnectionEditPart connEditPart) {
-        final org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart connection = 
-            (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart)connEditPart;
-        
-		String t = ""; //$NON-NLS-1$
-		try {
-			t = (String) getEditingDomain().runExclusive(
-				new RunnableWithResult.Impl() {
-
-				public void run() {
-					Anchor a = connection.getEdge().getTargetAnchor();
-					if (a instanceof IdentityAnchor)
-						setResult(((IdentityAnchor) a).getId());
-                    else
-                        setResult(""); //$NON-NLS-1$
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getTargetConnectionAnchor", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getTargetConnectionAnchor", e); //$NON-NLS-1$
-		}
-
-		return getNodeFigure().getConnectionAnchor(t);
-	}
-
-	/*
-	 * @see org.eclipse.gef.NodeEditPart#getTargetConnectionAnchor(org.eclipse.gef.Request)
-	 */
-	public ConnectionAnchor getTargetConnectionAnchor(Request request) {
-		if (request instanceof ReconnectRequest) {
-			if (((DropRequest) request).getLocation() == null) {
-				return getNodeFigure().getTargetConnectionAnchorAt(null);
-			}
-			Point pt = ((DropRequest) request).getLocation().getCopy();
-			return getNodeFigure().getTargetConnectionAnchorAt(pt);
-		}
-		else if (request instanceof DropRequest){
-			return getNodeFigure().getTargetConnectionAnchorAt(
-				((DropRequest) request).getLocation());
-		}
-		return getNodeFigure().getTargetConnectionAnchorAt(null);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapConnectionAnchorToTerminal(ConnectionAnchor)
-	 */
-	final public String mapConnectionAnchorToTerminal(ConnectionAnchor c) {
-		return getNodeFigure().getConnectionAnchorTerminal(c);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart#mapTerminalToConnectionAnchor(String)
-	 */
-	final public ConnectionAnchor mapTerminalToConnectionAnchor(String terminal) {
-		return getNodeFigure().getConnectionAnchor(terminal);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getView_SourceEdges().equals(feature))
-			refreshSourceConnections();
-		else if (NotationPackage.eINSTANCE.getView_TargetEdges().equals(feature))
-			refreshTargetConnections();
-		else if (NotationPackage.eINSTANCE.getFillStyle_Gradient().equals(feature) ||
-				NotationPackage.eINSTANCE.getFillStyle_FillColor().equals(feature)) {				
-			refreshBackgroundColor();
-		} else if (NotationPackage.eINSTANCE.getFillStyle_Transparency().equals(feature)) {
-			refreshTransparency();			
-		} else {
-			super.handleNotificationEvent(notification);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.INoteableEditPart#canAttachNote()
-	 */
-	public boolean canAttachNote() {
-		return true;
-	}
-	
-	/**
-	 * Refresh the editpart's figure background color. Background color can be gradient, if
-	 * supported.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#refreshBackgroundColor()
-	 * @since 1.2
-	 */
-    protected void refreshBackgroundColor() {
-        FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
-        if ( style != null ) {
-        	if (style.getGradient() == null || !supportsGradient()) { 
-        		setBackgroundColor(DiagramColorRegistry.getInstance().getColor(Integer.valueOf(style.getFillColor())));
-        	} else {
-        		setGradient(style.getGradient());
-        	}        	
-        }
-    }
-    
-    /**
-     * Refresh figure's background transparency.
-     * @since 1.2
-     */
-    protected void refreshTransparency() {
-        FillStyle style = (FillStyle)getPrimaryView().getStyle(NotationPackage.Literals.FILL_STYLE);
-        if ( style != null ) {    	
-        	setTransparency(style.getTransparency());
-        }
-    }
-    
-	/**
-	 * Sets the figure's background color, and also indicates to the figure that
-	 * gradient should not be used.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setBackgroundColor(org.eclipse.swt.graphics.Color)
-	 * @since 1.2
-	 */
-	protected void setBackgroundColor(Color c) {
-		NodeFigure fig = getNodeFigure();
-		fig.setBackgroundColor(c);
-		fig.setIsUsingGradient(false);
-		fig.setGradientData(-1, -1, 0);
-	}
-    
-    /**
- 	 * Sets the figure's gradient data, and also indicates to the figure that
-	 * gradient should be used for fill.
-     * 
-     * @param gradient GradientData object
-     * @since 1.2
-     */
-    protected void setGradient(GradientData gradient) {
-    	NodeFigure fig = getNodeFigure();
-    	if (gradient != null) {    		    		
-    		fig.setIsUsingGradient(true);
-    		fig.setGradientData(gradient.getGradientColor1(), gradient.getGradientColor2(), gradient.getGradientStyle()); 		
-    	} else {
-    		fig.setIsUsingGradient(false);
-    	}
-    }
-    
-	/**
-	 * Sets the figures background transparency. Value of -1 indicates that
-	 * transparency is not supported and will not have effect.
-	 * 
-	 * @param transp
-	 * @since 1.2
-	 */
-    protected void setTransparency(int transp) {
-		NodeFigure fig = getNodeFigure();
-		fig.setTransparency(transp);
-    }
-    
-	/**
-	 * Returns true if gradient is supported, false, otherwise. By default, this
-	 * method returns false. In order for gradient to be fully supported, figure
-	 * must support it in addition to the EditPart support. Clients who do
-	 * support gradient fully should override this method to return true. This
-	 * method can be used by UI as an indication if gradient should be available or
-	 * not.
-	 * 
-	 * @return true if gradient is supported, false otherwise
-	 * @since 1.2
-	 */
-	public boolean supportsGradient() {
-		return false;
-	}    
-
-	/**
-	 * Returns true if rounded corners is supported, false, otherwise. By
-	 * default, this method returns false. Clients who do support rounded
-	 * corners should override this method to return true. This method can be
-	 * used by UI as an indication if rounded corners should be available or
-	 * not. Note that rounded corners style is part of line style, meaning that
-	 * most or all shapes will have it installed (but not all of them will support it) 
-	 * 
-	 * @return true if rounded corners style is supported, false otherwise
-	 * @since 1.4
-	 */	
-	public boolean supportsRoundedCorners() {
-		return false;
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java
deleted file mode 100644
index c9fe4dc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- * 	  Dmitry Stadnik (Borland) - contribution for bugzilla 135694
- *	  Dmitry Stadnik (Borland) - contribution for bugzilla 136582
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editparts;
-
-import java.beans.PropertyChangeEvent;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-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.parser.CommonParserHint;
-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.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.TextStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The controller for the text compartment.
- * 
- * @author mmostafa
- */
-public class TextCompartmentEditPart extends CompartmentEditPart implements ITextAwareEditPart {
-	
-	/** the direct edit manager for text editing */
-	private DirectEditManager manager;
-	/** the text parser */
-	protected IParser parser;
-	/** the text parser options */
-	private ParserOptions parserOptions;
-	/** the element to listen to as suggested by the parser*/
-	private List parserElements = null;
-	/** the number of icons in the text label */
-	private int numIcons = 0;
-
-	/** Label that is displayed as the tooltip. */
-	private Label toolTipLabel = new Label();
-	  
-	private ILabelDelegate labelDelegate;
-
-	/**
-	 * coinstructor
-	 * @param view the view controlled by this edit part
-	 */
-	public TextCompartmentEditPart(EObject model) {
-		super(model);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-			EditPolicy.DIRECT_EDIT_ROLE,
-			new LabelDirectEditPolicy());
-		// Text Compartment do not handle creation request for views
-		removeEditPolicy(EditPolicyRoles.CREATION_ROLE);
-		
-	}
-
-    /**
-     * Override to use a different figure for this editpart.
-     * <p>
-     * IMPORTANT NOTES:
-     * <li> If you override this to create a different type of figure, you
-     * should also override {@link #createLabelDelegate()} and make sure you no
-     * longer call {@link #getLabel()}.
-     * <li> Do not call {@link #getLabelDelegate()} from within this method. Any
-     * initialization of the label delegate should be done in the
-     * {@link #createLabelDelegate()} method.
-     * </p>
-     */
-    protected IFigure createFigure() {
-        return createWrapLabel();
-    }
-    
-    /**
-     * @return WrapLabel, the created wrap label
-     * @deprecated This method has been deprecated to remove the assumption that
-     *             the figure of a <code>TextCompartmentEditPart</code> is a
-     *             <code>WrapLabel</code>. Create your figure in the
-     *             {@link #createFigure()} method instead and don't forget to
-     *             stop calling {@link #getLabel()}.
-     */
-    protected WrapLabel createWrapLabel() {
-        // alignment properties are set in createLabelDelegate().
-        return new WrapLabel();
-    }
-    
-    /**
-     * Creates the label delegate that will be used to interact with the label
-     * figure.
-     * <p>
-     * Note: If you have overridden {@link #createFigure()} to create a
-     * different type of figure, you need to also override this method to return
-     * the appropriate type of <code>LabelDelegate</code>.
-     * 
-     * @return the new label delegate
-     * @since 2.1
-     */
-    protected ILabelDelegate createLabelDelegate() {
-
-        // just in case the client has overridden getLabel()...
-        WrapLabel label = getLabel();
-        ILabelDelegate newLabelDelegate = null;
-        if (label != null) {
-            newLabelDelegate = new WrappingLabelDelegate(label);
-        } else {
-
-            // this should be a WrappingLabel since this is what is created in
-            // createFigure()...
-            newLabelDelegate = new WrappingLabelDelegate(
-                (WrappingLabel) getFigure());
-        }
-
-        newLabelDelegate.setTextJustification(PositionConstants.CENTER);
-        newLabelDelegate.setAlignment(PositionConstants.CENTER);
-        newLabelDelegate.setTextAlignment(PositionConstants.TOP);
-        return newLabelDelegate;
-    }
-    
-    public IFigure getFigure() {
-        if (figure == null) {
-            setFigure(createFigure());
-            setLabelDelegate(createLabelDelegate());
-        }
-        return figure;
-    }
-
-    /**
-     * Returns the label delegate that can be used to interact with the label
-     * figure.
-     * 
-     * @return the label delegate
-     * @since 2.1
-     */
-    public ILabelDelegate getLabelDelegate() {
-        if (labelDelegate == null) {
-            // this means that getFigure() has never been called as getFigure()
-            // sets the label delegate. Call getFigure() first.
-            getFigure();
-
-            // check if the label delegate is null, just in case getFigure() was
-            // overridden
-            if (labelDelegate == null) {
-                setLabelDelegate(createLabelDelegate());
-            }
-
-            return labelDelegate;
-        }
-        return labelDelegate;
-    }
-
-    /**
-     * Sets the label delegate.
-     * 
-     * @param labelDelegate
-     *            the label delegate to be set
-     * @since 2.1
-     */
-    protected void setLabelDelegate(ILabelDelegate labelDelegate) {
-        this.labelDelegate = labelDelegate;
-    }
-    
-    public Object getAdapter(Class key) {
-        if (key == ILabelDelegate.class) {
-            return getLabelDelegate();
-        }
-        return super.getAdapter(key);
-    }  
-	
-	/**
-     * This should be used instead of getFigure() to get the figure
-     * 
-     * @return Return the WrapLabel for the TextCompartment
-     * @deprecated This method has been deprecated to remove the assumption that
-     *             the figure of a <code>TextCompartmentEditPart</code> is a
-     *             <code>WrapLabel</code>. Use {@link #getLabelDelegate()} if
-     *             the behavior you need is available from the label delegate,
-     *             if not use {@link #getFigure()} and cast to the type of label
-     *             that you created in the {@link #createFigure()} method.
-     */
-    public WrapLabel getLabel() {
-        return (WrapLabel) getFigure();
-    }
-
-	/**
-	 * gets the label Icon for this edit part
-	 * @param index the index to use
-	 * @return Image
-	 */
-	protected Image getLabelIcon(int index) {
-		return null;
-	}
-
-	/**
-	 * gets the label text
-	 * @return the lebel text
-	 */
-	protected String getLabelText() {
-		EObject element = resolveSemanticElement();
-		return (element == null) ? null
-			: (getParser() == null) ? null
-				: getParser().getPrintString(new EObjectAdapter(element),
-					getParserOptions().intValue());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getEditText()
-	 */
-	public String getEditText() {
-		EObject element = resolveSemanticElement();
-		return (element == null) ? "" //$NON-NLS-1$
-		: getParser().getEditString(
-			new EObjectAdapter(element),
-			getParserOptions().intValue());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#editTextModified(java.lang.String)
-	 */
-	public void setLabelText(String text) {
-        getLabelDelegate().setText(text);
-	}
-
-	/* 
-     * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getCompletionProcessor()
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		EObject element = resolveSemanticElement();
-		if (element != null) {
-			return getParser().getCompletionProcessor(new EObjectAdapter(element));
-		}
-		return null;
-	}
-
-	private boolean canParse() {
-		return getEditText() != null;
-	}
-
-	/* 
-     * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getEditTextValidator()
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = resolveSemanticElement();
-
-					final IParser theParser = getParser();
-					try {
-						IParserEditStatus isValid = (IParserEditStatus) getEditingDomain()
-							.runExclusive(new RunnableWithResult.Impl() {
-
-									public void run() {
-										setResult(theParser.isValidEditString(
-											new EObjectAdapter(element),
-											(String) value));
-									}
-								});
-						return isValid.getCode() == ParserEditStatus.EDITABLE ? null
-							: isValid.getMessage();
-					} catch (InterruptedException e) {
-						Trace.catching(DiagramUIPlugin.getInstance(),
-							DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-							getClass(), "getEditTextValidator", e); //$NON-NLS-1$
-						Log.error(DiagramUIPlugin.getInstance(),
-							DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-							"getEditTextValidator", e); //$NON-NLS-1$
-					}
-
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/* 
-     * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getParserOptions()
-	 */
-	public final ParserOptions getParserOptions() {
-		if (parserOptions == null)
-			parserOptions = buildParserOptions();
-		return parserOptions;
-	}
-
-	/**
-	 * Builds the parser options. 
-	 * @return ParserOptions the parser options
-	 */
-	protected ParserOptions buildParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * Builds the parser options.
-	 */
-	protected final void refreshParserOptions() {
-		parserOptions = buildParserOptions();
-	}
-
-	/**
-	 * Determines if the given event affects the paser options
-	 * 
-	 * @param evt The event in question
-	 * @return whether the given event affects the parser options
-	 */
-	protected boolean isAffectingParserOptions(PropertyChangeEvent evt) {
-		return false;
-	}
-	
-	/**
-	 * Determines if the given Notification affects the paser options
-	 * 
-	 * @param evt The notification in question
-	 * @return whether the given notification affects the parser options
-	 */
-	protected boolean isAffectingParserOptions(Notification evt) {
-		return false;
-	}
-
-
-	/**
-	 * Method getLabelToolTip.
-	 * @return IFigure
-	 */
-	protected IFigure getLabelToolTip() {
-		String text = getToolTipText();
-		if (text != null && text.length() > 0) {
-			toolTipLabel.setText(text);
-			return toolTipLabel;
-		}
-		return null;
-	}
-
-	/**
-	 * This method can be overridden in the subclass to return
-	 * text for the tooltip.  
-	 * @return String the tooltip
-	 */
-	protected String getToolTipText() {
-		return null;
-	}
-
-	/**
-	 * check if this edit part is editable or not
-	 * @return true or false
-	 */
-	protected boolean isEditable() {
-		EObject element = resolveSemanticElement();
-		if (element != null && canParse()) {
-			return true;
-		}
-		return false;
-	}
-    
-
-	/**
-	 * performas direct edit
-	 */
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-
-	/**
-	 * Performs direct edit and will initiate another mouse click 
-	 * event so that the cursor will appear under the mouse
-	 * 	 
-	 *  @param eventLocation
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager().getClass() == TextDirectEditManager.class) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		} else {
-            performDirectEdit();
-		}
-	}
-	
-	/**
-	 * 
-	 * Performs direct edit setting the initial text to be the initialCharacter
-	 * 
-	 * @param initialCharacter
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		// Run the TextDirectEditManager show with the initial character
-		// This will not send an extra mouse click
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-    
-    private void showEditPart(){
-        EditPart parent = getParent();
-        if (parent!=null){
-            EditPartViewer viewer = parent.getViewer();
-            if (viewer!=null){
-                viewer.reveal(this);
-            }
-        }
-    }
-
-	
-	/**
-	 * 
-	 * Performs direct edit request based on request type
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#performDirectEditRequest(org.eclipse.gef.requests.DirectEditRequest)
-	 */
-	protected void performDirectEditRequest(Request request) {
-
-		final Request theRequest = request;
-
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-                        showEditPart();
-						// IF the direct edit request has an initial character...
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {							
-							Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else { // Some other Request
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"performDirectEditRequest", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"performDirectEditRequest", e); //$NON-NLS-1$
-		}
-
-	}
-
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} 
-		else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature))
-			refreshUnderline();
-		else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature))
-			refreshStrikeThrough();
-		else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || 
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} 
-		else if (NotationPackage.eINSTANCE.getTextStyle_TextAlignment().equals(feature))
-			refreshTextAlignment();
-		else if (isAffectingParserOptions(event)) {
-			refreshParserOptions();
-			refreshLabel();
-			
-		} else if (getParser() != null) {
-			
-			boolean sematicsAffected = getParser() instanceof ISemanticParser
-					&& ((ISemanticParser) getParser())
-							.areSemanticElementsAffected(null, event);
-							
-			boolean parserAffected = getParser().isAffectingEvent(event,
-					getParserOptions().intValue());
-
-			if (sematicsAffected) {
-				removeSemanticListeners();
-				
-				if (resolveSemanticElement() != null) {
-					addSemanticListeners();
-				}
-			}
-			
-			if (sematicsAffected || parserAffected) {
-				refreshLabel();
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshParserOptions();
-		refreshLabel();
-        refreshFont();
-		refreshUnderline();
-		refreshStrikeThrough();
-		refreshFontColor();
-		refreshTextAlignment();
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#refreshFont()
-     */
-    protected void refreshFont() {
-        FontStyle style = (FontStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-        FontData fontData = null;
-        
-        if (style != null) {
-            fontData = new FontData(
-                style.getFontName(), 
-                style.getFontHeight(), 
-                (style.isBold() ? SWT.BOLD : SWT.NORMAL) | 
-                (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-        } else {
-            // initialize font to defaults
-            fontData =
-                PreferenceConverter.getFontData(
-                    (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore(),
-                    IPreferenceConstants.PREF_DEFAULT_FONT);
-        }
-        
-        setFont(fontData);
-    }
-
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject semanticElement = resolveSemanticElement();
-			parserElements =
-				((ISemanticParser) getParser()).getSemanticElementsBeingParsed(semanticElement);
-
-			for (int i = 0; i < parserElements.size(); i++)
-				addListenerFilter("SemanticModel" + i, this,(EObject)parserElements.get(i)); //$NON-NLS-1$
-
-		} else 
-			super.addSemanticListeners();
-	}
-
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++)
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-		} else
-			super.removeSemanticListeners();
-	}
-
-	/**
-	 * getter for the Num Icons
-	 * @return num icons
-	 */
-	public int getNumIcons() {
-		return numIcons;
-	}
-
-	/**
-	 * setter for the num icons
-	 * @param numIcons
-	 */
-	public void setNumIcons(int numIcons) {
-		this.numIcons = numIcons;
-	}
-
-	protected List getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/* 
-     * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart#getParser()
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			String parserHint = ((View)getModel()).getType();
-			EObject element = resolveSemanticElement();
-			if (element != null) {
-				ParserHintAdapter hintAdapter =
-					new ParserHintAdapter(element, parserHint);
-				parser = ParserService.getInstance().getParser(hintAdapter);
-			}
-		}
-		return parser;
-	}
-
-	/**
-	 * Will update the tool tip text for the figure and also the icons for the label.  In additional
-	 * it will apply any font constraints to the label based on the type of Text Compartment we
-	 * are dealing with.
-	 * Any body overriding this method should either can this super.refreshLabel() or
-	 * call applyFontContraintsToLabel() to ensure the the proper font constraints are apply to
-	 * the label.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart#refreshLabel()
-	 */
-	protected void refreshLabel() {
-		// refreshes the label text
-		getLabelDelegate().setText(getLabelText());
-
-		// refreshes the label icon(s)
-		for (int i = 0; i < numIcons; i++)
-			getLabelDelegate().setIcon(getLabelIcon(i), i);
-
-		// refreshes the label tool tip
-		getFigure().setToolTip(getLabelToolTip());
-	}
-
-	/**
-	 * Refreshes the font underline property
-	 */
-	protected void refreshUnderline() {
-		FontStyle style = (FontStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null)
-			getLabelDelegate().setTextUnderline(style.isUnderline());
-	}
-
-	/**
-	 * Refreshes the font underline property
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style = (FontStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null)
-			getLabelDelegate().setTextStrikeThrough(style.isStrikeThrough());
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#getAccessibleEditPart()
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null)
-			accessibleEP = new AccessibleGraphicalEditPart() {
-			public void getName(AccessibleEvent e) {
-                ILabelDelegate label = getLabelDelegate();
-                if (label != null) {
-                    e.result = label.getText();
-                }
-
-			}
-		};
-		return accessibleEP;
-	}
-
-	/**
-	 * There is no children to text compartments 
-	 * 
-	 * @param semanticHint
-	 * @return IGraphicalEditPart
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-	/**
-	 * @return Returns the manager.
-	 *
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null)
-			setManager(
-				new TextDirectEditManager(
-					this));
-		return manager;
-	}
-	/**
-	 * @param manager The manager to set.
-	 * 
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-	
-	/**
-	 * gets the primary child view for this edit part, this is usually used
-	 * by direct edit requests, to see where the edit will happen
-	 * @return <code>View</code>
-	 */
-	public View getPrimaryChildView(){
-		if (getModel()!=null){
-			View view = (View)getModel();
-			return ViewUtil.getChildBySemanticHint(view,CommonParserHint.DESCRIPTION);
-		}
-		return null;
-	}
-
-	/**
-	 * Refreshes the text alignment property
-	 */
-	protected void refreshTextAlignment() {
-		TextStyle style = (TextStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getTextStyle());
-		if (style != null) {
-			if (style.getTextAlignment() == TextAlignment.RIGHT_LITERAL) {
-				getLabelDelegate().setTextJustification(PositionConstants.RIGHT);
-			} else if (style.getTextAlignment() == TextAlignment.CENTER_LITERAL) {
-				getLabelDelegate().setTextJustification(PositionConstants.CENTER);
-			} else {
-				// default to TextAlignment.LEFT_LITERAL
-				getLabelDelegate().setTextJustification(PositionConstants.LEFT);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.java
deleted file mode 100644
index b696273..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.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.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-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.editpolicies.ConstrainedToolbarLayoutEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IContainedEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * the top graphic controller
- * @author mmostafa
- *
- */
-public abstract class TopGraphicEditPart extends GraphicalEditPart implements IContainedEditPart {
-
-	/**
-	 * constructor
-	 * @param view the view controlled by this edit part 
-	 */
-	public TopGraphicEditPart(View view) {
-		super(view);
-	}
-
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(
-			EditPolicy.LAYOUT_ROLE,
-			new ConstrainedToolbarLayoutEditPolicy());
-	}
-
-	/**
-	 * Return a list of all resizable Compartment edit parts that exist in the
-	 * children list of this edit part
-	 * getResizableCompartments()
-	 * @return List of <code>EditPart<code>
-	 */
-	public List getResizableCompartments() {
-		List resizableChildren = new ArrayList();
-	    Iterator it = getChildren().iterator();
-	    while( it.hasNext() ) {
-	        Object child = it.next();
-	        if ( child instanceof ResizableCompartmentEditPart) {
-				resizableChildren.add( child );
-	        }
-	    }
-	    
-		return resizableChildren;
-	}
-	
-	/**
-	 * Gets all children, of this <code>EditPart<code>'s model, that had a 
-	 * <code>DrawerStyle</code> installed on them 
-	 * @return List of <code>View<code>s
-	 */
-	public List getResizableNotationViews() {
-		View view = getNotationView();
-		if (view!=null){
-			List resizableChildren = new ArrayList();
-			Iterator childrenIterator = view.getChildren().iterator();
-			while (childrenIterator.hasNext()){
-				View child = (View)childrenIterator.next();
-				if (child instanceof Node &&
-					((Node)child).getStyle(NotationPackage.eINSTANCE.getDrawerStyle())!=null){
-					resizableChildren.add(child);
-				}
-			}
-			return resizableChildren;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#performDirectEditRequest(org.eclipse.gef.requests.DirectEditRequest)
-	 */
-	protected void performDirectEditRequest(Request request) {
-		EditPart editPart = this;
-		if (request instanceof DirectEditRequest){
-			Point p = new Point(((DirectEditRequest)request).getLocation());
-			getFigure().translateToRelative(p);
-			IFigure fig = getFigure().findFigureAt(p);
-			editPart =(EditPart) getViewer().getVisualPartMap().get(fig);
-		}
-		if (editPart == this) {
-			try {
-				editPart = (EditPart) getEditingDomain().runExclusive(
-					new RunnableWithResult.Impl() {
-
-						public void run() {
-							setResult(getPrimaryChildEditPart());
-						}
-					});
-			} catch (InterruptedException e) {
-				Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"performDirectEditRequest", e); //$NON-NLS-1$
-				Log.error(DiagramUIPlugin.getInstance(),
-					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-					"performDirectEditRequest", e); //$NON-NLS-1$
-			}
-			if (editPart != null){
-				editPart.performRequest(request);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPart#understandsRequest(org.eclipse.gef.Request)
-	 */
-	public boolean understandsRequest(Request req) {
-		return RequestConstants.REQ_DIRECT_EDIT == req.getType()
-			|| super.understandsRequest(req);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeContainerEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeContainerEditPart.java
deleted file mode 100644
index cf7f818..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeContainerEditPart.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Implementation for the regular tree edit part
- * 
- * @author melaasar
- */
-public class TreeContainerEditPart extends TreeEditPart {
-
-	/**
-	 * Constructor
-	 * @param model
-	 */
-	public TreeContainerEditPart(Object model) {
-		super(model);
-	}
-
-	/**
-	 * Returns the children of this from the model,
-	 * as this is capable enough of holding EditParts.
-	 *
-	 * @return  List of children.
-	 */
-	protected List getModelChildren() {
-		if (getModel() instanceof View)
-			return new ArrayList(((View) getModel()).getChildren());
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.TreeEditPart#handlePropertyChangeEvent(java.beans.PropertyChangeEvent)
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getView_PersistedChildren()==feature||
-			NotationPackage.eINSTANCE.getView_TransientChildren()==feature)
-			refreshChildren();
-		else
-			super.handleNotificationEvent(event);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeDiagramEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeDiagramEditPart.java
deleted file mode 100644
index 103ad22..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeDiagramEditPart.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editparts;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * Tree edit part customized for a diagram.
- *
- * @author schafe
- */
-public class TreeDiagramEditPart extends TreeContainerEditPart{
-	
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
-	 */
-	protected void createEditPolicies() {
-		removeEditPolicy(EditPolicy.COMPONENT_ROLE);
-	}
-	
-	/**
-	 * Constructor
-	 * @param model
-	 */
-	public TreeDiagramEditPart(Object model) {
-		super(model);
-	}
-
-	protected void handleNotificationEvent(Notification event) {
-		if (NotationPackage.Literals.DIAGRAM__NAME.equals(event.getFeature())) {
-			refreshVisuals();
-		} else {
-			super.handleNotificationEvent(event);
-		}
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java
deleted file mode 100644
index 36c4293..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TreeEditPart.java
+++ /dev/null
@@ -1,272 +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.editparts;
-
-import org.eclipse.core.runtime.IAdaptable;
-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.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.services.action.filter.ActionFilterService;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconOptions;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.DescriptionStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IActionFilter;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * @author melaasar, mmostafa
- */
-public class TreeEditPart
-    extends AbstractTreeEditPart
-    implements NotificationListener, IEditingDomainProvider {
-
-    /** the element parser */
-    private IParser parser;
-
-    /** the element parser */
-    private IAdaptable referenceAdapter;
-    
-    private EObject[] objectListenningTo = new EObject[2];
-
-    /**
-     * Cache the editing domain after it is retrieved.
-     */
-    private TransactionalEditingDomain editingDomain;
-
-    /**
-     * Constructor
-     * @param model
-     */
-    public TreeEditPart(Object model) {
-        super(model);
-        
-        EObject reference = ((View)model).getElement();
-        if (reference == null) {
-        
-            this.referenceAdapter = new EObjectAdapter((EObject)model);
-        } else {
-            this.referenceAdapter =
-                new EObjectAdapter(reference);
-        }
-    }
-
-    /**
-     * @see org.eclipse.gef.EditPart#activate()
-     */
-    public void activate() {
-        if (isActive())
-            return;
-        super.activate();
-        View view = (View)getModel();
-        EObject semanticElement = getSemanticElement();
-        getDiagramEventBroker().addNotificationListener(view,this);
-        getDiagramEventBroker().addNotificationListener(semanticElement,this);
-        objectListenningTo[0] = view ;
-        objectListenningTo[1] = semanticElement;
-    }
-
-    /**
-     * @see org.eclipse.gef.EditPart#deactivate()
-     */
-    public void deactivate() {
-        if (!isActive())
-            return;
-        for (int index = 0; index < objectListenningTo.length; index++) {
-            getDiagramEventBroker().removeNotificationListener( objectListenningTo[index],this);
-            objectListenningTo[index] = null;
-        }
-        super.deactivate();
-    }
-
-    /** gets the model as a <code>View</code>
-     * @return View
-     */
-    protected View getNotationView() {
-        if (getModel() instanceof View)
-            return (View)getModel();
-        return null;
-    }
-
-    /**
-     * Return the editpart's underlying semantic element.
-     * @return semantic element
-     */
-    protected EObject getSemanticElement() {
-        return ViewUtil.resolveSemanticElement((View)getModel());
-    }
-
-    /**
-     * @see org.eclipse.gef.editparts.AbstractTreeEditPart#getImage()
-     */
-    protected Image getImage() {
-        if (referenceAdapter == null){
-            return null;
-        }
-        IconOptions options = new IconOptions();
-        options.set(IconOptions.GET_STEREOTYPE_IMAGE_FOR_ELEMENT);
-        return IconService.getInstance().getIcon(referenceAdapter, options.intValue());
-    }
-
-    /**
-     * @see org.eclipse.gef.editparts.AbstractTreeEditPart#getText()
-     */
-    protected String getText() {
-        if (getParser() != null)
-            return getParser().getPrintString(referenceAdapter,
-                ParserOptions.NONE.intValue());
-        EObject eObject = ((View) getModel()).getElement();
-        if (eObject != null) {
-            String name = EMFCoreUtil.getName(eObject);
-            if (name != null) {
-                return name;
-            }
-        }
-
-        DescriptionStyle descriptionStyle = (DescriptionStyle) ((View) getModel())
-            .getStyle(NotationPackage.eINSTANCE.getDescriptionStyle());
-
-        if (descriptionStyle != null) {
-            String text = descriptionStyle.getDescription();
-            StringTokenizer tokenizer = new StringTokenizer(text, "\n\r\f"); //$NON-NLS-1$
-            if (tokenizer.hasMoreTokens()) {
-                text = tokenizer.nextToken();
-            }
-            if (text.length() > 50) {
-                text = text.substring(0, 50);
-                text = text.concat(StringStatics.ELLIPSIS);
-            }
-            return text;
-        }
-
-        return super.getText(); 
-    }
-
-    /**
-     * Method getParser.
-     * @return IParser
-     */
-    private IParser getParser() {
-        if (parser == null) {
-            if (referenceAdapter != null && referenceAdapter.getAdapter(EObject.class) != null)
-                parser = ParserService.getInstance().getParser(referenceAdapter);
-        }
-        return parser;
-    }
-
-    /**
-     * Handles the passed property changed event only if the editpart's view is not deleted
-     * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-     */
-    public final void notifyChanged(Notification event) {
-        // Receiving an event while a view is deleted could only happen during "undo" of view creation,
-        // However, event handlers should be robust by using the event's value and not trying to read 
-        // the value from the model
-        if ((((View)getModel()).eResource() != null))
-            handleNotificationEvent(event);
-    }
-
-    /**
-     * Handles the supplied notification event. 
-     * @param event
-     */
-    protected void handleNotificationEvent( Notification notification ) {
-        Object notifier = notification.getNotifier();
-        if (NotationPackage.Literals.VIEW__ELEMENT==notification.getFeature()) {
-            reactivateSemanticElement();
-        } else if (notification.getNotifier() == getSemanticElement() ||
-                   notifier instanceof Style){
-            refreshVisuals();
-        }
-    }
-    
-    /**
-     * deactivates, activates then refreshes the editpart
-     */
-    protected void reactivateSemanticElement() {
-        deactivate();
-        activate();
-        refresh();
-    }
-
-    /**
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-     */
-    public Object getAdapter(Class key) {
-        // Adapt to IActionFilter
-        if (key == IActionFilter.class) {
-            return ActionFilterService.getInstance();
-        }
-        
-        if (View.class.isAssignableFrom(key)) {
-            Object _model = getModel();
-            if (key.isInstance(_model))
-                return _model;
-            else
-                return null;
-        }
-        
-        Object model = getModel();
-        
-        if (model != null && model instanceof View &&
-            EObject.class.isAssignableFrom(key)) {
-            // Adapt to semantic element
-            EObject semanticObject = ((View)model).getElement();
-            if (semanticObject!= null && !semanticObject.eIsProxy() && key.isInstance(semanticObject)){
-                return semanticObject;
-            }
-        }
-        return super.getAdapter(key);
-    }
-    
-    /**
-     * Derives my editing domain from my diagram element. Subclasses may
-     * override.
-     */
-    public EditingDomain getEditingDomain() {
-        if (editingDomain == null) {
-            editingDomain = TransactionUtil.getEditingDomain(getModel());
-        }
-        return editingDomain;
-    }
-    
-    /**
-     * Gets the diagram event broker from the editing domain.
-     * 
-     * @return the diagram event broker
-     */
-    protected DiagramEventBroker getDiagramEventBroker() {
-        EditingDomain theEditingDomain = getEditingDomain();
-        if (theEditingDomain instanceof TransactionalEditingDomain) {
-            return DiagramEventBroker
-                .getInstance((TransactionalEditingDomain) theEditingDomain);
-        }
-        return null;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/package.html
deleted file mode 100644
index c3e9d5c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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 %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/BorderItemSelectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/BorderItemSelectionEditPolicy.java
deleted file mode 100644
index 72e8d75..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/BorderItemSelectionEditPolicy.java
+++ /dev/null
@@ -1,125 +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.editpolicies;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.AlignmentRequest;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-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.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Edit policy to restrict border item movement.
- * 
- * @author jbruck, cmahoney
- */
-public class BorderItemSelectionEditPolicy
-	extends NonResizableEditPolicyEx {
-
-	public void eraseSourceFeedback(Request request) {
-		if ((REQ_MOVE.equals(request.getType()) && isDragAllowed())
-			|| REQ_CLONE.equals(request.getType())
-			|| REQ_ADD.equals(request.getType())
-			|| RequestConstants.REQ_DROP.equals(request.getType()))
-			eraseChangeBoundsFeedback((ChangeBoundsRequest) request);
-	}
-
-	/**
-	 * Calls other methods as appropriate.
-	 */
-	public void showSourceFeedback(Request request) {
-		if ((REQ_MOVE.equals(request.getType()) && isDragAllowed())
-			|| REQ_ADD.equals(request.getType())
-			|| REQ_CLONE.equals(request.getType())
-			|| RequestConstants.REQ_DROP.equals(request.getType()))
-			showChangeBoundsFeedback((ChangeBoundsRequest) request);
-	}
-
-	/**
-	 * Shows or updates feedback for a change bounds request.
-	 * 
-	 * @param request
-	 *            the request
-	 */
-	protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-		IBorderItemEditPart borderItemEP = (IBorderItemEditPart) getHost();
-		IBorderItemLocator borderItemLocator = borderItemEP.getBorderItemLocator();
-		
-		if (borderItemLocator != null) {
-			IFigure feedback = getDragSourceFeedbackFigure();
-			PrecisionRectangle rect = new PrecisionRectangle(
-				getInitialFeedbackBounds().getCopy());
-			getHostFigure().translateToAbsolute(rect);
-			rect.translate(request.getMoveDelta());
-			rect.resize(request.getSizeDelta());
-			getHostFigure().translateToRelative(rect);
-			Rectangle realLocation = borderItemLocator.getValidLocation(rect
-				.getCopy(), borderItemEP.getFigure());
-			getHostFigure().translateToAbsolute(realLocation);
-			feedback.translateToRelative(realLocation);
-			feedback.setBounds(realLocation);
-		}
-	}
-
-	/**
-	 * Returns the command contribution to a change bounds request.
-	 * 
-	 * @param request
-	 *            the change bounds requesgt
-	 * @return the command contribution to the request
-	 */
-	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		IBorderItemEditPart borderItemEP = (IBorderItemEditPart) getHost();
-		IBorderItemLocator borderItemLocator = borderItemEP.getBorderItemLocator();
-		
-		if (borderItemLocator != null) {
-			PrecisionRectangle rect = new PrecisionRectangle(
-				getInitialFeedbackBounds().getCopy());
-			getHostFigure().translateToAbsolute(rect);
-			rect.translate(request.getMoveDelta());
-			rect.resize(request.getSizeDelta());
-
-			getHostFigure().translateToRelative(rect);
-			Rectangle realLocation = borderItemLocator.getValidLocation(rect
-				.getCopy(), borderItemEP.getFigure());
-
-			Point parentOrigin = borderItemEP.getFigure().getParent().getBounds().getTopLeft();
-			Dimension d = realLocation.getTopLeft().getDifference(parentOrigin);
-			Point location = new Point(d.width, d.height);
-
-			ICommand moveCommand = new SetBoundsCommand(borderItemEP.getEditingDomain(),
-				DiagramUIMessages.Commands_MoveElement, new EObjectAdapter(
-					(View) getHost().getModel()), location);
-			return new ICommandProxy(moveCommand);
-		}
-		return null;
-	}
-
-	/** Return <tt>null</tt> to avoid handling the request. */
-	protected Command getAlignCommand(AlignmentRequest request) {
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalConnectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalConnectionEditPolicy.java
deleted file mode 100644
index c31092b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalConnectionEditPolicy.java
+++ /dev/null
@@ -1,781 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-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 java.util.ListIterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-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.figures.ICanonicalShapeCompartmentLayout;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-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.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;
-
-/**
- * A specialized implementation of <code>CanonicalEditPolicy</code>.
- * This implementation will manage connections owned by the semantic host.
- * 
- * @author mhanner / sshaw
- */
-public abstract class CanonicalConnectionEditPolicy
-	extends CanonicalEditPolicy {
-
-	/**
-	 * Return a list of semantic relationships contained inside this
-	 * compartment.
-	 * @return EObject list
-	 * 
-	 */
-	abstract protected List<EObject> getSemanticConnectionsList();
-
-	/**
-	 * Return the supplied relationship's source element
-	 * @param relationship semantic connection
-     * @return EObject the source EObject
-	 */
-	abstract protected EObject getSourceElement(EObject relationship);
-
-	/**
-	 * Return the supplied relationship's target element.
-	 * 
-	 * @param relationship semantic connection
-     * @return EObject the target EObject
-	 */
-	abstract protected EObject getTargetElement(EObject relationship);
-
-	/** Return an empty list. */
-	protected List<EObject> getSemanticChildrenList() {
-		return Collections.emptyList();
-	}
-
-	/* 
-	 * Override to ensure that all owned editparts are activated before the editpolicy refresh
-	 * is invoked that will try to canonically create connections and shapes.
-	 */
-	protected void refreshOnActivate() {
-		// need to activate editpart children before invoking the canonical refresh
-		List<EditPart> c = getHost().getChildren();
-		for (int i = 0; i < c.size(); i++) {
-			c.get(i).activate();
-		}
-		refresh();
-	}
-	
-	/**
-	 * Return <tt>true</tt> if the connection should be drawn between the
-	 * supplied endpoints; otherwise return <tt>false</tt>.
-	 * 
-	 * @param a
-	 *            connection's source element
-	 * @param a
-	 *            connection's target element
-	 * @return <tt>true</tt> if both parameters are not <tt>null</tt>;
-	 *         otherwise <tt>false</tt>
-	 */
-	protected boolean canCreateConnection(EditPart sep, EditPart tep,
-			EObject connection) {
-		if (sep != null && sep.isActive() && tep != null && tep.isActive()) {
-
-			View src = (View) sep.getAdapter(View.class);
-			View tgt = (View) tep.getAdapter(View.class);
-			if (src != null && tgt != null) {
-                EditPart sourceParent = sep.getParent();
-                while (sourceParent instanceof GroupEditPart) {
-                    sourceParent = sourceParent.getParent();
-                }
-                EditPart targetParent = tep.getParent();
-                while (targetParent instanceof GroupEditPart) {
-                    targetParent = targetParent.getParent();
-                }
-				
-                return sourceParent.getEditPolicy(
-					EditPolicyRoles.CANONICAL_ROLE) != null
-					&& targetParent.getEditPolicy(
-						EditPolicyRoles.CANONICAL_ROLE) != null;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Return the editpart mapped to the object. The editpart is retrieved from
-	 * a [view,semantic] mapping. {@link #getView(IElement)}is called if the
-	 * mapping cannot be found inside this manager.
-	 * 
-	 * @param element
-	 *            an <tt>View</tt> or <tt>EObject</tt> instance.
-	 * @param context
-	 * 			  an <code>EObject</code> that is the context for the element.  Typically,
-	 * 			  this will be either <code>null</code> or it will the <code>Edge</code>
-	 * 			  that is connected to the <code>element</code> to find the <code>EditPart</code> of.
-	 * @return an editpart; <tt>null</tt> if non could be found.
-	 */
-	private EditPart getEditPartFor(EObject element, EObject context) {
-		if (element != null && !(element instanceof View)) {
-			EditPartViewer viewer = getHost().getViewer();
-			if (viewer instanceof IDiagramGraphicalViewer) {
-				List<EditPart> parts = ((IDiagramGraphicalViewer) viewer)
-					.findEditPartsForElement(EMFCoreUtil.getProxyID(element),
-						INodeEditPart.class);
-
-				if (parts.isEmpty()) {
-					// reach for the container's editpart instead and force it
-					// to refresh
-					EObject container = element.eContainer();
-					EditPart containerEP = getEditPartFor(container, null);
-					if (containerEP != null) {
-						containerEP.refresh();
-						parts = ((IDiagramGraphicalViewer) viewer)
-							.findEditPartsForElement(EMFCoreUtil.getProxyID(element),
-								INodeEditPart.class);
-					}
-				}
-
-				// Check if the part is contained with-in the host EditPart
-				// since we are canonically updated the host.
-				return findEditPartForElement(element, context, parts);
-			}
-		}
-
-		return (EditPart) host().getViewer().getEditPartRegistry().get(element);
-	}
-
-	/**
-	 * Finds the specific <code>EditPart</code> from a <code>List</code> of editparts
-	 * that is the exact representation of the given <code>element</code> in the 
-	 * host context.
-	 * 
-	 * @param element
-	 *            an <tt>View</tt> or <tt>EObject</tt> instance.
-	 * @param context
-	 * 			  an <code>EObject</code> that is the context for the element.  Typically,
-	 * 			  this will be either <code>null</code> or it will the <code>Edge</code>
-	 * 			  that is connected to the <code>element</code> to find the <code>EditPart</code> of.
-	 * @param parts
-	 * 			  a <code>List</code> of <code>EditPart</codes> to search for a specific
-	 * 			  instance that is the exact representation of <code>element</code>
-	 * 			  in the host context.
-	 * @return an editpart; <tt>null</tt> if non could be found.
-	 */
-	protected EditPart findEditPartForElement(EObject element, EObject context, List<EditPart> parts) {
-		EditPart ancestor = getHost();
-		while (ancestor != null) {
-			EditPart ep = reachForEditPartWithAncestor(parts, ancestor);
-			if (ep != null) {
-				return ep;
-			}
-			ancestor = ancestor.getParent();
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Walks up the container tree and tries to find the EditPart that has the
-	 * given <code>EditPart</code> as an ancestor.
-	 * 
-	 * @param results
-	 *            <code>List</code> of <code>EditPart</code> objects
-	 * @param ancestor
-	 *            <code>EditPart</code> to check against.
-	 * @return <code>EditPart</code> that contains the <code>ancestor</code>
-	 *         in it's containment hierarchy
-	 */
-	private EditPart reachForEditPartWithAncestor(List<EditPart> results,
-			EditPart ancestor) {
-		
-		ListIterator<EditPart> li = results.listIterator();
-		while (li.hasNext()) {
-			EditPart ep = (EditPart) li.next();
-
-			EditPart walker = ep.getParent();
-			while (walker != null) {
-				if (walker.equals(ancestor))
-					return ep;
-				walker = walker.getParent();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the default factory hint.
-	 * 
-	 * @return an empty string
-	 */
-	protected String getDefaultFactoryHint() {
-		return "";//$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a connection view facde element for the supplied semantic element.
-	 * An empty string is used as the default factory hint.
-	 * 
-	 * @param element
-	 *            the semantic element
-	 * @param the
-	 *            connections source editpart
-	 * @param the
-	 *            connections target editpart
-	 * @param index
-	 *            semantic elements position
-	 */
-	protected final Edge createConnectionView(EObject connection, int index) {
-		EditPart sep = getSourceEditPartFor(connection);
-		EditPart tep = getTargetEditPartFor(connection);
-		if (!canCreateConnection(sep, tep, connection)) {
-			return null;
-		}
-
-		View sView = (View) sep.getModel();
-		View tView = (View) tep.getModel();
-		Edge model = null;
-		String factoryHint = getDefaultFactoryHint();
-		IAdaptable elementAdapter = new CanonicalElementAdapter(connection,
-			factoryHint);
-		CreateConnectionViewRequest ccr = getCreateConnectionViewRequest(
-			elementAdapter, getFactoryHint(elementAdapter, factoryHint), index);
-
-		ccr.setType(RequestConstants.REQ_CONNECTION_START);
-		ccr.setSourceEditPart(sep);
-		getCreateViewCommand(ccr); // sep.getCommand(ccr); //prime the command
-		ccr.setTargetEditPart(tep);
-		ccr.setType(RequestConstants.REQ_CONNECTION_END);
-		Command cmd = getCreateViewCommand(ccr); // tep.getCommand(ccr);
-		if (cmd != null && cmd.canExecute()) {
-			List<EObjectAdapter> viewAdapters = new ArrayList<EObjectAdapter>();
-			viewAdapters.add(new EObjectAdapter(((View) host().getModel())
-				.getDiagram()));
-			viewAdapters.add(new EObjectAdapter(sView));
-			viewAdapters.add(new EObjectAdapter(tView));
-
-			SetViewMutabilityCommand.makeMutable(viewAdapters).execute();
-
-			executeCommand(cmd);
-			IAdaptable adapter = (IAdaptable) ccr.getNewObject();
-			SetViewMutabilityCommand.makeMutable(adapter).execute();
-			model = (Edge) adapter.getAdapter(Edge.class);
-			if (model == null) {
-				String eMsg = NLS
-					.bind(
-						DiagramUIMessages.CanonicalEditPolicy_create_view_failed_ERROR_,
-						connection);
-				IllegalStateException ise = new IllegalStateException(eMsg);
-				Log.error(DiagramUIPlugin.getInstance(), IStatus.ERROR, eMsg,
-					ise);
-				throw ise;
-			}
-		}
-		return model;
-	}
-
-	/**
-	 * Calculates the <code>EditPart</code> that this connection element is
-	 * connected to at it's target.
-	 * 
-	 * @param connection
-	 *            the <code>EObject</code> element that we are canonical
-	 *            trying to create a view for.
-	 * @return the <code>EditPart</code> that is the source of the
-	 *         <code>View</code> we want to create
-	 */
-	protected EditPart getTargetEditPartFor(EObject connection) {
-		EObject tel;
-		EditPart tep;
-		tel = getTargetElement(connection);
-		tep = getEditPartFor(tel, connection);
-		return tep;
-	}
-
-	/**
-	 * Calculates the <code>EditPart</code> that this connection element is
-	 * connected to at it's source.
-	 * 
-	 * @param connection
-	 *            the <code>EObject</code> element that we are canonical
-	 *            trying to create a view for.
-	 * @return the <code>EditPart</code> that is the target of the
-	 *         <code>View</code> we want to create
-	 */
-	protected EditPart getSourceEditPartFor(EObject connection) {
-		EObject sel;
-		EditPart sep;
-		sel = getSourceElement(connection);
-		sep = getEditPartFor(sel, connection);
-		return sep;
-	}
-
-	/**
-	 * Forwards the supplied request to its source if the target is
-	 * <tt>null</tt>; otherwise it is forwarded to the target. Forwards the
-	 * supplied request to the editpart's <code>host</code>.
-	 * 
-	 * @param request
-	 *            a <code>CreareConnecgtorViewRequest</code>
-	 * @return Command to create the views in the request
-	 */
-	protected Command getCreateViewCommand(CreateRequest request) {
-		if (request instanceof CreateConnectionViewRequest) {
-			CreateConnectionViewRequest ccr = (CreateConnectionViewRequest) request;
-			EditPart ep = ccr.getTargetEditPart() == null ? ccr
-				.getSourceEditPart()
-				: ccr.getTargetEditPart();
-			return ep.getCommand(request);
-		}
-
-		return super.getCreateViewCommand(request);
-	}
-
-	/**
-	 * Return a create view request.
-	 * 
-	 * @param descriptor
-	 *            a {@link CreateViewRequest.ViewDescriptor}.
-	 * @return a create request
-	 */
-	protected CreateViewRequest getCreateViewRequest(
-			CreateViewRequest.ViewDescriptor descriptor) {
-		return getCreateViewRequest(Collections.singletonList(descriptor));
-	}
-
-	/**
-	 * Return a create view request. The request's location is set to
-	 * {@link ICanonicalShapeCompartmentLayout#UNDEFINED}.
-	 * 
-	 * @param descriptors
-	 *            a {@link CreateViewRequest.ViewDescriptor} list.
-	 * @return a create request
-	 */
-	protected CreateViewRequest getCreateViewRequest(List<ViewDescriptor> descriptors) {
-		CreateViewRequest cvr = super.getCreateViewRequest(descriptors);
-		Point loc = ICanonicalShapeCompartmentLayout.UNDEFINED.getLocation();
-		cvr.setLocation(loc);
-		return cvr;
-	}
-
-	/**
-	 * Return a create connection view request.
-	 * 
-	 * @param elementAdapter
-	 *            semantic element
-	 * @param viewKind
-	 *            type of view to create
-	 * @param hint
-	 *            factory hint
-	 * @param index
-	 *            index
-	 * @return a create <i>non-persisted </i> view request
-	 */
-	private CreateConnectionViewRequest getCreateConnectionViewRequest(
-			IAdaptable elementAdapter, String hint, int index) {
-		return new CreateConnectionViewRequest(getConnectionViewDescriptor(
-			elementAdapter, hint, index));
-	}
-
-	/**
-	 * Return a connection view descriptor.
-	 * 
-	 * @param elementAdapter
-	 *            semantic element
-	 * @param hint
-	 *            factory hint
-	 * @param index
-	 *            index
-	 * @return a create <i>non-persisted </i> connection view descriptor
-	 */
-	private ConnectionViewDescriptor getConnectionViewDescriptor(
-			IAdaptable elementAdapter, String hint, int index) {
-		return new ConnectionViewDescriptor(elementAdapter, hint, index, false,
-			((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());
-	}
-
-	/**
-	 * Updates the set of connection views so that it is in sync with the
-	 * semantic connections. This method is called in response to notification
-	 * from the model.
-	 * <P>
-	 * The update is performed by comparing the existing connection views with the
-	 * set of semantic connections returned from {@link #getSemanticConnections()}.
-	 * Views whose semantic connection no longer exists or whose semantic
-	 * connection ends are <tt>null</tt> are
-	 * {@link org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#deleteViews(Iterator) removed}.
-	 * New semantic children have their View
-	 * {@link  #createEdge(IElement, EditPart, EditPart, int, String)
-	 * created}. Subclasses must override <code>getSemanticConnections()</code>.
-	 * <P>
-	 * This refresh routine will not reorder the view list to ensure both it and
-	 * the semantic children are in the same order since it is possible that
-	 * this editpolicy will only handle a specific subset of the host's views.
-	 * 
-	 * This method should <em>not</em> be overridden.
-	 * 
-	 * @return <code>List</code> of new <code>IAdaptable</code> objects that
-	 *         adapt to <code>View</code> objects that were created as a
-	 *         result of the synchronization
-	 */
-	protected List<IAdaptable> refreshSemanticConnections() {
-		Edge viewChild;
-
-		// current connection views
-		Collection<Edge> viewChildren = getConnectionViews();
-		Collection<EObject> semanticChildren = new HashSet<EObject>();
-		semanticChildren.addAll(getSemanticConnectionsList());
-
-		List<View> orphaned = cleanCanonicalSemanticChildren(viewChildren,
-			semanticChildren);
-
-		// delete all the remaining views
-		deleteViews(orphaned.iterator());
-
-		// create a view for each remaining semantic element.
-		List<IAdaptable> viewDescriptors = new ArrayList<IAdaptable>();
-		
-		for(EObject semanticChild : semanticChildren) {
-			viewChild = createConnectionView(semanticChild, ViewUtil.APPEND);
-			if (viewChild != null) {
-				viewDescriptors.add(new EObjectAdapter(viewChild)); 
-			}
-		}
-		
-		makeViewsMutable(viewDescriptors);
-
-		// now refresh all the connection containers to update the editparts
-		HashSet<EditPart> ends = new HashSet<EditPart>();
-		
-		ListIterator<IAdaptable> li = viewDescriptors.listIterator();
-		while (li.hasNext()) {
-			IAdaptable adaptable = li.next();
-			Edge edge = (Edge)adaptable.getAdapter(Edge.class);
-			EditPart sourceEP = getEditPartFor(edge.getSource(), edge);
-			if (sourceEP != null) {
-				ends.add(sourceEP);
-			}
-			EditPart targetEP = getEditPartFor(edge.getTarget(), edge);
-			if (targetEP != null) {
-				ends.add(targetEP);
-			}
-		}
-
-		for(EditPart end : ends) {
-			end.refresh();
-		}
-
-		return viewDescriptors;
-	}
-    
-	@Override
-    protected boolean isOrphaned(Collection<EObject> semanticChildren, View view) {
-        EObject element = view.getElement();
-        if (semanticChildren.contains(element)) {
-            if (view instanceof Edge) {
-                Edge edge = (Edge) view;
-                if ((edge.getSource() == null || (edge.getSource().getElement() != getSourceElement(element)))
-						|| (edge.getTarget() == null || (edge.getTarget()
-								.getElement() != getTargetElement(element)))) {
-					return true;
-				}
-            }
-        } else {
-            return true;
-        }
-        return false;
-    }
-    
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#refreshSemantic()
-	 */
-	protected void refreshSemantic() {
-		List<IAdaptable> createdViews = super.refreshSemanticChildren();
-		List<IAdaptable> createdConnectionViews = refreshSemanticConnections();
-
-		// perform a layout of the container
-		DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host()
-				.getEditingDomain(), createdViews, host());
-		if (!createdViews.isEmpty() && layoutCmd.canExecute()) {
-			executeCommand(new ICommandProxy(layoutCmd));
-		}
-
-		List<IAdaptable> allViews = new ArrayList<IAdaptable>(
-				createdConnectionViews.size() + createdViews.size());
-		allViews.addAll(createdViews);
-		allViews.addAll(createdConnectionViews);
-		makeViewsImmutable(allViews);
-	}
-
-	/**
-	 * Return <tt>true</tt> if this editpolicy should try and delete the
-	 * supplied view; otherwise <tt>false<tt>.  
-	 * The default behaviour is to return <tt>true</tt> if the view's semantic element is <tt>null</tt>.
-	 * <P>
-	 * Subclasses should override this method to ensure the correct behaviour.
-	 * @return  <code>view.resolveSemanticElement() == null</code>
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return ViewUtil.resolveSemanticElement(view) == null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy#postProcessRefreshSemantic(java.util.List)
-	 */
-	protected void postProcessRefreshSemantic(List<IAdaptable> viewDescriptors) {
-		makeViewsMutable(viewDescriptors);
-
-		super.postProcessRefreshSemantic(viewDescriptors);
-	}
-
-	/**
-	 * Return the list of connections between elements contained within the host
-	 * compartment. 
-	 * 
-	 * @return list of <code>Edge</code>s.
-	 */
-	protected Collection<Edge> getConnectionViews() {
-		Collection<View> children = getViewChildren();
-		Set<Edge> connections = new HashSet<Edge>();
-		if (getHost() instanceof IGraphicalEditPart) {
-			IGraphicalEditPart gep = (IGraphicalEditPart)getHost();
-			getConnectionViews(connections, gep.getNotationView(), children);
-		}
-		
-		return connections;
-	}
-	
-	/**
-	 * Add all connections that are attached to the given node and any of it's
-	 * children.
-	 * 
-	 * @param connections
-	 * @param node
-	 */
-	private void getConnectionViews(Set<Edge> connections, View view, Collection<View> viewChildren ) {
-		IGraphicalEditPart gep = (IGraphicalEditPart)getHost();
-		View hostView = gep.getNotationView();
-		if (hostView != view) {
-			if (!shouldCheckForConnections(view, viewChildren)) {
-				return;
-			}
-		}
-		
-		for (Edge sourceEdge : (List<Edge>) ViewUtil.getSourceConnections(view)) {
-			if (shouldIncludeConnection(sourceEdge, viewChildren)) {
-				connections.add(sourceEdge);
-			}
-		}
-		
-		for (Edge targetEdge : (List<Edge>) ViewUtil.getTargetConnections(view)) {
-			if (shouldIncludeConnection(targetEdge, viewChildren)) {
-				connections.add(targetEdge);
-			}
-		}
-		
-		for(View viewChild : (List<View>)view.getChildren()){
-			if (viewChild instanceof Node) {
-				getConnectionViews(connections, viewChild, viewChildren );
-			}
-		}
-	}
-
-	/**
-	 * Determines if a given view should be checked to see if any attached connections should be considered
-	 * by the canonical synchronization routine.  By default it will consider views that are 2 levels deep from the
-	 * container in order to allow for connections that are attached to border items on children views in the 
-	 * container.
-	 * 
-	 * @param view a <code>View</code> to check to see if attached connections should be considered.
-	 * @param viewChildren a <code>Collection</code> of view children of the host notation view, that can be used
-	 * as a context to determine if the given view's attached connections should be considered.
-	 * @return a <code>boolean</code> <code>true</code> if connections on the view are used as part of the 
-	 * canonical synchronization.  <code>false</code> if the view's attached connections are to be ignored.
-	 */
-	protected boolean shouldCheckForConnections(View view, Collection<View> viewChildren) {
-		return (view != null && 
-			(viewChildren.contains(view) || viewChildren.contains(view.eContainer())));
-	}
-	
-	/**
-	 * Called by {@link #getConnectionViews()} to determine if the underlying
-	 * shape compartment is responsible for the supplied connection. By default,
-	 * the following condition must be met for the connection to be accepted:
-	 * <UL>
-	 * <LI> its source must not be null.
-	 * <LI> its target must not be null.
-	 * <LI> the shape compartment contains the source (or the source's container
-	 * view).
-	 * <LI> the shape compartment contains the target (or the target's container
-	 * view). </LI>
-	 * 
-	 * @param connection
-	 *            the connection view
-	 * @param children
-	 *            underlying shape compartment's children.
-	 * @return <tt>false</tt> if supplied connection should be ignored;
-	 *         otherwise <tt>true</tt>.
-	 */
-	protected boolean shouldIncludeConnection(Edge connection, Collection<View> children) {
-		return shouldCheckForConnections(connection.getSource(), children) ||
-				shouldCheckForConnections(connection.getTarget(), children);
-	}
-	
-	/**
-	 * Return {@link UnexecutableCommand} if the editpolicy is enabled and a
-	 * {@link DropObjectsRequest} is passed as an argument and its objects are
-	 * contained in the list of semantic children.
-	 */
-	public Command getCommand(Request request) {
-		if (understandsRequest(request)) {
-			if (isEnabled() && request instanceof DropObjectsRequest) {
-				return getDropCommand((DropObjectsRequest) request);
-			}
-		}
-		return super.getCommand(request);
-	}
-
-	/**
-	 * gets an <code>UnexecutableCommand</code> if the droprequest cannot be
-	 * supported; the semantic host cannot contain the element being dropped or
-	 * this editpolicy is enabled and it already contains of view for the
-	 * elements being dropped.
-	 * 
-	 * @param request
-	 *            the request to use
-	 * @return <code>Command</code>
-	 */
-	protected Command getDropCommand(DropObjectsRequest request) {
-		boolean enabled = isEnabled();
-		List children = getSemanticChildrenList();
-		
-		for(Object dropElement : request.getObjects()) {
-
-			// Allow diagram links on Canonical shapes compartments
-			if (allowDropElement(dropElement)) {
-				continue;
-			}
-			if (dropElement instanceof EObject
-					&& preventDropElement(dropElement)) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			boolean containsElement = children.contains(dropElement);
-			if (enabled) {
-				if (containsElement || preventDropElement(dropElement)) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return <tt>false</tt> if the supplied element should be prevented from
-	 * being dropped into this editpolicy's host; otherwise <tt>true</tt>.
-	 * This method is called by {@link #getDropCommand(DropObjectsRequest)} if
-	 * this editpolicy is enabled.
-	 * 
-	 * @param dropElement
-	 *            object being dropped.
-	 * @return <code>PackageUtil.canContain(getSemanticHost().eClass(), ((EObject)dropElement).eClass(), false)</code>
-	 *         if the supplied element is an <code>EObject</code>; otherwise
-	 *         <tt>false</tt>
-	 */
-	protected boolean preventDropElement(Object dropElement) {
-		return dropElement instanceof EObject ? !PackageUtil.canContain(
-			getSemanticHost().eClass(), ((EObject) dropElement).eClass(), false)
-			: false;
-	}
-
-    /**
-     * Return <tt>true</tt> if the supplied element should be able to be
-     * dropped into this editpolicy's host; otherwise <tt>false</tt>. This
-     * method is called by {@link #getDropCommand(DropObjectsRequest)} if this
-     * editpolicy is enabled. Returning false will necessarily prevent the
-     * element from being dropped; the <code>getDropCommand</code> method will
-     * also invoke <code>preventDropElement</code>.
-     * 
-     * @param dropElement
-     *            object being dropped.
-     * @return true if dropping the supplied element is supported, false
-     *         otherwise.
-     */
-    protected boolean allowDropElement(Object dropElement) {
-        return dropElement instanceof Diagram;
-    }
-    
-	/**
-	 * Understands the following:
-	 * <UL>
-	 * <LI>{@link DropObjectsRequest}
-	 * <LI>{@link RequestConstants#REQ_DROP_OBJECTS}
-	 * <LI>{@link org.eclipse.gef.RequestConstants#REQ_CREATE}
-	 * </UL>
-	 */
-	public boolean understandsRequest(Request req) {
-		return (RequestConstants.REQ_DROP_OBJECTS.equals(req.getType())
-			|| req instanceof DropObjectsRequest || RequestConstants.REQ_CREATE
-			.equals(req.getType())) ? true
-			: super.understandsRequest(req);
-	}
-
-    /**
-     * Determines if this editpolicy would create a view for the supplied 
-     * semantic element.  The default implementation will return <tt>true</tt>
-     * if the supplied <tt>eObject</tt> is contained in {@link #getSemanticConnectionsList()}.
-     * @param eObject a semantic element
-     * @return <tt>true</tt> if this policy would create a view; 
-     * <tt>false</tt> otherwise.
-     */
-    public boolean canCreate( EObject eObject ) {
-        return super.canCreate(eObject) || getSemanticConnectionsList().contains(eObject);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalEditPolicy.java
deleted file mode 100644
index e12e531..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CanonicalEditPolicy.java
+++ /dev/null
@@ -1,1267 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-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.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-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.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-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.StringStatics;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationUtil;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.util.EditPartUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.CanonicalStyle;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-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;
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * The base canonical editpolicy class.
- * This edit policy will register itself with the model server to receive
- * semantic events fired to its host editpart.  It will create, if necessary,
- * notation elements for all semantic elements inserted into the host
- * element or delete the notation element for the semantic element removed
- * from the host element.
- * <P>
- * This editpolicy will create the necessary notation element by simply
- * returning a {@link org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand}.
- * 
- * @see #refreshSemanticChildren()
- * @see #handleSemanticEvent(NotificationEvent) will create or delete notation elements
- * as required.
- * @see #getCreateViewCommand(CreateRequest)
- * @see #shouldDeleteView(View)
- * @author mhanner, mmostafa
- */
-public abstract class CanonicalEditPolicy extends AbstractEditPolicy 
-implements NotificationListener {
-	
-	/** Runs the supplied commands asyncronously. */
-	private static class AsyncCommand extends Command {
-		private final CompoundCommand _cc;
-		
-		
-		/**
-		 * constructor
-		 * @param label this command label
-		 */
-		public AsyncCommand(String label) {
-			super(label);
-			_cc = new CompoundCommand(label);
-		}
-
-		/**
-		 * constructor
-		 * @param cmd the command
-		 */
-		public AsyncCommand( Command cmd ) {
-			this( cmd.getLabel() );
-			add( cmd );
-		}
-
-		
-		/**
-		 * Executes the command asynchonously. 
-		 * Calls {@link #doExecute}.
-		 */
-		public final void execute() {
-            // do not use Display.getCurrent() this mthod could be invoked
-            // on a non ui thread
-			DisplayUtils.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					AsyncCommand.this.doExecute();
-				}
-			} );
-		}
-		
-		/**
-		 * Return the command to be executed asynchronously.
-		 * @return the command
-		 */
-		protected final CompoundCommand getCommand() {
-			return _cc;
-		}
-		
-		/** Executes the command. */
-		protected void doExecute() {
-			getCommand().execute(); 
-		}
-		
-		/**
-		 * Add supplied command to the list of commands to be executed.
-		 * @param cmd the command to add
-		 */
-		public void add( Command cmd ) {
-			_cc.add( cmd );
-		}
-	}
-	
-	/** [semantic element, canonical editpolicy] registry map. */
-	static Map<EObject, Set<CanonicalEditPolicy>> _registry = new WeakHashMap<EObject, Set<CanonicalEditPolicy>>();
-	
-	/** ModelServer Listener Identifiers. */	
-	private static final String SEMANTIC_FILTER_ID = "SemanticFilterID";//$NON-NLS-1$
-	
-	/** enable refresh flag. */
-	private boolean _enabled = true;
-	
-	/** flag signaling a refresh request made while the editpolicy was disabled. */
-	private boolean _deferredRefresh = false;
-	
-	/** semantic listener. */
-	private Map<String, Object[]> _listenerFilters;
-		
-	/** Adds <code>String.class</tt> adaptablity to return a factory hint. */
-	protected static final class CanonicalElementAdapter extends EObjectAdapter {
-		private String _hint;
-		
-		/**
-		 * constructor
-		 * @param element
-		 * @param hint
-		 */
-		public CanonicalElementAdapter( EObject element, String hint ) {
-			super(element);
-			_hint = hint;
-		}
-		
-		/** Adds <code>String.class</tt> adaptablity. */
-		public Object getAdapter(Class adapter) { 
-			if ( adapter.equals(String.class) ) {
-				return _hint;
-			}
-			return super.getAdapter(adapter);
-		}
-	}
-	
-	/** Register this editpolicy against its semantic host. */
-	private void RegisterEditPolicy() {
-		EObject semanticHost = getSemanticHost();
-		Set<CanonicalEditPolicy> set = _registry.get(semanticHost);
-		if ( set == null ) {
-			set = new HashSet<CanonicalEditPolicy>();
-			_registry.put( semanticHost, set );
-		}
-		set.add(this);
-	}
-	
-	/** Unregisters this editpolicy from the cache. */
-	private void UnregisterEditPolicy() {
-		EObject semanticHost = null; 
-
-		// 1st - delete unspecified refs
-		Set<CanonicalEditPolicy> set = _registry.get(null);
-		if ( set != null ) {
-			set.remove(this);
-			if ( set.isEmpty() ) {
-				_registry.remove(semanticHost);
-			}
-		}
-		
-		// reverse key lookup since the unregistering an editpolicy
-		// typically means that the semantic element has been deleted.
-		for(EObject key : _registry.keySet()) {
-			if(_registry.get(key).contains(this)) {
-				semanticHost = key;
-				break;
-			}
-		}
-		
-		set = _registry.get(semanticHost);
-		if ( set != null ) {
-			set.remove(this);
-			if ( set.isEmpty() ) {
-				_registry.remove(semanticHost);
-			}
-		}
-	}
-	
-	/**
-	 * Returns the <code>Canonical EditPolicies</code> mapped to the supplied <i>element</i>. 
-	 * Canonical EditPolicies are mapped to their {@link #getSemanticHost()} as
-	 * the key.  A single key may have multiple editpolicies registered against it.
-	 * @param element a semantic element
-	 * @return a unmodifiable list of semantic editpolicies listening to the supplied element
-	 */
-	public static List<CanonicalEditPolicy> getRegisteredEditPolicies( EObject element ) {
-		List<CanonicalEditPolicy> policies = new ArrayList<CanonicalEditPolicy>();
-		Collection<CanonicalEditPolicy> policiesWithSemanticElements = _registry.get(element);
-		if (policiesWithSemanticElements != null) {
-			policies.addAll(policiesWithSemanticElements);
-		}
-		Collection<CanonicalEditPolicy> policiesWithNullSemanticElements = _registry.get(null);
-		if (policiesWithNullSemanticElements != null) {
-			policies.addAll(policiesWithNullSemanticElements);
-		}
-		return Collections.unmodifiableList(policies);
-	}
-	
-	/**
-	 * Returns the <b>enabled </b> <code>Canonical EditPolicies</code> mapped
-	 * to the supplied <i>element </i> that are an instance of the supplied
-	 * <tt>clazz</tt>. Canonical EditPolicies are mapped to their
-	 * {@link #getSemanticHost()}as the key. A single key may have multiple
-	 * editpolicies registered against it.
-	 * 
-	 * @param element
-	 *            a semantic element
-	 * @param clazz
-	 *            a class type
-	 * @return an unmodifiable list of semantic editpolicies listening to the
-	 *         supplied element
-	 */
-	public static List<CanonicalEditPolicy> getRegisteredEditPolicies( EObject element, Class clazz ) {
-		List<CanonicalEditPolicy> registeredPolicies = new ArrayList<CanonicalEditPolicy>();
-		
-		for(CanonicalEditPolicy cep : getRegisteredEditPolicies(element)) {
-			if ( cep.isEnabled() && clazz.isInstance(cep) ) {
-				registeredPolicies.add(cep);
-			}
-		}
-		return Collections.unmodifiableList(registeredPolicies);
-	}
-	
-	/** Asserts that the supplied host is an {@link IGraphicalEditPart} instance. */
-	public void setHost(EditPart host) {
-		if ( !(host instanceof IGraphicalEditPart) ) {
-			throw new IllegalArgumentException();
-		}
-		super.setHost(host);
-	}
-
-	/**
-	 * @return <code>(IGraphicalEditPart)host()</code>.
-	 */
-	protected final IGraphicalEditPart host() {
-		return (IGraphicalEditPart)getHost();
-	}
-
-	/**
-	 * Return the host's semantic children. <BR>
-	 * @return a list of semantic children.
-	 */
-	/*
-	 * Changing the return type to List<EObject> breaks API for clients
-	 */
-	abstract protected List getSemanticChildrenList();
-	
-	/** 
-	 * Returns the default factory hint. 
-	 * @return <code>host().getView().getSemanticType()</code>
-	 */
-	protected String getDefaultFactoryHint() {
-		return ((View)host().getModel()).getType();
-	}
-	
-	/**
-	 * Return a factory hint to assign to this element. The supplied
-	 * default hint is used if no hint can be found.
-	 * @see #getFactoryHint(IAdaptable)
-	 * @param elementAdapter adapter that adapts to {@link EObject}.
-	 * @param defaultHint a default factory hint (typically the host's factory hint).
-	 * @return a factory hint.
-	 */
-	protected String getFactoryHint(
-		IAdaptable elementAdapter,
-		final String defaultHint) {
-		String fh = getFactoryHint(elementAdapter);
-		return fh == null ? defaultHint : fh;
-	}
-
-	/**
-	 * Clients may override this method to return an appropriate factory
-	 * hint for the supplied semantic element.  Returning <tt>null</tt> will
-	 * set the factory hint to the host editpart's factory hint.
-	 * @see #getFactoryHint(IAdaptable, String)
-	 * @param elementAdapter adapter that adapts to {@link EObject}.
-	 * @return <tt>null</tt>.
-	 */
-	protected String getFactoryHint(IAdaptable elementAdapter) {
-		return null;
-	}
-	
-	/**
-	 * Deletes a list of views.  The views will be deleted <tt>iff</tt> their semantic
-	 * element has also been deleted.
-	 * @param views an iterator on a list of views.
-	 * @return <tt>true</tt> if the host editpart should be refreshed; either one one of the supplied
-	 * views was deleted or has been reparented.
-	 */
-	protected final boolean deleteViews( Iterator<View> views ) {
-		if ( !isEnabled() ) {
-			return false;
-		}
-		final CompoundCommand cc = new CompoundCommand(DiagramUIMessages.DeleteCommand_Label);
-		while (views.hasNext()) {
-			View view = (View)views.next();
-			if ( shouldDeleteView(view) ) {
-				cc.add(getDeleteViewCommand(view));
-			}
-		} 
-		
-		boolean doDelete = !cc.isEmpty() && cc.canExecute();
-		if ( doDelete ) {
-			executeCommand(cc);
-		}
-		return doDelete;
-	}
-	
-	/**
-	 * gets a {@link Command} to delete the supplied  {@link View}.
-	 * @param view view to use
-	 * @return command
-	 */
-	protected Command getDeleteViewCommand(View view) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		return new ICommandProxy(new DeleteCommand(editingDomain, view));
-	}
-
-	/**
-	 * returns <tt>true</tt> to always delete a view if required.
-	 * @param view to consider
-	 * @return true or false
-	 */
-	protected boolean shouldDeleteView(View view) {
-		return true;
-	}
-	
-	/**
-	 * Return a list of all the notation elements mapped to the supplied semantic element.
-	 * @param element to use
-	 * @return list of <code>View</code>s
-	 */
-	protected List<View> getViewReferers(EObject element) {
-		List<View> views = new ArrayList<View>();
-		if (element != null) {
-			EReference[] features = {NotationPackage.eINSTANCE
-					.getView_Element()};
-			views.addAll(EMFCoreUtil.getReferencers(element, features));
-		}
-		return views;
-	}
-
-	
-	/**
-	 * This method tries to locate the position that the view will be
-	 * inserted into it's parent.  The position is determined by the position
-	 * of the semantic element.  If the semantic element is not found the view
-	 * will be appended to it's parent.
-	 * 
-	 * @param semanticChild
-	 * @return position where the view should be inserted
-	 */
-	protected int getViewIndexFor(EObject semanticChild) {
-		// The default implementation returns APPEND
-		return ViewUtil.APPEND;
-	}
-	
-
-	/**
-	 * Creates a <code>View</code> element for each of the supplied semantic elements.
-	 * @param eObjects list of semantic element
-	 * @return a list of {@link IAdaptable} that adapt to {@link View}.
-	 */
-	protected final List<IAdaptable> createViews(List<EObject> eObjects) {
-		List<ViewDescriptor> descriptors = new ArrayList<ViewDescriptor>();
-		
-		for(EObject element : eObjects) {
-			if ( element != null ) {
-				descriptors.add(getViewDescriptor(element));
-			}
-		}
-		
-		if ( !descriptors.isEmpty() ) {
-			// create the request
-			CreateViewRequest request = getCreateViewRequest(descriptors);
-			
-			// get the command and execute it.
-			Command cmd = getCreateViewCommand(request);
-			if ( cmd != null && cmd.canExecute() ) {
-				SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();
-				executeCommand(cmd);
-				List<IAdaptable> adapters = (List<IAdaptable>)request.getNewObject();
-				return adapters;
-			}
-		}
-		return Collections.emptyList();
-	}
-    	
-	/**
-	 * Executes the supplied command inside an <code>unchecked action</code>
-	 * @param cmd command that can be executed (i.e., cmd.canExecute() == true)
-	 */
-	protected void executeCommand( final Command cmd ) {
-        Map<String, Boolean> options = null;
-        EditPart ep = getHost();
-        boolean isActivating = true;
-        // use the viewer to determine if we are still initializing the diagram
-        // do not use the DiagramEditPart.isActivating since ConnectionEditPart's
-        // parent will not be a diagram edit part
-        EditPartViewer viewer = ep.getViewer();
-        if (viewer instanceof DiagramGraphicalViewer){
-            isActivating = ((DiagramGraphicalViewer)viewer).isInitializing();
-        }
-        
-       
-        if (isActivating||
-            !EditPartUtil.isWriteTransactionInProgress((IGraphicalEditPart)getHost(), false, false))
-            options = Collections.singletonMap(Transaction.OPTION_UNPROTECTED,
-                Boolean.TRUE);
-  
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-			((IGraphicalEditPart) getHost()).getEditingDomain(),
-			StringStatics.BLANK, options) {
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-
-				cmd.execute();
-
-				return Status.OK_STATUS;
-			}
-		};
-		try {
-			operation.execute(new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"executeCommand", e); //$NON-NLS-1$
-			Log.warning(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"executeCommand", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Returns a {@link CreateCommand} for each view descriptor contained
-	 * in the supplied request without forwarding create requests to the
-	 * host editpart.
-	 * @param request a create request
-	 * @return command create view command(s)
-	 */
-	protected Command getCreateViewCommand(CreateRequest request) {
-        assert request instanceof CreateViewRequest;
-
-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label); 
-        Command cmd = host().getCommand(request);
-
-        if (cmd == null) {
-            for(ViewDescriptor descriptor : ((CreateViewRequest)request).getViewDescriptors()) {
-                ICommand createCommand = getCreateViewCommand(descriptor);
-                cc.compose(createCommand);
-            }
-        } else {
-            cc.compose(new CommandProxy(cmd));
-            
-            for(ViewDescriptor descriptor : ((CreateViewRequest)request).getViewDescriptors()) {
-            	cc.compose(new CommandProxy(SetViewMutabilityCommand.makeMutable(descriptor)));
-            }
-        }
-        return new ICommandProxy(cc.reduce());
-	}
-	
-	/**
-	 * @param descriptor 
-	 * @return ICommand to create a view given a descriptor
-	 */
-	protected ICommand getCreateViewCommand(CreateViewRequest.ViewDescriptor descriptor) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		CreateCommand createCommand =
-            new CreateCommand(editingDomain,
-				descriptor, 
-				(View)getHost().getModel());
-        CompositeCommand cmd = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
-        cmd.compose(createCommand);
-        cmd.compose(new CommandProxy(SetViewMutabilityCommand.makeMutable(descriptor)));
-		return cmd;
-	}
-	
-	/**
-	 * Return a create view request.  
-	 * @param descriptors a {@link CreateViewRequest.ViewDescriptor} list.
-	 * @return a create request
-	 */
-	protected CreateViewRequest getCreateViewRequest( List<ViewDescriptor> descriptors ) {
-		return new CreateViewRequest( descriptors );
-	}
-	
-	/**
-	 * Return a view descriptor.
-	 * @param elementAdapter semantic element
-	 * @param viewKind type of view to create
-	 * @param hint factory hint
-	 * @param index index
-	 * @return a create <i>non-persisted</i> view descriptor
-	 */
-	protected CreateViewRequest.ViewDescriptor getViewDescriptor(
-		IAdaptable elementAdapter,
-		Class viewKind,
-		String hint,
-		int index) {
-
-		return new CreateViewRequest.ViewDescriptor(
-				elementAdapter,
-				viewKind,
-				hint,
-				index, 
-				false, 
-				host().getDiagramPreferencesHint());
-	}
-
-	/**
-	 * Convenience method to create a view descriptor.  Will call
-	 * {@link #getViewDescriptor(IAdaptable, Class, String, int)}
-	 * @param element semantic element.
-	 * @return view descriptor
-	 */
-	protected CreateViewRequest.ViewDescriptor getViewDescriptor( EObject element ) {
-		//
-		// create the view descriptor
-		String factoryHint = getDefaultFactoryHint();
-		IAdaptable elementAdapter =
-			new CanonicalElementAdapter(element, factoryHint);
-		
-		int pos = getViewIndexFor(element);
-		CreateViewRequest.ViewDescriptor descriptor = 
-			getViewDescriptor(
-				elementAdapter,
-				Node.class,
-				getFactoryHint(elementAdapter, factoryHint),
-				pos);
-		return descriptor;
-	}
-	
-	/**
-	 * Registers with the model server to receive semantic events targeted to 
-	 * the host editpart. By default, this editpolicy will receive events fired
-	 * to the semantic element mapped to the host editpart.  Clients wanting to 
-	 * listen to another semantic element should override {@link #getSemanticHost()}
-	 * @see #deactivate()
-	 */
-	public void activate() {
-		EObject semanticHost = getSemanticHost();
-		if ( semanticHost != null && !isActive() ) {
-			addListenerFilter(SEMANTIC_FILTER_ID, this, semanticHost);
-			// add listener to host view (handle case when user changes "visibility" property)
-			addListenerFilter("NotationListener_Visibility", //$NON-NLS-1$
-							  this,
-							  (View)getHost().getModel(),
-							  NotationPackage.eINSTANCE.getView_Visible());
-			
-			Style style = ((View)host().getModel()).getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-			if ( style != null ) {
-				addListenerFilter("NotationListener_DrawerStyle", this, style); //$NON-NLS-1$
-			}
-			style = ((View)host().getModel()).getStyle(NotationPackage.eINSTANCE.getCanonicalStyle());
-			if ( style != null ) {
-				addListenerFilter("NotationListener_CanonicalStyle", this, style);  //$NON-NLS-1$
-			}
-			
-			refreshOnActivate();
-		}
-		RegisterEditPolicy();
-	}
-
-	/**
-	 * Refresh that is called on activate of the editpolicy to ensure that all relevant editparts
-	 * can receive canonically created connections.
-	 */
-	protected void refreshOnActivate() {
-		refresh();
-	}
-
-	/**
-	 * Return <tt>true</tt> if the editpolicy is enabled and its host
-	 * is visible; otherwise <tt>false</tt>.
-	 * @return <tt>true</tt>
-	 */
-	public boolean isEnabled() {
-        // if the editing domain is null then there is no point in enabling the edit policy
-        // the editing domain could be null because the view is detached or if the host is detached
-        if ( TransactionUtil.getEditingDomain((EObject)getHost().getModel())==null){
-            return false;
-        }
-		DrawerStyle dstyle = (DrawerStyle) ((View)host().getModel()).getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-		boolean isCollapsed = dstyle == null ? false : dstyle.isCollapsed();
-		
-		if ( isCollapsed ) {
-			return false;
-		}
-		
-		CanonicalStyle style = getCanonicalStyle();
-		boolean enabled = _enabled && ((View)host().getModel()).isVisible();
-		
-		return style == null 
-			? enabled
-			: style.isCanonical() && enabled;
-	}
-
-	/**
-	 * Disables the editpolicy.  While disabled, the editpolicy
-	 * will not perform any refreshes.
-	 * @param enable 
-	 */
-	public void enableRefresh( boolean enable ) {
-		_enabled = enable;
-		if ( _enabled && _deferredRefresh ) {
-			_deferredRefresh = false;
-			refresh();
-		}
-	}
-	
-	/**
-	 * Sets enable(aBoolean) on all the edit policies of the semantic host.
-	 * @param enable
-	 */
-	public void setEnable( boolean enable ) {
-		EObject sHost = getSemanticHost();
-		List<CanonicalEditPolicy> registeredPolicies = getRegisteredEditPolicies(sHost);
-
-		CanonicalEditPolicy[] policies = new CanonicalEditPolicy[registeredPolicies.size()];
-		registeredPolicies.toArray(policies);
-		
-		for ( int i = 0; i < policies.length; i++ ) {
-			policies[i].enableRefresh(enable);
-		}
-	}
-	
-	/** 
-	 * check is this edit policy is active or not
-	 * @return <tt>true</tt> if the this editpart has already been activated;
-	 * otherwise <tt>false</tt>.
-	 */
-	public final boolean isActive() {
-		return _listenerFilters == null 
-			? false
-			: _listenerFilters.containsKey(SEMANTIC_FILTER_ID);
-	}
-	
-	/**
-	 * Return the semantic element to be <i>listened</i> to by this editpolicy.
-	 * @return <code>host().getView().resolveSemanticElement()</code> by default.
-	 */
-	public EObject getSemanticHost() {
-		return ViewUtil.resolveSemanticElement((View)host().getModel()); 
-	}
-	
-	/**
-	 * Unregisters all registered model server listeners.
-	 * @see #activate()
-	 */
-    public void deactivate() {
-    	if (_listenerFilters != null) {
-    		Map<String, Object[]> listeners = new HashMap<String, Object[]>(_listenerFilters);
-    		
-    		for(String id: listeners.keySet()) {
-    			removeListenerFilter(id);
-    		}
-    	}
-    	
-		UnregisterEditPolicy();
-    }
-
-	
-    /**
-	 * Adds a listener filter by adding the given listener to a passed notifier.
-	 * The supplied <tt>listener</tt> will not be added to there is already a listener
-	 * registered against the supplied <tt>filterId</tt>
-	 * 
-	 * @param filterId A unique filter id (within the same editpart instance)
-	 * @param listener A listener instance
-	 * @param notifier An element notifer to add the listener to
-	 * @return <tt>true</tt> if the listener was added, otherwise <tt>false</tt>
-	 * @throws NullPointerException if either <tt>filterId</tt> or <tt>listner</tt> parameters are <tt>null</tt>.
-	 */
-	protected boolean addListenerFilter(
-		String filterId,
-		NotificationListener listener,
-		EObject element) {
-		if ( filterId == null || listener == null ) {
-			throw new NullPointerException();
-		}
-
-		if (element != null) {
-			if (_listenerFilters == null)
-				_listenerFilters = new HashMap<String, Object[]>();
-			
-			if ( !_listenerFilters.containsKey(filterId)) {
-				getDiagramEventBroker().addNotificationListener(element,listener);
-				_listenerFilters.put(filterId, new Object[] { element, listener });
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Adds a listener filter by adding the given listener to a passed notifier.
-	 * The supplied <tt>listener</tt> will not be added to there is already a listener
-	 * registered against the supplied <tt>filterId</tt>
-	 * 
-	 * @param filterId A unique filter id (within the same editpart instance)
-	 * @param listener A listener instance
-	 * @param notifier An element notifer to add the listener to
-	 * @return <tt>true</tt> if the listener was added, otherwise <tt>false</tt>
-	 * @throws NullPointerException if either <tt>filterId</tt> or <tt>listner</tt> parameters are <tt>null</tt>.
-	 */
-	protected boolean addListenerFilter(
-		String filterId,
-		NotificationListener listener,
-		EObject element,
-		EStructuralFeature feature) {
-		if ( filterId == null || listener == null ) {
-			throw new NullPointerException();
-		}
-
-		if (element != null) {
-			if (_listenerFilters == null)
-				_listenerFilters = new HashMap<String, Object[]>();
-			
-			if ( !_listenerFilters.containsKey(filterId)) {
-				getDiagramEventBroker().addNotificationListener(element,feature,listener);
-				_listenerFilters.put(filterId, new Object[] { element,feature, listener });
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Removes a listener previously added with the given id
-	 * @param filterId the filter id
-	 */
-	protected void removeListenerFilter(String filterId) {
-		if (_listenerFilters == null) {
-			return;
-		}
-		Object[] objects = (Object[]) _listenerFilters.remove(filterId);
-		if (objects == null) {
-			return;
-		}
-		if (objects.length > 2) {
-			getDiagramEventBroker().removeNotificationListener(
-				(EObject) objects[0], (EStructuralFeature) objects[1],
-				(NotificationListener) objects[2]);
-		} else {
-			getDiagramEventBroker().removeNotificationListener(
-				(EObject) objects[0], (NotificationListener) objects[1]);
-		}
-	}
-	
-	/**
-	 * Event callback: filters out non IElementEvent events.
-	 * @param event an event fired from the model server.
-	 */
-	public final void notifyChanged(Notification notification) {
-		if ( isHostStillValid()) {
-			Object element = notification.getNotifier();
-			if ( element == null  ) {
-				return;
-			}
-			
-			handleNotificationEvent(notification);
-		}
-	}
-	
-	/**
-	 * Return <tt>true</tt> if the host is active and its view has not
-	 * been deleted; otherwise <tt>false</tt>
-	 * @return true or false
-	 */
-	protected final boolean isHostStillValid() {
-		if (!host().isActive()) {
-			return false;
-		}
-
-		// is it detached?
-		EObject eObject = (EObject) host().getModel();
-		if (eObject != null && eObject.eResource() == null
-			&& !eObject.eIsProxy()) {
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Handles <code>NotificationEvent</code> and resynchronizes the canonical
-	 * container if the event should be handled.
-	 * 
-	 * @param event <code>NotificationEvent</code> to handle.
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		
-		boolean shouldRefresh = false;
-		if ( shouldHandleNotificationEvent(event) ) {
-			if ( NotationPackage.eINSTANCE.getCanonicalStyle_Canonical() == event.getFeature() ) {
-				CanonicalStyle style = (CanonicalStyle) ((View)host().getModel()).getStyle(NotationPackage.eINSTANCE.getCanonicalStyle());
-				if (style != null) {
-					setEnable(style.isCanonical());
-				}
-			}
-			shouldRefresh = true;
-		}
-		
-		if (shouldRefresh)
-			refresh();
-	}
-	
-	/**
-	 * Determines if the the <code>NotificationEvent</code> should be handled / processed
-	 * by the editpolicy.
-	 * 
-	 * @param event <code>NotificationEvent</code> to check
-	 * @return <code>true</code> if event should be handled, <code>false</code> otherwise.
-	 */
-	protected boolean shouldHandleNotificationEvent(Notification event) {
-	  if ( NotationPackage.eINSTANCE.getDrawerStyle_Collapsed() == event.getFeature() || 
-	 	   NotationPackage.eINSTANCE.getCanonicalStyle_Canonical() == event.getFeature() ||
-	 	   NotationPackage.eINSTANCE.getView_Visible() == event.getFeature() ||
-	 	   NotationPackage.eINSTANCE.getView_PersistedChildren() == event.getFeature()) {
-		  return true;
-	  }
-
-	  Object element = event.getNotifier();
-      if (element instanceof EObject && !(element instanceof View)){
-          boolean addOrDelete = (NotificationUtil.isElementAddedToSlot(event) 
-                  || NotificationUtil.isElementRemovedFromSlot(event));
-          EStructuralFeature feature = getFeatureToSynchronize();
-          if (feature!=null){
-              if (feature.equals(event.getFeature()) && 
-                  (addOrDelete||NotificationUtil.isSlotModified(event))){
-                      return true;
-              }
-              return false;
-          }
-          Set<EStructuralFeature> features = getFeaturesToSynchronize();
-          if (features!=null && !features.isEmpty()){
-              if (features.contains(event.getFeature())&&
-                  (addOrDelete||NotificationUtil.isSlotModified(event))){
-                  return true;
-              }
-              return false;
-          }
-          
-          // just for backward compatibility will not be needed when all clients migrate
-          if (addOrDelete){
-                  return true;
-          }
-      }
-      return false;      
-	}
-
-			
-	/**
-     * Return the host's model children.
-     * @return list of <code>View</Code>s
-     */
-    protected List<View> getViewChildren() {
-        return getViewChildren((View) host().getModel());
-    }
-
-    /**
-     * Return the host's model children. This is a recursive method that handles
-     * groups.
-     * 
-     * @param view
-     *            the view to find the children for
-     * @return list of children views with groups removed.
-     */
-    private List<View> getViewChildren(View view) {
-        ArrayList<View> list = new ArrayList<View>();
-        
-        for(View child : (EList<View>)view.getChildren()) {
-            if (child instanceof Node
-                    && ViewType.GROUP.equals(((Node) child).getType())) {
-                list.addAll(getViewChildren(child));
-            } else {
-                list.add(child);
-            }        	
-        }
-        
-        return list;
-    }
-
-	/**
-	 * Resynchronize the canonical container.
-	 */
-	public final void refresh() {
-		try {
-			if ( isEnabled() ) {
-				// avoid re-entry
-				boolean defRefresh = _deferredRefresh;
-				_deferredRefresh = false;
-				refreshSemantic();
-				_deferredRefresh = defRefresh;
-			}
-			else {
-				_deferredRefresh = true;
-			}
-		}
-		catch ( Throwable t ) {
-			String eMsg = DiagramUIMessages.CanonicalEditPolicy_refresh_failed_ERROR_;
-			Log.error(DiagramUIPlugin.getInstance(), IStatus.WARNING,
-					eMsg, t);
-		}
-	}
-
-	/**
-	 * Redirects the call to {@link #refreshSemanticChildren()}.
-	 */
-	protected void refreshSemantic() {
-		List<IAdaptable> createdViews = refreshSemanticChildren();
-		makeViewsImmutable(createdViews);
-	}
-
-	/**
-	 * Sets state on views to allow for modification without changing their
-	 * non-persisted status.
-	 * 
-	 * @param createdViews <code<>List</code> of view adapters that were created during the 
-	 * {@link CanonicalEditPolicy#refreshSemantic()} operation
-	 */
-	final protected void makeViewsMutable(List<IAdaptable> createdViews) {
-		if (createdViews != null && !createdViews.isEmpty()) {
-			List<IAdaptable> viewAdapters = prepareAdapterList(createdViews);
-			executeCommand(SetViewMutabilityCommand.makeMutable(viewAdapters));
-		}
-	}
-	
-	/**
-	 * Sets views as being immutable, meaning that they are unmodifiable as 
-	 * non-persisted views.  Any subsequent change to an immutable view will force 
-	 * the view to be persisted.
-	 * 
-	 * @param createdViews <code<>List</code> of view adapters that were created during the 
-	 * {@link CanonicalEditPolicy#refreshSemantic()} operation
-	 */
-	final protected void makeViewsImmutable(List<IAdaptable> createdViews) {
-		if (createdViews != null && !createdViews.isEmpty()) {
-			addListenersToContainers(createdViews);
-			
-			List<IAdaptable> viewAdapters = prepareAdapterList(createdViews);
-			Command immutable = SetViewMutabilityCommand.makeImmutable(viewAdapters);
-			AsyncCommand ac = new AsyncCommand(immutable);
-			ac.execute();
-		}
-	}
-
-	private void addListenersToContainers(List<IAdaptable> createdViews) {
-		UniqueEList<View> list = new UniqueEList<View>();
-		for(IAdaptable obj : createdViews) {
-			View view = (View)obj.getAdapter(View.class);
-			if (view != null) {
-				list.add((View)view.eContainer());
-			}
-		}
-		
-		for(View containerView : list) {
-			addListenerFilter("NotationListener_Container_" + containerView.getClass().getName() + '@' + Integer.toHexString(containerView.hashCode()), //$NON-NLS-1$
-				  this,
-				  containerView,
-				  NotationPackage.eINSTANCE.getView_PersistedChildren());
-		}
-	}
-	
-	private List<IAdaptable> prepareAdapterList(List<IAdaptable> createdViews) {
-		List<IAdaptable> viewAdapters = new ArrayList<IAdaptable>();
-		View hostView = host().getNotationView();
-		if (hostView != null) {
-			viewAdapters.add(new EObjectAdapter(hostView));
-		}
-		
-		ListIterator<IAdaptable> li = createdViews.listIterator();
-		while (li.hasNext()) {
-			IAdaptable adapter = li.next();
-			
-			if (adapter != null) {
-				if (!(adapter instanceof IAdaptable) && adapter instanceof EObject) {
-					viewAdapters.add(new EObjectAdapter((EObject)adapter));
-				} else {
-					viewAdapters.add(adapter);
-				}
-			}
-		}
-		return viewAdapters;
-	}
-	
-	/**
-	 * Updates the set of children views so that it
-	 * is in sync with the semantic children. This method is called 
-	 * in response to notification from the model.
-	 * <P>
-	 * The update is performed by comparing the exising views with the set of
-	 * semantic children returned from {@link #getViewChildren()}. Views whose
-	 * semantic element no longer exists are {@link #deleteViews(Iterator) removed}. 
-	 * New semantic children have their View {@link  #createViews(List)
-	 * created}.  Subclasses must override <code>getSemanticChildren()</code>.
-	 * <P>
-	 * Unlike <code>AbstractEditPart#refreshChildren()</code>, this refresh will not
-	 * reorder the view list to ensure both it and the semantic children are
-	 * in the same order since it is possible that this edit policy will handle
-	 * a specifc subset of the host's views.  
-	 * <P>
-	 * The host is refreshed if a view has created or deleted as a result of this
-	 * refresh.
-	 * 
-	 * @return <code>List</code> of new <code>View</code> objects that were created as a result of 
-	 * the synchronization
-	 */
-	protected final List<IAdaptable> refreshSemanticChildren() {
-		
-		// Don't try to refresh children if the semantic element
-		// cannot be resolved.
-		if (resolveSemanticElement() == null) {
-			return Collections.emptyList();		
-		}
-		
-		// current views
-		List<View> viewChildren = getViewChildren();
-		List<EObject> semanticChildren = new ArrayList<EObject>(getSemanticChildrenList());
-
-		List<View> orphaned = cleanCanonicalSemanticChildren(viewChildren, semanticChildren);
-		boolean changed = false;
-		//
-		// delete all the remaining orphaned views
-		if ( !orphaned.isEmpty() ) {
-			changed = deleteViews(orphaned.iterator());
-		}
-		
-		//
-		// create a view for each remaining semantic element.
-		List<IAdaptable> createdViews = Collections.emptyList();
-		if ( !semanticChildren.isEmpty() ) {
-			createdViews = createViews( semanticChildren );
-			
-			for ( int i = 0; i < createdViews.size(); i++ ) {
-				View createdView = (View)((IAdaptable)createdViews.get(i)).getAdapter(View.class);
-				if (createdView == null) {
-					String eMsg =
-						NLS
-						.bind(
-							DiagramUIMessages.CanonicalEditPolicy_create_view_failed_ERROR_,
-							semanticChildren.get(i));
-					IllegalStateException ise =
-						new IllegalStateException(eMsg);
-					Log.error(
-						DiagramUIPlugin.getInstance(),
-						IStatus.ERROR,
-						eMsg,
-						ise);
-					throw ise;
-				}
-			}
-		}
-		
-		if (changed || createdViews.size() > 0) {
-			postProcessRefreshSemantic(createdViews);
-		}
-		
-
-		return createdViews;
-	}
-
-	/**
-	 * Synchronizes the semanticChildren the viewChildren to discover if any of the semanticChildren
-	 * don't have a corresponding view.  Any <code>semanticChildren</code> that do have a view are
-	 * removed from the list.
-	 * 
-	 * @param viewChildren <code>List</code> of <code>View</code> elements that already exist in the container.
-	 * @param semanticChildren <code>List</code> of semantic elements that are candidates for synchronization
-	 * @return <code>List</code> of orphans views that should be deleted from the container.
-	 */
-	final protected List<View> cleanCanonicalSemanticChildren(Collection<? extends View> viewChildren, Collection<EObject> semanticChildren) {
-		EObject semanticChild;
-		
-		List<View> orphaned = new ArrayList<View>();
-		Map<EObject, View> viewToSemanticMap = new HashMap<EObject, View>();
-		
-		for(View viewChild : viewChildren) {
-			
-			semanticChild = viewChild.getElement();
-			if (!isOrphaned(semanticChildren, viewChild)) {
-				semanticChildren.remove(semanticChild);
-				viewToSemanticMap.put(semanticChild, viewChild);
-			}
-			else {
-				orphaned.add(viewChild);
-			}
-			
-			View viewInMap = viewToSemanticMap.get(semanticChild);
-			if (viewInMap != null && !viewChild.equals(viewInMap)) { 
-				if (viewInMap.isMutable()) {
-					orphaned.remove(viewChild);
-					orphaned.add(viewInMap);
-					viewToSemanticMap.put(semanticChild, viewChild);
-				}
-			}
-		}
-		return orphaned;
-	}
-
-    /**
-     * Decide if the passed view is orphaned or not
-     * 
-     * @param semanticChildren
-     *            semantic children to check against
-     * @param view
-     *            the view that should be checked
-     * @return true if orphaned other wise false
-     */
-    protected boolean isOrphaned(Collection<EObject> semanticChildren, View view) {
-        return !semanticChildren.contains(view.getElement());
-    }
-	
-	/**
-	 * Allow for post processing of the refresh semantic to set the view mutable
-	 * state and allow subclasses to add functionality.
-	 * 
-	 * @param viewDescriptors <code>List</code> of IAdaptable that adapt to <code>View</code>
-	 */
-	protected void postProcessRefreshSemantic(List<IAdaptable> viewDescriptors) {
-		// need to refresh host to create editparts so that dependent canonical editpolicies can synchronize as well.
-		getHost().refresh(); 
-	}
-	
-	/**
-	 * Convenience method to return the host's semantic element.
-	 * Same as calling <code>host().getView().resolveSemanticElement();</code>
-	 * @return an {@link EObject}
-	 */
-	protected final EObject resolveSemanticElement() {
-		return ViewUtil.resolveSemanticElement((View)host().getModel());
-	}
-
-	/**
-	 * gets the canonical style that may be installed on the host shape compartment view.
-	 * @return <code>CanonicalStyle</code>
-	 */
-	protected CanonicalStyle getCanonicalStyle() {
-		return (CanonicalStyle) ((View)host().getModel()).getStyle(NotationPackage.eINSTANCE.getCanonicalStyle());
-	}	
-	
-    /**
-     * Gets the diagram event broker from the editing domain.
-     * 
-     * @return the diagram event broker
-     */
-    private DiagramEventBroker getDiagramEventBroker() {
-        TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        if (theEditingDomain != null) {
-            return DiagramEventBroker.getInstance(theEditingDomain);
-        }
-        return null;
-    }
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.parts.NotificationForEditPartsListener#getViewer()
-	 */
-	final public EditPartViewer getViewer() {
-		return getHost().getViewer();
-	}
-    
-    /**
-     * This method should be overridden by sub classes to provide the features the canonical edit policy
-     * will use to synchronize the views with the semantic element
-     * This method should be overridden only if the edit policy synchronizes more than one EStructuralFeature  
-     * @return Set of EStructuralFeature features
-     */
-
-    protected Set<EStructuralFeature> getFeaturesToSynchronize(){
-        return Collections.emptySet();
-    }
-    
-    /**
-     * This method should be overridden by sub classes to provide the feature the canonical edit policy
-     * will use to synchronize the views with the semantic element
-     * This method should be overridden only if the edit policy synchronizes only one EStructuralFeature  
-     * @return  EStructuralFeature 
-     */
-    protected EStructuralFeature getFeatureToSynchronize(){
-        return null;
-    }
-    
-    /**
-     * Determines if this editpolicy would create a view for the supplied 
-     * semantic element.  The default implementation will return <tt>true</tt>
-     * if the supplied <tt>eObject</tt> is contained in {@link #getSemanticChildrenList()}.
-     * @param eObject a semantic element
-     * @return <tt>true</tt> if this policy would create a view; 
-     * <tt>false</tt> otherwise.
-     */
-    public boolean canCreate( EObject eObject ) { 
-        return eObject == null 
-            ? false
-            : getSemanticChildrenList().contains(eObject);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ComponentEditPolicy.java
deleted file mode 100644
index 0660f8a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ComponentEditPolicy.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-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.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IInsertableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart;
-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.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.GroupRequestViaKeyboard;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Concrete class that extends the GEF's <code>ComponentEditPolicy</code>.
- * This edit policy will return a command in response to delete requests.
- * 
- * @author Vishy Ramaswamy
- */
-public class ComponentEditPolicy
-	extends org.eclipse.gef.editpolicies.ComponentEditPolicy {
-	
-	private static final String DELETE_FROM_DIAGRAM_DLG_TITLE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Title;
-
-	private static final String DELETE_FROM_DIAGRAM_DLG_MESSAGE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Message;
-
-	private static final String DELETE_FROM_MODEL_DLG_TOGGLE_LABEL = DiagramUIMessages.MessageDialogWithToggle_DoNotPromptAgainToggle_label; 	
-
-
-	/**
-	 * Returns a delete command to honour the supplied request.  
-	 * Calls {@link #createDeleteSemanticCommand(GroupRequest)} if 
-	 * {@link #shouldDeleteSemantic()} returns <tt>true</tt>; othwerise
-	 * {@link #createDeleteViewCommand(GroupRequest)} is called.
-	 * @see org.eclipse.gef.editpolicies.ComponentEditPolicy#createDeleteCommand(GroupRequest)
-	 */
-	protected final Command createDeleteCommand(GroupRequest deleteRequest) {
-
-		if (shouldDeleteSemantic()){
-			return createDeleteSemanticCommand(deleteRequest);
-		}
-		if (deleteRequest instanceof GroupRequestViaKeyboard) {
-			boolean shouldShowPrompt = ((GroupRequestViaKeyboard) deleteRequest)
-				.isShowInformationDialog();
-			if (shouldShowPrompt) {
-				((GroupRequestViaKeyboard) deleteRequest)
-					.setShowInformationDialog(false);
-				if (showPrompt() == false) {
-					return UnexecutableCommand.INSTANCE;
-				}
-			}
-		}
-		return createDeleteViewCommand(deleteRequest);
-		
-	}
-
-	/**
-	 * Return <tt>true</tt> if the host element should delete its semantic
-	 * element; otherwise <tt>false</tt> to delete its view. A <tt>true</tt>
-	 * return value implies that the host's parent is using a canonical
-	 * model manager.
-	 * @return true or false
-	 */
-	protected boolean shouldDeleteSemantic() {
-		EditPart parent = getHost().getParent();
-        if (parent instanceof SemanticListCompartmentEditPart){
-            SemanticListCompartmentEditPart semListCompartment  = 
-                (SemanticListCompartmentEditPart)parent;
-            return semListCompartment.isCanonicalOn();
-            
-        } else {
-
-            // If the parent is a group, then we want to get the first parent
-            // that isn't a group and test for a canonical editpolicy there.
-            while (parent instanceof GroupEditPart) {
-                parent = parent.getParent();
-            }
-        }
-        
-        EObject eObject = (EObject)getHost().getAdapter(EObject.class);
-        if (eObject != null && parent != null ) { //sanity checks
-			CanonicalEditPolicy cep = (CanonicalEditPolicy)parent.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-			return cep != null 
-				&& cep.isEnabled()
-				&& cep.canCreate(eObject); 					
-		} 	
-		return false;
-	}
-
-	/** 
-	 * Return a command to delete the host's view.  The host's primary view
-	 * is deleted if {@link GroupRequest#getEditParts()} returns a 
-	 * <tt>null</tt> or empty list; otherwise each editpart's view is 
-	 * deleted.
-	 * @param deleteRequest the original delete request.
-	 * @return Command
-	 */
-	protected Command createDeleteViewCommand(GroupRequest deleteRequest) {
-		CompositeCommand cc = new CompositeCommand(StringStatics.BLANK);
-
-        TransactionalEditingDomain editingDomain = getEditingDomain();
-		if (editingDomain == null) {
-			return null;
-		}
-		List toDel = deleteRequest.getEditParts();
-		if (toDel == null || toDel.isEmpty()) {
-			cc.compose(new DeleteCommand(editingDomain, (View) getHost()
-				.getModel()));
-		} else {
-			for (int i = 0; i < toDel.size(); i++) {
-				IGraphicalEditPart gep = (IGraphicalEditPart) toDel.get(i);
-				cc.compose(new DeleteCommand(editingDomain, (View) gep
-					.getModel()));
-			}
-		}
-		return new ICommandProxy(cc.reduce());
-	}
-
-	/**
-	 * Return a command to delete the host's semantic elements. This method is
-	 * called if the host is canonical.
-	 * 
-	 * @see #shouldDeleteSemantic()
-	 * @param deleteRequest
-	 *            the original delete request.
-	 * @return Command
-	 */
-	protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-        
-           boolean shouldShowPrompt = (deleteRequest instanceof GroupRequestViaKeyboard) ? ((GroupRequestViaKeyboard) deleteRequest)
-            .isShowInformationDialog()
-            : false;
-
-        EditCommandRequestWrapper editCommandRequest = new EditCommandRequestWrapper(
-            new DestroyElementRequest(editingDomain, shouldShowPrompt),
-            deleteRequest.getExtendedData());
-		
-		Command semanticCmd = getHost().getCommand(editCommandRequest);
-		if (semanticCmd != null && semanticCmd.canExecute()) {
-			CompoundCommand cc = new CompoundCommand();
-			cc.add(semanticCmd);
-			return cc;
-		}
-		return createDeleteViewCommand(deleteRequest);
-	}
-
-	/**
-	 * Returns the view element to be deleted.
-	 * @return the host's primary view element.
-	 */
-	protected View getView() {
-	   if (getHost().getModel() instanceof View &&
-			getHost() instanceof GraphicalEditPart){
-			GraphicalEditPart ePart = (GraphicalEditPart)getHost();
-			return ePart.getPrimaryView();
-		}
-		return null;
-	}
-	
-		
-	/**
-	 * Performs the delete action on the selected objects.
-	 */
-	private boolean showPrompt() {
-		boolean prompt = ((IPreferenceStore) ((IGraphicalEditPart) getHost())
-			.getDiagramPreferencesHint().getPreferenceStore())
-			.getBoolean(IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		
-		if(prompt) 
-			if(showMessageDialog()) 
-				return true; 
-			else
-				return false;
-											
-		return true;		
-		
-	}	
-
-	/**
-	 * launches the prompting dialogBox on deletion of elements from the diagram for the end user.
-	 * 
-	 * @return boolean  true if user pressed YES; false otherwise
-	 */
-	private boolean showMessageDialog() {	
-		MessageDialogWithToggle dialog = MessageDialogWithToggle
-			.openYesNoQuestion(Display.getCurrent().getActiveShell(),
-				DELETE_FROM_DIAGRAM_DLG_TITLE, DELETE_FROM_DIAGRAM_DLG_MESSAGE,
-				DELETE_FROM_MODEL_DLG_TOGGLE_LABEL, false,
-				(IPreferenceStore) ((IGraphicalEditPart) getHost())
-					.getDiagramPreferencesHint().getPreferenceStore(),
-				IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		
-		if (dialog.getReturnCode() == IDialogConstants.YES_ID) 
-			return true;
-		else 
-			return false;
-	}
-	
-	/**
-	 * getInsertableEditPart
-	 * Returns the EditPart that can be recipient of the default insert command.
-	 * 
-	 * @return IInsertableEditPart 
-	 */
-	protected IInsertableEditPart getInsertableEditPart() {
-		if (getHost() instanceof IInsertableEditPart) {
-			return (IInsertableEditPart)getHost();
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * getInsertCommand
-	 * Returns an creation command to honour the supplied request. 
-	 * 
-	 * @param insertRequest
-	 * @return Command that will create the default sementic element responding to insert.
-	 */
-	protected Command getInsertCommand(GroupRequest insertRequest) {
-		IInsertableEditPart insertEP = getInsertableEditPart();
-		if (null == insertEP)
-			return null;
-		
-		EObject hostElement = ViewUtil.resolveSemanticElement((View)insertEP.getModel());
-		if (hostElement != null) {
-
-            TransactionalEditingDomain editingDomain = getEditingDomain();
-            if (editingDomain == null) {
-                return null;
-            }
-
-            CreateElementRequest theReq = new CreateElementRequest(
-                 editingDomain, hostElement, insertEP.getElementType());
-
-            EditCommandRequestWrapper editCommandRequest = new EditCommandRequestWrapper(
-                theReq, insertRequest.getExtendedData());
-            Command cmd = ((IGraphicalEditPart) getHost())
-                .getCommand(editCommandRequest);
-
-            return cmd;
-		}
-		
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.ComponentEditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (!(request instanceof GroupRequest))
-			return null;
-		
-		GroupRequest grpRequest = (GroupRequest)request;
-		if (grpRequest instanceof GroupRequestViaKeyboard){
-			return getDeleteCommand(grpRequest);
-		}
-		else if (grpRequest.getType().equals(RequestConstants.REQ_INSERT_SEMANTIC)) {
-			return getInsertCommand(grpRequest);
-		}
-		
-		return super.getCommand(request);
-	}
-    
-    private TransactionalEditingDomain getEditingDomain() {
-         if (getHost() instanceof IGraphicalEditPart) {
-            return ((IGraphicalEditPart) getHost()).getEditingDomain();
-        } else if (getHost() instanceof IEditingDomainProvider) {
-            Object domain = ((IEditingDomainProvider) getHost())
-                .getEditingDomain();
-            if (domain instanceof TransactionalEditingDomain) {
-                return (TransactionalEditingDomain) domain;
-            }
-        }
-        return null;
-    }
-
- }
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java
deleted file mode 100644
index 539cc88..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java
+++ /dev/null
@@ -1,141 +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.editpolicies;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-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.internal.commands.SetConnectionBendpointsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.SetAllBendpointRequest;
-import org.eclipse.gmf.runtime.diagram.ui.util.SelectInDiagramHelper;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.LineMode;
-import org.eclipse.gmf.runtime.notation.Edge;
-
-/**
- * This EditPolicy defines the behavior of Bendpoints on a Connection.
- */
-public class ConnectionBendpointEditPolicy
-	extends org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.ConnectionBendpointEditPolicy { 
-	
-	/**
-	 * @param lineSegMode
-	 */
-	protected ConnectionBendpointEditPolicy(LineMode lineSegMode) {
-		super(lineSegMode);
-	}
-
-	/**
-	 * 
-	 */
-	public ConnectionBendpointEditPolicy() {
-		super(LineMode.OBLIQUE);
-	}
-
-	/**
-	 * 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 (RequestConstants.REQ_SET_ALL_BENDPOINT.equals(request.getType()))
-			return getSetBendpointCommand((SetAllBendpointRequest)request);
-			
-		return super.getCommand(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.
-	 */
-	protected Command getBendpointsChangedCommand(BendpointRequest request) {
-		if ((getHost().getViewer() instanceof ScrollingGraphicalViewer)&&
-				(getHost().getViewer().getControl() instanceof FigureCanvas)){
-			SelectInDiagramHelper.exposeLocation((FigureCanvas)getHost().getViewer().getControl(),request.getLocation().getCopy());
-		}
-		Connection connection = getConnection();
-		Edge connectionView = (Edge) request.getSource().getModel();
-		
-		return getBendpointsChangedCommand(connection, connectionView);
-	}
-
-	/**
-	 * Method getBendpointsChangedCommand
-	 * Different signature method that allows a command to constructed for changing the bendpoints
-	 * without requiring the original Request.
-	 * 
-	 * @param connection Connection to generate the bendpoints changed command from
-	 * @param edge notation element that the command will operate on.
-	 * @return Command SetBendpointsCommand that contains the point changes for the connection.
-	 */
-	protected Command getBendpointsChangedCommand(Connection connection, Edge edge) {
-		Point ptRef1 = connection.getSourceAnchor().getReferencePoint();
-		getConnection().translateToRelative(ptRef1);
-
-		Point ptRef2 = connection.getTargetAnchor().getReferencePoint();
-		getConnection().translateToRelative(ptRef2);
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-        SetConnectionBendpointsCommand sbbCommand = new SetConnectionBendpointsCommand(
-            editingDomain);
-        sbbCommand.setEdgeAdapter(new EObjectAdapter(edge));
-		sbbCommand.setNewPointList(connection.getPoints(), ptRef1, ptRef2);
-
-		return new ICommandProxy(sbbCommand);
-	}
-
-	/**
-	 * Method getSetBendpointCommand.
-	 * This method returns a command that executes the REQ_SET_ALL_BENDPOINT request
-	 * @param request SetAllBendpointRequest that stores the points to be set by the command.
-	 * @return Command to be executed.
-	 */
-	protected Command getSetBendpointCommand(SetAllBendpointRequest request) {
-		Connection connection = getConnection();
-		PointList newPoints = request.getPoints();
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        SetConnectionBendpointsCommand sbbCommand = new SetConnectionBendpointsCommand(editingDomain);
-		sbbCommand.setEdgeAdapter(new EObjectAdapter((Edge)getHost().getModel()));
-		
-		if (request.getSourceReference() != null && request.getTargetReference() != null) {
-			sbbCommand.setNewPointList(
-				newPoints, request.getSourceReference(), request.getTargetReference());
-		}
-		else {
-			sbbCommand.setNewPointList(
-				newPoints, connection.getSourceAnchor(), connection.getTargetAnchor());
-		}
-		
-		return new ICommandProxy(sbbCommand);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionHandleEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionHandleEditPolicy.java
deleted file mode 100644
index d807477..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionHandleEditPolicy.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionLabelsEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionLabelsEditPolicy.java
deleted file mode 100644
index f45d9cb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionLabelsEditPolicy.java
+++ /dev/null
@@ -1,150 +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.editpolicies;
-import java.util.Iterator;
-
-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.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-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.ShapeNodeEditPart;
-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.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ToggleConnectionLabelsRequest;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * EditPolicy which toggles the visibility of the labels associated with
- * the host.
- * 
- * @author jcorchis
- */
-public class ConnectionLabelsEditPolicy extends AbstractEditPolicy {
-	
-	/**
-	 * Understands the RequestConstants.REQ_TOGGLE_CONNECTION_LABELS request. 
-	 * @param request the request
-	 * @return true if RequestConstants.REQ_TOGGLE_CONNECTION_LABELS.equals(request.getType())
-	 * and false otherwise.
-	 */
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_TOGGLE_CONNECTION_LABELS.equals(request
-				.getType());
-	}
-	/**
-	 * Returns a <code>Command<code> which changes the visibility for 
-	 * the labels owned by the host.
-	 * @param request the request
-	 * @return the property change commands
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_TOGGLE_CONNECTION_LABELS.equals(request.getType())) {
-			boolean showHide = ((ToggleConnectionLabelsRequest) request)
-					.showConnectionLabel();		
-            CompositeCommand cc = 
-                new CompositeCommand(DiagramUIMessages.Command_hideLabel_Label);
-            Object model = getHost().getModel();
-            if (model instanceof View){
-                View hostView = (View)model;
-       			Iterator iter = hostView.getChildren().iterator();
-       			while(iter.hasNext()) {
-                    View childView = (View)iter.next();
-                    if (isLabelView(getHost() ,hostView, childView)){
-                        cc.add(new SetPropertyCommand(getEditingDomain(),
-                            new EObjectAdapter(childView),
-                            Properties.ID_ISVISIBLE,
-                            DiagramUIMessages.Command_hideLabel_Label,
-                            Boolean.valueOf(showHide)));
-                    }
-        		}
-        		return new ICommandProxy(cc);
-            }
-		}
-		return null;
-	}
-    
-   protected TransactionalEditingDomain getEditingDomain() {
-       return ((IGraphicalEditPart) getHost()).getEditingDomain();
-   }
-    
-    
-   /**
-    * determines if the passed view is a label view or not
-    * the default provided implementation is just an educated/generic guss
-    * clients can override this method to provide more specific response
-    * @param node
-    * @return
-    */
-    protected boolean isLabelView(EditPart containerEditPart,View parentView, View view) {
-    	// labels are not compartments
-        // labels contained by Node Shape Edit Parts or connection edit parts
-        // labels had location constrain
-        // labels had the string Type set on them 
-        if ((containerEditPart instanceof ShapeNodeEditPart ||
-             containerEditPart instanceof ConnectionEditPart )
-             &&  view instanceof Node){
-            Node node = (Node)view;
-            String nodeType = node.getType();
-            if (!isCompartment(node) &&
-                (nodeType != null && nodeType.length()>0)){
-                LayoutConstraint lContraint = node.getLayoutConstraint();
-                if (lContraint instanceof Location){
-                    return true;
-                }
-            }
-        }
-               
-       return false;
-    }
-    
-    /**
-     * determines if the passed view is a compartment view or not
-     * the default provided implementation is just an educated/generic guss
-     * clients can override this method to provide more specific response
-     * @param node
-     * @return
-     */
-    protected boolean isCompartment(Node node) {
-        if (node.getStyle(NotationPackage.eINSTANCE.getDrawerStyle())!=null){
-              return true;
-        }
-        return false;
-    }
-	
-	/**
-	 * If the request returns an executable command the host is returned, otherwise null.
-	 * @param request
-	 * @return getHost() if the request is supported or null.
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request)) {
-			Command command = getHost().getCommand(
-				new ToggleConnectionLabelsRequest(false));
-			if (command != null && command.canExecute())
-				return getHost();
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConstrainedToolbarLayoutEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConstrainedToolbarLayoutEditPolicy.java
deleted file mode 100644
index 234c3d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConstrainedToolbarLayoutEditPolicy.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.geometry.Transposer;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SetCompartmentRatioCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.FixedLocationResizableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.TextSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A layout editpolicy for containers with constrained toolbar layout manager
- * 
- * @author melaasar
- */
-public class ConstrainedToolbarLayoutEditPolicy
-	extends ConstrainedLayoutEditPolicy {
-
-	/**
-	 * The null constraint
-	 */
-	private static final double NULL_CONSTRAINT = -1;
-
-	/**
-	 * Indicates whether the layout manager is horizontal (or vertical)
-	 */
-	private boolean horizontal;
-
-	private Transposer transposer = new Transposer();
-
-	/**
-	 * Creates a new vertical ConstrainedFlowLayoutEditPolicy 
-	 */
-	public ConstrainedToolbarLayoutEditPolicy() {
-		this(false);
-	}
-
-	/**
-	 * Creates a new ConstrainedFlowLayoutEditPolicy with the given orientation
-	 * @param horizontal
-	 */
-	public ConstrainedToolbarLayoutEditPolicy(boolean horizontal) {
-		this.horizontal = horizontal;
-		transposer.setEnabled(horizontal);
-	}
-
-	/**
-	 * @return Whether the editpolicy is horizontal
-	 */
-	protected boolean isHorizontal() {
-		return horizontal;
-	}
-
-	
-	/**
-	* @see org.eclipse.gef.editpolicies.LayoutEditPolicy#createChildEditPolicy(org.eclipse.gef.EditPart)
-	*/
-	protected EditPolicy createChildEditPolicy(EditPart child) {
-		if( child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null )
-		{
-			if (child instanceof ResizableCompartmentEditPart)
-				return new ResizableCompartmentEditPolicy(isHorizontal());
-			else if (child instanceof TextCompartmentEditPart)
-				return new TextSelectionEditPolicy();
-			else if ( child instanceof IBorderItemEditPart)
-				return new BorderItemSelectionEditPolicy();
-			else if ( child instanceof FixedLocationResizableEditPart)
-				return  child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		}
-		return child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_AUTOSIZE.equals(request.getType()))
-			return getAutoSizeCommand(request);
-		return super.getCommand(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return understandsRequest(request) ? getHost() : null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#understandsRequest(org.eclipse.gef.Request)
-	 */
-	public boolean understandsRequest(Request req) {
-		if (RequestConstants.REQ_AUTOSIZE.equals(req.getType()))
-			return true;
-		return super.understandsRequest(req);
-	}
-
-	/**
-	 * Creates and returns an autosize command that reverts the layout constraints
-	 * @param request teh request
-	 * @return command
-	 */
-	protected Command getAutoSizeCommand(Request request) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		CompositeTransactionalCommand cmc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.Command_AdjustRatioCommand_Label);
-		Iterator children = getHost().getChildren().iterator();
-		while (children.hasNext()) {
-			IGraphicalEditPart child = (IGraphicalEditPart) children.next();
-			if (child instanceof ResizableCompartmentEditPart) {
-				cmc.compose(new SetCompartmentRatioCommand(editingDomain, new EObjectAdapter((View)child.getModel()), NULL_CONSTRAINT));
-			}
-		}
-		return cmc.isEmpty() ? null : new ICommandProxy(cmc.reduce());
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getResizeChildrenCommand(org.eclipse.gef.requests.ChangeBoundsRequest)
-	 */
-	protected Command getResizeChildrenCommand(ChangeBoundsRequest req) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-        CompositeTransactionalCommand cmc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.Command_AdjustRatioCommand_Label);
-		
-		boolean before = transposer.t(req.getMoveDelta()).y != 0;
-		GraphicalEditPart c = (GraphicalEditPart) req.getEditParts().get(0);
-		IFigure p = c.getFigure();
-		if (!(p instanceof ResizableCompartmentFigure)) {
-			return null;
-		}
-		IFigure a = ((ResizableCompartmentFigure) p).getAdjacentSibling(before);
-
-		double parentHeight = transposer.t(p.getParent().getSize()).height;
-		double heightDelta = MapModeUtil.getMapMode(p).DPtoLP(transposer.t(req.getSizeDelta()).height);
-
-		Map registry = getHost().getViewer().getVisualPartMap();
-		Iterator figures = p.getParent().getChildren().iterator();
-		while (figures.hasNext()) {
-			IFigure f = (IFigure) figures.next();
-			IGraphicalEditPart part = (IGraphicalEditPart) registry.get(f);
-			if (part instanceof ResizableCompartmentEditPart) {
-				double r = NULL_CONSTRAINT;
-				if (f.isVisible()) {
-					int height = transposer.t(f.getSize()).height;
-					if (f == p)
-						r = (height + heightDelta) / parentHeight;
-					else if (f == a)
-						r = (height - heightDelta) / parentHeight;
-					else
-						r = height / parentHeight;
-				}
-				cmc.compose(new SetCompartmentRatioCommand(editingDomain, new EObjectAdapter((View)part.getModel()), r));
-			}
-		}
-		return new ICommandProxy(cmc);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#createAddCommand(org.eclipse.gef.EditPart, java.lang.Object)
-	 */
-	protected Command createAddCommand(EditPart child, Object constraint) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#createChangeConstraintCommand(org.eclipse.gef.EditPart, java.lang.Object)
-	 */
-	protected Command createChangeConstraintCommand(
-		EditPart child,
-		Object constraint) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.draw2d.geometry.Point)
-	 */
-	protected Object getConstraintFor(Point point) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	protected Object getConstraintFor(Rectangle rect) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
-	 */
-	protected Command getCreateCommand(CreateRequest request) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#getDeleteDependantCommand(org.eclipse.gef.Request)
-	 */
-	protected Command getDeleteDependantCommand(Request request) {
-		return null;
-	}
-	
-	/*
-	 * Override to erase in case of GMF drop request, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=276033
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-	 */
-	@Override
-	public void eraseTargetFeedback(Request request) {
-		super.eraseTargetFeedback(request);
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-				eraseLayoutTargetFeedback(request);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java
deleted file mode 100644
index be6ae10..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-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.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.util.ObjectAdapter;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.core.commands.GroupCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.BringForwardCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.BringToFrontCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.SendBackwardCommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.SendToBackCommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ArrangeCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IEditableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.DuplicateViewsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.RefreshEditPartCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SnapCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-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.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.PasteViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ZOrderRequest;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutService;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardSupportUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * the container edit policy
- * @author sshaw
- */
-public class ContainerEditPolicy
-    extends org.eclipse.gef.editpolicies.ContainerEditPolicy {
-
-    protected Command getAddCommand(GroupRequest request) {
-        return null;
-    }
-
-    /**
-     * gets a delete dependant command  
-     * @param request the request
-     * @return command
-     */
-    protected Command getDeleteDependantCommand(Request request) {
-        return null;
-    }
-
-    protected Command getCreateCommand(CreateRequest request) {
-        return null;
-    }
-
-    public Command getOrphanChildrenCommand(GroupRequest request) {
-        return null;
-    }
-
-    /**
-     * Returns a command to paste the views
-     * @param request The PasteViewRequest
-     * @return Command the command to execute
-     */
-    protected Command getPasteCommand(PasteViewRequest request) {
-        /* Get the view context */
-        IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
-        View viewContext = (View) ((IAdaptable)editPart).getAdapter(View.class);
-
-        /* Get the clipboard data */
-        ICustomData[] data = request.getData();
-
-        /* Return the paste command */
-        if (data != null
-            && viewContext != null
-            && editPart instanceof ISurfaceEditPart) {
-            return new ICommandProxy(new PasteCommand(editPart
-                .getEditingDomain(), DiagramUIMessages.PasteCommand_Label,
-                viewContext, data, MapModeUtil
-                    .getMapMode(((org.eclipse.gef.GraphicalEditPart) getHost())
-                        .getFigure())));
-        }
-
-        return null;
-    }
-    
-    private class EditPartComparator implements Comparator {
-        
-        /* (non-Javadoc)
-         * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-         */
-        public int compare(Object arg0, Object arg1) {
-
-            EditPart ep0 = (EditPart)arg0;
-            EditPart ep1 = (EditPart)arg1;
-            
-            EditPart parent = ep0.getParent();
-            int ep0Index = parent.getChildren().indexOf( ep0 );
-            int ep1Index = parent.getChildren().indexOf( ep1 );
-            
-            return ep0Index - ep1Index;
-        }
-        
-    }
-
-    private List sortSelection( List editPartsToSort ) {
-
-        // IF the list to be sorted is less than 2...
-        if( editPartsToSort.size() < 2 ) {
-            // Return the original list
-            return editPartsToSort;
-        }
-
-        List toReturn = new ArrayList( editPartsToSort.size() );
-        toReturn.addAll( editPartsToSort );
-
-        Collections.sort( toReturn, new EditPartComparator() );
-    
-        return toReturn;
-    }
-
-    private List reverseSortSelection( List toSort ) {
-        List toReturn = sortSelection( toSort );
-        
-        Collections.reverse( toReturn );
-        return toReturn;
-    }
-
-    /**
-     * Returns a command that moves the selected views to the front
-     * @param request the ZOrder Request
-     * @return the command to execute
-     */
-    protected Command getBringToFrontCommand( ZOrderRequest request ) {
-        
-        CompositeCommand toReturn = new CompositeCommand( "" ); //$NON-NLS-1$
-        
-        // Create commands for each view to move
-        for (Iterator iter = sortSelection( request.getPartsToOrder() ).iterator();
-            iter.hasNext(); ) {
-            
-            IGraphicalEditPart element = (IGraphicalEditPart) iter.next();
-            toReturn.compose(new BringToFrontCommand(
-                element.getEditingDomain(), (View) element.getModel()));
-        }
-        
-        return new ICommandProxy( toReturn );
-    }
-
-    /**
-     * Returns a command the moves the selected views one step toward the front
-     * @param request the ZOrder Request
-     * @return the command to execute
-     */
-    protected Command getBringForwardCommand( ZOrderRequest request ) {
-        
-        CompositeCommand toReturn = new CompositeCommand( "" ); //$NON-NLS-1$
-    
-        // Create commands for each view to move
-        for (Iterator iter = reverseSortSelection( request.getPartsToOrder() ).iterator(); iter.hasNext();) {
-            IGraphicalEditPart toOrder = (IGraphicalEditPart) iter.next();
-            
-            toReturn.compose(new BringForwardCommand(
-                toOrder.getEditingDomain(), (View) toOrder.getModel()));
-        }
-        
-        return new ICommandProxy( toReturn );
-    }
-
-    /**
-     * Returns a command the moves the selected views to the back
-     * @param request the ZOrder Request
-     * @return the command to execute
-     */
-    protected Command getSendToBackCommand( ZOrderRequest request ) {
-        
-        CompositeCommand toReturn = new CompositeCommand( "" ); //$NON-NLS-1$
-        
-        // Create commands for each view to move
-        for (Iterator iter = reverseSortSelection(request.getPartsToOrder()).iterator(); iter.hasNext();) {
-            IGraphicalEditPart toOrder = (IGraphicalEditPart) iter.next();
-            
-            toReturn.compose(new SendToBackCommand(toOrder.getEditingDomain(),
-                (View) toOrder.getModel()));
-        }
-        
-        return new ICommandProxy( toReturn );
-    }
-    
-    /**
-     * Returns a command the moves the selected views one step toward the back
-     * @param request the ZOrder Request
-     * @return the command to execute
-     */
-    protected Command getSendBackwardCommand( ZOrderRequest request ) {
-
-        CompositeCommand toReturn = new CompositeCommand( "" ); //$NON-NLS-1$
-        
-        // Create commands for each view to move
-        for (Iterator iter = sortSelection(request.getPartsToOrder()).iterator(); iter.hasNext();) {
-            IGraphicalEditPart toOrder = (IGraphicalEditPart) iter.next();
-            
-            toReturn.compose(new SendBackwardCommand(
-                toOrder.getEditingDomain(), (View) toOrder.getModel()));
-        }
-        
-        return new ICommandProxy( toReturn );
-    }
-
-    /**
-     * gets an arrange command 
-     * @param request
-     * @return command
-     */
-    protected Command getArrangeCommand(ArrangeRequest request) {
-        
-        if (RequestConstants.REQ_ARRANGE_DEFERRED.equals(request.getType())) {
-            String layoutType = request.getLayoutType();
-            TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-                .getEditingDomain();
-            return new ICommandProxy(
-                new DeferredLayoutCommand(editingDomain,
-                    request.getViewAdaptersToArrange(),
-                    (IGraphicalEditPart) getHost(),
-                    layoutType));
-        }
-        
-        String layoutDesc = request.getLayoutType() != null ? request.getLayoutType() : LayoutType.DEFAULT;
-        
-        boolean offsetFromBoundingBox = false;
-        List<IGraphicalEditPart> editparts = new ArrayList<IGraphicalEditPart>();
-        
-        if ( (ActionIds.ACTION_ARRANGE_ALL.equals(request.getType())) || 
-             (ActionIds.ACTION_TOOLBAR_ARRANGE_ALL.equals(request.getType()))) {
-            editparts = ((IGraphicalEditPart)getHost()).getChildren();          
-            request.setPartsToArrange(editparts);
-        }
-        if ( (ActionIds.ACTION_ARRANGE_SELECTION.equals(request.getType())) ||
-             (ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION.equals(request.getType()))) {
-            editparts = request.getPartsToArrange();
-            offsetFromBoundingBox = true;
-        } 
-        if (RequestConstants.REQ_ARRANGE_RADIAL.equals(request.getType())) {
-            editparts = request.getPartsToArrange();
-            offsetFromBoundingBox = true;
-            layoutDesc = LayoutType.RADIAL;
-        }
-        
-        if (editparts.isEmpty())
-            return null;
-        
-        List hints = new ArrayList(2);
-        hints.add(layoutDesc);
-        hints.add(getHost());
-        IAdaptable layoutHint = new ObjectAdapter(hints);
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-        	.getEditingDomain(); 
-        
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(editingDomain, StringStatics.BLANK);
-        ctc.add(new ArrangeCommand(editingDomain, StringStatics.BLANK, null, editparts, layoutHint, offsetFromBoundingBox));
-        
-        //retrieves the preference store from the first edit part
-        IGraphicalEditPart firstEditPart = (IGraphicalEditPart)editparts.get(0);
-        if (firstEditPart.getViewer() instanceof DiagramGraphicalViewer){           
-             IPreferenceStore preferenceStore = ((DiagramGraphicalViewer)firstEditPart.getViewer())
-            .getWorkspaceViewerPreferenceStore();
-             if (preferenceStore != null && preferenceStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID)){
-             	Command snapCmd = getSnapCommand(request);
-            	if (snapCmd != null) {
-            		ctc.add(new CommandProxy(getSnapCommand(request)));
-            	}
-             }      
-        }   
-        
-        return new ICommandProxy(ctc);
-    }
-    
-    /**
-     * @param offsetFromBoundingBox
-     * @param nodes
-     * @param layoutHint
-     * @return runnable
-     * 
-     * @deprecated call the {@link LayoutService} directly
-     */
-    public Runnable layoutNodes(List nodes, boolean offsetFromBoundingBox, IAdaptable layoutHint) {
-        final Runnable layoutRun =  LayoutService.getInstance().layoutLayoutNodes(nodes, offsetFromBoundingBox, layoutHint);
-        return layoutRun;
-    }
-
-    /**
-     * Returns a command to to duplicate views and their underlying semantic
-     * elements (if applicable) of the given editparts.
-     * 
-     * @param request
-     *            the <code>DuplicateElementsRequest</code> whose list of duplicated
-     *            views will be populated when the command is executed
-     * @return the command to perform the duplication
-     */
-    private Command getDuplicateCommand(DuplicateRequest request) {
-        List notationViewsToDuplicate = new ArrayList();
-        Set elementsToDuplicate = new HashSet();
-
-        for (Iterator iter = request.getEditParts().iterator(); iter.hasNext();) {
-            Object ep = iter.next();
-            
-            // Disable duplicate on groups for now.  See bugzilla 182972.
-            if (ep instanceof GroupEditPart) {
-                return UnexecutableCommand.INSTANCE;
-            }
-            
-            if (ep instanceof ConnectionEditPart || ep instanceof ShapeEditPart
-                || ep instanceof ListItemEditPart) {
-                                
-                View notationView = (View)((IGraphicalEditPart) ep).getModel();
-                if (notationView != null) {
-                    notationViewsToDuplicate.add(notationView);
-                }
-            }
-        }
-        
-        // Remove views whose container view is getting copied.
-        ClipboardSupportUtil.getCopyElements(notationViewsToDuplicate);
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
-        
-        for (Iterator iter = notationViewsToDuplicate.iterator(); iter
-                .hasNext();) {
-            View view = (View) iter.next();
-            EObject element = view.getElement();
-
-            if (element != null) {
-                EObject resolvedElement = EMFCoreUtil.resolve(editingDomain,
-                        element);
-                if (resolvedElement != null) {
-                    elementsToDuplicate.add(resolvedElement);
-                }
-            }
-        }
-
-        /*
-         * We must append all inner edges of a node being duplicated. Edges are non-containment
-         * references, hence they won't be duplicated for free. Therefore, we add them here to
-         * the list views to duplicate.
-         * We don't add semantic elements of the edges to the list of semantic elements to duplicate
-         * since we assume that their semantic elements are owned by source or target or their semantic
-         * containers. 
-         */
-        /**
-         * Until duplicate views action enablement is driven by the created duplicate views command,
-         * we can't look for edges to duplicate. It's a performance hit.
-         */
-//        List<Edge> allInnerEdges = new LinkedList<Edge>();
-//        for (Iterator itr = notationViewsToDuplicate.iterator(); itr.hasNext();) {
-//        	allInnerEdges.addAll(ViewUtil.getAllInnerEdges((View) itr.next()));
-//        }
-//        notationViewsToDuplicate.addAll(allInnerEdges);
-        
-        if (!notationViewsToDuplicate.isEmpty()) {
-            if (!elementsToDuplicate.isEmpty()) {
-                org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest duplicateElementsRequest = new DuplicateElementsRequest(
-                    editingDomain, new ArrayList(elementsToDuplicate));
-                
-                Command duplicateElementsCommand = getHost().getCommand(
-                    new EditCommandRequestWrapper(duplicateElementsRequest, request.getExtendedData()));
-                if (duplicateElementsCommand != null
-                    && duplicateElementsCommand.canExecute()) {
-                    CompositeCommand cc = new CompositeCommand(
-                        DiagramUIMessages.Commands_Duplicate_Label);
-                    cc
-                        .compose(new CommandProxy(
-                            duplicateElementsCommand));
-                    
-                    cc.compose(new DuplicateViewsCommand(editingDomain,
-                        DiagramUIMessages.Commands_Duplicate_Label,
-                        request, notationViewsToDuplicate,
-                        duplicateElementsRequest.getAllDuplicatedElementsMap(), getDuplicateViewsOffset(request)));
-                    return new ICommandProxy(cc);
-                }
-            } else {
-                return new ICommandProxy(new DuplicateViewsCommand(editingDomain,
-                    DiagramUIMessages.Commands_Duplicate_Label,
-                    request, notationViewsToDuplicate, getDuplicateViewsOffset(request)));
-            }
-        }
-        return null;
-    }
-    
-    private Point getDuplicateViewsOffset(DuplicateRequest request) {
-        if (request.getOffset() != null) {
-            return request.getOffset();
-        }
-        int offset = MapModeUtil.getMapMode(
-            ((org.eclipse.gef.GraphicalEditPart) getHost()).getFigure())
-            .DPtoLP(10);
-        return new Point(offset, offset);
-    }
-    
-    private Command getSnapCommand(Request request){
-            
-        List editparts = null;
-        if (request instanceof GroupRequest){           
-            editparts =  ((GroupRequest)request).getEditParts();
-        }   
-        else if (request instanceof ArrangeRequest){
-            editparts = ((ArrangeRequest)request).getPartsToArrange();
-        }
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-                .getEditingDomain();
-        if (editparts != null){
-            return new ICommandProxy(new SnapCommand(editingDomain, editparts));
-        }       
-        return null;
-    }
-    
-    /**
-     * @see org.eclipse.gef.EditPolicy#getCommand(Request)
-     */
-    public Command getCommand(Request request) {
-        if (ActionIds.ACTION_GROUP.equals(request.getType())
-            && request instanceof GroupRequest) {
-            return getGroupCommand((GroupRequest) request);
-        } 
-        else if (request instanceof ArrangeRequest) {
-            return getArrangeCommand((ArrangeRequest)request);
-        }       
-        
-        if (RequestConstants.REQ_SNAP_TO_GRID.equals(request.getType())){
-            return getSnapCommand(request);
-        }
-        
-        if (RequestConstants.REQ_REFRESH.equals(request.getType())) {
-            IGraphicalEditPart containerEP = (IGraphicalEditPart) getHost();
-
-            CompositeCommand cc = new CompositeCommand(""); //$NON-NLS-1$
-            ListIterator li = containerEP.getChildren().listIterator();
-            while (li.hasNext()) {
-                cc.compose(
-                    new RefreshEditPartCommand(
-                        (IGraphicalEditPart) li.next(),
-                        false));
-            }
-            cc.compose(
-                new RefreshEditPartCommand(
-                    (IGraphicalEditPart) getHost(),
-                    true));
-
-            return new ICommandProxy(cc);
-        }
-
-        if (RequestConstants.REQ_PASTE.equals(request.getType())) {
-            return getPasteCommand((PasteViewRequest) request);
-        }
-
-        if (RequestConstants.REQ_DUPLICATE.equals(request.getType())) {
-            return getDuplicateCommand(((DuplicateRequest) request));
-        }
-
-        if (ZOrderRequest.REQ_BRING_TO_FRONT.equals(request.getType())) {
-            return getBringToFrontCommand((ZOrderRequest) request);
-        }
-        
-        if (ZOrderRequest.REQ_BRING_FORWARD.equals(request.getType())) {
-            return getBringForwardCommand((ZOrderRequest) request);
-        }
-        
-        if (ZOrderRequest.REQ_SEND_TO_BACK.equals(request.getType())) {
-            return getSendToBackCommand((ZOrderRequest) request);
-        }
-        
-        if (ZOrderRequest.REQ_SEND_BACKWARD.equals(request.getType())) {
-            return getSendBackwardCommand((ZOrderRequest) request);
-        }
-
-        return super.getCommand(request);
-    }
-
-    /**
-     * Returns a command to group the editparts in the request.
-     * 
-     * @param request
-     *            the request containing the editparts to be grouped.
-     * @return the command to perform the grouping
-     */
-    protected Command getGroupCommand(GroupRequest request) {
-        List shapeViews = new LinkedList();
-        IGraphicalEditPart parentEP = null;
-        for (Iterator iter = request.getEditParts().iterator(); iter.hasNext();) {
-            Object editpart = iter.next();
-
-            if (editpart instanceof ShapeEditPart) {
-
-                if (!((IEditableEditPart) editpart).isEditModeEnabled()) {
-                    return null;
-                }
-                
-                if (editpart instanceof IBorderItemEditPart) {
-                    return null;
-                }
-
-                if (parentEP != null) {
-                    if (parentEP != ((ShapeEditPart) editpart).getParent()) {
-                        // can only group shapes with the same parent
-                        return null;
-                    }
-                } else {
-                    parentEP = (IGraphicalEditPart) ((ShapeEditPart) editpart)
-                        .getParent();
-                }
-
-                if (((ShapeEditPart) editpart).getModel() instanceof Node) {
-                    shapeViews.add(((ShapeEditPart) editpart).getModel());
-                }
-            }
-        }
-
-        if (parentEP == null || !parentEP.isEditModeEnabled()) {
-            return null;
-        }
-
-        GroupCommand cmd = new GroupCommand(((IGraphicalEditPart) getHost())
-            .getEditingDomain(), shapeViews);
-        return new ICommandProxy(cmd);
-    }
-
-    /**
-     * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-     */
-    public EditPart getTargetEditPart(Request request) {
-		if (isArrangeRequest(request)) {
-			if (getHost() instanceof GraphicalEditPart
-					&& !(((GraphicalEditPart) getHost()).getContentPane()
-							.getLayoutManager() instanceof XYLayout)) {
-				return getHost().getParent() != null ? getHost().getParent().getTargetEditPart(request)
-						: null;
-			}
-		}
-		return understandsRequest(request) ? getHost() : null;
-	}
-
-    /**
-     * @see org.eclipse.gef.EditPolicy#understandsRequest(org.eclipse.gef.Request)
-     */
-    public boolean understandsRequest(Request request) {
-        return ( isArrangeRequest(request)
-                || ActionIds.ACTION_GROUP.equals(request.getType())
-                || RequestConstants.REQ_REFRESH.equals(request.getType())
-                || RequestConstants.REQ_PASTE.equals(request.getType())
-                || RequestConstants.REQ_DUPLICATE.equals(request.getType())
-                || RequestConstants.REQ_SNAP_TO_GRID.equals(request.getType())
-                || ZOrderRequest.REQ_BRING_TO_FRONT.equals(request.getType())
-                || ZOrderRequest.REQ_BRING_FORWARD.equals(request.getType())
-                || ZOrderRequest.REQ_SEND_TO_BACK.equals(request.getType())
-                || ZOrderRequest.REQ_SEND_BACKWARD.equals(request.getType()));
-    }
-    
-    /**
-     * Checks whether the request is some type of arrange request
-     * 
-     * @param request the request
-     * @return <code>true</code> if the request is an arrange request
-     * @since 1.4
-     */
-    final protected boolean isArrangeRequest(Request request) {
-        return ActionIds.ACTION_ARRANGE_ALL.equals(request.getType())
-        || ActionIds.ACTION_TOOLBAR_ARRANGE_ALL.equals(request.getType())
-        || ActionIds.ACTION_ARRANGE_SELECTION.equals(request.getType())
-        || ActionIds.ACTION_TOOLBAR_ARRANGE_SELECTION.equals(request.getType())             
-        || RequestConstants.REQ_ARRANGE_RADIAL.equals(request.getType())
-        || RequestConstants.REQ_ARRANGE_DEFERRED.equals(request.getType());
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerNodeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerNodeEditPolicy.java
deleted file mode 100644
index 6e1f6b3..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerNodeEditPolicy.java
+++ /dev/null
@@ -1,157 +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.editpolicies;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateViewAndOptionallyElementCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewAndElementCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * This is installed on a container editpart. It is responsible for creating
- * connections from a source shape to an unspecified target and a target shape to
- * an unspecified source. A popup will appear asking the user to select or
- * create a new source or target element. This will handle both single create
- * connection requests and multi connection requests (i.e. where the popup also
- * prompts the user for the type of relationship to created).
- * 
- * @author cmahoney
- */
-public class ContainerNodeEditPolicy
-	extends GraphicalNodeEditPolicy {
-
-	/**
-	 * Only handles connection end requests. Cannot start a connection on a
-	 * container.
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_CONNECTION_END.equals(request.getType())
-			&& request instanceof CreateConnectionRequest) {
-			return getConnectionAndEndCommands((CreateConnectionRequest) request);
-		}
-		return null;
-	}
-
-	/**
-	 * Creates the command to prompt the user for the relationship type
-	 * (optionally) and the element to be used for the unspecified end, and the
-	 * create commands necessary to create the views and elements.
-	 * 
-	 * @param request
-	 *            A single create connection request or unspecified connection
-	 *            requests (i.e. where the popup also prompts the user for the
-	 *            type of relationship to created).
-	 * @return the command
-	 */
-	protected Command getConnectionAndEndCommands(
-			CreateConnectionRequest request) {
-
-		CompoundCommand cc = new CompoundCommand(DiagramUIMessages.Command_CreateRelationship_Label);
-
-		// Flags the case where the connection is to be created from a known
-		// target
-		// to unspecified source.
-		boolean isDirectionReversed = request instanceof CreateUnspecifiedTypeConnectionRequest
-			&& ((CreateUnspecifiedTypeConnectionRequest) request)
-				.isDirectionReversed();
-
-		// Adds the command for the popup menu to get the relationship type and
-		// end element.
-		PromptForConnectionAndEndCommand menuCmd = getPromptForConnectionAndEndCommand(
-			request);
-		cc.add(new ICommandProxy(menuCmd));
-
-		// Adds the command to create a view (and optionally an element) for
-		// the other end.
-		CreateViewAndOptionallyElementCommand createOtherEndCmd = getCreateOtherEndCommand(
-			menuCmd.getEndAdapter(), request.getLocation());
-		cc.add(new ICommandProxy(createOtherEndCmd));
-		
-		// Adds the command to create the connection view and element.
-		ICommand connectionCmd = isDirectionReversed 
-			? getCreateConnectionCommand( 
-				request,
-				menuCmd.getConnectionAdapter(),
-				createOtherEndCmd.getResult(), 
-				request.getSourceEditPart())
-			: getCreateConnectionCommand(
-				request,
-				menuCmd.getConnectionAdapter(), 
-				request.getSourceEditPart(),
-				createOtherEndCmd.getResult());	
-			
-		cc.add(new ICommandProxy(connectionCmd));
-
-		return cc;
-	}
-	
-	/**
-	 * Gets a command that pops up a menu which can allow the user to select the
-	 * type of connector to be created and whether they want to create a new
-	 * type or select an existing element for the other end of the connector.
-	 * 
-	 * @param request
-	 *            A single create connection request or unspecified connection
-	 *            requests (i.e. where the popup also prompts the user for the
-	 *            type of relationship to created).
-	 * @return the command to popup up the menu
-	 */
-	protected PromptForConnectionAndEndCommand getPromptForConnectionAndEndCommand(
-			CreateConnectionRequest request) {
-		return new PromptForConnectionAndEndCommand(request,
-			(IGraphicalEditPart) getHost());
-	}
-
-	/**
-	 * Called by {@link #getConnectionAndEndCommands}.
-	 * @param endAdapter the end adapter 
-	 * @param location the location
-	 * @return command
-	 */
-	protected CreateViewAndOptionallyElementCommand getCreateOtherEndCommand(
-			IAdaptable endAdapter, Point location ) {
-		return new CreateViewAndOptionallyElementCommand(endAdapter,
-			(IGraphicalEditPart) getHost(), location,
-			((IGraphicalEditPart) getHost()).getDiagramPreferencesHint());
-	}
-	
-	/**
-	 * Called by {@link #getConnectionAndEndCommands} .
-	 * @param request the create connection request
-	 * @param typeInfoAdapter
-	 * @param sourceViewAdapter
-	 * @param targetViewAdapter
-	 * @return a <code>DeferredCreateConnectionViewAndElementCommand</code>
-	 */
-	protected ICommand getCreateConnectionCommand(
-			CreateRequest request,
-			IAdaptable typeInfoAdapter,
-			IAdaptable sourceViewAdapter,
-			IAdaptable targetViewAdapter) {
-		return new DeferredCreateConnectionViewAndElementCommand(request,
-			typeInfoAdapter, sourceViewAdapter, targetViewAdapter, getHost()
-				.getViewer());
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CreationEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CreationEditPolicy.java
deleted file mode 100644
index 189a4d9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/CreationEditPolicy.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-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.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-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.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-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.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.AddCommand;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandUtilities;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This edit policy returns the command that will create a new notational view
- * for a the given request.
- * 
- * @author choang
- */
-public class CreationEditPolicy extends AbstractEditPolicy {
-	
-	/**
-	 * @return Command for the REQ_CREATE request. If the request is of type
-	 *         CreateViewAndElementRequest then a command to create the
-	 *         semantic, and the view will
-	 * @see org.eclipse.gef.EditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (understandsRequest(request)) {
-			if (request instanceof CreateUnspecifiedTypeRequest) {
-				return getUnspecifiedTypeCreateCommand((CreateUnspecifiedTypeRequest) request);
-			} else if (request instanceof CreateViewAndElementRequest) {
-				return getCreateElementAndViewCommand(
-					(CreateViewAndElementRequest)request);
-			}
-			else if (request instanceof CreateViewRequest) {
-				return getCreateCommand((CreateViewRequest)request);
-			}
-			else if (request instanceof ChangeBoundsRequest) {
-				return getReparentCommand((ChangeBoundsRequest)request);
-			}
-			return super.getCommand(request);
-		}
-		return null;
-	}
-
-	/** Understands <tt>REQ_CREATE</tt> and <tt>REQ_ADD</tt> request types. */
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_CREATE.equals(request.getType())
-		    || RequestConstants.REQ_ADD.equals(request.getType())
-			|| super.understandsRequest(request);
-	}
-	
-	/**
-	 * Determines if a semantic reparent is being performed.
-	 * @param element element being reparented
-	 * @param newContext the new container element
-	 * @return <tt>true</tt> if the supplied elemnet's container is
-	 * not equals to the supplied <code>newContext</code>.\; otherwise <tt>false</tt>.
-	 */
-	protected boolean shouldReparent( EObject element, EObject newContext ) {
-		return !(element == null ||
-				element == newContext ||
-				element.eContainer() == newContext ||
-				isContainedIn( element, newContext )
-				);
-	}
-	
-	/*
-	 * This method checks to see element's containment tree already includes
-	 * itself.  This is necessary to prevent cyclic graphs in the model that
-	 * cause StackOverflowExceptions.
-	 */
-	private boolean isContainedIn( EObject element, EObject newContext )
-	{
-		EObject container = newContext.eContainer();
-		while( container != null ) {
-			if( container.equals(element) )
-				return true;
-			container = container.eContainer();
-		}
-		return false;
-	}
-
-	/** Return a command to reparent both the semantic and view elements. */
-	/**
-	 * return a command to reparent both the semantic and view elements. 
-	 * @param request the request
-	 * @return command
-	 */
-	protected Command getReparentCommand(ChangeBoundsRequest request) {
-		Iterator editParts = request.getEditParts().iterator();
-		View container = (View)getHost().getAdapter(View.class);
-		EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container);
-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label);
-		while ( editParts.hasNext() ) {
-			EditPart ep = (EditPart)editParts.next();
-			if ( ep instanceof LabelEditPart ) {
-				continue;
-			}
-			if (ep instanceof GroupEditPart) {
-                cc.compose(getReparentGroupCommand((GroupEditPart) ep));
-            }		
-			View view = (View)ep.getAdapter(View.class);
-			if ( view == null ) {
-				continue;
-			}
-			
-			EObject semantic = ViewUtil.resolveSemanticElement(view);
-			if ( semantic == null ) {
-				cc.compose(getReparentViewCommand((IGraphicalEditPart)ep));
-			}
-			else if ( context != null && shouldReparent(semantic, context)) {
-				cc.compose(getReparentCommand((IGraphicalEditPart)ep));
-			}
-		}
-		return cc.isEmpty() ? null : new ICommandProxy(cc.reduce());
-	}
-	
-    /**
-     * Return the command to reparent the supplied group editpart's semantic and
-     * notation elements.
-     * 
-     * @param gep
-     *            the groupEP editpart being reparented
-     * @return A composite command that will reparent both the semantic and
-     *         notation elements of the group.
-     */
-    protected ICommand getReparentGroupCommand(GroupEditPart groupEP) {
-        CompositeCommand cc = new CompositeCommand(
-            DiagramUIMessages.AddCommand_Label);
-        View container = (View) getHost().getModel();
-        EObject context = ViewUtil.resolveSemanticElement(container);
-
-        // semantic
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        for (Iterator iter = groupEP.getShapeChildren().iterator(); iter
-            .hasNext();) {
-            IGraphicalEditPart childEP = (IGraphicalEditPart) iter.next();
-            EObject element = ViewUtil.resolveSemanticElement((View) childEP
-                .getModel());
-            if (element != null) {
-                Command moveSemanticCmd = getHost().getCommand(
-                    new EditCommandRequestWrapper(new MoveRequest(
-                        editingDomain, context, element)));
-
-                if (moveSemanticCmd == null) {
-                    return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-                }
-
-                cc.compose(new CommandProxy(moveSemanticCmd));
-            }
-        }
-
-        // notation
-        cc.compose(getReparentViewCommand(groupEP));
-        return cc;
-    }
-	
-	/** 
-	 * Return the command to reparent the supplied editpart's semantic and notation
-	 * elements.
-	 * @param gep the editpart being reparented
-	 * @return A CompositeCommand2 that will reparent both the semantic and notation elements.
-	 */
-	protected ICommand getReparentCommand( IGraphicalEditPart gep ) {
-        CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label); 
-		View container = (View)getHost().getModel();
-		EObject context = ViewUtil.resolveSemanticElement(container);
-		View view = (View)gep.getModel();
-		EObject element = ViewUtil.resolveSemanticElement(view);
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-        //
-		// semantic
-		if ( element != null ) {
-			Command moveSemanticCmd =
-				getHost().getCommand(
-					new EditCommandRequestWrapper(
-						new MoveRequest(editingDomain, context, element)));
-            
-              if (moveSemanticCmd == null) {
-                  return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-              }
-			
-			cc.compose ( new CommandProxy(moveSemanticCmd) );
-		}
-		//
-		// notation
-		cc.compose(getReparentViewCommand(gep));
-		return cc;
-	}
-	
-	/** 
-	 * Return the command to reparent the supplied editpart's view only.
-	 * @param gep the editpart being reparented
-	 * @return A command to reparent the notation element.
-	 */
-	protected ICommand getReparentViewCommand( IGraphicalEditPart gep ) {
-		View container = (View)getHost().getModel();
-		View view = (View)gep.getModel();
-		return new AddCommand(gep.getEditingDomain(), new EObjectAdapter(container),
-							  new EObjectAdapter(view));
-	}
-	
-	/**
-	 * Called in response to a <tt>REQ_CREATE</tt> request.
-	 * 
-	 * Creates a compound command and populated with the following commands for
-	 * each element to be created: <BR>
-	 * <OL>
-	 * <LI>a {@link CreateCommand}for each of the request's view descriptor.
-	 * </OL>
-	 * 
-	 * @param request
-	 *            a create request (understands instances of
-	 *            {@link CreateViewRequest}).
-	 * @return a command to satify the request; <tt>null</tt> if the request
-	 *         is not understood.
-	 */
-	protected Command getCreateCommand(CreateViewRequest request) {
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        CompositeTransactionalCommand cc = new CompositeTransactionalCommand(
-            editingDomain, DiagramUIMessages.AddCommand_Label);
-        
-        Iterator descriptors = request.getViewDescriptors().iterator();
-
-		while (descriptors.hasNext()) {
-			CreateViewRequest.ViewDescriptor descriptor =
-				(CreateViewRequest.ViewDescriptor)descriptors.next();
-
-			CreateCommand createCommand =
-				new CreateCommand(editingDomain,
-					descriptor, 
-					(View)(getHost().getModel()));
-
-			cc.compose(createCommand);
-		}
-		return new ICommandProxy(cc.reduce());
-
-	}
-
-	/**
-	 * Method getCreateElementAndViewCommand.
-	 * 
-	 * @param request
-	 * @return Command Which creates the sematnic and the view command for the
-	 *         given CreateViewAndElementRequest
-	 */
-	protected Command getCreateElementAndViewCommand(CreateViewAndElementRequest request) {
-		// get the element descriptor
-		CreateElementRequestAdapter requestAdapter =
-			request.getViewAndElementDescriptor().getCreateElementRequestAdapter();
-
-		// get the semantic request
-		CreateElementRequest createElementRequest =
-			(CreateElementRequest) requestAdapter.getAdapter(
-				CreateElementRequest.class);
-
-		if (createElementRequest.getContainer() == null) {
-			// complete the semantic request by filling in the host's semantic
-			// element as the context
-			View view = (View)getHost().getModel();
-			EObject hostElement = ViewUtil.resolveSemanticElement(view);
-			
-			if (hostElement == null && view.getElement() == null) {
-				hostElement = view;
-			}			
-
-			// Returns null if host is unresolvable so that trying to create a
-			// new element in an unresolved shape will not be allowed.
-			if (hostElement == null) {
-				return null;
-			}
-			createElementRequest.setContainer(hostElement);
-		}
-
-		// get the create element command based on the elementdescriptor's
-		// request
-		Command createElementCommand =
-			getHost().getCommand(
-				new EditCommandRequestWrapper(
-					(CreateElementRequest)requestAdapter.getAdapter(
-						CreateElementRequest.class), request.getExtendedData()));
-
-		if (createElementCommand == null) { 
-			return UnexecutableCommand.INSTANCE;
-		}		
-		if(!createElementCommand.canExecute()){
-			return createElementCommand;
-		}
-		// create the semantic create wrapper command
-		SemanticCreateCommand semanticCommand =
-			new SemanticCreateCommand(requestAdapter, createElementCommand);
-		Command viewCommand = getCreateCommand(request);
-
-		Command refreshConnectionCommand =
-			getHost().getCommand(
-				new RefreshConnectionsRequest(((List)request.getNewObject())));
-
-
-		// form the compound command and return
-        CompositeCommand cc = new CompositeCommand(semanticCommand.getLabel());
-		cc.compose(semanticCommand);
-		cc.compose(new CommandProxy(viewCommand));
-		if ( refreshConnectionCommand != null ) {
-			cc.compose(new CommandProxy(refreshConnectionCommand));
-		}
-
-		return new ICommandProxy(cc);
-	}
-
-	/**
-	 * Gets the command to create a new view (and optionally element) for an
-	 * unspecified type request. This command includes a command to popup a menu
-	 * to prompt the user for the type to be created.
-	 * 
-	 * @param request
-	 *            the unspecified type request
-	 * @return the command
-	 */
-	private Command getUnspecifiedTypeCreateCommand(
-			final CreateUnspecifiedTypeRequest request) {
-
-		final Map createCmds = new HashMap();
-		List validTypes = new ArrayList();
-		for (Iterator iter = request.getElementTypes().iterator(); iter
-			.hasNext();) {
-			IElementType elementType = (IElementType) iter.next();
-			Request createRequest = request.getRequestForType(elementType);
-			if (createRequest != null) {
-				EditPart target = getHost().getTargetEditPart(createRequest);
-				if ( target == null )  {
-					continue;
-				}
-				Command individualCmd = target.getCommand(createRequest);
-
-				if (individualCmd != null && individualCmd.canExecute()) {
-					createCmds.put(elementType, individualCmd);
-					validTypes.add(elementType);
-				}
-			}
-		}
-
-		if (createCmds.isEmpty()) {
-			return null;
-		} else if (createCmds.size() == 1) {
-			return (Command) createCmds.values().toArray()[0];
-		} else {
-			CreateOrSelectElementCommand selectAndCreateViewCmd = new CreateOrSelectElementCommand(
-                DiagramUIMessages.CreateCommand_Label, Display.getCurrent()
-                    .getActiveShell(), validTypes) {
-				
-				private Command _createCmd;
-				/**
-				 * Execute the command that prompts the user with the popup
-				 * menu, then executes the command prepared for the element
-				 * type that the user selected.
-				 */
-				protected CommandResult doExecuteWithResult(
-                        IProgressMonitor progressMonitor, IAdaptable info)
-                    throws ExecutionException {
-                    
-					CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);
-					if (!cmdResult.getStatus().isOK()) {
-						return cmdResult;
-					}
-
-					IElementType type = (IElementType) cmdResult
-						.getReturnValue();
-
-					_createCmd = (Command) createCmds.get(type);
-					Assert.isTrue(_createCmd != null && _createCmd.canExecute());
-					
-					// validate the affected files
-					IStatus status = validateAffectedFiles(_createCmd);
-					if (!status.isOK()) {
-						return new CommandResult(status);
-					}
-					
-					_createCmd.execute();
-
-					// Set the result in the unspecified type request.
-					CreateRequest createRequest = request
-						.getRequestForType(type);
-                    
-                    Collection newObject = ((Collection) createRequest
-                            .getNewObject());
-					request.setNewObject(newObject);
-
-					return CommandResult.newOKCommandResult(newObject);
-				}
-				
-				protected CommandResult doUndoWithResult(
-                        IProgressMonitor progressMonitor, IAdaptable info)
-                    throws ExecutionException {
-                    
-					if (_createCmd != null && _createCmd.canUndo() ) {
-						// validate the affected files
-						IStatus status = validateAffectedFiles(_createCmd);
-						if (!status.isOK()) {
-							return new CommandResult(status);
-						}
-						_createCmd.undo();
-					}
-					return super.doUndoWithResult(progressMonitor, info);
-				}
-				
-				protected CommandResult doRedoWithResult(
-                        IProgressMonitor progressMonitor, IAdaptable info)
-                    throws ExecutionException {
-                    
-					if (_createCmd != null && CommandUtilities.canRedo(_createCmd)) {
-						// validate the affected files
-						IStatus status = validateAffectedFiles(_createCmd);
-						if (!status.isOK()) {
-							return new CommandResult(status);
-						}
-						_createCmd.redo();
-					}
-					return super.doRedoWithResult(progressMonitor, info);
-				}
-				
-				private IStatus validateAffectedFiles(Command command) {
-					Collection affectedFiles = CommandUtilities
-							.getAffectedFiles(command);
-					int fileCount = affectedFiles.size();
-					if (fileCount > 0) {
-						return FileModificationValidator
-								.approveFileModification((IFile[]) affectedFiles
-										.toArray(new IFile[fileCount]));
-					}
-					return Status.OK_STATUS;
-				}
-			};
-
-			return new ICommandProxy(selectAndCreateViewCmd);
-		}
-	}
-	
-	/** Return the host if this editpolicy understands the supplied request. */
-	public EditPart getTargetEditPart(Request request) {
-		return understandsRequest(request) ? getHost() : null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java
deleted file mode 100644
index 11c1a55..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator.DecoratorService;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.Decoration;
-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.diagram.ui.services.decorator.IDecoratorTarget.Direction;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ImageFigureEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OnConnectionLocator;
-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.internal.editpolicies.GraphicalEditPolicyEx;
-import org.eclipse.gmf.runtime.gef.ui.internal.figures.RelativeToBorderLocator;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This editpolicy is responsible for adding the decorations from the
- * <code>DecoratorService</code>. The decorations are added to a different
- * layer so that they have the option of being printed or not.
- * 
- * @author cmahoney
- */
-public class DecorationEditPolicy
-	extends GraphicalEditPolicyEx {
-
-	/**
-	 * The decoratorTarget object to be passed to the service. This serves as a
-	 * wrapper around this editpolicy.
-	 */
-	public class DecoratorTarget
-		implements IDecoratorTarget {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget#installDecorator(java.lang.Object,
-		 *      org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator)
-		 */
-		public void installDecorator(Object key, IDecorator decorator) {
-			Assert.isNotNull(key, "Decorators must be installed with keys"); //$NON-NLS-1$
-			decorators.put(key, decorator);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			return getHost().getAdapter(adapter);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget#createShapeDecoration(null,
-		 *      int, int, boolean)
-		 */
-		public IDecoration addShapeDecoration(Image image, Direction direction,
-				int margin, boolean isVolatile) {
-
-			IMapMode mm = MapModeUtil.getMapMode(((GraphicalEditPart)getHost()).getFigure());
-			ImageFigureEx figure = new ImageFigureEx();
-			figure.setImage(image);
-			figure.setSize(mm.DPtoLP(image.getBounds().width), mm
-				.DPtoLP(image.getBounds().height));
-
-			return addShapeDecoration(figure, direction, margin, isVolatile);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget#createConnectionDecoration(null,
-		 *      int, boolean)
-		 */
-		public IDecoration addConnectionDecoration(Image image,
-				int percentageFromSource, boolean isVolatile) {
-
-			IMapMode mm = MapModeUtil.getMapMode(((GraphicalEditPart)getHost()).getFigure());
-			ImageFigureEx figure = new ImageFigureEx();
-			figure.setImage(image);
-			figure.setSize(mm.DPtoLP(image.getBounds().width), mm
-				.DPtoLP(image.getBounds().height));
-
-			return addConnectionDecoration(figure, percentageFromSource,
-				isVolatile);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget#deleteDecoration(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration)
-		 */
-		public void removeDecoration(IDecoration decoration) {
-			if (decoration instanceof IFigure) {
-				((IFigure) decoration).getParent().remove((IFigure) decoration);
-			}
-            GraphicalEditPart ownerEditPart = (GraphicalEditPart) getAdapter(GraphicalEditPart.class);
-            ownerEditPart.getViewer().getVisualPartMap().remove(decoration);           
-		}
-
-		public IDecoration addShapeDecoration(IFigure figure,
-				Direction direction, int margin, boolean isVolatile) {
-
-			return addDecoration(figure, new RelativeToBorderLocator(
-				((GraphicalEditPart) getAdapter(GraphicalEditPart.class))
-					.getFigure(), getPositionConstant(direction), margin),
-				isVolatile);
-		}
-
-		public IDecoration addConnectionDecoration(IFigure figure,
-				int percentageFromSource, boolean isVolatile) {
-
-			IFigure hostFigure = ((GraphicalEditPart) getAdapter(GraphicalEditPart.class))
-				.getFigure();
-			Assert.isTrue(hostFigure instanceof Connection);
-
-			return addDecoration(figure, new OnConnectionLocator(
-				(Connection) hostFigure, percentageFromSource), isVolatile);
-		}
-
-		public IDecoration addDecoration(IFigure figure, Locator locator,
-				boolean isVolatile) {
-
-			Decoration decoration = new Decoration();
-			decoration.add(figure);
-			decoration.setSize(figure.getSize());
-            
-            GraphicalEditPart ownerEditPart = (GraphicalEditPart) getAdapter(GraphicalEditPart.class);
-            decoration.setOwnerFigure(ownerEditPart.getFigure());
-			decoration.setLocator(locator);
-            
-            // Register this figure with it's owner editpart so mouse events
-            // will be propagated to it's host.
-            ownerEditPart.getViewer().getVisualPartMap().put(decoration,
-                ownerEditPart);
-
-			IFigure pane = getLayer(isVolatile ? DiagramRootEditPart.DECORATION_UNPRINTABLE_LAYER
-				: DiagramRootEditPart.DECORATION_PRINTABLE_LAYER);
-
-			pane.add(decoration);
-			return decoration;
-		}
-	}
-
-	/** the decorators */
-	protected Map decorators;
-
-	/**
-	 * Updates all the decorations for the host editpart by calling refresh() on
-	 * each of the decorators installed on this editpart. If this is the first
-	 * time refresh() is called, then the <code>DecorationService</code> is
-	 * first called to create the decorators.
-	 * 
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx#refresh()
-	 */
-	public void refresh() {
-		if (decorators == null) {
-			decorators = new HashMap();
-			DecoratorService.getInstance().createDecorators(
-				new DecoratorTarget());
-		}
-		for (Iterator iter = decorators.values().iterator(); iter.hasNext();) {
-			IDecorator decorator = (IDecorator) iter.next();
-			decorator.refresh();
-		}
-	}
-
-	/**
-	 * Activates all the decorators.
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#activate()
-	 */
-	public void activate() {
-		if (decorators == null) {
-			decorators = new HashMap();
-			DecoratorService.getInstance().createDecorators(
-				new DecoratorTarget());
-		}	
-		if (decorators != null) {
-			for (Iterator iter = decorators.values().iterator(); iter.hasNext();) {
-				IDecorator decorator = (IDecorator) iter.next();
-				decorator.activate();
-			}
-		}
-	}
-
-	/**
-	 * Deactivates all the decorators.
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#deactivate()
-	 */
-	public void deactivate() {
-		if (decorators != null) {
-			for (Iterator iter = decorators.values().iterator(); iter.hasNext();) {
-				IDecorator decorator = (IDecorator) iter.next();
-				decorator.deactivate();
-			}
-		}
-	}
-
-	/**
-	 * Returns the decorators
-	 * 
-	 * @return the decorators.
-	 */
-	protected final Map getDecorators() {
-		return this.decorators;
-	}
-
-	/**
-	 * Sets the decorators
-	 * 
-	 * @param decorators
-	 *            The decorators to set.
-	 */
-	protected final void setDecorators(Map decorators) {
-		this.decorators = decorators;
-	}
-
-	/**
-	 * Converts the direction to an int as defined in PositionConstant.
-	 * 
-	 * @param direction
-	 * @return the int as defined in PositionConstant
-	 */
-	public int getPositionConstant(Direction direction) {
-
-		if (direction == Direction.CENTER) {
-			return PositionConstants.CENTER;
-		} else
-
-		if (direction == Direction.NORTH) {
-			return PositionConstants.NORTH;
-		} else
-
-		if (direction == Direction.SOUTH) {
-			return PositionConstants.SOUTH;
-		} else
-
-		if (direction == Direction.WEST) {
-			return PositionConstants.WEST;
-		} else
-
-		if (direction == Direction.EAST) {
-			return PositionConstants.EAST;
-		} else
-
-		if (direction == Direction.NORTH_EAST) {
-			return PositionConstants.NORTH_EAST;
-		} else
-
-		if (direction == Direction.NORTH_WEST) {
-			return PositionConstants.NORTH_WEST;
-		} else
-
-		if (direction == Direction.SOUTH_EAST) {
-			return PositionConstants.SOUTH_EAST;
-		} else
-
-		if (direction == Direction.SOUTH_WEST) {
-			return PositionConstants.SOUTH_WEST;
-		}
-
-		return PositionConstants.CENTER;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DescriptionDirectEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DescriptionDirectEditPolicy.java
deleted file mode 100644
index 3926554..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DescriptionDirectEditPolicy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-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.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A direct edit policy for DescriptionCompartmentEditParts.
- * These edit parts do not necessarily have a model reference.
- * The direct edit policy will support editing for those edit parts
- * that do not have a model reference.
- * 
- * @author schafe
- * @since 1.2
- */
-public class DescriptionDirectEditPolicy extends LabelDirectEditPolicy {
-
-
-	protected Command getDirectEditCommand(DirectEditRequest edit) {
-		String labelText = (String) edit.getCellEditor().getValue();
-		ITextAwareEditPart compartment =
-			(ITextAwareEditPart) getHost();
-        IGraphicalEditPart gep = (IGraphicalEditPart)getHost();
-        
-		View primaryView = gep.getPrimaryView();
-		IAdaptable elementAdapter = new EObjectAdapter(primaryView);
-
-		// check to make sure an edit has occurred before returning a command.
-		String prevText =
-			compartment.getParser().getEditString(elementAdapter, 0);
-		if (!prevText.equals(labelText)) {
-			ICommand iCommand =
-				compartment.getParser().getParseCommand(
-					elementAdapter,
-					labelText,
-					0);
-			return new ICommandProxy(iCommand);
-		}
-
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramAssistantEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramAssistantEditPolicy.java
deleted file mode 100644
index ac4164e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramAssistantEditPolicy.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-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.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * Encapsulates behavior common to editpolicies that popup diagram assistants.
- * 
- * @author cmahoney
- */
-public abstract class DiagramAssistantEditPolicy
-	extends GraphicalEditPolicy
-	implements MouseMotionListener {
-    
-	/**
-	 * The <code>Job</code> used to show the diagram assistant after a certain
-	 * amount of time has passed.
-	 */
-	private class ShowDiagramAssistantJob
-		extends UIJob {
-
-		/** the mouse location when the job was created */
-		private Point originalMouseLocation;
-
-		/**
-         * Creates a new instance.
-         */
-        protected ShowDiagramAssistantJob() {
-            super("Show Diagram Assistant"); //$NON-NLS-1$
-            setSystem(true);
-        }
-
-		/**
-		 * Sets mouse location
-		 * 
-		 * @param originalMouseLocation
-		 *            the current mouse location
-		 */
-		public void setOriginalMouseLocation(Point originalMouseLocation) {
-			this.originalMouseLocation = originalMouseLocation;
-		}
-
-		/**
-		 * The diagram assistant added when this task is run if the mouse is
-		 * still at the same spot where it was when the timer was started (i.e.
-		 * only add the diagram assistant when the user stops moving the mouse).
-		 */
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			if (originalMouseLocation != null
-				&& originalMouseLocation.equals(getMouseLocation())) {
-				if (isDiagramAssistantShowing()
-					&& !shouldAvoidHidingDiagramAssistant()) {
-					hideDiagramAssistant();
-				}
-				if (shouldShowDiagramAssistant()) {
-
-                    // Cancel the hide diagram assistant job for this host if it
-                    // is waiting to run.
-                    hideDiagramAssistantJob.cancel();
-
-                    // Schedule any hide diagram assistant jobs on other
-                    // editparts to run immediately to avoid duplicate diagram
-                    // assistants showing.
-                    if (getDiagramAssistantID() != null) {
-                        Job.getJobManager().wakeUp(getDiagramAssistantID());
-                    }
-
-					showDiagramAssistant(originalMouseLocation);
-				}
-			}
-			return Status.OK_STATUS;
-		}
-	}
-
-	/**
-	 * The <code>Job</code> used to hide the diagram assistant after a certain
-	 * amount of time has passed.
-	 */
-	private class HideDiagramAssistantJob
-        extends UIJob {
-
-        protected HideDiagramAssistantJob() {
-            super("Hide Diagram Assistant"); //$NON-NLS-1$
-            setSystem(true);
-        }
-
-		/**
-		 * The diagram assistant is removed when this task is run if the mouse
-		 * is still outside the shape.
-		 */
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			if (getMouseLocation() == null
-				|| !shouldAvoidHidingDiagramAssistant()) {
-				hideDiagramAssistant();
-			}
-			return Status.OK_STATUS;
-		}
-
-        public boolean belongsTo(Object family) {
-            return family == getDiagramAssistantID();
-        }
-	}
-	
-	/**
-	 * Listens to the focus events on the owner editpart so that the diagram
-	 * assistant can be added when the space bar is pressed. I tried to use
-	 * IFigure.addFocusListener(), but the figure isn't getting any focus change
-	 * events when the space bar is pressed.
-	 */
-	private class FocusListener
-		extends EditPartListener.Stub {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gef.EditPartListener#selectedStateChanged(org.eclipse.gef.EditPart)
-		 */
-		public void selectedStateChanged(EditPart part) {
-			if (part.hasFocus() && shouldShowDiagramAssistant()) {
-				showDiagramAssistant(getMouseLocation());
-			} else {
-				hideDiagramAssistant();
-			}
-		}
-	}
-
-	/**
-	 * The amount of time to wait before showing the diagram assistant.
-	 */
-	private static final int APPEARANCE_DELAY = 200;
-
-	/**
-	 * The amount of time to wait before hiding the diagram assistant after it
-	 * has been made visible.
-	 */
-	private static final int DISAPPEARANCE_DELAY = 2000;
-
-	/**
-	 * The amount of time to wait before hiding the diagram assistant after the
-	 * user has moved the mouse outside of the editpart.
-	 */
-	private static final int DISAPPEARANCE_DELAY_UPON_EXIT = 1000;
-
-	/**
-	 * The current mouse location within the host used to determine where the
-	 * diagram assistant should be displayed. This will be null if the mouse is
-	 * outside the host and diagram assistant figure.
-	 */
-	private Point mouseLocation;
-
-	/** Listens to focus change events on the host editpart. */
-	private FocusListener focusListener = new FocusListener();
-
-	/** Flag to indicate that the diagram assistant should not be hidden. */
-	private boolean avoidHidingDiagramAssistant = true;
-
-	private ShowDiagramAssistantJob showDiagramAssistantJob = new ShowDiagramAssistantJob();
-
-	private HideDiagramAssistantJob hideDiagramAssistantJob = new HideDiagramAssistantJob();
-
-	/**
-	 * Creates a new instance.
-	 */
-	public DiagramAssistantEditPolicy() {
-		super();
-	}
-
-	/**
-	 * Checks if the object is or is part of the diagram assistant figure. This
-	 * is used to determine if the mouse is hovering over the diagram assistant.
-	 * 
-	 * @param object
-	 *            the object in question
-	 * @return True if the object in question is or is part of the diagram
-	 *         assistant figure; false otherwise.
-	 */
-	protected abstract boolean isDiagramAssistant(Object object);
-
-	/**
-	 * Returns true if the diagram assistant is currently showing; false
-	 * otherwise. This is used to determine if the diagram assistant should be
-	 * shown or hidden at a given point in time.
-	 * 
-	 * @return true if the diagram assistant is showing; false otherwise
-	 */
-	protected abstract boolean isDiagramAssistantShowing();
-
-	/**
-	 * Shows the diagram assistant figure(s).
-	 * 
-	 * @param referencePoint
-	 *            The reference point which may be used to determine where the
-	 *            diagram assistant should be located. This is most likely the
-	 *            current mouse location. This could be null, for example, when
-	 *            the host gains focus via the space bar, in which case the
-	 *            diagram assistant should be shown in a default location.
-	 */
-	protected abstract void showDiagramAssistant(Point referencePoint);
-
-	/**
-	 * Hides the diagram assistant figure(s).
-	 */
-	protected abstract void hideDiagramAssistant();
-	
-	/**
-	 * Returns true if the diagram assistant should be shown; false otherwise.
-	 * This can be overridden to check any other conditions which must be met
-	 * prior to showing the diagram assistant.
-	 * 
-	 * @return true if the diagram assistant should be shown; false otherwise.
-	 */
-	protected boolean shouldShowDiagramAssistant() {
-		return getHost().isActive() && isPreferenceOn() && isHostEditable()
-			&& isHostResolvable() && isDiagramPartActive();
-	}
-
-	/**
-	 * Returns true if the preference to show this diagram assistant is on or if
-	 * there is no applicable preference; false otherwise.
-	 */
-	protected boolean isPreferenceOn() {
-		String prefName = getPreferenceName();
-		if (prefName == null) {
-			return true;
-		}
-		IPreferenceStore preferenceStore = (IPreferenceStore) ((IGraphicalEditPart) getHost())
-			.getDiagramPreferencesHint().getPreferenceStore();
-		return preferenceStore.getBoolean(prefName);
-	}
-
-	/**
-	 * The preference name indicating if the preference should be on or off.
-	 * This preference must be a boolean preference stored in the diagram
-	 * preferences.
-	 * 
-	 * @return the preference name if applicable; null otherwise
-	 */
-	String getPreferenceName() {
-		return null;
-	}
-	
-	/**
-	 * Checks if the host editpart is editable.
-	 * 
-	 * @return True if the host is editable; false otherwise.
-	 */
-	private boolean isHostEditable() {
-		if (getHost() instanceof GraphicalEditPart) {
-			return ((GraphicalEditPart) getHost()).isEditModeEnabled();
-		}
-		return true;
-	}
-
-	/**
-	 * Is the host's semantic reference resolvable (if applicable)?
-	 * 
-	 * @return true if the semantic reference is resolvable, true if there is no
-	 *         semantic reference, and false otherwise
-	 */
-	private boolean isHostResolvable() {
-		final View view = (View) getHost().getModel();
-        EObject element = view.getElement();
-		if (element != null) {
-			return !element.eIsProxy();
-		} 
-		return true;
-	}
-	
-	
-	/**
-	 * Checks if the diagram part is active.
-	 * 
-	 * @return True if the diagram part is active; false otherwise.
-	 */
-	private boolean isDiagramPartActive() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow();
-
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IWorkbenchPart activePart = page.getActivePart();
-				if (activePart instanceof IDiagramWorkbenchPart) {
-					return ((IDiagramWorkbenchPart) activePart)
-						.getDiagramEditPart().getRoot().equals(
-							((IGraphicalEditPart) getHost()).getRoot());
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Shows the diagram assistant after a certain amount of time has passed.
-	 * 
-	 * @param delay
-	 *            the delay in milliseconds
-	 */
-	protected void showDiagramAssistantAfterDelay(int delay) {
-		if (delay >= 0) {
-            showDiagramAssistantJob.setOriginalMouseLocation(getMouseLocation());
-            showDiagramAssistantJob.cancel();
-            showDiagramAssistantJob.schedule(delay);
-		}
-	}
-
-	/**
-	 * Hides the diagram assistant after a certain amount of time has passed.
-	 * 
-	 * @param delay
-	 *            the delay in milliseconds
-	 */
-	protected void hideDiagramAssistantAfterDelay(int delay) {
-		if (isDiagramAssistantShowing() && delay >= 0) {
-            hideDiagramAssistantJob.cancel();
-            hideDiagramAssistantJob.schedule(delay);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#activate()
-	 */
-	public void activate() {
-		super.activate();
-		((IGraphicalEditPart) getHost()).getFigure().addMouseMotionListener(
-			this);
-		((IGraphicalEditPart) getHost()).addEditPartListener(focusListener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#deactivate()
-	 */
-	public void deactivate() {
-		((IGraphicalEditPart) getHost()).getFigure().removeMouseMotionListener(
-			this);
-		((IGraphicalEditPart) getHost()).removeEditPartListener(focusListener);
-
-		hideDiagramAssistant();
-
-		super.deactivate();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseEntered(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseEntered(MouseEvent me) {
-		setMouseLocation(me.getLocation());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseExited(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseExited(MouseEvent me) {
-		setMouseLocation(null);
-		hideDiagramAssistantAfterDelay(getDisappearanceDelayUponExit());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseMoved(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseMoved(MouseEvent me) {
-		setMouseLocation(me.getLocation());
-
-		// do not hide the diagram assistant if the user is hovering over it
-		setAvoidHidingDiagramAssistant(isDiagramAssistant(me.getSource()));
-
-		showDiagramAssistantAfterDelay(getAppearanceDelay());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseHover(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseHover(MouseEvent me) {
-		// do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseDragged(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseDragged(MouseEvent me) {
-		// do nothing
-	}
-
-	/**
-	 * Gets the amount of time to wait before showing the diagram assistant.
-	 * 
-	 * @return the time to wait in milliseconds
-	 */
-	protected int getAppearanceDelay() {
-		return APPEARANCE_DELAY;
-	}
-
-	/**
-	 * Gets the amount of time to wait before hiding the diagram assistant after
-	 * it has been made visible.
-	 * 
-	 * @return the time to wait in milliseconds
-	 */
-	protected int getDisappearanceDelay() {
-		return DISAPPEARANCE_DELAY;
-	}
-
-	/**
-	 * Gets the amount of time to wait before hiding the diagram assistant after
-	 * the user has moved the mouse outside of the editpart.
-	 * 
-	 * @return the time to wait in milliseconds
-	 */
-	protected int getDisappearanceDelayUponExit() {
-		return DISAPPEARANCE_DELAY_UPON_EXIT;
-	}
-
-	/**
-	 * Gets the current mouse location. This will be null if the mouse is
-	 * outside the host and diagram assistant figure.
-	 * 
-	 * @return Returns the current mouse location
-	 */
-	protected Point getMouseLocation() {
-		return mouseLocation;
-	}
-
-	/**
-	 * Sets the current mouse location. If set to null, this implies that the
-	 * mouse is outside the host and diagram assistant figure.
-	 * 
-	 * @param mouseLocation
-	 *            the current mouse location
-	 */
-	protected void setMouseLocation(Point mouseLocation) {
-		this.mouseLocation = mouseLocation;
-	}
-
-	/**
-	 * Sets the flag to indicate that the diagram assistant should not be
-	 * hidden.
-	 * 
-	 * @param avoidHidingDiagramAssistant
-	 *            Flag to indicate that the diagram assistant should not be
-	 *            hidden
-	 */
-	protected void setAvoidHidingDiagramAssistant(boolean avoidHidingDiagramAssistant) {
-		this.avoidHidingDiagramAssistant = avoidHidingDiagramAssistant;
-	}
-
-	/**
-	 * Returns true if the diagram assistant should not be hidden; false
-	 * otherwise.
-	 * 
-	 * @return true if the diagram assistant should not be hidden; false
-	 *         otherwise.
-	 */
-	protected boolean shouldAvoidHidingDiagramAssistant() {
-		return avoidHidingDiagramAssistant;
-	}
-
-	/**
-     * Gets an ID string used to identify the diagram assistant classification.
-     * This ID should be the same string for all instances of a particular type
-     * of diagram assistant. One use of this ID is to avoid having multiple
-     * diagram assistants of the same type showing at the same time on different
-     * editparts. A good ID string would be the class's name (e.g.
-     * ConnectionHandleEditPolicy.class.getName()).
-     * 
-     * @return a unique string for a diagram assistant type or null
-     */
-    protected String getDiagramAssistantID() {
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramDragDropEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramDragDropEditPolicy.java
deleted file mode 100644
index a6d726c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramDragDropEditPolicy.java
+++ /dev/null
@@ -1,154 +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.editpolicies;
-
-import java.util.ArrayList;
-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.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-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.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-
-/**
- * @author choang
- *
- * Default edit policy to handle request of type <code>org.eclipse.gmf.runtime.diagram.ui.internal.requests.DropElementsRequest;<code>.
- * The default behavior will to Create a CreateViewRequest.
- */
-public class DiagramDragDropEditPolicy extends DragDropEditPolicy {
-
-	/**
-	 * getDropFileCommand
-	 * Handler method for the dropRequest as a result of a file transfer drag / drop operation.
-	 * @param dropRequest DropObjectsRequest that contains a list of Strings in it's objects list.
-	 * @return Command that that create the resulting view of the file if any, null otherwise.
-	 */
-	protected Command getDropFileCommand(DropObjectsRequest dropRequest) {
-		Iterator iter = dropRequest.getObjects().iterator();
-		while (iter.hasNext()) {
-			Object obj = iter.next();
-			if (obj instanceof String) {
-				//String filePath = (String)obj;
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getCommand(Request)
-	 */
-	public Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		// Create a view request from the drop request and then forward getting
-		// the command for that.
-
-		List viewDescriptors = new ArrayList();
-		Iterator iter = dropRequest.getObjects().iterator();
-
-		if (dropRequest.getObjects().size() > 0 &&
-			dropRequest.getObjects().get(0) instanceof String) {
-			return getDropFileCommand(dropRequest);
-		}
-		
-		while (iter.hasNext())
-			viewDescriptors.add(new CreateViewRequest.ViewDescriptor(
-				new EObjectAdapter((EObject) iter.next()),
-				((IGraphicalEditPart) getHost()).getDiagramPreferencesHint()));
-
-		return createViewsAndArrangeCommand(dropRequest, viewDescriptors);
-	}
-
-	/**
-	 * createViewsAndArrangeCommand
-	 * Method to create all the view based on the viewDescriptors list and provide
-	 * a default arrangement of them.
-	 * 
-	 * @param dropRequest
-	 * @param viewDescriptors
-	 * @return command
-	 */
-	protected Command createViewsAndArrangeCommand(DropObjectsRequest dropRequest, List viewDescriptors) {
-		CreateViewRequest createViewRequest =
-			new CreateViewRequest(viewDescriptors);
-		createViewRequest.setLocation(dropRequest.getLocation());
-		Command createCommand = getHost().getCommand(createViewRequest);
-
-		if (createCommand != null) {
-			List result = (List)createViewRequest.getNewObject();
-			dropRequest.setResult(result);
-
-			RefreshConnectionsRequest refreshRequest =
-				new RefreshConnectionsRequest(result);
-			Command refreshCommand = getHost().getCommand(refreshRequest);
-
-			ArrangeRequest arrangeRequest =
-				new ArrangeRequest(RequestConstants.REQ_ARRANGE_DEFERRED);
-			arrangeRequest.setViewAdaptersToArrange(result);
-			Command arrangeCommand = getHost().getCommand(arrangeRequest);
-
-			CompoundCommand cc = new CompoundCommand(createCommand.getLabel());
-			cc.add(createCommand.chain(refreshCommand));
-			cc.add(arrangeCommand);
-			
-			return cc;
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#showTargetFeedback(org.eclipse.gef.Request)
-	 */
-	public void showTargetFeedback(Request request) {
-		// no feedback for the diagram
-	}
-
-	/**
-	 * Handles dropping attributes from a class to the diagram to show as an
-	 * association.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getDropCommand(org.eclipse.gef.requests.ChangeBoundsRequest)
-	 */
-	protected Command getDropCommand(ChangeBoundsRequest request) {
-		if (request.getEditParts().size() > 0) {
-			EditPart parentEP =
-				((IGraphicalEditPart) request.getEditParts().get(0)).getParent();
-			if (parentEP instanceof ListCompartmentEditPart) {
-				Object originalType = request.getType();
-				request.setType(RequestConstants.REQ_SHOW_AS_ALTERNATE_VIEW);
-				Command cmd = parentEP.getCommand(request);
-				request.setType(originalType);
-				if (cmd != null) {
-					return cmd;
-				} 
-			} else if (parentEP instanceof GroupEditPart) {
-                // Dragging shapes outside the group will cause the group to
-                // grow and thus should not reparent.
-                return null;
-            }
-		}
-		return super.getDropCommand(request);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramPopupBarEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramPopupBarEditPolicy.java
deleted file mode 100644
index b8f4dd6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DiagramPopupBarEditPolicy.java
+++ /dev/null
@@ -1,281 +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.editpolicies;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteListener;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.SelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack;
-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.RGB;
-
-/**
- * This is the default popup bar editpolicy installed on diagrams. The popup bar
- * is populated using the element types of the tools of the palette drawer of
- * the last selected palette tool. If the diagram was just opened, the popup bar
- * is populated using the element types of the tools of the palette drawer that
- * is initially open. If there is no drawer initially open, then
- * <code>fillWithDefaults()</code> is called to initially populate the popup
- * bar.
- * 
- * @author cmahoney
- */
-public class DiagramPopupBarEditPolicy
-	extends PopupBarEditPolicy
-	implements PaletteListener {
-
-	/**
-	 * Holds the last active palette tool.
-	 */
-	private ToolEntry theLastTool = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#activate()
-	 */
-	public void activate() {
-		super.activate();
-		addPaletteListener();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#deactivate()
-	 */
-	public void deactivate() {
-		removePaletteListener();
-		super.deactivate();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.PopupBarEditPolicy#fillActionDescriptors()
-	 */
-	protected void fillPopupBarDescriptors() {
-		fillBasedOnLastActivePaletteTool();
-		if (getPopupBarDescriptors().isEmpty()) {
-			fillBasedOnOpenPaletteDrawer();
-			if (getPopupBarDescriptors().isEmpty()) {
-				fillWithDefaults();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.palette.PaletteListener#activeToolChanged(org.eclipse.gef.ui.palette.PaletteViewer,
-	 *      org.eclipse.gef.palette.ToolEntry)
-	 */
-	public void activeToolChanged(PaletteViewer palette, ToolEntry tool) {
-		if (!(tool instanceof SelectionToolEntry)) {
-			theLastTool = tool;
-		}
-	}
-
-	/**
-	 * Adds this edit policy as a palette listener.
-	 */
-	private void addPaletteListener() {
-		PaletteViewer paletteViewer = getHost().getViewer().getEditDomain()
-			.getPaletteViewer();
-		if (paletteViewer != null) {
-			paletteViewer.addPaletteListener(this);
-		}
-	}
-
-	/**
-	 * Removes this edit policy as a palette listener.
-	 */
-	private void removePaletteListener() {
-		PaletteViewer paletteViewer = getHost().getViewer().getEditDomain()
-			.getPaletteViewer();
-		if (paletteViewer != null) {
-			paletteViewer.removePaletteListener(this);
-		}
-		theLastTool = null;
-	}
-
-	/**
-     * Adds popup bar descriptors for all the shape tools in the palette
-     * container of the last active palette tool. Subclasses may override if
-     * they wish to customize this behavior for their diagram.
-     */
-	protected void fillBasedOnLastActivePaletteTool() {
-		if (theLastTool == null)
-			return;
-
-        // Find the palette group or drawer containing the last active tool.
-        PaletteContainer container = theLastTool.getParent();
-        if (container == null) {
-            return;
-        }
-        
-        while (!(container instanceof PaletteDrawer)
-            && !(container instanceof PaletteGroup)
-            && !(container instanceof PaletteRoot)
-            && container.getParent() != null) {
-            container = container.getParent();
-        }
-        
-        // Make sure the palette container is still in the palette root and has
-        // not been removed.  See bugzilla#176752.
-        PaletteRoot realPaletteRoot = getHost().getViewer().getEditDomain()
-            .getPaletteViewer().getPaletteRoot();
-        PaletteContainer paletteRoot = container;
-        boolean sameRoot = false;
-        while (paletteRoot != null) {
-            paletteRoot = paletteRoot.getParent();
-            if (paletteRoot == realPaletteRoot) {
-                sameRoot = true;
-                break;
-            }
-        }
-
-        if (sameRoot) {
-            fillWithPaletteToolsInContainer(container);
-        }
- 	}
-
-    /**
-     * Adds popup bar descriptors for all the shape tools in the given palette
-     * container. Subclasses may override if they wish to customize this
-     * behavior for their diagram.
-     * 
-     * @param palContainer
-     *            the <code>PaletteContainer</code>
-     */
-    protected void fillWithPaletteToolsInContainer(PaletteContainer palContainer) {
-		if (palContainer != null) {
-			List theEntries = palContainer.getChildren();
-			int isz = theEntries.size();
-			for (int i = 0; i < isz; i++) {
-				PaletteEntry theEntry = (PaletteEntry) theEntries.get(i);
-
-				if (theEntry != null) {
-					if (theEntry instanceof PaletteToolEntry) {
-						PaletteToolEntry theXtoolsEntry = (PaletteToolEntry) theEntry;
-						Tool tempTool = theXtoolsEntry.createTool();
-						if ((tempTool != null)
-							&& (tempTool instanceof CreationTool)) {
-							CreationTool theXtoolsTool = (CreationTool) tempTool;
-							IElementType theToolType = theXtoolsTool
-								.getElementType();
-							if ((theToolType != null)) {
-								
-								Image image = IconService.getInstance().getIcon(theToolType);
-                                
-                                // Workaround for mirroring and SWT.ICON issue
-                                if (image != null && image.type == SWT.ICON && isMirrored()) {
-                                    image = convert(image);
-                                }
-								
-								addPopupBarDescriptor(theToolType, image);
-							}
-						}
-					} else if (theEntry instanceof PaletteStack) {
-						// add all the entries from a palette stack as well
-						PaletteStack theStack = (PaletteStack) theEntry;
-						fillWithPaletteToolsInContainer(theStack);
-					}
-				}
-			}
-		}
-	}
-	
-	private boolean isMirrored() {
-		return ((getHost().getViewer().getControl().getStyle() & SWT.MIRRORED) != 0);
-	}
-	
-	private Image convert( Image srcImage) {
-		int height = srcImage.getBounds().height;
-		int width = srcImage.getBounds().width;
-		
-		ImageData srcImageData = srcImage.getImageData();
-		
-		RGB backgroundRGB = ((GraphicalEditPart) getHost()).getFigure().getBackgroundColor().getRGB();
-		int backgroundColor = srcImageData.palette.getPixel(backgroundRGB);		
-
-		// Set the transparent pixels to the background color
-		int count = 0;
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				if (((srcImageData.maskData[count>>3] >> (7-(count % 8))) & 1) == 0) {
-					srcImageData.setPixel(x, y, backgroundColor);
-				}
-				count++;				
-			}
-		}
-		srcImageData.maskData = null;
-
-		Image convertedImage = ImageDescriptor.createFromImageData(srcImageData).createImage(srcImage.getDevice());
-		
-		imagesToBeDisposed.add(convertedImage);
-		
-		return convertedImage;
-	}	
-	
-
-	/**
-     * Adds popup bar descriptors for all the shape tools in the palette drawer
-     * that is initially open. Subclasses may override if they wish to customize
-     * this behavior for their diagram.
-     */
-    protected void fillBasedOnOpenPaletteDrawer() {
-		PaletteViewer paletteViewer = getHost().getViewer().getEditDomain()
-			.getPaletteViewer();
-        
-        if (paletteViewer != null) {
-            for (Iterator iter = paletteViewer.getPaletteRoot().getChildren()
-                .iterator(); iter.hasNext();) {
-                Object child = iter.next();
-                if (child instanceof PaletteDrawer) {
-                    PaletteDrawer drawer = (PaletteDrawer) child;
-                    if (drawer.isInitiallyOpen()) {
-                        fillWithPaletteToolsInContainer(drawer);
-                        break;
-                    }
-                }
-            }
-        }
-	}
-
-	/**
-	 * Subclasses can override to provide default tools if the popup bar cannot
-	 * be populated based on the state of the palette.
-	 */
-	protected void fillWithDefaults() {
-		// by default, add no popup bar descriptors.
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DragDropEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DragDropEditPolicy.java
deleted file mode 100644
index 981ffa6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DragDropEditPolicy.java
+++ /dev/null
@@ -1,255 +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.editpolicies;
-
-import java.util.ArrayList;
-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.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.graphics.Color;
-
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-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.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Abstract Implementation for all EditPolicies that deal with the
- * REQ_DRAG, REQ_DROP and REQ_DROP_EOBJECTS requests 
- * as defined in <code>org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants<code>
- * 
- * The default implementation REQ_DRAG is to cast it into a REQ_ORPHAN request
- * The default implementation REQ_DROP is to cast it into a REQ_ADD request
- * 
- * 
- * @author melaasar
- */
-public class DragDropEditPolicy extends GraphicalEditPolicy {
-
-	/**
-	 * the background feedback color
-	 */
-	private static final Color GRAY = new Color(null, 200, 200, 200);
-
-	/**
-	 * the original background color
-	 */
-	protected Color revertColor;
-
-	/**
-	 * the original opacity
-	 */
-	protected boolean opacity;
-
-	/**
-	 * This will only return a command if the host is resolvable so that 
-	 * trying to drop on an unresolved shape will not be allowed.
-	 * @see org.eclipse.gef.EditPolicy#getCommand(Request)
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_DRAG.equals(request.getType())) {
-			return getDragCommand((ChangeBoundsRequest) request);
-		} else if (RequestConstants.REQ_DROP.equals(request.getType())) {
-			return getDropCommand((ChangeBoundsRequest) request);
-		} else if (
-			RequestConstants.REQ_DROP_OBJECTS.equals(request.getType())) {
-			DropObjectsRequest dndRequest = (DropObjectsRequest) request;
-			dndRequest.setRequiredDetail(getRequiredDragDetail(dndRequest));
-			return getDropObjectsCommand(dndRequest);
-		}
-		return null;
-	}
-
-	/**
-	 * gets a drag command
-	 * @param request the request
-	 * @return command
-	 */
-	protected Command getDragCommand(ChangeBoundsRequest request) {
-		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_ORPHAN);
-		req.setEditParts(request.getEditParts());
-		req.setMoveDelta(request.getMoveDelta());
-		req.setSizeDelta(request.getSizeDelta());
-		req.setLocation(request.getLocation());
-		req.setResizeDirection(request.getResizeDirection());
-		return getHost().getCommand(req);
-	}
-
-	/**
-	 * gets a drop command
-	 * @param request the request
-	 * @return command
-	 */
-	protected Command getDropCommand(ChangeBoundsRequest request) {
-		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_ADD);
-		req.setEditParts(request.getEditParts());
-		req.setMoveDelta(request.getMoveDelta());
-		req.setSizeDelta(request.getSizeDelta());
-		req.setLocation(request.getLocation());
-		req.setResizeDirection(request.getResizeDirection());
-		Command cmd = getHost().getCommand(req);
-		if (cmd == null || !cmd.canExecute()) {
-			return getDropObjectsCommand(castToDropObjectsRequest(request));
-		}
-		
-		return cmd;
-	}
-
-	/**
-	 * getDropElementCommand
-	 * Returns a command to handle a DropObjectsRequest of an EObject
-	 * 
-	 * @param element EObject that is being dropped.
-	 * @param request DropObjectsRequest that the element has retrieved from.
-	 * @return Command that handles the dropping of the EObject element.
-	 */
-	protected Command getDropElementCommand(EObject element, DropObjectsRequest request) {
-		return null;
-	}
-	
-	/**
-	 * getDropObjectsCommand
-	 * This provides a generic implementation for handling the 
-	 * DropObjectsRequest which checks for EObject and gets a command
-	 * from the getDropEementCommand method.
-	 * @param request DropObjectsRequest that is being handled
-	 * @return Command that handles the request.
-	 */
-	protected Command getDropObjectsCommand(DropObjectsRequest request) {
-		CompoundCommand cm = new CompoundCommand();
-		Iterator elements = request.getObjects().iterator();
-		while (elements.hasNext()) {
-			Object obj = elements.next();
-			if (obj instanceof EObject) {
-				Command cmd = getDropElementCommand((EObject)obj, request);
-			if (cmd != null)
-				cm.add(cmd);
-		}
-		}
-		
-		if (cm.isEmpty())
-			return null;
-		
-		return new ICommandProxy(new CommandProxy(cm.unwrap()));
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(Request)
-	 */
-	public EditPart getTargetEditPart(final Request request) {
-		return understandsRequest(request) ? getHost() : null;
-	}
-
-	/**
-	 * Only understands DRAG, DROP and DROP_ELEMENTS requests.
-	 * 
-	 * @return whether the request is supported
-	 */
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_MOVE.equals(request.getType())
-			|| RequestConstants.REQ_DRAG.equals(request.getType())
-			|| RequestConstants.REQ_DROP.equals(request.getType())
-			|| RequestConstants.REQ_DROP_OBJECTS.equals(request.getType());
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#showTargetFeedback(org.eclipse.gef.Request)
-	 */
-	public void showTargetFeedback(Request request) {
-		Command c = getCommand(request);
-		if (c != null && c.canExecute()) {
-			if (revertColor == null) {
-				revertColor = getHostFigure().getBackgroundColor();
-				opacity = getHostFigure().isOpaque();
-				getHostFigure().setBackgroundColor(
-					FigureUtilities.mixColors(GRAY, revertColor));
-				getHostFigure().setOpaque(true);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-	 */
-	public void eraseTargetFeedback(Request request) {
-		if (revertColor != null) {
-			getHostFigure().setBackgroundColor(revertColor);
-			getHostFigure().setOpaque(opacity);
-			revertColor = null;
-		}
-	}
-
-	/**
-	 * 
-	 * @param request
-	 * @return int 
-	 */
-	protected int getRequiredDragDetail(Request request) {
-		return DND.DROP_COPY;
-	}
-
-	/**
-	 * return the host Edit Part's semantic element, if the semantic element
-	 * is <code>null</code> or unresolvable it will return <code>null</code>
-	 * @return EObject
-	 */
-	protected EObject getHostObject() {
-		return ViewUtil
-			.resolveSemanticElement((View) ((IGraphicalEditPart) getHost())
-				.getModel());
-	}
-
-	/**
-	 * Retrieves the list of elements being dropped
-	 * @param request the request
-	 * @return List of elements
-	 */
-	protected DropObjectsRequest castToDropObjectsRequest(ChangeBoundsRequest request) {
-		Iterator editParts =
-			ToolUtilities
-				.getSelectionWithoutDependants(request.getEditParts())
-				.iterator();
-
-		List elements = new ArrayList();
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			if (editPart instanceof IGraphicalEditPart) {
-				EObject element = ViewUtil
-					.resolveSemanticElement((View) ((IGraphicalEditPart) editPart)
-						.getModel());
-				if (element != null)
-					elements.add(element);
-			}
-		}
-
-		DropObjectsRequest req = new DropObjectsRequest();
-		req.setObjects(elements);
-		req.setAllowedDetail(DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
-		req.setLocation(request.getLocation());
-		req.setRequiredDetail(getRequiredDragDetail(request));
-		return req;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/EditPolicyRoles.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/EditPolicyRoles.java
deleted file mode 100644
index 6b0911a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/EditPolicyRoles.java
+++ /dev/null
@@ -1,147 +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.editpolicies;
-
-/**
- * A list of keys defining the GMF diagram editpolicy roles. An editpolicy is
- * installed on an editpart using a role (a String identifier), if another
- * editpolicy is installed on the same editpart with the same role then it will
- * override the previous one installed. If an editpolicy is installed that may
- * need to be overridden, add its role here.
- * <p>
- * This interface defines constants only, it is <EM>not</EM> intended to be
- * implemented by clients.
- * </p>
- *  
- * @author cmahoney
- */
-public interface EditPolicyRoles {
-
-	/**
-	 * The key used to install a <i>decoration</i> EditPolicy, one that handles
-	 * creation and removal of decorations.
-	 */
-	public static final String DECORATION_ROLE = "DecorationPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>drop element</i> EditPolicy.
-	 */
-	public static final String DRAG_DROP_ROLE = "DragDropPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>connection handles</i> EditPolicy, one that
-	 * adds or changes the behavior of connection handles.
-	 */
-	public static final String CONNECTION_HANDLES_ROLE = "ConnectionHandlesPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>property handler</i> EditPolicy, one that
-	 * handles property change requests.
-	 */
-	public static final String PROPERTY_HANDLER_ROLE = "PropertyHandlerPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install an <i>open</i> EditPolicy. The OPEN_ROLE policy
-	 * is typically installed on edit part whose underlying data can only be
-	 * examined/modified by opening another editor window. For example, if an
-	 * edit part represented another diagram, then an "open" request on that
-	 * edit part should result in the corresponding diagram being opened in
-	 * another editor window.
-	 */
-	public static final String OPEN_ROLE = "OpenPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>show/hide connection labels</i> EditPolicy
-	 */
-	public static final String CONNECTION_LABELS_ROLE = "ConnectionLabelsPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>semantic</i> EditPolicy.
-	 */
-	public static final String SEMANTIC_ROLE = "SemanticPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>refresh pagebreaks</i> EditPolicy.
-	 */
-	public static final String REFRESH_PAGEBREAKS_ROLE = "RefreshPagebreaksPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>refresh connections</i> EditPolicy.
-	 */
-	public static final String REFRESH_CONNECTIONS_ROLE = "RefreshConnectionsPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>show elements</i> EditPolicy, one that
-	 * handles Show Related Elements and Show / Hide Relationships.
-	 */
-	public static final String SHOW_ELEMENTS_ROLE = "ShowElementsPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>sort filter</i> EditPolicy. The sort filter
-	 * role creates and opens the sort filter dialog if it is given content by
-	 * its children via the sort filter content role.
-	 */
-	public static final String SORT_FILTER_ROLE = "SortFilterPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>sort filter</i> content EditPolicy. The
-	 * sort filter content role understands how to provide content for the sort
-	 * filter dialog.
-	 */
-	public static final String SORT_FILTER_CONTENT_ROLE = "Sortfilter_contentPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used by edit policies which modify sorting and filtering.
-	 */
-	public static final String MODIFY_SORT_FILTER_ROLE = "ModifySortFilterPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>popup bar</i> EditPolicy. The popup bar
-	 * will be activated during mouse hover for the editpart.
-	 */
-	public static final String POPUPBAR_ROLE = "PopupBarEditPolicy"; //$NON-NLS-1$
-
-	/**
-	 * Key used to install a canonical edit policy. This edit policy will ensure
-	 * that the host's model children are in sync with a specifc set of semantic
-	 * children.
-	 */
-	public static final String CANONICAL_ROLE = "Canonical"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>ShowAsAlternateViewPolicy</i> EditPolicy
-	 * which understands notational requests such as:
-	 * <code>REQ_SHOW_AS_ALTERNATE_VIEW</code>
-	 */
-	public static final String SHOW_ALTERNATE_VIEW_ROLE = "ShowAsAlternateViewPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>creation</i> EditPolicy which understands
-	 * notational requests such as: <code>REQ_CREATE</code> where the request
-	 * is of type <code>CreateViewRequest</code>
-	 */
-	public static final String CREATION_ROLE = "CreationPolicy"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install a <i>SnapFeedbackPolicy</i> EditPolicy which
-	 * understands how to handle snap feedback when shapes are moved and
-	 * snapping is enabled
-	 */
-	public static final String SNAP_FEEDBACK_ROLE = "Snap Feedback"; //$NON-NLS-1$
-
-	/**
-	 * The key used to install an <i>TetherConnectionEditPolicy</i> which
-	 * provides a permanent tether between a connection and a shape.
-	 */
-	public static final String TETHER_ROLE = "TetherRole"; //$NON-NLS-1$
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/FlowLayoutEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/FlowLayoutEditPolicy.java
deleted file mode 100644
index 8e2dc54..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/FlowLayoutEditPolicy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Obeo and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *      Mariot Chauvin (Obeo) <mariot.chauvin@obeo.fr> - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editpolicies;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-
-/**
- * Extension of the GEF Flow Layout EditPolicy.
- * 
- * @since 1.4
- */
-public abstract class FlowLayoutEditPolicy extends org.eclipse.gef.editpolicies.FlowLayoutEditPolicy {
-
-	/*
-	 * Override to erase in case of GMF drop request, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=276033
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-	 */
-	@Override
-	public void eraseTargetFeedback(Request request) {
-		super.eraseTargetFeedback(request);
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-				eraseLayoutTargetFeedback(request);
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GraphicalNodeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GraphicalNodeEditPolicy.java
deleted file mode 100644
index 25334f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GraphicalNodeEditPolicy.java
+++ /dev/null
@@ -1,953 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-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.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionAnchorsCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionEndsCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
-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.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SetConnectionBendpointsCommand;
-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.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.ConnectionLayerEx;
-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.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * the graphical node edit policy
- * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy
- * 
- * @author mmostafa, cmahoney
- */
-public class GraphicalNodeEditPolicy
-		extends
-			org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy {
-	/** describes the view to be created. */
-	private IAdaptable _viewAdapter;
-	
-	/**
-	 * The label used for the command to create a new connection.
-	 */
-	private static final String CREATE_CONNECTION_COMMAND_LABEL = DiagramUIMessages.GraphicalNodeEditPolicy_createRelationshipCommand_label;
-	
-	/**
-	 * Gets a command that pops up a menu which allows the user to select which
-	 * type of connection to be created and then creates the connection. This
-	 * command uses
-	 * {@link #getCommandForMenuSelection(Object, CreateConnectionRequest)} on
-	 * the connection chosen to get the creation command.
-	 * 
-	 * @author cmahoney
-	 */
-	protected class PromptAndCreateConnectionCommand
-		extends CreateOrSelectElementCommand {
-
-		/**
-		 * Cache the request because it needs to be passed to
-		 * {@link #getCommandForMenuSelection(Object, CreateConnectionRequest)}.
-		 */
-		private CreateConnectionRequest request;
-
-		/**
-		 * Creates a new instance.
-		 * 
-		 * @param content
-		 *            The list of items making up the content of the popup menu.
-		 * @param request
-		 *            The relevant create connection request.
-		 */
-		public PromptAndCreateConnectionCommand(List content,
-				CreateConnectionRequest request) {
-			super(CREATE_CONNECTION_COMMAND_LABEL, Display.getCurrent()
-				.getActiveShell(), content);
-			this.request = request;
-		}
-
-		/**
-		 * The command to create the connection that may need to be
-		 * undone/redone.
-		 */
-		private Command createCommand;
-
-		/**
-		 * Pops up the dialog with the content provided, gets the command to be
-		 * executed based on the user selection, and then executes the command.
-		 */
-		protected CommandResult doExecuteWithResult(
-                IProgressMonitor progressMonitor, IAdaptable info)
-            throws ExecutionException {
-            
-			CommandResult cmdResult = super.doExecuteWithResult(progressMonitor, info);
-			if (!cmdResult.getStatus().isOK()) {
-				return cmdResult;
-			}
-
-            Object connectionType = cmdResult.getReturnValue();
-
-            Command cmd = getConnectionCompleteCommand(connectionType, getRequest());
-			Assert.isTrue(cmd != null && cmd.canExecute());
-			cmd.execute();
-			createCommand = cmd;
-            
-            if (connectionType instanceof IElementType) {
-                CreateRequest createRequest = ((CreateUnspecifiedTypeConnectionRequest) request)
-                    .getRequestForType((IElementType) connectionType);
-                Object newObject = createRequest.getNewObject();
-
-                return CommandResult.newOKCommandResult(newObject);
-            }
-            return CommandResult.newOKCommandResult();
-		}
-
-		protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			if (createCommand != null) {
-				createCommand.undo();
-			}
-			return super.doUndoWithResult(progressMonitor, info);
-		}
-
-		protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-			if (createCommand != null) {
-				createCommand.redo();
-			}
-			return super.doRedoWithResult(progressMonitor, info);
-		}
-
-		/**
-		 * Gets the request.
-		 * 
-		 * @return Returns the request.
-		 */
-		private CreateConnectionRequest getRequest() {
-			return request;
-		}
-
-	}
-	
-	protected Connection createDummyConnection(Request req) {
-		PolylineConnection c = (PolylineConnection) super.createDummyConnection(req);
-		c.setLineStyle(Graphics.LINE_DASHDOT);
-		c.setForegroundColor(((GraphicalEditPart) getHost()).getFigure()
-				.getForegroundColor());
-		return c;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getDummyConnectionRouter(org.eclipse.gef.requests.CreateConnectionRequest)
-	 */
-	protected ConnectionRouter getDummyConnectionRouter(CreateConnectionRequest arg0) {
-		EditPart ep = getHost();
-		if (ep instanceof IGraphicalEditPart) {
-			IGraphicalEditPart gep = ((IGraphicalEditPart)ep);
-			Routing routingVal = Routing.MANUAL_LITERAL;
-			if (gep.getNotationView() != null) {
-				Diagram dgrm = gep.getNotationView().getDiagram();
-				EditPart epfromReg = (EditPart)gep.getViewer().getEditPartRegistry().get(dgrm);
-				if (epfromReg != null)
-					routingVal = (Routing)epfromReg.getAdapter(Routing.class);
-			}
-			else {
-				IPreferenceStore store = (IPreferenceStore) ((IGraphicalEditPart)ep).getDiagramPreferencesHint().getPreferenceStore();
-				routingVal = Routing.get(store.getInt(IPreferenceConstants.PREF_LINE_STYLE));
-			}
-			
-			ConnectionLayer cLayer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER);
-			if (cLayer instanceof ConnectionLayerEx) {
-				ConnectionLayerEx cLayerEx = (ConnectionLayerEx)cLayer;
-				if (routingVal == Routing.MANUAL_LITERAL) {
-					return cLayerEx.getObliqueRouter();
-				}
-				else if (routingVal == Routing.RECTILINEAR_LITERAL) {
-					return cLayerEx.getRectilinearRouter();
-				}
-				else if (routingVal == Routing.TREE_LITERAL) {
-					return cLayerEx.getTreeRouter();
-				}
-			}
-		}
-		
-		return super.getDummyConnectionRouter(arg0);
-	}
-
-
-
-	protected ConnectionAnchor getSourceConnectionAnchor(
-			CreateConnectionRequest request) {
-		EditPart source = request.getSourceEditPart();
-		return source instanceof INodeEditPart ? ((INodeEditPart) source)
-				.getSourceConnectionAnchor(request) : null;
-	}
-	
-	protected ConnectionAnchor getTargetConnectionAnchor(
-			CreateConnectionRequest request) {
-		EditPart target = request.getTargetEditPart();
-		return target instanceof INodeEditPart ? ((INodeEditPart) target)
-				.getTargetConnectionAnchor(request) : null;
-	}
-
-	/**
-	 * get a connectable edit part
-	 * @return INodeEditPart
-	 */
-	protected INodeEditPart getConnectableEditPart() {
-		return (INodeEditPart) getHost();
-	}
-	/**
-	 * getConnectionCompleteEditPart
-	 * 
-	 * This method is used when the connection is verified and made complete to
-	 * retrieve the final connecting editpart to be used in the connection
-	 * creation. This is by default the "host" edit part which is what is
-	 * connected to by the user feedback. Subclassing edit-policies may wish to
-	 * redirect the connection to a different edit-part depending on the
-	 * gesture. i.e. the tree-view for generalizations will redirect the
-	 * connection to the target of the host.
-	 * 
-	 * @param request
-	 *            Request giving some information about the user gesture.
-	 * @return INodeEditPart which will be the target connection.
-	 */
-	protected INodeEditPart getConnectionCompleteEditPart(Request request) {
-		if (getHost() instanceof INodeEditPart) {
-			return (INodeEditPart) getHost();
-		}
-		return null;
-	}
-	/**
-	 * getConnectionTargetAnchor Method used during reconnection to retrieve
-	 * the appropriate target anchor based on a request.
-	 * 
-	 * @param request
-	 *            Request giving some information about the user gesture.
-	 * @return ConnectionAnchor the connections target end will connect to.
-	 */
-	protected ConnectionAnchor getConnectionTargetAnchor(Request request) {
-		INodeEditPart node = getConnectableEditPart();
-		if (node != null)
-			return node.getTargetConnectionAnchor(request);
-		
-		return null;
-	}
-	/**
-	 * get this edit policy's edit part <code>View</code>
-	 * @return View
-	 */
-	protected View getView() {
-		return (View)getHost().getModel();
-	}
-	/**
-	 * getSemanticHint Retrieves the semanticHint from the request regarding
-	 * the type of elemen being manipulated.
-	 * 
-	 * @param request
-	 *            Request that is sent from the user gesture
-	 * @return String that is the semantic type.
-	 */
-	protected String getSemanticHint(Request request) {
-		String hint = null;
-		if (request instanceof CreateConnectionViewAndElementRequest) {
-			CreateConnectionViewAndElementRequest ccvr = (CreateConnectionViewAndElementRequest) request;
-			// get the element descriptor
-			CreateElementRequestAdapter requestAdapter = ccvr
-					.getConnectionViewAndElementDescriptor()
-					.getCreateElementRequestAdapter();
-			// get the semantic request
-			CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter
-					.getAdapter(CreateRelationshipRequest.class);
-			hint = PackageUtil.getID(createElementRequest.getElementType().getEClass());
-		} else if (request instanceof ReconnectRequest) {
-			ReconnectRequest rr = (ReconnectRequest) request;
-			hint = ViewUtil.getSemanticElementClassId((View)rr.getConnectionEditPart().getModel());
-		} else if (request instanceof CreateConnectionViewRequest) {
-			CreateConnectionViewRequest ccvr = (CreateConnectionViewRequest) request;
-			hint = ccvr.getConnectionViewDescriptor().getSemanticHint();
-		}
-		return hint;
-	}
-	/**
-	 * getRoutingAdjustment method to adjust routing if the reorient has moved
-	 * the connection into a different routing environment. Specifically, if
-	 * the connection has been reoriented out of a tree structure it will
-	 * change routing to the default set in preference. Likewise, if the
-	 * connection has connected to a tree structure then the routing will
-	 * create a tree.
-	 * 
-	 * @param connection
-	 *            IAdaptable that is placeholder for not yet created connection.
-	 *            Also adapts directly to a ConnectionEditPart in the case of a
-	 *            reorient.
-	 * @param connectionHint
-	 *            String that is the semantic hint of the connection being
-	 *            manipulated
-	 * @param currentRouterType
-	 *            Integer current representation of the routing style
-	 * @param target
-	 *            EditPart that is being targeted by the request.
-	 * @return Command to make any routing adjustments if necessary.
-	 */
-	protected Command getRoutingAdjustment(IAdaptable connection,
-			String connectionHint, Routing currentRouterType, EditPart target) {
-		Command cmd = null;
-		if (connectionHint == null ||
-				target == null || target.getModel() == null
-				|| ((View)target.getModel()).getElement() == null)
-			return null;
-		// check if router needs to change type due to reorient.
-		String targetHint = ViewUtil.getSemanticElementClassId((View) target.getModel());
-		Routing newRouterType = null;
-		if (target instanceof ITreeBranchEditPart
-				&& connectionHint.equals(targetHint)) {
-			newRouterType = Routing.TREE_LITERAL;
-			ChangePropertyValueRequest cpvr = new ChangePropertyValueRequest(
-					StringStatics.BLANK, Properties.ID_ROUTING, newRouterType);
-			Command cmdRouter = target.getCommand(cpvr);
-			if (cmdRouter != null)
-				cmd = cmd == null ? cmdRouter : cmd.chain(cmdRouter);
-		} else {
-			if (currentRouterType.equals(Routing.TREE_LITERAL)) {
-				IPreferenceStore store = (IPreferenceStore)
-					((IGraphicalEditPart) getHost())
-						.getDiagramPreferencesHint().getPreferenceStore();
-				newRouterType = Routing.get(store.getInt(IPreferenceConstants.PREF_LINE_STYLE));
-			}
-		}
-		if (newRouterType != null) {
-			// add commands for line routing. Convert the new connection and
-			// also the targeted connection.
-			ICommand spc = new SetPropertyCommand(
-                getEditingDomain(), connection,
-				Properties.ID_ROUTING, StringStatics.BLANK, newRouterType);
-			Command cmdRouter = new ICommandProxy(spc);
-			if (cmdRouter != null) {
-				cmd = cmd == null ? cmdRouter : cmd.chain(cmdRouter);
-			}
-		}
-		return cmd;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest)
-	 */
-	protected Command getReconnectTargetCommand(ReconnectRequest request) {
-		INodeEditPart node = getConnectableEditPart();
-		if (node == null)
-			return null;
-		
-        TransactionalEditingDomain editingDomain = getEditingDomain();
-		
-		ConnectionAnchor targetAnchor = getConnectionTargetAnchor(request);
-		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
-		if (targetEP == null) {
-			return null;
-		}
-		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
-		sceCommand.setEdgeAdaptor(new EObjectAdapter((EObject)request
-				.getConnectionEditPart().getModel()));
-		sceCommand.setNewTargetAdaptor(targetEP);
-		SetConnectionAnchorsCommand scaCommand = new SetConnectionAnchorsCommand(editingDomain, StringStatics.BLANK);
-		scaCommand.setEdgeAdaptor(new EObjectAdapter((EObject) request
-			.getConnectionEditPart().getModel()));
-		scaCommand.setNewTargetTerminal(targetEP
-				.mapConnectionAnchorToTerminal(targetAnchor));
-		CompositeCommand cc = new CompositeCommand(
-			DiagramUIMessages.Commands_SetConnectionEndsCommand_Target);
-		cc.compose(sceCommand);
-		cc.compose(scaCommand);
-		Command cmd = new ICommandProxy(cc);
-		EditPart cep = request.getConnectionEditPart();
-		RoutingStyle style = (RoutingStyle) ((View)cep.getModel()).getStyle(NotationPackage.eINSTANCE.getRoutingStyle());
-		Routing currentRouter = Routing.MANUAL_LITERAL;		
-		if (style != null) {
-			currentRouter = style.getRouting();
-		}
-		Command cmdRouter = getRoutingAdjustment(request
-				.getConnectionEditPart(), getSemanticHint(request),
-				currentRouter, request.getTarget());
-		if (cmdRouter != null) {
-			cmd = cmd == null ? cmdRouter : cmd.chain(cmdRouter);
-			// reset the bendpoints
-			ConnectionAnchor sourceAnchor = node
-					.getSourceConnectionAnchor(request);
-			PointList pointList = new PointList();
-			pointList.addPoint(sourceAnchor.getLocation(targetAnchor
-					.getReferencePoint()));
-			pointList.addPoint(targetAnchor.getLocation(sourceAnchor
-					.getReferencePoint()));
-            
-			SetConnectionBendpointsCommand sbbCommand = new SetConnectionBendpointsCommand(editingDomain);
-			sbbCommand.setEdgeAdapter(request.getConnectionEditPart());
-			sbbCommand.setNewPointList(pointList, sourceAnchor
-					.getReferencePoint(), targetAnchor.getReferencePoint());
-			Command cmdBP = new ICommandProxy(sbbCommand);
-			if (cmdBP != null) {
-				cmd = cmd == null ? cmdBP : cmd.chain(cmdBP);
-			}
-		}
-		return cmd;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest)
-	 */
-	protected Command getReconnectSourceCommand(ReconnectRequest request) {
-		INodeEditPart node = getConnectableEditPart();
-		if (node == null)
-			return null;
-		
-        TransactionalEditingDomain editingDomain = getEditingDomain();
-        
-		ConnectionAnchor sourceAnchor = node.getSourceConnectionAnchor(request);
-		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
-		sceCommand.setEdgeAdaptor(new EObjectAdapter((View) request
-				.getConnectionEditPart().getModel()));
-		sceCommand.setNewSourceAdaptor(new EObjectAdapter((View)node
-				.getModel()));
-		SetConnectionAnchorsCommand scaCommand = new SetConnectionAnchorsCommand(editingDomain, StringStatics.BLANK);
-		scaCommand.setEdgeAdaptor(new EObjectAdapter((View) request
-			.getConnectionEditPart().getModel()));
-		scaCommand.setNewSourceTerminal(node.mapConnectionAnchorToTerminal(sourceAnchor));
-		CompositeCommand cc = new CompositeCommand(
-			DiagramUIMessages.Commands_SetConnectionEndsCommand_Source);
-		cc.compose(sceCommand);
-		cc.compose(scaCommand);
-		return new ICommandProxy(cc);
-	}
-	/**
-	 * Returns a command that will create the connection.
-	 * 
-	 * If you must override this method, you should call super.
-	 *  
-	 * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getConnectionCompleteCommand(org.eclipse.gef.requests.CreateConnectionRequest)
-	 *
-	 */
-	protected Command getConnectionCompleteCommand(
-			CreateConnectionRequest request) {
-		ICommandProxy proxy = (ICommandProxy) request
-			.getStartCommand();
-		if (proxy == null) {
-			return null;
-		}
-
-		// reset the target edit-part for the request
-		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
-		if (targetEP == null) {
-			return null;
-		}
-
-		CompositeCommand cc = (CompositeCommand) proxy.getICommand();
-		ConnectionAnchor targetAnchor = targetEP
-			.getTargetConnectionAnchor(request);
-        Iterator commandItr = cc.iterator();
-        commandItr.next(); //0
-		SetConnectionEndsCommand sceCommand = (SetConnectionEndsCommand) commandItr.next(); //1
-		sceCommand.setNewTargetAdaptor(new EObjectAdapter(((IGraphicalEditPart) targetEP).getNotationView()));
-		SetConnectionAnchorsCommand scaCommand = (SetConnectionAnchorsCommand) commandItr.next(); //2
-		scaCommand.setNewTargetTerminal(targetEP
-			.mapConnectionAnchorToTerminal(targetAnchor));
-		setViewAdapter(sceCommand.getEdgeAdaptor());
-		INodeEditPart sourceEditPart = (INodeEditPart) request
-			.getSourceEditPart();
-		ConnectionAnchor sourceAnchor = sourceEditPart
-			.mapTerminalToConnectionAnchor(scaCommand.getNewSourceTerminal());
-		PointList pointList = new PointList();
-		if (request.getLocation() == null) {
-			pointList.addPoint(sourceAnchor.getLocation(targetAnchor.getReferencePoint()));
-			pointList.addPoint(targetAnchor.getLocation(sourceAnchor.getReferencePoint()));			
-		}
-		else {
-			pointList.addPoint(sourceAnchor.getLocation(request.getLocation()));
-			pointList.addPoint(targetAnchor.getLocation(request.getLocation()));
-		}
-		SetConnectionBendpointsCommand sbbCommand = (SetConnectionBendpointsCommand) commandItr.next(); //3
-		sbbCommand.setNewPointList(pointList, sourceAnchor.getReferencePoint(),
-			targetAnchor.getReferencePoint());
-		return request.getStartCommand();
-	}
-	
-	/**
-	 * Cache the view descriptor describing the connection to be create.
-	 * 
-	 * @param viewAdapter
-	 */
-	protected final void setViewAdapter(IAdaptable viewAdapter) {
-		_viewAdapter = viewAdapter;
-	}
-	
-	/**
-	 * Return the view adapter describing the element to be created.
-	 * @see #setViewAdapter(IAdaptable)
-	 * @return adpater that can adapt <code>View.class</code>
-	 */
-	protected final IAdaptable getViewAdapter() {
-		return _viewAdapter;
-	}
-	protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
-		if (!(request instanceof CreateConnectionViewRequest))
-			return null;
-		CreateConnectionViewRequest req = (CreateConnectionViewRequest) request;
-		CompositeCommand cc = new CompositeCommand(
-			DiagramUIMessages.Commands_CreateCommand_Connection_Label);
-		Diagram diagramView = ((View)getHost().getModel())
-				.getDiagram();
-        TransactionalEditingDomain editingDomain = getEditingDomain();
-        CreateCommand createCommand = new CreateCommand(editingDomain, req
-				.getConnectionViewDescriptor(), diagramView.getDiagram());
-		setViewAdapter((IAdaptable) createCommand.getCommandResult()
-				.getReturnValue());
-        
-        
-        SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, StringStatics.BLANK);
-		sceCommand.setEdgeAdaptor(getViewAdapter());
-		sceCommand.setNewSourceAdaptor(new EObjectAdapter(getView()));
-		ConnectionAnchor sourceAnchor = getConnectableEditPart()
-				.getSourceConnectionAnchor(request);
-		SetConnectionAnchorsCommand scaCommand = new SetConnectionAnchorsCommand(editingDomain, StringStatics.BLANK);
-		scaCommand.setEdgeAdaptor(getViewAdapter());
-		scaCommand.setNewSourceTerminal(getConnectableEditPart()
-				.mapConnectionAnchorToTerminal(sourceAnchor));
-		SetConnectionBendpointsCommand sbbCommand = new SetConnectionBendpointsCommand(editingDomain);
-		sbbCommand.setEdgeAdapter(getViewAdapter());
-		cc.compose(createCommand);
-		cc.compose(sceCommand);
-		cc.compose(scaCommand);
-		cc.compose(sbbCommand);
-		Command c = new ICommandProxy(cc);
-		request.setStartCommand(c);
-		return c;
-	}
-	
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_CONNECTION_START.equals(request.getType())) {
-			if (request instanceof CreateConnectionViewAndElementRequest) {
-				return getConnectionAndRelationshipCreateCommand((CreateConnectionViewAndElementRequest) request);
-			} else if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-				return getUnspecifiedConnectionCreateCommand((CreateUnspecifiedTypeConnectionRequest) request);
-			}
-		} else if (RequestConstants.REQ_CONNECTION_END
-			.equals(request.getType())) {
-			if (request instanceof CreateConnectionViewAndElementRequest) {
-				return getConnectionAndRelationshipCompleteCommand((CreateConnectionViewAndElementRequest) request);
-			} else if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-				return getUnspecifiedConnectionCompleteCommand((CreateUnspecifiedTypeConnectionRequest) request);
-			}
-		}
-		return super.getCommand(request);
-	}
-	
-	/**
-	 * Gets the command to start the creation of a new connection and
-	 * relationship. This will update the request appropriately.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getConnectionAndRelationshipCreateCommand(
-			CreateConnectionViewAndElementRequest request) {
-		// get the element descriptor
-		CreateElementRequestAdapter requestAdapter = request
-				.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-		// get the semantic request
-		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter
-				.getAdapter(CreateRelationshipRequest.class);
-		// complete the semantic request by filling in the source
-		View sourceView = (View)getHost().getModel();
-		createElementRequest.setSource(ViewUtil.resolveSemanticElement(sourceView));
-		// get the create element request based on the elementdescriptor's
-		// request
-		Command createElementCommand = getHost().getCommand(
-			new EditCommandRequestWrapper(
-						(CreateRelationshipRequest) requestAdapter
-								.getAdapter(CreateRelationshipRequest.class), request.getExtendedData()));
-		// if element cannot be created, ignore
-		if (createElementCommand == null || !createElementCommand.canExecute()){
-			// Even if the command is not executable, status information may be set.
-			return createElementCommand;
-		}
-
-		return getConnectionCreateCommand(request);
-	}
-	
-	/**
-	 * Gets the command to start the creation of a new connection and
-	 * relationship (if applicable) for a unspecified type request. This will
-	 * update all the individual requests appropriately.
-	 * 
-	 * @param request
-	 *            the unspecified type request
-	 * @return the command
-	 */
-	private Command getUnspecifiedConnectionCreateCommand(
-			final CreateUnspecifiedTypeConnectionRequest request) {
-
-		if (request.isDirectionReversed()) {
-			return new Command() {
-
-				/**
-				 * All we know is the target and the possible relationship
-				 * types. At this point, there is no way to validate the
-				 * commands for this scenario.
-				 */
-				public boolean canExecute() {
-					return true;
-				}
-			};
-		} else {
-
-			// Get the start command for each individual request, this will
-			// update each request as required.
-			final List commands = new ArrayList();
-			for (Iterator iter = request.getAllRequests().iterator(); iter
-				.hasNext();) {
-				Request individualRequest = (Request) iter.next();
-				Command cmd = null;
-				if (individualRequest instanceof CreateConnectionViewAndElementRequest) {
-					cmd = getConnectionAndRelationshipCreateCommand((CreateConnectionViewAndElementRequest) individualRequest);
-				} else if (individualRequest instanceof CreateConnectionViewRequest) {
-					cmd = getConnectionCreateCommand((CreateConnectionViewRequest) individualRequest);
-				}
-				if (cmd != null && cmd.canExecute()) {
-					commands.add(cmd);
-				}
-			}
-
-			if (commands.isEmpty()) {
-				// GEF's AbstractConnectionCreationTool expects a null command
-				// when the gesture should be disabled.
-				return null;
-			}
-			
-			// return an executable command that does nothing
-			return new Command() {/* do nothing*/};
-		}
-	}	
-	
-	/**
-	 * Gets the command to complete the creation of a new connection and
-	 * relationship.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getConnectionAndRelationshipCompleteCommand(
-			CreateConnectionViewAndElementRequest request) {
-		// get the element descriptor
-		CreateElementRequestAdapter requestAdapter = request
-				.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-		// get the semantic request
-		CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter
-				.getAdapter(CreateRelationshipRequest.class);
-		
-		createElementRequest.setPrompt(!request.isUISupressed());
-		
-		// complete the semantic request by filling in the source and
-		// destination
-		INodeEditPart targetEP = getConnectionCompleteEditPart(request);
-		View sourceView = (View)request.getSourceEditPart().getModel();
-		View targetView = (View)targetEP.getModel();
-		
-		// resolve the source
-		EObject source = ViewUtil.resolveSemanticElement(sourceView);
-		if (source == null) {
-			source = sourceView;
-		}
-		createElementRequest.setSource(source);
-		
-		// resolve the target
-		EObject target = ViewUtil.resolveSemanticElement(targetView);
-		if (target == null) {
-			target = targetView;
-		}
-		createElementRequest.setTarget(target);
-		
-		// get the create element request based on the elementdescriptor's
-		// request
-		Command createElementCommand = targetEP
-				.getCommand(new EditCommandRequestWrapper(
-						(CreateRelationshipRequest) requestAdapter
-								.getAdapter(CreateRelationshipRequest.class), request.getExtendedData()));
-		
-		// create the create semantic element wrapper command
-		if (null == createElementCommand)
-			return null;
-		
-		SemanticCreateCommand semanticCommand = new SemanticCreateCommand(
-			requestAdapter, createElementCommand);
-		// get the view command
-		Command viewCommand = getConnectionCompleteCommand(request);
-		if (null == viewCommand)
-			return null;
-		// form the compound command and return
-		CompositeCommand cc = new CompositeCommand(semanticCommand.getLabel());
-		cc.compose( semanticCommand );
-		cc.compose( new CommandProxy(viewCommand) );
-		return new ICommandProxy(cc);
-	}
-
-	/**
-	 * Gets the command to complete the creation of a new connection and
-	 * relationship (if applicable) for an unspecified type request. This command
-	 * includes a command to popup a menu to prompt the user for the type of
-	 * connection to be created.
-	 * 
-	 * @param request
-	 *            the unspecified type request
-	 * @return the command
-	 */
-	protected Command getUnspecifiedConnectionCompleteCommand(
-			CreateUnspecifiedTypeConnectionRequest request) {
-
-		if (request.isDirectionReversed()) {
-			return getReversedUnspecifiedConnectionCompleteCommand(request);
-		}
-
-		List menuContent = getConnectionMenuContent(request);
-
-		if (menuContent.isEmpty()) {
-			return null;
-		} else if (menuContent.size() == 1) {
-			return getConnectionCompleteCommand(menuContent.get(0), request);
-		} else {
-			return new ICommandProxy(getPromptAndCreateConnectionCommand(
-				menuContent, request));
-		}
-	}
-
-	/**
-	 * Gets a command that pops up a menu which allows the user to select which
-	 * type of connection to be created and then creates the connection.
-	 * 
-	 * @param content
-	 *            The list of items making up the content of the popup menu.
-	 * @param request
-	 *            The relevant create connection request.
-	 * @return the command to popup up the menu and create the connection
-	 */
-	protected ICommand getPromptAndCreateConnectionCommand(List content,
-			CreateConnectionRequest request) {
-		return new PromptAndCreateConnectionCommand(content, request);
-	}
-	
-	/**
-	 * Gets the command to create a connection based on the request and the
-	 * connection identifier. This method is called after the user has selected
-	 * the connection to be created when presented with a popup.
-	 * @see #getPromptAndCreateConnectionCommand(List, CreateConnectionRequest)
-	 * 
-	 * @param connectionType
-	 *            the connection type as specified in
-	 *            {@link #getConnectionMenuContent(CreateConnectionRequest)}
-	 * @param request
-	 *            the request, identifying the source and target
-	 * @return the command to create the connection
-	 */
-	protected Command getConnectionCompleteCommand(Object connectionType,
-			CreateConnectionRequest request) {
-		if (connectionType instanceof IElementType) {
-			if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-				CreateRequest createRequest = ((CreateUnspecifiedTypeConnectionRequest) request)
-						.getRequestForType((IElementType) connectionType);
-				if (createRequest != null) {
-					return getHost().getCommand(createRequest);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets a list of all the connector items that will represent the connector
-	 * choices and will appear in the popup menu. This method will get the
-	 * connector content if the given request is a
-	 * <code>CreateUnspecifiedTypeConnectionRequest</code> using the types it
-	 * holds or the types retrieved from the Modeling Assistant Service.
-	 * 
-	 * <p>
-	 * If a subclass wishes to provide additional element types they should
-	 * consider providing these in a Modeling Assistant Provider. If a subclass
-	 * wishes to provide connector choices that are not elements types they may
-	 * provide them here, in this case, the label provider for
-	 * {@link PromptAndCreateConnectionCommand} may need to customized.
-	 * </p>
-	 * 
-	 * @return the list of connector items to appear in the popup menu
-	 */
-	protected List getConnectionMenuContent(CreateConnectionRequest request) {
-        List validRelTypes = new ArrayList();
-        if (request instanceof CreateUnspecifiedTypeConnectionRequest) {
-            CreateUnspecifiedTypeConnectionRequest unspecifiedRequest = (CreateUnspecifiedTypeConnectionRequest) request;
-            List allRequests = unspecifiedRequest.getAllRequests();
-            if (allRequests.isEmpty()) {
-                return null;
-            }
-            IGraphicalEditPart sourceEP = (IGraphicalEditPart) ((CreateConnectionRequest) allRequests
-                .get(0)).getSourceEditPart();
-            IGraphicalEditPart targetEP = (IGraphicalEditPart) ((CreateConnectionRequest) allRequests
-                .get(0)).getTargetEditPart();
-
-            List allRelTypes = unspecifiedRequest.useModelingAssistantService() ? ModelingAssistantService
-                .getInstance().getRelTypesOnSourceAndTarget(sourceEP, targetEP)
-                : unspecifiedRequest.getElementTypes();
-
-            for (Iterator iter = allRelTypes.iterator(); iter.hasNext();) {
-                IElementType type = (IElementType) iter.next();
-
-                Command individualCmd = null;
-
-                Request createConnectionRequest = unspecifiedRequest
-                    .getRequestForType(type);
-                if (createConnectionRequest != null) {
-                    individualCmd = getHost().getCommand(
-                        createConnectionRequest);
-                    
-                    if (individualCmd != null && individualCmd.canExecute()) {
-                        validRelTypes.add(type);
-                    }
-                } else {
-                    // This type may not have been given when the connection
-                    // creation occurred. In this case, use the deferred
-                    // connection creation mechanism.
-
-                    // First, setup the request to initialize the connection
-                    // start command.
-                    CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory
-                        .getCreateConnectionRequest(type,
-                            ((IGraphicalEditPart) getHost())
-                                .getDiagramPreferencesHint());
-                    connectionRequest.setSourceEditPart(null);
-                    connectionRequest.setTargetEditPart(sourceEP);
-                    connectionRequest
-                        .setType(RequestConstants.REQ_CONNECTION_START);
-                    sourceEP.getCommand(connectionRequest);
-
-                    // Now, setup the request in preparation to get the
-                    // connection end
-                    // command.
-                    connectionRequest.setSourceEditPart(sourceEP);
-                    connectionRequest.setTargetEditPart(targetEP);
-                    connectionRequest
-                        .setType(RequestConstants.REQ_CONNECTION_END);
-                    individualCmd = targetEP.getCommand(connectionRequest);                   
-
-                    if (individualCmd != null && individualCmd.canExecute()) {
-                        validRelTypes.add(type);
-                        unspecifiedRequest.addRequest(type, connectionRequest);
-                    }
-                }
-            }
-
-        }
-        return validRelTypes;
-    }
-				
-	/**
-	 * Gets the command to complete the creation of a new connection and
-	 * relationship (if applicable) for an unspecified type request. This command
-	 * includes a command to popup a menu to prompt the user for the type of
-	 * relationship to be created.
-	 * 
-	 * @param request
-	 *            the reversed unspecified type request
-	 * @return the command
-	 */
-	protected Command getReversedUnspecifiedConnectionCompleteCommand(
-			CreateUnspecifiedTypeConnectionRequest request) {
-		EditPart realSourceEP = request.getTargetEditPart();
-		EditPart realTargetEP = request.getSourceEditPart();
-		for (Iterator iter = request.getAllRequests().iterator(); iter
-			.hasNext();) {
-			CreateConnectionRequest connectionRequest = (CreateConnectionRequest) iter
-				.next();
-
-			// First, setup the request to initialize the connection start
-			// command.
-			connectionRequest.setSourceEditPart(null);
-			connectionRequest.setTargetEditPart(realSourceEP);
-			connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
-			realSourceEP.getCommand(connectionRequest);
-
-			// Now, setup the request in preparation to get the connection end
-			// command.
-			connectionRequest.setSourceEditPart(realSourceEP);
-			connectionRequest.setTargetEditPart(realTargetEP);
-			connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
-		}
-
-		// The requests are now ready to be sent to get the connection end
-		// command from real source to real target.
-		request.setDirectionReversed(false);
-		Command command = realTargetEP.getCommand(request);
-		return command;
-	}
-
-    private TransactionalEditingDomain getEditingDomain() {
-        return ((IGraphicalEditPart) getHost()).getEditingDomain();
-}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupComponentEditPolicy.java
deleted file mode 100644
index 819ce6b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupComponentEditPolicy.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.Iterator;
-
-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.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.core.commands.UngroupCommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.GroupRequestViaKeyboard;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-
-/**
- * A <code>ComponentEditPolicy</code> for a <code>GroupEditPart</code>.
- * 
- * @author crevells
- * @since 2.1
- */
-public class GroupComponentEditPolicy
-    extends ComponentEditPolicy {
-
-    public boolean understandsRequest(Request request) {
-        if (ActionIds.ACTION_UNGROUP.equals(request.getType())) {
-            return true;
-        }
-        return super.understandsRequest(request);
-    }
-
-    public Command getCommand(Request request) {
-        if (ActionIds.ACTION_UNGROUP.equals(request.getType())) {
-            return getUngroupCommand(request);
-        }
-        return super.getCommand(request);
-    }
-
-    public EditPart getTargetEditPart(Request request) {
-        return understandsRequest(request) ? getHost()
-            : null;
-    }
-
-    /**
-     * Returns a command to ungroup and then delete the group in the request.
-     * 
-     * @param request
-     *            the request containing the group to be ungrouped
-     * @return the command to perform the ungrouping
-     */
-    protected Command getUngroupCommand(Request request) {
-        UngroupCommand cmd = new UngroupCommand(((GroupEditPart) getHost())
-            .getEditingDomain(), (Node) getHost().getModel());
-        return new ICommandProxy(cmd);
-    }
-
-    /**
-     * Override to delete the group's children's semantic elements.
-     */
-    protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-
-        boolean shouldShowPrompt = (deleteRequest instanceof GroupRequestViaKeyboard) ? ((GroupRequestViaKeyboard) deleteRequest)
-            .isShowInformationDialog()
-            : false;
-
-        EditCommandRequestWrapper editCommandRequest = new EditCommandRequestWrapper(
-            new DestroyElementRequest(editingDomain, shouldShowPrompt),
-            deleteRequest.getExtendedData());
-
-        CompoundCommand cc = new CompoundCommand();
-        for (Iterator iter = ((GroupEditPart) getHost()).getShapeChildren()
-            .iterator(); iter.hasNext();) {
-            IGraphicalEditPart childEP = (IGraphicalEditPart) iter.next();
-            Command semanticCmd = childEP.getCommand(editCommandRequest);
-            if (semanticCmd != null && semanticCmd.canExecute()) {
-                cc.add(semanticCmd);
-            }
-        }
-
-        if (!cc.isEmpty()) {
-            cc.add(createDeleteViewCommand(deleteRequest));
-            return cc;
-        }
-
-        return createDeleteViewCommand(deleteRequest);
-    }
-
-    @Override
-    protected boolean shouldDeleteSemantic() {
-		EditPart parent = getHost().getParent();
-        if (parent instanceof SemanticListCompartmentEditPart){
-            SemanticListCompartmentEditPart semListCompartment  = 
-                (SemanticListCompartmentEditPart)parent;
-            return semListCompartment.isCanonicalOn();
-            
-        } else {
-
-            // If the parent is a group, then we want to get the first parent
-            // that isn't a group and test for a canonical editpolicy there.
-            while (parent instanceof GroupEditPart) {
-                parent = parent.getParent();
-            }
-        }
-        
-        
-        if (parent instanceof IGraphicalEditPart) {
-			CanonicalEditPolicy cep = (CanonicalEditPolicy)parent.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-			if ( cep != null ) {
-				return cep.isEnabled();						
-			} 					
-		} 	
-		return false;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupXYLayoutEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupXYLayoutEditPolicy.java
deleted file mode 100644
index 6ac36fb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GroupXYLayoutEditPolicy.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.Iterator;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.core.commands.UpdateGroupLocationCommand;
-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.requests.RequestConstants;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A <code>XYLayoutEditPolicy</code> for a <code>GroupEditPart</code>.
- * 
- * @author crevells
- * @since 2.1
- */
-public class GroupXYLayoutEditPolicy
-    extends XYLayoutEditPolicy {
-
-    public boolean understandsRequest(Request req) {
-        if (RequestConstants.REQ_AUTOSIZE.equals(req.getType())) {
-            return true;
-        }
-        return super.understandsRequest(req);
-    }
-
-    public Command getCommand(Request request) {
-        if (RequestConstants.REQ_AUTOSIZE.equals(request.getType()))
-            return getCommandFromChildren(request);
-        return super.getCommand(request);
-    }
-
-    /**
-     * Overridden so that if a child shape is moved or resized such that the
-     * group's location (i.e. top left corner) changes, the group's location as
-     * well as all the children's relative locations are updated.
-     */
-    protected Command getResizeChildrenCommand(ChangeBoundsRequest request) {
-        CompoundCommand resize = new CompoundCommand();
-        resize.add(super.getResizeChildrenCommand(request));
-        resize.add(new ICommandProxy(new UpdateGroupLocationCommand(
-            ((IGraphicalEditPart) getHost()).getEditingDomain(),
-            (View) getHost().getModel())));
-        return resize;
-    }
-
-    public EditPart getTargetEditPart(Request request) {
-        if (REQ_CREATE.equals(request.getType())) {
-            return null;
-        } else if (RequestConstants.REQ_AUTOSIZE.equals(request.getType())) {
-            return getHost();
-        }
-        return super.getTargetEditPart(request);
-    }
-
-    /**
-     * Gets a command from each child in the group.
-     * 
-     * @param request
-     * @return the compound command
-     */
-    private Command getCommandFromChildren(Request request) {
-        CompoundCommand cc = new CompoundCommand();
-        for (Iterator iter = getHost().getChildren().iterator(); iter.hasNext();) {
-            EditPart childEP = (EditPart) iter.next();
-            cc.add(childEP.getCommand(request));
-        }
-        cc.unwrap();
-        return cc;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LabelDirectEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LabelDirectEditPolicy.java
deleted file mode 100644
index b0ce484..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LabelDirectEditPolicy.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 
- *    Dmitri Stadnik (Borland) - remove dependency to TextCompartmentEditPart
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editpolicies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author melaasar
- */
-public class LabelDirectEditPolicy
-	extends DirectEditPolicy {
-
-	/**
-	 * We need an adapter that will be able to hold both a model 
-	 * and an view
-	 */
-	class EObjectAdapterEx
-		extends EObjectAdapter {
-
-		private View view = null;
-
-		/**
-		 * constructor
-		 * @param element	element to be wrapped
-		 * @param view	view to be wrapped
-		 */
-		public EObjectAdapterEx(EObject element, View view) {
-			super(element);
-			this.view = view;
-		}
-
-		public Object getAdapter(Class adapter) {
-			Object o = super.getAdapter(adapter);
-			if (o != null)
-				return o;
-			if (adapter.equals(View.class)) {
-				return view;
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
-	 */
-	protected Command getDirectEditCommand(DirectEditRequest edit) {
-		if (edit.getCellEditor() instanceof TextCellEditorEx)
-			if (!((TextCellEditorEx) edit.getCellEditor()).hasValueChanged())
-				return null;
-			
-		String labelText = (String) edit.getCellEditor().getValue();
-		
-		//for CellEditor, null is always returned for invalid values
-		if (labelText == null) {
-			return null;
-		}
-		
-		ITextAwareEditPart compartment = (ITextAwareEditPart) getHost();
-		EObject model = (EObject)compartment.getModel();
-		EObjectAdapter elementAdapter = null ;
-		if (model instanceof View) {
-            View view = (View)model;
-			elementAdapter = new EObjectAdapterEx(ViewUtil.resolveSemanticElement(view),
-				view);
-        }
-		else
-			elementAdapter = new EObjectAdapterEx(model, null);
-		// check to make sure an edit has occurred before returning a command.
-		String prevText = compartment.getParser().getEditString(elementAdapter,
-			compartment.getParserOptions().intValue());
-		if (!prevText.equals(labelText)) {
-			ICommand iCommand = 
-				compartment.getParser().getParseCommand(elementAdapter, labelText, 0);
-			return new ICommandProxy(iCommand);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see DirectEditPolicy#showCurrentEditValue(DirectEditRequest)
-	 */
-	protected void showCurrentEditValue(DirectEditRequest request) {
-		String value = (String) request.getCellEditor().getValue();
-		((ITextAwareEditPart) getHost()).setLabelText(value);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LayoutEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LayoutEditPolicy.java
deleted file mode 100644
index 05c8b23..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/LayoutEditPolicy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Obeo and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *      Mariot Chauvin (Obeo) <mariot.chauvin@obeo.fr> - initial API and implementation 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editpolicies;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * Extension of the GEF Layout EditPolicy.
- * 
- * @since 1.4
- */
-public abstract class LayoutEditPolicy extends org.eclipse.gef.editpolicies.LayoutEditPolicy {
-
-	/*
-	 * Override to erase in case of GMF drop request, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=276033
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-	 */
-	@Override
-	public void eraseTargetFeedback(Request request) {
-		super.eraseTargetFeedback(request);
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-				eraseLayoutTargetFeedback(request);
-	}
-
-	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ListItemComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ListItemComponentEditPolicy.java
deleted file mode 100644
index c90c30d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ListItemComponentEditPolicy.java
+++ /dev/null
@@ -1,59 +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.editpolicies;
-
-import org.eclipse.gef.EditPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IInsertableEditPart;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-
-/**
- * EditPolicy to be installed on {@link org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart}.
- * This editpolicy will delete the selected element.
- * @author mhanner
- */
-public class ListItemComponentEditPolicy
-	extends ComponentEditPolicy {
-
-
-	/**
-	 * 
-	 */
-	public ListItemComponentEditPolicy() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-	
-	/**
-	 * Returns the view element to be deleted.
-	 * @return the host's view element.
-	 */
-	protected View getView() {
-		return (View) getHost().getModel();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy#getInsertableEditPart()
-	 */
-	protected IInsertableEditPart getInsertableEditPart() {
-		// get the container of the host list item
-		EditPart container = getHost().getParent();
-		if (container instanceof IInsertableEditPart) {
-			return (IInsertableEditPart)container;
-		}
-		
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableEditPolicyEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableEditPolicyEx.java
deleted file mode 100644
index 16055db..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableEditPolicyEx.java
+++ /dev/null
@@ -1,131 +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.editpolicies;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Handle;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.AbstractHandle;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * A non-resizable edit policy that understands REQ_DRAG and REQ_DROP requests 
- * 
- * @author melaasar
- */
-public class NonResizableEditPolicyEx extends NonResizableEditPolicy {
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#eraseSourceFeedback(org.eclipse.gef.Request)
-	 */
-	public void eraseSourceFeedback(Request request) {
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-			eraseChangeBoundsFeedback((ChangeBoundsRequest) request);
-		else
-			super.eraseSourceFeedback(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#showSourceFeedback(org.eclipse.gef.Request)
-	 */
-	public void showSourceFeedback(Request request) {
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-			showChangeBoundsFeedback((ChangeBoundsRequest) request);
-		else
-			super.showSourceFeedback(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#addSelectionHandles()
-	 */
-	protected void addSelectionHandles() {
-		super.addSelectionHandles();
-		Iterator iter = handles.iterator();
-		while (iter.hasNext()) {
-			Handle handle = (Handle) iter.next();
-			if (handle.getDragTracker().getClass() == DragEditPartsTracker.class)
-				replaceHandleDragEditPartsTracker(handle);
-		}
-	}
-
-	/**
-	 * Replaces the handle's default DragEditPartsTracker with the extended
-	 * DragEditPartsTrackerEx 
-	 * @param handle handle to replace
-	 */
-	protected void replaceHandleDragEditPartsTracker(Handle handle) {
-		if (handle instanceof AbstractHandle) {
-			AbstractHandle h = (AbstractHandle) handle;
-			h.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request))
-			return getHost();
-		return super.getTargetEditPart(request);
-	}
-
-    /**
-     * Shows or updates feedback for a change bounds request.
-     * This method had been overriden to make sure that the feed back never
-     * go below the min size also it make sure it never exceed the max size
-     * @param request the request
-     */
-    protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-        IFigure feedback = getDragSourceFeedbackFigure();
-        
-        PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
-        getHostFigure().translateToAbsolute(rect);
-        rect.translate(request.getMoveDelta());
-        rect.resize(request.getSizeDelta());
-           
-        IFigure f = getHostFigure();
-        Dimension min = f.getMinimumSize().getCopy();
-        Dimension max = f.getMaximumSize().getCopy();
-        IMapMode mmode = MapModeUtil.getMapMode(f);
-        min.height = mmode.LPtoDP(min.height);
-        min.width = mmode.LPtoDP(min.width);
-        max.height = mmode.LPtoDP(max.height);
-        max.width = mmode.LPtoDP(max.width);
-        
-        if (min.width>rect.width)
-            rect.width = min.width;
-        else if (max.width < rect.width)
-            rect.width = max.width;
-        
-        if (min.height>rect.height)
-            rect.height = min.height;
-        else if (max.height < rect.height)
-            rect.height = max.height;
-        
-        feedback.translateToRelative(rect);
-        feedback.setBounds(rect);
-    }
-    
-    
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableLabelEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableLabelEditPolicy.java
deleted file mode 100644
index 0355c00..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableLabelEditPolicy.java
+++ /dev/null
@@ -1,158 +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.editpolicies;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-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.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.LabelHelper;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * EditPolicy which moves a label relative to it parent.
- * 
- * @author jcorchis
- */
-public class NonResizableLabelEditPolicy
-	extends NonResizableEditPolicyEx {
-
-	private Polyline tether = null;
-
-	protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) {
-		super.eraseChangeBoundsFeedback(request);
-		if (tether != null)
-			removeFeedback(tether);
-		tether = null;
-	}
-
-	protected IFigure createDragSourceFeedbackFigure() {
-		IFigure feedback = super.createDragSourceFeedbackFigure();
-		tether = new Polyline();
-		tether.setLineStyle(Graphics.LINE_DASHDOT);
-		tether.setForegroundColor(((IGraphicalEditPart) getHost()).getFigure()
-			.getForegroundColor());
-		addFeedback(tether);
-		return feedback;
-	}
-
-	protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-		super.showChangeBoundsFeedback(request);
-
-		IFigure p = getDragSourceFeedbackFigure();
-		Rectangle r = p.getBounds();
-		Point refPoint = ((LabelEditPart) getHost()).getReferencePoint();
-
-		// translate the feedback figure
-		PrecisionRectangle rect = new PrecisionRectangle(
-			getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(rect);
-		rect.translate(request.getMoveDelta());
-		rect.resize(request.getSizeDelta());
-		p.translateToRelative(rect);
-		p.setBounds(rect);
-
-		Rectangle centerMain = null;
-		// TODO: remove this hack. We should be using the reference point for
-		// the teher end, however,
-		// the reference point is causing miscaculation when positioning. This
-		// has to be redone in version 2.
-		if (((IGraphicalEditPart) getHost().getParent()).getFigure() instanceof Connection) {
-			centerMain = new Rectangle(refPoint.x, refPoint.y, 0, 0);
-			getHostFigure().translateToAbsolute(centerMain);
-			p.translateToRelative(centerMain);
-		} else {
-			centerMain = ((IGraphicalEditPart) getHost().getParent())
-				.getFigure().getBounds().getCopy();
-			centerMain.translate(centerMain.width / 2, centerMain.height / 2);
-			getHostFigure().translateToAbsolute(centerMain);
-			p.translateToRelative(centerMain);
-		}
-
-		PrecisionRectangle ref = new PrecisionRectangle(centerMain);
-
-		Point midTop = new Point(r.x + r.width / 2, r.y);
-		Point midBottom = new Point(r.x + r.width / 2, r.y + r.height);
-		Point midLeft = new Point(r.x, r.y + r.height / 2);
-		Point midRight = new Point(r.x + r.width, r.y + r.height / 2);
-
-		Point startPoint = midTop;
-
-		int x = r.x + r.width / 2 - refPoint.x;
-		int y = r.y + r.height / 2 - refPoint.y;
-
-		if (y > 0 && y > x && y > -x)
-			startPoint = midTop;
-		else if (y < 0 && y < x && y < -x)
-			startPoint = midBottom;
-		else if (x < 0 && y > x && y < -x)
-			startPoint = midRight;
-		else
-			startPoint = midLeft;
-
-		tether.setStart(startPoint);
-		tether.setEnd(ref.getLocation());
-	}
-
-	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		LabelEditPart editPart = (LabelEditPart) getHost();
-		Point refPoint = editPart.getReferencePoint();
-
-		// translate the feedback figure
-		PrecisionRectangle rect = new PrecisionRectangle(
-			getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(rect);
-		rect.translate(request.getMoveDelta());
-		rect.resize(request.getSizeDelta());
-		getHostFigure().translateToRelative(rect);
-
-		Point normalPoint = LabelHelper.offsetFromRelativeCoordinate(
-			getHostFigure(), rect, refPoint);
-
-		ICommand moveCommand = new SetBoundsCommand(editPart.getEditingDomain(), DiagramUIMessages.MoveLabelCommand_Label_Location,
-			new EObjectAdapter((View) editPart.getModel()), normalPoint);
-		return new ICommandProxy(moveCommand);
-	}
-
-	/**
-	 * Overridden to use a customized drag tracker for the handles. The
-	 * <code>isMove()</code> method of the drag tracker needs to be overridden
-	 * as the parent of the label and connection will not be the same as the
-	 * target editpart, instead it returns true always since labels can only be
-	 * moved and not resized.
-	 * 
-	 * @return a drag tracker
-	 */
-	protected DragTracker createSelectionHandleDragTracker() {
-		return new DragEditPartsTrackerEx(getHost()) {
-
-			protected boolean isMove() {
-				return true;
-			}
-		};
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableTextEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableTextEditPolicy.java
deleted file mode 100644
index 8402b49..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NonResizableTextEditPolicy.java
+++ /dev/null
@@ -1,91 +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.editpolicies;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-
-/**
- * A non-resizable editpolicy for text compartments. It handles the selection
- * and focus feedback of text compartments.
- * 
- * @author melaasar
- */
-public class NonResizableTextEditPolicy
-	extends NonResizableEditPolicyEx {
-
-    /**
-     * Gets the label delegate that is used to interact with the label figure
-     * inside the host editpart.
-     * 
-     * @return the label delegate
-     */
-    private ILabelDelegate getLabel() {
-        return (ILabelDelegate) getHost().getAdapter(ILabelDelegate.class);
-    }
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#hideFocus()
-	 */
-	protected void hideFocus() {
-	    getLabel().setFocus(false);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#hideSelection()
-	 */
-	protected void hideSelection() {
-		getLabel().setSelected(false);
-		getLabel().setFocus(false);
-		super.hideSelection();
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#showFocus()
-	 */
-	protected void showFocus() {
-		getLabel().setFocus(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-	 */
-	protected void showPrimarySelection() {
-		super.showPrimarySelection();
-		getLabel().setFocus(true);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-	 */
-	protected void showSelection() {
-		super.showSelection();
-		getLabel().setSelected(true);
-		getLabel().setFocus(false);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()
-	 */
-	protected List createSelectionHandles() {
-		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		return Collections.singletonList(moveHandle);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NotationConnectionReorientEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NotationConnectionReorientEditPolicy.java
deleted file mode 100644
index 9c6ea34..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/NotationConnectionReorientEditPolicy.java
+++ /dev/null
@@ -1,109 +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.editpolicies;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editpolicies.NoteAttachmentReorientEditPolicy;
-
-/**
- * By default, reorienting of connections that do not have any semantic meaning
- * (e.g. note attachments) will be supported between any two nodes by a
- * <code>GraphicalNodeEditPolicy</code>. The intention of this editpolicy is
- * to provide a place where this can be disabled. To disable reorienting of a
- * connection between two nodes, return an unexecutable command. For an example
- * implementation, see {@link NoteAttachmentReorientEditPolicy}.
- * 
- * @author Cherie Revells
- */
-abstract public class NotationConnectionReorientEditPolicy
-    extends AbstractEditPolicy {
-
-    public Command getCommand(Request request) {
-        if (REQ_RECONNECT_SOURCE.equals(request.getType())
-            && connectionSourceHasChanged((ReconnectRequest) request)) {
-            return getReorientConnectionSourceCommand((ReconnectRequest) request);
-        } else if (REQ_RECONNECT_TARGET.equals(request.getType())
-            && connectionTargetHasChanged((ReconnectRequest) request)) {
-            return getReorientConnectionTargetCommand((ReconnectRequest) request);
-        }
-
-        return super.getCommand(request);
-    }
-
-    /**
-     * Subclasses may override to return an unexecutable command if reorienting
-     * the connection to the new source should be disabled. Otherwise, this
-     * command should return null so as not to interfere.
-     * 
-     * @param request
-     *            the request to change the source of a connection
-     * @return an unexecutable command if this gesture should be disabled; null
-     *         otherwise
-     */
-    protected Command getReorientConnectionSourceCommand(
-            ReconnectRequest request) {
-        return null;
-    }
-
-    /**
-     * Subclasses may override to return an unexecutable command if reorienting
-     * the connection to the new target should be disabled. Otherwise, this
-     * command should return null so as not to interfere.
-     * 
-     * @param request
-     *            the request to change the target of a connection
-     * @return an unexecutable command if this gesture should be disabled; null
-     *         otherwise
-     */
-    protected Command getReorientConnectionTargetCommand(
-            ReconnectRequest request) {
-        return null;
-    }
-
-    /**
-     * Has the connection source changed? If not, then it is not necessary to
-     * return a command that will change the connection's source.
-     * 
-     * @param request
-     *            the request to reconnect the source of a connection
-     * @return true if the source has changed; false otherwise
-     */
-    private boolean connectionSourceHasChanged(ReconnectRequest request) {
-        return !request.getConnectionEditPart().getSource().equals(
-            request.getTarget());
-    }
-
-    /**
-     * Has the connection target changed? If not, then it is not necessary to
-     * return a command that will change the connection's target.
-     * 
-     * @param request
-     *            the request to reconnect the target of a connection
-     * @return true if the target has changed; false otherwise
-     */
-    private boolean connectionTargetHasChanged(ReconnectRequest request) {
-        return !request.getConnectionEditPart().getTarget().equals(
-            request.getTarget());
-    }
-
-    public boolean understandsRequest(Request request) {
-        if ((REQ_RECONNECT_SOURCE.equals(request.getType()) || REQ_RECONNECT_TARGET
-            .equals(request.getType()))) {
-            return true;
-        }
-        return false;
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenDiagramEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenDiagramEditPolicy.java
deleted file mode 100644
index abcd799..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenDiagramEditPolicy.java
+++ /dev/null
@@ -1,55 +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.editpolicies;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.OpenDiagramCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Edit Policy which opens the diagram corresponding to the host's semantic model.
- * 
- * @author jcorchis
- */
-public class OpenDiagramEditPolicy extends OpenEditPolicy {
-
-	/** 
-	 * Returns a Command to open a diagram for the given NalDiagramView.
-	 * @return Command
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy#getOpenCommand(org.eclipse.gef.Request)
-	 */
-	protected Command getOpenCommand(Request request) {
-		EditPart targetEditPart = getTargetEditPart(request);
-		if (targetEditPart instanceof IGraphicalEditPart) {
-			IGraphicalEditPart editPart = (IGraphicalEditPart)targetEditPart;
-			View view = editPart.getNotationView();
-			if (view !=null){
-				EObject element = ViewUtil.resolveSemanticElement(view);
-				if (element instanceof Diagram) {
-					return new ICommandProxy(
-						new OpenDiagramCommand(element));
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenEditPolicy.java
deleted file mode 100644
index 6c07f00..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/OpenEditPolicy.java
+++ /dev/null
@@ -1,85 +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.editpolicies;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/** Open Shape Edit Policy
- * <p>
- * This edit policy handles double click (open) gestures on shapes. When the user
- * double clicks on an edit part, GEF creates a REQ_OPEN request and subclasses of this
- * edit policy should handle that request. This policy should be installed with the
- * policy role OPEN_ROLE. Normally, the corresponding edit policy role
- * would be defined in {@link org.eclipse.gef.EditPolicy}, but no such role currently exists.
- * <p>
- * This edit policy is different from "DirectEditPolicy" even though both are a result of
- * a double click on a representation in a diagram. With the DIRECT_EDIT_ROLE, some type 
- * of in-diagram editing is performed (e.g., modify a text label, move line segment nodes, 
- * etc.). The OPEN_ROLE policy is typically installed on edit part whose underlying data
- * can only be examined/modified by opening another editor window. For example, if an edit
- * part represented another diagram, then an "open" request on that edit part should result 
- * in the corresponding diagram being opened in another editor window.
- * <p>
- * Although edit policies for both DIRECT_EDIT_ROLE and OPEN_ROLE could be installed on 
- * an edit part, typically only one of these roles is appropriate.
- * <p>
- * @author Kevin Cornell
- */
-public abstract class OpenEditPolicy extends AbstractEditPolicy {
-
-    /**
-     * Returns the <code>Command</code> to perform the open request.
-     * @param request the Request
-     * @return the command to perform the open
-     */
-    protected abstract Command getOpenCommand(Request request);
-
-    /** 
-     * Intercept a command request for REQ_OPEN.
-     * <p>
-     * @see org.eclipse.gef.EditPolicy#getCommand(org.eclipse.gef.Request)
-     */
-    public Command getCommand(Request request) {
-        if (RequestConstants.REQ_OPEN.equals(request.getType()))
-            return getOpenCommand(request);
-        return null;
-    }
-
-    /** 
-     * Determine if the request type is supported by this edit policy.
-     * <p>
-     * @see org.eclipse.gef.EditPolicy#understandsRequest(org.eclipse.gef.Request)
-     */
-    public boolean understandsRequest(Request request) {
-        if (RequestConstants.REQ_OPEN.equals(request.getType()))
-            return true;
-        return false;
-    }
-
-    /**
-     * By default, the target edit part is the host edit part.
-     * <p>
-     * @see org.eclipse.gef.EditPolicy#getTargetEditPart(Request)
-     */
-    public EditPart getTargetEditPart(Request request) {
-
-        if (understandsRequest(request))
-            return getHost();
-
-        return null;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PopupBarEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PopupBarEditPolicy.java
deleted file mode 100644
index 53f9c3a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PopupBarEditPolicy.java
+++ /dev/null
@@ -1,1060 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.Handle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-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.tools.AbstractPopupBarTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.PopupBarTool;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Popup bars are esentially a cartoon balloon with buttons that are activated
- * during mouse hover over a shape.
- * 
- * @author affrantz@us.ibm.com, cmahoney
- */
-public class PopupBarEditPolicy extends DiagramAssistantEditPolicy {
-
-	/* ************************** nested classes *********************** */
-	/**
-	 * 
-	 * Class to hold pertinent information about the tool placed on the popup bar
-	 * 
-	 * @author affrantz@us.ibm.com
-	 */
-	private class PopupBarDescriptor {
-
-		/** The action button tooltip */
-		private String _tooltip = new String();
-
-		/** The image for the button */
-		private Image _icon = null;
-
-		/** The typeinfo used to create the Request for the command */
-		@SuppressWarnings("unused")
-		private IElementType _elementType;
-
-		/** The DracgTracker / Tool associatd with the popup bar button */
-		private DragTracker _dragTracker = null;
-
-		/**
-		 * constructor
-		 * @param s
-		 * @param i
-		 * @param elementType
-		 * @param theTracker
-		 */
-		public PopupBarDescriptor(
-				String s,
-				Image i,
-				IElementType elementType,
-				DragTracker theTracker) {
-			_tooltip = s;
-			_icon = i;
-			_dragTracker = theTracker;
-			_elementType = elementType;
-
-		}
-
-		/**
-		 * gets the icon associated with this Descriptor
-		 * @return Image
-		 */
-		public final Image getIcon() {
-			return _icon;
-		}
-
-		/**
-		 * gets the drag tracker associated with this Descriptor
-		 * @return drag tracker
-		 */
-		public final DragTracker getDragTracker() {
-			return _dragTracker;
-		}
-
-		/**
-		 * gets the tool tip associated with this Descriptor
-		 * @return string
-		 */
-		public final String getToolTip() {
-			return _tooltip;
-		}
-
-	} // end PopupBarDescriptor
-
-	/**
-	 * Default tool placed on the popup bar
-	 * 
-	 * @author affrantz@us.ibm.com
-	 */
-	private class PopupBarLabelHandle extends Label implements Handle {
-		/**
-		 * flag to drawFocus rect around the handle when the mouse rolls over
-		 * it
-		 */
-		private boolean myMouseOver = false;
-
-		private Image myDisabledImage = null;
-
-		/** The dragTracker CreationTool associated with the handle * */
-		private DragTracker myDragTracker = null;
-
-		private Image getDisabledImage()
-		{
-			if (myDisabledImage != null)
-				return myDisabledImage;
-
-			Image theImage = this.getIcon();
-			if (theImage == null)
-				return null;
-
-			myDisabledImage = new Image(Display.getCurrent(), theImage, SWT.IMAGE_DISABLE);
-			if (imagesToBeDisposed == null) {
-				imagesToBeDisposed = new ArrayList();
-			}
-			imagesToBeDisposed.add(myDisabledImage);
-			return myDisabledImage;
-		}
-
-		/**
-		 * cnostructor
-		 * @param tracker
-		 * @param theImage
-		 */
-		public PopupBarLabelHandle(DragTracker tracker, Image theImage) {
-			super(theImage);
-			myDragTracker = tracker;
-			this.setOpaque(true);
-			this.setBackgroundColor(ColorConstants.buttonLightest);
-            calculateEnabled();
-		}
-
-		/**
-		 * @see org.eclipse.gef.Handle#getAccessibleLocation()
-		 */
-		public Point getAccessibleLocation() {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.gef.Handle#getDragTracker()
-		 */
-		public DragTracker getDragTracker() {
-			return myDragTracker;
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)
-		 *      paint a focus rectangle for the label if the mouse is inside
-		 *      the label
-		 */
-		protected void paintBorder(Graphics graphics) {
-			super.paintBorder(graphics);
-
-			if (myMouseOver) {
-
-				Rectangle area = getClientArea();
-				graphics.setForegroundColor(ColorConstants.black);
-				graphics.setBackgroundColor(ColorConstants.white);
-
-				graphics.drawFocus(
-					area.x,
-					area.y,
-					area.width - 1,
-					area.height - 1);
-
-			}
-
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.IFigure#handleMouseEntered(org.eclipse.draw2d.MouseEvent)
-		 *      flip myMouseOver bit and repaint
-		 */
-		public void handleMouseEntered(MouseEvent event) {
-            
-            calculateEnabled();
-
-			super.handleMouseEntered(event);
-			myMouseOver = true;
-			repaint();
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.IFigure#handleMouseExited(org.eclipse.draw2d.MouseEvent)
-		 *      flip myMouseOver bit and repaint
-		 */
-		public void handleMouseExited(MouseEvent event) {
-
-			super.handleMouseExited(event);
-			myMouseOver = false;
-			repaint();
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.IFigure#handleMousePressed(org.eclipse.draw2d.MouseEvent)
-		 *      set PopupBarEditPolicy.myActionMoveFigure bit so the popup bar
-		 *      is not dismissed after creating an item in the editpart
-		 * 
-		 */
-		public void handleMousePressed(MouseEvent event) {
-
-			if (1 == event.button) 
-			{
-				// this is the flag in PopupBarEditPolicy that
-				// prevents the popup bar from dismissing after a new item
-				// is added to a shape, which causes the editpart to be
-				// resized.
-				setFlag(POPUPBAR_MOVE_FIGURE, true);
-				// future: when other tools besides PopupBarTool are
-				// used
-				// we will need a way in which to call
-
-			}
-
-			super.handleMousePressed(event);
-		}
-
-        private void calculateEnabled() {
-            if((myDragTracker != null) && (myDragTracker instanceof AbstractPopupBarTool))
-            {
-                AbstractPopupBarTool abarTool = (AbstractPopupBarTool) myDragTracker;
-                setEnabled(abarTool.isCommandEnabled());
-            } else {
-                setEnabled(true);
-            }
-        }
-
-		/**
-		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-		 */
-		protected void paintFigure(Graphics graphics) {
-			if(!isEnabled())
-			{
-				Image theImage = getDisabledImage();
-				if (theImage != null)
-				{
-					graphics.translate(bounds.x, bounds.y);
-					graphics.drawImage(theImage, getIconLocation());
-					graphics.translate(-bounds.x, -bounds.y);
-					return;
-				}
-
-			}
-			super.paintFigure(graphics);
-
-		}
-	}
-
-	private static Image IMAGE_POPUPBAR_PLUS = DiagramUIPluginImages
-		.get(DiagramUIPluginImages.IMG_POPUPBAR_PLUS);
-
-	private static Image IMAGE_POPUPBAR = DiagramUIPluginImages
-		.get(DiagramUIPluginImages.IMG_POPUPBAR);
-	
-	/**
-	 * 
-	 * This is the figure that represents the ballon portion of the popup bar
-	 * 
-	 * @author affrantz@us.ibm.com
-	 */
-	private class RoundedRectangleWithTail extends RoundedRectangle {
-
-		private Image myTailImage = null;
-
-		private boolean bIsInit = false;
-
-		private int myCornerDimension = 6;
-
-		/**
-		 * constructor
-		 */
-		public RoundedRectangleWithTail() {
-			// we do not make the myActionTailFigue opaque because it
-			// doesn't look good when magnification is set.
-			this.setFill(true);
-			this.setBackgroundColor(ColorConstants.buttonLightest);
-			this.setForegroundColor(ColorConstants.lightGray);
-			this.setVisible(true);
-			this.setEnabled(true);
-			this.setOpaque(true);
-
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-		 */
-		public void paintFigure(Graphics graphics) {
-			int shiftWidth = 3;
-			Image theTail = getTail();
-			Rectangle theBounds = this.getBounds().getCopy();
-			theBounds.height -= theTail.getBounds().height;
-			theBounds.height -= shiftWidth;// shift slight above cursor
-			theBounds.x += shiftWidth; // shift slight to right of cursor
-			theBounds.width -= (shiftWidth + 1); // otherwise rhs is clipped
-
-			// fill the round rectangle first since it is opaque
-			graphics.fillRoundRectangle(
-				theBounds,
-				myCornerDimension,
-				myCornerDimension);
-			graphics.drawRoundRectangle(
-				theBounds,
-				myCornerDimension,
-				myCornerDimension);
-
-			graphics.drawImage(
-				theTail,
-				theBounds.x + 6,
-				theBounds.y + theBounds.height - 1);
-
-		}
-		private Image getTail()
-		{
-			if(!bIsInit)
-			{
-				if(getIsDisplayAtMouseHoverLocation() && !isHostConnection())
-				{
-					if(myTailImage == null)
-					{
-						myTailImage = IMAGE_POPUPBAR_PLUS;
-						bIsInit = true;
-					}
-				}
-				else
-				{
-					if(myTailImage == null)
-					{
-						myTailImage = IMAGE_POPUPBAR;
-						bIsInit = true;
-					}
-				}
-
-			}
-			return myTailImage;
-
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#isDiagramAssistant(java.lang.Object)
-	 */
-	protected boolean isDiagramAssistant(Object object) {
-		return object instanceof RoundedRectangleWithTail
-			|| object instanceof PopupBarLabelHandle;
-	}
-
-	/**
-	 * Adds the popup bar after a delay
-	 */
-	public void mouseHover(MouseEvent me) {
-			// if the cursor is inside the popup bar
-			// or the keyboar triggred activation
-			// then we do not want to deactivate
-			if (!isDiagramAssistant(me.getSource()))
-				setAvoidHidingDiagramAssistant(false);
-
-			setMouseLocation(me.getLocation());
-			if (getIsDisplayAtMouseHoverLocation())
-				showDiagramAssistantAfterDelay(getAppearanceDelayLocationSpecific()); // no
-																						// delay
-			else if (shouldShowDiagramAssistant()) {
-				showDiagramAssistant(getMouseLocation()); // no delay
-			}
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.MouseMotionListener#mouseMoved(org.eclipse.draw2d.MouseEvent)
-	 */
-	public void mouseMoved(MouseEvent me) {
-
-		if(getIsDisplayAtMouseHoverLocation())
-			{
-			Object srcObj = me.getSource();
-			if ((srcObj != null) && srcObj.equals(getHostFigure())) {
-				hideDiagramAssistant();
-			}
-		}
-		setAvoidHidingDiagramAssistant(true);
-		setMouseLocation(me.getLocation());
-
-		if (!getIsDisplayAtMouseHoverLocation()) {
-			// if the cursor is inside the popup bar
-			// or the keyboar triggred activation
-			// then we do not want to deactivate
-			if (!isDiagramAssistant(me.getSource()))
-				setAvoidHidingDiagramAssistant(false);
-
-			showDiagramAssistantAfterDelay(getAppearanceDelay());
-		}
-	}
-
-	/**
-	 * Listens to the owner figure being moved so the handles can be removed
-	 * when this occurs.
-	 * 
-	 * @author affrantz@us.ibm.com
-	 * 
-	 */
-	private class OwnerMovedListener implements FigureListener {
-
-		private Point myPopupBarLastPosition = new Point(0, 0);
-
-		boolean hasPositionChanged(Rectangle theBounds) {
-			if (theBounds.x != myPopupBarLastPosition.x)
-				return true;
-			if (theBounds.y != myPopupBarLastPosition.y)
-				return true;
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.draw2d.FigureListener#figureMoved(org.eclipse.draw2d.IFigure)
-		 */
-		public void figureMoved(IFigure source) {
-			// for some reason we get more than one
-			// figure moved call after compartment items are added
-			// myActionMoveFigure handles the first one which we expect
-			// hasPositionChanged handles the others caused by the selection of
-			// the compartment
-			// item.
-			if (getFlag(POPUPBAR_MOVE_FIGURE)
-				&& hasPositionChanged(source.getBounds())) {
-				hideDiagramAssistant(); // without delay
-			} else {
-				setFlag(POPUPBAR_MOVE_FIGURE, false); // toggle flag back
-				Rectangle theBounds = source.getBounds();
-				myPopupBarLastPosition.setLocation(theBounds.x, theBounds.y);
-
-			}
-
-		}
-	}
-
-	/**
-	 * Listens for mouse key presses so the popup bar can be dismissed if the context 
-	 * menu is displayed
-	 * 
-	 * @author affrantz@us.ibm.com
-	 */
-	private class PopupBarMouseListener extends MouseListener.Stub {
-
-		/**
-		 * @see org.eclipse.draw2d.MouseListener#mousePressed(org.eclipse.draw2d.MouseEvent)
-		 */
-		public void mousePressed(MouseEvent me) {
-			if (3 == me.button) // context menu, hide the popup bar
-			{
-				hideDiagramAssistant();
-			}
-			super.mousePressed(me);
-			setPopupBarOnDiagramActivated(true);
-		}
-		public void mouseReleased(MouseEvent me)
-		{
-			super.mouseReleased(me);
-
-		}
-	}
-
-	/* ************************* End nested classes ******************** */
-
-	/** Y postion offset from shape where the balloon top begin. */
-	static private int BALLOON_Y_OFFSET = 10;
-
-	/** Y postion offset from shape where the balloon top begin. */
-	static private double BALLOON_X_OFFSET_RHS = 0.65;
-
-	static private double BALLOON_X_OFFSET_LHS = 0.25;
-
-	/** Y postion offset from shape where the balloon top begin. */
-	static private int ACTION_WIDTH_HGT = 30;
-
-	static private int ACTION_BUTTON_START_X = 5;
-
-	static private int ACTION_BUTTON_START_Y = 5;
-
-	static private int ACTION_MARGIN_RIGHT = 10;
-
-	/** popup bar bits */
-	static private int POPUPBAR_ACTIVATEONHOVER				= 0x01; /* Display the action when hovering*/
-	static private int POPUPBAR_MOVE_FIGURE			 		= 0x02; /* Ignore the first figureMoved event when creating elements inside a shape via a popup bar*/ 
-	static private int POPUPBAR_DISPLAYATMOUSEHOVERLOCATION	= 0x04; /* Display the popup bar at the mouse location used by diagrams and machine edit parts*/
-	static private int POPUPBAR_ONDIAGRAMACTIVATED				= 0x10; /* For popup bars on diagram and machine edit parts, where we POPUPBAR_DISPLAYATMOUSEHOVERLOCATION, don't display popup bar until user clicks on surface*/
-	static private int POPUPBAR_HOST_IS_CONNECTION				= 0x20; /* For popup bars on connection edit parts*/
-
-	/** Bit field for the actrionbar associated bits */
-	private int myPopupBarFlags = POPUPBAR_ACTIVATEONHOVER;
-
-	private double myBallonOffsetPercent = BALLOON_X_OFFSET_RHS;
-
-	/** the figure used to surround the action buttons */
-	private IFigure myBalloon = null;
-
-	/** The popup bar descriptors for the popup bar buttons */
-	private List myPopupBarDescriptors = new ArrayList();
-
-	/** Images created that must be deleted when popup bar is removed */
-	protected List imagesToBeDisposed = null;
-
-	/** mouse keys listener for the owner shape */
-	private PopupBarMouseListener myMouseKeyListener = new PopupBarMouseListener();
-
-	/** listener for owner shape movement */
-	private OwnerMovedListener myOwnerMovedListener = new OwnerMovedListener();
-
-	/** flag for whether mouse cursor within shape */
-
-	private void setFlag(int bit, boolean b)
-	{
-		if (b)
-			myPopupBarFlags |= bit;
-		else if (getFlag(bit))
-			myPopupBarFlags ^= bit;
-
-	}
-
-	private boolean getFlag(int bit)
-	{
-		return ((myPopupBarFlags & bit) > 0);
-	}
-
-
-	
-	private void setPopupBarOnDiagramActivated(boolean bVal)
-	{
-		setFlag(POPUPBAR_ONDIAGRAMACTIVATED, bVal);
-	}
-	private boolean getPopupBarOnDiagramActivated()
-	{
-		return getFlag(POPUPBAR_ONDIAGRAMACTIVATED);
-	}
-
-	/**
-	 * set the host is connection flag
-	 * @param bVal the new value
-	 */
-	protected void setHostConnection(boolean bVal)
-	{
-		setFlag(POPUPBAR_HOST_IS_CONNECTION, bVal);
-	}
-
-	/**
-	 * get the host is connection flag
-	 * @return true or false
-	 */
-	protected boolean isHostConnection()
-	{
-		return getFlag(POPUPBAR_HOST_IS_CONNECTION);
-	}
-
-	/**
-	 * Populates the popup bar with popup bar descriptors added by suclassing
-	 * this editpolicy (i.e. <code>fillPopupBarDescriptors</code> and by
-	 * querying the modeling assistant service for all types supported on the
-	 * popup bar of this host. For those types added by the modeling assistant
-	 * service the icons are retrieved using the Icon Service.
-	 */
-	protected void populatePopupBars() {
-		fillPopupBarDescriptors();
-		List types = ModelingAssistantService.getInstance()
-			.getTypesForPopupBar(getHost());
-		for (Iterator iter = types.iterator(); iter.hasNext();) {
-			Object type = iter.next();
-			if (type instanceof IElementType) {
-				addPopupBarDescriptor((IElementType) type, IconService
-					.getInstance().getIcon((IElementType) type));
-			}
-		}
-	}
-
-	/**
-	 * This is the entry point that subclasses can override to fill the
-	 * popup bar descrioptors if they have customized tools that cannot be done
-	 * using the type along with the modeling assistant service.
-	 */
-	protected void fillPopupBarDescriptors() {
-		// subclasses can override.
-	}
-
-	private boolean isSelectionToolActive()
-	{
-		// getViewer calls getParent so check for null
-		if(getHost().getParent() != null && getHost().isActive() )
-		{
-			Tool theTool = getHost().getViewer().getEditDomain().getActiveTool();
-			if((theTool != null) && theTool instanceof SelectionTool)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#shouldShowDiagramAssistant()
-	 */
-	protected boolean shouldShowDiagramAssistant()
-	{
-		if (!super.shouldShowDiagramAssistant()) {
-			return false;
-		}
-
-		if(this.getIsDisplayAtMouseHoverLocation())
-		{
-			if (isHostConnection())
-				return isSelectionToolActive();
-			if (getPopupBarOnDiagramActivated())
-				return isSelectionToolActive();
-			return false;
-		}
-		else
-			return isSelectionToolActive();
-
-	}
-
-	/**
-	 * allows plugins to add their own popup bar tools and tips
-	 * @param elementType
-	 * @param theImage
-	 * @param theTracker
-	 * @param theTip
-	 */
-	protected void addPopupBarDescriptor(
-			IElementType elementType,
-			Image theImage,
-			DragTracker theTracker,
-			String theTip) {
-
-		PopupBarDescriptor desc =
-			new PopupBarDescriptor(theTip, theImage, elementType, theTracker);
-		myPopupBarDescriptors.add(desc);
-
-	}
-
-	/**
-	 * adds popup bar descriptor
-	 * @param elementType
-	 * @param theImage
-	 * @param theTracker
-	 */
-	protected void addPopupBarDescriptor(
-		IElementType elementType,
-		Image theImage,
-		DragTracker theTracker) {
-
-		String theInputStr = DiagramUIMessages.PopupBar_AddNew;
-
-
-		String theTip = NLS.bind(theInputStr, elementType.getDisplayName());
-	
-		addPopupBarDescriptor(elementType, theImage, theTracker, theTip);
-	}
-
-	/**
-	 * default method for plugins which passes along the PopupBarTool
-	 * as the tool to be used.
-	 * @param elementType
-	 * @param theImage
-	 */
-	protected void addPopupBarDescriptor(IElementType elementType,
-			Image theImage) {
-
-		this.addPopupBarDescriptor(elementType, theImage,
-			new PopupBarTool(getHost(), elementType));
-
-	}
-
-	/**
-	 * @param elementType
-	 * @param theImage
-	 * @param theTip
-	 */
-	protected void addPopupBarDescriptor(
-			IElementType elementType,
-			Image theImage,
-			String theTip) {
-
-		PopupBarTool theTracker =
-			new PopupBarTool(getHost(), elementType);
-		PopupBarDescriptor desc =
-			new PopupBarDescriptor(theTip, theImage, elementType, theTracker);
-		myPopupBarDescriptors.add(desc);
-
-	}
-
-	/**
-	 * method used primarily to add UnspecifiedTypeCreationTool
-	 * @param elementType
-	 * @param theImage
-	 * @param theRequest the create request to be used
-	 */
-	protected void addPopupBarDescriptor(
-			IElementType elementType,
-			Image theImage,
-			CreateRequest theRequest)
-	{
-
-		PopupBarTool theTracker =
-			new PopupBarTool(getHost(), theRequest);
-
-		this.addPopupBarDescriptor(elementType, theImage, theTracker);
-
-	}
-
-	/**
-	 * gets the popup bar descriptors
-	 * @return list
-	 */
-	protected List getPopupBarDescriptors() {
-		return myPopupBarDescriptors;
-	}
-
-	/**
-	 * initialize the popup bars from the list of action descriptors.
-	 */
-	private void initPopupBars() {
-
-		List theList = getPopupBarDescriptors();
-		if (theList.isEmpty()) {
-			return;
-		}
-		myBalloon = createPopupBarFigure();
-
-		int iTotal = ACTION_WIDTH_HGT * theList.size() + ACTION_MARGIN_RIGHT;
-
-		getBalloon().setSize(
-			iTotal,
-			ACTION_WIDTH_HGT + 2 * ACTION_BUTTON_START_Y);
-
-		int xLoc = ACTION_BUTTON_START_X;
-		int yLoc = ACTION_BUTTON_START_Y;
-
-		for (Iterator iter = theList.iterator(); iter.hasNext();) {
-			PopupBarDescriptor theDesc = (PopupBarDescriptor) iter.next();
-
-			// Button b = new Button(theDesc.myButtonIcon);
-			PopupBarLabelHandle b =
-				new PopupBarLabelHandle(
-					theDesc.getDragTracker(),
-					theDesc.getIcon());
-
-			Rectangle r1 = new Rectangle();
-			r1.setLocation(xLoc, yLoc);
-			xLoc += ACTION_WIDTH_HGT;
-			r1.setSize(
-				ACTION_WIDTH_HGT,
-				ACTION_WIDTH_HGT - ACTION_MARGIN_RIGHT);
-
-			Label l = new Label();
-			l.setText(theDesc.getToolTip());
-
-			b.setToolTip(l);
-			b.setPreferredSize(ACTION_WIDTH_HGT, ACTION_WIDTH_HGT);
-			b.setBounds(r1);
-
-			getBalloon().add(b);
-
-			b.addMouseMotionListener(this);
-			b.addMouseListener(this.myMouseKeyListener);
-
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#getPreferenceName()
-	 */
-	String getPreferenceName() {
-		return IPreferenceConstants.PREF_SHOW_POPUP_BARS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#isDiagramAssistantShowing()
-	 */
-	protected boolean isDiagramAssistantShowing() {
-		return getBalloon() != null;
-	}
-
-	private IFigure getBalloon() {
-		return myBalloon;
-	}
-
-	protected IFigure createPopupBarFigure() {
-		return new RoundedRectangleWithTail();
-	}
-
-	protected void showDiagramAssistant(Point referencePoint) {
-
-		// already have a one
-		if (getBalloon() != null && getBalloon().getParent() != null) 
-		{
-			return;
-		}
-
-		if (this.myPopupBarDescriptors.isEmpty()) 
-		{
-
-			populatePopupBars();
-			initPopupBars();
-
-			if (myPopupBarDescriptors.isEmpty()) {
-				return; // nothing to show
-			}
-		}
-		getBalloon().addMouseMotionListener(this);
-		getBalloon().addMouseListener(myMouseKeyListener);
-
-		// the feedback layer figures do not recieve mouse events so do not use
-		// it for popup bars
-		IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
-		layer.add(getBalloon());
-		
-		if (referencePoint == null) {
-			referencePoint = getHostFigure().getBounds().getCenter();
-		}
-
-		Point thePoint = getBalloonPosition(referencePoint);
-
-		getBalloon().setLocation(thePoint);
-
-		// dismiss the popup bar after a delay
-		if(!shouldAvoidHidingDiagramAssistant())
-		{
-			hideDiagramAssistantAfterDelay(getDisappearanceDelay());
-		}
-	}
-
-	/**
-	 * getter for the IsDisplayAtMouseHoverLocation flag
-	 * @return true or false
-	 */
-	protected boolean getIsDisplayAtMouseHoverLocation()
-	{
-		return getFlag(POPUPBAR_DISPLAYATMOUSEHOVERLOCATION);
-	}
-
-	/**
-	 * setter for the IsDisplayAtMouseHoverLocation
-	 * @param bVal
-	 */
-	protected void setIsDisplayAtMouseHoverLocation(boolean bVal)
-	{
-		setFlag(POPUPBAR_DISPLAYATMOUSEHOVERLOCATION, bVal);
-	}
-
-	/**
-	 * For editparts that consume the entire viewport, statechart, structure,
-	 * communication, we want to display the popup bar at the mouse location.
-	 * @param referencePoint
-	 *            The reference point which may be used to determine where the
-	 *            diagram assistant should be located. This is most likely the
-	 *            current mouse location. 
-	 *            @return Point
-	 */
-	private Point getBalloonPosition(Point referencePoint)
-	{
-		Point thePoint = new Point();
-		boolean atMouse = getIsDisplayAtMouseHoverLocation();
-		if (atMouse) {
-			thePoint.setLocation(referencePoint);
-			getHostFigure().translateToAbsolute(thePoint);
-			getBalloon().translateToRelative(thePoint);
-
-			// shift the ballon so it is above the cursor.
-			thePoint.y -= ACTION_WIDTH_HGT;
-			adjustToFitInViewport(thePoint);
-		}
-		else
-		{
-			Dimension theoffset = new Dimension();
-			Rectangle rcBounds = getHostFigure().getBounds().getCopy();
-
-			getHostFigure().translateToAbsolute(rcBounds);
-			getBalloon().translateToRelative(rcBounds);
-
-			theoffset.height = -(BALLOON_Y_OFFSET + ACTION_WIDTH_HGT);
-			theoffset.width = (int) (rcBounds.width * myBallonOffsetPercent);
-
-			thePoint.x = rcBounds.x + theoffset.width;
-			thePoint.y = rcBounds.y + theoffset.height;
-			adjustToFitInViewport(thePoint);
-		}
-		return thePoint;
-	}
-
-	/**
-     * Uses the balloon location passed in and its size to determine if the
-     * balloon will appear outside the viewport. If so, the balloon location
-     * will be modified accordingly.
-     * 
-     * @param balloonLocation
-     *            the suggested balloon location passed in and potentially
-     *            modified when this method completes
-     */
-    private void adjustToFitInViewport(Point balloonLocation) {
-        Control control = getHost().getViewer().getControl();
-        if (control instanceof FigureCanvas) {
-            Rectangle viewportRect = ((FigureCanvas) control).getViewport()
-                .getClientArea();
-            Rectangle balloonRect = new Rectangle(balloonLocation, getBalloon()
-                .getSize());
-
-            int yDiff = viewportRect.y - balloonRect.y;
-            if (yDiff > 0) {
-                // balloon is above the viewport, shift down
-                balloonLocation.translate(0, yDiff);
-            }
-            int xDiff = balloonRect.right() - viewportRect.right();
-            if (xDiff > 0) {
-                // balloon is to the right of the viewport, shift left
-                balloonLocation.translate(-xDiff, 0);
-            }
-        }
-    }
-
-	private void teardownPopupBar() {
-		getBalloon().removeMouseMotionListener(this);
-		getBalloon().removeMouseListener(myMouseKeyListener);
-		// the feedback layer figures do not recieve mouse events
-		IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);
-		if (myBalloon.getParent() != null) {
-			layer.remove(myBalloon);
-		}
-		myBalloon = null;
-
-		this.myPopupBarDescriptors.clear();
-
-		if (imagesToBeDisposed != null) {
-			for (Iterator iter = imagesToBeDisposed.iterator(); iter.hasNext();) {
-				((Image) iter.next()).dispose();
-			}
-			imagesToBeDisposed.clear();
-		}
-
-	}
-
-	protected void hideDiagramAssistant() {
-		if (getBalloon() != null) {
-
-			teardownPopupBar();
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#showDiagramAssistantAfterDelay(int)
-	 */
-	protected void showDiagramAssistantAfterDelay(int theDelay) {
-		// only show the popup bar if it isn't already showing
-		if (!isDiagramAssistantShowing()) {
-			super.showDiagramAssistantAfterDelay(theDelay);
-		}
-	}
-
-	public void activate() {
-		super.activate();
-
-		getHostFigure().addMouseListener(this.myMouseKeyListener);
-		getHostFigure().addFigureListener(this.myOwnerMovedListener);
-
-		if (getHost() instanceof ISurfaceEditPart) {
-			setIsDisplayAtMouseHoverLocation(true);
-		}
-	}
-
-	public void deactivate() {
-		getHostFigure().removeMouseListener(this.myMouseKeyListener);
-		getHostFigure().removeFigureListener(this.myOwnerMovedListener);
-
-		super.deactivate();
-
-	}
-
-	/**
-	 * This is the default which places the popup bar to favor the right side
-	 * of the shape
-	 * 
-     * @deprecated this is not being used anymore
-	 */
-	protected void setRightHandDisplay() {
-		this.myBallonOffsetPercent = BALLOON_X_OFFSET_RHS;
-	}
-
-	/**
-	 * Place the popup bar to favor the left had side of the shape
-	 * @deprecated this is not being used anymore
-	 */
-	protected void setLeftHandDisplay() {
-		this.myBallonOffsetPercent = BALLOON_X_OFFSET_LHS;
-	}
-
-	/**
-	 * check thee right display status
-	 * @return true or false
-     * @deprecated this is not being used anymore
-	 */
-	protected boolean isRightDisplay() {
-		return (BALLOON_X_OFFSET_RHS == myBallonOffsetPercent);
-	}
-
-	/**
-	 * Gets the amount of time to wait before showing the popup bar if the
-	 * popup bar is to be shown at the mouse location
-	 * {@link #getIsDisplayAtMouseHoverLocation()}.
-	 * 
-	 * @return the time to wait in milliseconds
-	 */
-	protected int getAppearanceDelayLocationSpecific() {
-		return getAppearanceDelay();
-	}
-
-    protected String getDiagramAssistantID() {
-        return PopupBarEditPolicy.class.getName();
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PropertyHandlerEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PropertyHandlerEditPolicy.java
deleted file mode 100644
index af179e1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/PropertyHandlerEditPolicy.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.ArrayList;
-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.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-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.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewRefactorHelper;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.editparts.TopGraphicEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.ApplyAppearancePropertiesRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangeChildPropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-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.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author sshaw 
- *
- * Edit policy to handle any property change requests.  In the case of the change
- * request for ID_AUTOSIZE we will create a AUTO_SIZE request and return the command 
- * for that instead of a property change request.
- */
-public class PropertyHandlerEditPolicy extends AbstractEditPolicy {
-
-	static private final String APPLY_APPEARANCE_PROPERTIES_UNDO_COMMAND_NAME = "Apply appearance properties"; //$NON-NLS-1$
-	
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getCommand(Request)
-	 */
-	public Command getCommand(Request request) {
-
-		if (!understandsRequest(request)) {
-			return null;
-		}
-
-		if (RequestConstants.REQ_PROPERTY_CHANGE.equals(request.getType()) || 
-			RequestConstants.REQ_CHILD_PROPERTY_CHANGE.equals(request.getType())) {
-			EditPart ep = getHost();
-			if (ep instanceof IGraphicalEditPart) {
-				View view = ((IGraphicalEditPart) ep).getNotationView();
-				ChangePropertyValueRequest cpvr =
-					(ChangePropertyValueRequest) request;
-				if (RequestConstants.REQ_CHILD_PROPERTY_CHANGE.equals(request.getType())){
-					view = ViewUtil.getChildBySemanticHint(view,((ChangeChildPropertyValueRequest)cpvr).getNotationViewType());
-				}
-				if (view !=null){
-					if (ViewUtil.isPropertySupported(view,cpvr.getPropertyID())) {
-						return new ICommandProxy(
-							new SetPropertyCommand(getEditingDomain(),
-								new EObjectAdapter(view),
-								cpvr.getPropertyID(),
-								cpvr.getPropertyName(),
-								((ChangePropertyValueRequest) request).getValue()));
-					}
-				}
-			}
-		} else if (RequestConstants.REQ_SHOW_ALL_COMPARTMENTS.equals(request.getType())){
-			EditPart ep = getHost();
-			if (ep instanceof TopGraphicEditPart) {
-				TopGraphicEditPart topEP = (TopGraphicEditPart) ep;
-				List resizableViews = topEP.getResizableNotationViews();
-				if (resizableViews.isEmpty())
-					return null;
-				ChangePropertyValueRequest cpvr =
-					(ChangePropertyValueRequest) request;
-				CompositeCommand compositeCommand = 
-					new CompositeCommand(cpvr.getPropertyName());
-				for (Iterator iter = resizableViews.iterator(); iter.hasNext();) {
-					View childView = (View) iter.next();
-					if (ViewUtil.isPropertySupported(childView,cpvr.getPropertyID())) {
-						compositeCommand.compose(new SetPropertyCommand(getEditingDomain(),
-								new EObjectAdapter(childView),
-								cpvr.getPropertyID(),
-								cpvr.getPropertyName(),
-								((ChangePropertyValueRequest) request).getValue()));
-					}
-				}
-				return new ICommandProxy(compositeCommand);
-			}
-		}else if (
-			request instanceof ApplyAppearancePropertiesRequest
-				&& getHost() instanceof IGraphicalEditPart) {
-
-			final ApplyAppearancePropertiesRequest aapr =
-				(ApplyAppearancePropertiesRequest) request;
-
-			final IGraphicalEditPart gep = (IGraphicalEditPart)getHost();
-			final ViewRefactorHelper vrh = new ViewRefactorHelper(gep.getDiagramPreferencesHint());
-			final List exclusions = getStyleExclusionsForCopyAppearance();
-			
-            ICommand viewStyleCommand = new AbstractTransactionalCommand(getEditingDomain(),
-                APPLY_APPEARANCE_PROPERTIES_UNDO_COMMAND_NAME, null) {
-				protected CommandResult doExecuteWithResult(
-                        IProgressMonitor progressMonitor, IAdaptable info)
-                    throws ExecutionException {
-					
-					vrh.copyViewAppearance(aapr.getViewToCopyFrom(), gep.getNotationView(), exclusions);
-					return CommandResult.newOKCommandResult();
-				}
-			};
-			
-			return new ICommandProxy(viewStyleCommand);
-		}
-
-		return null;
-	}
-
-	/**
-	 * @return a <code>List</code> of <code>EClass</code> <code>Style</code> types that are
-	 * to be excluded from the copy process.
-	 */
-	protected List getStyleExclusionsForCopyAppearance() {
-		List exclusions = new ArrayList();
-		exclusions.add(NotationPackage.eINSTANCE.getDescriptionStyle());
-		exclusions.add(NotationPackage.eINSTANCE.getImageBufferStyle());
-		return exclusions;
-	}
-	
-	/**
-	 * @see org.eclipse.gef.EditPolicy#understandsRequest(Request)
-	 */
-	public boolean understandsRequest(Request request) {
-		if (RequestConstants.REQ_PROPERTY_CHANGE.equals(request.getType()) ||
-			RequestConstants.REQ_CHILD_PROPERTY_CHANGE.equals(request.getType()) ||
-			RequestConstants.REQ_SHOW_ALL_COMPARTMENTS.equals(request.getType()))
-			return true;
-		if (request instanceof ApplyAppearancePropertiesRequest
-			&& getHost() instanceof IGraphicalEditPart)
-			return true;
-		return super.understandsRequest(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (!understandsRequest(request))
-			return null;
-
-		if (RequestConstants.REQ_PROPERTY_CHANGE.equals(request.getType()) ||
-			RequestConstants.REQ_CHILD_PROPERTY_CHANGE.equals(request.getType()) ||
-			RequestConstants.REQ_SHOW_ALL_COMPARTMENTS.equals(request.getType())) {
-			
-			return getHost();
-		} else if (request instanceof ApplyAppearancePropertiesRequest) {
-			return getHost();
-		}
-		return super.getTargetEditPart(request);
-	}
-    
-    protected TransactionalEditingDomain getEditingDomain() {
-        return ((IGraphicalEditPart) getHost()).getEditingDomain();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableCompartmentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableCompartmentEditPolicy.java
deleted file mode 100644
index 1213764..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableCompartmentEditPolicy.java
+++ /dev/null
@@ -1,273 +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.editpolicies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.handles.CompartmentCollapseHandle;
-import org.eclipse.gmf.runtime.diagram.ui.internal.handles.CompartmentResizeHandle;
-
-/**
- * A resizable editpolicy for resizable compartments. The editpolicy could be
- * vertical or horizontal
- * 
- * @author melaasar
- */
-public class ResizableCompartmentEditPolicy
-	extends ResizableEditPolicyEx {
-
-	private boolean horizontal;
-
-	/**
-	 * Creates a new vertical ResizableCompartmentEditPolicy
-	 */
-	public ResizableCompartmentEditPolicy() {
-		this(false);
-	}
-
-	/**
-	 * creates a new ResizableCompartmentEditPolicy with the given orientation
-	 * 
-	 * @param horizontal
-	 */
-	public ResizableCompartmentEditPolicy(boolean horizontal) {
-		this.horizontal = horizontal;
-	}
-
-	/**
-	 * @return Whether the editpolicy is horizontal
-	 */
-	protected boolean isHorizontal() {
-		return horizontal;
-	}
-
-	/**
-	 * This method is used to get the collapse handle(s). Subclasses can
-	 * override to provide different collapse handles
-	 * 
-	 * @return a list of collapse handles
-	 */
-	protected List createCollapseHandles() {
-		IGraphicalEditPart part = (IGraphicalEditPart) getHost();
-
-		List collapseHandles = new ArrayList();
-		collapseHandles.add(new CompartmentCollapseHandle(part));
-		return collapseHandles;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()
-	 */
-	protected List createSelectionHandles() {
-		IGraphicalEditPart part = (IGraphicalEditPart) getHost();
-		int d1 = isHorizontal() ? PositionConstants.WEST
-			: PositionConstants.NORTH;
-		int d2 = isHorizontal() ? PositionConstants.EAST
-			: PositionConstants.SOUTH;
-		List selectionHandles = new ArrayList();
-		selectionHandles.addAll(createCollapseHandles());
-		selectionHandles.add(new CompartmentResizeHandle(part, d1));
-		selectionHandles.add(new CompartmentResizeHandle(part, d2));
-		return selectionHandles;
-	}
-
-	/**
-	 * @return the <code>ResizableCompartmentFigure</code> that is the
-	 *         corresponding figure for the host edit part.
-	 */
-	private ResizableCompartmentFigure getCompartmentFigure() {
-		ResizableCompartmentFigure compartmentFigure = null;
-		if (getGraphicalEditPart() instanceof ResizableCompartmentEditPart) {
-			compartmentFigure = ((ResizableCompartmentEditPart) getGraphicalEditPart())
-				.getCompartmentFigure();
-		} else if (getGraphicalEditPart().getFigure() instanceof ResizableCompartmentFigure) {
-			compartmentFigure = (ResizableCompartmentFigure) getGraphicalEditPart()
-				.getFigure();
-		}
-		// TODO: remove later. this is a temporary fix for defect
-		// RATLC00522565
-		// eventually we will put the BorderedNodeFigure inside the resizable
-		// compartment
-		else if (getGraphicalEditPart().getFigure() instanceof BorderedNodeFigure) {
-			BorderedNodeFigure gpf = (BorderedNodeFigure) getGraphicalEditPart()
-				.getFigure();
-			IFigure f = gpf.getMainFigure();
-			if (f instanceof ResizableCompartmentFigure) {
-				compartmentFigure = (ResizableCompartmentFigure) f;
-			}
-		}
-
-		return compartmentFigure;
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionEditPolicy#showSelection()
-	 */
-	protected void showSelection() {
-		super.showSelection();
-		if (getHost().getSelected() != EditPart.SELECTED_NONE) {
-			ResizableCompartmentFigure compartmentFigure = getCompartmentFigure();
-			if (compartmentFigure != null) {
-				compartmentFigure.setSelected(true);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionEditPolicy#hideSelection()
-	 */
-	protected void hideSelection() {
-		super.hideSelection();
-		if (getHost().getSelected() == EditPart.SELECTED_NONE) {
-			ResizableCompartmentFigure compartmentFigure = getCompartmentFigure();
-			if (compartmentFigure != null) {
-				compartmentFigure.setSelected(false);
-			}
-		}
-	}
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.editpolicies.SelectionEditPolicy#activate()
-     */
-    public void activate() {
-        super.activate();
-        if (getHost().getParent().getSelected() != EditPart.SELECTED_NONE)
-            setSelectedState();
-    }
-
-    private EditPartListener hostListener;
-
-	private EditPartListener parentListener;
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionEditPolicy#addSelectionListener()
-	 */
-	protected void addSelectionListener() {
-		hostListener = new EditPartListener.Stub() {
-
-			public void selectedStateChanged(EditPart part) {
-				setSelectedState();
-				setFocus(part.hasFocus());
-			}
-		};
-		getHost().addEditPartListener(hostListener);
-
-		parentListener = new EditPartListener.Stub() {
-
-			public void selectedStateChanged(EditPart part) {
-				setSelectedState();
-			}
-		};
-		getParentGraphicEditPart().addEditPartListener(parentListener);
-
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionEditPolicy#removeSelectionListener()
-	 */
-	protected void removeSelectionListener() {
-		getHost().removeEditPartListener(hostListener);
-		getParentGraphicEditPart().removeEditPartListener(parentListener);
-	}
-
-	/**
-	 * Determine the select state of the policy based on: 1- The select state of
-	 * the compartment editpart 2- The select state of the parent graphic
-	 * editpart 3- The visibility state of the compartment editpart
-	 */
-	protected void setSelectedState() {
-		int hostState = getHost().getSelected();
-		int topState = EditPart.SELECTED_NONE;
-
-		if (getGraphicalEditPart().getTopGraphicEditPart() != null) {
-			topState = getGraphicalEditPart().getTopGraphicEditPart().getSelected();
-		}
-
-		boolean vis = getGraphicalEditPart().getNotationView().isVisible();
-
-		if (vis
-			&& ((hostState != EditPart.SELECTED_NONE || topState != EditPart.SELECTED_NONE)))
-			setSelectedState(EditPart.SELECTED);
-		else
-			setSelectedState(EditPart.SELECTED_NONE);
-	}
-
-	private IGraphicalEditPart getParentGraphicEditPart() {
-		return (IGraphicalEditPart) getGraphicalEditPart().getParent();
-	}
-
-	private IGraphicalEditPart getGraphicalEditPart() {
-		return (IGraphicalEditPart) getHost();
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#showChangeBoundsFeedback(org.eclipse.gef.requests.ChangeBoundsRequest)
-	 */
-	protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-		super.showChangeBoundsFeedback(getResizeChildrenRequest(request));
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getResizeCommand(org.eclipse.gef.requests.ChangeBoundsRequest)
-	 */
-	protected Command getResizeCommand(ChangeBoundsRequest request) {
-		return getHost().getParent().getCommand(
-			getResizeChildrenRequest(request));
-	}
-
-	/**
-	 * Creates a new ChangeBoundsRequest that respects the min and max of the
-	 * resize deltas
-	 */
-	private ChangeBoundsRequest getResizeChildrenRequest(ChangeBoundsRequest r) {
-		Dimension delta = r.getSizeDelta();
-
-		ResizableCompartmentFigure f = getCompartmentFigure();
-		
-		Dimension fd = f.getSize().getExpanded(delta);
-		fd.intersect(f.getMaximumSize()).union(f.getMinimumSize());
-		delta = fd.shrink(f.getSize().width, f.getSize().height);
-
-		boolean moved = (r.getResizeDirection() & PositionConstants.NORTH_WEST) != 0;
-		IFigure a = f.getAdjacentSibling(moved);
-		if (a != null) {
-			Dimension ad = a.getSize().getExpanded(delta.negate());
-			ad.intersect(a.getMaximumSize()).union(a.getMinimumSize());
-			delta = ad.shrink(a.getSize().width, a.getSize().height).negate();
-		} else {
-			delta.shrink(delta.width, delta.height);
-		}
-
-		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_RESIZE_CHILDREN);
-		req.setEditParts(getHost());
-		req.setLocation(r.getLocation());
-		req.setResizeDirection(r.getResizeDirection());
-		req.setSizeDelta(delta);
-		if (moved)
-			req.setMoveDelta(new Point(-delta.width, -delta.height));
-		return req;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableEditPolicyEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableEditPolicyEx.java
deleted file mode 100644
index f5383a0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableEditPolicyEx.java
+++ /dev/null
@@ -1,122 +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.editpolicies;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Handle;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editpolicies.ResizableEditPolicy;
-import org.eclipse.gef.handles.AbstractHandle;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * A resizable edit policy that understands REQ_DRAG and REQ_DROP requests 
- * 
- * @author melaasar
- */
-public class ResizableEditPolicyEx extends ResizableEditPolicy {
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#eraseSourceFeedback(org.eclipse.gef.Request)
-	 */
-	public void eraseSourceFeedback(Request request) {
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-			eraseChangeBoundsFeedback((ChangeBoundsRequest) request);
-		else
-			super.eraseSourceFeedback(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#showSourceFeedback(org.eclipse.gef.Request)
-	 */
-	public void showSourceFeedback(Request request) {
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-			showChangeBoundsFeedback((ChangeBoundsRequest) request);
-		else
-			super.showSourceFeedback(request);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#addSelectionHandles()
-	 */
-	protected void addSelectionHandles() {
-		super.addSelectionHandles();
-		Iterator iter = handles.iterator();
-		while (iter.hasNext()) {
-			Handle handle = (Handle) iter.next();
-			if (handle.getDragTracker().getClass() == DragEditPartsTracker.class)
-				replaceHandleDragEditPartsTracker(handle);
-		}
-	}
-
-	/**
-	 * Replaces the handle's default DragEditPartsTracker with the extended
-	 * DragEditPartsTrackerEx 
-	 * @param handle
-	 */
-	protected void replaceHandleDragEditPartsTracker(Handle handle) {
-		if (handle instanceof AbstractHandle) {
-			AbstractHandle h = (AbstractHandle) handle;
-			h.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request))
-			return getHost();
-		return super.getTargetEditPart(request);
-	}
-
-    protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-        IFigure feedback = getDragSourceFeedbackFigure();
-        
-        PrecisionRectangle rect = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
-        getHostFigure().translateToAbsolute(rect);
-        rect.translate(request.getMoveDelta());
-        rect.resize(request.getSizeDelta());
-        
-        IFigure f = getHostFigure();
-        Dimension min = f.getMinimumSize().getCopy();
-        Dimension max = f.getMaximumSize().getCopy();
-        IMapMode mmode = MapModeUtil.getMapMode(f);
-        min.height = mmode.LPtoDP(min.height);
-        min.width = mmode.LPtoDP(min.width);
-        max.height = mmode.LPtoDP(max.height);
-        max.width = mmode.LPtoDP(max.width);
-        
-        if (min.width>rect.width)
-            rect.width = min.width;
-        else if (max.width < rect.width)
-            rect.width = max.width;
-        
-        if (min.height>rect.height)
-            rect.height = min.height;
-        else if (max.height < rect.height)
-            rect.height = max.height;
-        
-        feedback.translateToRelative(rect);
-        feedback.setBounds(rect);
-    }
-  }
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableLabelEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableLabelEditPolicy.java
deleted file mode 100644
index a296ded..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableLabelEditPolicy.java
+++ /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 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.editpolicies;
-
-/**
- * resizable edit lable
- * 
- * @author mmostafa
- * @deprecated use {@link org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeLabelEditPolicy} instead
- */
-public class ResizableLabelEditPolicy
-	extends ResizableShapeLabelEditPolicy {
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java
deleted file mode 100644
index d2dbc47..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java
+++ /dev/null
@@ -1,174 +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.editpolicies;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleHandleProvider;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.IPropertyValueDeferred;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.diagram.ui.internal.requests.ChangeBoundsDeferredRequest;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-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.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A resizable editpolicy for resizable shape editparts 1- It customizes the
- * selection handles 2- It handles the autosize and deferred change bounds
- * request
- * 
- * @author melaasar
- */
-public class ResizableShapeEditPolicy
-	extends ResizableEditPolicyEx {
-
-	/**
-	 * Cfreates a new AutoSize comamnd
-	 * 
-	 * @param request
-	 * @return command
-	 */
-	protected Command getAutoSizeCommand(Request request) {
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		ICommand resizeCommand = new SetBoundsCommand(editingDomain, 
-			DiagramUIMessages.SetAutoSizeCommand_Label,
-			new EObjectAdapter((View) getHost().getModel()), new Dimension(-1,
-				-1));
-		return new ICommandProxy(resizeCommand);
-	}
-
-	/**
-	 * Method getMoveDeferredCommand.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getMoveDeferredCommand(ChangeBoundsDeferredRequest request) {
-		final class SetDeferredPropertyCommand
-			extends AbstractTransactionalCommand {
-
-			private IAdaptable newValue;
-
-			private IAdaptable viewAdapter;
-
-			/**
-			 * constructor
-			 * 
-             * @param editingDomain
-             * the editing domain through which model changes are made
-			 * @param label
-			 * @param viewAdapter
-			 * @param newValue
-			 */
-			public SetDeferredPropertyCommand(TransactionalEditingDomain editingDomain, String label,
-					IAdaptable viewAdapter, IAdaptable newValue) {
-				super(editingDomain, label, null);
-				this.viewAdapter = viewAdapter;
-				this.newValue = newValue;
-			}
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-                
-				if (null == viewAdapter || null == newValue)
-					return CommandResult.newCancelledCommandResult();
-
-				View view = (View) viewAdapter.getAdapter(View.class);
-				Point p = (Point) newValue
-					.getAdapter(IPropertyValueDeferred.class);
-				ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLocation_X(),
-						Integer.valueOf(p.x));
-				ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLocation_Y(),
-						Integer.valueOf(p.y));
-
-				// clear for garbage collection
-				viewAdapter = null;
-				newValue = null;
-				return CommandResult.newOKCommandResult();
-			}
-		}
-        View view = (View) getHost().getModel();
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-        SetDeferredPropertyCommand cmd = new SetDeferredPropertyCommand(editingDomain,
-			DiagramUIMessages.ResizableShapeEditPolicy_MoveDeferredCommand_label,
-			new EObjectAdapter(view), request
-				.getLocationAdapter());
-		return new ICommandProxy(cmd);
-	}
-
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_AUTOSIZE.equals(request.getType()))
-			return getAutoSizeCommand(request);
-		if (RequestConstants.REQ_MOVE_DEFERRED.equals(request.getType()))
-			return getMoveDeferredCommand((ChangeBoundsDeferredRequest) request);
-		return super.getCommand(request);
-	}
-
-	public boolean understandsRequest(Request request) {
-		if (RequestConstants.REQ_AUTOSIZE.equals(request.getType())
-			|| RequestConstants.REQ_MOVE_DEFERRED.equals(request.getType()))
-			return true;
-		return super.understandsRequest(request);
-	}
-
-	/**
-	 * Creates the figure used for feedback.
-	 * 
-	 * @return the new feedback figure
-	 */
-	protected IFigure createDragSourceFeedbackFigure() {
-		// Use a ghost rectangle for feedback
-		RectangleFigure r = new RectangleFigure();
-		FigureUtilities.makeGhostShape(r);
-		r.setLineStyle(Graphics.LINE_DOT);
-		r.setForegroundColor(ColorConstants.white);
-		r.setBounds(getInitialFeedbackBounds());
-		addFeedback(r);
-		return r;
-	}
-
-	/**
-	 * Override for AccessibleHandleProvider when deactivated
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=69316
-	 */
-	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.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeLabelEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeLabelEditPolicy.java
deleted file mode 100644
index d958b31..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeLabelEditPolicy.java
+++ /dev/null
@@ -1,204 +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.editpolicies;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-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.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.LabelHelper;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Edit policy which supports
- * 
- * @author jcorchis
- */
-public class ResizableShapeLabelEditPolicy
-	extends ResizableShapeEditPolicy {
-
-	private Polyline tether = null;
-
-	/**
-	 * Removes the tether from the feedback
-	 * 
-	 * @see NonResizableEditPolicy#eraseChangeBoundsFeedback(ChangeBoundsRequest)
-	 */
-	protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) {
-		super.eraseChangeBoundsFeedback(request);
-		if (tether != null)
-			removeFeedback(tether);
-		tether = null;
-	}
-
-	/**
-	 * Add the tether to the feedback
-	 * 
-	 * @see NonResizableEditPolicy#createDragSourceFeedbackFigure()
-	 */
-	protected IFigure createDragSourceFeedbackFigure() {
-		IFigure feedback = super.createDragSourceFeedbackFigure();
-		tether = new Polyline();
-		tether.setLineStyle(Graphics.LINE_DASHDOT);
-		tether.setForegroundColor(((IGraphicalEditPart) getHost().getParent())
-			.getFigure().getForegroundColor());
-		addFeedback(tether);
-		return feedback;
-	}
-
-	protected Command getMoveCommand(ChangeBoundsRequest request) {
-		Point refPoint = getReferencePoint();
-
-		// translate the feedback figure
-		PrecisionRectangle rect = new PrecisionRectangle(
-			getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(rect);
-		rect.translate(request.getMoveDelta());
-		rect.resize(request.getSizeDelta());
-		getHostFigure().translateToRelative(rect);
-		adjustRect(rect);
-
-		Point normalPoint = LabelHelper.offsetFromRelativeCoordinate(
-			getHostFigure(), rect, refPoint);
-
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-		ICommand moveCommand = new SetBoundsCommand(editingDomain,
-            DiagramUIMessages.MoveLabelCommand_Label_Location,
-            new EObjectAdapter((View) getHost().getModel()), normalPoint);
-        return new ICommandProxy(moveCommand);
-	}
-
-	/**
-	 * adjust the rectangle used for the move command; the default implementatin
-	 * assumes no behavior, clients can override this function to change
-	 * this behavior
-	 * 
-	 * @param rect
-	 *            Rect to adjust
-	 */
-	protected void adjustRect(PrecisionRectangle rect) {
-		// do nothing
-	}
-
-	protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-		super.showChangeBoundsFeedback(request);
-
-		IFigure p = getDragSourceFeedbackFigure();
-		Rectangle r = p.getBounds();
-		Point refPoint = getReferencePoint();
-
-		// translate the feedback figure
-		PrecisionRectangle rect = new PrecisionRectangle(
-			getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(rect);
-		rect.translate(request.getMoveDelta());
-		rect.resize(request.getSizeDelta());
-		p.translateToRelative(rect);
-		p.setBounds(rect);
-
-		// translate the refPoint
-		PrecisionRectangle ref = new PrecisionRectangle(new Rectangle(
-			refPoint.x, refPoint.y, 0, 0));
-		getHostFigure().translateToAbsolute(ref);
-		p.translateToRelative(ref);
-
-		Point midTop = new Point(r.x + r.width / 2, r.y);
-		Point midBottom = new Point(r.x + r.width / 2, r.y + r.height);
-		Point midLeft = new Point(r.x, r.y + r.height / 2);
-		Point midRight = new Point(r.x + r.width, r.y + r.height / 2);
-
-		Point startPoint = midTop;
-
-		int x = r.x + r.width / 2 - refPoint.x;
-		int y = r.y + r.height / 2 - refPoint.y;
-
-		if (y > 0 && y > x && y > -x)
-			startPoint = midTop;
-		else if (y < 0 && y < x && y < -x)
-			startPoint = midBottom;
-		else if (x < 0 && y > x && y < -x)
-			startPoint = midRight;
-		else
-			startPoint = midLeft;
-
-		tether.setStart(startPoint);
-		tether.setEnd(ref.getLocation());
-	}
-
-	/**
-	 * @param request
-	 *            the resize request
-	 * @return the command contribution obtained from the parent
-	 */
-	protected Command getResizeCommand(ChangeBoundsRequest request) {
-
-        PrecisionRectangle rect = new PrecisionRectangle(
-            getInitialFeedbackBounds().getCopy());
-        getHostFigure().translateToAbsolute(rect);
-        rect.translate(request.getMoveDelta());
-        rect.resize(request.getSizeDelta());
-        getHostFigure().translateToRelative(rect);
-        View shapeView = (View) getHost().getModel();
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-
-        Point refPoint = getReferencePoint();
-        Point normalPoint = LabelHelper.offsetFromRelativeCoordinate(
-            getHostFigure(), rect, refPoint);
-
-        ICommand resizeCommand = new SetBoundsCommand(editingDomain,
-            DiagramUIMessages.SetLocationCommand_Label_Resize,
-            new EObjectAdapter(shapeView), new Rectangle(normalPoint, rect
-                .getSize()));
-        return new ICommandProxy(resizeCommand);
-	}
-
-	/**
-	 * Helper method to calculate the reference point on the middle of the
-	 * parent edge or the point given by the location of a node.
-	 * 
-	 * @return the reference point
-	 */
-	private Point getReferencePoint() {
-		if (getHost().getParent() instanceof AbstractConnectionEditPart) {
-			PointList ptList = ((AbstractConnectionEditPart) getHost()
-				.getParent()).getConnectionFigure().getPoints();
-			return PointListUtilities.calculatePointRelativeToLine(ptList, 0,
-				50, true);
-		} else {
-			return ((GraphicalEditPart) getHost().getParent()).getFigure()
-				.getBounds().getLocation();
-		}
-
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/RotatableShapeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/RotatableShapeEditPolicy.java
deleted file mode 100644
index 274f409..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/RotatableShapeEditPolicy.java
+++ /dev/null
@@ -1,226 +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.editpolicies;
-
-import java.util.List;
-
-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.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Handle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.internal.handles.RotateHandle;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RotateTracker;
-import org.eclipse.gmf.runtime.gef.ui.internal.requests.RotateShapeRequest;
-
-/**
- * A rotatable editpolicy for rotating fork and join itparts
- * It rotates the figure if diagonal handlers are dragged and
- * resizes the figure otherwise as defined by the superclass
- *  
- * @author oboyko
- */
-public class RotatableShapeEditPolicy extends ResizableShapeEditPolicy {
-	
-	// how much should be the mice moved to rotate the figure
-	private final static int DEFAULT_TOLERANCE = 6;
-
-	/*
-	 * Create the selection handles for edit parts that have Rotatable Edit Policy
-	 * installed on them, i.e. Forks and Joins from Activity and State Machine diagrams
-	 *  (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()
-	 */
-	protected List createSelectionHandles() {
-        setResizeDirections(PositionConstants.EAST | PositionConstants.SOUTH | 
-            PositionConstants.WEST | PositionConstants.NORTH);
-        
-        List selectionhandles = super.createSelectionHandles();
-        GraphicalEditPart part = (GraphicalEditPart) getHost();
-		
-		selectionhandles.add(createRotationHandle(part, PositionConstants.SOUTH_EAST));
-		selectionhandles.add(createRotationHandle(part, PositionConstants.SOUTH_WEST));
-		selectionhandles.add(createRotationHandle(part, PositionConstants.NORTH_WEST));
-		selectionhandles.add(createRotationHandle(part, PositionConstants.NORTH_EAST));
-		return selectionhandles;
-	}
-	
-	/**
-	 * Create rotate handle with a rotate tracker
-	 * @param owner the owner edit part
-	 * @param direction the handle direction
-	 * @return the handle
-	 */
-	protected Handle createRotationHandle(GraphicalEditPart owner, int direction) {
-		RotateHandle handle = new RotateHandle(owner, direction);
-		handle.setDragTracker(
-			new RotateTracker(owner, direction));
-		return handle;
-	}
-	
-	/**
-	 * Shows or updates feedback for a change bounds request that is seen as rotation
-	 * @param request the request
-	*/
-	protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-		// If the figure is being rotated draw the rotation feedback
-		if ( isRotationRequired(request)) {
-			// Get current feedback
-			IFigure feedback = getDragSourceFeedbackFigure();
-			
-			if (doRotation(request)) {
-				// Get the absolute coordinates for rotated figure
-				PrecisionRectangle rect = getAbsoluteRotatedBounds();
-				// Draw the rotated figure in the feedback
-				feedback.translateToRelative(rect);
-				feedback.setBounds(rect);
-			}
-			else {
-				// Get the absolute coordinates for initial and rotated figure
-				PrecisionRectangle initFigure = getAbsoluteInitialBounds();
-				// Draw the initial figure in the feedback
-				feedback.translateToRelative(initFigure);
-				feedback.setBounds(initFigure);
-			}
-		}
-		else {
-			// otherwise the figure is being resized
-			super.showChangeBoundsFeedback(request);
-		}
-	}
-	
-	/*
-	 * Returns PrecisionRectangle obtained from the rotation by 90 deg. of an argument rectangle
-	 * with respect to it's geometrical centre
-	 * @param Rectangle r
-	 * @return PrecisionRectangle rect obtained from rotation of r
-	 */
-	private PrecisionRectangle rotateRectangle(Rectangle r) {
-		PrecisionRectangle rect = new PrecisionRectangle(r);
-		if (isVertical(r)) {
-			rect.setX(rect.preciseX-rect.preciseHeight/2.0+rect.preciseWidth/2.0);
-			rect.setY(rect.preciseY+rect.preciseHeight/2.0-rect.preciseWidth/2.0);
-		}
-		else {
-			rect.setX(rect.preciseX+rect.preciseWidth/2.0-rect.preciseHeight/2.0);
-			rect.setY(rect.preciseY-rect.preciseWidth/2.0+rect.preciseHeight/2.0);
-		}
-		transposePrecisionRectangleSize(rect);
-		return rect;
-	}
-	
-	/*
-	 * Check whether the bar (or figure) is vertical or horizontal
-	 * @param Rectangle - the bounds of the figure
-	 * @return true if figure is vertical, fasle if figure is horizontal
-	 */
-	private boolean isVertical(Rectangle r) {
-		return r.height>r.width;
-	}
-	
-	/*
-	 * Transposes PrecisionRectangle's size
-	 * @param PrecisionRectangle
-	 * @return PrecisionRectangle with transposed size  
-	 */
-	private void transposePrecisionRectangleSize(PrecisionRectangle r) {
-		double height = r.preciseHeight;
-		r.setHeight(r.preciseWidth);
-		r.setWidth(height);
-	}
-	
-	/*
-	 * Returns if figure must be rotated based on the info in the request, i.e. 
-	 * diagonal resize direction and rotatable edit parts are selected.
-	 * @param change bounds request
-	 * @return true if figure must be rotated
-	 */
-	private boolean isRotationRequired(ChangeBoundsRequest request) {
-		return request instanceof RotateShapeRequest ?  ((RotateShapeRequest) request).shouldRotate() : false; 
-	}
-	
-	/*
-	 * Returns the command contribution for the given resize request. By default, the request
-	 * is redispatched to the host's parent as a {@link
-	 * org.eclipse.gef.RequestConstants#REQ_RESIZE_CHILDREN}.  The parent's editpolicies
-	 * determine how to perform the resize based on the layout manager in use.
-	 * @param request the resize request
-	 * @return the command contribution obtained from the parent
-	 * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getResizeCommand(org.eclipse.gef.requests.ChangeBoundsRequest)
-	*/
-	protected Command getResizeCommand(ChangeBoundsRequest request) {
-		// if the figure needs to be rotated set the command with the proper data
-		if (isRotationRequired(request)) {
-			ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_RESIZE_CHILDREN);
-			req.setEditParts(getHost());
-
-			// fake resizing and movement to resize the figure if mice is moved far enough
-			if (doRotation(request)) {
-					// Get the absolute coordinates for initial and rotated figure
-					PrecisionRectangle rect = getAbsoluteRotatedBounds();
-					PrecisionRectangle initFigure = getAbsoluteInitialBounds();
-					req.setMoveDelta
-						(new Point(rect.preciseX - initFigure.preciseX, rect.preciseY - initFigure.preciseY));
-					req.setSizeDelta
-						(new Dimension(rect.width - initFigure.width, rect.height - initFigure.height));
-				}
-				else {
-					// otherwise SizeDelta and MoveDelta must be 0s
-					req.setSizeDelta(new Dimension());
-					req.setMoveDelta(new Point());
-				}
-			
-			req.setLocation(request.getLocation());
-			req.setExtendedData(request.getExtendedData());
-			req.setResizeDirection(request.getResizeDirection());
-			return getHost().getParent().getCommand(req);
-		}
-		else {
-			// otherwise the figure is being resized
-			return super.getResizeCommand(request);
-		}
-	}
-	
-	/*
-	 * Based on the size delta from the request determines whether the EditPart must be rotated or
-	 * remain as it is 
-	 */
-	private boolean doRotation(ChangeBoundsRequest request) {
-		return Math.abs(request.getSizeDelta().width) > DEFAULT_TOLERANCE || Math.abs(request.getSizeDelta().height) > DEFAULT_TOLERANCE;
-	}
-	
-	/*
-	 * Returns the bounds of the initial figure in the absolute coordinates
-	 */
-	private PrecisionRectangle getAbsoluteInitialBounds() {
-		// store the initial figure
-		PrecisionRectangle initFigure = new PrecisionRectangle(getInitialFeedbackBounds().getCopy());
-		getHostFigure().translateToAbsolute(initFigure);
-		return initFigure;
-	}
-	
-	/*
-	 * Returns the bounds of the rotated initial figure with respect to its geometrical centre
-	 * in absolute coordinates
-	 */
-	private PrecisionRectangle getAbsoluteRotatedBounds() {
-		// store the rotated figure
-		PrecisionRectangle rect = new PrecisionRectangle(rotateRectangle(getInitialFeedbackBounds().getCopy()));
-		getHostFigure().translateToAbsolute(rect);
-		return rect;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SemanticEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SemanticEditPolicy.java
deleted file mode 100644
index 74be227..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SemanticEditPolicy.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-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.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-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.IElementType;
-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.DestroyRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-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.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * An editpolicy to handle creation and updating of semantic model elements
- * 
- * @author melaasar
- */
-public class SemanticEditPolicy
-	extends AbstractEditPolicy {
-
-	private static final String DELETE_FROM_MODEL_DLG_TITLE = DiagramUIMessages.PromptingDeleteFromModelAction_DeleteFromModelDialog_Title;
-
-	private static final String DELETE_FROM_MODEL_DLG_MESSAGE = DiagramUIMessages.PromptingDeleteFromModelAction_DeleteFromModelDialog_Message;
-
-	private static final String DELETE_FROM_MODEL_DLG_TOGGLE_LABEL = DiagramUIMessages.MessageDialogWithToggle_DoNotPromptAgainToggle_label; 	
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#getCommand(Request)
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_SEMANTIC_WRAPPER.equals(request.getType())) {
-			return getSemanticCommand(((EditCommandRequestWrapper) request)
-				.getEditCommandRequest());
-		} else if (REQ_RECONNECT_SOURCE.equals(request.getType())
-			&& relationshipSourceHasChanged((ReconnectRequest) request)) {
-			EditPart connectionEP = ((ReconnectRequest) request)
-				.getConnectionEditPart();
-			if (ViewUtil.resolveSemanticElement((View) connectionEP.getModel()) == null) {
-				return getReorientRefRelationshipSourceCommand((ReconnectRequest) request);
-			} else {
-				return getReorientRelationshipSourceCommand((ReconnectRequest) request);
-			}
-		} else if (REQ_RECONNECT_TARGET.equals(request.getType())
-			&& relationshipTargetHasChanged((ReconnectRequest) request)) {
-			EditPart connectionEP = ((ReconnectRequest) request)
-				.getConnectionEditPart();
-			if (ViewUtil.resolveSemanticElement((View) connectionEP.getModel()) == null) {
-				return getReorientRefRelationshipTargetCommand((ReconnectRequest) request);
-			} else {
-				return getReorientRelationshipTargetCommand((ReconnectRequest) request);
-			}
-		}
-
-		return super.getCommand(request);
-	}
-
-	/**
-	 * Has the relationship target changed? If not, then it is not necessary to
-	 * return a command that will change the relationship's target.
-	 * 
-	 * @param request
-	 *            the request to reconnect the target of a relationship
-	 * @return true if the target has changed; false otherwise
-	 */
-	private boolean relationshipTargetHasChanged(ReconnectRequest request) {
-		return !request.getConnectionEditPart().getTarget().equals(
-			request.getTarget());
-	}
-
-	/**
-	 * Has the relationship source changed? If not, then it is not necessary to
-	 * return a command that will change the relationship's source.
-	 * 
-	 * @param request
-	 *            the request to reconnect the source of a relationship
-	 * @return true if the source has changed; false otherwise
-	 */
-	private boolean relationshipSourceHasChanged(ReconnectRequest request) {
-		return !request.getConnectionEditPart().getSource().equals(
-			request.getTarget());
-	}
-
-	/**
-	 * Method getSemanticCommand.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getSemanticCommand(IEditCommandRequest request) {
-
-		if ((request instanceof DestroyRequest)  && (getHost() instanceof ConnectionEditPart)
-				&& !((ConnectionEditPart) getHost()).isSemanticConnection()) {
-			// no semantic meaning to the connection being destroyed
-			return null;
-		}
-		
-		IEditCommandRequest completedRequest = completeRequest(request);
-        
-        boolean shouldPromptOnDestroy = false;
-        if (completedRequest instanceof DestroyRequest && !isParentCanonical(getHost())) {
-            shouldPromptOnDestroy = ((DestroyRequest) completedRequest).isConfirmationRequired();
-            ((DestroyRequest) completedRequest).setConfirm(false);
-        }
-		     
-        ICommand semanticCommand = null;
-       Object editHelperContext =  completedRequest.getEditHelperContext();
-		IElementType elementType = ElementTypeRegistry.getInstance()
-			.getElementType(editHelperContext);
-
-		if(elementType == null && editHelperContext instanceof ICommand){
-			semanticCommand = (ICommand)editHelperContext ;
-		} else {
-			semanticCommand = (elementType != null)
-				? elementType.getEditCommand(completedRequest)
-				: null;
-		}
-						
-		if(semanticCommand == null){
-			return null;
-		}
-		
-      if (completedRequest instanceof DestroyRequest) {
-            ((DestroyRequest) completedRequest).setConfirm(shouldPromptOnDestroy);
-        }
-		
-		boolean shouldProceed = true;
-		if (completedRequest instanceof DestroyRequest) {
-			shouldProceed = shouldProceed((DestroyRequest) completedRequest);
-		}
-		if (shouldProceed) {
-			Command c = new ICommandProxy(semanticCommand);
-			if (completedRequest instanceof DestroyRequest) {
-				TransactionalEditingDomain domain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-				ICommand ic = new DeleteCommand(domain, (View)getHost().getModel());
-				CompositeTransactionalCommand cc = new CompositeTransactionalCommand(domain, semanticCommand
-					.getLabel());
-				cc.setTransactionNestingEnabled(true);
-				cc.compose(semanticCommand);
-				cc.compose(ic);
-				c = new ICommandProxy(cc);
-			}
-			return c;
-		}
-		
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#understandsRequest(Request)
-	 */
-	public boolean understandsRequest(Request request) {
-		if (request instanceof EditCommandRequestWrapper)
-			return true;
-		
-		if (REQ_RECONNECT_SOURCE.equals(request.getType())
-			|| REQ_RECONNECT_TARGET.equals(request.getType())) {
-			EObject parentElement = null;
-			if (getHost().getParent() instanceof IGraphicalEditPart) {
-				parentElement = ViewUtil
-					.resolveSemanticElement((View) getHost().getParent()
-						.getModel());
-			}
-			
-			if (getHostElement() != parentElement)
-				return true;
-		}
-		
-		return false;
-	}
-
-	private EObject getHostElement() {
-		return ViewUtil.resolveSemanticElement((View) getHost()
-			.getModel());
-	}
-
-	/**
-	 * Returns a new completed version of the <code>request</code>, mainly
-	 * based on targetting the host of this edit policy.
-	 * 
-	 * @param request
-	 *            the request to be completed
-	 * @return the completed version of the request. This may or may not be a
-	 *         new instance.
-	 */
-	protected IEditCommandRequest completeRequest(IEditCommandRequest request) {
-
-		IEditCommandRequest result = request;
-
-		if (result instanceof DestroyRequest) {
-			DestroyRequest destroyRequest = (DestroyRequest) result;
-
-			
-			if (getHostElement() != null) {
-				// Destroy element request
-
-				if (destroyRequest instanceof DestroyElementRequest) {
-					((DestroyElementRequest) destroyRequest)
-						.setElementToDestroy(getHostElement());
-					((DestroyElementRequest) destroyRequest).getParameters().clear();
-				} else {
-					result = new DestroyElementRequest(request
-                        .getEditingDomain(), getHostElement(), destroyRequest
-                        .isConfirmationRequired());
-					result.addParameters(request.getParameters());
-                }
-
-				
-			} else if (getHost() instanceof ConnectionEditPart) {
-				// Destroy reference request
-
-				EObject container = ViewUtil
-					.resolveSemanticElement(((Edge) getHost().getModel())
-						.getSource());
-
-				EObject referenceObject = ViewUtil
-					.resolveSemanticElement(((Edge) getHost().getModel())
-						.getTarget());
-
-				if (destroyRequest instanceof DestroyReferenceRequest) {
-					DestroyReferenceRequest destroyReferenceRequest = (DestroyReferenceRequest) result;
-
-					destroyReferenceRequest.setContainer(container);
-					destroyReferenceRequest
-						.setReferencedObject(referenceObject);
-
-				} else {
-					result = new DestroyReferenceRequest(((IGraphicalEditPart)getHost())
-                        .getEditingDomain(), container, null, referenceObject,
-                        destroyRequest.isConfirmationRequired());
-					result.addParameters(request.getParameters());
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Method getReorientRelationshipSourceCommand.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getReorientRelationshipSourceCommand(
-			ReconnectRequest request) {
-		EObject connectionSemElement = ViewUtil.resolveSemanticElement(((View) request.getConnectionEditPart()
-				.getModel()));
-		EObject targetSemElement = ViewUtil.resolveSemanticElement(((View) request.getTarget().getModel()));
-		EObject oldSemElement = ViewUtil.resolveSemanticElement(((View) request.getConnectionEditPart()
-				.getSource().getModel())); 
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        ReorientRelationshipRequest semRequest = new ReorientRelationshipRequest(
-            editingDomain, connectionSemElement, targetSemElement,
-            oldSemElement, ReorientRelationshipRequest.REORIENT_SOURCE);
-        
-        semRequest.addParameters(request.getExtendedData());
-		
-		return getSemanticCommand(semRequest);
-	}
-
-	/**
-	 * Method getReorientRelationshipTargetCommand.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getReorientRelationshipTargetCommand(
-			ReconnectRequest request) {
-		EObject connectionSemElement = ViewUtil.resolveSemanticElement((View) request.getConnectionEditPart().getModel());
-		EObject targetSemElement = ViewUtil.resolveSemanticElement((View) request.getTarget().getModel());
-		EObject oldSemElement = ViewUtil.resolveSemanticElement((View) request.getConnectionEditPart()
-			.getTarget().getModel());
-
-		// check if we need to redirect the semantic request because of a tree
-		// gesture.
-		String connectionHint = ViewUtil
-			.getSemanticElementClassId((View) request.getConnectionEditPart()
-				.getModel());
-		if (((View) request.getTarget().getModel()).getElement() != null) {
-			String targetHint = ViewUtil
-				.getSemanticElementClassId((View) request.getTarget()
-					.getModel());
-			if (request.getConnectionEditPart() instanceof ITreeBranchEditPart
-				&& request.getTarget() instanceof ITreeBranchEditPart
-				&& connectionHint.equals(targetHint)) {
-				ITreeBranchEditPart targetBranch = (ITreeBranchEditPart) request
-					.getTarget();
-
-				targetSemElement = ViewUtil.resolveSemanticElement((View) targetBranch.getTarget().getModel());
-			}
-		}
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        ReorientRelationshipRequest semRequest = new ReorientRelationshipRequest(
-            editingDomain, connectionSemElement, targetSemElement,
-            oldSemElement, ReorientRelationshipRequest.REORIENT_TARGET);
-        
-        semRequest.addParameters(request.getExtendedData());
-		
-		return getSemanticCommand(semRequest);
-	}
-
-	/*
-	 * Returns the getHost() if the policy understands the request.
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#getTargetEditPart(org.eclipse.gef.Request)
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request)) {
-			return getHost();
-		} else {
-			return super.getTargetEditPart(request);
-		}
-
-	}
-
-	/**
-	 * Method getReorientRelationshipSourceCommand.
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getReorientRefRelationshipSourceCommand(
-			ReconnectRequest request) {
-
-		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-		
-		if (connectionEP instanceof ConnectionEditPart) {
-			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-				return null;
-			}
-		}
-
-		EditPart sourceEditPart = connectionEP.getSource();
-		EditPart targetEditPart = connectionEP.getTarget();
-		EObject referenceOwner = ViewUtil
-			.resolveSemanticElement((View) sourceEditPart.getModel());
-		EObject oldTarget = ViewUtil
-			.resolveSemanticElement((View) targetEditPart.getModel());
-		EObject newTarget = ViewUtil
-			.resolveSemanticElement((View) request.getTarget().getModel());
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-		ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequest(
-            editingDomain, referenceOwner, newTarget, oldTarget,
-            ReorientReferenceRelationshipRequest.REORIENT_SOURCE);
-		
-		semRequest.addParameters(request.getExtendedData());
-
-		return getSemanticCommand(semRequest);
-	}
-
-	/**
-	 * Method getReorientRefRelationshipTargetCommand. Removes the reference the
-	 * ConnectionEditPart current has an add the new TargetEditPart
-	 * 
-	 * @param request
-	 * @return Command
-	 */
-	protected Command getReorientRefRelationshipTargetCommand(
-			ReconnectRequest request) {
-		
-		org.eclipse.gef.ConnectionEditPart connectionEP = (request).getConnectionEditPart();
-		
-		if (connectionEP instanceof ConnectionEditPart) {
-			if (!((ConnectionEditPart) connectionEP).isSemanticConnection()) {
-				return null;
-			}
-		}
-
-		EditPart sourceEditPart = connectionEP.getSource();
-		EditPart targetEditPart = connectionEP.getTarget();
-		EObject referenceOwner = ViewUtil
-			.resolveSemanticElement((View) sourceEditPart.getModel());
-		EObject oldTarget = ViewUtil
-			.resolveSemanticElement((View) targetEditPart.getModel());
-		EObject newTarget = ViewUtil
-			.resolveSemanticElement((View) request.getTarget().getModel());
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-
-        ReorientReferenceRelationshipRequest semRequest = new ReorientReferenceRelationshipRequest(
-            editingDomain, referenceOwner, newTarget, oldTarget,
-            ReorientReferenceRelationshipRequest.REORIENT_TARGET);
-        
-        semRequest.addParameters(request.getExtendedData());
-
-		return getSemanticCommand(semRequest);
-	}
-
-	/**
-	 * should proceed
-	 * @param destroyRequest the destroy request
-	 * @return true or false
-	 */
-	protected boolean shouldProceed(DestroyRequest destroyRequest) {
-		if (isParentCanonical(getHost())) {
-		    return true;
-        }
-		
-		if (!(destroyRequest.isConfirmationRequired())){
-			return true;
-		}else{
-			destroyRequest.setConfirm(false);
-			return showMessageDialog();					
-		}
-	}
-
-    /**
-     * Checks if the parent container is canonical
-     * 
-     * @param editpart the editpart in question
-     * @return true if the parent shape is canonical
-     */
-    private static boolean isParentCanonical(EditPart editpart) {
-        EditPart parent = null;
-        if ((editpart instanceof ConnectionEditPart)
-            && (((ConnectionEditPart) editpart).getSource() != null)) {
-            parent = ((ConnectionEditPart) editpart).getSource().getParent();
-        } else {
-            parent = editpart.getParent();
-        }
-        
-        while (parent instanceof GroupEditPart) {
-            parent = parent.getParent();
-        }
-        
-        return ((parent instanceof GraphicalEditPart) && ((GraphicalEditPart) parent)
-            .isCanonical());
-    }
-
-
-	/**
-	 * launches the prompting dialogBox on deletion of elements from the model
-	 * for the end user.
-	 * 
-	 * @return boolean true if user pressed YES; false otherwise
-	 */
-	private boolean showMessageDialog() {
-		MessageDialogWithToggle dialog = MessageDialogWithToggle
-			.openYesNoQuestion(Display.getCurrent().getActiveShell(),
-				DELETE_FROM_MODEL_DLG_TITLE, DELETE_FROM_MODEL_DLG_MESSAGE,
-				DELETE_FROM_MODEL_DLG_TOGGLE_LABEL, false,
-				(IPreferenceStore) ((IGraphicalEditPart) getHost())
-					.getDiagramPreferencesHint().getPreferenceStore(),
-				IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_MODEL);
-
-		if (dialog.getReturnCode() == IDialogConstants.YES_ID)
-			return true;
-		else
-			return false;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ShapeCompartmentDropEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ShapeCompartmentDropEditPolicy.java
deleted file mode 100644
index e95c577..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ShapeCompartmentDropEditPolicy.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-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.gef.requests.ChangeBoundsRequest;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-
-
-/**
- * Supports droping model elements onto the shape compartment editpart.
- * @author mhanner
- */
-public class ShapeCompartmentDropEditPolicy
-	extends DragDropEditPolicy {
-
-	/**
-	 * Overriden to ensure that we don't drag the top level shape inside the shape compartment itself since this precipitates 
-	 * difficult movement behavior of the top level shape.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getDropCommand(org.eclipse.gef.requests.ChangeBoundsRequest)
-	 */
-	protected Command getDropCommand(ChangeBoundsRequest request) {
-		List editparts = request.getEditParts();
-		if (editparts.size() == 1) {
-			Object obj = editparts.get(0);
-			if (obj instanceof EditPart) {
-				EditPart requestEP = (EditPart)obj;
-				if (getHost() instanceof IGraphicalEditPart) {
-					IGraphicalEditPart gep = (IGraphicalEditPart)getHost();
-					if (gep.getTopGraphicEditPart().equals(requestEP)) {
-						return null;
-					} else if (requestEP.getParent() instanceof GroupEditPart) {
-                        // Dragging shapes outside the group will cause the
-                        // group to grow and thus should not reparent.
-                        return null;
-                    }
-				}
-			}
-		}
-		
-		return super.getDropCommand(request);
-	}
-	
-	/**
-	 * Returns a command to create a view for each of the elements defined
-	 * in the supplied request.
-	 */
-	protected Command getDropObjectsCommand(DropObjectsRequest dropRequest) {
-		List viewDescriptors = new ArrayList();
-		Iterator iter = dropRequest.getObjects().iterator();
-
-		while (iter.hasNext()) {
-			Object obj = iter.next();
-			if (obj instanceof EObject) {
-				viewDescriptors.add(new CreateViewRequest.ViewDescriptor(
-					new EObjectAdapter((EObject) obj),
-					((IGraphicalEditPart) getHost())
-						.getDiagramPreferencesHint()));
-			}
-		}
-		
-		CreateViewRequest createViewRequest =
-			new CreateViewRequest(viewDescriptors);
-		createViewRequest.setLocation(dropRequest.getLocation());
-		Command createCommand = getHost().getCommand(createViewRequest);
-
-		if (createCommand != null) {
-			List result = (List)createViewRequest.getNewObject();
-			dropRequest.setResult(result);
-
-			RefreshConnectionsRequest refreshRequest =
-				new RefreshConnectionsRequest(result);
-			Command refreshCommand = getHost().getCommand(refreshRequest);
-
-			ArrangeRequest arrangeRequest =
-				new ArrangeRequest(RequestConstants.REQ_ARRANGE_DEFERRED);
-			arrangeRequest.setViewAdaptersToArrange(result);
-			Command arrangeCommand = getHost().getCommand(arrangeRequest);
-
-			CompoundCommand cc = new CompoundCommand(createCommand.getLabel());
-			cc.add(createCommand.chain(refreshCommand));
-			cc.add(arrangeCommand);
-			
-			return cc;
-		}
-		return null;
-
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterCompartmentItemsEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterCompartmentItemsEditPolicy.java
deleted file mode 100644
index 83f5131..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterCompartmentItemsEditPolicy.java
+++ /dev/null
@@ -1,142 +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.diagram.ui.editpolicies;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.editpolicies.AbstractEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterPage;
-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.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.sortfilter.SortFilterDialogUtil;
-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.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * EditPolicy which provides sorting/filtering for ListCompartmentItems.
- * 
- * @author jcorchis
- */
-public class SortFilterCompartmentItemsEditPolicy
-	extends AbstractEditPolicy {
-
-	/**
-	 * Returns <code>true</code> if the request is a REQ_SORT_FILTER_COMPARTMENT type and the view is resolvable.
-	 * @return <code>true</code> if the request is a REQ_SORT_FILTER_COMPARTMENT type and the view is resolvable.
-	 * and <code>false</code> otherwise.
-	 */
-	public final boolean understandsRequest(Request request) {
-		IGraphicalEditPart editPart = (IGraphicalEditPart) getHost();
-		View view = editPart.getNotationView();
-		if (RequestConstants
-			.REQ_SORT_FILTER_COMPARTMENT
-			.equals(request.getType())
-			&& view !=null 
-			&& ViewUtil.resolveSemanticElement(view)!= null) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Opens the sort/filter dialog if there is at least on contribution
-	 * from a child.
-	 * @return command the <code>SortFilterCommand</code>
-	 */
-	public Command getCommand(Request request) {
-		if (understandsRequest(request)) {
-				List childContributions = new ArrayList();
-
-				GraphicalEditPart ep = (GraphicalEditPart) getHost();
-				List children = ep.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);
-					}
-				}
-
-				List selectedEditParts = ((SortFilterCompartmentItemsRequest) request)
-					.getEditParts();
-				if (selectedEditParts.size() == 1 && childContributions.size() > 0 ) {
-					// Open the sort/filter dialog
-					SortFilterDialogUtil.invokeDialog(
-						(GraphicalEditPart) getHost(), getRootPage(),
-
-						childContributions);
-				} else if (selectedEditParts.size() > 1) {
-					// Open the filter dialog if this host is the primary
-					// selection and the selection size is greater than 1.
-					
-					// Set the filter map as the first non-empty map from the selection.
-					if (Collections.EMPTY_MAP.equals(getFilterMap()) || getFilterMap() == null) {
-						Map filterMap = null;
-						Iterator i = selectedEditParts.iterator();
-						while(i.hasNext()) {
-							IGraphicalEditPart part = (IGraphicalEditPart) i.next();
-							EditPolicy policy = part.getEditPolicy(EditPolicyRoles.SORT_FILTER_ROLE);
-							if (policy instanceof SortFilterCompartmentItemsEditPolicy) {
-								filterMap = ((SortFilterCompartmentItemsEditPolicy)policy).getFilterMap();
-								if (!Collections.EMPTY_MAP.equals(filterMap) &&  filterMap != null)
-									break;
-							}
-						}
-						if (!Collections.EMPTY_MAP.equals(filterMap) && filterMap != null) 
-							SortFilterDialogUtil.invokeFilterDialog(selectedEditParts,
-								filterMap);
-					} else  {
-						SortFilterDialogUtil.invokeFilterDialog(selectedEditParts,
-							getFilterMap());
-					}
-				}
-			}
-			return null;
-	}
-	
-	public EditPart getTargetEditPart(Request request) {
-		return understandsRequest(request) ? getHost() : null;
-	}
-
-	/**
-	 * Returns the root <code>SortFilterPage</code> which filters using
-	 * the <code>UMLModifiers</code> as the filtering criteria. Default implementation
-	 * returns null.  Override to add the root page.
-	 * @return the root <code>SortFilterPage</code>
-	 */
-	public SortFilterPage getRootPage() {
-		return null;
-	}
-	
-	/**
-	 * Override to provide the filter Map. The default is any empty map
-	 * @return Map
-	 */
-	public Map getFilterMap() {		
-		return Collections.EMPTY_MAP;
-	}	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterContentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterContentEditPolicy.java
deleted file mode 100644
index 9a88206..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/SortFilterContentEditPolicy.java
+++ /dev/null
@@ -1,144 +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.diagram.ui.editpolicies;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterLabelProvider;
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterPage;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.SortFilterContentRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * EditPolicy which contributes <code>SortFilterPage</code> content 
- * to the <code>SortFilterDialog</code>.
- * 
- * @author jcorchis
- */
-public abstract class SortFilterContentEditPolicy extends AbstractEditPolicy {
-
-	/**
-	 * Returns <code>true</code> if the request is a REQ_SORT_FILTER_CONTENT type.
-	 * @return <code>true</code> if the request is a REQ_SORT_FILTER_CONTENT type
-	 * and <code>false</code> otherwise.
-	 */
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_SORT_FILTER_CONTENT.equals(request
-			.getType());
-	}
-
-	/**
-	 * Adds the <code>SortFilterPage</code> to the <code>SortFilterDialog</code> given
-	 * if the provided implementation has content.
-	 * @param request the <code>SortFilterContentRequest</code>
-	 * @return null Does not return a <code>Command</code>
-	 */
-	public Command getCommand(Request request) {
-		if (understandsRequest(request)) {
-
-			// Do not contribute to the Sort/Filter dialog
-			// if there is nothing to sort or filter.	
-			if (getContents() == null || getContents().size() == 0)
-				return null;
-
-			SortFilterContentRequest contentRequest =
-				(SortFilterContentRequest) request;
-			SortFilterPage newSortFilterPage =
-				new SortFilterPage(
-					SortFilterPage.CHILD_PAGE,
-					(GraphicalEditPart) getHost(),
-					getCollectionColumns(),
-					getLabelProvider());
-
-			newSortFilterPage.setContents(getContents(), getHiddenContents());
-			newSortFilterPage.setTitle(getCompartmentLabel());
-
-			if (getFilter() != null && getFilterColumn() != null)
-				newSortFilterPage.setFilter(getFilter(), getFilterColumn());
-
-			// Get the List from the request and Add the new page
-			contentRequest.getSortFilterPageList().add(newSortFilterPage);
-		}
-		return null;
-	}
-
-	/**
-	 * Override to return the label for the compartment other than the one provided
-	 * by <code>ResizableCompartmentEditPart.getTitleName()</code>.
-	 * @return the compartment label
-	 */
-	public String getCompartmentLabel() {
-		if (getHost() instanceof ListCompartmentEditPart) {
-			return ((ListCompartmentEditPart) getHost()).getCompartmentName();
-		}
-		return null;
-	}
-
-	/**
-	 * Implement to return a <code>List</code> of <code>SortFilterCollectionColumn</code>s
-	 * which are used to define the <code>SortFilterDialog</code> table.
-	 * @return the collection columns.
-	 */
-	public abstract List getCollectionColumns();
-
-	/**
-	 * Implement to return a <code>SortFilterLabelProvider</code> for
-	 * for the compartment.  The <code>SortFilterLabelProvider</code> 
-	 * provides the content for the SortFilterDialog table.
-	 * @return <code>SortFilterLabelProvider</code>
-	 */
-	public abstract SortFilterLabelProvider getLabelProvider();
-
-	/**
-	 * Implement to return a <code>List</code> of <code>SortFilterElement</code>s
-	 * which are used to define the <code>SortFilterDialog</code> tables content.
-	 * @return the collection of <code>SortFilterElement</code>s
-	 */
-	public abstract List getContents();
-	
-	/**
-	 * Override to return a list of elements that are hidden by other means. The 
-	 * items in this list will not be displayed in the sort/filter dialog, and will
-	 * remain in the ID_FILTERED_OBJECTS list when changes to the sort/filter
-	 * are applied.
-	 * 
-	 * @return a list if items not to be displayed in the sort/filter dialog.
-	 */
-	public List getHiddenContents() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Override to return a filter this SortFilterPage.
-	 * @return the filter map
-	 */
-	public Map getFilter() {
-		return null;
-	}
-
-	/**
-	 * Override to return the column to which the filter applies.
-	 * @return the filter column
-	 */
-	public String getFilterColumn() {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TetherConnectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TetherConnectionEditPolicy.java
deleted file mode 100644
index a75465f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TetherConnectionEditPolicy.java
+++ /dev/null
@@ -1,163 +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.editpolicies;
-
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.GraphicalEditPolicyEx;
-
-/**
- * An EditPolicy that tethers a shape to the connection to which it 
- * applies. The default style for the tether is <code>Graphics.LINE_DASH</code>
- * 
- * @author jcorchis
- */
-public class TetherConnectionEditPolicy
-	extends GraphicalEditPolicyEx {
-
-	private Polyline tether;
-
-	private OwnerMovedListener ownerMovedListener = new OwnerMovedListener();
-
-	/**
-	 * Returns the tether figure which is a <code>Polyline</code> with the
-	 * given style.
-	 * 
-	 * @return the <code>Polyline</code>
-	 * @since 1.2
-	 */
-	public Polyline getConnection() {
-		if (tether == null) {
-			tether = new PolylineConnectionEx();
-			tether.setLineStyle(Graphics.LINE_DASH);			
-		}
-		return tether;
-	}
-
-	/**
-	 * Listens to the owner figure being moved so the tether position can be
-	 * updated when this occurs.
-	 */
-	private class OwnerMovedListener
-		implements FigureListener {
-
-		/**
-		 * @see org.eclipse.draw2d.FigureListener#figureMoved(org.eclipse.draw2d.IFigure)
-		 */
-		public void figureMoved(IFigure source) {
-			refresh();
-		}
-	}
-
-	/**
-	 * Adds the tether upon activation
-	 */
-	public void activate() {
-		super.activate();
-		addConnection();
-		((IGraphicalEditPart) getHost()).getFigure().addFigureListener(
-			ownerMovedListener);
-	}
-
-	/**
-	 * Removes the tether upon deactivation.
-	 */
-	public void deactivate() {
-		((IGraphicalEditPart) getHost()).getFigure().removeFigureListener(
-			ownerMovedListener);
-		removeConnection();
-		super.deactivate();
-	}
-
-	/**
-	 * Removes the tether from the label.
-	 */
-	private void removeConnection() {
-		if (getParentFigure().getChildren().contains(getConnection()))
-			getParentFigure().remove(getConnection());
-	}
-	
-	/**
-	 * Adds the tether
-	 *
-	 */
-	private void addConnection() {
-		if (!getParentFigure().getChildren().contains(getConnection()))
-			getParentFigure().add(getConnection());
-	}
-
-	/**
-	 * Updates the end-points of the tether based on the figure's position.
-	 */
-	public void refresh() {
-		IFigure figure = ((GraphicalEditPart) getHost()).getFigure();
-
-		Rectangle r = figure.getBounds().getCopy();
-		
-		PointList pl = new PointList();
-		Point refPoint = new Point();
-		if (getHost().getParent() instanceof AbstractConnectionEditPart) {
-			AbstractConnectionEditPart connectionClassEP = (AbstractConnectionEditPart) getHost()
-			.getParent();
-			pl = connectionClassEP.getConnectionFigure().getPoints();
-			refPoint = PointListUtilities.calculatePointRelativeToLine(pl, 0, 50, true);
-		} else {
-			refPoint = ((AbstractGraphicalEditPart)getHost().getParent()).getFigure().getBounds().getLocation();
-		}
-
-		Point midTop = new Point(r.x + r.width / 2, r.y);
-		Point midBottom = new Point(r.x + r.width / 2, r.y + r.height);
-		Point midLeft = new Point(r.x, r.y + r.height / 2);
-		Point midRight = new Point(r.x + r.width, r.y + r.height / 2);
-
-		Point startPoint = midTop;
-
-		int x = r.x + r.width / 2 - refPoint.x;
-		int y = r.y + r.height / 2 - refPoint.y;
-
-		if (y > 0 && y > x && y > -x)
-			startPoint = midTop;
-		else if (y < 0 && y < x && y < -x)
-			startPoint = midBottom;
-		else if (x < 0 && y > x && y < -x)
-			startPoint = midRight;
-		else
-			startPoint = midLeft;
-
-		getConnection().setStart(startPoint);
-		getConnection().setEnd(refPoint);
-		getConnection().setForegroundColor(
-			((AbstractGraphicalEditPart) getHost().getParent()).getFigure()
-				.getForegroundColor());
-	}
-
-	/**
-	 * Returns the layer that the tether will be added.
-	 * 
-	 * @return the layer that the tether will be added
-	 */
-	private IFigure getParentFigure() {
-		return getHostFigure().getParent();		
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TreeGraphicalNodeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TreeGraphicalNodeEditPolicy.java
deleted file mode 100644
index 9e4f18f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/TreeGraphicalNodeEditPolicy.java
+++ /dev/null
@@ -1,103 +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.editpolicies;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-
-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.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This class overrides the default GraphicalNodeEditPolicy to allow for a
- * redirection of the target editpart when connecting. Specifically it used for
- * connections of the same semantic type and will route them using the tree
- * routing. The common example is with generalizations. It is typical for an
- * inheritance hierarchy to be viewed as a tree.
- * 
- * @author sshaw
- */
-public class TreeGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy {
-
-	/**
-	 * isTreeConnection Method determines if the user gesture that spawned the
-	 * request should result in the connection being made into a tree view. The
-	 * criteria is whether the semantic type being requested is the same as the
-	 * semantic type being targeted.
-	 * 
-	 * @param request
-	 *            Request that is sent from the user gesture
-	 * @return boolean true if connection should be made into a tree, false
-	 *         otherwise.
-	 */
-	private boolean isTreeConnection(Request request) {
-		IGraphicalEditPart editPart = (IGraphicalEditPart)getHost();
-		View view = editPart.getNotationView();
-		String modelHint = ViewUtil.getSemanticElementClassId(view);
-		String hint = getSemanticHint(request);
-
-		if (modelHint.equals(hint)) {
-			return true;
-		}
-
-		return false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getConnectionCompleteEditPart(org.eclipse.gef.Request)
-	 */
-	protected INodeEditPart getConnectionCompleteEditPart(Request request) {
-		if (isTreeConnection(request)) {
-			return (INodeEditPart) ((ConnectionEditPart) getHost()).getTarget();
-		}
-
-		return super.getConnectionCompleteEditPart(request);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy#getConnectionTargetAnchor(org.eclipse.gef.Request)
-	 */
-	protected ConnectionAnchor getConnectionTargetAnchor(Request request) {
-		if (isTreeConnection(request)) {
-			INodeEditPart nep = getConnectionCompleteEditPart(request);
-			return nep.getTargetConnectionAnchor((ConnectionEditPart)getHost());
-		}
-		
-		return super.getConnectionTargetAnchor(request);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getConnectionCompleteCommand(org.eclipse.gef.requests.CreateConnectionRequest)
-	 */
-	protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
-		Command cmd = super.getConnectionCompleteCommand(request);
-
-		Command cmdRouter = getRoutingAdjustment(getViewAdapter(), 
-												getSemanticHint(request), Routing.TREE_LITERAL, 
-												request.getTargetEditPart());
-		if (cmdRouter != null) {
-			cmd = cmd == null ? cmdRouter : cmd.chain(cmdRouter);
-		}
-		return cmd;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableConnectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableConnectionEditPolicy.java
deleted file mode 100644
index 02816a6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableConnectionEditPolicy.java
+++ /dev/null
@@ -1,48 +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.editpolicies;
-
-import org.eclipse.gef.AccessibleHandleProvider;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-
-/**
- * This edit policy does not allow elements to be moved
- * 
- * @author Wayne Diu, wdiu
- */
-public class UnmovableConnectionEditPolicy extends org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy {
-	/**
-	 * Just override getCommand to always return null.
-	 * 
-	 * Then, it won't support move or align, and orphan because aligning
-	 * means moving the element and orphan implies that the element has
-	 * moved somewhere.
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		return null;
-	}
-	
-	/**
-	 * Since unmoveable, override to never return an AccessibleHandleProvider
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == AccessibleHandleProvider.class) {
-			return null;
-		}
-		return super.getAdapter(key);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableShapeEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableShapeEditPolicy.java
deleted file mode 100644
index 9813acd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/UnmovableShapeEditPolicy.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.editpolicies;
-
-import org.eclipse.gef.AccessibleHandleProvider;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-
-/**
- * This edit policy does not allow elements to be moved
- * 
- * @author Wayne Diu, wdiu
- **/
-public class UnmovableShapeEditPolicy extends ResizableShapeEditPolicy {
-	
-	/**
-	 * Just override getCommand to always return null.
-	 * 
-	 * Then, it won't support move or align, and orphan because aligning
-	 * means moving the element and orphan implies that the element has
-	 * moved somewhere.
-	 * 
-	 * @see org.eclipse.gef.EditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		return null;
-	}
-	
-	/**
-	 * Since unmoveable, override to never return an AccessibleHandleProvider
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == AccessibleHandleProvider.class) {
-			return null;
-		}
-		return super.getAdapter(key);
-	}	
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ViewComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ViewComponentEditPolicy.java
deleted file mode 100644
index 7549df2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ViewComponentEditPolicy.java
+++ /dev/null
@@ -1,43 +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.editpolicies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-
-
-/**
- * Concrete class that extends the <code>ComponentEditPolicy</code>.
- * This edit policy will return a command in response to delete requests.
- * 
- * @author Jody Schofield
- */
-public class ViewComponentEditPolicy extends ComponentEditPolicy {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy#shouldDeleteSemantic()
-	 */
-	protected boolean shouldDeleteSemantic() {
-
-		return false;
-	}
-
-    /**
-     * Returns a command to delete the view. Since this command has no semantic
-     * element we want to avoid the prompt regarding "delete from model".
-     */
-    protected Command getDeleteCommand(GroupRequest request) {
-        return createDeleteViewCommand(request);
-    }
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/VisibilityComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/VisibilityComponentEditPolicy.java
deleted file mode 100644
index bb9d313..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/VisibilityComponentEditPolicy.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.List;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-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.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Component edit policy which sets the <code>Property.ID_ISVISIBLE</code> to
- * <i>false</i> rather than deleting the view.  Doesn't support delete semantic.
- * 
- * @author jcorchis
- */
-public class VisibilityComponentEditPolicy
-	extends ComponentEditPolicy {
-	
-	/** 
-	 * Return to make the <code>GraphicalEditPart</code>'s figure not visible.
-	 * @param deleteRequest the original delete request.
-	 */
-	protected Command createDeleteViewCommand(GroupRequest deleteRequest) {
-		CompositeCommand cc = new CompositeCommand(StringStatics.BLANK);
-		List toDel = deleteRequest.getEditParts();
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		if (toDel == null || toDel.isEmpty()) {
-			SetPropertyCommand c = new SetPropertyCommand(editingDomain,
-				DiagramUIMessages.Command_hideLabel_Label,
-				new EObjectAdapter((View) getHost().getModel()),
-				Properties.ID_ISVISIBLE, Boolean.FALSE);
-			cc.compose(c);
-		} else {
-			for (int i = 0; i < toDel.size(); i++) {
-				IGraphicalEditPart gep = (IGraphicalEditPart) toDel.get(i);
-				SetPropertyCommand c = new SetPropertyCommand(editingDomain,
-					DiagramUIMessages.Command_hideLabel_Label,
-					new EObjectAdapter((View)gep.getModel()),
-					Properties.ID_ISVISIBLE,
-					Boolean.FALSE);
-				cc.compose(c);
-			}
-		}
-		return new ICommandProxy(cc.reduce());		
-	}
-
-	/** 
-	 * Returns null.
-	 * @see #shouldDeleteSemantic()
-	 * @param deleteRequest the original delete request.
-	 */
-	protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-		return null;
-	}
-    
-	protected Command getDeleteCommand(GroupRequest deleteRequest) {
-        // Override this method to avoid prompt when deleting views with no
-        // semantic meaning. See bugzilla 158845.
-        if (shouldDeleteSemantic()) {
-            return createDeleteSemanticCommand(deleteRequest);
-        }
-        return createDeleteViewCommand(deleteRequest);
-    }
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/XYLayoutEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/XYLayoutEditPolicy.java
deleted file mode 100644
index 663c7aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/XYLayoutEditPolicy.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010, 2012 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.editpolicies;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-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.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SnapToGuides;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-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.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.LayoutHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.DiagramGuide;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.commands.ChangeGuideCommand;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * the xy layout edit policy 
- * @see org.eclipse.gef.editpolicies.XYLayoutEditPolicy
- * @author sshaw
- *
- */
-public class XYLayoutEditPolicy
-	extends org.eclipse.gef.editpolicies.XYLayoutEditPolicy {
-
-
-	/** 
-	 * Called in response to a <tt>REQ_ADD</tt> (reparent) request.  
-	 * Returns a <tt>SetPropertyCommand</tt> to set the <tt>child<tt>'s bounds
-	 * to the supplied constraint.
-	 * 
-	 * @param child element being reparented.
-	 * @param constraint - rectangle containing the child's bounds (location)
-	 * @return a new command or null if the compound command is empty
-	 * 
-	 */
-	protected Command createAddCommand(EditPart child, Object constraint) {
-		if ( child instanceof ShapeEditPart && constraint instanceof Rectangle) {
-			Rectangle rect = (Rectangle) constraint;
-			
-	 		ICommand boundsCommand = 
-	 			new SetBoundsCommand(((ShapeEditPart) child).getEditingDomain(),
-	 				DiagramUIMessages.SetLocationCommand_Label_Resize,
-	 				new EObjectAdapter((View) child.getModel()),
-					rect.getTopLeft()); 
-			return new ICommandProxy(boundsCommand);
-		}
-		return null;
-	}
-
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#createChangeConstraintCommand(org.eclipse.gef.requests.ChangeBoundsRequest, org.eclipse.gef.EditPart, java.lang.Object)
-	 */
-	protected Command createChangeConstraintCommand(
-			ChangeBoundsRequest request, EditPart child, Object constraint) {
-		
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-		Command cmd = createChangeConstraintCommand(child, constraint);
-		View view = (View)child.getModel();
-		if ((request.getResizeDirection() & PositionConstants.NORTH_SOUTH) != 0) {
-			Integer guidePos = (Integer)request.getExtendedData()
-					.get(SnapToGuides.KEY_HORIZONTAL_GUIDE);
-			if (guidePos != null) {
-				int hAlignment = ((Integer)request.getExtendedData()
-						.get(SnapToGuides.KEY_HORIZONTAL_ANCHOR)).intValue();
-				ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain, view, true);
-				cgm.setNewGuide(findGuideAt(guidePos.intValue(), true), hAlignment);
-				cmd = cmd.chain(new ICommandProxy(cgm));
-			} else if (DiagramGuide.getInstance().getHorizontalGuide(view) != null) {
-				// SnapToGuides didn't provide a horizontal guide, but this part is attached
-				// to a horizontal guide.  Now we check to see if the part is attached to
-				// the guide along the edge being resized.  If that is the case, we need to
-				// detach the part from the guide; otherwise, we leave it alone.
-				int alignment = DiagramGuide.getInstance().getHorizontalAlignment(view);
-				int edgeBeingResized = 0;
-				if ((request.getResizeDirection() & PositionConstants.NORTH) != 0)
-					edgeBeingResized = -1;
-				else
-					edgeBeingResized = 1;
-				if (alignment == edgeBeingResized) {
-					ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain, view, true);
-					cmd = cmd.chain(new ICommandProxy(cgm));
-				}
-			}
-		}
-		
-		if ((request.getResizeDirection() & PositionConstants.EAST_WEST) != 0) {
-			Integer guidePos = (Integer)request.getExtendedData()
-					.get(SnapToGuides.KEY_VERTICAL_GUIDE);
-			if (guidePos != null) {
-				int vAlignment = ((Integer)request.getExtendedData()
-						.get(SnapToGuides.KEY_VERTICAL_ANCHOR)).intValue();
-				ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain, view, false);
-				cgm.setNewGuide(findGuideAt(guidePos.intValue(), false), vAlignment);
-				cmd = cmd.chain(new ICommandProxy(cgm));
-			} else if (DiagramGuide.getInstance().getVerticalGuide(view) != null) {
-				int alignment = DiagramGuide.getInstance().getVerticalAlignment(view);
-				int edgeBeingResized = 0;
-				if ((request.getResizeDirection() & PositionConstants.WEST) != 0)
-					edgeBeingResized = -1;
-				else
-					edgeBeingResized = 1;
-				if (alignment == edgeBeingResized) {
-					ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain, view, false);
-					cmd = cmd.chain(new ICommandProxy(cgm));
-				}
-			}
-		}
-		
-        if (request.getType().equals(REQ_MOVE_CHILDREN)
-                || request.getType().equals(REQ_ALIGN_CHILDREN)) {
-            Integer guidePos = (Integer)request.getExtendedData()
-                    .get(SnapToGuides.KEY_HORIZONTAL_GUIDE);
-            ChangeGuideCommand cgm = null;
-            if (guidePos != null) {
-                cgm = new ChangeGuideCommand(editingDomain,view, true);;
-                int hAlignment = ((Integer)request.getExtendedData()
-                        .get(SnapToGuides.KEY_HORIZONTAL_ANCHOR)).intValue();
-                cgm.setNewGuide(findGuideAt(guidePos.intValue(), true), hAlignment);
-            }else {
-                Guide theOldGuide = DiagramGuide.getInstance().getHorizontalGuide(view);
-                if (theOldGuide!=null)
-                    cgm = new ChangeGuideCommand(editingDomain,view, true);
-            }
-            // If know this creates a lot of extra commands.  They are currently
-            // required for attaching/detaching shapes to guides
-            if (cgm!=null)
-                cmd = cmd.chain(new ICommandProxy(cgm));
-            
-            guidePos = (Integer)request.getExtendedData()
-                    .get(SnapToGuides.KEY_VERTICAL_GUIDE);
-            cgm = null;
-            if (guidePos != null) {
-                cgm = new ChangeGuideCommand(editingDomain, view, false);
-                int vAlignment = ((Integer)request.getExtendedData()
-                        .get(SnapToGuides.KEY_VERTICAL_ANCHOR)).intValue();
-                cgm.setNewGuide(findGuideAt(guidePos.intValue(), false), vAlignment);
-            }else {
-                 Guide theOldGuide = DiagramGuide.getInstance().getVerticalGuide(view);
-                    if (theOldGuide!=null)
-                        cgm = new ChangeGuideCommand(editingDomain, view, true);
-            }
-            // If know this creates a lot of extra commands.  They are currently
-            // required for attaching/detaching shapes to guides
-            if (cgm!=null)
-                cmd = cmd.chain(new ICommandProxy(cgm));
-        }
-
-
-		return cmd;
-	}
-	
-	/** 
-	 * Called in response to a <tt>REQ_RESIZE_CHILDREN</tt> request.
-	 * 
-	 * This implementation creates a <tt>SetPropertyCommand</i> and sets
-	 * the <tt>ID_BOUNDS</tt> property value to the supplied constraints.
-	 * 
-	 * @param child the element being resized.
-	 * @param constraint the elements new bounds.
-	 * @return {@link SetBoundsCommand}
-	 */
-	protected Command createChangeConstraintCommand(
-		EditPart child,
-		Object constraint) {
-		Rectangle newBounds = (Rectangle) constraint;
-		View shapeView = (View) child.getModel();
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
- 		ICommand boundsCommand = 
- 			new SetBoundsCommand(editingDomain,
- 				DiagramUIMessages.SetLocationCommand_Label_Resize,
- 				new EObjectAdapter(shapeView),
-				newBounds); 
-		return new ICommandProxy(boundsCommand);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.gef.requests.ChangeBoundsRequest, org.eclipse.gef.GraphicalEditPart)
-	 */
-	protected Object getConstraintFor(
-		ChangeBoundsRequest request,
-		GraphicalEditPart child) {
-		Rectangle rect = (Rectangle) super.getConstraintFor(request, child);
-		Rectangle cons = getCurrentConstraintFor(child);
-		Dimension requestSizeDelta = request.getSizeDelta();
-		if (requestSizeDelta.width == 0 && cons != null){
-			rect.width = cons.width;
-		}
-		if (requestSizeDelta.height == 0 && cons != null){
-			rect.height = cons.height;
-		}
-		return rect;
-	}
-
-	/**
-	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command
-	 * to set each created element bounds and autosize properties.
-	 * 
-	 * @param request a create request (understands instances of {@link CreateViewRequest}).
-	 * @return a command to satify the request; <tt>null</tt> if the request is not
-	 * understood.
-	 */
-	protected Command getCreateCommand(CreateRequest request) {
-		CreateViewRequest req = (CreateViewRequest) request;
-        
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(
-            editingDomain, DiagramUIMessages.AddCommand_Label);
-        Iterator iter = req.getViewDescriptors().iterator();
-
-		final Rectangle BOUNDS = (Rectangle) getConstraintFor(request);
-
-
-
-		while (iter.hasNext()) {
-			CreateViewRequest.ViewDescriptor viewDescriptor = (CreateViewRequest.ViewDescriptor)iter.next(); 
-			Rectangle rect = getBoundsOffest(req, BOUNDS,viewDescriptor);
-			cc.compose(new SetBoundsCommand(editingDomain, 
-				DiagramUIMessages.SetLocationCommand_Label_Resize,
-				viewDescriptor,
-				rect));
-		}
-		
-		if( cc.reduce() == null )
-			return null;
-
-		return chainGuideAttachmentCommands( request,
-			new ICommandProxy(cc.reduce()));
-	}
-
-	/**
-	 * Return bounds offset by some predefined amount.
-	 * @param request the request
-	 * @param bounds	the rectangle bounds
-	 * @param viewDescriptor the view descriptor
-	 * @return rectangle
-	 */
-	protected Rectangle getBoundsOffest( CreateViewRequest request, Rectangle bounds, CreateViewRequest.ViewDescriptor viewDescriptor ) {
-		int translate = request.getViewDescriptors().indexOf(viewDescriptor) * 10;
-		return bounds.getCopy().translate( translate, translate );
-	}
-	
-	/** 
-	 * <tt>null</tt> implementation: request not handled.
-	 */
-	protected Command getDeleteDependantCommand(Request request) {
-		return null;
-	}
-
-	/** 
-	 * <tt>null</tt> implementation: request not handled.
-	 */
-	protected Command getOrphanChildrenCommand(Request request) {
-		return null;
-	}
-
-	protected EditPolicy createChildEditPolicy(EditPart child) {
-		if ( child instanceof ShapeEditPart ) {
-			return ((ShapeEditPart)child).getPrimaryDragEditPolicy();
-		}
-		
-		return null;
-	}	
-	
-	/**
-	 * Creates command for <tt>REQ_CREATE</tt> 
-	 * requests only; all others requests are forwarded to the parent class.
-	 * 
-	 * @see #getCommand(Request) 
-	 */
-	public Command getCommand(Request request) {
-
-		if (REQ_CREATE.equals(request.getType())) {
-
-			if (request instanceof CreateViewRequest) {
-				return getCreateCommand((CreateViewRequest) request);
-			} else {
-				return null;
-			}
-
-		}
-		return super.getCommand(request);
-	}
-	
-	/* Override to use to deal with causes where the point is UNDERFINED
-	 * we will ask the layout helper to find a location for us
-	 * @see org.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy#getConstraintFor(org.eclipse.gef.requests.CreateRequest)
-	 */
-	protected Object getConstraintFor(CreateRequest request) {
-		
-		Object constraint = super.getConstraintFor(request);
-		
-		if ( LayoutHelper.UNDEFINED.getLocation().equals(request.getLocation()) ){	
-			Rectangle rect = (Rectangle)constraint;
-			rect.setLocation(getLayoutHelper().getReferencePosition(getHostFigure()));
-			Point point = getLayoutHelper().validatePosition(getHostFigure(),rect);
-			rect.setLocation(point);
-			return rect;	
-		}
-		return constraint;	
-	}
-	
-	/** 
-	 * Return the host's figure. 
-	 * The super calls getFigure().  This is a problem when used with shapecompartments.  Instead,
-	 * return getContextPane().  In shape comaprtments this will return the correct containing figure.
-	 */
-	protected IFigure getHostFigure() {
-		return ((GraphicalEditPart)getHost()).getContentPane();
-	}
-	
-	// layout helper used to help locate shape created with undefined points
-	LayoutHelper layoutHelper = null;
-	
-	/** Return this layout helper. */
-	private LayoutHelper getLayoutHelper() {
-		if (layoutHelper == null) {
-			layoutHelper = new LayoutHelper();
-		}
-		return layoutHelper;
-	}
-	
-	/**
-	 * @param request
-	 * @param cmd
-	 * @return command
-	 */
-	protected Command chainGuideAttachmentCommands(
-			Request request, Command cmd) {
-		Assert.isNotNull(request);
-		Assert.isNotNull(cmd);
-
-		EditPartViewer editPartViewer = getHost().getRoot().getViewer();
-		Command result = cmd;
-
-		CreateViewRequest req = (CreateViewRequest) request;
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-
-		// Attach to horizontal guide, if one is given
-		Integer guidePos = (Integer)request.getExtendedData()
-				.get(SnapToGuides.KEY_HORIZONTAL_GUIDE);
-		if (guidePos != null) {
-			int hAlignment = ((Integer)request.getExtendedData()
-					.get(SnapToGuides.KEY_HORIZONTAL_ANCHOR)).intValue();
-
-			Guide guide = findGuideAt(guidePos.intValue(), true);
-
-			Iterator iter = req.getViewDescriptors().iterator();
-
-			while (iter.hasNext()) {
-				IAdaptable desc = (IAdaptable)iter.next();
-				ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain,
-                    editPartViewer, desc, true);
-				cgm.setNewGuide(guide, hAlignment);
-				result = result.chain(new ICommandProxy(cgm));
-			}
-		}
-
-		// Attach to vertical guide, if one is given
-		guidePos = (Integer)request.getExtendedData()
-				.get(SnapToGuides.KEY_VERTICAL_GUIDE);
-		if (guidePos != null) {
-			int vAlignment = ((Integer)request.getExtendedData()
-					.get(SnapToGuides.KEY_VERTICAL_ANCHOR)).intValue();
-
-			Guide guide = findGuideAt(guidePos.intValue(), false);
-
-			Iterator iter = req.getViewDescriptors().iterator();
-
-			while (iter.hasNext()) {
-				IAdaptable desc = (IAdaptable)iter.next();
-
-				ChangeGuideCommand cgm = new ChangeGuideCommand(editingDomain,
-                    editPartViewer, desc, false);
-				cgm.setNewGuide(guide, vAlignment);
-				result = result.chain(new ICommandProxy(cgm));
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * gets the guid at a specific pos
-	 * @param pos	the position
-	 * @param horizontal the horizontal flag	
-	 * @return the guid
-	 */
-	protected Guide findGuideAt(int pos, boolean horizontal) {
-		RulerProvider provider = ((RulerProvider)getHost().getViewer().getProperty(
-				horizontal ? RulerProvider.PROPERTY_VERTICAL_RULER 
-				: RulerProvider.PROPERTY_HORIZONTAL_RULER));
-		IMapMode mm = MapModeUtil.getMapMode(((GraphicalEditPart)getHost()).getFigure());
-		
-		return (Guide)provider.getGuideAt(mm.LPtoDP(pos));
-	}
-	
-	/*
-	 * Override to erase in case of GMF drop request, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=276033
-	 * (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.LayoutEditPolicy#eraseTargetFeedback(org.eclipse.gef.Request)
-	 */
-	@Override
-	public void eraseTargetFeedback(Request request) {
-		super.eraseTargetFeedback(request);
-		if (RequestConstants.REQ_DROP.equals(request.getType()))
-				eraseLayoutTargetFeedback(request);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/package.html
deleted file mode 100644
index 9afb8b1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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, selection…etc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemLocator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemLocator.java
deleted file mode 100644
index c85c0f1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemLocator.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-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.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * BorderItemLocator works closely with border items in determining position.
- * BorderItemLocators use a figure as the bounds around which the
- * borderItemFigure can be placed. This figure may not necessarily be the main
- * figure.
- * <p>
- * BorderItemLocator allows intial placement ( N/W/S/E ) and is used in
- * conjunction with BorderItemSelectionEditPolicy for feedback.
- * <p>
- * Collision detection is provided so that border items cannot overlap and
- * therefore be hidden.
- * <p>
- * Border item movement is restricted along border of bordered shape.
- * 
- * @author tisrar, jbruck, cmahoney
- */
-public class BorderItemLocator
-	implements IBorderItemLocator {
-
-	/** the figure around which this border item appears */
-	private IFigure parentFigure = null;
-
-	private Rectangle constraint = new Rectangle(0, 0, 0, 0);
-
-	private Dimension borderItemOffset = new Dimension(1, 1);
-
-	private int preferredSide = PositionConstants.WEST;
-	
-	/** remembers the preferred side used when the locator was created*/
-	private int originalPreferredSide = PositionConstants.WEST;
-
-	private int currentSide = PositionConstants.WEST;
-	
-	private int interval;
-	
-	/**
-	 * Accessor to return the constraint location of the border item.
-	 * 
-	 * @return the constraint
-	 */
-	protected Rectangle getConstraint() {
-		return constraint;
-	}
-	
-	/**
-	 * The preferred side determines placement of figure.
-	 * 
-	 * @param interval interval between border items used in collision resolving (must be > 0)
-	 * @param parentFigure
-	 */
-	public BorderItemLocator(int interval, IFigure parentFigure) {
-		Assert.isTrue(interval > 0);
-		Assert.isNotNull(parentFigure);
-		this.parentFigure = parentFigure;
-		this.interval = interval;
-	}
-
-	/**
-	 * The preferred side determines placement of figure.
-	 * 
-	 * @param parentFigure
-	 */
-	public BorderItemLocator(IFigure parentFigure) {
-		this(MapModeUtil.getMapMode(parentFigure).DPtoLP(8), parentFigure);
-	}
-
-	/**
-	 * The preferred side determines placement of figure.
-	 * 
-	 * @param parentFigure
-	 * @param preferredSide
-	 *            the preferred side of the parent figure on which to place this
-	 *            border item as defined in {@link PositionConstants}
-	 */
-	public BorderItemLocator(IFigure parentFigure, int preferredSide) {
-		this(parentFigure);
-		this.preferredSide = preferredSide;
-		this.originalPreferredSide = preferredSide;
-	}
-	
-	/**
-	 * The preferred side determines placement of figure.
-	 * 
-	 * @param parentFigure
-	 * @param preferredSide
-	 *            the preferred side of the parent figure on which to place this
-	 *            border item as defined in {@link PositionConstants}
-	 * @param interval interval between border items used in collision resolving (must be > 0)
-	 */
-	public BorderItemLocator(IFigure parentFigure, int preferredSide, int interval) {
-		this(interval, parentFigure);
-		this.preferredSide = preferredSide;
-		this.originalPreferredSide = preferredSide;
-	}
-	
-	/**
-	 * The preferred location overrides the preferred side.
-	 * 
-	 * @param parentFigure
-	 * @param constraint
-	 */
-	public BorderItemLocator(IFigure borderItem, IFigure parentFigure,
-			Rectangle constraint) {
-		this(parentFigure);
-		setConstraint(constraint);
-	}
-
-	/**
-	 * The preferred location overrides the preferred side.
-	 * 
-	 * @param parentFigure
-	 * @param constraint
-	 * @param interval interval between border items used in collision resolving (must be > 0)
-	 */
-	public BorderItemLocator(IFigure borderItem, IFigure parentFigure,
-			Rectangle constraint, int interval) {
-		this(interval, parentFigure);
-		setConstraint(constraint);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator#resetPosition(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public void setConstraint(Rectangle theConstraint) {
-		this.constraint = theConstraint;
-
-		if (theConstraint.getTopLeft().x == 0
-			|| theConstraint.getTopLeft().y == 0) {
-			setCurrentSideOfParent(getPreferredSideOfParent());
-		}
-	}
-
-	/**
-	 * Get the preferred location. If none has been previously set, use the
-	 * preferred side to take an initial guess.
-	 * 
-	 * @return point
-	 */
-	protected Point getPreferredLocation(IFigure borderItem) {
-		Point constraintLocation = getConstraint().getLocation();
-		Point ptAbsoluteLocation = this.getAbsoluteToBorder(constraintLocation);
-
-		if (constraintLocation.x == 0 || constraintLocation.y == 0) {
-			return getPreferredLocation(getPreferredSideOfParent(), borderItem);
-		} else {
-			return ptAbsoluteLocation;
-		}
-	}
-
-	/**
-	 * Utility to calculate the parent bounds with consideration for the handle
-	 * bounds inset.
-	 * 
-	 * @return <code>Rectangle</code> that is the bounds of the parent.
-	 */
-	protected Rectangle getParentBorder() {
-		Rectangle bounds = getParentFigure().getBounds().getCopy();
-		if (getParentFigure() instanceof NodeFigure) {
-			bounds = ((NodeFigure) getParentFigure()).getHandleBounds()
-				.getCopy();
-		}
-		return bounds;
-	}
-	
-	/**
-	 * Get an initial location based on the side. ( choose middle of the side )
-	 * 
-	 * @param side
-	 *            the preferred side of the parent figure on which to place this
-	 *            border item as defined in {@link PositionConstants}
-	 * @return point
-	 */
-	protected Point getPreferredLocation(int side, IFigure borderItem) {
-		Rectangle bounds = getParentBorder();
-		int parentFigureWidth = bounds.width;
-		int parentFigureHeight = bounds.height;
-		int parentFigureX = bounds.x;
-		int parentFigureY = bounds.y;
-		int x = parentFigureX;
-		int y = parentFigureY;
-
-		Dimension borderItemSize = getSize(borderItem);
-
-		if (side == PositionConstants.WEST) {
-			x = parentFigureX - borderItemSize.width
-				+ getBorderItemOffset().width;
-			y += parentFigureHeight / 2;
-		} else if (side == PositionConstants.EAST) {
-			x = parentFigureX + parentFigureWidth - getBorderItemOffset().width;
-			y += parentFigureHeight / 2;
-		} else if (side == PositionConstants.NORTH) {
-			y = parentFigureY - borderItemSize.height
-				+ getBorderItemOffset().height;
-			x += parentFigureWidth / 2;
-		} else if (side == PositionConstants.SOUTH) {
-			x += parentFigureWidth / 2;
-			y = parentFigureY + parentFigureHeight
-				- getBorderItemOffset().height;
-		}
-		return new Point(x, y);
-	}
-	/**
-	 * Ensure the suggested location actually lies on the parent boundary. The
-	 * side takes precedence.
-	 * 
-	 * @param suggestedLocation
-	 * @param suggestedSide
-	 * @return point
-	 */
-	protected Point locateOnParent(Point suggestedLocation,
-			int suggestedSide, IFigure borderItem) {
-		Rectangle bounds = getParentBorder();
-		int parentFigureWidth = bounds.width;
-		int parentFigureHeight = bounds.height;
-		int parentFigureX = bounds.x;
-		int parentFigureY = bounds.y;
-		Dimension borderItemSize = getSize(borderItem);
-		int newX = suggestedLocation.x;
-		int newY = suggestedLocation.y;
-		int westX = parentFigureX - borderItemSize.width
-			+ getBorderItemOffset().width;
-		int eastX = parentFigureX + parentFigureWidth
-			- getBorderItemOffset().width;
-		int southY = parentFigureY + parentFigureHeight
-			- getBorderItemOffset().height;
-		int northY = parentFigureY - borderItemSize.height
-			+ getBorderItemOffset().height;
-		if (suggestedSide == PositionConstants.WEST) {
-			if (suggestedLocation.x != westX) {
-				newX = westX;
-			}
-			if (suggestedLocation.y < bounds.getTopLeft().y) {
-				newY = northY + borderItemSize.height;
-			} else if (suggestedLocation.y > bounds.getBottomLeft().y
-				- borderItemSize.height) {
-				newY = southY - borderItemSize.height;
-			}
-		} else if (suggestedSide == PositionConstants.EAST) {
-			if (suggestedLocation.x != eastX) {
-				newX = eastX;
-			}
-			if (suggestedLocation.y < bounds.getTopLeft().y) {
-				newY = northY + borderItemSize.height;
-			} else if (suggestedLocation.y > bounds.getBottomLeft().y
-				- borderItemSize.height) {
-				newY = southY - borderItemSize.height;
-			}
-		} else if (suggestedSide == PositionConstants.SOUTH) {
-			if (suggestedLocation.y != southY) {
-				newY = southY;
-			}
-			if (suggestedLocation.x < bounds.getBottomLeft().x) {
-				newX = westX + borderItemSize.width;
-			} else if (suggestedLocation.x > bounds.getBottomRight().x
-				- borderItemSize.width) {
-				newX = eastX - borderItemSize.width;
-			}
-		} else { // NORTH
-			if (suggestedLocation.y != northY) {
-				newY = northY;
-			}
-			if (suggestedLocation.x < bounds.getBottomLeft().x) {
-				newX = westX + borderItemSize.width;
-			} else if (suggestedLocation.x > bounds.getBottomRight().x
-				- borderItemSize.width) {
-				newX = eastX - borderItemSize.width;
-			}
-		}
-		return new Point(newX, newY);
-	}
-
-	/**
-	 * Determine if the the given point conflicts with the position of an
-	 * existing borderItemFigure and returns the conflicting border item figure
-	 * 
-	 * @param recommendedLocation
-	 * @return the conflicting border item figure
-	 */
-	protected IFigure getConflictingBorderItemFigure(Point recommendedLocation,
-			IFigure targetBorderItem) {
-		Rectangle recommendedRect = new Rectangle(recommendedLocation,
-			getSize(targetBorderItem));
-		List borderItems = targetBorderItem.getParent().getChildren();
-        
-        // Only check those border items that would have already been
-        // relocated. See Bugzilla#214799.
-        int currentIndex = borderItems.indexOf(targetBorderItem);
-        for (int i = 0; i < currentIndex; i++) {
-            IFigure borderItem = (IFigure) borderItems.get(i);
-			if (borderItem.isVisible()) {
-				Rectangle rect = borderItem.getBounds().getCopy();
-				if (rect.intersects(recommendedRect)) {
-					return borderItem;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * The preferred side takes precedence.
-	 * 
-	 * @param suggestedLocation
-	 * @param suggestedSide
-	 * @param circuitCount
-	 *            recursion count to avoid an infinite loop
-	 * @return point
-	 */
-	protected Point locateOnBorder(Point suggestedLocation,
-			int suggestedSide, int circuitCount, IFigure borderItem) {
-		Point recommendedLocation = locateOnParent(suggestedLocation,
-			suggestedSide, borderItem);
-
-		Dimension borderItemSize = getSize(borderItem);
-		
-		IFigure conflictingBorderItem = getConflictingBorderItemFigure(recommendedLocation, borderItem);
-
-		if (circuitCount < 4 && conflictingBorderItem != null) {
-			if (suggestedSide == PositionConstants.WEST) {
-				do {
-					calculateNextNonConflictingPosition(recommendedLocation,
-							interval, suggestedSide, borderItem, conflictingBorderItem.getBounds());
-					conflictingBorderItem = getConflictingBorderItemFigure(recommendedLocation, borderItem);
-				} while (conflictingBorderItem != null);
-				if (recommendedLocation.y > getParentBorder().getBottomLeft().y
-					- borderItemSize.height) { // off the bottom,
-					// wrap south
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.SOUTH, circuitCount + 1, borderItem);
-				} else if (recommendedLocation.y < getParentBorder().getTopLeft().y
-					- borderItemSize.height) { // off the top, wrap north
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.NORTH, circuitCount + 1, borderItem);
-				}  
-			} else if (suggestedSide == PositionConstants.SOUTH) {
-				do {
-					calculateNextNonConflictingPosition(recommendedLocation,
-							interval, suggestedSide, borderItem, conflictingBorderItem.getBounds());
-					conflictingBorderItem = getConflictingBorderItemFigure(recommendedLocation, borderItem);
-				} while (conflictingBorderItem != null);
-				if (recommendedLocation.x > getParentBorder().getBottomRight().x
-					- borderItemSize.width) {
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.EAST, circuitCount + 1, borderItem);
-				} else if (recommendedLocation.x < getParentBorder().getBottomLeft().x
-					- borderItemSize.width) {
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.WEST, circuitCount + 1, borderItem);
-				}
-			} else if (suggestedSide == PositionConstants.EAST) {
-				// move up the east side
-				do {
-					calculateNextNonConflictingPosition(recommendedLocation,
-							interval, suggestedSide, borderItem, conflictingBorderItem.getBounds());
-					conflictingBorderItem = getConflictingBorderItemFigure(recommendedLocation, borderItem);
-				} while (conflictingBorderItem != null);
-				if (recommendedLocation.y < getParentBorder().getTopRight().y) {
-					// east is full, try north.
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.NORTH, circuitCount + 1, borderItem);
-				} else if (recommendedLocation.y > getParentBorder().getBottomRight().y) {
-					// east is full, try south.
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.SOUTH, circuitCount + 1, borderItem);
-				}
-			} else { // NORTH
-				do {
-					calculateNextNonConflictingPosition(recommendedLocation,
-							interval, suggestedSide, borderItem, conflictingBorderItem.getBounds());
-					conflictingBorderItem = getConflictingBorderItemFigure(recommendedLocation, borderItem);
-				} while (conflictingBorderItem != null);
-				if (recommendedLocation.x < getParentBorder().getTopLeft().x) {
-					return locateOnBorder(recommendedLocation,
-						PositionConstants.WEST, circuitCount + 1, borderItem);
-				} else if (recommendedLocation.x > getParentBorder().getTopRight().x) {
-					return locateOnBorder(recommendedLocation,
-							PositionConstants.EAST, circuitCount + 1, borderItem);
-				}
-			}
-		}
-		return recommendedLocation;
-	}
-
-	/**
-	 * Modifies the location of the border item (currentLocation) to avoid
-	 * overlapping with the obstacle rectangle (another border item bounds)
-	 * 
-	 * @param currentLocation
-	 *            The current location of the border item
-	 * @param interval
-	 *            The suggested spacing to try to find the next non-conflicting
-	 *            position
-	 * @param currentSide
-	 *            The current side of the border item
-	 * @param borderItem
-	 *            The borderItem being relocated (here to be used by subclasses
-	 *            if needed)
-	 * @param obstacle
-	 *            The bounds of the border item conflicting with the border item
-	 *            currently being relocated
-	 */
-	protected void calculateNextNonConflictingPosition(Point currentLocation,
-			int interval, int currentSide, IFigure borderItem,
-			Rectangle obstacle) {
-		switch (currentSide) {
-		case PositionConstants.WEST:
-			currentLocation.y = obstacle.getBottomLeft().y + interval;
-			break;
-		case PositionConstants.SOUTH: // Move towards the east side
-			currentLocation.x = obstacle.getBottomRight().x + interval;
-			break;
-		case PositionConstants.EAST:
-			currentLocation.y = obstacle.getTopRight().y - interval
-					- getSize(borderItem).height;
-			break;
-		case PositionConstants.NORTH: // Move towards the west side
-			currentLocation.x = obstacle.getTopLeft().x - interval
-					- getSize(borderItem).width;
-			break;
-		default:
-			throw new IllegalArgumentException(
-					"Invalid side argument: " //$NON-NLS-1$
-							+ currentSide
-							+ ". Should be the value from PositionConstants: WEST, EAST, NORTH or SOUTH"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Convert the relative coords in the model to ones that are Relative to the
-	 * container (absolute in respect to the main figure)
-	 * 
-	 * @param ptRelativeOffset
-	 * @return point
-	 */
-	protected Point getAbsoluteToBorder(Point ptRelativeOffset) {
-		Point parentOrigin = getParentBorder().getTopLeft();
-		return parentOrigin.translate(ptRelativeOffset);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator#getValidLocation(org.eclipse.draw2d.geometry.Rectangle,
-	 *      org.eclipse.draw2d.IFigure)
-	 */
-	public Rectangle getValidLocation(Rectangle proposedLocation,
-			IFigure borderItem) {
-		Rectangle realLocation = new Rectangle(proposedLocation);
-		int side = findClosestSideOfParent(proposedLocation, getParentBorder());
-		Point newTopLeft = locateOnBorder(realLocation.getTopLeft(), side, 0,
-			borderItem);
-		realLocation.setLocation(newTopLeft);
-		return realLocation;
-	}
-
-	/**
-	 * Find the closest side when x,y is inside parent.
-	 * 
-	 * @param proposedLocation
-	 * @param parentBorder
-	 * @return draw constant
-	 */
-	public static int findClosestSideOfParent(Rectangle proposedLocation,
-			Rectangle parentBorder) {
-		// Rectangle parentBorder = getParentBorder();
-		Point parentCenter = parentBorder.getCenter();
-		Point childCenter = proposedLocation.getCenter();
-		if (childCenter.x < parentCenter.x) // West, North or South.
-		{
-			if (childCenter.y < parentCenter.y) // west or north
-			{
-				// closer to west or north?
-				Point parentTopLeft = parentBorder.getTopLeft();
-				if ((childCenter.x - parentTopLeft.x) <= (childCenter.y - parentTopLeft.y)) {
-					return PositionConstants.WEST;
-				} else {
-					return PositionConstants.NORTH;
-				}
-			} else { // west or south
-				Point parentBottomLeft = parentBorder.getBottomLeft();
-				if ((childCenter.x - parentBottomLeft.x) <= (parentBottomLeft.y - childCenter.y)) {
-					return PositionConstants.WEST;
-				} else {
-					return PositionConstants.SOUTH;
-				}
-			}
-		} else { // EAST, NORTH or SOUTH
-			if (childCenter.y < parentCenter.y) // north or east
-			{
-				Point parentTopRight = parentBorder.getTopRight();
-				if ((parentTopRight.x - childCenter.x) <= (childCenter.y - parentTopRight.y)) {
-					return PositionConstants.EAST;
-				} else {
-					return PositionConstants.NORTH;
-				}
-			} else { // south or east.
-				Point parentBottomRight = parentBorder.getBottomRight();
-				if ((parentBottomRight.x - childCenter.x) <= (parentBottomRight.y - childCenter.y)) {
-					return PositionConstants.EAST;
-				} else {
-					return PositionConstants.SOUTH;
-				}
-			}
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Locator#relocate(org.eclipse.draw2d.IFigure)
-	 */
-	public void relocate(IFigure borderItem) {
-        Dimension size = getSize(borderItem);
-		Rectangle rectSuggested = new Rectangle(
-			getPreferredLocation(borderItem), size);
-		if (constraint.x == 0 && constraint.y == 0) {
-			// if setting back to the original position, use the preferred
-			// side that client indicated then
-			setPreferredSideOfParent(originalPreferredSide);
-		} else {
-			int closestSide = findClosestSideOfParent(rectSuggested,
-					getParentBorder());
-			setPreferredSideOfParent(closestSide);			
-		}
-		Point ptNewLocation = locateOnBorder(getPreferredLocation(borderItem),
-			getPreferredSideOfParent(), 0, borderItem);
-        borderItem.setBounds(new Rectangle(ptNewLocation, size));
-
-		setCurrentSideOfParent(findClosestSideOfParent(new Rectangle(ptNewLocation, size), getParentBorder()));
-	}
-
-	/**
-	 * getter for the parent figure
-	 * 
-	 * @return <code>IFigure</code>
-	 */
-	public IFigure getParentFigure() {
-		return parentFigure;
-	}
-
-	/**
-	 * @return Returns the borderItemOffset.
-	 */
-	public Dimension getBorderItemOffset() {
-		return borderItemOffset;
-	}
-
-	/**
-	 * @param borderItemOffset
-	 *            The borderItemOffset to set.
-	 */
-	public void setBorderItemOffset(Dimension borderItemOffset) {
-		this.borderItemOffset = borderItemOffset;
-	}
-
-	/**
-	 * Returns the preferred side of the parent figure on which to place this
-	 * border item.
-	 * 
-	 * @return the preferred side of the parent figure on which to place this
-	 *         border item as defined in {@link PositionConstants}
-	 */
-	public int getPreferredSideOfParent() {
-		return preferredSide;
-	}
-
-	/**
-	 * Sets the preferred side of the parent figure on which to place this
-	 * border item.
-	 * 
-	 * @param preferredSide
-	 *            the preferred side of the parent figure on which to place this
-	 *            border item as defined in {@link PositionConstants}
-	 */
-	public void setPreferredSideOfParent(int preferredSide) {
-		this.preferredSide = preferredSide;
-		setCurrentSideOfParent(preferredSide);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator#getSide()
-	 */
-	public int getCurrentSideOfParent() {
-		return currentSide;
-	}
-
-	/**
-	 * Sets the side of the parent figure on which the border item should
-	 * appear.
-	 * 
-	 * @param side
-	 *            the side on which this border item appears as defined in
-	 *            {@link PositionConstants}
-	 */
-	public void setCurrentSideOfParent(int side) {
-		this.currentSide = side;
-	}
-	
-	/**
-	 * Gets the size of the border item figure.
-	 * @param borderItem
-	 * @return the size of the border item figure.
-	 */
-	protected final Dimension getSize(IFigure borderItem) {
-        Dimension size = getConstraint().getSize();
-        if (size.isEmpty()) {
-        	size = borderItem.getPreferredSize();
-        }
-        return size;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java
deleted file mode 100644
index 5b30899..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.IClippingStrategy;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-
-/**
- * a Border item aware implementation for the free form layer
- * This layer will make sure that scroll bars and bounds calculations 
- * respect the border items implementation
- * @author mmostafa
- *
- */
-public class BorderItemsAwareFreeFormLayer
-    extends FreeformLayer {
-    
-    private BorderItemAwareFreeFormHelper _helper = new BorderItemAwareFreeFormHelper(this);
-    
-    private static final IClippingStrategy BORDER_ITEM_CLIPPING_STRATEGY = new IClippingStrategy() {
-		public Rectangle[] getClip(IFigure childFigure) {
-			if (childFigure instanceof IExpandableFigure) {
-				return new Rectangle[] {((IExpandableFigure)childFigure).getExtendedBounds()};
-			}
-			return new Rectangle[] {childFigure.getBounds()};
-		}
-    };
-    
-    Rectangle extendedBounds = null;
-    
-    public BorderItemsAwareFreeFormLayer() {
-    	super();
-    	setClippingStrategy(BORDER_ITEM_CLIPPING_STRATEGY);
-    }
-    
-    /**
-     * The helper class used by the border item aware free form layer
-     * This helper class will calculate the correct extent of the layer, considering the 
-     * border items
-     * @author mmostafa
-     *
-     */
-    public class BorderItemAwareFreeFormHelper implements FreeformListener
-    {
-
-        class ChildTracker implements FigureListener {
-            public void figureMoved(IFigure source) {
-                invalidate();
-            }
-        }
-
-        private FreeformFigure host;
-        private Rectangle freeformExtent;
-        private FigureListener figureListener = new ChildTracker();
-
-        public BorderItemAwareFreeFormHelper(FreeformFigure host) {
-            this.host = host;
-        }
-        
-        public void reset(){
-            freeformExtent = null;
-        }
-
-        public Rectangle getFreeformExtent() {
-            if (freeformExtent != null)
-                return freeformExtent;
-            Rectangle r;
-            List children = host.getChildren();
-            for (int i = 0; i < children.size(); i++) {
-                IFigure child = (IFigure)children.get(i);
-                if (child instanceof FreeformFigure)
-                    r = ((FreeformFigure) child).getFreeformExtent();
-                else if (child instanceof IExpandableFigure)
-                    r = ((IExpandableFigure) child).getExtendedBounds();
-                else
-                    r = child.getBounds();
-                if (freeformExtent == null)
-                    freeformExtent = r.getCopy();
-                else
-                    freeformExtent.union(r);
-            }
-            Insets insets = host.getInsets();
-            if (freeformExtent == null)
-                freeformExtent = new Rectangle(0, 0, insets.getWidth(), insets.getHeight());
-            else {
-                host.translateToParent(freeformExtent);
-                freeformExtent.expand(insets);
-            }
-            return freeformExtent;
-        }
-
-        public void hookChild(IFigure child) {
-            invalidate();
-            if (child instanceof FreeformFigure)
-                ((FreeformFigure)child).addFreeformListener(this);
-            else
-                child.addFigureListener(figureListener);
-        }
-
-        void invalidate() {
-            freeformExtent = null;
-            host.fireExtentChanged();
-            if (host.getParent() != null)
-                host.getParent().revalidate();
-            else
-                host.revalidate();
-        }
-
-        public void notifyFreeformExtentChanged() {
-            //A childs freeform extent has changed, therefore this extent must be recalculated
-            invalidate();
-        }
-
-        public void setFreeformBounds(Rectangle bounds) {
-            host.setBounds(bounds);
-            bounds = bounds.getCopy();
-            host.translateFromParent(bounds);
-            List children = host.getChildren();
-            for (int i = 0; i < children.size(); i++) {
-                IFigure child = (IFigure)children.get(i);
-                if (child instanceof FreeformFigure)
-                    ((FreeformFigure) child).setFreeformBounds(bounds);
-            }
-        }
-
-        public void unhookChild(IFigure child) {
-            invalidate();
-            if (child instanceof FreeformFigure)
-                ((FreeformFigure)child).removeFreeformListener(this);
-            else
-                child.removeFigureListener(figureListener);
-        }
-
-   }
-
-    
-    public Rectangle getBounds() {
-        if (extendedBounds==null){
-            Iterator  figuresIter = getChildren().iterator();
-            Rectangle _bounds = super.getBounds().getCopy();
-            while (figuresIter.hasNext()) {
-                Figure element = (Figure) figuresIter.next();
-                Rectangle rect = null;
-                if (element instanceof IExpandableFigure){
-                    rect = ((IExpandableFigure)element).getExtendedBounds();
-                }else {
-                    rect = element.getBounds();
-                }
-                _bounds.union(rect);
-            }
-            extendedBounds = _bounds; 
-        }
-        return extendedBounds;
-    }
-
-    public void invalidate() {
-        extendedBounds = null;
-        super.invalidate();
-    }
-
-    public void validate() {
-        extendedBounds = null;
-        super.validate();
-    }
-    
-    /**
-     * @see IFigure#add(IFigure, Object, int)
-     */
-    public void add(IFigure child, Object constraint, int index) {
-        super.add(child, constraint, index);
-        _helper.hookChild(child);
-    }
-    
-    /**
-     * @see FreeformFigure#getFreeformExtent()
-     */
-    public Rectangle getFreeformExtent() {
-        return _helper.getFreeformExtent();
-    }
-    
-    /**
-     * @see IFigure#remove(IFigure)
-     */
-    public void remove(IFigure child) {
-        _helper.unhookChild(child);
-        super.remove(child);
-    }
-    
-    /**
-     * @see FreeformFigure#setFreeformBounds(Rectangle)
-     */
-    public void setFreeformBounds(Rectangle bounds) {
-        _helper.setFreeformBounds(bounds);
-    }
-    
-    /**
-     * will notify the layer that a border item had been moved; which will result in 
-     * invalidating the layer (recalculating the bounds and extent).
-     */
-    public void borderFigureMoved(){
-        _helper.invalidate();
-    }
-    
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsUtil.java
deleted file mode 100644
index a33f14b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsUtil.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.runtime.diagram.ui.figures;
-
-import org.eclipse.draw2d.IFigure;
-
-
-/**
- * Utility class used to provide helper methods commonly used by the 
- * Border Item figures 
- * @author mmostafa
- *
- */
-public class BorderItemsUtil {
-    
-    /**
-     * returns the border item waare free form layer for the passed figure
-     * @param borderFigure  the figure to use to get the <code>BorderItemsAwareFreeFormLayer</code>
-     * @return BorderItemsAwareFreeFormLayer or null if there is no one found
-     */
-    static public BorderItemsAwareFreeFormLayer getBorderItemLayer(IFigure borderFigure){
-        IFigure figure = borderFigure.getParent();
-        while (figure!=null && !(figure instanceof BorderItemsAwareFreeFormLayer)){
-            figure = figure.getParent();
-        }
-        if (figure!=null){
-            return (BorderItemsAwareFreeFormLayer)figure;
-        }
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java
deleted file mode 100644
index b2565da..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 259507
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.IClippingStrategy;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutAnimator;
-import org.eclipse.draw2d.TreeSearch;
-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.internal.figures.BorderItemContainerFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * Wrapper figure that contains the main figure and the border item figures.
- * This is required to allow the main figure's layout manager to ignore the
- * border items. The border item container applies a delegating layout manager
- * to allow border item children to lay themselves out.
- * 
- * @author jbruck, cmahoney, mmostafa
- */
-public class BorderedNodeFigure
-	extends NodeFigure implements IExpandableFigure{
-
-	private BorderItemContainerFigure borderItemContainer;
-
-	private IFigure mainFigure;
-	
-	private Rectangle extendedBounds = new Rectangle();
-
-	/**
-	 * Creates a new BorderedNodeFigure figure.
-	 * 
-	 * @param mainFigure
-	 *            the figure to use with this figure
-	 */
-	public BorderedNodeFigure(IFigure mainFigure) {
-		super();
-		setOpaque(false); // set transparent by default
-		setBorder(null);
-		setLayoutManager(null);
-		this.mainFigure = mainFigure;
-
-		add(getMainFigure());
-		add(getBorderItemContainer());
-
-		setBounds(getMainFigure().getBounds().getCopy());
-		getBorderItemContainer().setBounds(new Rectangle(0, 0, 1, 1));
-		setClippingStrategy(new BorderItemClippingStrategy());
-	}
-
-	/**
-	 * Gets the border item container figure to which border item figures can be
-	 * added with a {@link IBorderItemLocator} as the constraint and then later
-	 * removed.
-	 * 
-	 * @return The border item container figure
-	 */
-	public IFigure getBorderItemContainer() {
-		if (borderItemContainer == null) {
-			borderItemContainer = new BorderItemContainerFigure();
-			borderItemContainer
-				.setLayoutManager(new DelegatingLayout());
-			borderItemContainer.addLayoutListener(LayoutAnimator.getDefault());
-			borderItemContainer.setVisible(true);
-		}
-		return borderItemContainer;
-	}
-
-	/**
-	 * Gets the main figure of this bordered figure.
-	 * 
-	 * @return The "main" figure
-	 */
-	public IFigure getMainFigure() {
-		return mainFigure;
-	}
-
-	public Rectangle getClientArea(Rectangle rect) {
-		if (getMainFigure() != null) {
-			return getMainFigure().getClientArea(rect);
-		}
-		return super.getClientArea(rect);
-	}
-
-	/**
-	 * gets the handle bounds of the main figure
-	 * 
-	 * @return the hnalde bounds
-	 */
-	public Rectangle getHandleBounds() {
-		if (getMainFigure() instanceof NodeFigure) {
-			return ((NodeFigure) getMainFigure()).getHandleBounds().getCopy();
-		} else {
-			return getMainFigure().getBounds().getCopy();
-		}
-	}
-	
-	/**
-	 * Give the main figure the entire bounds of the wrapper.
-	 */
-	protected void layout() {
-		if (!this.getBounds().equals(getMainFigure().getBounds())) {
-			getMainFigure().setBounds(this.getBounds().getCopy());
-			getBorderItemContainer().invalidateTree();
-			erase();
-		}
-	}
-
-	/**
-	 * We need to override this for smooth painting of border items.
-	 */
-	public boolean containsPoint(int x, int y) {
-		if (borderItemContainer.containsPoint(x, y)) {
-			return true;
-		}
-		return super.containsPoint(x, y);
-	}
-
-	protected void primTranslate(int dx, int dy) {
-		super.primTranslate(dx, dy);
-		erase();
-	}
-
-	public void erase() {
-		super.erase();
-		if (borderItemContainer != null)
-			borderItemContainer.erase();
-	}
-
-	/**
-	 * Refresh adornments
-	 */
-	public void repaint() {
-		super.repaint();
-		if (borderItemContainer != null)
-			borderItemContainer.repaint();
-	}
-
-	public IFigure findFigureAt(int x, int y, TreeSearch search) {
-		if (search.prune(this))
-			return null;
-		IFigure result = borderItemContainer.findFigureAt(x, y, search);
-		if (result != null) {
-			return result;
-		}
-		return getMainFigure().findFigureAt(x, y, search);
-	}
-
-	public IFigure findMouseEventTargetAt(int x, int y) {
-		IFigure borderItemFigure = borderItemContainer.findMouseEventTargetAt(
-			x, y);
-		if (borderItemFigure != null)
-			return borderItemFigure;
-		return super.findMouseEventTargetAt(x, y);
-	}
-
-    public boolean intersects(Rectangle rect) {
-        if (getExtendedBounds().intersects(rect))
-            return true;
-        return super.intersects(rect);
-    }
-
-	public Dimension getMinimumSize(int wHint, int hHint) {
-		return getMainFigure().getMinimumSize(wHint, hHint);
-	}
-
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		return getMainFigure().getPreferredSize(wHint, hHint);
-	}
-
-	public IFigure getToolTip() {
-		return getMainFigure().getToolTip();
-	}
-
-	public void setToolTip(IFigure f) {
-		getMainFigure().setToolTip(f);
-	}
-
-	public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
-		if (getMainFigure() instanceof NodeFigure)
-			return ((NodeFigure) getMainFigure())
-				.getSourceConnectionAnchorAt(p);
-		return super.getSourceConnectionAnchorAt(p);
-	}
-
-	public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
-		if (getMainFigure() instanceof NodeFigure)
-			return ((NodeFigure) getMainFigure())
-				.getTargetConnectionAnchorAt(p);
-		return super.getTargetConnectionAnchorAt(p);
-	}
-
-	public ConnectionAnchor getConnectionAnchor(String terminal) {
-		if (getMainFigure() instanceof NodeFigure)
-			return ((NodeFigure) getMainFigure()).getConnectionAnchor(terminal);
-		return super.getConnectionAnchor(terminal);
-	}
-
-	public String getConnectionAnchorTerminal(ConnectionAnchor c) {
-		if (getMainFigure() instanceof NodeFigure)
-			return ((NodeFigure) getMainFigure())
-				.getConnectionAnchorTerminal(c);
-		return super.getConnectionAnchorTerminal(c);
-	}
-
-	/**
-	 * This method provides a generic way to get a target figure's parent's main
-	 * figure where if the target figure is a border item figure, then its
-	 * parent is considered the figure on which it borders.It is not possible to
-	 * get a target figure's parent using <code>IFigure#getParent()</code> if
-	 * the target figure is a border item figure, since this would return the
-	 * border item container figure.
-	 * 
-	 * @param target
-	 *            the target figure, may or may not be acting as a border item
-	 *            figure
-	 * @return the parent figure or if the target figure was on a border item
-	 *         container figure, then the main figure that it borders.
-	 */
-	public static IFigure getParentFigure(IFigure target) {
-		IFigure parent = target.getParent();
-		if (parent instanceof BorderItemContainerFigure) {
-			return ((BorderedNodeFigure) parent.getParent()).getMainFigure();
-		}
-		return parent;
-	}
-    
-    public Rectangle getExtendedBounds() {
-        if (extendedBounds == null) {
-	        Rectangle rect = getBounds().getCopy();
-	         if (borderItemContainer!=null){
-	            rect = rect.union(borderItemContainer.getExtendedBounds());
-	        }
-	         extendedBounds = rect;
-        }
-        return extendedBounds;
-    }
-    
-    @Override
-    public void invalidate() {
-        extendedBounds = null;
-    	super.invalidate();
-    }
-    
-    @Override
-    public void validate() {
-        extendedBounds = null;
-    	super.validate();
-    }
-    
-    @Override
-    protected void fireFigureMoved() {
-    	super.fireFigureMoved();
-        extendedBounds = null;
-    }
-
-	private class BorderItemClippingStrategy implements IClippingStrategy {
-		
-		public Rectangle[] getClip(IFigure childFigure) {
-			if (childFigure == borderItemContainer) {
-				return new Rectangle[] {borderItemContainer.getExtendedBounds()};
-			}
-			return new Rectangle[] {childFigure.getBounds()};
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/CanonicalShapeCompartmentLayout.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/CanonicalShapeCompartmentLayout.java
deleted file mode 100644
index 8a14461..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/CanonicalShapeCompartmentLayout.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.diagram.ui.figures;
-
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;
-
-/**
- * Layouts the shape compartment's children.  This class provides utility methods
- * to layout figure's whose position are undefined.
- * 
- * @see org.eclipse.gmf.runtime.diagram.ui.figures.ICanonicalShapeCompartmentLayout
- * 
- * @author mhanner
- */
-public class CanonicalShapeCompartmentLayout
-	extends FreeFormLayoutEx
-	implements ICanonicalShapeCompartmentLayout {
-
-
-	/** the [figure,editpart] map. */
-	private Map _visualPartMap;
-
-	/** layout helper instance */
-	private LayoutHelper _layoutHelper = null;
-
-	/**
-	 * Creates an instance
-	 * @param map the [figure,editpart] map.
-	 * @see org.eclipse.gef.EditPartViewer#getVisualPartMap()
-	 */
-	public CanonicalShapeCompartmentLayout(Map map) {
-		setVisualPartMap(map);
-	}
-
-	/**
-	 * Implements the algorithm to layout the components of the given container figure.
-	 * Each component is laid out using it's own layout constraint specifying it's size
-	 * and position. Calls {@link #layoutUndefinedChildren(IFigure)} to layout 
-	 * all child figure whose position are <i>undefined</i>
-	 * @see org.eclipse.gmf.runtime.diagram.ui.figures.ICanonicalShapeCompartmentLayout
-	 * @param parent containing figure.
-	 */
-	public void layout(IFigure parent) {
-		layoutUndefinedChildren(parent);
-		super.layout(parent);
-	}
-
-	/**
-	 * Layout the supplied parent's children whose position is equal to {@link #UNDEFINED}.
-	 * Calls <code>LayoutHelper.layoutUndefinedChildren(ICanonicalShapeCompartmentLayout, IFigure, Map)</code>;
-	 * @param parent the containing figure.
-	 */
-	public void layoutUndefinedChildren(IFigure parent) {
-		GetLayoutHelper().layoutUndefinedChildren(
-			this,
-			parent,
-			getVisualPartMap());
-	}
-
-	/** Return this manager's layout helper. */
-	private LayoutHelper GetLayoutHelper() {
-		if (_layoutHelper == null) {
-			_layoutHelper = new LayoutHelper();
-		}
-		return _layoutHelper;
-	}
-
-	/**
-	 * Set the [figure, editpart] map.
-	 * @see org.eclipse.gef.EditPartViewer#getVisualPartMap() 
-	 */
-	public void setVisualPartMap(Map map) {
-		_visualPartMap = map;
-	}
-
-	/** 
-	 * Return the [figure, editpart] map.
-	 * @see org.eclipse.gef.EditPartViewer#getVisualPartMap()
-	 */
-	public Map getVisualPartMap() {
-		return _visualPartMap;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/DiagramColorConstants.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/DiagramColorConstants.java
deleted file mode 100644
index 9941a65..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/DiagramColorConstants.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.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * Set of color constants that are commonly used.
- * <p>
- * This interface defines constants only, it is <EM>not</EM> intended to be
- * implemented by clients.
- * </p>
- * 
- * @author sshaw
- */
-public interface DiagramColorConstants
-	extends ColorConstants{
-    
-	/**
-	 * Constant <code>Color</code> representing green.
-	 */
-	public final static Color 
-		diagramGreen = new Color(null, 40,100,70);
-    
-	/**
-	 * Constant <code>Color</code> representing light red.
-	 */
-	public final static Color
-		diagramLightRed = new Color(null, 255, 203, 203);
-    
-	/**
-	 * Constant <code>Color</code> representing red.
-	 */
-	public final static Color
-		diagramRed = new Color(null, 255, 128, 128);
-    
-	/**
-	 * Constant <code>Color</code> representing light blue.
-	 */
-    public final static Color
-		diagramLightBlue = new Color(null, 202, 203, 255);
-
-	/**
-	 * Constant <code>Color</code> representing blue.
-	 */
-    public final static Color
-		diagramBlue = new Color(null, 128, 128, 255);
-	
-    /**
-	 * Constant <code>Color</code> representing light gray.
-	 */
-	public final static Color
-		diagramLightGray = new Color(null, 250, 250, 254);
-	
-	/**
-	 * Constant <code>Color</code> representing gray.
-	 */
-	public final static Color
-		diagramGray = new Color(null, 176, 176, 176);
-	
-	/**
-	 * Constant <code>Color</code> representing dark gray.
-	 */
-	public final static Color
-		diagramDarkGray = new Color(null, 131, 122, 133);
-	
-	/**
-	 * Constant <code>Color</code> representing light yellow.
-	 */
-	public final static Color
-		diagramLightYellow = new Color(null, 255, 255, 203);
-	
-	/**
-	 * Constant <code>Color</code> representing dark yellow.
-	 */ 
-	public final static Color
-		diagramDarkYellow = new Color(null, 255, 204, 102);	
-	
-	/**
-	 * Constant <code>Color</code> representing a light gold yellow.
-	 */
-	public final static Color
-		diagramLightGoldYellow = new Color(null, 255, 255, 204);
-
-	/**
-	 * Constant <code>Color</code> representing burgundy red.
-	 */
-	public final static Color
-		diagramBurgundyRed = new Color(null, 153, 0, 51);
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IBorderItemLocator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IBorderItemLocator.java
deleted file mode 100644
index 822a916..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IBorderItemLocator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-
-
-/**
- * @author cmahoney
- */
-public interface IBorderItemLocator
-	extends org.eclipse.gmf.runtime.draw2d.ui.figures.IBorderItemLocator {
-    
-    // The IBorderItemLocator interface has been moved to the draw2d plugin, but
-    // keep this here to avoid breaking API.
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ICanonicalShapeCompartmentLayout.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ICanonicalShapeCompartmentLayout.java
deleted file mode 100644
index b7e7592..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ICanonicalShapeCompartmentLayout.java
+++ /dev/null
@@ -1,52 +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.figures; 
-
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Layout figures who's position is undefined.  This interface guarantees
- * implementations access to the [figure,editpart] registry map.
- * 
- * @see org.eclipse.gmf.runtime.diagram.ui.figures.CanonicalShapeCompartmentLayout
- * @author mhanner
- */
-public interface ICanonicalShapeCompartmentLayout extends LayoutManager
-{
-	/** Constant that represetns an <i>undefined</i> element. */
-	public static final Rectangle UNDEFINED = LayoutHelper.UNDEFINED;
-	
-	/**
-	 * Set the [figure, editpart] map.
-	 * @param map to set
-	 * @see org.eclipse.gef.EditPartViewer#getVisualPartMap() 
-	 */
-	void setVisualPartMap( Map map );
-	
-	/** 
-	 * Return the [figure, editpart] map.
-	 * @see org.eclipse.gef.EditPartViewer#getVisualPartMap()
-	 * @return <code>Map</code> 
-	 */
-	Map getVisualPartMap();
-
-	/**
-	 * Layout the supplied parent's children whose position is equal to {@link #UNDEFINED}.
-	 * @param parent the containing figure.
-	 */
-	void layoutUndefinedChildren( IFigure parent );
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java
deleted file mode 100644
index 81cd305..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * An Expandable Figure.
- * 
- * @since 1.4
- * @author Anthony Hunter
- */
-public interface IExpandableFigure {
-
-	/**
-	 * Returns the smallest rectangle completely enclosing the IFigure and its
-	 * border children figures. Implementation may return the Rectangle by
-	 * reference. For this reason, callers of this method must not modify the
-	 * returned Rectangle. The Rectangle's values may change in the future.
-	 * 
-	 * @return This IExpandableFigure bounds that include border items.
-	 */
-	Rectangle getExtendedBounds();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LabelLocator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LabelLocator.java
deleted file mode 100644
index 8966971..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LabelLocator.java
+++ /dev/null
@@ -1,171 +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.figures;
-
-import org.eclipse.draw2d.AbstractLocator;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionLocator;
-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.diagram.ui.internal.figures.LabelHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.LabelViewConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-/**
- * Label locator that supports locating labels whose parent is either a Node or
- * and Edge.
- * 
- * @author jcorchis
- */
-public class LabelLocator extends AbstractLocator {
-
-
-	/**
-	 * the parent figure of this locator
-	 */
-	protected IFigure parent;
-	private int alignment;
-	private Point offSet;
-	private Dimension extent;
-
-	/**
-	 * Constructor to create a an instance of <code>LabelLocator</code>
-	 * which locates an IFigure offset relative to a calculated reference point.
-	 * @param parent the parent figure
-	 * @param offSet the relative location of the label
-	 * @param alignment the alignment hint in the case the parent is a <code>Connection</code>
-	 */
-	public LabelLocator(IFigure parent, Point offSet, int alignment) {
-		this.parent = parent;
-		this.offSet = offSet;
-		this.alignment = alignment;
-
-	}
-	
-	/**
-	 * Constructor for figure who are located and sized.
-	 * @param parent
-	 * @param bounds
-	 * @param alignment
-	 */
-	public LabelLocator(IFigure parent, Rectangle bounds, int alignment) {
-		this(parent, bounds.getLocation(), alignment);
-		this.extent = bounds.getSize();
-	}
-	
-	/**
-	 * getter for the offset point
-	 * @return point
-	 */
-	public Point getOffset() {
-		return this.offSet;
-	}
-	
-	/**
-	 * setter for the offset point
-	 * @param offset
-	 */
-	public void setOffset(Point offset) {
-		this.offSet = offset;
-	}
-
-	/**
-	 * Positions the lable relative to the reference point with the
-	 * given offsets.
-	 */
-	public void relocate(IFigure target) {
-	    
-	    // The calculation of the location depends on the size of the shape so
-        // the size must be set first.
-
-       if (extent != null) {
-            LabelLocator currentConstraint = (LabelLocator)target.getParent().getLayoutManager().getConstraint(target);
-            Dimension currentExtent = currentConstraint.getSize();
-            Dimension size = new Dimension(currentExtent);
-            if (currentExtent.width == -1) size.width = target.getPreferredSize().width;
-            if (currentExtent.height == -1) size.height = target.getPreferredSize().height;
-            target.setSize(size);
-        } else {
-            target.setSize(new Dimension(target.getPreferredSize().width, target.getPreferredSize().height));           
-        }
-	       
-		Point location = LabelHelper.relativeCoordinateFromOffset(target, getReferencePoint(), offSet);
-		target.setLocation(location);
-	}
-	
-	/**
-	 * Returns the reference point for the locator.
-	 * @return the reference point
-	 */
-	protected Point getReferencePoint() {
-		if (parent instanceof Connection) {
-			PointList ptList = ((Connection) parent).getPoints();	
-			return PointListUtilities.calculatePointRelativeToLine(ptList, 0, getLocation(), true);						
-		} else {
-			return parent.getBounds().getLocation();			
-		}
-	}
-
-	/**
-	 * Returns the 
-	 */
-	private int getLocation() {
-		switch (getAlignment()) {
-			case ConnectionLocator.SOURCE:
-				return LabelViewConstants.TARGET_LOCATION;
-			case ConnectionLocator.TARGET:
-				return LabelViewConstants.SOURCE_LOCATION;
-			case ConnectionLocator.MIDDLE:
-				return LabelViewConstants.MIDDLE_LOCATION;
-			default:
-				return LabelViewConstants.MIDDLE_LOCATION;
-		}
-	}
-
-	/**
-	 * Returns the alignment of ConnectionLocator. 
-	 * @return The alignment
-	 * 
-	 */
-	public int getAlignment() {
-		return alignment;
-	}
-	
-	/**
-	 * Returns the current extent for this locator
-	 * @return the extent
-	 */
-	public Dimension getSize() {
-		return extent.getCopy();
-	}
-	
-	/**
-	 * Returns the <code>PointList</code> describing the label's parent.
-	 * 
-	 * @return pointList
-	 */
-	protected PointList getPointList() {
-		if (parent instanceof Connection) {
-			return ((Connection) parent).getPoints();
-		} else {
-			PointList ptList = new PointList();
-			ptList.addPoint(parent.getBounds().getLocation());
-			return ptList;
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LayoutHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LayoutHelper.java
deleted file mode 100644
index 9e9d3e7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/LayoutHelper.java
+++ /dev/null
@@ -1,154 +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.figures;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * A utility class used to find the location to place an <i>undefined</i>
- * child figure.
- * @author mhanner
- */
-public class LayoutHelper {
-	
-	/**
-	 * constructor 
-	 * 
-	 */
-	public LayoutHelper() {
-	    //
-	}
-
-	/** Constant that represetns an <i>undefined</i> element. */
-	public static final Rectangle UNDEFINED = new Rectangle(-1,-1,-1,-1);
-	
-	/**
-	 * Layout the supplied parent's children whose position is equal to {@link #UNDEFINED}.
-	 * @see #getReferencePosition(IFigure)
-	 * @param mgr the calling layout manager
-	 * @param parent the containing figure.
-	 * @param registry the [figure,editpart] registry
-	 */
-	public void layoutUndefinedChildren(
-		ICanonicalShapeCompartmentLayout mgr,
-		IFigure parent,
-		Map registry) {
-		List children = getUnpositionedChildren(parent);
-		if (!children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				IFigure child = (IFigure) children.get(i);
-				Point loc = getReferencePosition(parent);
-				loc = validatePosition(parent, new Rectangle(loc, child.getSize()));
-				child.setLocation( loc );
-				parent.getLayoutManager().setConstraint( child, child.getBounds());
-			}
-		}
-	}
-
-	/**
-	 * Return the supplied figures children whose location is {@link #UNDEFINED}.
-	 * @param parent the containing figure.
-	 * @return list of figures
-	 */
-	public final List getUnpositionedChildren(IFigure parent) {
-		List children = parent.getChildren();
-		List retval = new ArrayList();
-		for (int i = 0; i < children.size(); i++) {
-			IFigure child = (IFigure) children.get(i);
-//			System.out.println( "getConstraints(" + child + ") " + parent.getLayoutManager().getConstraint(child));//$NON-NLS-2$//$NON-NLS-1$
-			if (UNDEFINED
-				.getLocation()
-				.equals(child.getBounds().getLocation())) {
-				retval.add(child);
-			}
-		}
-		return retval;
-	}
-
-	/**
-	 * Return an initial point to position <i>UNDEFINED</i> children.
-	 * @see #validatePosition(IFigure, Rectangle)
-	 * @param parent the containing figure (typically <tt>layout()</tt>'s input parameter)
-	 * @return <code>parent.getBounds().getCenter().getCopy();</code>
-	 */
-	public Point getReferencePosition(IFigure parent) {
-		return parent.getBounds().getCenter().getCopy();
-	}
-
-	/**
-	 * Returns a location inside the supplied <tt>parent</tt> that is currently
-	 * unoccupied by another figure.
-	 * @param parent containing figure.
-	 * @param bounds are being searched.
-	 * @return an unoccupied position.
-	 */
-	public Point validatePosition( IFigure parent, Rectangle bounds ) {
-		Rectangle theBounds = bounds.getCopy();
-		IFigure clobber = findFigureIn(parent, bounds);
-		if ( clobber != null ) {
-			theBounds.setLocation( updateClobberedPosition(clobber,null) );
-			return validatePosition(parent, theBounds);
-		}
-		return theBounds.getLocation();
-	}
-	
-	/**
-	 * Return a child figure that is already occupying the a position within
-	 * the supplied <tt>bounds</tt> 
-	 * figure.
-	 * @param parent The parent figure of the newly added child.
-	 * @param bounds the area being tested. 
-	 * @return a child figure already occupying the supplied <tt>bounds</tt>
-	 * or <tt>null</tt> if the bounds are unoccuppied.
-	 */
-	public IFigure findFigureIn(IFigure parent, Rectangle bounds) {
-		ListIterator listIterator = parent.getChildren().listIterator();
-		final boolean useContainCheck = UNDEFINED.getSize().equals(bounds.getSize());
-		while (listIterator.hasNext()) {
-			IFigure child = (IFigure)listIterator.next();
-			Rectangle cBounds = child.getBounds();
-			if (UNDEFINED.getLocation().equals(cBounds.getLocation())) {
-				continue; //ignore this figure
-			}
-			if (useContainCheck) {
-				if (cBounds.contains(bounds.getLocation())) {
-					return child;
-				}
-			}
-			else if (cBounds.intersects(bounds)) {
-				return child;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a position <b>not</b> contained with the supplied figures bounds.
-	 * @param clobbered the figure currently occuping the <i>reference position<\i>
-	 * @param newlyAddedChild the child figure being added. <B>NOTE, MAY BE NULL</B>
-	 * @return <code>clobbered.getBounds().getRight().getCopy().translate(30,0);</code> 
-	 * @see #getReferencePosition(IFigure)
-	 * @see #validatePosition(IFigure, Rectangle)
-	 */
-	public Point updateClobberedPosition(
-		IFigure clobbered, IFigure newlyAddedChild) {
-		return clobbered.getBounds().getRight().getCopy().translate(MapModeUtil.getMapMode(clobbered).DPtoLP(30), 0);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/NoteFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/NoteFigure.java
deleted file mode 100644
index 1134bba..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/NoteFigure.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-
-import org.eclipse.draw2d.AbstractBorder;
-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.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.swt.graphics.Path;
-
-/*
- * @canBeSeenBy %partners
- */
-/**
- * a figure represents the Note view, this figure had a mode called
- * DiagramLinkMode, if this mode is turned ON then the text alignment
- * will be center instead of left and the border will be rectangle
- * instead of the note border shape, also it will not paint the border
- * @see #setDiagramLinkMode(boolean)
- * @author sshaw, mmostafa
- *
- */
-public class NoteFigure extends DefaultSizeNodeFigure implements IPolygonAnchorableFigure {
-
-	private boolean diagramLinkMode = false;
-
-
-	private boolean withDanglingCorner = true;
-
-	/**
-	 * the clip height constant in device coordinates
-	 */
-	static public final int CLIP_HEIGHT_DP = 12;
-	
-	/**
-	 * the margin constant in device coordinates
-	 */
-	static public final int MARGIN_DP = 5;
-	
-	/**
-	 * the clip margin constant in device coordinates
-	 */
-	static public final int CLIP_MARGIN_DP = 14;
-	
-	/**
-	 * Border for notes. Defines paint method and insets that depend on line width and
-	 * given margin.
-	 * @since 1.2
-	 */
-	public class NoteFigureBorder extends AbstractBorder {
-		private Insets margin;
-		NoteFigureBorder(Insets insets) {
-			margin = insets;
-		}	
-		
-		/**
-		 * Returns margin for this border
-		 * @return margin as Insets
-		 */
-		public Insets getMargin() {
-			return margin;
-		}
-
-		/**
-		 * Sets the margin for this border 
-		 * @param margin as Insets
-		 */
-		public void setMargin(Insets margin) {
-			this.margin = margin;
-		}
-
-
-		/*
-		 * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
-		 */
-		public Insets getInsets(IFigure figure) {
-			NoteFigure noteFigure = (NoteFigure)figure;
-			int width = noteFigure.getLineWidth();
-			return new Insets(width + margin.top, width + margin.left, 
-					width + margin.bottom, width + margin.right);
-		}
-
-
-		/* 
-		 * @see org.eclipse.draw2d.Border#paint(org.eclipse.draw2d.IFigure, org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)
-		 */
-		public void paint(IFigure figure, Graphics g, Insets insets) {
-			NoteFigure noteFigure = (NoteFigure)figure;
-			Rectangle r = noteFigure.getBounds().getCopy();
-			r.shrink(noteFigure.getLineWidth() / 2, noteFigure.getLineWidth() / 2);
-			
-			PointList p = noteFigure.getPointList(r);
-			p.addPoint(r.x, r.y - noteFigure.getLineWidth() / 2);
-			g.setLineWidth(noteFigure.getLineWidth());  
-			g.setLineStyle(noteFigure.getLineStyle());  
-			g.drawPolyline(p);
-	
-			if (withDanglingCorner) {
-				PointList corner = new PointList();
-				corner.addPoint(r.x + r.width - getClipWidth(), r.y);
-				corner.addPoint(r.x + r.width - getClipWidth(), r.y + getClipHeight());
-				corner.addPoint(r.x + r.width, r.y + getClipHeight());
-				g.drawPolyline(corner);			
-			}			
-		}
-	}
-		
-	/**
-	 * Constructor
-	 * 
-	 * @param width <code>int</code> value that is the default width in logical units
-	 * @param height <code>int</code> value that is the default height in logical units
-	 * @param insets <code>Insets</code> that is the empty margin inside the note figure in logical units
-	 */
-	public NoteFigure(int width, int height, Insets insets) {
-		super(width, height);
-		// NoteFigureBorder defines insets which ensure that content within the note will be indented 
-		// appropriately as the line width changes
-		setBorder(new NoteFigureBorder(insets)); 
-
-		ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout() {
-			// Override to ensure that children's size is not taken into account
-			// when calculating minimum size (otherwise, if WrappingLabel is a
-			// child, the smallest rectangle we could get would be big enough to
-			// fit the label of minimum size = three dots and icon if there is
-			// one). 
-			public Dimension calculateMinimumSize(IFigure container, int wHint,
-					int hHint) {
-				Insets aNinsets = container.getInsets();
-				Dimension aMminSize = new Dimension(0, 0);
-				return transposer
-					.t(aMminSize)
-					.expand(aNinsets.getWidth(), aNinsets.getHeight())
-					.union(getBorderPreferredSize(container));
-			}			
-		};
-		layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT);
-		layout.setSpacing(insets.top);
-		setLayoutManager(layout);
-	}
-	
-	private int getClipHeight() {
-		return MapModeUtil.getMapMode(this).DPtoLP(12);
-	}
-	
-	private int getClipWidth() {
-		return getClipHeight() + MapModeUtil.getMapMode(this).DPtoLP(1);
-	}
-	
-	/**
-	 * Method getPointList.
-	 * @param r
-	 * @return PointList
-	 */
-	protected PointList getPointList(Rectangle r) {
-
-		PointList p = new PointList();
-		
-		p.addPoint(r.x, r.y);
-		if (!isDiagramLinkMode()){
-			p.addPoint(r.x + r.width - getClipWidth(), r.y);
-			p.addPoint(r.x + r.width - 1, r.y + getClipHeight());
-		}else{
-			p.addPoint(r.x + r.width - 1, r.y) ;
-		}
-		p.addPoint(r.x + r.width - 1, r.y + r.height - 1);
-		p.addPoint(r.x, r.y + r.height - 1);
-		p.addPoint(r.x, r.y);
-
-		return p;
-	}
-
-	/**
-	 * Paints border unless this Note is in DiagramLinkMode  
-	 * 
-	 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintBorder(Graphics g) {
-		if (!isDiagramLinkMode()) {
-			getBorder().paint(this, g, NO_INSETS);
-		}		 
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics g) {
-		super.paintFigure(g);
-		applyTransparency(g);
-		if (!isUsingGradient()) {
-			Path path = getPath();
-			try {
-				g.fillPath(path);
-			} finally {
-				path.dispose();
-			}
-		} else {
-			fillGradient(g);
-		}			
-	}
-
-	
-	/**
-	 * sets or resets the diagram link mode, in diagram link mode the note
-	 * will not paint a border or background for itself
-	 * @param diagramLinkMode , the new diagram link mode state
-	 * @return the old diagram Link mode state
-	 */
-	public boolean setDiagramLinkMode(boolean diagramLinkMode) {
-		boolean bOldDiagramLinkMode = this.diagramLinkMode;
-		ConstrainedToolbarLayout layout = (ConstrainedToolbarLayout)getLayoutManager();
-		if (diagramLinkMode){
-			layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_CENTER);
-		}else {
-			layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT);
-		}
-		this.diagramLinkMode = diagramLinkMode;
-		return bOldDiagramLinkMode;
-	}
-	
-	/**
-	 * @return true is in diagram Link mode, otherwise false
-	 */
-	public boolean isDiagramLinkMode() {
-		return diagramLinkMode;
-	}
-
-   /*
-    * (non-Javadoc)
-    * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-    */ 
-    public PointList getPolygonPoints() {
-        return getPointList(getBounds());
-    }
-    
-    /**
-     * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getPath()
-     *
-	 * @since 1.2
-	 */
-    protected Path getPath() {
-    	Path path = new Path(null);
-    	PointList pl = getPointList(
-    			getBounds().getCopy().shrink(getLineWidth()/2, getLineWidth()/2));
-    	path.moveTo(pl.getPoint(0).x, pl.getPoint(0).y);
-    	for (int i = 0; i < pl.size(); i++) {
-    		path.lineTo(pl.getPoint(i).x, pl.getPoint(i).y);
-    	}
-    	path.close();
-    	return path;
-    }    
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java
deleted file mode 100644
index fcdedce..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.figures;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.OneLineBorder;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimatableScrollPane;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OverlayScrollPaneLayout;
-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.Font;
-
-
-/**
- * A figure to represent the resizable compartment There are two constructors
- * available The one that takes a String:title consists of two childen: title
- * label + animatable scroll pane. The other one just consists of an animatable
- * scroll pane.
- *
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- * 
- * @author melaasar
- * @author choang
- */
-/**
- * @author Steve
- *
- */
-public class ResizableCompartmentFigure extends NodeFigure {
-
-	private final static int FLAG__FIT_CONTENTS = MAX_FLAG << 1;
-	
-	/**
-	 * @since 1.3
-	 */
-	protected final static int FRAME_MAX_FLAG = FLAG__FIT_CONTENTS;
-
-	private boolean _horizontal = false;
-
-	/**
-	 * The pane for all text compartment including the title
-	 */
-	private Figure textPane = null;
-	/**
-	 * The compartment title label
-	 */
-	private WrappingLabel titleLabel;
-	
-	/**
-	 * the minimum size the client area can occupy in logical coordinates
-	 */
-	private int minClientSize = 0;
-	
-	/**
-	 * The compartment scroll pane
-	 */
-	protected ScrollPane scrollPane;
-	/**
-	 * The selected state
-	 */
-	private boolean selected;
-
-	/**
-	 * Indicates if the scroll pane has been initialized.
-	 */
-	private boolean isScrollPaneInitialized = false;
-
-	/**
-	 * Specifies the default minimum client size of this figure in device coordinates.
-	 * Clients should use their editors <code>IMapMode</code> to convert this to logical
-	 * coordinates.
-	 */
-	public static final int MIN_CLIENT_DP = 11;
-    
-    /**
-     * A constructor for a top level resizable compartment figure
-     * 
-     * @param compartmentTitle <code>String</code> that is the title that is
-     * displayed at the top of the compartment figure (optional).
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     */
-    public ResizableCompartmentFigure(String compartmentTitle, IMapMode mm) {
-        this.minClientSize = mm.DPtoLP(MIN_CLIENT_DP);
-        setTextPane(new Figure() {
-            public Dimension getMaximumSize() {
-                return getPreferredSize();
-            }
-        });
-        getTextPane().setLayoutManager(new ConstrainedToolbarLayout());
-        add(getTextPane());
-        add(scrollPane = createScrollPane(mm));
-        setLayoutManager(new ConstrainedToolbarLayout());
-        setTitle(compartmentTitle);
-        setToolTip(compartmentTitle);
-        setBorder(new OneLineBorder(mm.DPtoLP(1), PositionConstants.TOP));
-    }
-    
-	/**
-	 * Creates the animatable scroll pane
-	 * 
-	 * @return <code>AnimatableScrollPane</code>
-     * @deprecated use {@link ResizableCompartmentFigure#createScrollPane(IMapMode)} instead
-	 */
-	protected AnimatableScrollPane createScrollpane() {
-		return createScrollpane(MapModeUtil.getMapMode(this));
-	}
-    
-    /**
-     * Creates the animatable scroll pane
-     * 
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     * @return <code>AnimatableScrollPane</code>
-     * @deprecated use {@link ResizableCompartmentFigure#createScrollPane(IMapMode)} instead
-     */
-    protected AnimatableScrollPane createScrollpane(IMapMode mm) {
-        scrollPane = new AnimatableScrollPane();
-        scrollPane.getViewport().setContentsTracksWidth(true);
-        scrollPane.getViewport().setContentsTracksHeight(false);
-        scrollPane.setLayoutManager(new OverlayScrollPaneLayout());
-        scrollPane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC);
-        scrollPane.setHorizontalScrollBarVisibility(ScrollPane.NEVER);
-        scrollPane.setContents(new Figure());
-        int half_minClient = getMinClientSize()/2;
-        scrollPane.getContents().setBorder(
-                new MarginBorder(1, half_minClient, 1, half_minClient));            
-        return (AnimatableScrollPane)scrollPane;
-    }    
-    
-    /**
-     * Creates the animatable scroll pane
-     * 
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     * @return <code>ScrollPane</code>
-     */
-    protected ScrollPane createScrollPane(IMapMode mm) {
-        return createScrollpane(mm);
-    }
-	
-	/**
-	 * @return that is the minimum size the client area can occupy in 
-	 * logical coordinates.
-	 */
-	final protected int getMinClientSize() {
-		return minClientSize;
-	}
-	
-	/**
-	 * Sets the compartment title visibility
-	 * 
-	 * @param visibility
-	 */
-	public void setTitleVisibility(boolean visibility) {
-		getTextPane().setVisible(visibility);
-	}
-	/**
-	 * Expands the compartment figure
-	 */
-	public void expand() {
-        scrollPane.getViewport().setVisible(true);
-        scrollPane.setHorizontalScrollBarVisibility(ScrollPane.AUTOMATIC);
-        scrollPane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC);
-        if (scrollPane instanceof AnimatableScrollPane) {
-            ((AnimatableScrollPane)scrollPane).expand();
-        }
-	}
-	/**
-	 * Collapses the compartment figure
-	 */
-	public void collapse() {
-		scrollPane.setVerticalScrollBarVisibility(ScrollPane.NEVER);
-		scrollPane.setHorizontalScrollBarVisibility(ScrollPane.NEVER);
-        if (scrollPane instanceof AnimatableScrollPane) {
-            ((AnimatableScrollPane)scrollPane).collapse();
-        }
-        scrollPane.getViewport().setVisible(false);
-	}
-	/**
-	 * Expands the compartment figure
-	 */
-	public void setExpanded() {
-        scrollPane.getViewport().setVisible(true);
-        if (scrollPane instanceof AnimatableScrollPane) {
-            ((AnimatableScrollPane)scrollPane).setExpanded(true);
-        }
-        scrollPane.setHorizontalScrollBarVisibility(ScrollPane.AUTOMATIC);
-		scrollPane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC);		
-	}
-	/**
-	 * Collapses the compartment figure
-	 */
-	public void setCollapsed() {
-		scrollPane.setVerticalScrollBarVisibility(ScrollPane.NEVER);
-		scrollPane.setHorizontalScrollBarVisibility(ScrollPane.NEVER);
-        if (scrollPane instanceof AnimatableScrollPane) {
-            ((AnimatableScrollPane)scrollPane).setExpanded(false);
-        }
-        scrollPane.getViewport().setVisible(false);
-	}
-	
-	/**
-	 * @return The contents pane of this compartment figure
-	 */
-	public IFigure getContentPane() {
-		return scrollPane.getContents();
-	}
-
-	
-	public void setFont(Font f) {
-		textPane.setFont(f);
-	}
-	/**
-	 * Sets the font color of the compartment title label
-	 * 
-	 * @param c
-	 *            The new color
-	 */
-	public void setFontColor(Color c) {
-		textPane.setForegroundColor(c);
-	}
-	
-	/**
-	 * Set the compartment title to the supplied text.
-	 * @param title this figure title
-	 */
-	public void setTitle(String title) {
-		if (title == null) {
-			if (titleLabel != null)
-				getTextPane().remove(titleLabel);
-		} else if (titleLabel == null) {
-			getTextPane().add(titleLabel = new WrappingLabel(title));
-		} else
-			titleLabel.setText(title);
-	}
-	
-	/**
-	 * Set the tooltip to the supplied text.
-	 * @param tooltip this figure tooltip
-	 */
-	public void setToolTip(String tooltip) {
-		if (tooltip == null)
-			setToolTip((IFigure) null);
-		else if (getToolTip() instanceof Label)
-			((Label) getToolTip()).setText(tooltip);
-		else
-			setToolTip(new Label(tooltip));
-	}
-	
-	/**
-	 * scrollpane accessor
-	 * 
-	 * @return the scrollpane figure.
-	 */
-	public final ScrollPane getScrollPane() {
-		return scrollPane;
-	}
-	
-	/**
-	 * Accessor for the expanded property
-	 * 
-	 * @return boolean expanded
-	 */
-	public final boolean isExpanded() {
-        if (scrollPane instanceof AnimatableScrollPane) {
-            return ((AnimatableScrollPane)scrollPane).isExpanded();
-        }
-        
-		return true;
-	}
-	
-	/**
-	 * Return this figure's compartment title.
-	 * @return <code>String</code>
-	 */
-	public final String getCompartmentTitle() {
-		return titleLabel == null ? null : titleLabel.getText();
-	}
-	
-	/**
-	 * Gets the adjacent visible sibling before (or after) the figure
-	 * @param before flag to identify the before or after, <code>true</code>
-	 * means before, <code>false</code> means after
-	 * @return <code>IFigure</code>
-	 */
-	public final IFigure getAdjacentSibling(boolean before) {
-		List siblings = getParent().getChildren();
-		int index = siblings.indexOf(this);
-		if (before) {
-			for (int i = index - 1; i >= 0; i--) {
-				IFigure sibling = (IFigure) siblings.get(i);
-				if (sibling instanceof ResizableCompartmentFigure
-						&& sibling.isVisible())
-					return sibling;
-			}
-		} else {
-			for (int i = index + 1; i < siblings.size(); i++) {
-				IFigure sibling = (IFigure) siblings.get(i);
-				if (sibling instanceof ResizableCompartmentFigure
-						&& sibling.isVisible())
-					return sibling;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Sets the selection state of this label
-	 * 
-	 * @param b
-	 *            true will cause the label to appear selected
-	 */
-	public void setSelected(boolean b) {
-		if (this.selected == b)
-			return;
-		selected = b;
-		repaint();
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintFigure(Graphics graphics) {
-		super.paintFigure(graphics);
-		if (selected) {
-			graphics.setLineWidth(2);
-            int shrink = MapModeUtil.getMapMode(this).DPtoLP(1);
-			graphics.drawRectangle(getClientArea().shrink(shrink, shrink));
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		Dimension p = super.getPreferredSize(wHint, hHint);
-		return p.getUnioned(minSize != null ? minSize : getMinClientDimension()
-				.getExpanded(getInsets().getWidth(), getInsets().getHeight()));
-	}
-	
-	/**
-	 * @return makes sure that we can fit the collapse handles and the
-	 * contents of the scroll pane. 
-	 * @see org.eclipse.draw2d.IFigure#getMinimumSize(int, int)
-	 */
-	public Dimension getMinimumSize(int w, int h) {		
-		if (isFitContents()) {
-			return getPreferredSize(w, h);
-		}
-		
-		if (minSize != null)
-			return minSize;
-		
-		minSize = new Dimension(); 
-		
-		if (getLayoutManager() != null) {
-			minSize = getLayoutManager().getMinimumSize(this, w, h);
-		}
-	
-		int minHeight = getMinClientDimension().height+getInsets().getHeight();
-		minSize.height = Math.max(minHeight, minSize.height);
-		if (h >= 0)
-			minSize.height = Math.min(minSize.height, h);
-		
-		int minWidth = getMinClientDimension().width+getInsets().getWidth();
-		minSize.width = Math.max(minWidth, minSize.width);
-		if (w >= 0)
-			minSize.width = Math.min(minSize.width, w);
-		
-		return minSize;		
-	}
-	
-	/**
-	 * getter for the horizontal flag
-	 * @return the horizontal flag
-	 */
-	public final boolean isHorizontal() {
-		return _horizontal;
-	}
-	
-	/**
-	 * setter for the horizontal flag
-	 * @param horizontal the new value of the horizontal flag
-	 */
-	public final void setHorizontal(boolean horizontal) {
-		_horizontal = horizontal;
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.IFigure#getMaximumSize()
-	 */
-	public Dimension getMaximumSize() {
-		Dimension d = super.getMaximumSize().getCopy();
-		if (!isExpanded())
-			if ( isHorizontal() ) {	
-				d.width = getPreferredSize().width;	
-			}
-			else {	
-				d.height = getPreferredSize().height;
-			}
-		return d;
-	}
-	/**
-	 * @see IFigure#invalidate()
-	 */
-	public void invalidate() {
-		prefSize = null;
-		minSize = null;
-		super.invalidate();
-	}
-	/**
-	 * @return Returns the textPane.
-	 */
-	public Figure getTextPane() {
-		return textPane;
-	}
-	/**
-	 * @param textPane
-	 *            The textPane to set.
-	 */
-	private void setTextPane(Figure textPane) {
-		this.textPane = textPane;
-	}
-
-	/**
-	 * For this compartment we need it to be a min size so to fit the 
-	 * collapse handles and to give the user an area they
-	 * can drag and drop into the list compartment
-	 * even if there is nothing in the compartment 
-	 * @return <code>Dimension</code>
-	 */
-	public Dimension getMinClientDimension(){
-		return new Dimension(getMinClientSize(), getMinClientSize());
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.IFigure#validate()
-	 */
-	public void validate() {
-		super.validate();
-
-		// Need a place to do this after the child figures have all been
-		// created.
-		initializeScrollPane();
-	}
-	
-	/**
-	 * Initializes the scroll to x and y locations on the scroll pane to
-	 * accomodate children figures with negative locations. See RATLC00142157.
-	 */
-	private void initializeScrollPane() {
-		if (!isScrollPaneInitialized) {
-			if (getScrollPane() != null) {
-				Point topLeft = getScrollPane().getContents().getBounds()
-					.getTopLeft();
-				if (topLeft.x < 0) {
-					getScrollPane().getViewport().getHorizontalRangeModel()
-						.setValue(topLeft.x);
-				}
-				if (topLeft.y < 0) {
-					getScrollPane().getViewport().getVerticalRangeModel()
-						.setValue(topLeft.y);
-				}
-			}
-			isScrollPaneInitialized = true;
-		}
-	}
-
-	/**
-	 * Checks whether the "fit contents" flag is set
-	 * @return <code>true</code> if fit contents flag is set
-	 * @since 1.3
-	 */
-	public boolean isFitContents() {
-		return (this.flags & FLAG__FIT_CONTENTS) != 0; 
-	}
-	
-	/**
-	 * Sets the "fit contents" flag and updates the figure accordingly
-	 * @param fitContents
-	 * @since 1.3
-	 */
-	public void setFitContents(boolean fitContents) {
-		if (fitContents != isFitContents()) {
-			LayoutManager lm = getContentPane().getLayoutManager(); 
-			if (fitContents) {
-				this.flags |= FLAG__FIT_CONTENTS;
-				if (lm instanceof FreeformLayout) {
-					((FreeformLayout)lm).setPositiveCoordinates(true);
-				}
-			} else {
-				this.flags &= ~FLAG__FIT_CONTENTS;
-				if (lm instanceof FreeformLayout) {
-					((FreeformLayout)lm).setPositiveCoordinates(false);
-				}
-			}
-			getContentPane().revalidate();
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java
deleted file mode 100644
index 987c502..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java
+++ /dev/null
@@ -1,140 +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.figures;
-
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.FreeformViewport;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gmf.runtime.diagram.ui.layout.FreeFormLayoutEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.AnimatableScrollPane;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OverlayScrollPaneLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-
-/**
- * A specialized implementation of <code>ResizableCompartmentFigure</code>, this
- * class configures the scrollpane to use a {@link org.eclipse.draw2d.FreeformLayer}
- * with a {@link org.eclipse.draw2d.FreeformLayout} as its contents.  
- * 
- * @author mhanner
- */
-public class ShapeCompartmentFigure extends ResizableCompartmentFigure {
-	
-	
-	/**
-	 * constant defines the font title 
-	 */
-	public static final Font FONT_TITLE = new Font(null, new FontData("Helvetica", 9, SWT.BOLD));//$NON-NLS-1$
-	   
-    /**
-     * Create an instance.  Calls {@link #configureFigure()} to reconfigure
-     * the scrollpane.
-     * 
-     * @param title figure's title.
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     */
-    public ShapeCompartmentFigure(String title, IMapMode mm) {
-        super(title, mm);
-    }
-    
-
-    protected AnimatableScrollPane createScrollpane(IMapMode mm) {
-        configureFigure(mm);
-        return (AnimatableScrollPane)getScrollPane();
-    }
-	/**
-	 * The scrollpane is configured to use a {@link FreeformLayer} with a
-	 * {@link FreeformLayout} as its contents.
-     * @deprecated use {@link ShapeCompartmentFigure#configureFigure(IMapMode)} instead
-	 */
-	protected void configureFigure() {
-		configureFigure(MapModeUtil.getMapMode(this));        
-	}
-    
-    /**
-     * The scrollpane is configured to use a {@link FreeformLayer} with a
-     * {@link FreeformLayout} as its contents.
-     * 
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     */
-    protected void configureFigure(IMapMode mm) {
-        ScrollPane scrollpane = getScrollPane();
-        if(scrollpane==null){
-            scrollpane = scrollPane = new AnimatableScrollPane();
-        }
-        scrollpane.setViewport(new FreeformViewport());
-        scrollPane.setScrollBarVisibility(ScrollPane.AUTOMATIC);
-        scrollpane.setLayoutManager(new OverlayScrollPaneLayout() );
-
-        IFigure contents = new BorderItemsAwareFreeFormLayer();
-        contents.setLayoutManager(new FreeFormLayoutEx());
-        scrollpane.setContents(contents);
-        
-        int MB = mm.DPtoLP(5);
-        scrollpane.setBorder(new MarginBorder(MB, MB, MB, MB));
-        int SZ = mm.DPtoLP(10);
-        scrollpane.setMinimumSize(new Dimension(SZ, SZ));
-    
-        this.setFont(FONT_TITLE);
-    }    
-   
-  
-	/**
-	 * Convenience method to registers the supplied listener to the scrollpane's 
-	 * vertical and horizonatl range models. 
-	 * 
-	 * @param listener The listener to add
-	 */
-	public void addPropertyChangeListener(PropertyChangeListener listener) {
-		getScrollPane().getViewport()
-			.getVerticalRangeModel()
-			.addPropertyChangeListener(
-			listener);
-		getScrollPane()
-			.getViewport()
-			.getHorizontalRangeModel()
-			.addPropertyChangeListener(
-			listener);
-	}
-
-	/**
-	 * Convenience method to removes the supplied listener from the scrollpane's 
-	 * RangeModel's list of PropertyChangeListeners.
-	 * @param listener The listener to remove
-	 */
-	public void removePropertyChangeListener(PropertyChangeListener listener) {
-		getScrollPane()
-			.getViewport()
-			.getVerticalRangeModel()
-			.removePropertyChangeListener(
-			listener);
-		getScrollPane()
-			.getViewport()
-			.getHorizontalRangeModel()
-			.removePropertyChangeListener(listener);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/package.html
deleted file mode 100644
index deb7bf8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/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>the figures package</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java
deleted file mode 100644
index 3eb12f2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java
+++ /dev/null
@@ -1,161 +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.handles;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.TreeSearch;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.handles.AbstractHandle;
-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.editparts.IResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.CollapseFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.CompartmentCollapseTracker;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A handle for collapsing resizable compartments
- *  
- * @author melaasar
- */
-public class CompartmentCollapseHandle
-	extends AbstractHandle
-	implements PropertyChangeListener, NotificationListener {
-
-	/** 
-	 * Positions the supplied figure in its owner's top left corner offset by [1,1] 
-	 */
-	private class CollapseHandleLocator implements Locator {
-		public void relocate(IFigure target) {
-			Rectangle theBounds = getOwnerFigure().getClientArea().getCopy();          
-			getOwnerFigure().translateToAbsolute(theBounds);
-            target.translateToRelative(theBounds);
-			target.setLocation(theBounds.getLocation());            
-		}
-	}
-
-	/** handle figure dimension */
-	public static Dimension SIZE = new Dimension(11, 11);
-
-	/** the handle figure */
-	protected CollapseFigure collapseFigure = null;
-
-	/**
-     * Creates a new Compartment Collapse Handle
-     * 
-     * @param owner
-     */
-    public CompartmentCollapseHandle(IGraphicalEditPart owner) {
-        setOwner(owner);
-        setLocator(new CollapseHandleLocator());
-        setCursor(Cursors.ARROW);
-
-        setSize(SIZE);
-        setLayoutManager(new StackLayout());
-
-        if (owner != null && owner.getParent() != null
-            && owner.getParent() instanceof IGraphicalEditPart)
-            add(collapseFigure = new CollapseFigure(((IGraphicalEditPart) owner
-                .getParent()).getFigure()));
-        else
-            add(collapseFigure = new CollapseFigure());
-
-        View view = owner.getNotationView();
-        if (view != null) {
-            DrawerStyle style = (DrawerStyle) view
-                .getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-            if (style != null) {
-                collapseFigure.setCollapsed(style.isCollapsed());
-                return;
-            }
-        }
-        collapseFigure.setCollapsed(false);
-    }
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#findFigureAt(int, int, TreeSearch)
-	 */
-	public IFigure findFigureAt(int x, int y, TreeSearch search) {
-		IFigure found = super.findFigureAt(x, y, search);
-		return (collapseFigure.equals(found)) ? this : found;
-	}
-
-	/**
-	 * @see org.eclipse.gef.handles.AbstractHandle#createDragTracker()
-	 */
-	protected DragTracker createDragTracker() {
-		return new CompartmentCollapseTracker(
-			(IResizableCompartmentEditPart) getOwner());
-	}
-
-	/**
-	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent evt) {
-		if (evt.getPropertyName().equals(Properties.ID_COLLAPSED))
-			collapseFigure.setCollapsed(
-				((Boolean) evt.getNewValue()).booleanValue());
-	}
-	
-	/**
-	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-	 */
-	public void notifyChanged(Notification notification) {
-		if (NotationPackage.eINSTANCE.getDrawerStyle_Collapsed()==notification.getFeature())
-			collapseFigure.setCollapsed(notification.getNewBooleanValue());
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#addNotify()
-	 */
-	public void addNotify() {
-		super.addNotify();
-		IGraphicalEditPart owner = (IGraphicalEditPart) getOwner();
-		View view = owner.getNotationView();
-		if (view!=null){
-			getDiagramEventBroker().addNotificationListener(owner.getNotationView(),CompartmentCollapseHandle.this);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#removeNotify()
-	 */
-	public void removeNotify() {
-		IGraphicalEditPart owner = (IGraphicalEditPart) getOwner();
-		getDiagramEventBroker().removeNotificationListener(owner.getNotationView(),this);
-		super.removeNotify();
-	}
-	
-    private DiagramEventBroker getDiagramEventBroker() {
-        TransactionalEditingDomain theEditingDomain = ((IGraphicalEditPart) getOwner())
-            .getEditingDomain();
-        if (theEditingDomain != null) {
-            return DiagramEventBroker.getInstance(theEditingDomain);
-        }
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandle.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandle.java
deleted file mode 100644
index a37895e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandle.java
+++ /dev/null
@@ -1,209 +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.handles;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.TreeSearch;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.AbstractHandle;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.ConnectionHandleTool;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is the handle figure used to represent a connection handle.
- * 
- * @author cmahoney
- */
-public class ConnectionHandle extends AbstractHandle {
-
-	/**
-	 * An enumeration of connection directions.
-	 * OUTGOING = source to target
-	 * INCOMING = target to source
-	 */
-	public static final class HandleDirection {
-		private HandleDirection() {
-		    // empty
-		}
-
-		/** source to target */
-		public static final HandleDirection OUTGOING = new HandleDirection();
-
-		/** target to source */
-		public static final HandleDirection INCOMING = new HandleDirection();
-	}
-
-	/** the error icon that can be superimposed on the connection handle image */
-	private static final ImageFigure ERROR_IMAGE = new ImageFigure(SharedImages
-		.get(SharedImages.IMG_ERROR));
-
-	static {
-		ERROR_IMAGE.setSize(SharedImages.get(SharedImages.IMG_ERROR)
-			.getBounds().width, SharedImages.get(SharedImages.IMG_ERROR)
-			.getBounds().height);
-	}
-
-	/** direction that the relationship is to be created */
-	private HandleDirection handleDirection;
-
-	/**
-	 * Creates a new <code>ConnectionHandle</code>.
-	 * @param ownerEditPart the editpart for which the handle belongs
-	 * @param relationshipDirection direction that the relationship is to be created
-	 * @param tooltip the tooltip
-	 */
-	public ConnectionHandle(
-		IGraphicalEditPart ownerEditPart,
-		HandleDirection relationshipDirection,
-		String tooltip) {
-
-		setOwner(ownerEditPart);
-		setRelationshipDirection(relationshipDirection);
-		setToolTip(new Label(tooltip));
-
-		// A stack layout is used so that the error icon can be overlayed on top.
-		setLayoutManager(new StackLayout());
-	}
-	
-	/**
-	 * @see org.eclipse.gef.handles.AbstractHandle#createDragTracker()
-	 */
-	protected DragTracker createDragTracker() {
-		return new ConnectionHandleTool(this);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#findFigureAt(int, int, org.eclipse.draw2d.TreeSearch)
-	 */
-	public IFigure findFigureAt(int x, int y, TreeSearch search) {
-		// return the ConnectionHandle and not the children figures
-		if (containsPoint(x, y)) {
-			return this;
-		}
-		return super.findFigureAt(x, y, search);
-	}
-
-	/**
-	 * Make public.
-	 * @see org.eclipse.gef.handles.AbstractHandle#setLocator(org.eclipse.draw2d.Locator)
-	 */
-	public void setLocator(Locator locator) {
-		super.setLocator(locator);
-	}
-
-	/**
-	 * Make public.
-	 * @see org.eclipse.gef.handles.AbstractHandle#getOwner()
-	 */
-	public GraphicalEditPart getOwner() {
-		return super.getOwner();
-	}
-
-	/**
-	 * Sets the direction that the relationship is to be created.
-	 * @param direction the <code>HandleDirection</code> that the relationship is to be created
-	 */
-	protected void setRelationshipDirection(HandleDirection direction) {
-		handleDirection = direction;
-	}
-
-	/**
-	 * Is this for incoming relationships?
-	 * @return true if this is for incoming relationships, false otherwise
-	 */
-	public boolean isIncoming() {
-		return handleDirection == HandleDirection.INCOMING;
-	}
-
-	/**
-	 * Superimposes an error icon on this connection handle.
-	 */
-	public void addErrorIcon() {
-		add(ERROR_IMAGE);
-	}
-
-	/**
-	 * Removes the error icon if it is being displayed.
-	 */
-	public void removeErrorIcon() {
-		if (getChildren().contains(ERROR_IMAGE)) {
-			remove(ERROR_IMAGE);
-		}
-	}
-
-	/**
-	 * Updates the images used for the handles, based on the side they will
-	 * appear on.  Sets the location of the handles using the locator.
-	 * @see org.eclipse.draw2d.IFigure#validate()
-	 */
-	public void validate() {
-		if (isValid())
-			return;
-
-		removeAll();
-		int side = ((ConnectionHandleLocator) getLocator())
-			.getBorderSide();
-		Image image = getImage(side);
-
-		ImageFigure imageFigure = new ImageFigure(image);
-		imageFigure.setSize(image.getBounds().width, image.getBounds().height);
-		add(imageFigure);
-
-		setSize(imageFigure.getSize().getUnioned(ERROR_IMAGE.getSize()));
-
-		super.validate();
-	}
-    
-    /**
-     * Gets the image to be used for the connection handle given the side of the
-     * shape where the connection handle will appear. A call to
-     * <code>isIncoming()</code> will reveal the direction of the handle.
-     * 
-     * @param side
-     *            the side of the shape where the connection handle will appear,
-     *            a value in PositionConstants
-     * @return the image to be used for the connection handle
-     */
-    protected Image getImage(int side) {
-        if (side == PositionConstants.WEST) {
-            return isIncoming() ? DiagramUIPluginImages
-                .get(DiagramUIPluginImages.IMG_HANDLE_INCOMING_WEST)
-                : DiagramUIPluginImages
-                    .get(DiagramUIPluginImages.IMG_HANDLE_OUTGOING_WEST);
-        } else if (side == PositionConstants.EAST) {
-            return isIncoming() ? DiagramUIPluginImages
-                .get(DiagramUIPluginImages.IMG_HANDLE_INCOMING_EAST)
-                : DiagramUIPluginImages
-                    .get(DiagramUIPluginImages.IMG_HANDLE_OUTGOING_EAST);
-        } else if (side == PositionConstants.SOUTH) {
-            return isIncoming() ? DiagramUIPluginImages
-                .get(DiagramUIPluginImages.IMG_HANDLE_INCOMING_SOUTH)
-                : DiagramUIPluginImages
-                    .get(DiagramUIPluginImages.IMG_HANDLE_OUTGOING_SOUTH);
-        } else {
-            return isIncoming() ? DiagramUIPluginImages
-                .get(DiagramUIPluginImages.IMG_HANDLE_INCOMING_NORTH)
-                : DiagramUIPluginImages
-                    .get(DiagramUIPluginImages.IMG_HANDLE_OUTGOING_NORTH);
-        }
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandleLocator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandleLocator.java
deleted file mode 100644
index 20d3d24..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/ConnectionHandleLocator.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.handles;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.PositionConstants;
-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.handles.HandleBounds;
-
-/**
- * This locator is used to locate all the handles around the shape the closest
- * distance to the mouse location. It spaces the handles a certain distance
- * apart. Call setEastWestSouth(true) to indicate that the connection handle can
- * only be located on the east, west, or south side of the reference figure.
- * 
- * @author cmahoney
- */
-public class ConnectionHandleLocator
-	implements Locator {
-
-	/** number of pixels between connection handles */
-	private static int HANDLE_SPACING = 20;
-
-	/** the MARGIN to leave by the edge of the parent figure */
-	private static int MARGIN = 2;
-	
-	/**
-     * the margin outside the shape in which the handles will appear to
-     * determine if the handles will be outside the viewport
-     */
-    private static Dimension HANDLE_MARGIN = new Dimension(25, 25);
-
-	/** list of connection handles for the shape */
-	private List<ConnectionHandle> handles = new ArrayList<ConnectionHandle>();
-
-	/** a point in the shape used when locating the handles */
-	private Point cursorPosition = null;
-
-	/** the parent figure */
-	private IFigure reference = null;
-
-	/** the side on which the handles will appear, value from PositionConstants */
-	private int side = PositionConstants.WEST;
-
-	/** the point on the border where the handles should appear */
-	private Point borderPoint = new Point(0, 0);
-
-	/**
-	 * flag to indicate if the connection handle should only be on the east,
-	 * west, or south side
-	 */
-	private boolean bEastWestSouth = false;
-
-	/**
-	 * Constructor for ConnectionHandleLocator.
-	 * 
-	 * @param reference
-	 *            the figure
-	 * @param cursorPosition
-	 *            the handles will be located on the border of the shape as
-	 *            close to this position as possible
-	 */
-	public ConnectionHandleLocator(IFigure reference, Point cursorPosition) {
-		this.reference = reference;
-		this.cursorPosition = cursorPosition;
-	}
-
-	/**
-	 * Adds a connection handle to the list of handles.
-	 * 
-	 * @param handle
-	 *            the <code>ConnectionHandle</code> to add
-	 */
-	public void addHandle(ConnectionHandle handle) {
-		handles.add(handle);
-	}
-
-    /**
-     * Return the client area of the viewport. If a viewport is not found, a
-     * default rectangle is returned.
-     * 
-     * @return the client area of the viewport
-     */
-    private Rectangle getViewportArea() {
-        IFigure fig = getReference();
-        while (fig != null) {
-            if (fig instanceof Viewport) {
-                return fig.getClientArea();
-            }
-            fig = fig.getParent();
-        }
-        return new Rectangle(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-
-    /**
-	 * Resets the border point and side variables where the connection handles
-	 * will appear, based on the cursor location.
-	 */
-	private void resetBorderPointAndSide() {
-        Rectangle bounds = getReferenceFigureBounds();
-
-        // Get the point on the edge of the reference figure nearest to the
-        // cursor position.
-        int westDiff = cursorPosition.x - bounds.x;
-        int eastDiff = bounds.getRight().x - cursorPosition.x;
-        int southDiff = bounds.getBottom().y - cursorPosition.y;
-        int northDiff = isEastWestSouth() ? Integer.MAX_VALUE
-            : cursorPosition.y - bounds.y;
-
-        // avoid having the handles appear outside the viewport
-        Rectangle viewportRect = getViewportArea();
-        Rectangle absBounds = bounds.getCopy();
-        getReference().translateToAbsolute(absBounds);
-        absBounds.translate(viewportRect.getLocation());
-        
-        Dimension handleMargin = getHandleMargin();
-        if (absBounds.right() + handleMargin.width > viewportRect.right()) {
-            // don't use east side
-            eastDiff = Integer.MAX_VALUE;
-        } else if (absBounds.x - handleMargin.width < viewportRect.x) {
-            // don't use west side
-            westDiff = Integer.MAX_VALUE;
-        }
-        if (absBounds.bottom() + handleMargin.height > viewportRect.bottom()) {
-            // don't use south side
-            southDiff = Integer.MAX_VALUE;
-        } else if (absBounds.y - handleMargin.height < viewportRect.y) {
-            // don't use north side
-            northDiff = Integer.MAX_VALUE;
-        }
-
-        double minLR = Math.min(eastDiff, westDiff);
-        double minUD = Math.min(southDiff, northDiff);
-        // which directions is closest North/South or East/West?
-        boolean bUp = (minUD < minLR);
-
-        if (bUp) {
-            if (northDiff < southDiff) {
-                // re-evaluate if the north is closer than the east since the
-                // handles will be placed in the north-west corner because of
-                // the action bar.
-                if (eastDiff < westDiff
-                    && eastDiff < cursorPosition.getDistance(bounds
-                        .getTopLeft())) {
-                    borderPoint.setLocation(bounds.x + bounds.width,
-                        cursorPosition.y);
-                    side = PositionConstants.EAST;
-                } else {
-                    borderPoint.setLocation(bounds.x, bounds.y);
-                    side = PositionConstants.NORTH;
-                }
-            } else {
-                borderPoint.setLocation(cursorPosition.x, bounds.y
-                    + bounds.height);
-                side = PositionConstants.SOUTH;
-            }
-        } else {
-            if (westDiff < eastDiff) {
-                borderPoint.setLocation(bounds.x, cursorPosition.y);
-                side = PositionConstants.WEST;
-            } else {
-                //
-                borderPoint.setLocation(bounds.x + bounds.width,
-                    cursorPosition.y);
-                side = PositionConstants.EAST;
-            }
-        }
-    }
-
-	/**
-	 * Gets the side (West, South, or East) on which the handles will appear,
-	 * using the cursor position passed in to the constructor.
-	 * 
-	 * @return the side, a value in PositionContstants
-	 */
-	public int getBorderSide() {
-		resetBorderPointAndSide();
-		return side;
-	}
-
-	/**
-	 * Locates the figure on the appropriate edge of the parent depending on
-	 * which side is closest to the reference point. Then adjusts the figure
-	 * depending on the number of handles that this locator has so that the
-	 * handles are spaced out from the center along the edge of the shape.
-	 * 
-	 * @see org.eclipse.draw2d.Locator#relocate(org.eclipse.draw2d.IFigure)
-	 */
-	public void relocate(IFigure target) {
-		Rectangle bounds = getReferenceFigureBounds();
-		resetBorderPointAndSide();
-
-		Point borderPointTranslated = borderPoint.getCopy();
-		reference.translateToAbsolute(bounds);
-		target.translateToRelative(bounds);
-		reference.translateToAbsolute(borderPointTranslated);
-		target.translateToRelative(borderPointTranslated);
-
-		int width = target.getBounds().width;
-		int halfWidth = width / 2;
-
-		int height = target.getBounds().height;
-		int halfHeight = height / 2;
-
-		// adjust border point if the handles will extend past the bounds of the
-		// shape
-		if (side == PositionConstants.WEST || side == PositionConstants.EAST) {
-			int halfTotalHeight = (height * handles.size() + HANDLE_SPACING
-				* (handles.size() - 1)) / 2;
-			if (borderPointTranslated.y - halfTotalHeight < bounds.getTop().y) {
-				borderPointTranslated.y = bounds.getTop().y + halfTotalHeight;
-			} else if (borderPointTranslated.y + halfTotalHeight > bounds
-				.getBottom().y) {
-				borderPointTranslated.y = bounds.getBottom().y
-					- halfTotalHeight;
-			}
-		} else {
-			int halfTotalWidth = (width * handles.size() + HANDLE_SPACING
-				* (handles.size() - 1)) / 2;
-			if (borderPointTranslated.x - halfTotalWidth < bounds.getLeft().x) {
-				borderPointTranslated.x = bounds.getLeft().x + halfTotalWidth;
-			} else if (borderPointTranslated.x + halfTotalWidth > bounds
-				.getRight().x) {
-				borderPointTranslated.x = bounds.getRight().x - halfTotalWidth;
-			}
-		}
-
-		// set location based on side
-		if (side == PositionConstants.WEST) {
-			target.setLocation(borderPointTranslated
-				.getTranslated(new Dimension(-(width + MARGIN), -halfHeight)));
-		} else if (side == PositionConstants.EAST) {
-			target.setLocation(borderPointTranslated
-				.getTranslated(new Dimension(MARGIN, -halfHeight)));
-		} else if (side == PositionConstants.SOUTH) {
-			target.setLocation(borderPointTranslated
-				.getTranslated(new Dimension(-halfWidth, MARGIN)));
-		} else if (side == PositionConstants.NORTH) {
-			target.setLocation(borderPointTranslated
-				.getTranslated(new Dimension(MARGIN, -height - MARGIN)));
-		}
-
-		// space out handles
-		int index = handles.indexOf(target);
-		double centerOffset = index - (handles.size() / 2.0) + 0.5;
-
-		if (side == PositionConstants.WEST || side == PositionConstants.EAST) {
-			target.translate(0, (int) (centerOffset * HANDLE_SPACING));
-		} else {
-			target.translate((int) (centerOffset * HANDLE_SPACING), 0);
-		}
-
-	}
-
-	/**
-	 * Gets the bounding rectangle of the reference figure.
-	 * 
-	 * @return the bounds
-	 */
-	private Rectangle getReferenceFigureBounds() {
-		Rectangle bounds = reference instanceof HandleBounds ? ((HandleBounds) reference)
-			.getHandleBounds().getCopy()
-			: reference.getBounds().getCopy();
-		return bounds;
-	}
-
-	/**
-	 * Gets the reference figure.
-	 * 
-	 * @return Returns the reference.
-	 */
-	protected IFigure getReference() {
-		return reference;
-	}
-
-	/**
-	 * Gets the cursor position.
-	 * 
-	 * @return Returns the cursorPosition.
-	 */
-	protected Point getCursorPosition() {
-		return cursorPosition;
-	}
-
-	/**
-	 * Can the connection handle can only be located on the east, west, or south
-	 * side of the reference figure.
-	 * 
-	 * @return Returns true if the connection handle can only be located on the
-	 *         east, west, or south side of the reference figure; false
-	 *         otherwise.
-	 */
-	public boolean isEastWestSouth() {
-		return bEastWestSouth;
-	}
-
-	/**
-	 * Set to true if the connection handle can only be located on the east,
-	 * west, or south side of the reference figure.
-	 * 
-	 * @param eastWestSouth
-	 *            The bEastWestSouth to set.
-	 */
-	public void setEastWestSouth(boolean eastWestSouth) {
-		bEastWestSouth = eastWestSouth;
-	}
-	
-	/**
-     * Returns the margin outside the shape in which the handles will appear to
-     * determine if the handles will be outside the viewport.
-     * 
-     * @return the margin
-     */
-    protected Dimension getHandleMargin() {
-        return HANDLE_MARGIN;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/handles/package.html
deleted file mode 100644
index fe6ae80..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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>
-handles and handle locator package</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/ImageFileFormat.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/ImageFileFormat.java
deleted file mode 100644
index 0f09e40..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/ImageFileFormat.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.image;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.gmf.runtime.common.core.util.EnumeratedType;
-
-/**
- * An enumeration of image formats supported by the copy diagram to image
- * file utility class <code>CopyToImageUtil</code>. 
- * <p>We use this enumeration rather than int as in SWT.IMAGE_GIF to enforce 
- * strict supported format type checking.</p>
- * 
- * @author Anthony Hunter 
- * <a href="mailto:ahunter@rational.com">ahunter@rational.com</a>
- */
-public class ImageFileFormat extends EnumeratedType {
-
-	
-	private static final int IMAGE_SVG = 100;
-	private static final int IMAGE_PDF = IMAGE_SVG + 1;
-	static final long serialVersionUID = 1;
-	
-	/**
-	 * The default quality.
-	 * @since 1.4
-	 */
-	public static final float DEFAULT_QUALITY = (float) 1.0;
-	
-	/**
-	 * supported format Graphics Interchange Format (GIF).
-	 */
-	public static final ImageFileFormat GIF = new ImageFileFormat("GIF", SWT.IMAGE_GIF); //$NON-NLS-1$
-
-	/**
-	 * supported format Joint Photographic Experts Group format (JPEG).
-	 */
-	public static final ImageFileFormat JPEG = new ImageFileFormat("JPEG", SWT.IMAGE_JPEG); //$NON-NLS-1$
-	
-/**
-	 * supported format Joint Photographic Experts Group format (JPG).
-	 */
-	public static final ImageFileFormat JPG = new ImageFileFormat("JPG", SWT.IMAGE_JPEG); //$NON-NLS-1$
-
-	/**
-	 * supported format Windows Bitmap format (BMP).
-	 */
-	public static final ImageFileFormat BMP = new ImageFileFormat("BMP", SWT.IMAGE_BMP); //$NON-NLS-1$
-
-	/**
-	 * supported format Scalable Vector Graphics (SVG).
-	 */
-	public static final ImageFileFormat SVG = new ImageFileFormat("SVG", IMAGE_SVG); //$NON-NLS-1$
-	
-	
-	/**
-	 * supported format Scalable Vector Graphics (PDF).
-	 */
-	public static final ImageFileFormat PDF = new ImageFileFormat("PDF", IMAGE_PDF); //$NON-NLS-1$
-
-    /**
-     * supported format PNG.
-     */
-    public static final ImageFileFormat PNG = new ImageFileFormat("PNG", SWT.IMAGE_PNG); //$NON-NLS-1$
-
-	/**
-	 * The list of values for this enumerated type.
-	 */
-	public static final ImageFileFormat[] VALUES = { GIF, BMP, JPEG, JPG, SVG, PNG, PDF };
-	
-	private float quality;
-	
-	/**
-	 * Constructs a new type with the specified
-	 * name and ordinal.
-	 * 
-	 * @param name The name of the new type.
-	 * @param ordinal The ordinal for the new type.
-	 */
-	private ImageFileFormat(String name, int ordinal) {
-		super(name, ordinal);
-		this.quality = DEFAULT_QUALITY;
-	}
-
-	/**
-	 * 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));
-	}
-
-	/**
-	 * Retrieves the default image format.
-	 * @return the default image format.
-	 */
-	public static ImageFileFormat getDefaultImageFormat() {
-		return PNG;
-	}
-
-	/**
-	 * resolve the selected image format to an enumerated type.
-	 * @param ordinal the selected format in the pulldown
-	 * @return the image format enumerated type
-	 */
-	public static ImageFileFormat resolveImageFormat(int ordinal) {
-		return ImageFileFormat.VALUES[ordinal];
-	}
-
-	/**
-	 * Resolve the selected image format to an enumerated type.
-	 * @param imageFormat the selected format.
-	 * @return the image format enumerated type
-	 */
-	public static ImageFileFormat resolveImageFormat(String imageFormat) {
-		for (int i = 0; i < ImageFileFormat.VALUES.length; i++) {
-			if (ImageFileFormat
-				.VALUES[i]
-				.getName()
-				.toLowerCase()
-				.equals(imageFormat.toLowerCase())) {
-				return ImageFileFormat.VALUES[i];
-			}
-		}
-
-		return ImageFileFormat.getDefaultImageFormat();
-	}
-	
-	/**
-	 * Get the quality 
-	 * @since 1.4
-	 */
-	public float getQuality() {
-		return quality;
-	}
-	
-	/**
-	 * Set the quality for image.
-	 * @since 1.4
-	 */
-	public void setQuality(float quality) {
-		this.quality = quality;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/PartPositionInfo.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/PartPositionInfo.java
deleted file mode 100644
index 1574184..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/PartPositionInfo.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.image;
-
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A data structure that stores the positional information of a
- *  shape as well as the semantic element behind the shape.
- * 
- * @author yqian 
- * @author cmcgee
- * @author Barys Dubauski
- */
-public class PartPositionInfo {
-
-	private int m_iPartHeight;
-	private int m_iPartWidth;
-	private int m_iPartX;
-	private int m_iPartY;
-	private EObject m_semanticElement;
-	private View m_view;
-	private List<Point> m_polyline = null; // List contains objects of type Point (x,y coordinate pairs)
-
-	/**
-	 * get the part Height
-	 * @return part height
-	 */
-	public int getPartHeight() {
-		return m_iPartHeight;
-	}
-
-	/**
-	 * set the part height
-	 * @param iPartHeight the part height
-	 */
-	public void setPartHeight(int iPartHeight) {
-		m_iPartHeight = iPartHeight;
-	}
-
-	/**
-	 * get the part width
-	 * @return the part width
-	 */
-	public int getPartWidth() {
-		return m_iPartWidth;
-
-	}
-
-	/**
-	 * set the part width
-	 * @param iPartWidth the part width
-	 */
-	public void setPartWidth(int iPartWidth) {
-		m_iPartWidth = iPartWidth;
-	}
-
-	/**
-	 * get the part X position
-	 * @return X position of the part
-	 */
-	public int getPartX() {
-		return m_iPartX;
-
-	}
-
-	/**
-	 * get the part Y position
-	 * @return Y position of the part
-	 */
-	public int getPartY() {
-		return m_iPartY;
-	}
-
-	/**
-	 * set the part X position
-	 * @param iPartX the X position of the part 
-	 */
-	public void setPartX(int iPartX) {
-		m_iPartX = iPartX;
-	}
-
-	/**
-	 * set the part Y Position
-	 * @param iPartY the Y position of the part
-	 */
-	public void setPartY(int iPartY) {
-		m_iPartY = iPartY;
-	}
-	
-	/**
-	 * Retreive the semantic element of the edit part.
-	 * @return The semantic element EObject.
-	 */
-	public EObject getSemanticElement() {
-		return m_semanticElement;
-	}
-
-	/**
-	 * Sets the semantic element for the edit part.
-	 * @param element The semantic element EObject.
-	 */
-	public void setSemanticElement(EObject element) {
-		m_semanticElement = element;
-	}
-	
-	/**
-	 * @return List of Point type objects (that carry X and Y coordinate pair) representing the polyline
-	 */
-	public List<Point> getPolyline() {
-		return m_polyline;
-	}
-	
-	/**
-	 * @param List of Point type objects (that carry X and Y coordinate pair) representing the polyline
-	 */
-	public void setPolyline(List<Point> m_polyline) {
-		this.m_polyline = m_polyline;
-	}
-
-	/**
-	 * Returns the View
-	 * @return view
-	 * @since 1.2
-	 */
-	public View getView() {
-		return m_view;
-	}
-
-	/**
-	 * Sets the View
-	 * @param View
-	 * @since 1.2
-	 */
-	public void setView(View view) {
-		m_view = view;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/image/package.html
deleted file mode 100644
index 02c7643..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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>
-this package contains classes related to the imge support</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIDebugOptions.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIDebugOptions.java
deleted file mode 100644
index 1e150d9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIDebugOptions.java
+++ /dev/null
@@ -1,77 +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.internal;
-
-/**
- * A list of debug options for the Diagram UI Plugin.
- * 
- * @author khussey
- *
- */
-public final class DiagramUIDebugOptions {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramUIDebugOptions() {
-		//static class: prevent instatiation
-	}
-
-	/**
-	 * Debug enabler
-	 */
-	public static final String DEBUG = DiagramUIPlugin.getPluginId() + "/debug"; //$NON-NLS-1$
-
-	/**
-	 * exception catching flag
-	 */
-	public static final String EXCEPTIONS_CATCHING = DEBUG + "/exceptions/catching"; //$NON-NLS-1$
-	
-	/**
-	 * exception throwing flag
-	 */
-	public static final String EXCEPTIONS_THROWING = DEBUG + "/exceptions/throwing"; //$NON-NLS-1$
-
-	/**
-	 * debug method entering flag
-	 */
-	public static final String METHODS_ENTERING = DEBUG + "/methods/entering"; //$NON-NLS-1$
-	
-	/**
-	 * debug method exiting flag
-	 */
-	public static final String METHODS_EXITING = DEBUG + "/methods/exiting"; //$NON-NLS-1$
-    
-	/**
-	 * Drag and drop tracing 
-	 */
-	public static final String DND = DEBUG + "/dnd/tracing"; //$NON-NLS-1$  
-    
-    /**
-     * canonical debugging
-     */
-    public static final String CANONICAL = DEBUG + "/filter/canonical";//$NON-NLS-1$
-    
-    
-    /**
-     * Persistence manager debug flag 
-     */
-    public static final String PERSISTENCE_MGR = DEBUG + "/filter/persistencemgr";//$NON-NLS-1$
-    
-    
-    /**
-     * events debugging 
-     */
-    public static final String EVENTS = DEBUG + "/filter/events";//$NON-NLS-1$
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIPlugin.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIPlugin.java
deleted file mode 100644
index dba9739..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.DiagramEventBrokerThreadSafe;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The DiagramUI  plugin defines all the artifacts needed for the
- * visualization of modelling diagrams
- * 
- * @author melaasar
- */
-public class DiagramUIPlugin
-	extends AbstractUIPlugin {
-
-	/**
-	 * the plugin singleton
-	 */
-	private static Plugin singleton;
-
-	/**
-	 * gets the plugin singleton
-	 * 
-	 * @return the plugin singleton
-	 */
-	public static DiagramUIPlugin getInstance() {
-		return (DiagramUIPlugin) 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 Diagram plugin instance
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#Plugin()
-	 */
-	public DiagramUIPlugin() {
-		super();
-		if (singleton == null) {
-			singleton = this;
-		}
-	}
-
-	public void start(BundleContext context)
-	throws Exception {
-		super.start(context);
-		
-		PreferencesHint.registerPreferenceStore(PreferencesHint.USE_DEFAULTS,
-				new PreferenceStore());
-		
-		DiagramEventBroker.registerDiagramEventBrokerFactory(new DiagramEventBroker.DiagramEventBrokerFactory() {
-        	public DiagramEventBroker createDiagramEventBroker(TransactionalEditingDomain editingDomain) {
-        		return new DiagramEventBrokerThreadSafe(editingDomain);
-        	}
-        });
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIStatusCodes.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIStatusCodes.java
deleted file mode 100644
index 2ce1d53..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/DiagramUIStatusCodes.java
+++ /dev/null
@@ -1,73 +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.internal;
-
-/**
- * A list of status codes for the Diagram UI plugin
- * 
- * @author khussey
- * 
- */
-public final class DiagramUIStatusCodes {
-
-	/**
-	 * This class should not be instantiated since it is a static constant
-	 * class.
-	 * 
-	 */
-	private DiagramUIStatusCodes() {
-		//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 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/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/CustomContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/CustomContributionItem.java
deleted file mode 100644
index dd3d213..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/CustomContributionItem.java
+++ /dev/null
@@ -1,302 +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.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem;
-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.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-
-/**
- * @author melaasar
- * 
- * An abstract implementation of a custom toolbar contribution item for a diagram
- * engine-based part
- *  
- */
-public abstract class CustomContributionItem
-	extends AbstractContributionItem {
-
-	/** the target request */
-	private Request targetRequest;
-	/** the cached operation set */
-	private List _operationSet = Collections.EMPTY_LIST;
-
-	/**
-	 * Constructs a new custom contribution item
-	 * 
-	 * @param workbenchPage The workbench page
-	 * @param id The item's id
-	 */
-	public CustomContributionItem(
-		IWorkbenchPage workbenchPage,
-		String id) {
-		super(workbenchPage, id);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IContributionItem#dispose()
-	 */
-	public void dispose() {
-		targetRequest = null;
-		_operationSet = null;
-		super.dispose();
-	}
-
-	protected void doRun(IProgressMonitor progressMonitor) {
-		updateTargetRequest();
-		execute(getCommand(), progressMonitor);
-	}
-
-	public void refresh() {
-		_operationSet = null; // invalidate the cached set
-		updateTargetRequest();
-		super.refresh();
-	}
-
-	protected boolean calculateEnabled() {
-		Command command = getCommand();
-		return command != null && command.canExecute();
-	}
-
-	/**
-	 * Executes the given {@link Command}.
-	 * @param command the command to execute
-	 * @param progressMonitor the progress monitor
-	 */
-	protected final void execute(
-		Command command,
-		IProgressMonitor progressMonitor) {
-		if (command == null || !command.canExecute())
-			return;
-		if (getDiagramCommandStack() != null)
-			getDiagramCommandStack().execute(command, progressMonitor);
-	}
-
-	/**
-	 * gets the part's diagram command stack.
-	 * @return the <code>DiagramCommandStack</code>
-	 */
-	protected DiagramCommandStack getDiagramCommandStack() {
-		Object stack = getWorkbenchPart().getAdapter(CommandStack.class);
-		return (stack instanceof DiagramCommandStack)
-			? (DiagramCommandStack) stack
-			: null;
-	}
-
-	/**
-	 * Gets a command to execute on the operation set based on the target request
-	 * 
-	 * @return a command to execute
-	 */
-	protected Command getCommand() {
-		return getCommand(getTargetRequest());
-	}
-	
-	/**
-	 * Gets a command to execute on the operation set based on a given request
-	 * @param request the request
-	 * @return a command to execute
-	 */
-	protected Command getCommand(Request request) {
-		List operationSet = getOperationSet();
-		Iterator editParts = operationSet.iterator();
-		CompoundCommand command = new CompoundCommand(getCommandLabel());
-		while (editParts.hasNext()) {
-			EditPart editPart = (EditPart) editParts.next();
-			Command curCommand = editPart.getCommand(request);
-			if (curCommand != null) {
-				command.add(curCommand);
-			}
-		}
-		return command.isEmpty()
-			|| command.size() != operationSet.size()
-				? UnexecutableCommand.INSTANCE
-				: (Command) command;
-	}
-
-	/**
-	 * Gets an optional label for the action's executed command
-	 * 
-	 * @return An optional label for the action's executed command
-	 */
-	protected String getCommandLabel() {
-		return null;
-	}
-
-	/**
-	 * Gets a request to be addressed to the operation set
-	 * 
-	 * @return a target request 
-	 */
-	protected Request getTargetRequest() {
-		if (targetRequest == null)
-			targetRequest = createTargetRequest();
-		return targetRequest;
-	}
-
-	/**
-	 * Creates a new target request
-	 * 
-	 * @return the new target request
-	 */
-	protected abstract Request createTargetRequest();
-
-	/**
-	 * updates the target request. 
-	 * Clients should call this method whenever the request 
-	 * is expected to be changed
-	 */
-	protected void updateTargetRequest() {
-		// no def impl
-	}
-
-	/**
-	 * A utility method to return a list of objects in the current structured selection
-	 * 
-	 * @return A list of objects in the current structure selection
-	 */
-	protected List getSelectedObjects() {
-		return getStructuredSelection().toList();
-	}
-
-	/**
-	 * Return the list of editparts considered the operation set after caching them
-	 * 
-	 * @return A list of editparts conidered the operation set
-	 */
-	protected final List getOperationSet() {
-		if (_operationSet == null) {
-			_operationSet = createOperationSet();
-			if (_operationSet == null)
-				_operationSet = Collections.EMPTY_LIST;
-		}
-		return _operationSet;
-	}
-
-	/**
-	 * Filters the selected objects and returns only 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));
-		}
-		return targetedEPs.isEmpty() ? Collections.EMPTY_LIST : targetedEPs;
-	}
-
-	/**
-	 * Given an editpart, returns a list of target editparts to the current request
-	 * If no targets could be found, an empty list is returned 
-	 *  
-	 * @param editpart The given editpart
-	 * @return a list of target editparts, or Empty list if none
-	 */
-	protected List getTargetEditParts(EditPart editpart) {
-		EditPart targetEP = editpart.getTargetEditPart(getTargetRequest());
-		return (targetEP == null)
-			? Collections.EMPTY_LIST
-			: Collections.singletonList(targetEP);
-	}
-
-	/**
-	 * A utility method to get the <code>IDiagramEditDomain</code> from the 
-	 * current part if it adapts to it
-	 * 
-	 * @return The diagram edit domain adapter if it exists; <code>null</code> otherwise
-	 */
-	protected IDiagramEditDomain getDiagramEditDomain() {
-		return (IDiagramEditDomain) getWorkbenchPart().getAdapter(
-			IDiagramEditDomain.class);
-	}
-
-	/**
-	 * A utility method to return the active part if it implements the 
-	 * <code>IDiagramWorkbenchPart</code> interface
-	 *  
-	 * @return The current part if it implements <code>IDiagramWorkbenchPart</code>; <code>null</code> otherwise
-	 */
-	protected IDiagramWorkbenchPart getDiagramWorkbenchPart() {
-		return getWorkbenchPart() instanceof IDiagramWorkbenchPart
-			? (IDiagramWorkbenchPart) getWorkbenchPart()
-			: null;
-	}
-
-	/**
-	 * A utility method to return the active <code>DiagramEditPart</code>
-	 * if the current part implements <code>IDiagramWorkbenchPart</code>
-	 *  
-	 * @return The current diagram if the parts implements 
-	 * <code>IDiagramWorkbenchPart</code>; <code>null</code> otherwise
-	 */
-	protected DiagramEditPart getDiagramEditPart() {
-		IDiagramWorkbenchPart editor = getDiagramWorkbenchPart();
-		return editor != null ? editor.getDiagramEditPart() : null;
-	}
-
-	/**
-	 * A utility method to return the active <code>DiagramEditPart</code>
-	 * if the current part implements <code>IDiagramWorkbenchPart</code>
-	 *  
-	 * @return The current diagram if the parts implements 
-	 * <code>IDiagramWorkbenchPart</code>; <code>null</code> otherwise
-	 */
-	protected IDiagramGraphicalViewer getDiagramGraphicalViewer() {
-		IDiagramWorkbenchPart part = getDiagramWorkbenchPart();
-		return part != null ? part.getDiagramGraphicalViewer() : null;
-	}
-
-	/**
-	 * Filters the given list of EditParts so that the list only contains the EditParts that 
-	 * matches the given condition when called on the given editpart).
-	 * @param list the list of edit parts to filter
-	 * @param condition the condition 
-	 * @return a modified list containing those editparts that matched the condition
-	 */
-	protected List filterEditPartsMatching(
-		List list,
-		EditPartViewer.Conditional condition) {
-		List matchList = new ArrayList();
-		Iterator iter = list.iterator();
-		while (iter.hasNext()) {
-			EditPart ep = (EditPart) iter.next();
-			if (condition.evaluate(ep))
-				matchList.add(ep);
-		}
-		return matchList;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/InsertAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/InsertAction.java
deleted file mode 100644
index ef0dcb2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/InsertAction.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.internal.actions;
-
-import java.util.Collection;
-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.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-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.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * An action to insert new objects into a container.
- */
-public class InsertAction
-	extends SelectionAction
-{
-
-
-	/**
-	 * the action id
-	 */
-	public static final String ID = ActionIds.ACTION_INSERT_SEMANTIC;
-
-/**
- * Constructs a <code>DeleteAction</code> using the specified part.
- * @param part The part for this action
- */
-public InsertAction(IWorkbenchPart part) {
-	super(part);
-	setId(ID);
-}
-
-/**
- * Initializes this action's text and images.
- */
-protected void init() {
-	super.init();
-	setEnabled(false);
-}
-
-/**
- * Create a command to insert the new objects.
- * @param objects The objects to be deleted.
- * @return The command to insert the new object.
- */
-public Command createInsertCommand(List objects) {
-	if (objects.isEmpty())
-		return null;
-	if (objects.size() > 1)
-		return null;
-	if (!(objects.get(0) instanceof EditPart))
-		return null;
-
-	GroupRequest insertReq = new GroupRequest(RequestConstants.REQ_INSERT_SEMANTIC);
-
-	return ((EditPart)(objects.get(0))).getCommand(insertReq);
-}
-
-/**
- * Returns <code>true</code> if the selected objects can
- * be deleted.  Returns <code>false</code> if there are
- * no objects selected or the selected objects are not
- * {@link EditPart}s.
- * @return <code>true</code> if the command should be enabled
- */
-protected boolean calculateEnabled() {
-	Command cmd = createInsertCommand(getSelectedObjects());
-	if (cmd == null)
-		return false;
-	return cmd.canExecute();
-}
-
-/**
- * Performs the delete action on the selected objects.
- */
-public void run() {
-	Command cmd = createInsertCommand(getSelectedObjects());
-	execute(cmd);
-	
-	Collection newObjects = DiagramCommandStack.getReturnValues(cmd);
-	Iterator i = newObjects.iterator();
-	if (i.hasNext()) {
-		Object obj = i.next();
-
-		IGraphicalEditPart host = (IGraphicalEditPart) getSelectedObjects().get(0);
-		EditPart elementEP = host.findEditPart(host, (EObject)obj);
-		if (elementEP == null) {
-			// try the host's parent if the creation created a sibling
-			IGraphicalEditPart parent = (IGraphicalEditPart)host.getParent();
-			elementEP = parent.findEditPart(parent, (EObject)obj);
-		}
-		
-		if (elementEP != null && getWorkbenchPart() instanceof IDiagramWorkbenchPart) {
-			final EditPart newEP = elementEP;
-			final IDiagramGraphicalViewer viewer = ((IDiagramWorkbenchPart)getWorkbenchPart()).getDiagramGraphicalViewer();
-			
-			// automatically put the first shape into edit-mode
-			Display.getCurrent().asyncExec(new Runnable() {
-				public void run() {
-					viewer.setSelection(new StructuredSelection(newEP));
-					Request der = new Request(RequestConstants.REQ_DIRECT_EDIT);
-					newEP.performRequest(der);
-				}
-			});
-		}
-	}
-}
-
-}
-
-
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/OpenAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/OpenAction.java
deleted file mode 100644
index fc597f9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/OpenAction.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.diagram.ui.internal.actions;
-
-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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.ui.IWorkbenchPage;
-
-
-
-
-/**
- * @author tmacdoug
- *
- * This action is used to handle open actions on a diagram
- *
- */
-public class OpenAction
-extends DiagramAction {
-	
-	/**
-	 * @param workbenchPage
-	 */
-	public OpenAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-
-	public void init() {
-		super.init();
-		
-		setId(ActionIds.OPEN);
-		setText(DiagramUIMessages.Open_ActionLabelText);
-		setToolTipText(DiagramUIMessages.Open_ActionToolTipText);
-	}
-
-	protected Request createTargetRequest() {		
-		return new Request(RequestConstants.REQ_OPEN);
-	}
-
-	protected boolean isSelectionListener() {
-		return true;
-	}
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteAction.java
deleted file mode 100644
index bec7852..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteAction.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.actions;
-
-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.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.ui.actions.DeleteAction;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-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.internal.DiagramUIPlugin;
-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.requests.GroupRequestViaKeyboard;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Delete Action originating via keyboard using the 'Delete' hot/shortcut key
- * 
- * @author bagrodia
- * Created on Jun 30, 2004
- */
-public class PromptingDeleteAction
-	extends DeleteAction {
-	
-
-	/**
-	 * Constructs a <code>PromptingDeleteAction</code> using the specified part.
-	 * @param part The part for this action
-	 */
-	public PromptingDeleteAction(IWorkbenchPart part) {
-		super(part);
-	}
-
-	
-	
-	/**
-	 * create a command for the passed list of objects
-	 * @param objects objects to associate with the command
-	 * @return <code>Command</code>
-	 */
-	
-	public Command createCommand(List objects) {
-		
-		if(objects.isEmpty()) return null;
-		
-		
-		/* Create the delete request */
-		GroupRequestViaKeyboard deleteReq =
-			new GroupRequestViaKeyboard(RequestConstants.REQ_DELETE);
-		
-		deleteReq.setShowInformationDialog(DiagramUIPlugin.getInstance()
-			.getPreferenceStore().getBoolean(
-				IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM));
-
-		CompoundCommand deleteCC =
-			new CompoundCommand(DiagramUIMessages.DeleteCommand_Label);
-
-
-		deleteReq.setShowInformationDialog(false);
-		boolean containsSemanticElement = false;
-		CompositeTransactionalCommand command = null;
-        TransactionalEditingDomain editingDomain = null;
-		for (int i = 0; i < objects.size(); i++) {			
-			if(objects.get(i) instanceof EditPart){
-				/* Get the next part */
-				EditPart editPart = (EditPart) objects.get(i);
-				if (editPart instanceof IGraphicalEditPart){
-                    if (editingDomain == null) {
-                        editingDomain = ((IGraphicalEditPart) editPart).getEditingDomain();
-                    }
-					if (!containsSemanticElement&&
-						ViewUtil.resolveSemanticElement((View)editPart.getModel()) != null){
-						containsSemanticElement = true;
-						deleteReq.setShowInformationDialog(true);
-					}
-				}
-
-				/* Send the request to the edit part */
-				Command command2 = editPart.getCommand(deleteReq);
-				if (command2 != null && editingDomain != null) {
-					if (command == null)
-						command = new CompositeTransactionalCommand(editingDomain, command2.getLabel());
-					if ( containsSemanticElement ) {
-						deleteReq.setShowInformationDialog(false);
-					}
-					command.compose(new CommandProxy(command2));
-				}
-			}
-		}		
-		
-		
-		if ((command != null)&&(command.size() > 0))
-			deleteCC.add(new ICommandProxy(command));
-		return deleteCC;
-	}	
-	
-	
-	
-	/**
-	 * This is by purpose set to true since there is no need to go to editpart 
-	 * and obtain commands.
-	 * @see org.eclipse.gef.ui.actions.DeleteAction#calculateEnabled()
-	 * 
-	 */
-	protected boolean calculateEnabled() {		
-		return true;
-	}
-	
-	public void run() {
-        TransactionalEditingDomain editingDomain = null;
-        // try adapting the workbench part
-        IWorkbenchPart part = getWorkbenchPart();
-        if (part != null) {
-        	IEditingDomainProvider edProvider = (IEditingDomainProvider) part
-        	.getAdapter(IEditingDomainProvider.class);
-
-        	if (edProvider != null) {
-        		EditingDomain domain = edProvider.getEditingDomain();
-
-        		if (domain instanceof TransactionalEditingDomain) {
-        			editingDomain = (TransactionalEditingDomain) domain;
-        		}
-        	}
-        }        
-        if (editingDomain != null) {
-        	final Command command[] = new Command[1];
-        	AbstractEMFOperation operation = new AbstractEMFOperation(
-        			editingDomain, DiagramUIMessages.DeleteCommand_Label) {
-
-        		protected IStatus doExecute(IProgressMonitor monitor,
-        				IAdaptable info)
-        		throws ExecutionException {
-        			command[0] = createCommand(getSelectedObjects());
-        			return CommandResult.newOKCommandResult().getStatus();
-
-        		}
-        	};
-        	try {
-        		operation.execute(null, null);
-        	} catch (ExecutionException e) {
-        		// do nothing
-        	}
-
-        	if (command[0] != null)
-        		execute(command[0]);
-        }
-    }
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java
deleted file mode 100644
index 91cca1b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PromptingDeleteFromModelAction.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.ui.actions.DeleteFromModelAction;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-/**
- * Delete Action originating via keyboard using the 'Ctrl+d' hot/shortcut key
- * as well as using context menu "Delete from model"
- * 
- * @author bagrodia
- * @canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.*
- * Created on Jun 30, 2004
- */
-public class PromptingDeleteFromModelAction
-	extends DeleteFromModelAction {	
-	
-	/**
-	 * used to distinguish context menu calls from keyboard calls (the only difference is in calculating enablement) 
-	 */
-	private boolean calledFromContextMenu;
-
-	/**
-	 * Creates a <code>PromptingDeleteFromModelAction</code> with a default label.
-	 *
-	 * @param part The part this action will be associated with.
-	 */
-	public PromptingDeleteFromModelAction(IWorkbenchPart part) {
-		super(part);
-		calledFromContextMenu = false;
-	}
-
-	/**
-	 * Creates a <code>PromptingDeleteFromModelAction</code> with a default label.
-	 * @param workbenchPage The page this action will be associated with.
-	 */
-	public PromptingDeleteFromModelAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-		calledFromContextMenu = false;
-	}
-	
-	/**
-	 * Creates a <code>PromptingDeleteFromModelAction</code> with a default label.
-	 * @param workbenchPage The page this action will be associated with.
-	 */
-	public PromptingDeleteFromModelAction(IWorkbenchPage workbenchPage, boolean fromContextMenu) {
-		super(workbenchPage);
-		calledFromContextMenu = fromContextMenu;
-	}	
-	
-	/**
-	 * Calculates enablement of this action. 
-	 * 
-	 * @return <code>true</code> if call is made via keyboard, or from context menu and action should be enabled,
-	 *         <code>false</code> otherwise
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		if (calledFromContextMenu) {
-			// Need to calculate enablement.
-			return super.calculateEnabled();
-		} else {
-			// for calls from keyboard, always return true for performance reasons
-			return true; 
-		}
-	}
-	
-	
-	/** First gets the delete command, where target request is modified to include the information about
-	 * whether confirmation prompt should be issued. Then it runs the obtained command.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#doRun(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doRun(IProgressMonitor progressMonitor) {		
-		Request req = getTargetRequest();
-		boolean showInformationDialog = ((IPreferenceStore) getPreferencesHint()
-					.getPreferenceStore())
-					.getBoolean(IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_MODEL);
-		DestroyElementRequest targetRequest = (DestroyElementRequest)((EditCommandRequestWrapper)req).getEditCommandRequest();		
-		targetRequest.setConfirm(showInformationDialog);
-
-		Command command = getCommand();
-		if ((command instanceof CompoundCommand)&&(((CompoundCommand)command).getChildren().length > 0)){
-			CompositeTransactionalCommand compositeModelActionCommand = new CompositeTransactionalCommand(getEditingDomain(),
-                getCommandLabel());
-			CompoundCommand compoundCommand = (CompoundCommand)command;
-			Iterator iterator = compoundCommand.getCommands().iterator();
-			while (iterator.hasNext()){
-				compositeModelActionCommand.compose(new CommandProxy((Command)iterator.next()));				
-			}
-			command = new ICommandProxy(compositeModelActionCommand); 
-		}
-		if (command != null)
-			execute(command, progressMonitor);
-	}
-	
-	/**
-	 *  Return the semantic request to destroy the element
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.DiagramAction#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {		
-		TransactionalEditingDomain editingDomain = getEditingDomain();
-        if (editingDomain != null) {
-            DestroyElementRequest destroyRequest = new DestroyElementRequest(
-                editingDomain, false);
-            return new EditCommandRequestWrapper(destroyRequest);
-        }
-        return null;
-	}
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PropertyChangeAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PropertyChangeAction.java
deleted file mode 100644
index 6f631e0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/PropertyChangeAction.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.gef.EditPart;
-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.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author melaasar
- */
-public abstract class PropertyChangeAction extends DiagramAction {
-
-	// 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 action
-	 * 
-	 * @param workbenchPage The workbench page
-	 * @param propertyName The property name
-	 * @param propertyId The property id
-	 */
-	public PropertyChangeAction(
-		IWorkbenchPage workbenchPage,
-		String propertyId,
-		String propertyName) {
-		super(workbenchPage);
-		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;
-	}
-
-	/**
-	 * 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() {
-						setResult(getStructuralFeatureValue(editPart, thePropertyId));
-					}
-				});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"getPropertyValue", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"getPropertyValue", e); //$NON-NLS-1$
-		}
-		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;
-	}
-	
-    /**
-     * Override to return true to have this property action work on the shapes
-     * in a <code>GroupEditPart</code> as if the shapes were multi-selected.
-     * 
-     * @return true if this property action is to dig into the shapes of groups
-     */
-    protected boolean digIntoGroups() {
-        return false;
-    }
-    
-    /**
-     * Gets the structural feature value of the property id on the editpart
-     * passed in or one of the children if the editpart is a group and
-     * {@link #digIntoGroups()} returns true.
-     * 
-     * @param editpart
-     *            the editpart
-     * @param thePropertyId
-     *            the property id
-     */
-    private Object getStructuralFeatureValue(IGraphicalEditPart editpart,
-            final String thePropertyId) {
-        ENamedElement element = PackageUtil.getElement(thePropertyId);
-        if (element instanceof EStructuralFeature) {
-            if (digIntoGroups() && editpart instanceof GroupEditPart) {
-                editpart = (IGraphicalEditPart) editpart.getChildren().get(0);
-            }
-            return editpart
-                .getStructuralFeatureValue((EStructuralFeature) element);
-        }
-        return null;
-    }
-
-    protected List getTargetEditParts(EditPart editpart) {
-        if (digIntoGroups() && editpart instanceof GroupEditPart) {
-            List targetEPs = new ArrayList();
-            for (Iterator iterator = ((GroupEditPart) editpart)
-                .getShapeChildren().iterator(); iterator.hasNext();) {
-                EditPart childEP = (EditPart) iterator.next();
-                targetEPs.addAll(super.getTargetEditParts(childEP));
-            }
-            return targetEPs;
-        }
-        return super.getTargetEditParts(editpart);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ToggleRouterAction.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ToggleRouterAction.java
deleted file mode 100644
index 9735722..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ToggleRouterAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-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.editparts.ConnectionEditPart;
-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.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Toggles routing style for selected connections
- */
-public class ToggleRouterAction extends CheckedPropertyAction {
-
-
-	/**
-	 * @param workbenchPage
-	 * @param routerType
-	 */
-	public ToggleRouterAction(IWorkbenchPage workbenchPage) {
-		super(
-			workbenchPage,
-			Properties.ID_ROUTING,
-			DiagramUIMessages.ChangeRouterAction_ChangePropertyValueRequest_label,
-			Routing.MANUAL_LITERAL);
-		setId(ActionIds.ACTION_TOGGLE_ROUTER);
-	}
-
-	private boolean testTree(Object currentRoutingType) {
-		if (currentRoutingType.equals(Routing.TREE_LITERAL)) {
-			List selected = getSelectedObjects();
-			if (selected.size() < 2) 
-				return false;
-			
-			ListIterator li = selected.listIterator();
-			while (li.hasNext()) {
-				if (!(li.next() instanceof ITreeBranchEditPart))
-					return false;
-			}		
-		}
-		
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction#getNewPropertyValue()
-	 */
-	protected Object getNewPropertyValue() {
-		
-		// Method retrieves the current routing style and returns the next possible choice
-		if (!getOperationSet().isEmpty()) {
-			Object element = getOperationSet().get(0);
-					
-			if (element instanceof ConnectionEditPart) {
-				ConnectionEditPart primaryConnection = (ConnectionEditPart) element;
-				
-				RoutingStyle style = (RoutingStyle) (primaryConnection.getNotationView())
-				.getStyle(NotationPackage.eINSTANCE.getRoutingStyle());
-
-				if (style != null) {
-					Routing currentRouting = style.getRouting();
-					if (currentRouting != null) {
-						for (Iterator iter = Routing.VALUES.iterator(); iter.hasNext();) {
-							if (iter.next().equals(currentRouting) && iter.hasNext()) {						
-								Object currentRoutingType = iter.next();
-								if (testTree(currentRoutingType)) {
-									return currentRoutingType;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return Routing.VALUES.get(0);
-	}
-	
-	/* 
-	 * (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/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ZoomContributionItem.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ZoomContributionItem.java
deleted file mode 100644
index 10bbe1a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/ZoomContributionItem.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.internal.util.IUIConstants;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-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.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @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 ZoomContributionItem extends CustomContributionItem implements ZoomListener, Listener {
-
-	/**
-	 * Custom zoom operations
-	 */
-	private static final String ZOOM_IN = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomIn;
-
-	private static final String ZOOM_OUT = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomOut;
-
-	private static final String ZOOM_100 = DiagramUIMessages.ZoomAction_ZoomCombo_Zoom100;
-
-	private static final String ZOOM_FIT = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomToFit;
-
-	private static final String ZOOM_WIDTH = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomToWidth;
-
-	private static final String ZOOM_HEIGHT = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomToHeight;
-
-	private static final String ZOOM_SELECTION = DiagramUIMessages.ZoomAction_ZoomCombo_ZoomToSelection;
-
-	private static final String ZOOM_IN_ACTION = DiagramUIMessages.ZoomAction_ZoomIn;
-
-	private static final String ZOOM_OUT_ACTION = DiagramUIMessages.ZoomAction_ZoomOut;
-
-	private static final String ZOOM_100_ACTION = DiagramUIMessages.ZoomAction_Zoom100;
-
-	private static final String ZOOM_FIT_ACTION = DiagramUIMessages.ZoomAction_ZoomToFit;
-
-	private static final String ZOOM_WIDTH_ACTION = DiagramUIMessages.ZoomAction_ZoomToWidth;
-
-	private static final String ZOOM_HEIGHT_ACTION = DiagramUIMessages.ZoomAction_ZoomToHeight;
-
-	private static final String ZOOM_SELECTION_ACTION = DiagramUIMessages.ZoomAction_ZoomToSelection;
-
-	/**
-	 * The part's zoom manager
-	 */
-	private ZoomManager zoomManager;
-
-	/**
-	 * The zoom image
-	 */
-	private List<Image> zoomImages = new ArrayList<Image>();
-
-	/**
-	 * constructor
-	 * 
-	 * @param workbenchPage
-	 *            the workbench page
-	 */
-	public ZoomContributionItem(IWorkbenchPage workbenchPage) {
-		super(workbenchPage, ActionIds.CUSTOM_ZOOM);
-		setLabel(DiagramUIMessages.ZoomActionMenu_ZoomLabel);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.actions.CustomContributionItem#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#setWorkbenchPart(org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected void setWorkbenchPart(IWorkbenchPart workbenchPart) {
-		super.setWorkbenchPart(workbenchPart);
-		if (workbenchPart != null)
-			setZoomManager((ZoomManager) workbenchPart.getAdapter(ZoomManager.class));
-	}
-
-	/**
-	 * Returns true if the operation set is not empty and only if the diagram is
-	 * selected.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#calculateEnabled()
-	 */
-	protected boolean calculateEnabled() {
-		return getZoomManager() != null;
-	}
-
-	/**
-	 * Returns the zoomManager.
-	 * 
-	 * @return ZoomManager
-	 */
-	public ZoomManager getZoomManager() {
-		return zoomManager;
-	}
-
-	/**
-	 * Sets the ZoomManager
-	 * 
-	 * @param zm
-	 *            The ZoomManager
-	 */
-	public void setZoomManager(ZoomManager zm) {
-		if (zoomManager == zm)
-			return;
-		if (zoomManager != null)
-			zoomManager.removeZoomListener(this);
-
-		zoomManager = zm;
-		update();
-
-		if (zoomManager != null)
-			zoomManager.addZoomListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.ContributionItem#dispose()
-	 */
-	public void dispose() {
-		if (getZoomManager() != null) {
-			getZoomManager().removeZoomListener(this);
-			zoomManager = null;
-		}
-		for (Image image : zoomImages) {
-			image.dispose();
-		}
-		zoomImages.clear();
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.ZoomListener#zoomChanged(double)
-	 */
-	public void zoomChanged(double zoom) {
-		update();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createControl(Composite parent) {
-		Combo combo = new Combo(parent, SWT.DROP_DOWN);
-		combo.addListener(SWT.Selection, this);
-		combo.addListener(SWT.KeyDown, this);
-		combo.setItems(getZoomLevelsAsText());
-		combo.setVisibleItemCount(IUIConstants.DEFAULT_DROP_DOWN_SIZE);
-		return combo;
-	}
-
-	/**
-	 * @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(DiagramUIPluginImages.get(DiagramUIPluginImages.IMG_ZOOM_IN));
-		return mi;
-	}
-
-	/**
-	 * Creates the zoom menu
-	 * 
-	 * @param mi
-	 */
-	private void createMenu(MenuItem mi) {
-		Menu menu = new Menu(mi.getParent());
-		createMenuItem(menu, ZOOM_IN_ACTION, ZOOM_IN, DiagramUIPluginImages.DESC_ZOOM_IN);
-		createMenuItem(menu, ZOOM_OUT_ACTION, ZOOM_OUT, DiagramUIPluginImages.DESC_ZOOM_OUT);
-		createMenuItem(menu, ZOOM_100_ACTION, ZOOM_100, DiagramUIPluginImages.DESC_ZOOM_100);
-		createMenuItem(menu, ZOOM_FIT_ACTION, ZOOM_FIT, DiagramUIPluginImages.DESC_ZOOM_TOFIT);
-		createMenuItem(menu, ZOOM_WIDTH_ACTION, ZOOM_WIDTH, DiagramUIPluginImages.DESC_ZOOM_TOFIT);
-		createMenuItem(menu, ZOOM_HEIGHT_ACTION, ZOOM_HEIGHT, DiagramUIPluginImages.DESC_ZOOM_TOFIT);
-		createMenuItem(menu, ZOOM_SELECTION_ACTION, ZOOM_SELECTION, DiagramUIPluginImages.DESC_ZOOM_TOFIT);
-		mi.setMenu(menu);
-	}
-
-	/**
-	 * Creates a menu item with a given text and image with the push style
-	 * 
-	 * @param menu
-	 *            The menu
-	 * @param text
-	 *            The menu item text
-	 * @param data
-	 *            The callback data to determine which zoom action to take
-	 * @param imageDescriptor
-	 *            The menu item image
-	 * @return mentu item
-	 */
-	private MenuItem createMenuItem(Menu menu, String text, String data, ImageDescriptor imageDescriptor) {
-		MenuItem mi = new MenuItem(menu, SWT.PUSH);
-		mi.setText(text);
-		mi.setData(data);
-		if (imageDescriptor != null)
-			mi.setImage(createImage(imageDescriptor));
-		mi.addListener(SWT.Selection, this);
-		return mi;
-	}
-
-	/**
-	 * Get the zoom levels as text string array from the zoom manager.
-	 * 
-	 * @return String array with zoom levels.
-	 * 
-	 * @see org.eclipse.gef.editparts.ZoomManager#getZoomLevelsAsText()
-	 */
-	public String[] getZoomLevelsAsText() {
-		int nNumericZoomLevels = (getZoomManager() != null) ? getZoomManager().getZoomLevels().length : 0;
-		String[] allZoomLevels = new String[nNumericZoomLevels + 6];
-
-		allZoomLevels[0] = ZOOM_IN;
-		allZoomLevels[1] = ZOOM_OUT;
-		allZoomLevels[2] = ZOOM_FIT;
-		allZoomLevels[3] = ZOOM_WIDTH;
-		allZoomLevels[4] = ZOOM_HEIGHT;
-		allZoomLevels[5] = ZOOM_SELECTION;
-
-		if (getZoomManager() != null) {
-			String[] numericZoomLevels = getZoomManager().getZoomLevelsAsText();
-			for (int i = 0; i < getZoomManager().getZoomLevels().length; i++) {
-				allZoomLevels[i + 6] = numericZoomLevels[i];
-			}
-		}
-
-		return allZoomLevels;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.action.AbstractContributionItem#refreshItem()
-	 */
-	protected void refreshItem() {
-		if (getZoomManager() != null) {
-			if (getControl() != null) {
-				Combo combo = (Combo) getControl();
-				combo.setItems(getZoomLevelsAsText());
-				String zoom = getZoomManager().getZoomAsText();
-				int index = combo.indexOf(zoom);
-				if (index != -1)
-					combo.select(index);
-				else
-					combo.setText(zoom);
-			}
-		}
-		super.refreshItem();
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void handleEvent(Event event) {
-		// Enter is commonly known as ascii 13 on all platforms. To prevent
-		// casting, this is the same as \r.
-		if (event.type == SWT.KeyDown && event.character != '\r')
-			return;
-		if (getControl() != null)
-			setZoomAsText(((Combo) getControl()).getText());
-		else
-			setZoomAsText((String) event.widget.getData());
-	}
-
-	/**
-	 * Sets the zoom level to the zoom string using the zoom manager. First, it
-	 * checks for the special cases. If it isn't one of the special cases, it
-	 * uses the zoom manager to do the zooming. There are six special cases,
-	 * zoom to fit, zoom in, zoom out, zoom to width, zoom to height, and zoom
-	 * to selected shapes.
-	 * 
-	 * @param zoomText
-	 *            the zoom string which we will zoom to.
-	 * @see org.eclipse.gef.editparts.ZoomManager#setZoomAsText(java.lang.String)
-	 */
-	public void setZoomAsText(String zoomText) {
-		if (ZOOM_IN.equals(zoomText))
-			getZoomManager().zoomIn();
-		else if (ZOOM_OUT.equals(zoomText))
-			getZoomManager().zoomOut();
-		else if (ZOOM_100.equals(zoomText))
-			getZoomManager().setZoom(1);
-		else if (ZOOM_FIT.equals(zoomText))
-			zoomToFit(true, true, false);
-		else if (ZOOM_WIDTH.equals(zoomText))
-			zoomToFit(true, false, false);
-		else if (ZOOM_HEIGHT.equals(zoomText))
-			zoomToFit(false, true, false);
-		else if (ZOOM_SELECTION.equals(zoomText))
-			zoomToFit(true, true, true);
-		else
-			getZoomManager().setZoomAsText(zoomText);
-	}
-
-	/**
-	 * Performs the zoom operation. Always zooms when possible.
-	 * 
-	 * @param onWidth
-	 *            true to perform zoom on the width
-	 * @param onHeight
-	 *            true to perform zoom on the height
-	 * @param selectionOnly
-	 *            true to only zoom the selected items, false to zoom the entire
-	 *            diagram
-	 */
-	protected void zoomToFit(boolean onWidth, boolean onHeight, boolean selectionOnly) {
-		zoomToFit(onWidth, onHeight, selectionOnly, false);
-	}
-
-	/**
-	 * Performs the zoom operation.
-	 * 
-	 * @param onWidth
-	 *            true to perform zoom on the width
-	 * @param onHeight
-	 *            true to perform zoom on the height
-	 * @param selectionOnly
-	 *            true to only zoom the selected items, false to zoom the entire
-	 *            diagram
-	 * @param zoomOutOnly
-	 *            true to only zoom out and avoid zooming to greater than 100%,
-	 *            false to always zoom even if it could make the shapes on the
-	 *            diagram very large
-	 */
-	protected void zoomToFit(boolean onWidth, boolean onHeight, boolean selectionOnly, boolean zoomOutOnly) {
-
-		Iterator editParts;
-		if (selectionOnly) {
-			editParts = getStructuredSelection().iterator();
-		} else {
-			List allEditParts = getDiagramEditPart().getConnections();
-			allEditParts.addAll(getDiagramEditPart().getChildrenAffectingZoom());
-			editParts = allEditParts.iterator();
-		}
-
-		Rectangle targetRegion = null;
-		while (editParts.hasNext()) {
-			IFigure f = ((GraphicalEditPart) editParts.next()).getFigure();
-			targetRegion = targetRegion == null ? f.getBounds().getCopy() : targetRegion.getUnion(f.getBounds());
-		}
-
-		// IF nothing to Zoom...
-		if (targetRegion == null) {
-			// do nothing
-			return;
-		}
-
-		// Translate the region into pixels
-		MapModeUtil.getMapMode(getDiagramEditPart().getFigure()).LPtoDP(targetRegion);
-
-		Viewport viewport = getZoomManager().getViewport();
-
-		float xratio = viewport.getHorizontalRangeModel().getExtent() / (float) targetRegion.width;
-		float yratio = viewport.getVerticalRangeModel().getExtent() / (float) targetRegion.height;
-
-		double zoom = 1.0;
-		if (onHeight && onWidth) {
-			zoom = (yratio < xratio) ? Math.floor(yratio * 100) : Math.floor(xratio * 100);
-		} else if (onWidth) {
-			zoom = Math.floor(xratio * 100);
-		} else if (onHeight) {
-			zoom = Math.floor(yratio * 100);
-		}
-
-		if (zoomOutOnly && zoom >= 100) {
-			// we should always continue in order to set the viewport
-			// location
-			zoom = 100;
-		}
-
-		// apply thresholds
-		Point topLeft = targetRegion.getTopLeft();
-		zoom = Math.min((int) (zoomManager.getMaxZoom() * 100), Math.max((int) (zoomManager.getMinZoom() * 100), zoom));
-
-		int viewX = Math.round(topLeft.x * (float) zoom / 100.0f);
-		int viewY = Math.round(topLeft.y * (float) zoom / 100.0f);
-
-		getZoomManager().setZoom(zoom / 100);
-		viewport.setHorizontalLocation(viewX);
-		viewport.setVerticalLocation(viewY);
-
-		// always refresh the zoom text when zoom to fit,
-		// required when the zoom percentage did not change but we wish
-		// to display the text as a percentage.
-		update();
-	}
-
-	/**
-	 * Creates an image and caches it
-	 * 
-	 * @param descriptor
-	 * @return image
-	 */
-	private Image createImage(ImageDescriptor descriptor) {
-		int index = zoomImages.indexOf(descriptor);
-		if (index != -1)
-			return zoomImages.get(index);
-		Image image = descriptor.createImage();
-		zoomImages.add(image);
-		return image;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/actions/package.html
deleted file mode 100644
index 5b8aab7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java
deleted file mode 100644
index ddb92b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.commands;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager;
-import org.eclipse.gmf.runtime.common.ui.util.CustomData;
-import org.eclipse.gmf.runtime.common.ui.util.CustomDataTransfer;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-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;
-
-/**
- * Abstract parent for all concrete clipboard commands used for IViews
- * 
- * @author Vishy Ramaswamy
- */
-public abstract class ClipboardCommand extends AbstractTransactionalCommand {
-    /**
-     * String constant for the clipboard format
-     */
-    public static final String DRAWING_SURFACE = "Drawing Surface"; //$NON-NLS-1$
-
-    /**
-     * The target <code>View</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 ClipboardCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param viewContext The target view used as a context for the clipboard operations
-     */
-    public ClipboardCommand(TransactionalEditingDomain editingDomain, View viewContext) {
-        this(editingDomain, null, viewContext);
-    }
-
-    /**
-     * Constructor for ClipboardCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label The label for the command
-     * @param viewContext The target view used as a context for the clipboard operations
-     */
-    public ClipboardCommand(TransactionalEditingDomain editingDomain, 
-        String label,
-        View viewContext) {
-        super(editingDomain, label, getWorkspaceFiles(viewContext));
-
-        Assert.isNotNull(viewContext);
-
-        this.viewContext = viewContext;
-    }
-
-    /**
-     * Copies the list of views to the system clipboard by delegating the
-     * serialization exercise to the view context's <code>IViewModel</code>
-     * 
-     * @param source The list of views to be copied
-     */
-    protected void copyToClipboard(List source) {
-        /* Check if the source has elements */
-        if (source == null || source.size() == 0) {
-            return;
-        }
-
-        /* Copy the views */
-        CustomData data =
-                new CustomData(
-                    DRAWING_SURFACE,
-                    copyViewsToString(source).getBytes());
-
-        /* Add the data to the clipboard manager */
-        if (data != null) {
-            ClipboardManager.getInstance().addToCache(
-                new ICustomData[] { data },
-                CustomDataTransfer.getInstance());
-        }
-    }
-
-    /**
-     * Returns the viewContext.
-     * @return IView
-     */
-    protected View getViewContext() {
-        return viewContext;
-    }
-
-	/**
-	 * convert a <code>List</code> of <code>View</code>s to a string, using
-	 * the serialized representation of each view
-	 * @param views
-	 * @return string representation of all supplied views
-	 */
-	public static String copyViewsToString(List views) {
-		Assert.isNotNull(views);
-		Assert.isTrue(views.size() > 0);
-
-		/* Create an empty selection */
-		List selection = new ArrayList();
-
-		/* views iterator */
-		Iterator iter = views.iterator();
-		
-		/* Add the elements to the selection */
-		while (iter.hasNext()) {
-			EObject viewElement =(View)iter.next();
-			if (viewElement != null) {
-				selection.add(viewElement);
-			}
-		}
-		
-		/*
-		 * We must append all inner edges of a node being copied. Edges are non-containment
-		 * references, hence they won't be copied for free. Therefore, we add them here to
-		 * the list of views to copy.
-		 */
-		List<Edge> innerEdges = new LinkedList<Edge>();
-		for (Iterator itr = views.iterator(); itr.hasNext();) {
-			View view = (View) itr.next();
-			if (!(view instanceof Diagram)) {
-				innerEdges.addAll(ViewUtil.getAllInnerEdges(view));
-			}
-		}
-		selection.addAll(innerEdges);
-
-		// add the measurement unit in an annotation.  Put it in the last position
-		//   to work around a limitation in the copy/paste infrastructure, that
-		//   selects the ClipboardSupportFactory based on the first element in
-		//   the copy list.  If the annotation is first, then we get the wrong
-		//   clipboard support instance
-		View firstView = (View)views.get(0);
-		Diagram dgrm = firstView.getDiagram();
-		EAnnotation measureUnitAnnotation  = EcoreFactory.eINSTANCE.createEAnnotation();
-		measureUnitAnnotation.setSource(dgrm.getMeasurementUnit().getName());
-		selection.add(measureUnitAnnotation);
-
-		/* Copy the selection to the string */
-		return ClipboardUtil.copyElementsToString(selection,
-			new HashMap(), new NullProgressMonitor()); 	
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/CopyCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/CopyCommand.java
deleted file mode 100644
index af523d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/CopyCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.commands;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-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.notation.View;
-/**
- * Copy Command used to copy the list of <code>IView</code> to the system
- * clipboard
- * 
- * @author Vishy Ramaswamy
- */
-public class CopyCommand extends ClipboardCommand {
-    /**
-     * The list of <code>View</code> used for the copy operation
-     */
-    private final List source;
-
-    /**
-     * Constructor for CopyCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param viewContext
-     * @param source
-     */
-    public CopyCommand(TransactionalEditingDomain editingDomain, 
-        View viewContext,
-        List source) {
-        this(editingDomain, null, viewContext, source);
-    }
-
-    /**
-     * Constructor for CopyCommand.
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label
-     * @param viewContext
-     * @param source
-     */
-    public CopyCommand(TransactionalEditingDomain editingDomain, 
-        String label,
-        View viewContext,
-        List source) {
-        super(editingDomain, label, viewContext);
-
-        Assert.isNotNull(source);
-        this.source = source;
-    }
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-        /* Copy all the views */
-        copyToClipboard(getSource());
-        return CommandResult.newOKCommandResult();
-    }
-
-    /**
-     * Returns the source.
-     * @return List
-     */
-    public List getSource() {
-        return source;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/DuplicateViewsCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/DuplicateViewsCommand.java
deleted file mode 100644
index 04f84fc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/DuplicateViewsCommand.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.commands;
-
-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.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-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.diagram.ui.requests.DuplicateRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
-import org.eclipse.gmf.runtime.notation.Bounds;
-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.View;
-
-/**
- * This command duplicates a list of notational views and adds each duplicate to
- * it's originator's container. It also duplicates the semantic element that the
- * view references (if it does reference a semantic element). All references
- * between views and elements that are duplicated are updated to refer to the
- * new duplicated objects.
- * 
- * <p>
- * The command returns the new duplicated views.
- * </p>
- * 
- * @author cmahoney
- */
-public class DuplicateViewsCommand
-	extends DuplicateEObjectsCommand {
-
-	/**
-	 * This is a map passed in by the client of all the elements that have been
-	 * duplicated (key is original element, value is duplicated element) so that
-	 * the views that are duplicated can be updated to point to the
-	 * corresponding duplicated element.
-	 */
-	Map duplicatedElements;
-
-	/**
-	 * This will be populated with the views that are duplicated after the
-	 * command executes.
-	 */
-	List duplicatedViewsToBeReturned = new ArrayList();
-	
-	private Point offset = new Point(0, 0);
-
-	/**
-     * Creates a new <code>DuplicateViewsCommand</code>.
-     * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label
-     *            the command label
-     * @param request
-     *            the <code>DuplicateElementsRequest</code> whose list of
-     *            duplicated views will be populated
-     * @param viewsToDuplicate
-     *            the views to be duplicated
-     * @param duplicatedElements
-     *            the map of elements that were duplicated that should be used
-     *            to change the duplicated views to reference its dupliated
-     *            element (if applicable)
-     * @param offset
-     *            the offset from the location of the original views where the
-     *            new views will be placed.
-     */
-	public DuplicateViewsCommand(TransactionalEditingDomain editingDomain, String label, DuplicateRequest request,
-			List viewsToDuplicate, Map duplicatedElements, Point offset) {
-		super(editingDomain, label, viewsToDuplicate);
-		this.duplicatedElements = duplicatedElements;
-		duplicatedViewsToBeReturned = request.getDuplicatedViews();
-		this.offset = offset;
-	}
-
-	/**
-     * Creates a new <code>DuplicateViewsCommand</code>.
-     * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param label
-     *            the command label
-     * @param request
-     *            the <code>DuplicateElementsRequest</code> whose list of
-     *            duplicated views will be populated
-     * @param viewsToDuplicate
-     *            the views to be duplicated
-     * @param offset
-     *            the offset from the location of the original views where the
-     *            new views will be placed.
-     */
-	public DuplicateViewsCommand(TransactionalEditingDomain editingDomain, String label, DuplicateRequest request,
-			List viewsToDuplicate, Point offset) {
-		this(editingDomain, label, request, viewsToDuplicate, null, offset);
-	}
-
-	/**
-	 * Overridden to association the duplicated views with the duplicated
-	 * elements.
-	 */
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		CommandResult result = super.doExecuteWithResult(progressMonitor, info);
-
-		if (!result.getStatus().isOK()) {
-			return result;
-		}
-
-		for (Iterator iter = getObjectsToBeDuplicated().iterator(); iter
-			.hasNext();) {
-			View originalView = (View) iter.next();
-			View duplicateView = (View) getAllDuplicatedObjectsMap().get(
-				originalView);
-
-            // Update the duplicated views to reference the duplicated elements.
-			assignSementicElementsDownViewTree(duplicateView);
-            
-			
-			/**
-			 * TODO: sourceRefs and targetRefs seem to be completely
-			 * unnecessary. Look into removing the code below.
-			 * Commented out for now.
-			 */
-			// Remove source and target edges that were not duplicated.
-//			List sourceRefs = new ArrayList(ViewUtil.getSourceConnections(duplicateView));
-//			for (Iterator iterator = sourceRefs.iterator(); iterator.hasNext();) {
-//				EObject edge = (EObject) iterator.next();
-//				if (!getAllDuplicatedObjectsMap().containsValue(edge)) {
-//					sourceRefs.remove(edge);
-//				}
-//			}
-//			List targetRefs = new ArrayList(ViewUtil.getTargetConnections(duplicateView));
-//			for (Iterator iterator = targetRefs.iterator(); iterator.hasNext();) {
-//				EObject edge = (EObject) iterator.next();
-//				if (!getAllDuplicatedObjectsMap().containsValue(edge)) {
-//					targetRefs.remove(edge);
-//				}
-//			}
-
-			if (duplicateView instanceof Node) {
-				// Change the location of the duplicated views.
-				LayoutConstraint layoutConstraint = ((Node) duplicateView)
-					.getLayoutConstraint();
-				if (layoutConstraint instanceof Bounds) {
-					Bounds bounds = (Bounds) layoutConstraint;
-					int x = bounds.getX();
-					bounds.setX(x + offset.x);
-					int y = bounds.getY();
-					bounds.setY(y + offset.y);
-				}
-			} else if (duplicateView instanceof Edge) {
-                assert originalView instanceof Edge;
-                
-                // If the source/target wasn't duplicated, then the copier
-                // would not have set the source/target.
-                Edge duplicateEdge = (Edge) duplicateView;
-                Edge originalEdge = (Edge) originalView;
-
-                boolean sourceDuplicated = duplicateEdge.getSource() != null;
-                boolean targetDuplicated = duplicateEdge.getTarget() != null;
-
-                if (!sourceDuplicated) {
-                    duplicateEdge.setSource(originalEdge.getSource());
-                }
-                if (!targetDuplicated) {
-                    duplicateEdge.setTarget(originalEdge.getTarget());
-                }
-            }
-
-			if (duplicateView != null) {
-				duplicatedViewsToBeReturned.add(duplicateView);
-			}
-		}
-
-		return CommandResult.newOKCommandResult(duplicatedViewsToBeReturned);
-
-	}
-	
-	/**
-	 * Assign semantic elements (if there are any to add) 
-	 * to all children of a view down the view tree hierarchy
-	 * 
-	 * @param view the view tree hierarchy root
-	 */
-	private void assignSementicElementsDownViewTree(View view) {
-		EObject originalElement = view.getElement();
-		if (originalElement != null) {
-			Object duplicateElement = duplicatedElements.get(originalElement);
-			if (duplicateElement != null) {
-				view.setElement((EObject) duplicateElement);
-			}
-		}
-		for (Iterator itr = view.getChildren().iterator(); itr.hasNext();) {
-			assignSementicElementsDownViewTree((View) itr.next());
-		}
-	}
-    
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ElementTypeLabelProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ElementTypeLabelProvider.java
deleted file mode 100644
index 2999598..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ElementTypeLabelProvider.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.diagram.ui.internal.commands;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * A label provider that provides the name and image for 
- * <code>IElementType</code> objects. 
- * 
- * @author cmahoney
- */
-public class ElementTypeLabelProvider
-	extends LabelProvider {
-
-	/**
-	 * Retrieves the image for <code>IElementType</code> objects using
-	 * the <code>IconService</code>.
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object) {
-		if (object instanceof IElementType) {
-			return IconService.getInstance()
-				.getIcon((IElementType) object);
-		}
-		return null;
-	}
-
-	/**
-	 * Uses <code>IElementType.getDisplayName()</code> for the text.
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		if (object instanceof IElementType) {
-			return ((IElementType) object).getDisplayName();
-		} else {
-			return object.toString();
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/MakeDiagramUnmodifiableCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/MakeDiagramUnmodifiableCommand.java
deleted file mode 100644
index 5717858..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/MakeDiagramUnmodifiableCommand.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.diagram.ui.internal.commands;
-
-import org.eclipse.gef.commands.Command;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-
-
-/**
- * <p>
- * Performs whatever operations are necessary to make a diagram unmodifiable.
- * </p>
- * <p>
- * <LI>Parts should not be movable</LI>
- * <LI>Parts with compartments should not have the capability to expand/collapse the compartment</LI>
- * <LI>Parts should not allow a user to modify the name of the underlying semantic elements</LI>
- * <LI>The diagram and its parts should not produce any usable action bars</LI>
- * </p>
- * 
- * @author cmcgee
- */
-public class MakeDiagramUnmodifiableCommand
-	extends Command {
-	private DiagramEditPart diagramPart;
-	private boolean modify;
-	
-	/**
-	 * Constructs a command to make a diagram unmodifyable or modifyable.
-	 * 
-	 * @param part The diagram edit part for the diagram.
-	 * @param modify true/false whether the diagram should be modifyable.
-	 */
-	public MakeDiagramUnmodifiableCommand(DiagramEditPart part, boolean modify) {
-		diagramPart = part;
-		this.modify = modify;
-	}
-	
-	public void execute() {
-		setModifiable(diagramPart,modify);
-		diagramPart = null;//for garbage collection
-	}
-	
-	/**
-	 * Sets a diagram edit part as modifiable or not.
-	 * 
-	 * @param part A valid diagram edit part.
-	 * @param modify true/false whether the diagram should be modifyable.
-	 */
-	public static void setModifiable(DiagramEditPart part ,boolean modify) {
-		if (modify) {
-			part.enableEditMode();
-		} else {
-			part.disableEditMode();
-		}
-	} 
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/RefreshEditPartCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/RefreshEditPartCommand.java
deleted file mode 100644
index f562407..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/RefreshEditPartCommand.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.gef.EditPartViewer;
-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.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.osgi.util.NLS;
- 
-/**
- * Command to refresh and revalidate a given <code>IGraphicalEditPart</code>
- * @author sshaw
- */
-public class RefreshEditPartCommand 
-	extends AbstractCommand {
-
-	private View notation;
-	private EditPartViewer viewer;
-	private boolean revalidate;
-	
-	/**
-	 * constructor
-	 * @param editPart edit part to use 
-	 * @param revalidate revalidate flag
-	 */
-	public RefreshEditPartCommand(IGraphicalEditPart editPart, boolean revalidate) {
-		super(StringStatics.BLANK, null);
-		this.revalidate = revalidate;
-		notation = (View)editPart.getModel();
-		viewer = editPart.getRoot().getViewer();
-	}
-	
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		Map epRegistry = viewer.getEditPartRegistry();
-		IGraphicalEditPart editPart = (IGraphicalEditPart)epRegistry.get(notation);
-
-		if ( editPart != null ) {
-			editPart.refresh();
-		
-			if (revalidate) {
-				editPart.getFigure().invalidate();
-				editPart.getFigure().validate();
-			}
-		}
-		else {
-			//
-			// problem with editpart registry
-			String eMsg = NLS.bind(  
-				DiagramUIMessages.RefreshEditPartCompartment_execute_failed_ERROR_,
-				notation);
-			Log.error( DiagramUIPlugin.getInstance(), IStatus.ERROR, eMsg);
-		}
-
-		notation = null; // for garbage collection
-		viewer = null; // for garbage collection
-		return CommandResult.newOKCommandResult();
-	}
-
-    public boolean canRedo() {
-		return true;
-	}
-
-    public boolean canUndo() {
-		return true;
-	}
-
-    protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		return CommandResult.newOKCommandResult();
-	}
-
-    protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		return CommandResult.newOKCommandResult();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetCompartmentRatioCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetCompartmentRatioCommand.java
deleted file mode 100644
index 4bb7be1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetCompartmentRatioCommand.java
+++ /dev/null
@@ -1,82 +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.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.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.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-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.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Ratio;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Sets the ratio for the resizable compartment, where the default ratio is -1
- * This command might create/destroy the Ratio layout constraint of the compartment
- * It will destroy it if the ratio is set to default and there is a ratio
- * It will create it if the ratio is not default and there was no ratio 
- * otherwise it will just set the ratio's value
- * 
- * @author melaasar
- */
-public class SetCompartmentRatioCommand extends SetPropertyCommand {
-
-	/**
-	 * constructor
-     * @param editingDomain the editing domain
-	 * @param viewAdapter adapter that can adapt to <code>View.class</code>
-	 * @param newValue the new value of the ratio
-	 */
-	public SetCompartmentRatioCommand(TransactionalEditingDomain editingDomain,
-            IAdaptable viewAdapter, double newValue) {
-		super(editingDomain, viewAdapter, Properties.ID_RATIO, Properties.ID_RATIO, new Double(newValue));
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		View view = (View)getViewAdapter().getAdapter(View.class);
-		if (view != null) {
-			Node node = (Node)view;
-			Ratio ratio = (Ratio) node.getLayoutConstraint(); 
-
-			if (((Double)getNewValue()).doubleValue() == -1) {
-				if (ratio != null)
-					DestroyElementCommand.destroy(ratio);
-			} else {
-				if (ratio == null) {
-					ratio = NotationFactory.eINSTANCE.createRatio();
-					node.setLayoutConstraint(ratio);
-				}
-				if (getPropertyId() instanceof String){
-					ENamedElement namedElement = PackageUtil.getElement((String)getPropertyId());
-					if (namedElement instanceof EStructuralFeature)
-						ViewUtil.setStructuralFeatureValue(view,(EStructuralFeature)namedElement, getNewValue());
-				}
-				
-			}
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetConnectionBendpointsCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetConnectionBendpointsCommand.java
deleted file mode 100644
index 0982284..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SetConnectionBendpointsCommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
-
-/**
- * @author melaasar
- */
-public class SetConnectionBendpointsCommand extends AbstractTransactionalCommand {
-	private IAdaptable edgeAdapter;
-	private PointList newPointList;
-	private Point sourceRefPoint;
-	private Point targetRefPoint;
-	
-	/**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @see java.lang.Object#Object()
-	 */
-	public SetConnectionBendpointsCommand(TransactionalEditingDomain editingDomain) {
-		super(editingDomain, DiagramUIMessages.Commands_SetBendpointsCommand_Label,  null);
-	}
-
-	public List getAffectedFiles() {
-		View view = (View) edgeAdapter.getAdapter(View.class);
-		if (view != null)
-			return getWorkspaceFiles(view);
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * Returns the edgeAdaptor.
-	 * @return IAdaptable
-	 */
-	public IAdaptable getEdgeAdaptor() {
-		return edgeAdapter;
-	}
-
-	/**
-	 * Returns the targetRefPoint.
-	 * @return Point
-	 */
-	public Point getTargetRefPoint() {
-		return targetRefPoint;
-	}
-
-	/**
-	 * Returns the newPointList.
-	 * @return PointList
-	 */
-	public PointList getNewPointList() {
-		return newPointList;
-	}
-
-	/**
-	 * Returns the sourceRefPoint.
-	 * @return Point
-	 */
-	public Point getSourceRefPoint() {
-		return sourceRefPoint;
-	}
-
-	/**
-	 * Sets the edgeAdaptor.
-	 * @param edgeAdapter The edgeAdaptor to set
-	 */
-	public void setEdgeAdapter(IAdaptable edgeAdapter) {
-		this.edgeAdapter = edgeAdapter;
-	}
-
-	/**
-	 * Method setNewPointList.
-	 * @param newPointList
-	 * @param sourceRefPoint
-	 * @param targetRefPoint
-	 */
-	public void setNewPointList(
-		PointList newPointList,
-		Point sourceRefPoint,
-		Point targetRefPoint) {
-		this.newPointList = new PointList(newPointList.size());
-		for (int i = 0; i < newPointList.size(); i++) {
-			this.newPointList.addPoint(newPointList.getPoint(i));
-		}
-		this.sourceRefPoint = sourceRefPoint;
-		this.targetRefPoint = targetRefPoint;
-	}
-
-	/**
-	 * set a new point list
-	 * @param newPointList	the new point list to set
-	 * @param sourceAnchor	
-	 * @param targetAnchor
-	 */
-	public void setNewPointList(
-		PointList newPointList,
-		ConnectionAnchor sourceAnchor,
-		ConnectionAnchor targetAnchor) {
-
-		this.newPointList = new PointList(newPointList.size());
-		for (int i = 0; i < newPointList.size(); i++) {
-			this.newPointList.addPoint(newPointList.getPoint(i));
-		}
-		if (sourceAnchor != null) {
-			sourceRefPoint = sourceAnchor.getReferencePoint();
-			sourceAnchor.getOwner().translateToRelative(sourceRefPoint);
-		}
-		if (targetAnchor != null) {
-			targetRefPoint = targetAnchor.getReferencePoint();
-			targetAnchor.getOwner().translateToRelative(
-				targetRefPoint);
-		}
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		Assert.isNotNull(newPointList);
-		Assert.isNotNull(sourceRefPoint);
-		Assert.isNotNull(targetRefPoint);
-
-		Edge edge =
-			(Edge) getEdgeAdaptor().getAdapter(Edge.class);
-		Assert.isNotNull(edge);
-
-		List newBendpoints = new ArrayList();
-		int numOfPoints = newPointList.size();
-		for (short i = 0; i < numOfPoints; i++) {
-			Dimension s = newPointList.getPoint(i).getDifference(sourceRefPoint);
-			Dimension t = newPointList.getPoint(i).getDifference(targetRefPoint);
-			newBendpoints.add(new RelativeBendpoint(s.width, s.height, t.width, t.height));
-		}
-
-		RelativeBendpoints points = (RelativeBendpoints) edge.getBendpoints();
-		points.setPoints(newBendpoints);
-		return CommandResult.newOKCommandResult();
-	}
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SnapCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SnapCommand.java
deleted file mode 100644
index 346ea88..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/SnapCommand.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    Michael Golubev (Borland) - Fix for Bug 261192
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.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.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionDimension;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-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.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command is used to snap edit parts on a diagram, where the edit parts are
- * passed in as the parameter.
- * 
- * @author carson_li
- */
-public class SnapCommand extends AbstractTransactionalCommand {
-
-	/** the edit parts requested to be snapped to grid */
-	protected List<? extends IGraphicalEditPart> editparts;
-
-	/**
-	 * Constructor for <code>SnapCommand</code>.
-	 * 
-	 * @param editingDomain
-	 *            the editing domain through which model changes are made
-	 * @param editparts
-	 *            the list containing the edit parts that need to be snapped
-	 */
-	public SnapCommand(TransactionalEditingDomain editingDomain, List<? extends IGraphicalEditPart> editparts) {
-
-		super(editingDomain, DiagramUIMessages.SnapToGrid_textLabel, null);
-		this.editparts = editparts;
-
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#getAffectedFiles()
-	 */
-	public List getAffectedFiles() {
-		if (editparts != null) {
-			// we only need the first child since all the edit parts being
-			// snapped originate from the same diagram
-			IGraphicalEditPart parent = (IGraphicalEditPart) editparts.get(0);
-			View view = (View) parent.getPrimaryView();
-			return getWorkspaceFiles(view);
-		}
-		return super.getAffectedFiles();
-	}
-
-	/**
-	 * Executes a snap command for all the desired edit parts.
-	 * 
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor progressMonitor, IAdaptable info)
-			throws ExecutionException {
-
-		CompositeTransactionalCommand snapCommand = new CompositeTransactionalCommand(getEditingDomain(), getLabel());
-
-		for (IGraphicalEditPart newEditPart : editparts) {
-			if (newEditPart.getModel() instanceof Node) {
-
-				LayoutConstraint constraint = ((Node) newEditPart.getModel()).getLayoutConstraint();
-				if (constraint instanceof Bounds) {
-					
-					Bounds bounds = (Bounds) constraint;
-					ChangeBoundsRequest request = new ChangeBoundsRequest(RequestConstants.REQ_MOVE);
-					request.setEditParts(newEditPart);
-
-					// translate all coordinates to device units as a standard if necessary
-					// this is done since moveDelta uses device units
-					
-					PrecisionDimension moveDeltaDim = new PrecisionDimension(bounds.getX()
-                        - newEditPart.getFigure().getBounds().x, bounds.getY()
-                        - newEditPart.getFigure().getBounds().y);
-					/*
-					 * Distance in pixels needs to be scaled by the scaling factor of the zoom tool, i.e. ScaledRootEditPart
-					 */
-					newEditPart.getFigure().translateToAbsolute(moveDeltaDim);
-					PrecisionPoint moveDelta = new PrecisionPoint(moveDeltaDim.preciseWidth(), moveDeltaDim.preciseHeight());
-
-					// In the case that the figure bounds and model's layout constant are the same,
-					// xDiff and yDiff will evaluate to zero, but snapToHelper will still locate the closest
-					// NorthWest snap locations. In the case that they're not, we assume the figure's bounds
-					// have not been updated, so the moveDelta value will simulate a drag to the new location
-					// In both situations we base the resulting snap location off the figure's bounds
-
-					// snapToGrid logic taken from DragEditPartsTracker.java
-					request.getExtendedData().clear();
-					request.setMoveDelta(moveDelta);
-
-					PrecisionRectangle figureBounds = null;
-					IFigure figure = newEditPart.getFigure();
-					if (figure instanceof HandleBounds) {
-						figureBounds = new PrecisionRectangle(
-								((HandleBounds) figure).getHandleBounds());
-					} else {
-						figureBounds = new PrecisionRectangle(figure.getBounds());
-					}
-
-					figure.translateToAbsolute(figureBounds);
-				
-					SnapToHelper snapToHelper = (SnapToHelper) newEditPart.getAdapter(SnapToHelper.class);
-					PrecisionRectangle baseRect = new PrecisionRectangle(figureBounds);
-					baseRect.translate(moveDelta);
-
-					if (snapToHelper != null) {
-						snapToHelper.snapPoint(request,
-								PositionConstants.HORIZONTAL | PositionConstants.VERTICAL,
-								new PrecisionRectangle[] { baseRect },	moveDelta);
-						request.setMoveDelta(moveDelta);
-					}
-
-					Command gefMove = newEditPart.getCommand(request);
-					if (gefMove != null){
-						snapCommand.add(new CommandProxy(gefMove));	
-					}
-					
-				}
-			}
-		}
-
-		if (snapCommand != null && snapCommand.canExecute()) {
-			snapCommand.execute(progressMonitor, info);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ToggleCanonicalModeCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ToggleCanonicalModeCommand.java
deleted file mode 100644
index 3b3f8bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ToggleCanonicalModeCommand.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.commands;
-
-import java.lang.ref.WeakReference;
-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.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.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-
-/**
- * A command that will enable/disable the canonical editpolicy 
- * installed on the supplied editparts.
- * @author mhanner
- */
-public class ToggleCanonicalModeCommand extends Command {
-
-	/** enablement flag. */
-	private boolean _enable;
-	
-	/** list of semantic elements canonical editpolicies are listening to. */
-	private Collection _semanticHosts = new ArrayList();
-    
-    // an operation to enable undo using Transaction API is possible
-    private AbstractEMFOperation op = null;
-
-    // domain to use to record the change that will happenwhen we re-enable the edit policy
-    private TransactionalEditingDomain domain;
-	
-	/**
-	 * Create an instance.
-	 * @param editParts collection of editparts who's canonical editpolicies will be affected.
-	 * @param enable enablement flag
-	 */
-	public ToggleCanonicalModeCommand(Collection editParts, boolean enable) {
-		super(DiagramUIMessages.ToggleCanonicalModeCommand_Label); 
-		Object[] editparts = new Object[editParts.size()];
-		editParts.toArray(editparts);
-		for ( int i = 0; i < editparts.length; i++ ) {
-			EditPart editPart = (EditPart)editparts[i];
-			if (editPart != null) {
-				CanonicalEditPolicy editPolicy = getCanonicalEditPolicy(editPart);
-				if ( editPolicy != null ) {
-					_semanticHosts.add( new WeakReference(editPolicy.getSemanticHost()) );
-				}
-			}
-		}
-		_enable = enable;
-	}
-	
-	/**
-	 * Create an instance.
-	 * @param element a semantic element
-	 * @param enable enablement flag
-	 */
-	public ToggleCanonicalModeCommand( EObject element, boolean enable ) {
-		super(DiagramUIMessages.ToggleCanonicalModeCommand_Label);
-		_semanticHosts.add( new WeakReference(element) );
-		_enable = enable;
-	}
-		
-	/**
-	 * Create an instance.
-	 * @param target the target editpart
-	 * @param enable the enablement flag
-	 */
-	public ToggleCanonicalModeCommand(EditPart target, boolean enable) {
-		this( Collections.singletonList(target), enable);
-	}
-	
-	/**
-	 * <code>ToggleCanonicalModeCommand</code> factory method.  
-	 * @param editParts collection of editparts who's canonical editpolicies will be affected.
-	 * @param enable enablement flag
-	 * @return a <code>ToggleCanonicalModeCommand</code> if at least one of the supplied editparts
-	 * has a <code>CanonicalEditPolicy</code> installed on it, otherwise <tt>null</tt>.
-	 */
-	public static ToggleCanonicalModeCommand getToggleCanonicalModeCommand( Collection editParts, boolean enable) {
-		ToggleCanonicalModeCommand cmd = new ToggleCanonicalModeCommand( editParts, enable );
-		return cmd.getSemanticHosts().isEmpty() ? null : cmd;
-	}
-	
-	/**
-	 * <code>ToggleCanonicalModeCommand</code> factory method.  This copy constructor style factory
-	 * will return a new command that shares the supplied commands semantic hosts.
-	 * @param tcmd a <code>ToggleCanonicalModeCommand</code>
-	 * @param enable enablement flag
-	 * @return a <code>ToggleCanonicalModeCommand</code> if at least one of the supplied editparts
-	 * has a <code>CanonicalEditPolicy</code> installed on it, otherwise <tt>null</tt>.
-	 */
-	public static ToggleCanonicalModeCommand getToggleCanonicalModeCommand( ToggleCanonicalModeCommand tcmd, boolean enable) {
-		if ( tcmd == null  || tcmd.getSemanticHosts().isEmpty() ) {
-			return null;
-		}
-		ToggleCanonicalModeCommand cmd = new ToggleCanonicalModeCommand( Collections.EMPTY_LIST, enable );
-		cmd.setSemanticHosts( tcmd.getSemanticHosts() );
-		return cmd;
-	}
-
-	/**
-	 * Return the set of semantic hosts on which a canonical editpolicy is listening. 
-	 * @return semantic hosts
-	 */
-	protected final Collection getSemanticHosts() {
-		return _semanticHosts;
-	}
-	
-	private final void setSemanticHosts( Collection hosts ) {
-		_semanticHosts.clear();
-		_semanticHosts.addAll(hosts);
-	}
-	
-	/**
-	 * Return the canonical editpolicy installed on the supplied editpart.
-	 * @param editPart edit part to use
-	 * @return the canoncial edit policy if there is any
-	 */
-	protected static CanonicalEditPolicy getCanonicalEditPolicy(
-            EditPart editPart) {
-
-        // If the editpart is a group, then we want to get the first parent
-        // that isn't a group and get the canonical editpolicy there.
-        while (editPart instanceof GroupEditPart) {
-            editPart = editPart.getParent();
-        }
-
-        return (CanonicalEditPolicy) editPart
-            .getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-    }
-	
-	/** Removes the canonical editpolict from the target editpart. */ 
-	public void execute() {
-        // try to record only if we are enabling the edit policy
-        if (_enable && domain != null) {
-            op = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
-
-                protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
-                    throws ExecutionException {
-                    DoEnable(_enable);
-                    return Status.OK_STATUS;
-                }
-                
-            };
-            try {
-                op.execute(null, null);
-            } catch (ExecutionException e) {
-                //I give up... just do the enable.
-                DoEnable(_enable);
-            }
-        }else{
-			DoEnable(_enable);
-		}
-	}
-
-	/** 
-	 * Enables the canonical editpolicies listening of the list of
-	 * semantic elements. 
-	 * @param enable enablement flag
-	 */
-	private void DoEnable(boolean enable) {
-		Iterator references = getSemanticHosts().iterator();
-		while( references.hasNext() ) {
-			WeakReference wr = (WeakReference)references.next();
-			EObject semanticHost = (EObject)wr.get();
-			if (semanticHost != null) {
-				List ceps = CanonicalEditPolicy.getRegisteredEditPolicies(semanticHost);
-				for ( int i = 0; i < ceps.size(); i++ ) {
-					CanonicalEditPolicy cep = (CanonicalEditPolicy)ceps.get(i);
-					cep.enableRefresh(enable); 
-				}
-			}
-		}	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.commands.Command#redo()
-	 */
-	public void redo() {
-		if (op != null) {
-			try {
-				op.redo(null, null);
-			} catch (ExecutionException e) {
-				// Give up...
-			}
-		}
-		DoEnable(_enable);
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.commands.Command#undo()
-     */
-    public void undo() {
-        // the enable is not an EMF command, so we had to undo it manually before undo the EMF operation
-        DoEnable(!_enable);
-        if (op != null) {
-            try {
-                op.undo(null, null);
-            } catch (ExecutionException e) {
-                // Give up...
-            }
-        }
-    }
-    
-    public void setDomain(TransactionalEditingDomain d) {
-        domain = d;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupConfigBlock.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupConfigBlock.java
deleted file mode 100644
index 5661dfc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupConfigBlock.java
+++ /dev/null
@@ -1,951 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.dialogs;
-
-
-import java.text.ParseException;
-import java.util.ArrayList;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.DefaultValues;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.ILabels;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupPageType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupWidgetFactory;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-
-import com.ibm.icu.text.NumberFormat;
-
-/**
- * PSConfigurationBlock implements part of PSDialog allowing the user to configure
- * the following printing preferences:
- * 
- * 1. Measurement units
- * 2. Page orientation
- * 3. Page size
- * 4. Page margins
- * 
- * PSConfiguration Block is also used by PSPreferencePage.
- * 
- * @author etworkow
- */
-public class PageSetupConfigBlock implements ILabels {
-	
-	private Button 
-		fButtonPortrait, 
-		fButtonLandscape, 
-		fButtonInches, 
-		fButtonMillimetres;
-	
-	private Label
-		fLabelSize,
-		fLabelWidth,
-		fLabelUnitWidth,
-		fLabelHeight,
-		fLabelMarginTop,
-		fLabelUnitMarginTop,
-		fLabelMarginBottom,
-		fLabelMarginLeft,
-		fLabelUnitMarginLeft,
-		fLabelMarginRight;
-	
-	private Combo 
-		fComboSize;
-	
-	private Text
-		fTextWidth,
-		fTextHeight,
-		fTextMarginTop,
-		fTextMarginBottom,
-		fTextMarginLeft,
-		fTextMarginRight;
-	
-	private Initializer fInitialier;
-	private Persistor fPersistor;
-	private Convertor fConvertor;
-	
-	private PageSetupDialog fParentDialog;
-	private PrintingPreferencePage fPreferencePage;
-	
-	private ArrayList fControls = new ArrayList();
-	private IPreferenceStore fStore;
-	private String fCurrentUnit;
-	private NumberFormat fNumberFormat;
-	
-	/**
-	 * Creates an instance of PageSetupConfigBlock.
-	 * 
-	 * @param store Preference store for storing and reading preferences.
-	 */
-	public PageSetupConfigBlock(IPreferenceStore store) {
-		fInitialier = new Initializer(this);
-		fPersistor = new Persistor(this);
-		fConvertor = new Convertor(this);
-		fStore = store;
-		fNumberFormat = NumberFormat.getNumberInstance();
-	}
-	
-	/**
-	 * Creates an instance of PageSetupConfigBlock.
-	 * 
-	 * @param store Preference store for storing and reading preferences.
-	 * @param parentDialog Dialog containing this Page Setup Configuration Block.
-	 */
-	public PageSetupConfigBlock(IPreferenceStore store, PageSetupDialog parentDialog) {
-		this(store);
-		fParentDialog = parentDialog;
-	}
-	
-	/**
-	 * Creates an instance of PageSetupConfigBlock.
-	 * 
-	 * @param store Preference store for storing and reading preferences.
-	 */
-	public PageSetupConfigBlock(IPreferenceStore store, PrintingPreferencePage preferencePage) {
-		this(store);
-		fPreferencePage = preferencePage;
-	}
-	
-	/**
-	 * Add page setup tab to Page Setup Dialog composite.
-	 * 
-	 * @param parent Composite which will hold Page Setup Tab.
-	 * @return Control Page Setup Folder
-	 */
-	public Control createContents(Composite parent) {
-		TabFolder folder = new TabFolder(parent, SWT.NONE);
-		//folder.setLayout(new TabFolderLayout());	
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Composite pageSetupComposite = createPageSetupTabContent(folder);
-	
-		TabItem item = new TabItem(folder, SWT.NONE);
-		item.setText(LABEL_TITLE_PAGE_SETUP_TAB_ITEM);
-		item.setControl(pageSetupComposite);
-			
-		fInitialier.initPrintControls();
-		
-		return folder;
-	}
-	
-	/**
-	 * Saves Page Setup preferences.  This method is called after user presses 'Ok' button in
-	 * Page Setup Dialog or 'Apply' button in Printing preference page.
-	 */
-	public void save() {
-		fPersistor.saveConfigBlockControlValues();
-	}
-			
-	/** 
-	 * Restores Page Setup Defaults.  This method is called after user presses 'Restore Defaults'
-	 * button in printing preference page.
-	 */
-	public void performDefaults() {
-
-		fButtonInches.setSelection(DefaultValues.DEFAULT_INCHES);
-		fButtonInches.setEnabled(true);
-		fButtonMillimetres.setSelection(DefaultValues.DEFAULT_MILLIM);
-		fButtonMillimetres.setEnabled(true);
-		
-		fButtonPortrait.setSelection(DefaultValues.DEFAULT_PORTRAIT);
-		fButtonLandscape.setSelection(DefaultValues.DEFAULT_LANDSCAPE);
-		
-		fComboSize.select(DefaultValues.getLocaleSpecificPageType().getIndex());
-		fTextWidth.setText(fNumberFormat.format(DefaultValues.getLocaleSpecificPageType().getWidth()));
-		fTextHeight.setText(fNumberFormat.format(DefaultValues.getLocaleSpecificPageType().getHeight()));
-		
-		fTextMarginTop.setText(fNumberFormat.format(DefaultValues.DEFAULT_MARGIN_TOP));
-		fTextMarginBottom.setText(fNumberFormat.format(DefaultValues.DEFAULT_MARGIN_BOTTOM));
-		fTextMarginLeft.setText(fNumberFormat.format(DefaultValues.DEFAULT_MARGIN_LEFT));
-		fTextMarginRight.setText(fNumberFormat.format(DefaultValues.DEFAULT_MARGIN_RIGHT));
-        
-		fPreferencePage.setErrorMessage(null);
-	}
-	
-	/** 
-	 * Create Page Setup tab allowing the user to choose print page preferences.
-	 */
-	private Composite createPageSetupTabContent(Composite folder) {
-		
-		Composite composite = new Composite(folder, SWT.NULL);
-		composite.setLayout(new GridLayout(2, false));
-		
-		createGroupPageOrientation(composite);
-		createGroupUnits(composite);
-		createGroupPaperSize(composite);
-		createGroupMargin(composite);
-		
-		return composite;
-	}
-	
-	/**
-	 * Create part of PSDialog allowing the user to choose page orientation. 
-	 */
-	private void createGroupPageOrientation(Composite composite) {
-		Group group = PageSetupWidgetFactory.createGroup(composite, LABEL_TITLE_GROUP_ORIENTATION);
-		
-		// Add two radio buttons to the group
-		fButtonPortrait = PageSetupWidgetFactory.createRadioButton(group, LABEL_BUTTON_PORTRAIT);
-		fButtonLandscape  = PageSetupWidgetFactory.createRadioButton(group, LABEL_BUTTON_LANDSCAPE);
-	
-		fControls.add(fButtonPortrait);
-		fControls.add(fButtonLandscape);
-	}
-	
-	/** 
-	 * Create part of PSDialog allowing the user to choose measurement units. 
-	 */
-	private void createGroupUnits(Composite composite) {
-		Group group = PageSetupWidgetFactory.createGroup(composite, LABEL_TITLE_GROUP_UNITS);
-		
-		fButtonInches = PageSetupWidgetFactory.createRadioButtonInches(group, LABEL_BUTTON_INCHES);
-		fButtonMillimetres  = PageSetupWidgetFactory.createRadioButtonMillim(group, LABEL_BUTTON_MILLIMETRES);
-	
-		fButtonInches.addSelectionListener(new InchesSelectionListener(LABEL_INCHES));
-		fButtonMillimetres.addSelectionListener(new MillimetresSelectionListener(LABEL_MILLIMETRES));
-		
-		fControls.add(fButtonInches);
-		fControls.add(fButtonMillimetres);
-	}
-	
-	/** 
-	 * Create part of PSDialog allowing the user to specify page size, width and height. 
-	 */
-	private void createGroupPaperSize(Composite composite) {
-		Group group = PageSetupWidgetFactory.createGroupPaperSize(composite, LABEL_TITLE_GROUP_PAPER_SIZE);
-			
-		fLabelSize = PageSetupWidgetFactory.createLabel(group, LABEL_PAGE_SIZE);
-		fComboSize = PageSetupWidgetFactory.createComboSize(group);
-        
-		fLabelWidth = PageSetupWidgetFactory.createLabel(group, LABEL_PAGE_WIDTH_INCHES);
-		fTextWidth = PageSetupWidgetFactory.createTextWidth(group);
-		fLabelUnitWidth = PageSetupWidgetFactory.createLabelFiller(group);
-		
-		fLabelHeight = PageSetupWidgetFactory.createLabel(group, LABEL_PAGE_HEIGHT_INCHES);
-		fTextHeight = PageSetupWidgetFactory.createTextHeight(group);
-		
-		fComboSize.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				
-				int index = fComboSize.getSelectionIndex();
-				
-				if (isConversionNeeded()) {
-					fTextHeight.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(PageSetupPageType.pages[index].getHeight())));
-					fTextWidth.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(PageSetupPageType.pages[index].getWidth())));
-				} else {
-					fTextHeight.setText(fNumberFormat.format(PageSetupPageType.pages[index].getHeight()));
-					fTextWidth.setText(fNumberFormat.format(PageSetupPageType.pages[index].getWidth()));
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-		});
-		
-		fTextWidth.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextWidth.isFocusControl()) {
-					fComboSize.select(PageSetupPageType.USER_DEFINED.getIndex());
-					setOkButtonEnableStatus();
-				} else if (fComboSize.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-		});
-		
-		fTextHeight.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextHeight.isFocusControl()) {
-					fComboSize.select(PageSetupPageType.USER_DEFINED.getIndex());
-					setOkButtonEnableStatus();
-				} else if (fComboSize.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-		});
-		
-		fControls.add(fLabelSize);
-		fControls.add(fComboSize);
-		fControls.add(fLabelWidth);
-		fControls.add(fTextWidth);
-		fControls.add(fLabelUnitWidth);
-		fControls.add(fLabelHeight);
-		fControls.add(fTextHeight);
-	}
-    
-    
-    /**
-     * Converts a given string into double format 
-     * @param strNum the string containing the number (should contain only numbers)
-     * @return double value
-     */
-    private double getDblFromString(String strNum) {
-        try {
-            Number num = null;
-            num = fNumberFormat.parse(strNum);
-            return num.doubleValue();
-            
-        }
-        catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-	
-	/**
-	 * Sets the status of the OK button.  If the user input is invalid, OK button's
-	 * status will be set to disabled.  Otherwise, it will be set to 'enabled'.
-	 */
-	public void setOkButtonEnableStatus() {
-		// Verify all margin and page size text fields contain valid values
-		boolean allValid = 
-			StringValidator.isValid(fTextWidth.getText()) &&
-			StringValidator.isValid(fTextHeight.getText()) &&
-		
-			StringValidator.isValid(fTextMarginTop.getText()) &&
-			StringValidator.isValid(fTextMarginBottom.getText()) &&
-			StringValidator.isValid(fTextMarginLeft.getText()) &&
-			StringValidator.isValid(fTextMarginRight.getText());
-        
-        boolean marginsValid = false;
-        
-        if (allValid) {
-            
-            //check to see if the right and left margins together are not greater than the page width
-            //(same goes for top and bottom margins as compared to the page height).
-            //Note: since width and height are swapped when in landscape, we check the other way around 
-            //when landscape is selected.
-            
-            if (fButtonPortrait.getSelection())
-                marginsValid = 
-                    ((getDblFromString(fTextMarginTop.getText()) + getDblFromString(fTextMarginBottom.getText())) 
-                            < getDblFromString(fTextHeight.getText())) && 
-                    ((getDblFromString(fTextMarginLeft.getText()) + getDblFromString(fTextMarginRight.getText())) 
-                            < getDblFromString(fTextWidth.getText()));
-            else
-                marginsValid = 
-                    ((getDblFromString(fTextMarginTop.getText()) + getDblFromString(fTextMarginBottom.getText())) 
-                            < getDblFromString(fTextWidth.getText())) && 
-                    ((getDblFromString(fTextMarginLeft.getText()) + getDblFromString(fTextMarginRight.getText())) 
-                            < getDblFromString(fTextHeight.getText()));
-        }
-		
-		// Set the status of the OK button
-		if (null == fPreferencePage) {
-			if (allValid && marginsValid) {
-                fParentDialog.getOkButton().setEnabled(true);
-                fButtonInches.setEnabled(true);
-                fButtonMillimetres.setEnabled(true);
-			}
-			else {
-				fParentDialog.getOkButton().setEnabled(false);
-				fButtonInches.setEnabled(false);
-				fButtonMillimetres.setEnabled(false);
-			}
-		} else {
-			if (allValid && marginsValid) {
-                fPreferencePage.setValid(true);
-                fPreferencePage.setErrorMessage(null);
-                fButtonInches.setEnabled(true);
-                fButtonMillimetres.setEnabled(true);
-			}
-			else {
-				fPreferencePage.setValid(false);
-				fPreferencePage.setErrorMessage(LABEL_PRINT_PREFERENCE_PAGE_ERROR_MSG);
-				fButtonInches.setEnabled(false);
-				fButtonMillimetres.setEnabled(false);
-			}
-		}
-		
-	}
-	
-	/**
-	 * Determine if the current set of units are in inches.
-	 *  	
-	 * @return true if the current units are in inches.
-	 */
-	private boolean isUnitsInInch() {
-		return (fCurrentUnit.startsWith("inc")); //$NON-NLS-1$
-	}
-	
-	/** 
-	 * Create part of PSDialog allowing the user to specify page margin values. 
-	 */
-	private void createGroupMargin(Composite composite) {
-		Group group = PageSetupWidgetFactory.createGroupMargin(composite, LABEL_TITLE_GROUP_MARGIN);
-        
-		fLabelMarginTop = PageSetupWidgetFactory.createLabel(group, LABEL_MARGIN_TOP_INCHES);
-		fTextMarginTop = PageSetupWidgetFactory.createTextMargin(group);
-		fLabelUnitMarginTop = PageSetupWidgetFactory.createLabelFiller(group);
-		
-		fLabelMarginBottom = PageSetupWidgetFactory.createLabel(group, LABEL_MARGIN_BOTTOM_INCHES);
-		fTextMarginBottom = PageSetupWidgetFactory.createTextMargin(group);
-        
-		fLabelMarginLeft = PageSetupWidgetFactory.createLabel(group, LABEL_MARGIN_LEFT_INCHES);
-		fTextMarginLeft = PageSetupWidgetFactory.createTextMargin(group);
-		fLabelUnitMarginLeft = PageSetupWidgetFactory.createLabelFiller(group);
-		
-		fLabelMarginRight = PageSetupWidgetFactory.createLabel(group, LABEL_MARGIN_RIGHT_INCHES);
-		fTextMarginRight = PageSetupWidgetFactory.createTextMargin(group);
-        
-		
-		fTextMarginTop.addFocusListener(new FocusListener() {
-
-			public void focusGained(FocusEvent e) {
-				// do nothing.
-			}
-
-			public void focusLost(FocusEvent e) {
-				double marginTop = getDblFromString(fTextMarginTop.getText());
-				double minimumTop = DefaultValues.MINIMUM_MARGIN_TOP;
-				if (!isUnitsInInch()) {
-					marginTop = fConvertor.convertMilimToInches(marginTop);
-					minimumTop = fConvertor.convertInchesToMilim(minimumTop);
-				}
-				if (marginTop < DefaultValues.MINIMUM_MARGIN_TOP) {
-					fTextMarginTop.setText(fNumberFormat.format(minimumTop));
-				}
-			}
-		});
-		fTextMarginTop.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextMarginTop.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-			
-		});
-				
-		fTextMarginBottom.addFocusListener(new FocusListener() {
-			public void focusGained(FocusEvent e) {
-				// do nothing.
-			}
-			/**
-			 * Ensure we have minimum margins set.
-			 */
-			public void focusLost(FocusEvent e) {
-				double marginBottom = getDblFromString(fTextMarginBottom.getText());
-				double minimumBottom = DefaultValues.MINIMUM_MARGIN_BOTTOM;
-				if (!isUnitsInInch()) {
-					marginBottom = fConvertor.convertMilimToInches(marginBottom);
-					minimumBottom = fConvertor.convertInchesToMilim(minimumBottom);
-				}
-				if (marginBottom < DefaultValues.MINIMUM_MARGIN_BOTTOM) {
-					fTextMarginBottom.setText(fNumberFormat.format(minimumBottom));
-				}
-			}
-		});
-		fTextMarginBottom.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextMarginBottom.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-		});
-		
-
-		fTextMarginLeft.addFocusListener(new FocusListener() {
-			public void focusGained(FocusEvent e) {
-				// do nothing.
-			}
-			/**
-			 * Ensure we have minimum margins set.
-			 */
-			public void focusLost(FocusEvent e) {
-				double marginLeft = getDblFromString(fTextMarginLeft.getText());
-				double minimumLeft = DefaultValues.MINIMUM_MARGIN_LEFT;
-				if (!isUnitsInInch()) {
-					marginLeft = fConvertor.convertMilimToInches(marginLeft);
-					minimumLeft = fConvertor.convertInchesToMilim(minimumLeft);
-				}
-				if (marginLeft < DefaultValues.MINIMUM_MARGIN_LEFT) {
-					fTextMarginLeft.setText(fNumberFormat.format(minimumLeft));
-				}
-			}
-		});
-		fTextMarginLeft.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextMarginLeft.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-		});
-		
-		fTextMarginRight.addFocusListener(new FocusListener() {
-			public void focusGained(FocusEvent e) {
-				// do nothing.
-			}
-			/**
-			 * Ensure we have minimum margins set.
-			 */
-			public void focusLost(FocusEvent e) {
-				double marginRight = getDblFromString(fTextMarginRight.getText());
-				double minimumRight = DefaultValues.MINIMUM_MARGIN_RIGHT;
-				if (!isUnitsInInch()) {
-					marginRight = fConvertor.convertMilimToInches(marginRight);
-					minimumRight = fConvertor.convertInchesToMilim(minimumRight);
-				}
-				if (marginRight < DefaultValues.MINIMUM_MARGIN_RIGHT) {
-					fTextMarginRight.setText(fNumberFormat.format(minimumRight));
-				}
-			}
-		});
-		fTextMarginRight.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (fTextMarginRight.isFocusControl()) {
-					setOkButtonEnableStatus();
-				}
-			}
-		});
-		fControls.add(fLabelMarginTop);
-		fControls.add(fTextMarginTop);
-		fControls.add(fLabelUnitMarginTop);
-		
-		fControls.add(fLabelMarginBottom);
-		fControls.add(fTextMarginBottom);
-		
-		fControls.add(fLabelMarginLeft);
-		fControls.add(fTextMarginLeft);
-		fControls.add(fLabelUnitMarginLeft);
-		
-		fControls.add(fLabelMarginRight);
-		fControls.add(fTextMarginRight);
-	}
-	
-	/**
-	 * Returns a specified control.
-	 * 
-	 * @param controlType type of control
-	 * @return Control control matchin specified controlType
-	 */
-	public Control getControl(PageSetupControlType controlType) {
-		if (controlType.equals(PageSetupControlType.BUTTON_USE_INCHES))
-			return fButtonInches;
-		else if (controlType.equals(PageSetupControlType.BUTTON_USE_MILLIM))
-			return fButtonMillimetres;	
-		
-		else if (controlType.equals(PageSetupControlType.BUTTON_USE_PORTRAIT))
-			return fButtonPortrait;
-		else if (controlType.equals(PageSetupControlType.BUTTON_USE_LANDSCAPE))
-			return fButtonLandscape;
-		
-		else if (controlType.equals(PageSetupControlType.COMBO_PAGE_SIZE))
-			return fComboSize;
-		else if (controlType.equals(PageSetupControlType.TEXT_PAGE_HEIGHT))
-			return fTextHeight;
-		else if (controlType.equals(PageSetupControlType.TEXT_PAGE_WIDTH))
-			return fTextWidth;
-		
-		else if (controlType.equals(PageSetupControlType.TEXT_MARGIN_TOP))
-			return fTextMarginTop;
-		else if (controlType.equals(PageSetupControlType.TEXT_MARGIN_BOTTOM))
-			return fTextMarginBottom;
-		else if (controlType.equals(PageSetupControlType.TEXT_MARGIN_LEFT))
-			return fTextMarginLeft;
-		else if (controlType.equals(PageSetupControlType.TEXT_MARGIN_RIGHT))
-			return fTextMarginRight;
-		
-		else if (controlType.equals(PageSetupControlType.LABEL_UNIT_PAGE_HEIGHT))
-			return fLabelUnitWidth;
-		else if (controlType.equals(PageSetupControlType.LABEL_UNIT_MARGIN_TOP))
-			return fLabelUnitMarginTop;
-		else if (controlType.equals(PageSetupControlType.LABEL_UNIT_MARGIN_LEFT))
-			return fLabelUnitMarginLeft;
-		else
-			return null;
-	}
-	
-	/**
-	 * After calling this method, all controls will appear as disabled.
-	 */
-	public void disableAllControls() {
-		Control control;
-		for (int i = 0; i < fControls.size(); i++) {
-			control = (Control) fControls.get(i);
-			control.setEnabled(false);
-		}
-	}
-	
-	/**
-	 * After calling this method, all controls will appear as enabled.
-	 */
-	public void enableAllControls() {
-		Control control;
-		for (int i = 0; i < fControls.size(); i++) {
-			control = (Control) fControls.get(i);
-			control.setEnabled(true);
-		}
-	}
-	
-	// INITIALIZER
-	private class Initializer {
-
-		private PageSetupConfigBlock fBlockPrint;
-		
-		public Initializer(PageSetupConfigBlock configBlock) {
-			fBlockPrint = configBlock;
-		}
-		
-		public void initPrintControls() {
-			initValuesForUnitGroup();
-			initValuesForOrientationGroup();
-			initValuesForSizeGroup();
-			initValuesForMarginGroup();
-			initUnitLabels();
-		}
-		
-		private void initValuesForUnitGroup() {
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_INCHES, WorkspaceViewerProperties.PREF_USE_INCHES);
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_MILLIM, WorkspaceViewerProperties.PREF_USE_MILLIM);
-		}
-		
-		private void initValuesForOrientationGroup() {
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_PORTRAIT, WorkspaceViewerProperties.PREF_USE_PORTRAIT);
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_LANDSCAPE, WorkspaceViewerProperties.PREF_USE_LANDSCAPE);
-		}
-		
-		private void initValuesForSizeGroup() {
-			initCombo(fBlockPrint, PageSetupControlType.COMBO_PAGE_SIZE, WorkspaceViewerProperties.PREF_PAGE_SIZE);
-			initText(fBlockPrint, PageSetupControlType.TEXT_PAGE_HEIGHT, WorkspaceViewerProperties.PREF_PAGE_HEIGHT);
-			initText(fBlockPrint, PageSetupControlType.TEXT_PAGE_WIDTH, WorkspaceViewerProperties.PREF_PAGE_WIDTH);
-		}
-		
-		private void initValuesForMarginGroup() {
-			initText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_TOP, WorkspaceViewerProperties.PREF_MARGIN_TOP);
-			initText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_BOTTOM, WorkspaceViewerProperties.PREF_MARGIN_BOTTOM);
-			initText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_LEFT, WorkspaceViewerProperties.PREF_MARGIN_LEFT);
-			initText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_RIGHT, WorkspaceViewerProperties.PREF_MARGIN_RIGHT);
-		}
-		
-		private void initUnitLabels() {
-			if (fButtonInches.getSelection()) {
-                fLabelHeight.setText(LABEL_PAGE_HEIGHT_INCHES);
-                fLabelWidth.setText(LABEL_PAGE_WIDTH_INCHES);
-                fLabelMarginBottom.setText(LABEL_MARGIN_BOTTOM_INCHES);
-                fLabelMarginLeft.setText(LABEL_MARGIN_LEFT_INCHES);
-                fLabelMarginRight.setText(LABEL_MARGIN_RIGHT_INCHES);
-                fLabelMarginTop.setText(LABEL_MARGIN_TOP_INCHES);
-                
-				fCurrentUnit = "inc"; //$NON-NLS-1$
-			}
-			else {
-                fLabelHeight.setText(LABEL_PAGE_HEIGHT_MM);
-                fLabelWidth.setText(LABEL_PAGE_WIDTH_MM);
-                fLabelMarginBottom.setText(LABEL_MARGIN_BOTTOM_MM);
-                fLabelMarginLeft.setText(LABEL_MARGIN_LEFT_MM);
-                fLabelMarginRight.setText(LABEL_MARGIN_RIGHT_MM);
-                fLabelMarginTop.setText(LABEL_MARGIN_TOP_MM);
-                
-				fCurrentUnit = "mil"; //$NON-NLS-1$
-			}
-		}
-			
-		private void initRadioButton(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			Button button = (Button) block.getControl(controlType);
-			button.setSelection(fStore.getBoolean(key));
-		}
-		
-		private void initText(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			Text text = (Text) block.getControl(controlType);
-			
-			double value = fStore.getDouble(key);
-			text.setText(fNumberFormat.format(value));
-			
-            
-            if (isConversionNeeded()) {
-                //get the values directly from the hardcoded values if the option is not user defined (more accurate)
-                
-                if (fBlockPrint.fComboSize.getSelectionIndex() != PageSetupPageType.USER_DEFINED.getIndex()) {
-                    
-                    if (text == fBlockPrint.fTextHeight) 
-                        fBlockPrint.fTextHeight.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(
-                            PageSetupPageType.pages[fBlockPrint.fComboSize.getSelectionIndex()].getHeight())));
-                    
-                    else if (text == fBlockPrint.fTextWidth)
-                        fBlockPrint.fTextWidth.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(
-                            PageSetupPageType.pages[fBlockPrint.fComboSize.getSelectionIndex()].getWidth())));                
-                    else
-                        text.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(value)));
-                }
-                else
-                    text.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(value)));
-            }
-		}
-	
-		private void initCombo(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			Combo combo = (Combo) block.getControl(controlType);
-			String pageSize = fStore.getString(key);
-			String item;
-	
-			for (int i = 0; i < combo.getItemCount(); i++) {
-				item = combo.getItem(i);
-				if (item.startsWith(pageSize)) combo.select(i);
-			}
-		}
-	}
-
-	// PERSISTOR
-	private class Persistor {
-
-		private PageSetupConfigBlock fBlockPrint;
-		
-		public Persistor(PageSetupConfigBlock configBlock) {
-			fBlockPrint = configBlock;
-		}
-		
-		public void saveConfigBlockControlValues() {	
-			saveValuesFromUnitGroup();
-			saveValuesFromOrientationGroup();
-			saveValuesFromSizeGroup();
-			saveValuesFromMarginGroup();
-			
-			emptyControlList();
-		}
-		
-		private void saveValuesFromUnitGroup() {
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_INCHES, WorkspaceViewerProperties.PREF_USE_INCHES);
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_MILLIM, WorkspaceViewerProperties.PREF_USE_MILLIM);	
-		}
-		
-		private void saveValuesFromOrientationGroup() {
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_PORTRAIT, WorkspaceViewerProperties.PREF_USE_PORTRAIT);
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_LANDSCAPE, WorkspaceViewerProperties.PREF_USE_LANDSCAPE);
-		}
-		
-		private void saveValuesFromSizeGroup() {
-			saveCombo(fBlockPrint, PageSetupControlType.COMBO_PAGE_SIZE, WorkspaceViewerProperties.PREF_PAGE_SIZE);
-			saveText(fBlockPrint, PageSetupControlType.TEXT_PAGE_HEIGHT, WorkspaceViewerProperties.PREF_PAGE_HEIGHT);
-			saveText(fBlockPrint, PageSetupControlType.TEXT_PAGE_WIDTH, WorkspaceViewerProperties.PREF_PAGE_WIDTH);
-		}
-		
-		private void saveValuesFromMarginGroup() {
-			saveText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_TOP, WorkspaceViewerProperties.PREF_MARGIN_TOP);
-			saveText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_BOTTOM, WorkspaceViewerProperties.PREF_MARGIN_BOTTOM);
-			saveText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_LEFT, WorkspaceViewerProperties.PREF_MARGIN_LEFT);
-			saveText(fBlockPrint, PageSetupControlType.TEXT_MARGIN_RIGHT, WorkspaceViewerProperties.PREF_MARGIN_RIGHT);
-		}
-			
-		private void saveText(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			if (isConversionNeeded()) 
-				fStore.setValue(key, fConvertor.convertToInches(controlType));
-				
-			else {
-				Text text = (Text) block.getControl(controlType);
-				fStore.setValue(key, getDblFromString(text.getText()));
-			}
-		}
-		
-		private void saveRadioButton(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			Button button = (Button) block.getControl(controlType);
-			fStore.setValue(key, button.getSelection());
-		}
-		
-		private void saveCombo(PageSetupConfigBlock block, PageSetupControlType controlType, String key) {
-			Combo combo = (Combo) block.getControl(controlType);
-			int index = combo.getSelectionIndex();
-			fStore.setValue(key, combo.getItem(index));
-		}
-		
-		private void emptyControlList() {
-			for (int i = 0; i < fControls.size(); i++) {
-				fControls.remove(i);
-			}
-		}
-	}
-
-	// CONVERTOR
-	private class Convertor {
-
-		PageSetupConfigBlock fBlockPrint;
-		
-		public Convertor(PageSetupConfigBlock configBlock) {
-			fBlockPrint = configBlock;
-		}
-		
-		public double convertToInches(PageSetupControlType type) { 
-			Text text = (Text) fBlockPrint.getControl(type);
-			
-			Number num = null;
-			try {
-				num = fNumberFormat.parse(text.getText());
-				double valueInMillimetres = num.doubleValue();
-				double valueInInches = convertMilimToInches(valueInMillimetres);
-				return valueInInches;	
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			return -1;
-		}
-		
-		public double convertToMillimetres(PageSetupControlType type) { 
-			Text text = (Text) fBlockPrint.getControl(type);
-			
-			Number num = null;
-			try {
-				num = fNumberFormat.parse(text.getText());
-				double valueInInches = num.doubleValue();
-				double valueInMillimetres = convertInchesToMilim(valueInInches);
-				return valueInMillimetres;
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-			return -1;
-					
-		}
-		
-		public double convertInchesToMilim(double inches) {
-			return inches * 25.4d; 
-		}
-		
-		public double convertMilimToInches(double milim) {
-			return milim / 25.4d;
-		}
-	}
-	
-	// LISTENERS
-	private class UnitSelectionListener implements SelectionListener {
-
-		private String fLabel;
-		
-		public UnitSelectionListener(String label) {
-			fLabel = label;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			updateLabels();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetDefaultSelected(SelectionEvent e) { 
-			// empty 
-		}
-		
-		private void updateLabels() {
-            if (fLabel.equals(LABEL_MILLIMETRES)) {
-                fLabelHeight.setText(LABEL_PAGE_HEIGHT_MM);
-                fLabelWidth.setText(LABEL_PAGE_WIDTH_MM);
-                fLabelMarginBottom.setText(LABEL_MARGIN_BOTTOM_MM);
-                fLabelMarginLeft.setText(LABEL_MARGIN_LEFT_MM);
-                fLabelMarginRight.setText(LABEL_MARGIN_RIGHT_MM);
-                fLabelMarginTop.setText(LABEL_MARGIN_TOP_MM);
-            }
-            else {
-                fLabelHeight.setText(LABEL_PAGE_HEIGHT_INCHES);
-                fLabelWidth.setText(LABEL_PAGE_WIDTH_INCHES);
-                fLabelMarginBottom.setText(LABEL_MARGIN_BOTTOM_INCHES);
-                fLabelMarginLeft.setText(LABEL_MARGIN_LEFT_INCHES);
-                fLabelMarginRight.setText(LABEL_MARGIN_RIGHT_INCHES);
-                fLabelMarginTop.setText(LABEL_MARGIN_TOP_INCHES);
-            }
-
-            fLabelHeight.getParent().layout(true);
-            fLabelMarginBottom.getParent().layout(true);
-            fLabelHeight.getShell().pack(true);
-		}	
-	}
-	
-	private class InchesSelectionListener extends UnitSelectionListener {
-
-		public InchesSelectionListener(String label) {
-			super(label);
-		}
-		
-		public void widgetSelected(SelectionEvent e) {
-			Button b = (Button) e.getSource();
-			if (b.getSelection()) {
-				super.widgetSelected(e);
-				if (fCurrentUnit.startsWith("mil")) { //$NON-NLS-1$
-					convertValuesToInches();
-					fCurrentUnit = "inc"; //$NON-NLS-1$
-				}
-			}
-		}
-		
-		private void convertValuesToInches() {
-			fTextWidth.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_PAGE_WIDTH)));
-			fTextHeight.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_PAGE_HEIGHT)));
-			fTextMarginTop.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_MARGIN_TOP)));
-			fTextMarginBottom.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_MARGIN_BOTTOM)));
-			fTextMarginLeft.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_MARGIN_LEFT)));
-			fTextMarginRight.setText(fNumberFormat.format(fConvertor.convertToInches(PageSetupControlType.TEXT_MARGIN_RIGHT)));
-		}
-	}
-	
-	private class MillimetresSelectionListener extends UnitSelectionListener {
-
-		public MillimetresSelectionListener(String label) {
-			super(label);
-		}
-		
-		public void widgetSelected(SelectionEvent e) {
-			Button b = (Button) e.getSource();
-			if (b.getSelection()) { 
-				super.widgetSelected(e);
-				if (isUnitsInInch()) { 
-					convertValuesToMillimetres();
-					fCurrentUnit = "mil"; //$NON-NLS-1$
-				}
-			}
-		}
-		
-		private void convertValuesToMillimetres() {
-            //get the values directly from the hardcoded values if the option is not user defined (more accurate)
-            
-            if (fComboSize.getSelectionIndex() == PageSetupPageType.USER_DEFINED.getIndex()) {
-    			fTextWidth.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_PAGE_WIDTH)));
-    			fTextHeight.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_PAGE_HEIGHT)));
-            }
-            else {
-                fTextWidth.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(
-                    PageSetupPageType.pages[fComboSize.getSelectionIndex()].getWidth())));
-                fTextHeight.setText(fNumberFormat.format(fConvertor.convertInchesToMilim(
-                    PageSetupPageType.pages[fComboSize.getSelectionIndex()].getHeight())));
-            }
-			fTextMarginTop.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_MARGIN_TOP)));
-			fTextMarginBottom.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_MARGIN_BOTTOM)));
-			fTextMarginLeft.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_MARGIN_LEFT)));
-			fTextMarginRight.setText(fNumberFormat.format(fConvertor.convertToMillimetres(PageSetupControlType.TEXT_MARGIN_RIGHT)));
-		}
-	}
-
-	private boolean isConversionNeeded() {
-		if (fButtonInches.getSelection())
-			return false;
-		return true;
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupControlType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupControlType.java
deleted file mode 100644
index d79fa45..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupControlType.java
+++ /dev/null
@@ -1,119 +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.internal.dialogs;
-
-import java.util.ArrayList;
-
-/**
- * All controls that appear in Page Setup Dialog.
- * 
- * @author etworkow
- */
-public class PageSetupControlType {
-
-	private String fName = null;
-	
-	/** Represents 'Use workspace settings' radio button. */
-	public static PageSetupControlType BUTTON_USE_WORKSPACE_SETTINGS = new PageSetupControlType("Use workspace settings"); //$NON-NLS-1$
-	
-	/** Represents 'Use configure settings' push button. */
-	public static PageSetupControlType BUTTON_CONFIGURE_WORKSPACE_SETTINGS = new PageSetupControlType("Configure workspace settings"); //$NON-NLS-1$
-	
-	/** Represents 'Use diagram settings' radio button. */
-	public static PageSetupControlType BUTTON_USE_DIAGRAM_SETTINGS = new PageSetupControlType("Use diagram settings"); //$NON-NLS-1$
-	
-	/** Represents 'Use inches' radio button. */
-	public static PageSetupControlType BUTTON_USE_INCHES = new PageSetupControlType("Inches"); //$NON-NLS-1$
-	
-	/** Represents 'Use millimetres' radio button. */
-	public static PageSetupControlType BUTTON_USE_MILLIM = new PageSetupControlType("Millim"); //$NON-NLS-1$
-	
-	/** Represents 'Use portrait' radio button. */
-	public static PageSetupControlType BUTTON_USE_PORTRAIT = new PageSetupControlType("Portrait"); //$NON-NLS-1$
-	
-	/** Represents 'Use landscape' radio button. */
-	public static PageSetupControlType BUTTON_USE_LANDSCAPE = new PageSetupControlType("Landscape"); //$NON-NLS-1$
-	
-	/** Represents combo listing supported page sizes. */
-	public static PageSetupControlType COMBO_PAGE_SIZE = new PageSetupControlType("Size"); //$NON-NLS-1$
-	
-	/** Represents 'Page width' text field. */
-	public static PageSetupControlType TEXT_PAGE_WIDTH = new PageSetupControlType("Width"); //$NON-NLS-1$
-	
-	/** Represents 'Page height' text field. */
-	public static PageSetupControlType TEXT_PAGE_HEIGHT = new PageSetupControlType("Height"); //$NON-NLS-1$
-	
-	/** Represents top margin text field. */
-	public static PageSetupControlType TEXT_MARGIN_TOP = new PageSetupControlType("Top margin"); //$NON-NLS-1$
-	
-	/** Represents bottom margin text field. */
-	public static PageSetupControlType TEXT_MARGIN_BOTTOM = new PageSetupControlType("Bottom margin"); //$NON-NLS-1$
-	
-	/** Represents left margin text field. */
-	public static PageSetupControlType TEXT_MARGIN_LEFT = new PageSetupControlType("Left margin"); //$NON-NLS-1$
-	
-	/** Represents right margin text field. */
-	public static PageSetupControlType TEXT_MARGIN_RIGHT = new PageSetupControlType("Right margin"); //$NON-NLS-1$
-
-	/** Represents unit label next to page width text field. */
-	public static PageSetupControlType LABEL_UNIT_PAGE_WIDTH = new PageSetupControlType("Page width label"); //$NON-NLS-1$
-	
-	/** Represents unit label next to page height text field. */
-	public static PageSetupControlType LABEL_UNIT_PAGE_HEIGHT = new PageSetupControlType("Page height label"); //$NON-NLS-1$
-	
-	/** Represents unit label next to top margin text field. */
-	public static PageSetupControlType LABEL_UNIT_MARGIN_TOP = new PageSetupControlType("Top margin label"); //$NON-NLS-1$
-	
-	/** Represents unit label next to bottom margin text field. */
-	public static PageSetupControlType LABEL_UNIT_MARGIN_BOTTOM = new PageSetupControlType("Bottom margin label"); //$NON-NLS-1$
-	
-	/** Represents unit label next to left margin text field. */
-	public static PageSetupControlType LABEL_UNIT_MARGIN_LEFT = new PageSetupControlType("Left margin label"); //$NON-NLS-1$
-	
-	/** Represents unit label next to right margin text field. */
-	public static PageSetupControlType LABEL_UNIT_MARGIN_RIGHT = new PageSetupControlType("Right margin label"); //$NON-NLS-1$
-	
-	/** Represents configuration block allowing the user to configure page settings. */
-	public static PageSetupControlType CONFIG_BLOCK_PRINT = new PageSetupControlType("Config block"); //$NON-NLS-1$
-	
-	/** Represents configuration block allowing the user to toggle between diagram and workspace settings. */
-	public static PageSetupControlType CONFIG_BLOCK_SELECTION = new PageSetupControlType("Config block selection"); //$NON-NLS-1$
-	
-	private PageSetupControlType(String name) {
-		fName = name;
-	}
-	
-	/**
-	 * Returns name of the control.
-	 * 
-	 * @return String control name
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * Return a list of text fields that are used to obtain user input.
-	 * 
-	 * @return ArrayList List of Text widgets that appear in Page Setup Dialog.
-	 */
-	public static ArrayList getTextFieldTypes() {
-		ArrayList list = new ArrayList();
-		list.add(TEXT_MARGIN_TOP);
-		list.add(TEXT_MARGIN_BOTTOM);
-		list.add(TEXT_MARGIN_LEFT);
-		list.add(TEXT_MARGIN_RIGHT);
-		list.add(TEXT_PAGE_WIDTH);
-		list.add(TEXT_PAGE_HEIGHT);
-		return list;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupDialog.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupDialog.java
deleted file mode 100644
index eaaae70..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupDialog.java
+++ /dev/null
@@ -1,201 +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.internal.dialogs;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-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.internal.pagesetup.ILabels;
-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;
-
-
-/**
- * Page Setup Dialog allowing the user to set printing preferences.  It consists
- * of two parts:
- * 
- * 1. PSSelectionConfigurationBlock allowing the user to choose workspace or diagram settings.
- * 2. PSConfigurationBlock allowing the user to configure printing preferences.
- * 
- * @author etworkow
- */
-public class PageSetupDialog extends Dialog implements ILabels {
-
-	private static PageSetupConfigBlock fPrinterConfigurationBlock;
-	private static PageSetupSelectionConfigBlock fSelectionConfigurationBlock;
-	
-	private ArrayList fConfigBlocks = new ArrayList();
-	
-	/**
-	 * Creates an instance on PageSetupDialog.
-	 * 
-	 * @param parentShell parent shell
-	 */
-	public PageSetupDialog(Shell parentShell) {
-		super(parentShell);
-		
-		IPreferenceStore diagramViewerStore = getDiagramViewerStore();
-		IPreferenceStore globalStore = getGlobalPreferencesStore();
-		
-		fSelectionConfigurationBlock = new PageSetupSelectionConfigBlock(diagramViewerStore, globalStore, this);
-		fPrinterConfigurationBlock = new PageSetupConfigBlock(diagramViewerStore, this);
-		
-		fConfigBlocks.add(fPrinterConfigurationBlock);
-		fConfigBlocks.add(fSelectionConfigurationBlock);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-	 */
-	protected void cancelPressed() {
-		super.cancelPressed();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		//super.createDialogArea(parent);
-		
-		fSelectionConfigurationBlock.createContents(parent);
-		fPrinterConfigurationBlock.createContents(parent);
-		
-		enableConfigurationBlocks();
-		
-		getShell().setText(LABEL_TITLE_PAGE_SETUP);
-        
-        PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, 
-            "org.eclipse.gmf.runtime.diagram.ui.egmf0300"); //$NON-NLS-1$
-		
-		return parent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		Button useDiagramSettings = (Button) fSelectionConfigurationBlock.getControl(PageSetupControlType.BUTTON_USE_DIAGRAM_SETTINGS);
-		
-		if ( useDiagramSettings.getSelection()) {
-			fPrinterConfigurationBlock.save();
-			fSelectionConfigurationBlock.save();
-			super.okPressed();
-		}
-		else {
-			fSelectionConfigurationBlock.save();
-			super.okPressed();
-		}
-	}
-
-	/**
-	 * Returns a reference to the OK button in Page Setup Dialog.
-	 * 
-	 * @return Button reference to the OK button
-	 */
-	public Button getOkButton() {
-		return super.getButton(OK);
-	}
-	
-	/**
-	 * Returns a reference to configuration block.
-	 * 
-	 * @return PageSetupConfigBlock configuration block making up Page Setup Dialog
-	 */
-	protected PageSetupConfigBlock getConfigurationBlock() {
-		return fPrinterConfigurationBlock;
-	}
-	
-	/**
-	 * Returns a reference to configuration block.
-	 * 
-	 * @return PageSetupSelectionConfigBlock configuration block making up Page Setup Dialog
-	 */
-	protected static PageSetupSelectionConfigBlock getSelectionConfigurationBlock() {
-		return fSelectionConfigurationBlock;
-	}
-	
-	private void enableConfigurationBlocks() {
-		Button bUseWorkspaceSettings = (Button) fSelectionConfigurationBlock.getControl(PageSetupControlType.BUTTON_USE_WORKSPACE_SETTINGS);
-		
-		if (bUseWorkspaceSettings.getSelection()) {
-			fSelectionConfigurationBlock.enableButtonConfigure();
-			fPrinterConfigurationBlock.disableAllControls();
-		} else {
-			fSelectionConfigurationBlock.disableButtonConfigure();
-			fPrinterConfigurationBlock.enableAllControls();
-		}
-	}
-	
-	private static IDiagramGraphicalViewer getDiagramGraphicalViewer() {
-		IWorkbenchPart page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-		if (page instanceof IDiagramWorkbenchPart) {
-			return ((IDiagramWorkbenchPart)page).getDiagramGraphicalViewer();
-		}
-		return null;
-	}
-
-	
-	/**
-	 * Returns a reference to a preference store unique to a diagram viewer.
-	 * 
-	 * @return IPreferenceStore unique preference store for currently selected
-	 *         diagram viewer
-	 */
-	private static IPreferenceStore getDiagramViewerStore() {
-		IPreferenceStore store = null;
-
-		IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();
-		if (viewer instanceof DiagramGraphicalViewer) {
-			store = ((DiagramGraphicalViewer) viewer)
-				.getWorkspaceViewerPreferenceStore();
-		}
-
-		return store;
-	}
-
-	/**
-	 * Returns a reference to the global preference store for the active
-	 * diagram, if no preferences are specified for the current diagram editor
-	 * then null is returned.
-	 * 
-	 * @return IPreferenceStore the preference store for currently selected
-	 *         diagram; null, if there are no preferences for this diagram
-	 */
-	private static IPreferenceStore getGlobalPreferencesStore() {
-		IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();
-		if (viewer.getRootEditPart() instanceof IDiagramPreferenceSupport) {
-			PreferencesHint preferencesHint = ((IDiagramPreferenceSupport) viewer
-				.getRootEditPart()).getPreferencesHint();
-			IPreferenceStore store = (IPreferenceStore) preferencesHint
-				.getPreferenceStore();
-
-			IPreferenceStore defaultStore = (IPreferenceStore) PreferencesHint.USE_DEFAULTS
-				.getPreferenceStore();
-
-			if (!store.equals(defaultStore)) {
-				return store;
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupSelectionConfigBlock.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupSelectionConfigBlock.java
deleted file mode 100644
index ceb7545..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/PageSetupSelectionConfigBlock.java
+++ /dev/null
@@ -1,289 +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.internal.dialogs;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Shell;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.ILabels;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageSetupWidgetFactory;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-
-/**
- * PSSelectionConfigurationBlock implements part of PSDialog allowing the user to toggle
- * between Diagram or Workspace settings.  It consists of the following controls:
- * 
- * 1. Use workspace settings radio button
- * 2. Use diagram settings radio button
- * 3. Configure workspace settings button
- * 
- * @author etworkow
- */
-public class PageSetupSelectionConfigBlock implements ILabels {
-	
-	private Button 
-		fButtonUseWorkspaceSettings,
-		fButtonConfigure,
-		fButtonUseDiagramSettings;
-	
-	private Shell fShell;
-
-	/** Read preference values from preference store and uses them to initialize all controls. */
-	private Initializer fInitialier;
-	
-	/** Saves preference values in preference store. */
-	private Persistor fPersistor;
-
-	/** List of all controls. */
-	private ArrayList fControls = new ArrayList();
-	
-	/** Store holding all preferences */
-	private IPreferenceStore fStore;
-
-	/**
-	 * Store holding the global preferences if the user chooses to configure the
-	 * global page setting preferences
-	 */
-	private IPreferenceStore fGlobalStore;
-
-	/** Parent dialog hosting thise selection configuration block. */
-	private PageSetupDialog fParentDialog;
-	
-	/**
-	 * Creates an instance of PageSetupSelectionConfigBlock.
-	 * 
-	 * @param store
-	 *            Preference store used to initialize
-	 *            PSSelectionConfigurationBlock
-	 * @param globalStore
-	 *            the global preference store used if the user chooses to
-	 *            configure the global page setting preferences from this dialog
-	 * @param dialog
-	 */
-	public PageSetupSelectionConfigBlock(IPreferenceStore store, IPreferenceStore globalStore, PageSetupDialog dialog) {
-		fInitialier = new Initializer(this);
-		fPersistor = new Persistor(this);
-		fStore = store;
-		fGlobalStore = globalStore;
-		fParentDialog = dialog;
-	}
-	
-	/**
-	 * Create composite with three buttons allowing the user to toggle
-	 * between diagram and workspace setting.
-	 * 
-	 * @param parent Composite holding the buttons
-	 * @return Control composite with buttons
-	 */
-	protected Control createContents(Composite parent) {	
-		Composite selectionComposite = new Composite(parent, SWT.NULL);
-		selectionComposite.setLayout(new GridLayout(2, true));
-				
-		createSelectionGroup(selectionComposite);
-		fShell = parent.getShell();
-		
-		fInitialier.initSelectionControls();
-		
-		return selectionComposite;
-	}
-	
-	/**
-	 * Saves preferences in a preference store.
-	 */
-	protected void save() {
-		fPersistor.saveConfigBlockControlValues();
-	}
-	
-	/** 
-	 * Create part of PSDialog allowing the user to choose between diagram and workspace settings.
-	 */
-	private void createSelectionGroup(Composite composite) {
-		
-		// Add two radio buttons to the group
-		fButtonUseWorkspaceSettings = PageSetupWidgetFactory.createRadioButton(composite, LABEL_BUTTON_USE_WORKSPACE_SETTINGS);
-		fButtonConfigure = PageSetupWidgetFactory.createPushButton(composite, LABEL_BUTTON_CONFIGURE_WORKSPACE_SETTINGS);
-		fButtonUseDiagramSettings = PageSetupWidgetFactory.createRadioButton(composite, LABEL_BUTTON_USE_DIAGRAM_SETTINGS);
-		
-		if (fGlobalStore == null
-			|| !(fGlobalStore instanceof IPersistentPreferenceStore)) {
-			fButtonUseWorkspaceSettings.setEnabled(false);
-		}
-		
-		addUseWorkspaceSettingsListener();
-		addUseDiagramSettingsListener();
-		addConfigureWorkspaceSettingsListener();
-		
-		fControls.add(fButtonUseWorkspaceSettings);
-		fControls.add(fButtonConfigure);
-		fControls.add(fButtonUseDiagramSettings);
-	}
-	
-	/**
-	 * Attach selection handling logic to 'Use workspace settings' button. 
-	 */
-	private void addUseWorkspaceSettingsListener() {
-		fButtonUseWorkspaceSettings.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				fParentDialog.getConfigurationBlock().disableAllControls();
-				fButtonConfigure.setEnabled(true);
-				fParentDialog.getOkButton().setEnabled(true);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-			
-		});
-	}
-	
-	/** 
-	 * Attach selection handling logic to 'Use diagram settings' button. 
-	 */
-	private void addUseDiagramSettingsListener() {
-		fButtonUseDiagramSettings.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				fParentDialog.getConfigurationBlock().enableAllControls();
-				fButtonConfigure.setEnabled(false);
-				fParentDialog.getConfigurationBlock().setOkButtonEnableStatus();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}			
-		});
-	}
-	
-	/** 
-	 * Attach selection handling logic to 'Configure workspace settings' button. 
-	 */
-	private void addConfigureWorkspaceSettingsListener() {
-		fButtonConfigure.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				// Display Printing preference page allowing the user to configure global printing settings
-				IPreferencePage page = new PrintingPreferencePage(fGlobalStore);
-				page.setTitle(ILabels.LABEL_PREFERENCE_PAGE_PRINTING);
-				
-				IPreferenceNode targetNode = new PreferenceNode(ID_PAGE_SETUP_PREF_PAGE, page);
-				PreferenceManager manager = new PreferenceManager();
-				manager.addToRoot(targetNode);
-				
-				PreferenceDialog dialog = new PreferenceDialog(fShell, manager);
-				
-				dialog.create();
-				dialog.setMessage(TITLE_PAGE_SETUP_TAB_ITEM);
-				dialog.open();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-			
-		});
-	}
-
-	/** 
-	 * Return specified control. 
-	 */
-	public Control getControl(PageSetupControlType controlType) {
-		if (controlType.equals(PageSetupControlType.BUTTON_USE_WORKSPACE_SETTINGS))
-			return fButtonUseWorkspaceSettings;
-		else if (controlType.equals(PageSetupControlType.BUTTON_USE_DIAGRAM_SETTINGS))
-			return fButtonUseDiagramSettings;
-		else if (controlType.equals(PageSetupControlType.BUTTON_CONFIGURE_WORKSPACE_SETTINGS))
-			return fButtonConfigure;
-		else
-			return null;
-	}
-	
-	/** 
-	 * Calling this method will disable the 'Configure workspace settings' button. 
-	 */
-	public void disableButtonConfigure() {
-		fButtonConfigure.setEnabled(false);
-	}
-	
-	/** 
-	 * Calling this method will enable the 'Configure workspace settings' button. 
-	 */
-	public void enableButtonConfigure() {
-		fButtonConfigure.setEnabled(true);
-	}
-	
-	// INITIALIZER
-	private class Initializer {
-
-		private PageSetupSelectionConfigBlock fBlockPrint;
-
-		public Initializer(PageSetupSelectionConfigBlock configBlock) {
-			fBlockPrint = configBlock;
-		}
-		
-		public void initSelectionControls() {
-			initRadioButtons();
-		}
-		
-		private void initRadioButtons() {
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_WORKSPACE_SETTINGS, WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS);
-			initRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_DIAGRAM_SETTINGS, WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS);
-		}
-		
-		private void initRadioButton(PageSetupSelectionConfigBlock block, PageSetupControlType controlType, String key) {
-			Button button = (Button) block.getControl(controlType);
-			button.setSelection(fStore.getBoolean(key));
-		}
-	}
-
-	// PERSISTOR
-	private class Persistor {
-
-		private PageSetupSelectionConfigBlock fBlockPrint;
-
-		public Persistor(PageSetupSelectionConfigBlock configBlock) {
-			fBlockPrint = configBlock;
-		}
-		
-		public void saveConfigBlockControlValues() {	
-			saveConfigRadioButtonValues();
-			//fBlockPrint.emptyControlList();
-		}
-		
-		private void saveConfigRadioButtonValues() {
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_WORKSPACE_SETTINGS, WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS);
-			saveRadioButton(fBlockPrint, PageSetupControlType.BUTTON_USE_DIAGRAM_SETTINGS, WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS);
-		}
-		
-		private void saveRadioButton(PageSetupSelectionConfigBlock block, PageSetupControlType controlType, String key) {
-			Button button = (Button) block.getControl(controlType);
-			fStore.setValue(key, button.getSelection());
-		}
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/StringValidator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/StringValidator.java
deleted file mode 100644
index 16f3192..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/StringValidator.java
+++ /dev/null
@@ -1,91 +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.internal.dialogs;
-
-import java.text.ParseException;
-
-import com.ibm.icu.text.NumberFormat;
-
-/**
- * StringValidator verifies the integrity of the user input.  It is used by
- * page setup dialog to verify the integrity of margin and page size values.
- * 
- * @author etworkow
- */
-class StringValidator {
-
-	/**
-	 * Verify input is valid - not null and is a positive number.
-	 *  
-	 * @param input
-	 * @return
-	 */
-	public static boolean isValid(String input) {
-
-		return isNotEmpty(input) && 
-			   isDouble(input) && 
-			   isPositive(input);
-	}
-		
-	/**
-	 * Verify user input string is not empty.
-	 * 
-	 * @param input the value entered by the user
-	 * @return boolean true is string it not empty, false otherwise
-	 */
-	private static boolean isNotEmpty(String input) {
-		if (input.length() > 0) return true;
-		return false;
-	}
-	
-	/**
-	 * Verify all characters in a user input string are numeric.
-	 * 
-	 * @param input the value entered by the user
-	 * @return boolean true is string contains only numeric characters, false otherwise
-	 */
-	private static boolean isDouble(String input) {
-		// Verify input can be parsed as double
-		char[] tokens = input.toCharArray();
-		if (!(Character.isDigit(tokens[0])))
-			return false;
-		
-		try {
-            NumberFormat.getNumberInstance().parse(input);
-		} catch (ParseException e) {
-            return false;
-        }
-		
-		return true;
-	}
-	
-	/**
-	 * Verify the value entered by the user is positive.
-	 * 
-	 * @param input the value entered by the user
-	 * @return boolean true if value > 0, false otherwise
-	 */
-	private static boolean isPositive(String input) {
-		if (isDouble(input)) {
-			try {
-				// Verify input is a positive number
-				Number n = NumberFormat.getNumberInstance().parse(input);
-				if (n.doubleValue() >= 0) 
-					return true;
-			} catch (ParseException e) {
-				return false;
-			}			
-		}
-		// If input is not numeric, return false
-		return false;
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/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>
-
-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/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/FilterDialog.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/FilterDialog.java
deleted file mode 100644
index c75ecc1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/FilterDialog.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    Nicolas Rouquette (NASA) - Fix for Bug 260812. 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.sortfilter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-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.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SortFilterContentEditPolicy;
-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.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * Simple dialog that support filtering of list compartment items through visibililty
- * 
- * @author jcorchis
- */
-public class FilterDialog
-	extends Dialog {
-	
-	/** dialog title prefix */
-	private final String title = DiagramUIMessages.SortFilterDialog_title;
-	
-	/** filter list labels */
-	static private final String FILTER_ITEMS_CONTAINING = DiagramUIMessages.SortFilter_filterItemsListLabel;	
-	static private final String FILTER_ITEMS_LIST = DiagramUIMessages.SortFilter_fitlerListLabel;
-
-	/** Tool tips and labels for the filter buttons */
-	static private final String ADD_TO = DiagramUIMessages.SortFilter_addTo;
-	private final String ADD_TO_LABEL = "<"; //$NON-NLS-1$
-	static private final String REMOVE_FROM = DiagramUIMessages.SortFilter_removeFrom;
-	private final String REMOVE_FROM_LABEL = ">"; //$NON-NLS-1$	
-	static private final String ADD_ALL = DiagramUIMessages.SortFilter_addAll;
-	private final String ADD_ALL_LABEL = "<<"; //$NON-NLS-1$
-	static private final String REMOVE_ALL = DiagramUIMessages.SortFilter_removeAll;
-	private final String REMOVE_ALL_LABEL = ">>"; //$NON-NLS-1$
-	static private final String APPLY = DiagramUIMessages.SortFilter_apply;
-
-	/** List item widgets */
-	private org.eclipse.swt.widgets.List filterList = null;
-	private org.eclipse.swt.widgets.List filters = null;
-	private Button addTo = null;
-	private Button removeFrom = null;
-	private Button addAllTo = null;
-	private Button removeAllFrom = null;
-
-	/** Button IDs */
-	private final int ADD_TO_ID = 1000;
-	private final int REMOVE_FROM_ID = ADD_TO_ID + 1;
-	private final int ADD_ALL_TO_ID = ADD_TO_ID + 2;
-	private final int REMOVE_ALL_FROM_ID = ADD_TO_ID + 3;	
-	private final int APPLY_ID = 5000;
-
-	/** Height (in list items) for the filter items lists */
-	private int LIST_HEIGHT = 8;
-
-	/** The collection Column list for this page */
-	private Map filterMap = null;
-	private String[] filterStrings = null;
-	
-	/** the default fitlering settings */
-	private Filtering _filtering = Filtering.NONE_LITERAL;
-	private List _filteringKeys = Collections.EMPTY_LIST;
-	
-	/** List of editpart selected */
-	private List selection;	
-	
-	/**  
-	 * Allows the user to initial apply changes and then
-	 * only after filtering has changed.
-	 */
-	private boolean changeToApply = true;
-
-	
-	/**
-	 * SelectionAdapter for the filtering buttons. Calls <code>buttonPressed()</code>
-	 * to handle the action.
-	 * 
-	 * @author jcorchis
-	 */
-	class ButtonSelectionAdapter extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent event) {
-			buttonPressed(((Integer) event.widget.getData()).intValue());
-		}
-	}
-
-	/** Instance of the ButtonSelectionAdapter used for all filtering buttons. */
-	private ButtonSelectionAdapter buttonSelectionAdapter =
-		new ButtonSelectionAdapter();
-	
-	/**
-	 * @param parentShell
-	 */
-	protected FilterDialog(Shell parentShell, List selection, Map filterMap) {
-		super(parentShell);
-		this.selection  = selection;
-		this.filterMap = filterMap;
-	}
-
-		
-	/**
-	 * Adds an apply button and the filter control 
-	 * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {		
-		getShell().setText(title);
-		createFilterLists(parent);				
-		return parent;
-	}
-	
-	
-	/**
-	 * Adds the apply button
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		createButton(parent, APPLY_ID, APPLY, true);		
-		
-	}
-	
-	/**
-	 * Creates the filtering list widgets
-	 * @param parent
-	 */
-	private void createFilterLists(Composite ancestor) {
-		// Do not show the filter lists if not filter criteria 
-		// is defined.
-		if (filterMap == null || filterMap.isEmpty())	
-			return;
-		
-		Object[] filterArray = filterMap.keySet().toArray();
-		this.filterStrings = new String[filterArray.length];
-		for (int i = 0; i < filterArray.length; i++) {
-			filterStrings[i] = (String) filterArray[i];
-		}	
-		
-		//setup layout 
-		Composite parent = new Composite(ancestor, SWT.NULL);
-
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 10;
-		layout.marginWidth = 10;
-		layout.numColumns = 3;
-		parent.setLayout(layout);
-
-		// Create the possible filter items list
-		Label filterItemsLabel = new Label(parent, SWT.LEFT);
-		filterItemsLabel.setText(FILTER_ITEMS_CONTAINING);
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-		filterItemsLabel.setLayoutData(gd);
-
-		// Create the possible filter items list
-		new Label(parent, SWT.LEFT);
-
-		// Create the possible filter items list		
-		Label filterItemLabel = new Label(parent, SWT.LEFT);
-		filterItemLabel.setText(FILTER_ITEMS_LIST);
-		GridData gd2 = new GridData();
-		gd2.horizontalAlignment = GridData.BEGINNING;
-		filterItemLabel.setLayoutData(gd2);
-
-		// Create the possible filter items list
-		filters =
-			new org.eclipse.swt.widgets.List(
-				parent,
-				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL);
-		gridData.verticalSpan = 1;
-		gridData.widthHint = 80;
-		int listHeight = filters.getItemHeight() * LIST_HEIGHT;
-		Rectangle trim = filters.computeTrim(0, 0, 0, listHeight);
-		gridData.heightHint = trim.height;
-		filters.setLayoutData(gridData);
-
-		// Create a new composite for the buttons and add
-		// stack them vertically	  				  	
-		Composite buttonComposite = new Composite(parent, SWT.NULL);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonLayout.numColumns = 1;
-		buttonComposite.setLayout(buttonLayout);
-
-		GridData buttGD =
-			new GridData(GridData.FILL_VERTICAL | GridData.CENTER);
-		buttGD.horizontalSpan = 1;
-		buttGD.widthHint = 30;
-		buttonComposite.setLayoutData(buttGD);
-
-		removeFrom = new Button(buttonComposite, SWT.PUSH);
-		removeFrom.setText(REMOVE_FROM_LABEL);
-		removeFrom.setToolTipText(REMOVE_FROM);
-		removeFrom.setLayoutData(makeArrowButtonGridData(removeFrom));
-		removeFrom.setData(new Integer(REMOVE_FROM_ID));
-		removeFrom.addSelectionListener(buttonSelectionAdapter);
-		removeFrom.setEnabled(false);
-
-		addTo = new Button(buttonComposite, SWT.PUSH);
-		addTo.setText(ADD_TO_LABEL);
-		addTo.setToolTipText(ADD_TO);
-		addTo.setLayoutData(makeArrowButtonGridData(addTo));
-		addTo.setData(new Integer(ADD_TO_ID));
-		addTo.addSelectionListener(buttonSelectionAdapter);
-		addTo.setEnabled(false);
-
-		removeAllFrom = new Button(buttonComposite, SWT.PUSH);
-		removeAllFrom.setText(REMOVE_ALL_LABEL);
-		removeAllFrom.setToolTipText(REMOVE_ALL);
-		removeAllFrom.setLayoutData(makeArrowButtonGridData(removeAllFrom));
-		removeAllFrom.setData(new Integer(REMOVE_ALL_FROM_ID));
-		removeAllFrom.addSelectionListener(buttonSelectionAdapter);
-		addAllTo = new Button(buttonComposite, SWT.PUSH);
-
-		addAllTo.setText(ADD_ALL_LABEL);
-		addAllTo.setToolTipText(ADD_ALL);
-		addAllTo.setLayoutData(makeArrowButtonGridData(addAllTo));
-		addAllTo.setData(new Integer(ADD_ALL_TO_ID));
-		addAllTo.addSelectionListener(buttonSelectionAdapter);
-
-		// Add the possible list of filter items
-		this.filterList =
-			new org.eclipse.swt.widgets.List(
-				parent,
-				SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		GridData gridData2 = new GridData(GridData.VERTICAL_ALIGN_FILL);
-		gridData2.verticalSpan = 1;
-		gridData2.widthHint = 80;
-		int listHeight2 = filterList.getItemHeight() * LIST_HEIGHT;
-		Rectangle trim2 = filterList.computeTrim(0, 0, 0, listHeight2);
-		gridData.heightHint = trim2.height;
-		filterList.setLayoutData(gridData2);
-
-		filters.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				removeFrom.setEnabled(filters.getSelectionCount() > 0);
-			}
-		});
-
-		filterList.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addTo.setEnabled(filterList.getSelectionCount() > 0);
-			}
-		});
-
-		initFilterLists();
-	}
-	
-	/**
-	 * Populates the filter lists based on the _filteringKeys
-	 * and the filter criteria.
-	 */
-	private void initFilterLists() {
-		// TODO match the filtering key for all the list compartments
-		if (filterMap != null && !filterMap.isEmpty()) {
-			Set keySet = filterMap.keySet();
-			Iterator i = keySet.iterator();
-			if (_filtering == Filtering.AUTOMATIC_LITERAL) {
-				// Set the values of the filtered and unfiltered string
-				while (i.hasNext()) {
-					String filterString = (String) i.next();
-					if (_filteringKeys.contains(filterString)) {
-						filters.add(filterString);						
-					} else {
-						filterList.add(filterString);
-					}
-				}
-			} else {
-				// Add all filter strings to the possible filter list
-				while (i.hasNext()) {
-					String filterString = (String) i.next();
-					filterList.add(filterString);
-				}
-			}
-		}
-	}	
-	
-	/**
-	 * Creates GridData for the moveup and movedown toolbar buttons.
-	 * @param control button
-	 * @return the <code>GridData</code>
-	 */
-	protected GridData makeArrowButtonGridData(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		//fill horizontal to make them all the same size
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.heightHint = 24;
-		gc.dispose();
-		return gridData;
-	}	
-	
-	/**
-	 * 
-	 * @param filterMap
-	 * @param property
-	 */
-	public void setFilter(Map filterMap, String property) {
-		if (filterMap != null) {
-			this.filterMap = filterMap;
-			Object[] filterArray = filterMap.keySet().toArray();
-			this.filterStrings = new String[filterArray.length];
-			for (int i = 0; i < filterArray.length; i++) {
-				filterStrings[i] = (String) filterArray[i];
-			}
-		}
-	}
-	
-	/**
-	 * Handles the button pressed event on the filter criteria.  Move the items
-	 * between the lists based on the selection and but button pressed.
-	 * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int buttonId) {
-		String[] items = {
-		};
-		switch (buttonId) {
-			case ADD_TO_ID :
-				items = filterList.getSelection();
-				for (int i = 0; i < items.length; i++) {
-					filters.add(items[i]);
-					filterList.remove(items[i]);
-				}
-				addTo.setEnabled(false);
-				changeToApply = true;
-				break;
-			case REMOVE_FROM_ID :
-				items = filters.getSelection();
-				for (int i = 0; i < items.length; i++) {
-					filterList.add(items[i]);
-					filters.remove(items[i]);
-				}
-				removeFrom.setEnabled(false);
-				changeToApply = true;
-				break;
-			case ADD_ALL_TO_ID :
-				items = filterList.getItems();
-				for (int i = 0; i < items.length; i++) {
-					filters.add(items[i]);
-					filterList.remove(items[i]);
-				}
-				changeToApply = true;
-				break;
-			case REMOVE_ALL_FROM_ID :
-				items = filters.getItems();
-				for (int i = 0; i < items.length; i++) {
-					filters.remove(items[i]);
-					filterList.add(items[i]);
-				}
-				changeToApply = true;
-				break;
-			case IDialogConstants.OK_ID :
-				okPressed();
-				break;
-			case APPLY_ID :
-				applyPressed();
-				break;
-			default:
-				super.buttonPressed(buttonId);
-		}
-	}	
-	
-	/**
-	 * 
-	 */
-	protected void okPressed() {
-		if (changeToApply)
-			applyPressed();
-		super.okPressed();		
-	}
-	
-	/**
-	 * Executes a sort filter command for every list compartment that understands
-	 * the sort filter request.
-	 */
-	protected void applyPressed() {	
-		if (!changeToApply)
-			return;
-		if (filters.getItemCount() > 0) { 
-			_filteringKeys = new ArrayList();
-			_filtering = Filtering.AUTOMATIC_LITERAL;
-			for (int i = 0; i < filters.getItemCount(); i++) {
-				_filteringKeys.add(filters.getItems()[i]);
-			}
-		} else {
-			_filtering = Filtering.NONE_LITERAL;
-			_filteringKeys = Collections.EMPTY_LIST;
-		}
-
-		ChangePropertyValueRequest filterTypeRequest = new ChangePropertyValueRequest(
-			Properties.ID_FILTERING, Properties.ID_FILTERING,
-			_filtering);
-		ChangePropertyValueRequest filterKeysRequest = new ChangePropertyValueRequest(
-			Properties.ID_FILTERING_KEYS, Properties.ID_FILTERING_KEYS,
-			_filteringKeys);
-
-		// Run the command	
-        TransactionalEditingDomain editingDomain = null;
-        List childCommands = new ArrayList();
-		Iterator iter = selection.iterator();
-		while (iter.hasNext()) {
-			GraphicalEditPart ep = (GraphicalEditPart) iter.next();
-            
-            if (editingDomain == null) {
-                editingDomain = ep.getEditingDomain();
-            }
-            
-			List children = ep.getChildren();
-			for (int i = 0; i < children.size(); i++) {
-				if (children.get(i) instanceof ListCompartmentEditPart) {
-					ListCompartmentEditPart editPart = (ListCompartmentEditPart) children
-						.get(i);
-					
-					if (filterMap != null && filterMap.equals(getFilterMapFromEditPart(editPart))) {					
-                       Command command = editPart.getCommand(filterTypeRequest);
-                       if (null != command) {
-                    	   childCommands.add(new CommandProxy(command));
-                       }
-                       command = editPart.getCommand(filterKeysRequest);
-                       if (null != command) {
-                    	   childCommands.add(new CommandProxy(command));
-                       }
-					}
-				}
-			}
-		}
-        
-        CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, 
-            DiagramUIMessages.Command_SortFilterCommand, childCommands);   
-        
-		((IGraphicalEditPart) selection.get(0)).getRoot().getViewer()
-			.getEditDomain().getCommandStack().execute(
-				new ICommandProxy(cc));	
-		
-		changeToApply = false;
-	}
-	
-	/**
-	 * Returns the ListCompartment level filter map or Collections.EMPTY_MAP
-	 * if an EditPolicyRoles.SORT_FILTER_CONTENT_ROLE is not installed
-	 * on the ListCompartment. 
-	 * @param editPart
-	 * @return Map the filter map
-	 */
-	private Map getFilterMapFromEditPart(ListCompartmentEditPart editPart) {
-		
-		EditPolicy ep = editPart.getEditPolicy(EditPolicyRoles.SORT_FILTER_CONTENT_ROLE);
-		if (ep instanceof SortFilterContentEditPolicy) { 
-			return ((SortFilterContentEditPolicy)ep).getFilter();
-		}
-		
-		return Collections.EMPTY_MAP;
-		
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterContentProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterContentProvider.java
deleted file mode 100644
index de512eb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterContentProvider.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.diagram.ui.internal.dialogs.sortfilter;
-
-import java.util.Collection;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * Content Provider for the sort filter dialog.
- * 
- * @author jcorchis
- */
-public class SortFilterContentProvider implements IStructuredContentProvider {
-
-	/**
-	 * Convience method to return an Object[] given content <code>List</code>.
-	 * @return an array of objects give the content <code>List</code>
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object sortFilterElements) {
-		if (sortFilterElements == null) {
-			return null;
-		}
-
-		return ((Collection)sortFilterElements).toArray();
-	}
-
-	/**
-	 * Unimplemented.
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	    // Not implemented
-	}
-
-	/**
-	 * Unimplemented
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	    // Not implemented
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialog.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialog.java
deleted file mode 100644
index 33ce880..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialog.java
+++ /dev/null
@@ -1,163 +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.internal.dialogs.sortfilter;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterPage;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.Policy;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Sort/Filter dialog.  The OK button applies all changes from each 
- * page starting with the ROOT page. 
- * 
- * @author jcorchis
- */
-public class SortFilterDialog extends PreferenceDialog {
-	
-	/** dialog title prefix */
-	private final String title = DiagramUIMessages.SortFilterDialog_title;
-	private CommandStack commandStack = null;
-	
-	/**
-	 * CollectionEditorDialog constructor
-	 * @param parentShell 	the parent shell
-	 */
-	public SortFilterDialog(Shell parentShell, CommandStack commandStack) {
-		super(parentShell, new SortFilterPageManager());
-		this.commandStack = commandStack;
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Control control = super.createDialogArea(parent);
-		getShell().setText(title);
-		getTreeViewer().expandAll();
-		return control;
-	}
-	
-	/**
-	 * Overridden to give access to the root node to show it's
-	 * child pages.
-	 * @param node the tree preference node
-	 * @return boolean
-	 */
-	public boolean showPage(IPreferenceNode node) {
-		return super.showPage(node);
-	}
-	
-	/**
-	 * Get the name of the selected item preference.  Overridden to 
-	 * always set the preference page to the root node.
-	 */
-	protected String getSelectedNodePreference() {
-		return null;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferenceDialog#okPressed()
-	 */
-	protected void okPressed() {
-		SafeRunnable.run(new SafeRunnable() {
-			private boolean errorOccurred;
-
-			
-			 /* (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-			 */
-			 
-			public void run() {
-				getButton(IDialogConstants.OK_ID).setEnabled(false);
-				errorOccurred = false;
-				boolean hasFailedOK = false;
-				try {
-					// Notify all the pages and give them a chance to abort
-					Iterator nodes = getPreferenceManager().getElements(PreferenceManager.PRE_ORDER)
-							.iterator();
-					CompoundCommand cc = new CompoundCommand();
-					while (nodes.hasNext()) {
-						IPreferenceNode node = (IPreferenceNode) nodes.next();
-						IPreferencePage page = node.getPage();
-						if (page != null) {
-							if (page instanceof SortFilterPage) {
-								Command cmd = ((SortFilterPage)page).getCommand();
-								if (cmd != null && cmd.canExecute())
-									cc.add(cmd);
-							}
-							else if (!page.performOk()){
-								hasFailedOK = true;
-								return;
-							}
-						}
-					}
-					if (cc.canExecute())
-						commandStack.execute(cc);
-				} catch (Exception e) {
-					handleException(e);
-				} finally {
-					//Don't bother closing if the OK failed
-					if(hasFailedOK){
-						setReturnCode(FAILED);
-						getButton(IDialogConstants.OK_ID).setEnabled(true);
-						return;
-					}
-					
-					if (!errorOccurred) {
-						//Give subclasses the choice to save the state of the
-					    //preference pages.
-						handleSave();
-					}
-					setReturnCode(OK);
-					close();
-				}
-			}
-
-			
-			 /* (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
-			 */
-			 
-			public void handleException(Throwable e) {
-				errorOccurred = true;
-				
-				Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, 0, e.toString(), e));
-
-				setSelectedNodePreference(null);
-				String message = JFaceResources.getString("SafeRunnable.errorMessage"); //$NON-NLS-1$
-				MessageDialog.openError(getShell(), JFaceResources.getString("Error"), message); //$NON-NLS-1$
-
-			}
-		});
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialogUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialogUtil.java
deleted file mode 100644
index 9c408aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterDialogUtil.java
+++ /dev/null
@@ -1,87 +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.internal.dialogs.sortfilter;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterPage;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Utility class that creates and opens the actual dialog with the data the 
- * EditPolicy must provide before the dialog is invoked.
- * 
- * @author jcorchis
- */
-public class SortFilterDialogUtil {
-	
-	private final static String ROOT_NAME = DiagramUIMessages.SortFilterDialog_rootTitle;
-
-	/**
-	 * Constructor for CollectionEditorUtil.  No need instantiate this class.
-	 */
-	private SortFilterDialogUtil() {
-	    // utility class.
-	}
-
-	/**
-	 * Invokes the Sort/Filter with the given <b>CollectionPages</b>
-	 * @param view the  the element
-	 * @return the window return code OK or CANCEL
-	 */
-	static public int invokeDialog(
-		GraphicalEditPart editPart,
-		SortFilterPage rootPage,
-		List collectionPages) {
-			
-		SortFilterDialog sortFilterDialog =
-			new SortFilterDialog(
-				Display.getCurrent().getActiveShell(), editPart.getViewer().getEditDomain().getCommandStack());
-				
-		rootPage.setTitle(ROOT_NAME);
-
-		sortFilterDialog.getPreferenceManager().addToRoot(
-			new SortFilterRootPreferenceNode(ROOT_NAME, rootPage, sortFilterDialog));
-		// Add the child pages
-		Iterator iter = collectionPages.iterator();
-		while (iter.hasNext()) {
-			sortFilterDialog.getPreferenceManager().addTo(
-			ROOT_NAME,
-				new PreferenceNode(
-					StringStatics.BLANK,
-					(SortFilterPage) iter.next()));
-		}
-
-		sortFilterDialog.create();
-		return sortFilterDialog.open();
-	}
-	
-	/**
-	 * Invokes the simple filter dialog which allows
-	 * multiple elements to be filtered.
-	 * @param selection
-	 * @return
-	 */
-	static public int invokeFilterDialog(
-			List selection, Map filterMap) {
-		FilterDialog filterDialog =
-			new FilterDialog(Display.getCurrent().getActiveShell(), selection, filterMap);
-		
-		return filterDialog.open();
-	}	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterPageManager.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterPageManager.java
deleted file mode 100644
index 6ab01ca..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterPageManager.java
+++ /dev/null
@@ -1,28 +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.internal.dialogs.sortfilter;
-
-import org.eclipse.jface.preference.PreferenceManager;
-
-/**
- * <code>PageManager</code> for the Sort/Filter dialog.
- * 
- * @author jcorchis
- */
-public class SortFilterPageManager extends PreferenceManager {
-	
-	public SortFilterPageManager() {
-		super('+');
-	}
-	
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterRootPreferenceNode.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterRootPreferenceNode.java
deleted file mode 100644
index 5360aa0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/SortFilterRootPreferenceNode.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.internal.dialogs.sortfilter;
-
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceNode;
-
-import org.eclipse.gmf.runtime.diagram.ui.dialogs.sortfilter.SortFilterPage;
-
-/**
- * Extended to provide access from the <code>PreferenceNode</code> to the <code>
- * PreferenceDialog</code>.
- * 
- * @author jcorchis
- */
-public class SortFilterRootPreferenceNode extends PreferenceNode {
-	
-	private PreferenceDialog preferenceDialog;
-	
-	/**
-	 * Constructor for <code>SortFilterRootPreferenceNode</code>
-	 * @param rootName name of the root node
-	 * @param page the page associated with the root node
-	 * @param sortFilterDialog the <code>PreferenceDialog</code>
-	 */
-	public SortFilterRootPreferenceNode(String rootName, SortFilterPage page, PreferenceDialog sortFilterDialog) {
-		super(rootName, page);
-		this.preferenceDialog = sortFilterDialog;
-	}
-	
-	/**
-	 * Returns the <code>PreferenceDialog</code> associated with this <code>PreferenceNode</code>
-	 * @return the <code>PreferenceDialog</code> associated with this <code>PreferenceNode</code>
-	 */
-	public PreferenceDialog getPreferenceDialog() {
-		return this.preferenceDialog;		
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/package.html
deleted file mode 100644
index 238f6f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/dialogs/sortfilter/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.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultCompartmentEditPart.java
deleted file mode 100644
index 306b6e9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultCompartmentEditPart.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.internal.editparts;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * An editpart to show a default compartment view.
- * 
- * @author cmahoney
- * 
- */
-public class DefaultCompartmentEditPart
-	extends ResizableCompartmentEditPart {
-
-	/**
-	 * Constructs a new instance.
-	 * 
-	 * @param view
-	 */
-	public DefaultCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.EditPart#refresh()
-	 */
-	public void refresh() {
-		// do nothing
-	}
-
-	public String getCompartmentName() {
-		return DiagramUIMessages.InvalidView;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultConnectionEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultConnectionEditPart.java
deleted file mode 100644
index 9d68283..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultConnectionEditPart.java
+++ /dev/null
@@ -1,60 +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.internal.editparts;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.LabelEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.OnConnectionLocator;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * An editpart to show a default connection view.
- * 
- * @author cmahoney
- */
-public class DefaultConnectionEditPart
-	extends ConnectionNodeEditPart {
-
-	/**
-	 * Constructs a new instance.
-	 * 
-	 * @param view
-	 */
-	public DefaultConnectionEditPart(View view) {
-		super(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#createConnectionFigure()
-	 */
-	protected Connection createConnectionFigure() {
-
-		PolylineConnectionEx conn = new PolylineConnectionEx() {
-
-			public void paint(Graphics graphics) {
-				setForegroundColor(ColorConstants.red);
-				super.paint(graphics);
-			}
-
-		};
-
-		conn.add(new LabelEx(DiagramUIMessages.InvalidView), new OnConnectionLocator(conn, 50));
-		return conn;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultEditableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultEditableEditPart.java
deleted file mode 100644
index 622c4af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultEditableEditPart.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.editparts;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IEditableEditPart;
-
-/**
- * Default implementation of the <code>IEditableEditPart</code> interface
- * 
- * @author Vishy Ramaswamy
- */
-public class DefaultEditableEditPart
-	implements IEditableEditPart {
-
-	/**
-	 * The edit part
-	 */
-	private final GraphicalEditPart editPart;
-
-	/**
-	 * Flag to indicate if the edit part is in edit mode
-	 */
-	private boolean isEditable = true;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param editPart
-	 *            the edit part
-	 */
-	public DefaultEditableEditPart(GraphicalEditPart editPart) {
-		super();
-		Assert.isNotNull(editPart);
-		this.editPart = editPart;
-
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart#isEditModeEnabled()
-	 */
-	public boolean isEditModeEnabled() {
-		return this.isEditable;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart#disableEditMode()
-	 */
-	public void disableEditMode() {
-		if (!isEditModeEnabled()) {
-			return;
-		}
-
-		List l = getGraphicalEditPart().getSourceConnections();
-		for (int i = 0; i < l.size(); i++) {
-			Object obj = l.get(i);
-			if ( obj instanceof IEditableEditPart) {
-				((IEditableEditPart)obj).disableEditMode();
-			}
-		}
-
-		List c = getGraphicalEditPart().getChildren();
-		for (int i = 0; i < c.size(); i++) {
-			Object obj = c.get(i);
-			if ( obj instanceof IEditableEditPart) {
-				((IEditableEditPart)obj).disableEditMode();
-			}
-		}
-
-		this.isEditable = false;
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart#enableEditMode()
-	 */
-	public void enableEditMode() {
-		if (isEditModeEnabled()) {
-			return;
-		}
-
-		this.isEditable = true;
-
-		List c = getGraphicalEditPart().getChildren();
-		for (int i = 0; i < c.size(); i++) {
-			Object obj = c.get(i);
-			if ( obj instanceof IEditableEditPart) {
-				((IEditableEditPart)obj).enableEditMode();
-			}
-		}
-
-		List l = getGraphicalEditPart().getSourceConnections();
-		for (int i = 0; i < l.size(); i++) {
-			Object obj = l.get(i);
-			if ( obj instanceof IEditableEditPart) {
-				((IEditableEditPart)obj).enableEditMode();
-			}
-		}
-	}
-
-	/**
-	 * Returns the editPart.
-	 * 
-	 * @return the editPart.
-	 */
-	private GraphicalEditPart getGraphicalEditPart() {
-		return this.editPart;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultNodeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultNodeEditPart.java
deleted file mode 100644
index d4984b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DefaultNodeEditPart.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.diagram.ui.internal.editparts;
-
-import org.eclipse.draw2d.Graphics;
-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.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-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.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * An editpart to show a default node view.
- * 
- * @author cmahoney
- */
-public class DefaultNodeEditPart
-	extends ShapeNodeEditPart {
-
-	/**
-	 * Rectangle figure with error text.
-	 */
-	static class DefaultNodeFigure
-		extends DefaultSizeNodeFigure {
-
-		public DefaultNodeFigure(int width, int height) {
-			super(width, height);
-		}
-
-		protected void paintFigure(Graphics g) {
-			Rectangle r = Rectangle.SINGLETON;
-			r.setBounds(getBounds());
-
-			g.setBackgroundColor(DiagramColorConstants.diagramLightRed);
-			g.fillRectangle(r);
-
-			g.setForegroundColor(DiagramColorConstants.black);
-			r.width--;
-			r.height--;
-			g.drawRectangle(r);
-
-			String txt = DiagramUIMessages.InvalidView;
-
-			IMapMode mm = MapModeUtil.getMapMode(this);
-			if (txt != null && txt.length() > 0) {
-				Dimension td = FigureUtilities.getTextExtents(txt, g.getFont());
-				mm.DPtoLP(td);
-				Point p = FigureUtilities.getLocation(
-					PositionConstants.NORTH_SOUTH, td, r);
-				g.drawString(txt, p);
-				setPreferredSize(td.expand(mm.DPtoLP(10), mm.DPtoLP(10)));
-			}
-		}
-	}
-
-	/**
-	 * Constructs a new instance.
-	 * 
-	 * @param view
-	 */
-	public DefaultNodeEditPart(View view) {
-		super(view);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new DefaultNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramLinkEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramLinkEditPart.java
deleted file mode 100644
index c3ebdc6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramLinkEditPart.java
+++ /dev/null
@@ -1,87 +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.internal.editparts;
-
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-
-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.internal.editpolicies.NonSemanticEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Edit Part which supports only diagram links.
- * 
- * @author jcorchis
- */
-public class DiagramLinkEditPart extends ShapeNodeEditPart {
-
-
-	/**
-	 * @param view
-	 */
-	public DiagramLinkEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @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());
-
-		// The following edit policy support the link open.		
-		installEditPolicy(
-			EditPolicyRoles.OPEN_ROLE,
-			new OpenDiagramEditPolicy());	
-		
-		installEditPolicy(
-			EditPolicy.COMPONENT_ROLE,
-			new ViewComponentEditPolicy());
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	protected NodeFigure createNodeFigure() {
-		Dimension defaultSize = new Dimension(getMapMode().DPtoLP(100), getMapMode().DPtoLP(25));
-		DefaultSizeNodeFigure fig = new DefaultSizeNodeFigure(defaultSize.width, defaultSize.height);
-		int margin = getMapMode().DPtoLP(5);
-		fig.setBorder(new MarginBorder(margin, margin, margin, margin));
-		fig.setLayoutManager(new ConstrainedToolbarLayout());
-		fig.setOpaque(true);
-		fig.setDefaultSize(defaultSize);
-		return fig;
-	}
-	
-	/**
-	 * 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);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramNameCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramNameCompartmentEditPart.java
deleted file mode 100644
index 35e34a9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramNameCompartmentEditPart.java
+++ /dev/null
@@ -1,191 +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.internal.editparts;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-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.icon.IconOptions;
-import org.eclipse.gmf.runtime.common.ui.services.icon.IconService;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.CreateDiagramLinkCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.editparts.TextCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Name compartment for NalDiagramView elements.  
- * This compartment is not editable. 
- * 
- * @author jcorchis
- */
-public class DiagramNameCompartmentEditPart extends TextCompartmentEditPart {
-	
-	private IconOptions iconOptions;
-	protected static final int ICON_INDEX = 0;
-	protected static final int NUM_ICONS = 1;	
-
-	/**
-	 * @param view
-	 */
-	public DiagramNameCompartmentEditPart(View view) {
-		super(view);
-		iconOptions = new IconOptions();
-		iconOptions.set(IconOptions.GET_STEREOTYPE_IMAGE_FOR_ELEMENT);
-		iconOptions.set(IconOptions.NO_DEFAULT_STEREOTYPE_IMAGE);
-		setNumIcons(NUM_ICONS);
-	}
-    
-    protected ILabelDelegate createLabelDelegate() {
-        ILabelDelegate labelDelegate = super.createLabelDelegate();
-        labelDelegate.setIconAlignment(PositionConstants.TOP);
-        labelDelegate.setTextAlignment(PositionConstants.TOP);
-        labelDelegate.setAlignment(PositionConstants.TOP);
-        labelDelegate.setTextWrapOn(true);
-        labelDelegate.setTextJustification(PositionConstants.CENTER);
-        return labelDelegate;
-    }
-        
-    public void activate() {
-        super.activate();
-        EObject semanticProxy = getElement();
-        if (semanticProxy != null && !semanticProxy.eIsProxy()) {
-            addSemanticListeners();
-        }
-    }
-
-    /** Return the semantic element associated to this editpart. */
-    public EObject resolveSemanticElement() {
-        try {
-            return (EObject) getEditingDomain().runExclusive(
-                new RunnableWithResult.Impl() {
-
-                public void run() {
-                    View primary = getPrimaryView();
-                    if (primary != null)
-                        setResult(ViewUtil.resolveSemanticElement(primary));
-                }
-            });
-        } catch (InterruptedException e) {
-               Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "resolveSemanticElement", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "resolveSemanticElement", e); //$NON-NLS-1$
-            return null;
-        }
-    }
-    
-    /**
-     * Helper method to get the element of this view. 
-     * 
-     * @return
-     */
-    private EObject getElement() {
-        // This uses the primary view only because that is what
-        // {@link #resolveSemanticElement()} uses and I am
-        // assuming this was done for some reason.
-        View primary = getPrimaryView();
-        if (primary != null) {
-            return primary.getElement();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the icon image associated with the diagram.
-     * @param the 
-     * @return Image
-     */
-    protected Image getLabelIcon(int i) {
-        EObject element = getElement();
-        if (element != null)
-            return IconService.getInstance().getIcon(
-                new EObjectAdapter(element));
-        return null;
-    }
-    
-    /**
-     * @return <tt>false</tt> 
-     */
-    protected boolean isEditable() { 
-        return false; 
-    }
-    
-    /**
-     * Selectable if the parent edit part is not a DiagramLinkEditPart.
-     *  @return <tt>false</tt> if the parent is a DiagramLinkEditPart.
-     */
-    public boolean isSelectable() {
-        return false;
-    }
-    
-    public void createDefaultEditPolicies() {
-        super.createDefaultEditPolicies();
-        installEditPolicy(EditPolicy.COMPONENT_ROLE,
-                new DiagramLinkComponentEditPolicy());  
-    }
-    
-    protected void setVisibility(boolean vis) {
-        super.setVisibility(vis && getElement() != null);
-    }
-
-    private class DiagramLinkComponentEditPolicy extends ComponentEditPolicy {
-        
-        /**
-         * Returns a command to set the model to null. 
-         */
-        public Command createDeleteViewCommand(GroupRequest request) {
-            
-            TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-                .getEditingDomain();
-            
-            CreateDiagramLinkCommand com = new CreateDiagramLinkCommand(editingDomain,
-                DiagramUIMessages.Command_CreateDiagramLink,
-                    (View)getHost().getParent().getModel(), 
-                    null);
-            return new ICommandProxy(com);
-        }
-    }
-    
-    /**
-     * Overridden so that the name of the diagram will still be displayed even
-     * if the element is unresolved.
-     */
-    protected String getLabelText() {
-        String label = super.getLabelText();
-        if (label == null) {
-            EObject element = getElement();
-            if (element != null) {
-                return EMFCoreUtil.getName(element);
-            }
-        }
-        return label;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramRootTreeEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramRootTreeEditPart.java
deleted file mode 100644
index 3b1aaec..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DiagramRootTreeEditPart.java
+++ /dev/null
@@ -1,49 +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.internal.editparts;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.TreeEditPart;
-import org.eclipse.gef.editparts.RootTreeEditPart;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-
-/**
- * An override of RootTreeEditPart to give the root's contents a TreeItem widget
- * instead of a Tree widget. This will make the root's contents (the diagram) show
- * in the Outline Tree viewer as the root tree item. It will also fix the problem
- * of deleting a view selects the next node in the tree istead of the diagram node
- * 
- * @author melaasar
- */
-public class DiagramRootTreeEditPart extends RootTreeEditPart {
-
-	private TreeItem diagramTreeItem;
-	
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#addChildVisual(org.eclipse.gef.EditPart, int)
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		diagramTreeItem = new TreeItem((Tree)getWidget(), 0, index);
-		((TreeEditPart)childEditPart).setWidget(diagramTreeItem);
-	}
-	
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#removeChildVisual(org.eclipse.gef.EditPart)
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		diagramTreeItem.dispose();
-		super.removeChildVisual(childEditPart);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DummyEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DummyEditPart.java
deleted file mode 100644
index 7b5f414..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/DummyEditPart.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.internal.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-
-
-/**
- * Dummy edit part class
- * 
- * @author mmostafa
- */
-public class DummyEditPart extends GraphicalEditPart {
-
-	protected IFigure createFigure() {
-		return null;
-	}
-	
-	/**
-	 * Constructs a new instance.
-	 * 
-	 * @param model
-	 */
-	public DummyEditPart(EObject model) {
-		super(model);
-	}
-
-	protected void addNotationalListeners() {
-		// no need for Listeners
-	}
-
-	protected void addSemanticListeners() {
-		//no need for Listeners
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/FixedLocationResizableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/FixedLocationResizableEditPart.java
deleted file mode 100644
index 2d698ad..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/FixedLocationResizableEditPart.java
+++ /dev/null
@@ -1,20 +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.internal.editparts;
-
-
-/**
- * @author jcorchis
- */
-public interface FixedLocationResizableEditPart {
-	// Marker interface
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/GridLayerEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/GridLayerEx.java
deleted file mode 100644
index 6841d45..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/GridLayerEx.java
+++ /dev/null
@@ -1,78 +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.internal.editparts;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-
-
-/**
- * Grid Layer extension that provides grid color, origin and line style
- * settings to the GridLayer
- * 
- * @author tmacdoug
- *
- */
-public class GridLayerEx
-	extends GridLayer {
-
-	// Grid line style (for example dotted, dashed, solid, etc.)
-	private int lineStyle = SWT.LINE_CUSTOM;
-	private int[] dashes = new int[]{1,5};
-	
-	public GridLayerEx() {
-		super();
-	}
-	
-	/**
-	 * Constructs grid layer with the specified color
-	 * @param color
-	 */
-	public GridLayerEx(Color color) {
-		super();
-		setForegroundColor(color);
-	}
-
-	/**
-	 * Constructs grid layer with the specified color and origin
-	 * @param color
-	 * @param p
-	 */
-	public GridLayerEx(Color color, Point p) {
-		super();
-		setForegroundColor(color);
-		setOrigin(p);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editparts.GridLayer#paintGrid(org.eclipse.draw2d.Graphics)
-	 */
-	protected void paintGrid(Graphics g) {
-		FigureUtilities.paintGridWithStyle(g, this, origin, gridX, gridY, lineStyle, dashes);
-	}
-
-	
-	public void setLineStyle(int lineStyle) {
-		this.lineStyle = lineStyle;
-	}	
-	
-	public void setLineDash(int[] dashSet) {
-		this.dashes = dashSet;
-	}	
-
-	
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/IContainedEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/IContainedEditPart.java
deleted file mode 100644
index 3e8025c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/IContainedEditPart.java
+++ /dev/null
@@ -1,25 +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.internal.editparts;
-
-
-/**
- * Interface implemented to get around problems with
- * contribution item service.  All objects that are not
- * "diagram edit parts" will implement this interface.
- * 
- * @author schafe
- */
-public interface IContainedEditPart {
-	//marker to denote all edit parts that are not diagram edit parts
-	//TODO: remove when contribution item service supports notValue for objectclass
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ISurfaceEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ISurfaceEditPart.java
deleted file mode 100644
index 425f19b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ISurfaceEditPart.java
+++ /dev/null
@@ -1,46 +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.internal.editparts;
-
-import java.util.List;
-
-
-/**
- * Interface for those edit parts that support surface operations.
- * 
- * @author schafe, cmahoney
- */
-public interface ISurfaceEditPart {
-	
-	/**
-	 * Returns true if the surface edit part is to support
-	 * the view actions.  False otherwise.
-	 * @return boolean isSupportingViewActions
-	 */
-	public boolean isSupportingViewActions();
-	
-	/**
-	 * Setter for isSupportingViewActions
-	 * @param boolean supportsViewActions
-	 */
-	public void setIsSupportingViewActions(boolean supportsViewActions);
-	
-	/**
-	 * Gets the primary editparts on this surface, that is, the top-level shapes
-	 * and connectors.
-	 * 
-	 * @return List of primary edit parts. If there are none then it returns a
-	 *         Collections.EMPTY_LIST, which is immutable
-	 */
-	public List getPrimaryEditParts();
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/NoteAttachmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/NoteAttachmentEditPart.java
deleted file mode 100644
index 59cebee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/NoteAttachmentEditPart.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.editparts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/*
- * @canBeSeenBy %level1
- */
-public class NoteAttachmentEditPart extends ConnectionNodeEditPart {
-
-	public NoteAttachmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @see ConnectionNodeEditPart#createConnectionFigure()
-	 */
-	protected Connection createConnectionFigure() {
-		PolylineConnectionEx conn = new PolylineConnectionEx();
-		conn.setLineStyle(Graphics.LINE_DOT);
-		return conn;
-	}
-	
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart#handleNotificationEvent(org.eclipse.emf.common.notify.Notification)
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.Literals.LINE_STYLE__LINE_WIDTH.equals(feature)) {
-			refreshLineWidth();
-			refreshArrowSource();
-			refreshArrowTarget();
-		} else if (NotationPackage.Literals.LINE_TYPE_STYLE__LINE_TYPE
-				.equals(feature)) {
-			refreshLineType();
-		} else if (NotationPackage.Literals.ARROW_STYLE__ARROW_SOURCE
-				.equals(feature)) {
-			refreshArrowSource();
-		} else if (NotationPackage.Literals.ARROW_STYLE__ARROW_TARGET
-				.equals(feature)) {
-			refreshArrowTarget();
-		} else {
-			super.handleNotificationEvent(notification);
-		}
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineWidth(int)
-	 */
-	protected void setLineWidth(int width) {
-		if (width < 0) {
-			width = 1;
-		}
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setLineWidth(getMapMode().DPtoLP(width));
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setLineType(int)
-	 */
-	protected void setLineType(int lineType) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setLineStyle(lineType);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setArrowSource(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	protected void setArrowSource(RotatableDecoration arrowDecoration) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setSourceDecoration(arrowDecoration);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#setArrowTarget(org.eclipse.draw2d.RotatableDecoration)
-	 */
-	protected void setArrowTarget(RotatableDecoration arrowDecoration) {
-		PolylineConnectionEx conn = (PolylineConnectionEx) getFigure();
-		conn.setTargetDecoration(arrowDecoration);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/PageBreakEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/PageBreakEditPart.java
deleted file mode 100644
index abf121a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/PageBreakEditPart.java
+++ /dev/null
@@ -1,421 +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.internal.editparts;
-
-import org.eclipse.draw2d.Cursors;
-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.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-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.internal.editpolicies.PageBreakNonResizableEditPolicy;
-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.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Edit part which controls the page breaks figure. 
- * 
- * @author jcorchis
- */
-public class PageBreakEditPart extends AbstractGraphicalEditPart {
-
-	/* Figure associated with this graphic edit part */
-	private PageBreaksFigure pageOutlineFigure;
-
-	/* The size for the entire diagram 	 */
-	private Rectangle diagramBounds = new Rectangle();
-
-//	/* Attribute used to store the page breaks */
-//	private Rectangle pageBreakBounds;
-
-	/**
-	 * Method to update this the bounds of the shapes
-	 * on the diagram.
-	 * @param bounds the bounds of the shapes on the diagram
-	 */
-	public void set(Point location, Rectangle bounds) {
-		
-		if (bounds.x < location.x || bounds.y < location.y) {
-			// Figure's have been moved to the left or above the 
-			// the page breaks figure's location
-			calculatePageBreakFigureBounds(true, bounds.getSize());
-		} else {
-			// Calculate the number of pages needed to contain
-			// the diagram
-			int width = Math.abs(bounds.right() - location.x);
-			int height = Math.abs(bounds.bottom() - location.y);
-			
-			updatePageCount(width, height);			
-			
-			getPageBreaksFigure().setLocation(location);
-			
-			
-		}	
-	}
-
-	private void updatePageCount(int width, int height) {
-		Point printerPageSize = getPageSize();
-		float numCols = ((float) width) / printerPageSize.x;
-		int cols = Math.max(1, (int) Math.ceil(numCols));
-		float numRows = ((float) height) / printerPageSize.y;
-		int rows = Math.max(1, (int) Math.ceil(numRows));
-
-		int xInc = printerPageSize.x * cols;
-		int yInc = printerPageSize.y * rows;
-
-		getPageBreaksFigure().setSize(new Dimension(xInc, yInc));
-		getPageBreaksFigure().setPageCount(rows, cols);
-	}
-	
-	/**
-	 * Calculates the size of the page breaks figure and the
-	 * number of rows and columns based on the print page size.
-	 * This method updates the page breaks figure bounds directly.
-	 * 
-	 * @param center true to center the page breaks figure,
-	 * false to not center it.
-	 */
-	public void calculatePageBreakFigureBounds(boolean center) {
-		calculatePageBreakFigureBounds(center, diagramBounds.getSize());
-	}
-	
-	/**
-	 * Calculates the size of the page breaks figure and the
-	 * number of rows and columns based on the print page size.
-	 * This method will also center the page breaks figure.
-	 */
-	public void calculatePageBreakFigureBounds() {
-		calculatePageBreakFigureBounds(true, diagramBounds.getSize());
-	}	
-	
-	/**
-	 * Calculates the size of the page breaks figure and the
-	 * number of rows and columns based on the print page size.
-	 * This method updates the page breaks figure bounds directly.
-	 * 
-	 * @param center true to center the page breaks figure,
-	 * false to not center it.
-	 */
-	private void calculatePageBreakFigureBounds(boolean center, Dimension bounds) {
-		updatePageCount(bounds.width, bounds.height);
-		
-		if (center) {
-			centerPageBreaksFigure();
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractGraphicEditPart#createFigure()
-	 */
-	protected IFigure createFigure() {
-		pageOutlineFigure = new PageBreaksFigure(PageBreaksFigure.FIGURE);
-		pageOutlineFigure.setCursor(Cursors.SIZEALL);
-		return pageOutlineFigure;
-	}
-	
-	private PageBreaksFigure getPageBreaksFigure() {
-		if (pageOutlineFigure == null) {
-			createFigure();
-		}
-		return pageOutlineFigure;
-	}
-
-	/**
-	 * @see com.ibm.etools.gef.editparts.AbstractEditPart#createEditPolicies()
-	 */
-	protected void createEditPolicies() {
-		installEditPolicy(
-			EditPolicy.PRIMARY_DRAG_ROLE,
-			new PageBreakNonResizableEditPolicy());
-	}
-	
-	/**
-	 * Utility method that calculate the printer page size.      
-	 * @return point the page size point.x == width, point.y == height
-	 */
-	public Point getPageSize() {
-		IPreferenceStore s = getPreferenceStoreForPageSetup();
-		
-		IMapMode mm = MapModeUtil.getMapMode();
-		RootEditPart drEP = getRoot();
-		if (drEP instanceof DiagramRootEditPart) {
-			mm = ((DiagramRootEditPart)drEP).getMapMode();
-		}
-		
-		return PageInfoHelper.getPageSize(s, mm);
-	}
-
-	/**
-	 * Utility method to set the page breaks figure such that the 
-	 * all the diagram shapes appear centered within the page breaks
-	 * figure.
-	 */
-	private void centerPageBreaksFigure() {
-
-		Rectangle pageBreakBounds = getPageBreaksFigure().getBounds();
-
-		Rectangle r = diagramBounds;
-		Point offset =
-			new Point(
-				((pageBreakBounds.width - diagramBounds.width) / 2),
-				((pageBreakBounds.height - diagramBounds.height) / 2));
-		Rectangle centeredRec =
-			new Rectangle(
-				r.x - offset.x,
-				r.y - offset.y,
-				pageBreakBounds.width,
-				pageBreakBounds.height);
-		getPageBreaksFigure().setBounds(centeredRec);
-		updatePreferenceStore();
-	}
-
-	/**
-	 * Resizes the page outline figure based on changes to the diagram's children 
-	 * @param bounds the bounds of the figure 
-	 */
-	public void resize(Rectangle newBounds) {
-		Rectangle pageBreakBounds = getFigure().getBounds();
-		Point pageSize = getPageSize();
-
-		// Change in the EAST/WEST directions
-		if (newBounds.x != diagramBounds.x
-			|| newBounds.width != diagramBounds.width) {
-
-			if (newBounds.x < diagramBounds.x
-				|| newBounds.right() < diagramBounds.right()) {
-
-				// Move WEST: add cols to the WEST
-				if (newBounds.x < pageBreakBounds.x) {
-					int effectivewidth =
-						Math.abs(pageBreakBounds.right() - newBounds.right())
-							+ newBounds.width;
-					float cols = ((float) effectivewidth) / pageSize.x;
-					int requiredCols = (int) Math.ceil(Math.abs(cols));
-					int xOffset = Math.round(requiredCols * pageSize.x);
-
-					getPageBreaksFigure().setCols(requiredCols);
-					pageBreakBounds = getPageBreaksFigure().getBounds();
-					getPageBreaksFigure().setBounds(
-						new Rectangle(
-							pageBreakBounds.right() - xOffset,
-							pageBreakBounds.y,
-							xOffset,
-							pageBreakBounds.height));
-				}
-
-				// Remove cols from the EAST? 
-				pageBreakBounds = getPageBreaksFigure().getBounds();
-				int effectiveWidth =
-					Math.abs(newBounds.x - pageBreakBounds.x) + newBounds.width;
-				float cols = ((float) effectiveWidth) / pageSize.x;
-				int requiredCols = (int) Math.ceil(Math.abs(cols));
-				int xOffset = Math.round(requiredCols * pageSize.x);
-				getPageBreaksFigure().setCols(requiredCols);
-				getPageBreaksFigure().setBounds(
-					new Rectangle(
-						pageBreakBounds.x,
-						pageBreakBounds.y,
-						xOffset,
-						pageBreakBounds.height));
-
-			} else {
-
-				// Move EAST: add cols to the EAST
-				if (newBounds.right() > pageBreakBounds.right()) {
-					int effectiveWidth =
-						Math.abs(newBounds.x - pageBreakBounds.x)
-							+ newBounds.width;
-					float x = ((float) effectiveWidth) / pageSize.x;
-					int reqdCols = (int) Math.ceil(Math.abs(x));
-					int xOffset = Math.round(reqdCols * pageSize.x);
-					getPageBreaksFigure().setCols(reqdCols);
-					pageBreakBounds = getFigure().getBounds();
-					getPageBreaksFigure().setBounds(
-						new Rectangle(
-							pageBreakBounds.x,
-							pageBreakBounds.y,
-							xOffset,
-							pageBreakBounds.height));
-				}
-
-				// Remove cols from the WEST?
-				pageBreakBounds = getPageBreaksFigure().getBounds();
-				int effectiveWidth =
-					Math.abs(pageBreakBounds.right() - newBounds.right())
-						+ newBounds.width;
-				float cols = ((float) effectiveWidth) / pageSize.x;
-				int requiredCols = (int) Math.ceil(Math.abs(cols));
-				int xOffset = Math.round(requiredCols * pageSize.x);
-				getPageBreaksFigure().setCols(requiredCols);
-				getPageBreaksFigure().setBounds(
-					new Rectangle(
-						pageBreakBounds.right() - xOffset,
-						pageBreakBounds.y,
-						xOffset,
-						pageBreakBounds.height));
-
-			}
-		}
-
-		// Change in NORTH/SOUTH directions
-		if (newBounds.y != diagramBounds.y
-			|| newBounds.height != diagramBounds.height) {
-
-			if (newBounds.y < diagramBounds.y
-				|| newBounds.bottom() < diagramBounds.bottom()) {
-
-				// Move NORTH: add rows to the NORTH
-				if (newBounds.y < pageBreakBounds.y) {
-					// Add row to the top
-					int effectiveHeight =
-						(pageBreakBounds.bottom() - newBounds.bottom())
-							+ newBounds.height;
-					float rows = ((float) effectiveHeight) / pageSize.y;
-					int requiredRows = (int) Math.ceil(Math.abs(rows));
-					int yOffset = Math.round(requiredRows * pageSize.y);
-
-					getPageBreaksFigure().setRows(requiredRows);
-					pageBreakBounds = getFigure().getBounds();
-					getPageBreaksFigure().setBounds(
-						new Rectangle(
-							pageBreakBounds.x,
-							pageBreakBounds.bottom() - yOffset,
-							pageBreakBounds.width,
-							yOffset));
-				}
-
-				// Remove rows to the SOUTH?
-				pageBreakBounds = getPageBreaksFigure().getBounds();
-				int effectiveHeight =
-					Math.abs(newBounds.y - pageBreakBounds.y)
-						+ newBounds.height;
-				float rows = ((float) effectiveHeight) / pageSize.y;
-				int requiredRows = (int) Math.ceil(Math.abs(rows));
-				int yOffset = Math.round(requiredRows * pageSize.y);
-				getPageBreaksFigure().setRows(requiredRows);
-				pageBreakBounds = getFigure().getBounds();
-				getPageBreaksFigure().setBounds(
-					new Rectangle(
-						pageBreakBounds.x,
-						pageBreakBounds.y,
-						pageBreakBounds.width,
-						yOffset));
-
-
-			} else {
-
-				// Move SOUTH: add rows the SOUTH
-				if (newBounds.bottom() > pageBreakBounds.bottom()) {
-					// move south outside the page breaks boundary           		
-					int effectiveHeight =
-						(newBounds.y - pageBreakBounds.y) + newBounds.height;
-					float rows = ((float) effectiveHeight) / pageSize.y;
-					int requiredRows = (int) Math.ceil(Math.abs(rows));
-					int yOffset = Math.round(requiredRows * pageSize.y);
-
-					getPageBreaksFigure().setRows(requiredRows);
-					pageBreakBounds = getFigure().getBounds();
-					getPageBreaksFigure().setBounds(
-						new Rectangle(
-							pageBreakBounds.x,
-							pageBreakBounds.y,
-							pageBreakBounds.width,
-							yOffset));
-				}
-
-				// Remove rows from the NORTH?
-				pageBreakBounds = getPageBreaksFigure().getBounds();
-				int effectiveheight =
-					Math.abs(pageBreakBounds.bottom() - newBounds.bottom())
-						+ newBounds.height;
-				float rows = ((float) effectiveheight) / pageSize.y;
-				int requiredRows = (int) Math.ceil(Math.abs(rows));
-				int yOffset = Math.round(requiredRows * pageSize.y);
-
-				getPageBreaksFigure().setRows(requiredRows);
-				pageBreakBounds = getFigure().getBounds();
-				getPageBreaksFigure().setBounds(
-					new Rectangle(
-						pageBreakBounds.x,
-						pageBreakBounds.bottom() - yOffset,
-						pageBreakBounds.width,
-						yOffset));
-
-			}
-		}
-
-		this.diagramBounds = newBounds;
-	}
-	
-	/**
-	 * Updates the workspace viewer's prefence store values for
-	 * the page breaks figure location.
-	 */
-	public void updatePreferenceStore() {
-		Rectangle r = getPageBreaksFigure().getBounds();
-		
-		//don't use the workspace one
-		IPreferenceStore s = ((DiagramGraphicalViewer) getRoot().getViewer())
-		.getWorkspaceViewerPreferenceStore();
-		
-		if (s != null) {
-			s.setValue(WorkspaceViewerProperties.PAGEBREAK_X, r.x);
-			s.setValue(WorkspaceViewerProperties.PAGEBREAK_Y, r.y);
-		}
-	}	
-
-	/*
-	 * @see AbstractEditPart#getDragTracker(Request)
-	 */
-	public DragTracker getDragTracker(Request req) {
-		return new DragEditPartsTrackerEx(this) {
-			protected boolean isMove() {
-				return true;
-			}
-		};
-	}
-	
-	/**
-	 * Return the workspace preference store from the DiagramUIPlugin or the
-	 * diagram viewer's preference store, depending on what the user chose
-	 * in the Page Setup dialog.
-	 * 
-	 * @return IPreferenceStore for the workspace or diagram viewer
-	 */
-	private IPreferenceStore getPreferenceStoreForPageSetup() {
-		IPreferenceStore workspaceStore = ((DiagramGraphicalViewer) getRoot()
-			.getViewer()).getWorkspaceViewerPreferenceStore();
-
-		if (workspaceStore
-			.getBoolean(WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS)) {
-			return workspaceStore;
-		} else if (getRoot() instanceof IDiagramPreferenceSupport) {
-			return (IPreferenceStore)((IDiagramPreferenceSupport) getRoot()).getPreferencesHint()
-				.getPreferenceStore();
-		}
-		return (IPreferenceStore) PreferencesHint.USE_DEFAULTS
-			.getPreferenceStore();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/TextEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/TextEditPart.java
deleted file mode 100644
index 7f42692..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/TextEditPart.java
+++ /dev/null
@@ -1,75 +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.internal.editparts;
-
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-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.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * A freeform text shape editpart.
- */
-public class TextEditPart extends ShapeNodeEditPart {
-
-	private static final int TEXT_DEFAULT_WIDTH_DP  = 100;
-	private static final int TEXT_DEFAULT_HEIGHT_DP =  13;
-
-	public TextEditPart(View view) {
-		super(view);
-	}
-
-	protected NodeFigure createNodeFigure() {
-		Dimension defaultSize = new Dimension(getMapMode().DPtoLP(TEXT_DEFAULT_WIDTH_DP), getMapMode().DPtoLP(TEXT_DEFAULT_HEIGHT_DP));
-		DefaultSizeNodeFigure nodeFigure = new DefaultSizeNodeFigure(defaultSize.width, defaultSize.height);
-		nodeFigure.setBorder(null);
-		nodeFigure.setOpaque(false);
-		nodeFigure.setLayoutManager(new StackLayout());
-		nodeFigure.setDefaultSize(defaultSize);
-		return nodeFigure;
-	}
-
-	protected void setBackgroundColor(Color color) {
-		getFigure().setBackgroundColor(null);
-	}
-
-	/**
-	 * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
-	 * The Text view does not have foreground and background colors
-	 */
-	protected void refreshVisuals() {
-		refreshVisibility();
-		refreshBounds();
-		refreshFont();
-	}
-
-	/**
-	 * 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);
-	}
-
-    protected void createDefaultEditPolicies() {
-        super.createDefaultEditPolicies();
-        removeEditPolicy(EditPolicyRoles.SORT_FILTER_ROLE);
-        removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ZoomableEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ZoomableEditPart.java
deleted file mode 100644
index 78eb155..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/ZoomableEditPart.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.editparts;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-
-/**
- * @author sshaw
- *
- * Interface that abstracts the methods needed to perform zoom within a specific EditPart.
- * 
- */
-public interface ZoomableEditPart {
-	
-	/**
-	 * zoomOut
-	 * Method will zoom out the EditPart to the next available level
-	 */
-	public void zoomOut();
-	
-	/**
-	 * zoomIn
-	 * Method will zoom in the EditPart to the next available level
-	 */
-	public void zoomIn();
-	
-	/**
-	 * zoomOut
-	 * Method will zoom out the EditPart to the next available level centered around a given point
-	 * @param center Point around which the zoom will be centered in absolute coordinates
-	 */
-	public void zoomOut(Point center);
-	
-	/**
-	 * zoomIn
-	 * Method will zoom in the EditPart to the next available level centered around a given point
-	 * @param center Point around which the zoom will be centered in absolute coordinates
-	 */
-	public void zoomIn(Point center);
-	
-	/**
-	 * zoomTo
-	 * This method allows implementators to zoom to a certain level centered around a given point.
-	 * @param zoom double value where 1.0 represents 100%.
-	 * @param center Point around which the zoom will be centered in absolute coordinates
-	 */
-	public void zoomTo(double zoom, Point center);
-	
-	/**
-	 * zoomTo
-	 * This method allows implementors to zoom into or out to a rectangular area.
-	 * @param rect Rectangle that the edit part will zoom into our out to in absolute coordinates.
-	 */
-	public void zoomTo(Rectangle rect);
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editparts/package.html
deleted file mode 100644
index 0de9132..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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>
-
-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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionEditPolicy.java
deleted file mode 100644
index bf4cae5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionEditPolicy.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/******************************************************************************
-c * 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.internal.editpolicies;
-
-import org.eclipse.core.runtime.Assert;
-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.gef.commands.CompoundCommand;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-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.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-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.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.diagram.ui.requests.GroupRequestViaKeyboard;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author melaasar
- * 
- * An editpolicy that is responsible for Connection related model events. It
- * currently handles only the DELETE request
- */
-public class ConnectionEditPolicy
-	extends org.eclipse.gef.editpolicies.ConnectionEditPolicy {
-	
-	private static final String DELETE_FROM_DIAGRAM_DLG_TITLE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Title;
-
-	private static final String DELETE_FROM_DIAGRAM_DLG_MESSAGE = DiagramUIMessages.PromptingDeleteAction_DeleteFromDiagramDialog_Message;
-
-	private static final String DELETE_FROM_MODEL_DLG_TOGGLE_LABEL = DiagramUIMessages.MessageDialogWithToggle_DoNotPromptAgainToggle_label;
-
-	/**
-	 * Returns a delete command to honour the supplied request. Calls
-	 * {@link #createDeleteSemanticCommand(GroupRequest)}if
-	 * {@link #shouldDeleteSemantic()}returns <tt>true</tt>; othwerise
-	 * {@link #createDeleteViewCommand(GroupRequest)}is called.
-	 */
-	protected final Command getDeleteCommand(GroupRequest deleteRequest) {
-		boolean isDeleteFromKeyBoard = deleteRequest instanceof GroupRequestViaKeyboard;
-		
-			if (shouldDeleteSemantic()){
-				return createDeleteSemanticCommand(deleteRequest);
-			}else{
-					
-				boolean proceedToDeleteView = true;
-				if (isDeleteFromKeyBoard){
-					GroupRequestViaKeyboard groupRequestViaKeyboard = (GroupRequestViaKeyboard)deleteRequest;					
-					if (groupRequestViaKeyboard.isShowInformationDialog()){
-						proceedToDeleteView = showPrompt();
-						groupRequestViaKeyboard.setShowInformationDialog(false);
-						if (!(proceedToDeleteView))
-							return UnexecutableCommand.INSTANCE;
-					}					
-				}
-				
-				return createDeleteViewCommand(deleteRequest);
-			}
-					
-	}
-
-	
-	/**
-	 * Return <tt>true</tt> if either the connections source or target
-	 * editparts are canonical; otherwise <tt>false</tt>.
-	 */
-	protected boolean shouldDeleteSemantic() {
-
-		Assert.isTrue(getHost() instanceof AbstractConnectionEditPart);
-		
-		
-		AbstractConnectionEditPart cep = (AbstractConnectionEditPart) getHost();
-		
-		if (cep instanceof ConnectionEditPart) {
-			if (!((ConnectionEditPart) cep).isSemanticConnection()) {
-				return false;
-			}
-		}
-
-		boolean isCanonical = false;
-		if (cep.getSource() != null)
-			isCanonical = IsCanonical(cep.getSource());
-		if (cep.getTarget() != null)
-			isCanonical = isCanonical && IsCanonical(cep.getTarget());
-		return isCanonical;
-		
-	}
-
-	/**
-	 * Return <tt>true</tt> if the supplied editpart is canonical; otherwise,
-	 * <tt>false</tt>.
-	 */
-	private boolean IsCanonical(EditPart ep) {
-		EditPart parent = ep.getParent();
-		return parent instanceof GraphicalEditPart
-			? ((GraphicalEditPart) parent).isCanonical()
-			: false;
-	}	
-
-	/**
-	 * Return a command to delete the host's view.
-	 * 
-	 * @param deleteRequest
-	 *            the original delete request.
-	 */
-	protected Command createDeleteViewCommand(GroupRequest deleteRequest) {
-        
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-		return new ICommandProxy(
-			new DeleteCommand(editingDomain, (View) getHost().getModel()));
-	}
-	/**
-	 * Return a command to delete the host's semantic element. This method is
-	 * called if the host is canonical.
-	 * 
-	 * @see #shouldDeleteSemantic()
-	 * @param deleteRequest
-	 *            the original delete request.
-	 */
-	protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-
-        TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-            .getEditingDomain();
-        
-		EditCommandRequestWrapper semReq = null;
-		if ( deleteRequest instanceof GroupRequestViaKeyboard ) {
-			GroupRequestViaKeyboard grDeleteRequest = (GroupRequestViaKeyboard)deleteRequest;
-			semReq = 
-				new EditCommandRequestWrapper(new DestroyElementRequest(editingDomain, 
-						grDeleteRequest.isShowInformationDialog()), deleteRequest.getExtendedData());
-		} else {
-			semReq = 
-				new EditCommandRequestWrapper(new DestroyElementRequest(editingDomain, false), deleteRequest.getExtendedData());
-
-		}
-		Command semanticCmd = getHost().getCommand(semReq);
-		if (semanticCmd != null && semanticCmd.canExecute()) {
-			CompoundCommand cc = new CompoundCommand();
-			cc.add(semanticCmd);
-			return cc;
-		}
-		return null;
-	}
-	/**
-	 * Performs the delete action on the selected objects.
-	 */
-	private boolean showPrompt() {
-		boolean prompt = ((IPreferenceStore)
-			((IGraphicalEditPart) getHost()).getDiagramPreferencesHint().getPreferenceStore())
-			.getBoolean(IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		
-		if(prompt) 
-			if(showMessageDialog()) 
-				return true; 
-			else
-				return false;
-											
-		return true;		
-		
-	}	
-	
-	
-	
-	/**
-	 * launches the prompting dialogBox on deletion of elements from the diagram for the end user.
-	 * 
-	 * @return boolean  true if user pressed YES; false otherwise
-	 */
-	private boolean showMessageDialog() {	
-		MessageDialogWithToggle dialog = MessageDialogWithToggle
-			.openYesNoQuestion(Display.getCurrent().getActiveShell(),
-				DELETE_FROM_DIAGRAM_DLG_TITLE, DELETE_FROM_DIAGRAM_DLG_MESSAGE,
-				DELETE_FROM_MODEL_DLG_TOGGLE_LABEL, false,
-				(IPreferenceStore) ((IGraphicalEditPart) getHost())
-					.getDiagramPreferencesHint().getPreferenceStore(),
-				IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM);
-		
-		if (dialog.getReturnCode() == IDialogConstants.YES_ID) 
-			return true;
-		else 
-			return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.editpolicies.ComponentEditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (request instanceof GroupRequestViaKeyboard){
-			return getDeleteCommand((GroupRequest)request);
-		}
-		return super.getCommand(request);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionLineSegEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionLineSegEditPolicy.java
deleted file mode 100644
index 04ad0b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ConnectionLineSegEditPolicy.java
+++ /dev/null
@@ -1,26 +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.diagram.ui.internal.editpolicies;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.LineMode;
-
-public class ConnectionLineSegEditPolicy
-	extends ConnectionBendpointEditPolicy {
-
-	/**
-	 * @param lineSegMode
-	 */
-	public ConnectionLineSegEditPolicy() {
-		super(LineMode.ORTHOGONAL_FREE);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DelegatingMouseEventsEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DelegatingMouseEventsEditPolicy.java
deleted file mode 100644
index b4ba72f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DelegatingMouseEventsEditPolicy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.editpolicies;
-
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart;
-
-/**
- * This editpolicy forwards all mouse events to the editpolicy installed on its
- * nearest parent. The editpolicy to delegate to must implement the
- * <code>MouseMotionListener</code> interface.
- * 
- * @author cmahoney
- */
-public class DelegatingMouseEventsEditPolicy
-    extends AbstractEditPolicy
-    implements MouseMotionListener {
-
-    /** The editpolicy role used to retrieve the editpolicy from the parent. */
-    private final String editPolicyRole;
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param editPolicyRole
-     *            The editpolicy role used to retrieve the editpolicy from the
-     *            parent.
-     */
-    public DelegatingMouseEventsEditPolicy(String editPolicyRole) {
-        super();
-        this.editPolicyRole = editPolicyRole;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPolicy#activate()
-     */
-    public void activate() {
-        super.activate();
-
-        ((IGraphicalEditPart) getHost()).getFigure().addMouseMotionListener(
-            this);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.EditPolicy#deactivate()
-     */
-    public void deactivate() {
-        ((IGraphicalEditPart) getHost()).getFigure().removeMouseMotionListener(
-            this);
-
-        super.deactivate();
-    }
-
-    /**
-     * Traverses the parent editpart hierarchy to find the first parent with an
-     * editpolicy of the appropriate role installed that implements the
-     * <code>MouseMotionListener</code> interface. Stops if a parent is a
-     * <code>TopGraphicEditPart</code>.
-     * 
-     * @return the parent editpolicy role or null if none was found
-     */
-    private EditPolicy getParentEditPolicy() {
-        EditPart parentEP = getHost().getParent();
-        while (parentEP != null) {
-            EditPolicy editPolicy = parentEP.getEditPolicy(editPolicyRole);
-            if (editPolicy != null && editPolicy instanceof MouseMotionListener) {
-                return editPolicy;
-            }
-            if (parentEP instanceof TopGraphicEditPart) {
-                return null;
-            }
-            parentEP = parentEP.getParent();
-        }
-        return null;
-    }
-
-    /**
-     * Forwards this mouse event to the first parent of the host editpart that
-     * has the applicable editpolicy installed.
-     */
-    public void mouseEntered(MouseEvent me) {
-        MouseMotionListener parentPolicy = (MouseMotionListener) getParentEditPolicy();
-        if (parentPolicy != null) {
-            translateLocation(me);            
-            parentPolicy.mouseEntered(me);
-        }
-    }
-
-    /**
-     * Forwards this mouse event to the first parent of the host editpart that
-     * has the applicable editpolicy installed.
-     */
-    public void mouseExited(MouseEvent me) {
-        MouseMotionListener parentPolicy = (MouseMotionListener) getParentEditPolicy();
-        if (parentPolicy != null) {
-            translateLocation(me);            
-            parentPolicy.mouseExited(me);
-        }
-    }
-
-    /**
-     * Forwards this mouse event to the first parent of the host editpart that
-     * has the applicable editpolicy installed.
-     */
-    public void mouseHover(MouseEvent me) {
-        MouseMotionListener parentPolicy = (MouseMotionListener) getParentEditPolicy();
-        if (parentPolicy != null) {
-            translateLocation(me);            
-            parentPolicy.mouseHover(me);
-        }
-    }
-
-    /**
-     * Forwards this mouse event to the first parent of the host editpart that
-     * has the applicable editpolicy installed.
-     */
-    public void mouseMoved(MouseEvent me) {
-        MouseMotionListener parentPolicy = (MouseMotionListener) getParentEditPolicy();
-        if (parentPolicy != null) {
-            translateLocation(me);            
-            parentPolicy.mouseMoved(me);
-        }
-    }
-
-    /**
-     * Forwards this mouse event to the first parent of the host editpart that
-     * has the applicable editpolicy installed.
-     */
-    public void mouseDragged(MouseEvent me) {
-        MouseMotionListener parentPolicy = (MouseMotionListener) getParentEditPolicy();
-        if (parentPolicy != null) {
-            translateLocation(me);            
-            parentPolicy.mouseDragged(me);
-        }
-    }
-
-    /**
-     * Updates the location in the <code>MouseEvent</code> to be relative to
-     * the host figure of the editpolicy being delegated to.
-     * 
-     * @param mouseEvent
-     *            the mouse event whose location will be updated
-     */
-    private void translateLocation(MouseEvent mouseEvent) {
-        Point location = mouseEvent.getLocation();
-        ((IGraphicalEditPart) getHost()).getFigure().translateToAbsolute(
-            location);
-        ((IGraphicalEditPart) getParentEditPolicy().getHost()).getFigure()
-            .translateToRelative(location);
-        mouseEvent.x = location.x;
-        mouseEvent.y = location.y;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DiagramLinkDragDropEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DiagramLinkDragDropEditPolicy.java
deleted file mode 100644
index b76594f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/DiagramLinkDragDropEditPolicy.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.internal.editpolicies;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.CreateDiagramLinkCommand;
-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.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.dnd.DND;
-
-/**
- * Edit Policy which supports dropping NalDiagramView onto shapes.  The host's 
- * semantic model get sets to the dropped diagram.
- * 
- * @author jcorchis
- */
-public class DiagramLinkDragDropEditPolicy extends DragDropEditPolicy {
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getCommand(DropElementsRequest)
-	 */
-	public Command getDropObjectsCommand(DropObjectsRequest request) {
-
-		// Return the non-null command if the dropped selection contains at least
-		// one diagram element.
-		if (RequestConstants.REQ_DROP_OBJECTS.equals(request.getType())) {
-			DropObjectsRequest elements = request;
-			Iterator i = elements.getObjects().iterator();
-			while (i.hasNext()) {
-				Object element = i.next();
-				if (element instanceof Diagram) {
-
-					Diagram diagram = (Diagram) element;
-					View view = (View)getHost().getModel();
-                    
-
-                    TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-                        .getEditingDomain();
-			
-					CreateDiagramLinkCommand com = new CreateDiagramLinkCommand(
-                        editingDomain,
-                        DiagramUIMessages.Command_CreateDiagramLink, view,
-                        diagram);
-
-					return new ICommandProxy(com);
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#understandsRequest()
-	 */
-	public boolean understandsRequest(Request request) {
-		if (RequestConstants.REQ_DROP_OBJECTS.equals(request.getType())) {
-			List elements = ((DropObjectsRequest) request).getObjects();
-			return elements.size() == 1 && elements.get(0) instanceof Diagram;
-		}
-		return super.understandsRequest(request);
-
-	}
-
-	/**
-	 * @see org.eclipse.gef.EditPolicy#showTargetFeedback(org.eclipse.gef.Request)
-	 */
-	public void showTargetFeedback(Request request) {
-		if (understandsRequest(request))
-			super.showTargetFeedback(request);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy#getDragOperation(org.eclipse.gef.Request)
-	 */
-	protected int getRequiredDragDetail(Request request) {
-		if (request instanceof DropObjectsRequest){
-			DropObjectsRequest req = (DropObjectsRequest) request;
-			if ((req.getAllowedDetail() & DND.DROP_LINK) != 0)
-				return DND.DROP_LINK;
-			return DND.DROP_COPY;
-		}
-		return super.getRequiredDragDetail(request);
-	}	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/LabelSnapBackEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/LabelSnapBackEditPolicy.java
deleted file mode 100644
index c8977af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/LabelSnapBackEditPolicy.java
+++ /dev/null
@@ -1,84 +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.internal.editpolicies;
-
-import org.eclipse.draw2d.geometry.Point;
-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.runtime.common.core.command.ICommand;
-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.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * EditPolicy which support the RequestConstants.REQ_SNAP_BACK request type.
- * 
- * Returns a command to position a label's offset to it default set at creation.
- * 
- * @author jcorchis
- */
-public class LabelSnapBackEditPolicy
-	extends GraphicalNodeEditPolicy {
-
-
-	/**
-	 * Understands RequestConstants.REQ_SNAP_BACK request types
-	 * @param request
-	 * @return boolean
-	 */
-	public boolean understandsRequest(Request request) {
-		return RequestConstants.REQ_SNAP_BACK.equals(request.getType());
-	}
-	
-	/**
-	 * Returns a <code>Command</code> which sets the label's offset to its
-	 * original position.
-	 * 
-	 * @param request the request
-	 * @return the command
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_SNAP_BACK.equals(request.getType())) {
-			View view = (View)getHost().getModel();
-			String hint = view.getType();
-			Point offset = LabelEditPart.getSnapBackPosition(hint);
-			if (offset == null)
-				return null;
-            
-            TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost())
-                .getEditingDomain();
-            
-	 		ICommand moveCommand = 
-	 			new SetBoundsCommand(editingDomain,
-	 				DiagramUIMessages.SetLocationCommand_Label_Resize,
-	 				new EObjectAdapter(view),
-					offset); 
-			return new ICommandProxy(moveCommand);
-		}
-		return null;
-	}
-
-	public EditPart getTargetEditPart(Request request) {
-		if (understandsRequest(request))
-			return getHost();
-		return super.getTargetEditPart(request);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ListComponentEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ListComponentEditPolicy.java
deleted file mode 100644
index 1d23a7c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ListComponentEditPolicy.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.internal.editpolicies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ComponentEditPolicy;
-
-
-/**
- * @author sshaw
- *
- * Override for List compartments that removes deletion capability.
- */
-public class ListComponentEditPolicy
-	extends ComponentEditPolicy {
-
-	/** 
-	 * Return to make the <code>GraphicalEditPart</code>'s figure not visible.
-	 * @param deleteRequest the original delete request.
-	 */
-	protected Command createDeleteViewCommand(GroupRequest deleteRequest) {
-		return null;		
-	}
-
-	/** 
-	 * Returns null.
-	 * @see #shouldDeleteSemantic()
-	 * @param deleteRequest the original delete request.
-	 */
-	protected Command createDeleteSemanticCommand(GroupRequest deleteRequest) {
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ModifySortFilterEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ModifySortFilterEditPolicy.java
deleted file mode 100644
index b580d06..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/ModifySortFilterEditPolicy.java
+++ /dev/null
@@ -1,86 +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.internal.editpolicies;
-
-import java.util.Collections;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-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.editparts.ListCompartmentEditPart;
-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.requests.ChangeSortFilterRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * EditPolicy which supports modifying sorting and filtering properties.
- * 
- * @author jcorchis
- */
-public class ModifySortFilterEditPolicy
-	extends AbstractEditPolicy {
-	
-	
-	/**
-	 * Returns a command which sets all the sort/filter properties specified in the
-	 * Request of type <code>RequestConstants.REQ_CHANGE_SORT_FILTER</code>
-	 * 
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#getCommand(org.eclipse.gef.Request)
-	 */
-	public Command getCommand(Request request) {
-		if (RequestConstants.REQ_CHANGE_SORT_FILTER.equals(request.getType())) {
-			ChangeSortFilterRequest req = (ChangeSortFilterRequest) request;
-			View view = (View)((ListCompartmentEditPart)getHost()).getModel();
-            TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-			CompositeTransactionalCommand command = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.Command_SortFilterCommand);
-            SetPropertyCommand filteringCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_FILTERING, Properties.ID_FILTERING, req.getFiltering());
-			SetPropertyCommand filterKeyCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_FILTERING_KEYS, Properties.ID_FILTERING_KEYS, req.getFilterKeys());
-			SetPropertyCommand filteredObjectsCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_FILTERED_OBJECTS, Properties.ID_FILTERED_OBJECTS, req.getFilteredObjects());
-			
-			command.compose(filteringCommand);
-			command.compose(filterKeyCommand);
-			command.compose(filteredObjectsCommand);			
-			
-			SetPropertyCommand sortingCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_SORTING, Properties.ID_SORTING, req.getSorting());
-			SetPropertyCommand sortingKeysCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_SORTING_KEYS, Properties.ID_SORTING_KEYS, req.getSortKeys() == null ? Collections.EMPTY_MAP : req.getSortKeys());
-			SetPropertyCommand sortedObjectsCommand = new SetPropertyCommand(editingDomain, new EObjectAdapter(view), Properties.ID_SORTED_OBJECTS, Properties.ID_SORTED_OBJECTS, req.getSortedObjects());
-			
-			command.compose(sortingCommand);
-			command.compose(sortingKeysCommand);
-			command.compose(sortedObjectsCommand);
-			
-			return new ICommandProxy(command.reduce());
-		}
-		return super.getCommand(request);
-	}
-	
-	
-	/**
-	 * Understands requests of type <code>RequestConstants.REQ_CHANGE_SORT_FILTER</code>
-	 * @see org.eclipse.gef.editpolicies.AbstractEditPolicy#understandsRequest(org.eclipse.gef.Request)
-	 */
-	public boolean understandsRequest(Request req) {
-		if (RequestConstants.REQ_CHANGE_SORT_FILTER.equals(req.getType()))
-			return true;
-		return super.understandsRequest(req);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NonSemanticEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NonSemanticEditPolicy.java
deleted file mode 100644
index 4781716..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NonSemanticEditPolicy.java
+++ /dev/null
@@ -1,50 +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.internal.editpolicies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * This Concrete edit policy will return command(s) in response to
- * semantic requests for non-semantic shapes.
- * 
- * @author Jody Schofield
- */
-public class NonSemanticEditPolicy extends SemanticEditPolicy {
-
-	/**
-	 * This method overrides the one contained in the SemanticEditPolicy
-	 * and if the request is a DestroyElementRequest it prevents the request
-	 * from going to the semantic service for a command.
-	 * 
-	 * @param editRequest edit command request to get a command for
-	 * @return Command
-	 */
-	protected Command getSemanticCommand(IEditCommandRequest editRequest) {
-
-		if ( editRequest instanceof DestroyElementRequest ) {
-			if (getHost() instanceof GraphicalEditPart){
-				return new ICommandProxy(new DeleteCommand(editRequest
-                    .getEditingDomain(), ((GraphicalEditPart) getHost())
-                    .getPrimaryView()));
-			}
-		}
-		return super.getSemanticCommand( editRequest );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NoteAttachmentReorientEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NoteAttachmentReorientEditPolicy.java
deleted file mode 100644
index a830728..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/NoteAttachmentReorientEditPolicy.java
+++ /dev/null
@@ -1,69 +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.internal.editpolicies;
-
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NotationConnectionReorientEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditPart;
-
-/**
- * This editpolicy disables reorienting of note attachments between two nodes
- * when neither is a note.
- * 
- * @author Cherie Revells
- */
-public class NoteAttachmentReorientEditPolicy
-    extends NotationConnectionReorientEditPolicy {
-
-    protected Command getReorientConnectionSourceCommand(
-            ReconnectRequest request) {
-
-        ConnectionEditPart connectionEP = request.getConnectionEditPart();
-        if (connectionEP instanceof NoteAttachmentEditPart
-            && !isValidNoteAttachmentReorient(request.getTarget(), connectionEP.getTarget())) {
-            return UnexecutableCommand.INSTANCE;
-        }
-        return super.getReorientConnectionSourceCommand(request);
-    }
-
-    protected Command getReorientConnectionTargetCommand(
-            ReconnectRequest request) {
-
-        ConnectionEditPart connectionEP = request.getConnectionEditPart();
-        if (connectionEP instanceof NoteAttachmentEditPart
-            && !isValidNoteAttachmentReorient(connectionEP.getSource(), request.getTarget())) {
-            return UnexecutableCommand.INSTANCE;
-        }
-        return super.getReorientConnectionSourceCommand(request);
-
-    }
-
-    /**
-     * Checks if the connection reorient is valid between the given source and target.
-     * @param sourceEditPart
-     * @param targetEditPart
-     * @return true if the connection reorient is valid; false otherwise
-     */
-    private boolean isValidNoteAttachmentReorient(EditPart sourceEditPart,
-            EditPart targetEditPart) {
-        if (sourceEditPart instanceof NoteEditPart
-            || targetEditPart instanceof NoteEditPart) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/PageBreakNonResizableEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/PageBreakNonResizableEditPolicy.java
deleted file mode 100644
index cd6140b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/PageBreakNonResizableEditPolicy.java
+++ /dev/null
@@ -1,403 +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.internal.editpolicies;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.PageBreakEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.PageBreaksFigure;
-
-/**
- * Edit policy that handles the _feedback of the page breaks figure
- * while it is being dragged.  The _feedback changes the number of pages,
- * size and location of the feeback figure based on the location of the 
- * diagram bounds.
- * 
- * @author jcorchis
- */
-public class PageBreakNonResizableEditPolicy
-    extends SelectionHandlesEditPolicy {
-
-    //private PageBreaksFigure _feedback = null;
-    private Point _paperSize;
-    private Rectangle _newBounds;
-    private int _rows, _cols;
-//    private PositionConstants _direction;
-
-    private PageBreaksFigure _feedback;
-    private Rectangle _originalLocation;
-
-    protected IFigure createDragSourceFeedbackFigure() {
-        IFigure pageBreaksFeedbackFigure = createPageBreakFeedbackFigure();
-
-        if (pageBreaksFeedbackFigure != null) {
-            addFeedback(pageBreaksFeedbackFigure);
-        }
-
-        return pageBreaksFeedbackFigure;
-    }
-
-    /**
-     * Method createTextFeedbackFigure.
-     * @return IFigure
-     */
-    protected IFigure createPageBreakFeedbackFigure() {
-        PageBreaksFigure feedBackFigure =
-            new PageBreaksFigure(PageBreaksFigure.FEEDBACK);
-        PageBreakEditPart pageBreakEditPart = (PageBreakEditPart) getHost();
-        PageBreaksFigure pageBreakFigure =
-            (PageBreaksFigure) pageBreakEditPart.getFigure();
-        _paperSize = pageBreakEditPart.getPageSize();
-        feedBackFigure.setPageCount(
-            pageBreakFigure.getPageCount().x,
-            pageBreakFigure.getPageCount().y);
-        feedBackFigure.setBounds(getBounds());
-        _rows = pageBreakFigure.getPageCount().x;
-        _cols = pageBreakFigure.getPageCount().y;
-
-        _paperSize = ((PageBreakEditPart) getHost()).getPageSize();
-
-        return feedBackFigure;
-
-    }
-
-    protected List createSelectionHandles() {
-        return java.util.Collections.EMPTY_LIST;
-    }
-
-    public void deactivate() {
-        if (_feedback != null) {
-            removeFeedback(_feedback);
-            _feedback = null;
-        }
-        hideFocus();
-        super.deactivate();
-    }
-
-    /**
-     * Erase _feedback indicating that the receiver object is 
-     * being dragged.  This method is called when a drag is
-     * completed or cancelled on the receiver object.
-     * @param dragTracker com.ibm.etools.gef.tools.DragTracker The drag 
-     * tracker of the tool performing the drag.
-     */
-    protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) {
-        if (_feedback != null) {
-            removeFeedback(_feedback);
-        }
-        _feedback = null;
-        _originalLocation = null;
-    }
-
-    /**
-     * Erase _feedback indicating that the receiver object is 
-     * being dragged.  This method is called when a drag is
-     * completed or cancelled on the receiver object.
-     * @param dragTracker com.ibm.etools.gef.tools.DragTracker The drag tracker
-     * of the tool performing the drag.
-     */
-    public void eraseSourceFeedback(Request request) {
-        if (REQ_MOVE.equals(request.getType()))
-            eraseChangeBoundsFeedback((ChangeBoundsRequest) request);
-    }
-
-    private Rectangle getBounds() {
-        return ((GraphicalEditPart) getHost()).getFigure().getBounds();
-    }
-
-    public Command getCommand(Request request) {
-        if (REQ_MOVE.equals(request.getType())) {
-            getHost().activate();
-            return getMoveCommand((ChangeBoundsRequest) request);
-        }
-
-        return null;
-    }
-
-    /**
-     * Return the Figure to be used to paint the drag source
-     * _feedback.
-     */
-    protected IFigure getDragSourceFeedbackFigure() {
-        if (_feedback == null) {
-            IFigure fig = ((GraphicalEditPart) getHost()).getFigure();
-            _originalLocation = new Rectangle(fig.getBounds());
-            _feedback = (PageBreaksFigure) createDragSourceFeedbackFigure();
-        }
-        return _feedback;
-    }
-
-    /**
-     * Overridden from GEF to support zoom.
-     * Had to scale the delta into device coordinates
-     */
-    protected Command getMoveCommand(ChangeBoundsRequest request) {
-
-        ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_MOVE_CHILDREN);
-        req.setEditParts(getHost());
-
-        IFigure pageBreaksFigure = ((GraphicalEditPart) getHost()).getFigure();
-        Rectangle moveDelta =
-            new Rectangle(
-                0,
-                0,
-                request.getMoveDelta().x,
-                request.getMoveDelta().y);
-        pageBreaksFigure.translateToRelative(moveDelta);
-
-        Rectangle sizeDelta =
-            new Rectangle(
-                0,
-                0,
-                request.getSizeDelta().width,
-                request.getSizeDelta().height);
-        pageBreaksFigure.translateToRelative(sizeDelta);
-
-        req.setMoveDelta(new Point(moveDelta.width, moveDelta.height));
-        req.setSizeDelta(sizeDelta.getSize());
-        req.setLocation(request.getLocation());
-        return getHost().getParent().getCommand(req);
-    }
-
-    /**
-     * Overridden from GEF to support zoom.
-     * 
-     * Display _feedback to indicate that the receiver object
-     * is being dragged.
-     * @param dragTracker com.ibm.etools.gef.tools.DragTracker The drag 
-     * tracker of the tool performing the drag.
-     */
-    protected void showChangeBoundsFeedback(ChangeBoundsRequest request) {
-        IFigure p = getDragSourceFeedbackFigure();
-
-        Rectangle moveDelta =
-            new Rectangle(
-                0,
-                0,
-                request.getMoveDelta().x,
-                request.getMoveDelta().y);
-        p.translateToRelative(moveDelta);
-
-        Rectangle r =
-            _originalLocation.getTranslated(
-                new Point(moveDelta.width, moveDelta.height));
-
-        r.width += request.getSizeDelta().width;
-        r.height += request.getSizeDelta().height;
-
-        ((GraphicalEditPart) getHost()).getFigure().translateToAbsolute(r);
-        p.translateToRelative(r);
-        ((PageBreaksFigure) p).setPageCount(_rows, _cols);
-        p.setBounds(r);
-    }
-
-    public void showSourceFeedback(Request request) {
-        if (REQ_MOVE.equals(request.getType()))
-            showChangeBoundsFeedback((ChangeBoundsRequest) request);
-    }
-
-    public boolean understandsRequest(Request request) {
-        if (REQ_MOVE.equals(request.getType()))
-            return true;
-        return false;
-    }
-
-	//    /**
-	//     * Calculates the _feedback bounds based on the move delta
-	//     * @param moveDelta the move vector
-	//     * @return the _feedback size and location
-	//     */
-	//    private Rectangle calculateFeedbackBounds(Point moveDelta) {
-	//        // Create a copy of the current _feedback bounds to use in the
-	// calculation
-	//        PageBreaksFigure feedBackFigure =
-	//            (PageBreaksFigure) getDragSourceFeedbackFigure();
-	//        Rectangle currentBounds = feedBackFigure.getBounds().getCopy();
-	//        int c = feedBackFigure.getPageCount().y;
-	//        int r = feedBackFigure.getPageCount().x;
-	//
-	//        PageBreakEditPart e = (PageBreakEditPart) getHost();
-	//        Rectangle diagramBounds =
-	//            ((DiagramEditPart) e.getParent()).getChildrenBounds();
-	//
-	//        // Drag to the WEST
-	//        if (moveDelta.x < 0) {
-	//            if (currentBounds.right() < diagramBounds.right()) {
-	//                // Add page to the EAST
-	//                int effectiveWidth =
-	//                    Math.abs(diagramBounds.x - currentBounds.x)
-	//                        + diagramBounds.width;
-	//                float cols = ((float) effectiveWidth) / _paperSize.x;
-	//                int requiredCols = (int) Math.ceil(Math.abs(cols));
-	//                int xOffset = Math.round(requiredCols * _paperSize.x);
-	//                c = requiredCols;
-	//                currentBounds.setBounds(
-	//                    new Rectangle(
-	//                        currentBounds.x,
-	//                        currentBounds.y,
-	//                        xOffset,
-	//                        currentBounds.height));
-	//            }
-	//
-	//            // Remove page from the WEST?
-	//            int effectiveWidth =
-	//                Math.abs(diagramBounds.right() - currentBounds.right())
-	//                    + diagramBounds.width;
-	//            float cols = ((float) effectiveWidth) / _paperSize.x;
-	//            int requiredCols = (int) Math.ceil(Math.abs(cols));
-	//            int xOffset = Math.round(requiredCols * _paperSize.x);
-	//            if (c > requiredCols) {
-	//                c = requiredCols;
-	//                currentBounds.setBounds(
-	//                    new Rectangle(
-	//                        currentBounds.right() - xOffset,
-	//                        currentBounds.y,
-	//                        xOffset,
-	//                        currentBounds.height));
-	//            }
-	//        } else if (moveDelta.x > 0) {
-	//            // Drag to the EAST
-	//            if (currentBounds.x > diagramBounds.x) {
-	//                // Add page to the WEST
-	//                int effectiveWidth =
-	//                    Math.abs(currentBounds.right() - diagramBounds.right())
-	//                        + diagramBounds.width;
-	//                float cols = ((float) effectiveWidth) / _paperSize.x;
-	//                int requiredCols = (int) Math.ceil(Math.abs(cols));
-	//                int xOffset = Math.round(requiredCols * _paperSize.x);
-	//                c = requiredCols;
-	//                currentBounds.setLocation(
-	//                    currentBounds.right() - xOffset,
-	//                    currentBounds.y);
-	//                currentBounds.setSize(xOffset, currentBounds.height);
-	//            }
-	//
-	//            // Remove page from the EAST?
-	//            int effectiveWidth =
-	//                Math.abs(currentBounds.x - diagramBounds.x)
-	//                    + diagramBounds.width;
-	//            float cols = ((float) effectiveWidth) / _paperSize.x;
-	//            int requiredCols = (int) Math.ceil(Math.abs(cols));
-	//            if (c > requiredCols) {
-	//                c = requiredCols;
-	//                int xOffset = Math.round(requiredCols * _paperSize.x);
-	//                currentBounds.setSize(xOffset, currentBounds.height);
-	//
-	//            }
-	//        }
-	//        // Drag to the SOUTH
-	//        if (moveDelta.y > 0) {
-	//            if (currentBounds.y > diagramBounds.y) {
-	//                // Add page to the NORTH
-	//                int effectiveHeight =
-	//                    Math.abs(currentBounds.bottom() - diagramBounds.bottom())
-	//                        + diagramBounds.height;
-	//                float rows = ((float) effectiveHeight) / _paperSize.y;
-	//                int requiredRows = (int) Math.ceil(Math.abs(rows));
-	//                int yOffset = Math.round(requiredRows * _paperSize.y);
-	//                r = requiredRows;
-	//                currentBounds.setLocation(
-	//                    currentBounds.x,
-	//                    currentBounds.bottom() - yOffset);
-	//                currentBounds.setSize(currentBounds.width, yOffset);
-	//            }
-	//
-	//            // Remove from the SOUTH?
-	//            int effectiveHeight =
-	//                Math.abs(diagramBounds.y - currentBounds.y)
-	//                    + diagramBounds.height;
-	//            float rows = ((float) effectiveHeight) / _paperSize.y;
-	//            int requiredRows = (int) Math.ceil(Math.abs(rows));
-	//            int yOffset = Math.round(requiredRows * _paperSize.y);
-	//            if (r > requiredRows) {
-	//                r = requiredRows;
-	//                currentBounds.setSize(currentBounds.width, yOffset);
-	//            }
-	//        } else
-	//
-	//            // Drag to the NORTH
-	//            if (moveDelta.y < 0) {
-	//                if (currentBounds.bottom() < diagramBounds.bottom()) {
-	//                    // Add page to the SOUTH
-	//                    int effectiveHeight =
-	//                        Math.abs(diagramBounds.y - currentBounds.y)
-	//                            + diagramBounds.height;
-	//                    float rows = ((float) effectiveHeight) / _paperSize.y;
-	//                    int requiredRows = (int) Math.ceil(Math.abs(rows));
-	//                    int yOffset = Math.round(requiredRows * _paperSize.y);
-	//                    r = requiredRows;
-	//                    currentBounds.setSize(currentBounds.width, yOffset);
-	//                }
-	//
-	//                // Remove from the NORTH?
-	//                int effectiveWidth =
-	//                    Math.abs(currentBounds.bottom() - diagramBounds.bottom())
-	//                        + diagramBounds.height;
-	//                float rows = ((float) effectiveWidth) / _paperSize.y;
-	//                int requiredRows = (int) Math.ceil(Math.abs(rows));
-	//                int yOffset = Math.round(requiredRows * _paperSize.y);
-	//                if (r > requiredRows) {
-	//                    r = requiredRows;
-	//                    currentBounds.setLocation(
-	//                        currentBounds.x,
-	//                        currentBounds.bottom() - yOffset);
-	//                    currentBounds.setSize(currentBounds.width, yOffset);
-	//                }
-	//            }
-	//
-	//        _newBounds = currentBounds;
-	//        _cols = c;
-	//        _rows = r;
-	//
-	//        return currentBounds;
-	//    }
-
-	/**
-	 * @return Returns the _newBounds.
-	 */
-	protected Rectangle getNewBounds() {
-		return _newBounds;
-	}
-	/**
-	 * @return Returns the _paperSize.
-	 */
-	protected Point getPaperSize() {
-		return _paperSize;
-	}
-	/**
-	 * @return Returns the _rows.
-	 */
-	protected int getRows() {
-		return _rows;
-	}
-/**
- * @return Returns the _feedback.
- */
-protected PageBreaksFigure getFeedback() {
-	return _feedback;
-}
-	/**
-	 * @return Returns the _originalLocation.
-	 */
-	protected Rectangle getOriginalLocation() {
-		return _originalLocation;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TextSelectionEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TextSelectionEditPolicy.java
deleted file mode 100644
index 191c692..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TextSelectionEditPolicy.java
+++ /dev/null
@@ -1,84 +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.internal.editpolicies;
-
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-
-/**
- * A non-resizable editpolicy for text compartments. It handles the selection
- * and focus feedback of text compartments.
- * 
- * @author melaasar
- */
-public class TextSelectionEditPolicy
-    extends SelectionEditPolicy {
-
-    /**
-     * Gets the label delegate that is used to interact with the label figure
-     * inside the host editpart.
-     * 
-     * @return the label delegate
-     */
-    private ILabelDelegate getLabel() {
-        return (ILabelDelegate) getHost().getAdapter(ILabelDelegate.class);
-    }
-
-    /**
-     * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#hideFocus()
-     */
-    protected void hideFocus() {
-        if (getLabel() != null) {
-            getLabel().setFocus(false);
-        }
-    }
-
-    /**
-     * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#hideSelection()
-     */
-    protected void hideSelection() {
-        if (getLabel() != null) {
-            getLabel().setSelected(false);
-            getLabel().setFocus(false);
-        }
-
-    }
-
-    /**
-     * @see org.eclipse.gef.editpolicies.NonResizableEditPolicy#showFocus()
-     */
-    protected void showFocus() {
-        if (getLabel() != null) {
-            getLabel().setFocus(true);
-        }
-    }
-
-    /**
-     * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-     */
-    protected void showPrimarySelection() {
-        if (getLabel() != null) {
-            getLabel().setSelected(true);
-            getLabel().setFocus(true);
-        }
-    }
-
-    /**
-     * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
-     */
-    protected void showSelection() {
-        if (getLabel() != null) {
-            getLabel().setSelected(true);
-            getLabel().setFocus(false);
-        }
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TreeConnectionBendpointEditPolicy.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TreeConnectionBendpointEditPolicy.java
deleted file mode 100644
index c214e52..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/TreeConnectionBendpointEditPolicy.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.editpolicies;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ForestRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.TreeRouter;
-import org.eclipse.gmf.runtime.gef.ui.internal.editpolicies.LineMode;
-import org.eclipse.gmf.runtime.notation.Edge;
-
-
-/**
- * @author sshaw
- *
- * Override to specify the default LineMode as constrained for Tree connections.
- */
-public class TreeConnectionBendpointEditPolicy
-	extends ConnectionBendpointEditPolicy {
-
-	/**
-	 * Default constructor
-	 */
-	public TreeConnectionBendpointEditPolicy() {
-		super(LineMode.ORTHOGONAL_CONSTRAINED);
-	}
-	
-	static private Map connections = new HashMap();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.EditPolicy#activate()
-	 */
-	public void activate() {
-		connections.put(getConnection(), getHost());
-		super.activate();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.EditPolicy#deactivate()
-	 */
-	public void deactivate() {
-		connections.remove(getConnection());
-		super.deactivate();
-	}
-	
-	/**
-	 * 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.
-	 */
-	protected Command getBendpointsChangedCommand(BendpointRequest request) {
-		Command cmd = super.getBendpointsChangedCommand(request);
-		if (cmd == null)
-			return null;
-		
-		//synch constraints up with the rest of the tree
-		if (getConnection().getConnectionRouter() instanceof ForestRouter) {
-			ForestRouter forestRouter = (ForestRouter)getConnection().getConnectionRouter();
-			TreeRouter treeRouter = forestRouter.getSubRouter(getConnection());
-			if (treeRouter != null) {
-				List connList = treeRouter.getConnectionList();
-				ListIterator li = connList.listIterator();
-				while (li.hasNext()) {
-					Connection conn = (Connection)li.next();
-					if (!conn.equals(getConnection())) {
-						EditPart connectionEP = (EditPart)connections.get(conn);
-						if (connectionEP != null) {
-							Edge connectionView = (Edge) connectionEP.getModel();
-							Command cmd1 = getBendpointsChangedCommand(conn, connectionView);
-							if (cmd1 != null)
-								cmd = cmd.chain(cmd1);
-						}
-					}
-				}
-			}
-		}
-		
-		return cmd;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/editpolicies/package.html
deleted file mode 100644
index 3ea9781..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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, selection…etc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java
deleted file mode 100644
index 0797ffb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.figures;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.GraphicsSource;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScalableFreeformLayeredPane;
-import org.eclipse.draw2d.TreeSearch;
-import org.eclipse.draw2d.UpdateManager;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsUtil;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * BorderItemContainerFigures contain the main pane on which border items are
- * places. BorderItems are children of BorderItemContainerFigures and therefore
- * move when the parent moves. BorderItems within the BorderItemContainerFigure
- * may be painted outside the main figure and therefore the
- * BorderItemContainerFigure controls clipping region. The work of positioning
- * border items is handled by the locator. ( This implementation of border items
- * was re-written from the original created by Tauseef ). The orginal
- * implementation kept border items in a separate list ( not as children ) and
- * painted them after, requiring explicit moving of children.
- * 
- * @author tisrar, jbruck, cmahoney, mmostafa
- */
-public class BorderItemContainerFigure
-	extends NodeFigure {
-    
-    // rectangle indicating the extended bounds of the figure
-    // extended bounds include the border items in the calculations 
-    private Rectangle extendedBounds = new Rectangle();
-    
-    private BorderItemContainerHelper helper = new BorderItemContainerHelper();
-    
-	private BorderedItemContainerUpdateManagerWrapper updateManagerWrapper = new BorderedItemContainerUpdateManagerWrapper();
-    
-	/**
-	 * Constructor
-	 */
-	public BorderItemContainerFigure() {
-		super();
-	}
-
-	/**
-	 * Paints this Figure's client area. The client area is typically defined as
-	 * the anything inside the Figure's {@link Border} or {@link Insets}, and
-	 * by default includes the children of this Figure. On return, this method
-	 * must leave the given Graphics in its initial state.
-	 * 
-	 * @param graphics
-	 *            The Graphics used to paint
-	 * 
-	 */
-	protected void paintClientArea(Graphics graphics) {
-		if (getChildren().isEmpty() || !isVisible())
-			return;
-		Rectangle clip = getVisibleExtendedBounds();
-		graphics.setClip(clip);
-
-        if (useLocalCoordinates()) {
-            graphics.translate(getBounds().x + getInsets().left, getBounds().y
-                + getInsets().top);
-		}
-		graphics.pushState();
-		paintChildren(graphics);
-		graphics.popState();
-		graphics.restoreState();
-	}
-
-	/**
-	 * gets the handle bounds of the main figure
-	 * 
-	 * @return the handle bounds of the main figure
-	 * @see org.eclipse.gef.handles.HandleBounds#getHandleBounds()
-	 */
-	public Rectangle getHandleBounds() {
-		Rectangle handleRect = null;
-
-		ListIterator listIterator = getChildren().listIterator();
-		while (listIterator.hasNext()) {
-			Object object = listIterator.next();
-			if (object instanceof NodeFigure
-				&& ((NodeFigure) object).isVisible()) {
-				if (handleRect == null) {
-					handleRect = ((NodeFigure) object).getHandleBounds()
-						.getCopy();
-				} else {
-					handleRect.union(((NodeFigure) object).getHandleBounds()
-						.getCopy());
-				}
-			}
-		}
-		return handleRect;
-	}
-
-	protected void primTranslate(int dx, int dy) {
-		/*
-		 * If the border item container is being moved, the children must move by the same amount too
-		 * (as opposed to free form figure).
-		 * We must ignore children moves in this case in the helper, since border item container shouldn't be invalidated.
-		 */
-		helper.ignoreChildFigureMovesHandling = true;
-		super.primTranslate(dx, dy);
-		helper.ignoreChildFigureMovesHandling = false;
-	}
-
-	/**
-	 * We need to override this for smooth painting of border item items.
-	 */
-	public boolean containsPoint(int x, int y) {
-		if (useLocalCoordinates()) {
-            x = x - getBounds().x - getInsets().left;
-            y = y - getBounds().y - getInsets().top;
-        }
-
-		for (int i = getChildren().size(); i > 0;) {
-			i--;
-			IFigure fig = (IFigure) getChildren().get(i);
-			if (fig.containsPoint(x, y)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns a descendant of this Figure such that the Figure returned
-	 * contains the point (x, y), and is accepted by the given TreeSearch.
-	 * Returns <code>null</code> if none found.
-	 * 
-	 * @param x
-	 *            The X coordinate
-	 * @param y
-	 *            The Y coordinate
-	 * @param search
-	 *            the TreeSearch
-	 * @return The descendant Figure at (x,y)
-	 */
-	protected IFigure findDescendantAtExcluding(int x, int y, TreeSearch search) {
-		Point pt = new Point(x, y);
-		this.translateFromParent(pt);
-
-		IFigure fig;
-		for (int i = getChildren().size(); i > 0;) {
-			i--;
-			fig = (IFigure) getChildren().get(i);
-			if (fig.isVisible()) {
-				fig = fig.findFigureAt(pt.x, pt.y, search);
-				if (fig != null)
-					return fig;
-			}
-		}
-		// No descendants were found
-		return null;
-	}
-
-	public IFigure findFigureAt(int x, int y, TreeSearch search) {
-		if (search.prune(this))
-			return null;
-		IFigure child = findDescendantAtExcluding(x, y, search);
-		if (child != null)
-			return child;
-		return null;
-	}
-
-	/**
-	 * Returns the deepest descendant for which {@link #isMouseEventTarget()}
-	 * returns <code>true</code> or <code>null</code> if none found. The
-	 * Parameters <i>x</i> and <i>y</i> are absolute locations. Any Graphics
-	 * transformations applied by this Figure to its children during
-	 * {@link #paintChildren(Graphics)} (thus causing the children to appear
-	 * transformed to the user) should be applied inversely to the points <i>x</i>
-	 * and <i>y</i> when called on the children.
-	 * 
-	 * @param x
-	 *            The X coordinate
-	 * @param y
-	 *            The Y coordinate
-	 * @return The deepest descendant for which isMouseEventTarget() returns
-	 *         true
-	 */
-	public IFigure findMouseEventTargetAt(int x, int y) {
-		IFigure f = findMouseEventTargetInDescendantsAt(x, y);
-		if (f != null)
-			return f;
-		if (isMouseEventTarget())
-			return this;
-		return null;
-	}
-
-	/**
-	 * Searches this Figure's children for the deepest descendant for which
-	 * {@link #isMouseEventTarget()} returns <code>true</code> and returns
-	 * that descendant or <code>null</code> if none found.
-	 * 
-	 * @see #findMouseEventTargetAt(int, int)
-	 * @param x
-	 *            The X coordinate
-	 * @param y
-	 *            The Y coordiante
-	 * @return The deepest descendant for which isMouseEventTarget() returns
-	 *         true
-	 */
-	protected IFigure findMouseEventTargetInDescendantsAt(int x, int y) {
-		Point pt = new Point(x, y);
-		this.translateFromParent(pt);
-
-		IFigure fig;
-		for (int i = getChildren().size(); i > 0;) {
-			i--;
-			fig = (IFigure) getChildren().get(i);
-			if (fig.isVisible() && fig.isEnabled()) {
-				if (fig.containsPoint(pt.x, pt.y)) {
-					fig = fig.findMouseEventTargetAt(pt.x, pt.y);
-					return fig;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#intersects(Rectangle)
-	 */
-	public boolean intersects(Rectangle rect) {		
-		Rectangle rectangle = getExtendedBounds();
-		return rectangle.intersects(rect);
-	}
-	
-    /**
-     * Gets the area of the extended bounds which is visible, that is, that is
-     * contained within the viewport bounds. This is needed so that when this
-     * shape is within a scrollable compartment, the border items are not
-     * visible when they are outside the visible area.
-     * 
-     * @return the area of the extended bounds which is visible
-     */
-    private Rectangle getVisibleExtendedBounds() {
-        Rectangle extendedRect = getExtendedBounds().getCopy();
-        translateToAbsolute(extendedRect);
-        Rectangle parentRect = getViewportBounds().getIntersection(
-            extendedRect);
-        translateToRelative(parentRect);
-        return parentRect;
-    }
-    
-    /**
-     * Return the area of the parent viewport if there is one, otherwise, return
-     * the client area of the parent. The viewport area is required so that
-     * border items outside the viewport are not shown (i.e. when they are
-     * scrolled out of view).
-     * 
-     * @return returns the viewport client area in absolute coordinates
-     */
-    private Rectangle getViewportBounds() {
-        Rectangle rect = getParent().getParent().getClientArea().getCopy();
-        getParent().getParent().translateToParent(rect);
-        getParent().getParent().translateToAbsolute(rect);
-
-        IFigure port = getViewport();
-        if (port != null) {
-            Rectangle portRect = port.getClientArea().getCopy();
-            port.translateToParent(portRect);
-            port.translateToAbsolute(portRect);
-
-            if (portRect.height != 0 && portRect.width != 0) {
-                rect = portRect;
-            }
-        }
-        return rect;
-    }
-    
-	public IFigure getMainFigure() {
-        return ((BorderedNodeFigure) getParent()).getMainFigure();
-    }
-
-	/**
-	 * Helper to retrieve the viewport that this item sits on.
-	 * 
-	 * @return the view port
-	 */
-	private IFigure getViewport() {
-		//
-		// Start searching for viewport to clip on from the main figure.
-		//
-		IFigure fig = getMainFigure();
-		while (fig != null) {
-			if (fig instanceof Viewport
-	                || fig instanceof ScalableFreeformLayeredPane)
-				return fig;
-			fig = fig.getParent();
-			if (fig instanceof BorderItemContainerFigure) {
-				fig = ((BorderItemContainerFigure) fig).getMainFigure();
-			}
-		}
-		return null;
-	}
-
-	public void erase() {
-		if (getParent() != null && isVisible()) {
-			repaint();
-		}
-	}
-
-	/**
-	 * Refresh adornments
-	 */
-	public void repaint() {
-		repaint(getExtendedBounds());
-	}
-    
-    public void invalidate() {
-        extendedBounds = null;
-        super.invalidate();
-        updateLayerExtents();
-    }
-    
-    public void validate() {
-        extendedBounds = null;
-        super.validate();
-    }
-    
-	@Override
-	public UpdateManager getUpdateManager() {
-		if (getParent() != null) {
-			return updateManagerWrapper;
-		}
-		return super.getUpdateManager();
-	}
-
-    /**
-     * Gets the extended bounds of the figure which includes the bounds of all
-     * the border item figures.
-     * 
-     * @return the extended bounds
-     */
-    public Rectangle getExtendedBounds() {
-        if (extendedBounds == null) {
-            extendedBounds = getParent().getBounds().getCopy();
-            for (IFigure childFigure : (List<IFigure>) getChildren()) {
-                Rectangle childBounds = (childFigure instanceof IExpandableFigure) ? ((IExpandableFigure) childFigure)
-                    .getExtendedBounds()
-                    : childFigure.getBounds(); 
-                if (useLocalCoordinates()) {
-                    childBounds = childBounds.getCopy();
-                    childBounds.translate(getLocation());
-                }
-                extendedBounds.union(childBounds);
-            }
-        }
-        return extendedBounds;
-    }
-    
-    protected void fireFigureMoved() {
-        super.fireFigureMoved();
-        extendedBounds = null;
-        updateLayerExtents();
-    }
-
-    private void updateLayerExtents() {
-        BorderItemsAwareFreeFormLayer layer = BorderItemsUtil.getBorderItemLayer(this);
-        if (layer!=null){
-            layer.borderFigureMoved();
-        }
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#add(org.eclipse.draw2d.IFigure, java.lang.Object, int)
-	 */
-	public void add(IFigure figure, Object constraint, int index) {
-		super.add(figure, constraint, index);
-		helper.hookChild(figure);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Figure#remove(org.eclipse.draw2d.IFigure)
-	 */
-	public void remove(IFigure figure) {
-		helper.unhookChild(figure);
-		super.remove(figure);
-	}
-    
-    private class BorderItemContainerHelper {
-    	
-    	boolean ignoreChildFigureMovesHandling;
-    	
-    	class ChildTracker implements FigureListener {
-    		public void figureMoved(IFigure source) {
-    			if (!ignoreChildFigureMovesHandling) {
-    				revalidate();
-    			}
-    		}
-    	}
-    	
-    	private FigureListener figureListener = new ChildTracker();
-    	
-    	public void hookChild(IFigure child) {
-    	    revalidate();
-    		child.addFigureListener(figureListener);
-    	}
-    	
-    	public void unhookChild(IFigure child) {
-    	    revalidate();
-    		child.removeFigureListener(figureListener);
-    	}
-    	
-    }
-    
-    private class BorderedItemContainerUpdateManagerWrapper extends UpdateManager {
-    	
-    	public BorderedItemContainerUpdateManagerWrapper() {
-    	}
-
-		@Override
-		public void setGraphicsSource(GraphicsSource gs) {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().setGraphicsSource(gs);
-		}
-
-		@Override
-		public synchronized void addDirtyRegion(IFigure figure, int x, int y,
-				int w, int h) {
-			Rectangle r = new Rectangle(x, y, w, h);
-			IFigure borderedNodeParent = BorderItemContainerFigure.this.getParent().getParent();
-			IFigure walker = figure;
-			do {
-				walker = walker.getParent();
-				walker.translateToParent(r);
-			} while (walker != borderedNodeParent && walker.getParent() != null);
-			walker.getUpdateManager().addDirtyRegion(walker, r.x, r.y, r.width, r.height);
-		}
-
-		@Override
-		public synchronized void addInvalidFigure(IFigure f) {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().addInvalidFigure(f);
-		}
-
-		@Override
-		public synchronized void performUpdate() {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().performUpdate();
-		}
-
-		@Override
-		public synchronized void performUpdate(Rectangle exposed) {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().performUpdate(exposed);
-		}
-
-		@Override
-		public void performValidation() {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().performValidation();
-		}
-
-		@Override
-		public synchronized void runWithUpdate(Runnable runnable) {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().runWithUpdate(runnable);
-		}
-
-		@Override
-		public void setRoot(IFigure figure) {
-			BorderItemContainerFigure.this.getParent().getUpdateManager().setRoot(figure);
-		}
-
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/CollapseFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/CollapseFigure.java
deleted file mode 100644
index 2b3e1c9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/CollapseFigure.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author sshaw
- *
- * Figure used to represent the collapse handle in the corner of a list compartment or shape compartment.
- */
-public class CollapseFigure extends RectangleFigure {
-
-	private boolean collapsed = false;
-    private IFigure containerFigure = null;
-    
-    private static boolean isWinOS = SWT.getPlatform().equals("win32"); //$NON-NLS-1$
-      
-    /**
-     * Constrcuts an instance
-     */
-    public CollapseFigure() {
-        super();
-    }
-
-    /**
-     * Constrcuts an instance
-     * 
-     * @param containerFigure
-     *            containers's figure
-     */
-    public CollapseFigure(IFigure containerFigure) {
-        super();
-        this.containerFigure = containerFigure;
-    }
-	
-	/*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.draw2d.Shape#fillShape(org.eclipse.draw2d.Graphics)
-     */
-	protected void fillShape(Graphics graphics) {
-		
-		Image img;
-		
-		if (isCollapsed()) {
-			if (isWinOS) {
-				img = DiagramUIPluginImages.get(DiagramUIPluginImages.IMG_HANDLE_EXPAND_WIN);
-			} else {
-				img = DiagramUIPluginImages.get(DiagramUIPluginImages.IMG_HANDLE_EXPAND);
-			}
-		} else {
-			if (isWinOS) {
-				img = DiagramUIPluginImages.get(DiagramUIPluginImages.IMG_HANDLE_COLLAPSE_WIN);
-			} else {			
-				img = DiagramUIPluginImages.get(DiagramUIPluginImages.IMG_HANDLE_COLLAPSE);
-			}
-		}
-		graphics.drawImage(img, getBounds().x, getBounds().y);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Shape#outlineShape(org.eclipse.draw2d.Graphics)
-	 */
-	protected void outlineShape(Graphics graphics) {
-		// do nothing
-	}
-	
-	/**
-	 * isCollapsed
-	 * Utility method to determine if the IFigure is collapse or not.
-	 * 
-	 * @return true if collapse, false otherwise.
-	 */
-	public boolean isCollapsed() {
-		return collapsed;
-	}
-
-	/**
-	 * setCollapsed
-	 * Setter method to change collapsed state of the figure.  Will force update
-	 * to repaint the figure to reflect the changes.
-	 * 
-	 * @param b boolean true to set collapsed, false to uncollapse.
-	 */
-	public void setCollapsed(boolean b) {
-		collapsed = b;
-		revalidate();
-		repaint();
-	}
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.draw2d.Figure#isVisible()
-     */
-    public boolean isVisible() {
-        boolean visibility = super.isVisible();
-        if (visibility && containerFigure != null) {
-            /*
-             * Try to hide the handle if it's to be drawn outside of the
-             * container edit part figure
-             */
-            Rectangle containerBounds = containerFigure.getClientArea()
-                .getCopy();
-            containerFigure.translateToAbsolute(containerBounds);
-            translateToRelative(containerBounds);
-            return containerBounds.contains(getBounds());
-        }
-        return visibility;
-    }
-    
-    
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java
deleted file mode 100644
index 0aa43ad..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutAnimator;
-import org.eclipse.draw2d.TreeSearch;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-
-/**
- * This is the figure used for a group. The figure itself has nothing to paint
- * except for its children.
- * 
- * In order to support grouping of shapes with border items, the group figure is
- * an <code>IExpandableFigure</code> which has an extended bounds that
- * contains all the childrens border items. Otherwise, the group's bounds would
- * have had to include all the border items of its children. The group figure
- * contains a <code>BorderItemContainerFigure</code> similar to the
- * BorderedNodeFigure in order to accomplish this. To add shapes to this group,
- * use the {@link #getContainerFigure()} method.
- * 
- * @author crevells
- * 
- */
-public class GroupFigure
-    extends NodeFigure
-    implements IExpandableFigure {
-
-    /**
-     * The <code>BorderItemContainerFigure</code> needs slight customization
-     * to be used for groups.
-     */
-    private class BorderItemContainerFigureEx
-        extends BorderItemContainerFigure {
-
-        /**
-         * The main figure is just the <code>GroupFigure</code>. There is no
-         * other figure that needs to be painted.
-         */
-        public IFigure getMainFigure() {
-            return getParent();
-        }
-
-        protected boolean useLocalCoordinates() {
-            // the group children locations are relative to the group's location
-            return true;
-        }
-
-    }
-
-    /**
-     * The figure that will hold all the children so that the children's border
-     * items can be painted outside the bounds of the <code>GroupFigure</code>.
-     */
-    private BorderItemContainerFigure borderItemContainer;
-
-    /**
-     * Creates a new <code>GroupFigure</code>.
-     */
-    public GroupFigure() {
-        super();
-        setOpaque(false); // set transparent by default
-        setLayoutManager(new XYLayout());
-        add(getContainerFigure());
-    }
-
-    /**
-     * Gets the container figure to which the shapes belonging to the group
-     * should be added.
-     * 
-     * @return the container figure for the children
-     */
-    public IFigure getContainerFigure() {
-        if (borderItemContainer == null) {
-            borderItemContainer = createBorderItemContainerFigure();
-        }
-        return borderItemContainer;
-    }
-
-    private BorderItemContainerFigure createBorderItemContainerFigure() {
-        BorderItemContainerFigure figure = new BorderItemContainerFigureEx();
-        figure.setLayoutManager(new XYLayout());
-        figure.addLayoutListener(LayoutAnimator.getDefault());
-        figure.setVisible(true);
-        return figure;
-    }
-
-    public Rectangle getClientArea(Rectangle rect) {
-        return getContainerFigure().getClientArea(rect);
-    }
-
-    public boolean containsPoint(int x, int y) {
-        return getContainerFigure().containsPoint(x, y);
-    }
-
-    public Rectangle getHandleBounds() {
-        return getContainerFigure().getBounds();
-    }
-
-    protected void layout() {
-        if (!this.getBounds().equals(getContainerFigure().getBounds())) {
-            getContainerFigure().setBounds(this.getBounds().getCopy());
-        }
-    }
-
-    public void erase() {
-        super.erase();
-        getContainerFigure().erase();
-    }
-
-    public void repaint() {
-        super.repaint();
-        getContainerFigure().repaint();
-    }
-
-    public IFigure findFigureAt(int x, int y, TreeSearch search) {
-        return getContainerFigure().findFigureAt(x, y, search);
-    }
-
-    public IFigure findMouseEventTargetAt(int x, int y) {
-        return getContainerFigure().findMouseEventTargetAt(x, y);
-    }
-
-    public boolean intersects(Rectangle rect) {
-        return getExtendedBounds().intersects(rect);
-    }
-
-    public Dimension getMinimumSize(int wHint, int hHint) {
-        return getContainerFigure().getMinimumSize(wHint, hHint);
-    }
-
-    public Dimension getPreferredSize(int wHint, int hHint) {
-        return getContainerFigure().getPreferredSize(wHint, hHint);
-    }
-
-    public Rectangle getExtendedBounds() {
-        return ((BorderItemContainerFigure) getContainerFigure())
-                    .getExtendedBounds();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java
deleted file mode 100644
index 66e8cfa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.figures;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * An Expandable Figure
- * 
- * @author mmostafa
- * @deprecated Use {org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure}
- */
-public interface IExpandableFigure extends
-		org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure {
-
-	Rectangle getExtendedBounds();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/LabelHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/LabelHelper.java
deleted file mode 100644
index fd6a3a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/LabelHelper.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.figures;
-
-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.Rectangle;
-
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-/**
- * Helper class to convert the label coordinates from an offset value
- * from a keypoint to real draw2d coordinate
- * 
- * @author sshaw
- *
- */
-public class LabelHelper {
-
-	/**
-	 * Calculates the label offset from the reference point given the label bounds.  
-	 * 
-	 * @param label the <code>IFigure</code> to calculate the offset for
-	 * @param bounds the <code>Rectangle</code> that is the bounding box of the label.
-	 * @param ref the <code>Point</code> that is the reference point that the offset
-	 * is based on.
-	 * @return a <code>Point</code> which represents a value offset from the <code>ref</code>
-	 * point oriented based on the nearest line segment.
-	 */
-	static public Point offsetFromRelativeCoordinate(IFigure label, Rectangle bounds, Point ref) {
-		return offsetFromRelativeCoordinate(label, bounds, getParentPointList(label), ref);
-	}
-	
-	/**
-	 * Calculates the label offset from the reference point given the label bounds and a points list.  
-	 * 
-	 * @param label the <code>IFigure</code> to calculate the offset for
-	 * @param bounds the <code>Rectangle</code> that is the bounding box of the label.
-	 * @param points the <code>PointList</code> that contains that the label offset is relative to.
-	 * @param ref the <code>Point</code> that is the reference point that the offset
-	 * is based on.
-	 * @return a <code>Point</code> which represents a value offset from the <code>ref</code>
-	 * point oriented based on the nearest line segment.
-	 */
-	static private Point offsetFromRelativeCoordinate(IFigure label, Rectangle bounds, PointList points, Point ref) {
-		Rectangle rect = new Rectangle(bounds);
-		
-		//Componsate for the fact that we are using the 
-		// figure center
-		rect.translate(rect.width /2, rect.height /2);
-		
-		Point normalPoint = normalizeRelativePointToPointOnLine(points, ref,
-				new Point(rect.x - ref.x, rect.y - ref.y));
-		
-		return normalPoint;
-	}
-	
-	/**
-	 * Calculates the relative coordinate that is equivalent to the offset from the reference 
-	 * point, that can be used to set the label location.
-	 * 
-	 * @param label the <code>IFigure</code> to calculate the relative coordinate for 
-	 * @param ref a <code>Point</code> located on the parent which the offset value
-	 * is relative to.
-	 * @param offset a <code>Point</code> which represents a value offset from the <code>ref</code>
-	 * point oriented based on the nearest line segment.
-	 * @return a <code>Point</code> that is the relative coordinate of the label that can be
-	 * used to set it's location.
-	 */
-	static public Point relativeCoordinateFromOffset(IFigure label, Point ref, Point offset) {
-		return relativeCoordinateFromOffset(label, getParentPointList(label), ref, offset);
-	}
-	
-	/**
-	 * Calculates the relative coordinate that is equivalent to the offset from the reference 
-	 * point, that can be used to set the label location.
-	 * 
-	 * @param label the <code>IFigure</code> to calculate the relative coordinate for 
-	 * @param points the <code>PointList</code> that contains that the label offset is relative to.
-	 * @param ref a <code>Point</code> located on the parent which the offset value
-	 * is relative to.
-	 * @param offset a <code>Point</code> which represents a value offset from the <code>ref</code>
-	 * point oriented based on the nearest line segment.
-	 * @return a <code>Point</code> that is the relative coordinate of the label that can be
-	 * used to set it's location.
-	 */
-	static private Point relativeCoordinateFromOffset(IFigure label, PointList points, Point ref, Point offset) {
-		Point location = calculatePointRelativeToPointOnLine(points, ref, offset);
-		location.translate(-1 * label.getBounds().width /2, -1 * label.getBounds().height /2);
-		return location;
-	}
-	
-	/**
-	 * gets the point list using the passed figure to get the parent
-	 * 
-	 * @param label the <code>IFigure</code> to use to retrieve the parent points
-	 * @return List of points
-	 */
-	static private PointList getParentPointList(IFigure label) {
-		IFigure parent = label.getParent();
-		if (parent instanceof Connection) {
-			return ((Connection) parent).getPoints();
-		} else {
-			PointList ptList = new PointList();
-			ptList.addPoint(parent.getBounds().getLocation());
-			return ptList;
-		}			
-	}
-	
-	/**
-	 * Returns a point located relative to the line by the given offset.
-	 * 
-	 * @param ptLst the point
-	 * @param ptOnLine
-	 * @param offset
-	 * @return the relative point given the line angle
-	 */
-	protected static Point calculatePointRelativeToPointOnLine(PointList ptLst, Point ptOnLine, Point offset) {
-		// Calculate slope of line
-		if (ptLst.size() == 1) {
-			// This is a node...
-			return ptLst.getFirstPoint().getTranslated(offset);
-		} else if (ptLst.size() >= 2){
-			// This is a edge...
-			int index = PointListUtilities.findNearestLineSegIndexOfPoint(ptLst, ptOnLine);	
-			if (index < 1) {
-				return ptLst.getFirstPoint().getTranslated(offset);
-			}
-			LineSeg segment = (LineSeg) PointListUtilities.getLineSegments(ptLst).get(index - 1);
-			Point relativeOffset = null;
-			if (segment != null) {
-				if (segment.isHorizontal()) {
-					if (segment.getOrigin().x > segment.getTerminus().x) {
-						relativeOffset = ptOnLine.getTranslated(offset.getNegated());
-						//System.out.println("1. Relative offset: " + relativeOffset);//$NON-NLS-1$
-						return relativeOffset;
-					} else {
-						relativeOffset = ptOnLine.getTranslated(offset);	
-						//System.out.println("2. Relative offset: " + relativeOffset);//$NON-NLS-1$
-						return relativeOffset;
-					}
-				} else if (segment.isVertical()) {
-					if (segment.getOrigin().y > segment.getTerminus().y) {
-						relativeOffset = ptOnLine.getTranslated(offset.getCopy().scale(-1, 1).transpose());
-						//System.out.println("3. Relative offset: " + relativeOffset);//$NON-NLS-1$
-						return relativeOffset;						
-					} else {
-						relativeOffset = ptOnLine.getTranslated(offset.getCopy().scale(1, -1).transpose());
-						//System.out.println("4. Relative offset: " + relativeOffset);//$NON-NLS-1$
-						return relativeOffset;
-					}
-				} else {				
-					double slope = segment.slope();
-					double theta = Math.atan(slope);
-					Point normalizedOffset = new Point(offset);
-					Point calculatedOffset = new Point();
-					if (segment.getOrigin().x > segment.getTerminus().x) {
-						normalizedOffset = offset.getCopy().scale(-1, -1);
-					}
-
-					calculatedOffset = new Point(normalizedOffset.x
-						* Math.cos(theta) - normalizedOffset.y
-						* Math.sin(theta), normalizedOffset.x * Math.sin(theta)
-						+ normalizedOffset.y * Math.cos(theta));
-					relativeOffset = ptOnLine.getTranslated(calculatedOffset);
-					//System.out.println("5. Relative offset: " + relativeOffset);//$NON-NLS-1$
-					return relativeOffset;									
-				}
-			}
-		}					
-		return null;
-	}
-	
-	/**
-	 * Calculates the normalized offset from a point on a <code>Connection</code>'s point list to an point.
-	 * 
-	 * @param ptLst
-	 * @param ptOnLine
-	 * @param offset
-	 * @return the normalized offset
-	 */
-	private static Point normalizeRelativePointToPointOnLine(PointList ptLst, Point ptOnLine, Point offset) {
-		// Calculate slope of line
-		if (ptLst.size() == 1) {
-			// This is a node...
-			return offset;
-		} else if (ptLst.size() >= 2){
-			// This is a edge...
-			int index = PointListUtilities.findNearestLineSegIndexOfPoint(ptLst, ptOnLine);		
-			LineSeg segment = (LineSeg) PointListUtilities.getLineSegments(ptLst).get(index - 1);
-			Point normalOffset = null;
-			if (segment != null) {
-				if (segment.isHorizontal()) {
-					if (segment.getOrigin().x > segment.getTerminus().x) {
-						normalOffset = offset.getNegated();
-						//System.out.println("1. Normal offset: " + normalOffset);//$NON-NLS-1$
-						return normalOffset;
-					} else {
-						normalOffset = offset;
-						//System.out.println("2. Normal offset: " + normalOffset);//$NON-NLS-1$
-						return normalOffset;						
-					}					
-				} else if (segment.isVertical()) {
-					if (segment.getOrigin().y < segment.getTerminus().y) {
-						normalOffset = offset.scale(-1, 1).transpose();
-						//System.out.println("3. Normal offset: " + normalOffset);//$NON-NLS-1$
-						return normalOffset;
-					} else {
-						normalOffset = offset.scale(1, -1).transpose();
-						//System.out.println("4. Normal offset: " + normalOffset);//$NON-NLS-1$						
-						return normalOffset;
-					}
-				} else {				
-					Point p = ptOnLine.getTranslated(offset);
-					normalOffset = getOrthogonalDistances(segment, ptOnLine, p);	
-					//System.out.println("5. Normal offset: " + normalOffset);//$NON-NLS-1$
-					return normalOffset;										
-				}
-			}
-		}					
-		return null;
-
-	}
-	
-	/**
-	 * Calculates distances from a <code>Point</code> on a <code>LineSeg</code> to 
-	 * another <code>Point</code>.  The sign of the distances indicate direction.
-	 * 
-	 * @param lineSeg
-	 * @param ptOnLine
-	 * @param refPoint
-	 * @return the distance from <code>Point</code> on a <code>LineSeg</code> to another <code>Point</code>
-	 */
-	private static Point getOrthogonalDistances(LineSeg lineSeg, Point ptOnLine, Point refPoint) {
-		LineSeg parallelSeg = lineSeg.getParallelLineSegThroughPoint(refPoint);
-		Point p1 = parallelSeg.perpIntersect(ptOnLine.x, ptOnLine.y);
-		double dx = p1.getDistance(refPoint) * ((p1.x > refPoint.x) ? -1 : 1);
-		double dy = p1.getDistance(ptOnLine) * ((p1.y < ptOnLine.y) ? -1 : 1);
-		Point orth = new Point(dx, dy);	
-		// Reflection in the y axis		
-		if (lineSeg.getOrigin().x > lineSeg.getTerminus().x)
-			orth = orth.scale(-1, -1);
-		return orth;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/NestedResizableCompartmentFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/NestedResizableCompartmentFigure.java
deleted file mode 100644
index df7329c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/NestedResizableCompartmentFigure.java
+++ /dev/null
@@ -1,62 +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.internal.figures;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-
-/**
- * A figure to represent the nested resizable compartment figure. Extends 
- * ResizeableCompartmentFigure with the following differences
- * 1.  If the contents of the scroll pane is empty then the figure will not be visible
- * 2.  Provides a constructor that has the text pane text align to the left
- * 3.  Provides a constructor that doesn't have a title by default.
- * 
- * Used by List compartment figures that are nested within other resizable compartment 
- * @author choang
- */
-public class NestedResizableCompartmentFigure extends ResizableCompartmentFigure {
-    
-    /**
-     * Constructors a ResizeableComparmtmentFigure that has the text align to the left
-     * and the scrollpane 
-     * @param mm the <code>IMapMode</code> that is used to initialize the
-     * default values of of the scrollpane contained inside the figure.  This is
-     * necessary since the figure is not attached at construction time and consequently
-     * can't get access to the owned IMapMode in the parent containment hierarchy.
-     */
-    public NestedResizableCompartmentFigure(IMapMode mm) {
-        super(null, mm);
-        setBorder(null);
-        ConstrainedToolbarLayout layout = (ConstrainedToolbarLayout)getLayoutManager();
-        layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT); //diff cause we want to align our title to the left top
-        getScrollPane().getContents().setBorder(null);
-    }
-	
-	/*
-	 * Zero dimension
-	 */
-	private static Dimension ZERO_DIM = new Dimension(0,0);
-	
-	/* 
-	 * Override as the min dimension is 0,0 since this compartment doesn't want to 
-	 * leave any spaces if there are not contains
-	 * @see org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure#getMinClientDimension()
-	 */
-	public Dimension getMinClientDimension() {		
-		return ZERO_DIM;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/PageBreaksFigure.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/PageBreaksFigure.java
deleted file mode 100644
index 216c8d2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/PageBreaksFigure.java
+++ /dev/null
@@ -1,238 +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.internal.figures;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-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.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * Page Breaks Figure.  A rectangle divided into subrectangles 
- * which are usually based on the printable page size.  This figure
- * supports two different states.  One for the regular figure and one used
- * as a feedback figure. 
- *  
- * @author jcorchis
- */
-public class PageBreaksFigure extends Figure {
-
-    /* constants used to indicated the type of figure */
-    public static final boolean FIGURE = true;
-    public static final boolean FEEDBACK = false;
-
-    /* Initial number of rows and columns */
-    private int rows = 1;
-    private int cols = 1;
-
-    // List that contains the bounds of the filled 
-    // rectangles which comprise the figure.    
-    private List recList;
-
-    private boolean figureType = FIGURE;
-
-    /**
-     * Constructor for PageBreaksFigure.
-     */
-    public PageBreaksFigure(boolean type) {
-        super();
-        figureType = type;
-        if (type) {
-            recList = new ArrayList(5);
-	    }
-    }
-
-    private int getBorderLineWidth() {
-    		return MapModeUtil.getMapMode(this).DPtoLP(7);
-    }
-    
-    private int getLineWidth() {
-    		return MapModeUtil.getMapMode(this).DPtoLP(1);
-    }
-    
-    private int getBottomPageMargin() {
-    		return MapModeUtil.getMapMode(this).DPtoLP(60);
-    }
-    
-    public void setPageCount(int rows, int cols) {
-        this.rows = Math.max(1, rows);
-        this.cols = Math.max(1, cols);
-    }
-
-    public void setRows(int rows) {
-        this.rows = Math.max(1, rows);
-    }
-
-    public void setCols(int cols) {
-        this.cols = Math.max(1, cols);
-    }
-
-    public Point getPageCount() {
-        return new Point(rows, cols);
-    }
-
-    /**
-     * @see Figure#paintBorder(Graphics)
-     */
-    protected void paintBorder(Graphics g) {
-        super.paintBorder(g);
-    }
-
-    /**
-     * @see Figure#paintFigure(Graphics)
-     */
-    protected void paintFigure(Graphics g) {
-        if (figureType) {
-            paintPageFigure(g);
-        } else {
-            paintFeedbackFigure(g);
-        }
-    }
-
-    /**
-     * The regular version of paint(Graphics g)
-     */
-    private void paintPageFigure(Graphics g) {
-        super.paintFigure(g);
-        recList.clear();
-        Rectangle r = getBounds();
-
-        g.setForegroundColor(ColorConstants.blue);
-        g.setBackgroundColor(ColorConstants.blue);
-
-        // Draw the border
-        final int borderLineWidth = getBorderLineWidth();
-        Rectangle top = new Rectangle(r.x, r.y, r.width, borderLineWidth);
-        recList.add(top);
-
-        Rectangle right =
-            new Rectangle(
-                r.x + r.width - borderLineWidth,
-                r.y,
-                borderLineWidth + 1,
-                r.height);
-        recList.add(right);
-
-        Rectangle left = new Rectangle(r.x, r.y, borderLineWidth, r.height);
-        recList.add(left);
-
-        Rectangle bottom =
-            new Rectangle(
-                r.x,
-                r.y + r.height - borderLineWidth,
-                r.width,
-                borderLineWidth + 1 );
-        recList.add(bottom);
-
-        for (int i = 0; i < recList.size(); i++) {
-            g.fillRectangle((Rectangle) recList.get(i));
-        }
-
-        // Draw the internal page division lines
-        g.setLineWidth(getLineWidth());
-        Point location = getLocation();
-
-        int colSize = (int) Math.floor(r.width / cols);
-        for (int i = 1; i < cols; i++) {
-            int colsOffset = colSize * i;
-            Rectangle rec =
-                new Rectangle(
-                    location.x + colsOffset,
-                    location.y,
-                    getLineWidth(),
-                    r.height);
-            recList.add(rec);
-            g.fillRectangle(rec);
-        }
-
-        int rowSize = (int) Math.floor(r.height / rows);
-        for (int i = 1; i < rows; i++) {
-            int rowOffset = rowSize * i;
-            Rectangle rec =
-                new Rectangle(
-                    location.x,
-                    location.y + rowOffset,
-                    r.width,
-                    getLineWidth());
-            recList.add(rec);
-            g.fillRectangle(rec);
-        }
-
-        // Add page numers centered at the bottom of each page
-        int halfPageSize = (int) Math.floor(colSize / 2);
-        for (int col = 1; col < cols + 1; col++) {
-            for (int row = 1; row < rows + 1; row++) {
-                int colsOffset = location.x + (colSize * col);
-                int rowOffset = location.y + (rowSize * row);
-                int topCenter = colsOffset - halfPageSize;
-                String pageNumber = row + " - " + col; //$NON-NLS-1$
-                Dimension size =
-                    FigureUtilities.getTextExtents(pageNumber, getFont());
-                g.drawString(
-                    pageNumber,
-                    topCenter - size.width,
-                    rowOffset - (getBottomPageMargin() + size.height));
-            }
-        }
-    }
-
-    /**
-     * The feedback version of paint(Graphics g)
-     */
-    private void paintFeedbackFigure(Graphics g) {
-        super.paintFigure(g);
-        Rectangle r = getBounds();
-
-        g.setForegroundColor(ColorConstants.blue);
-        g.setBackgroundColor(ColorConstants.blue);
-        g.setLineStyle(Graphics.LINE_DASHDOT);
-
-        g.drawRectangle(r.x, r.y, r.width - 1, r.height - 1);
-
-
-        int colSize = (int) Math.floor(r.width / cols);
-        for (int i = 1; i < cols; i++) {
-            int colsOffset = colSize * i;
-            g.drawLine(r.x + colsOffset, r.y, r.x + colsOffset, r.y + r.height);
-        }
-
-        int rowSize = (int) Math.floor(r.height / rows);
-        for (int i = 1; i < rows; i++) {
-            int rowOffset = rowSize * i;
-            g.drawLine(r.x, r.y + rowOffset, r.x + r.width, r.y + rowOffset);
-        }
-    }
-
-    public boolean containsPoint(int x, int y) {
-    	if (figureType == FEEDBACK)
-    		return false;
-    		
-        if (isOpaque())
-            return super.containsPoint(x, y);
-
-        for (int i = 0; i < recList.size(); i++) {
-            Rectangle r = (Rectangle) recList.get(i);
-            if (r.contains(x, y)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/ResizableLabelLocator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/ResizableLabelLocator.java
deleted file mode 100644
index 7126826..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/ResizableLabelLocator.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.runtime.diagram.ui.internal.figures;
-
-
-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.LabelLocator;
-
-/**
- * @author mmostafa
- */
-public class ResizableLabelLocator extends LabelLocator{
-	
-	/**
-	 * Constructor for figure who are located and sized.
-	 * @param parent		the parent figure
-	 * @param bounds		the bounds
-	 * @param alignment		the alignment
-	 */
-	public ResizableLabelLocator(IFigure parent, Rectangle bounds, int alignment) {
-		super(parent,bounds,alignment);
-	}
-	
-	/**
-	 * Positions the lable relative to the reference point with the
-	 * given offsets.
-	 */
-	public void relocate(IFigure target) {
-		Dimension preferredSize = target.getPreferredSize();
-		LabelLocator currentConstraint = (LabelLocator)target.getParent().getLayoutManager().getConstraint(target);
-		Dimension currentExtent = currentConstraint.getSize();
-		Dimension size = new Dimension(currentExtent);
-		if (currentExtent.width == -1) size.width = preferredSize.width;
-		if (currentExtent.height == -1) size.height = preferredSize.height;
-		target.setSize(size);
-		Point location = LabelHelper.relativeCoordinateFromOffset(target, getReferencePoint(), getOffset());
-		
-		target.setLocation(location);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/CompartmentResizeHandle.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/CompartmentResizeHandle.java
deleted file mode 100644
index 34172a1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/CompartmentResizeHandle.java
+++ /dev/null
@@ -1,105 +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.internal.handles;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RelativeLocator;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.handles.AbstractHandle;
-import org.eclipse.gef.tools.ResizeTracker;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Creates a  non-visual resize handle for the given <code>ResizableCompartmentEditPart</code>.
- * @param owner The <code>GraphicalEditPart</code> owner.
- * 
- * @author jcorchis
- * @author melaasar
- */
-public class CompartmentResizeHandle extends AbstractHandle {
-
-	private int location = PositionConstants.NORTH;
-
-	/**
-	 * Constructs an instance of a resize handle for a resizable compartment.
-	 * @param owner The edit part which own's the compartment resize handle
-	 */
-	public CompartmentResizeHandle(IGraphicalEditPart owner, int location) {
-		setOwner(owner);
-		this.location = location;
-		setLocator(new RelativeLocator(owner.getFigure(), location));
-		setCursor(Cursors.getDirectionalCursor(location));
-	}
-
-	/**
-	 * @return the drag tracker for the resizable edit part 
-	 */
-	protected DragTracker createDragTracker() {
-		// TODO Eclipse 3.0 Check
-		return new ResizeTracker(getOwner(), location) {
-			protected List createOperationSet() {
-				return Collections.singletonList(getOwner());
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
-	 */
-	public Dimension getPreferredSize(int wHint, int hHint) {
-		Rectangle rect = getOwnerFigure().getBounds().getCopy();
-
-		MapModeUtil.getMapMode(getOwnerFigure()).LPtoDP(rect);
-		if ((location & PositionConstants.NORTH_SOUTH) != 0)
-			return new Dimension(rect.width, 3);
-		else
-			return new Dimension(3, rect.height);
-	}
-
-	
-	protected IFigure getCompartmentFigure()
-	{
-		if (getOwner() instanceof ResizableCompartmentEditPart) {
-			return ((ResizableCompartmentEditPart)getOwner()).getCompartmentFigure();
-		}
-		else if( getOwner().getFigure() instanceof BorderedNodeFigure ){
-			return ((BorderedNodeFigure)getOwner().getFigure()).getMainFigure();
-		}
-		
-		return getOwner().getFigure();
-	}
-	
-	/**
-	 * @see org.eclipse.draw2d.IFigure#containsPoint(int, int)
-	 */
-	public boolean containsPoint(int x, int y) {
-		if (super.containsPoint(x, y)) {
-			ResizableCompartmentFigure f =
-				(ResizableCompartmentFigure) getCompartmentFigure();
-			boolean before = (location & PositionConstants.NORTH_WEST) != 0;
-			return f.getAdjacentSibling(before) != null;
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/RotateHandle.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/RotateHandle.java
deleted file mode 100644
index 2106b38..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/RotateHandle.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.diagram.ui.internal.handles;
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.ResizeHandle;
-import org.eclipse.swt.graphics.Cursor;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RotateTracker;
-
-
-/**
- * Rotate handle that provides support for figure rotations.
- * Looks exactly like resize handle, the only difference the cursor is "hand"
- * 
- * @author oboyko
- */
-public class RotateHandle
-	extends ResizeHandle {
-	
-	// direction/position where on the figure the handle is placed
-	private int direction;
-	
-	/**
-	 * Creates a new RotateHandle for the given GraphicalEditPart.
-	 * <code>direction</code> is the relative direction from the 
-	 * center of the owner figure.  For example, <code>SOUTH_EAST</code>
-	 * would place the handle in the lower-right corner of its
-	 * owner figure.  These direction constants can be found in
-	 * {@link org.eclipse.draw2d.PositionConstants}.
-	 * 
-	 * @param owner the <code>GraphicalEditPart</code> that references the RotateHandle
-	 * @param direction relative direction from the center of the owner figure
-	 */
-	public RotateHandle(GraphicalEditPart owner, int direction) {
-		super(owner,direction);
-		this.direction = direction; 
-		setCursor(Cursors.HAND);
-	}
-
-	/**
-	 * Creates a new ResizeHandle for the given GraphicalEditPart.
-	 * 
-	 * @see SquareHandle#SquareHandle(GraphicalEditPart, Locator, Cursor)
-	 */
-	public RotateHandle(GraphicalEditPart owner, Locator loc, Cursor c) {
-		super(owner, loc, c);
-	}
-
-	/**
-	 * Returns <code>null</code> for the DragTracker.
-	 * 
-	 * @return returns <code>null</code>
-	*/
-	protected DragTracker createDragTracker() {
-		return new RotateTracker(getOwner(), direction);
-	}
-
-
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/handles/package.html
deleted file mode 100644
index 238f6f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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.diagram.ui.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/DiagramUIPluginImages.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/DiagramUIPluginImages.java
deleted file mode 100644
index f9907de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/DiagramUIPluginImages.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-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 DiagramUIPluginImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	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$	
-
-	// 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_ZOOM_IN = PREFIX_ROOT + "zoomplus.gif"; //$NON-NLS-1$
-	
-	public static final String IMG_HANDLE_EXPAND = PREFIX_ROOT + "collapsedEmpty.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_COLLAPSE = PREFIX_ROOT + "expanded.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_EXPAND_WIN = PREFIX_ROOT + "expand.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_COLLAPSE_WIN = PREFIX_ROOT + "collapse.gif"; //$NON-NLS-1$	
-	
-	public static final String IMG_HANDLE_INCOMING_WEST = PREFIX_ROOT + "handle_incoming_west.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_OUTGOING_WEST = PREFIX_ROOT + "handle_outgoing_west.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_INCOMING_EAST = PREFIX_ROOT + "handle_incoming_east.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_OUTGOING_EAST = PREFIX_ROOT + "handle_outgoing_east.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_INCOMING_SOUTH = PREFIX_ROOT + "handle_incoming_south.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_OUTGOING_SOUTH = PREFIX_ROOT + "handle_outgoing_south.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_INCOMING_NORTH = PREFIX_ROOT + "handle_incoming_north.gif"; //$NON-NLS-1$
-	public static final String IMG_HANDLE_OUTGOING_NORTH = PREFIX_ROOT + "handle_outgoing_north.gif"; //$NON-NLS-1$
-
-	public static final String IMG_POPUPBAR = PREFIX_ROOT + "popupbar.gif"; //$NON-NLS-1$
-	public static final String IMG_POPUPBAR_PLUS = PREFIX_ROOT + "popupbar_plus.gif"; //$NON-NLS-1$
-
-    public static final String IMG_GROUP = PREFIX_ROOT + "group.gif"; //$NON-NLS-1$
-
-	// Image descriptors.
-
-	public static final ImageDescriptor DESC_HANDLE_COLLAPSE = createAndCache(IMG_HANDLE_COLLAPSE);
-	public static final ImageDescriptor DESC_HANDLE_EXPAND = createAndCache(IMG_HANDLE_EXPAND);
-	public static final ImageDescriptor DESC_HANDLE_COLLAPSE_WIN = createAndCache(IMG_HANDLE_COLLAPSE_WIN);
-	public static final ImageDescriptor DESC_HANDLE_EXPAND_WIN = createAndCache(IMG_HANDLE_EXPAND_WIN);
-	
-	public static final ImageDescriptor DESC_HANDLE_INCOMING_WEST = createAndCache(IMG_HANDLE_INCOMING_WEST);
-	public static final ImageDescriptor DESC_HANDLE_OUTGOING_WEST = createAndCache(IMG_HANDLE_OUTGOING_WEST);
-	public static final ImageDescriptor DESC_HANDLE_INCOMING_EAST = createAndCache(IMG_HANDLE_INCOMING_EAST);
-	public static final ImageDescriptor DESC_HANDLE_OUTGOING_EAST = createAndCache(IMG_HANDLE_OUTGOING_EAST);
-	public static final ImageDescriptor DESC_HANDLE_INCOMING_SOUTH = createAndCache(IMG_HANDLE_INCOMING_SOUTH);
-	public static final ImageDescriptor DESC_HANDLE_OUTGOING_SOUTH = createAndCache(IMG_HANDLE_OUTGOING_SOUTH);
-	public static final ImageDescriptor DESC_HANDLE_INCOMING_NORTH = createAndCache(IMG_HANDLE_INCOMING_NORTH);
-	public static final ImageDescriptor DESC_HANDLE_OUTGOING_NORTH = createAndCache(IMG_HANDLE_OUTGOING_NORTH);
-	
-	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_CONNECTOR_LABELS_GROUP = create(PREFIX_ENABLED +  "show_connector_group.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_HIDE_CONNECTOR_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_ZOOM_IN = createAndCache(IMG_ZOOM_IN);
-	public static final ImageDescriptor DESC_ZOOM_OUT = create(PREFIX_ROOT + "zoomminus.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ZOOM_100 = create(PREFIX_ROOT + "zoom100.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ZOOM_TOFIT = create(PREFIX_ROOT + "zoomtofit.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_SELECTCONNECTORS = create(PREFIX_ENABLED + "selectconnectors.gif"); //$NON-NLS-1$	
-	public static final ImageDescriptor DESC_SELECTCONNECTORS_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_OUTLINE = create(PREFIX_ROOT + "outline.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_OVERVIEW = create(PREFIX_ROOT + "overview.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_ACTON_RECALCPAGEBREAKS = create(PREFIX_ENABLED + "recalcpagebreaks.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ACTON_RECALCPAGEBREAKS_DISABLED = create(PREFIX_DISABLED + "recalcpagebreaks.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_POPUPBAR = createAndCache(IMG_POPUPBAR);
-	public static final ImageDescriptor DESC_POPUPBAR_PLUS = createAndCache(IMG_POPUPBAR_PLUS);
-	
-	public static final ImageDescriptor DESC_SNAPBACK = create(PREFIX_ROOT + "snapback.gif");//$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_SHOW_PROPERTIES_VIEW = create(PREFIX_ROOT + "properties_view.gif");//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_SHOW_CONNECTOR_LABELS = create(PREFIX_ENABLED + "showconnector.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHOW_CONNECTOR_LABELS_DISABLED = create(PREFIX_DISABLED + "showconnector.gif"); //$NON-NLS-1$			
-	public static final ImageDescriptor DESC_HIDE_CONNECTOR_LABELS = create(PREFIX_ENABLED + "hideconnector.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HIDE_CONNECTOR_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_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 + PREFIX_ROOT + "copy_appearance_properties.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COPY_APPEARANCE_DISABLED = create(PREFIX_DISABLED + PREFIX_ROOT + "copy_appearance_properties.gif"); //$NON-NLS-1$	
-	
-	public static final ImageDescriptor DESC_SHAPECURSOR_MASK = create(PREFIX_ENABLED + "shapecursor_mask.gif");//$NON-NLS-1$
-	public static final ImageDescriptor DESC_SHAPECURSOR_SOURCE = create(PREFIX_ENABLED + "shapecursor_source.gif");//$NON-NLS-1$	
-	
-	public static final ImageDescriptor DESC_NOSHAPECURSOR_MASK = create(PREFIX_DISABLED + "noshapecursor_mask.gif");//$NON-NLS-1$
-	public static final ImageDescriptor DESC_NOSHAPECURSOR_SOURCE = create(PREFIX_DISABLED + "noshapecursor_source.gif");//$NON-NLS-1$	
-	
-	public static final ImageDescriptor DESC_CONNECTION_CURSOR_MASK = create(PREFIX_ENABLED + "connectcursor_mask.gif");//$NON-NLS-1$
-	public static final ImageDescriptor DESC_CONNECTION_CURSOR_SOURCE = create(PREFIX_ENABLED + "connectcursor_source.gif");//$NON-NLS-1$
-	public static final ImageDescriptor DESC_NO_CONNECTION_CURSOR_MASK = create(PREFIX_DISABLED + "noconnectcursor_mask.gif");//$NON-NLS-1$
-	public static final ImageDescriptor DESC_NO_CONNECTION_CURSOR_SOURCE = create(PREFIX_DISABLED + "noconnectcursor_source.gif");//$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_CHECKBOX_SELECTED = create(PREFIX_ROOT + "checkboxselected.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHECKBOX_CLEARED = create(PREFIX_ROOT + "checkboxcleared.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_UP_PATH = create(PREFIX_ROOT + "CollectionUp.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DOWN_PATH = create(PREFIX_ROOT + "CollectionDown.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SORT_ARROW_UP = create(PREFIX_ROOT + "sm_arrow_up.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SORT_ARROW_DN = create(PREFIX_ROOT + "sm_arrow_dn.gif"); //$NON-NLS-1$
-    
-    public static final ImageDescriptor DESC_GROUP = createAndCache(IMG_GROUP); 
-
-	/**
-	 * 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(DiagramUIPlugin
-			.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);
-		DiagramUIPlugin.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 DiagramUIPlugin.getInstance().getImageRegistry().get(imageName);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.java
deleted file mode 100644
index 3102c46..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.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.runtime.diagram.ui.internal.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class InternalDiagramUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.internal.l10n.InternalDiagramUIMessages";//$NON-NLS-1$
-
-	private InternalDiagramUIMessages() {
-		// 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 Text_InitialValue;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, InternalDiagramUIMessages.class);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.properties b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.properties
deleted file mode 100644
index 5c37fda..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/InternalDiagramUIMessages.properties
+++ /dev/null
@@ -1,26 +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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Diagram 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
-
-Text_InitialValue = Text
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/l10n/package.html
deleted file mode 100644
index 310f904..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/DefaultValues.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/DefaultValues.java
deleted file mode 100644
index 65379e9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/DefaultValues.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.pagesetup;
-
-import java.util.Locale;
-
-/**
- * Contains default values that will be used to initialize printing
- * preferences declared in WorkspaceViewerProperties.PREF.  Two sets of preferences 
- * exist: one set in workspace and one set in diagram preference store.
- * 
- * @author etworkow
- */
-public class DefaultValues {
-
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS. */
-	public static boolean DEFAULT_USE_WORKSPACE_SETTINGS = true;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS. */
-	public static boolean DEFAULT_USE_DIAGRAM_SETTINGS = false;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_INCHES. */
-	public static boolean DEFAULT_INCHES = !useDefaultMetricMeasures();
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_MILLIM. */
-	public static boolean DEFAULT_MILLIM = useDefaultMetricMeasures();
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_PORTRAIT. */
-	public static boolean DEFAULT_PORTRAIT = true;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_USE_LANDSCAPE. */
-	public static boolean DEFAULT_LANDSCAPE = false;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_PAGE_SIZE. */
-	public static String DEFAULT_PAGE_SIZE = getLocaleSpecificPageType().getName();
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_PAGE_HEIGHT. */
-	public static double DEFAULT_PAGE_WIDTH = getLocaleSpecificPageType().getWidth();
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_PAGE_WIDTH. */
-	public static double DEFAULT_PAGE_HEIGHT = getLocaleSpecificPageType().getHeight();
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_MARGIN_TOP. */
-	public static double DEFAULT_MARGIN_TOP = 0.5;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_MARGIN_BOTTOM. */
-	public static double DEFAULT_MARGIN_BOTTOM = 0.5;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_MARGIN_LEFT. */
-	public static double DEFAULT_MARGIN_LEFT = 0.5;
-	
-	/** Represents default value for WorkspaceViewerProperties.PREF_MARGIN_RIGHT. */
-	public static double DEFAULT_MARGIN_RIGHT = 0.5;
-			
-	/** Enforce a minimum margin to take printer limitations into account */
-	public static double MINIMUM_MARGIN_TOP = 0.25;
-	
-	/** Enforce a minimum margin to take printer limitations into account */
-	public static double MINIMUM_MARGIN_BOTTOM = 0.25;
-	
-	/** Enforce a minimum margin to take printer limitations into account */
-	public static double MINIMUM_MARGIN_LEFT = 0.25;
-	
-	/** Enforce a minimum margin to take printer limitations into account */
-	public static double MINIMUM_MARGIN_RIGHT = 0.25;
-	
-	/**
-	 * Returns locale specific page size.
-	 * 
-	 * @return PSPageType PSPageType.LETTER on US/Canada locale, PSPageType.A4 otherwise.
-	 */
-	static public PageSetupPageType getLocaleSpecificPageType() {
-		if (!useDefaultMetricMeasures()) {
-			return PageSetupPageType.LETTER;
-		}
-		return PageSetupPageType.A4;
-	}
-	
-	/**
-	 * Inspects the locale to determine if we are in a location that does 
-	 * use the metric system by default.
-	 * 
-	 * @return boolean true if we are in a location that uses metric.
-	 */
-	static public boolean useDefaultMetricMeasures() {
-		Locale defaultLocale = Locale.getDefault();
-		String defaultCountry = defaultLocale.getCountry();
-		
-		if (defaultCountry != null
-				&& (defaultCountry.equals(Locale.US.getCountry()) || 
-					defaultCountry.equals(Locale.CANADA.getCountry()) || 
-				    (defaultCountry.length() == 0 && defaultLocale.getLanguage().equals(Locale.ENGLISH.getLanguage())))) {
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/ILabels.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/ILabels.java
deleted file mode 100644
index 5510dea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/ILabels.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 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.internal.pagesetup;
-
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-
-/**
- * Internationalized labels displayed Page Setup Dialog.
- * 
- * @author etworkow
- */
-public interface ILabels {
-
-	public static String ID_PAGE_SETUP_PREF_PAGE = "id.pageSetupPreferencePage"; //$NON-NLS-1$
-	
-	///////////////////////
-	// Page Setup Dialog //
-	///////////////////////
-	
-	/** Represents a title for Page Setup Dialog. */
-	public static String LABEL_TITLE_PAGE_SETUP = DiagramUIMessages.PageSetupDialog_title;
-	
-	/** Represents a title of Page Setup Tab in Page Setup Dialog. */
-	public static String LABEL_TITLE_PAGE_SETUP_TAB_ITEM = DiagramUIMessages.PageSetupDialog_title_tab;
-
-	/////////////////////////
-	//PSConfigurationBlock //
-	/////////////////////////
-	/** Represents a title of unit group in Page Setup Dialog. */
-	public static String LABEL_TITLE_GROUP_UNITS = DiagramUIMessages.PageSetupDialog_title_group_unit;
-	
-	/** Represents a label of inches radio button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_INCHES = DiagramUIMessages.PageSetupDialog_button_inches;
-	
-	/** Represents a label of millimetres radio button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_MILLIMETRES = DiagramUIMessages.PageSetupDialog_button_millimetres;
-	
-	// Orientation group
-	/** Represents a title of orientation group in Page Setup Dialog. */
-	public static String LABEL_TITLE_GROUP_ORIENTATION = DiagramUIMessages.PageSetupDialog_title_group_orientation;
-	
-	/** Represents a label of portrait radio button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_PORTRAIT = DiagramUIMessages.PageSetupDialog_button_portrait;
-	
-	/** Represents a label of landscape radio button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_LANDSCAPE = DiagramUIMessages.PageSetupDialog_button_landscape;
-	
-	// Size group
-	/** Represents a label of group paper size in Page Setup Dialog. */
-	public static String LABEL_TITLE_GROUP_PAPER_SIZE = DiagramUIMessages.PageSetupDialog_title_group_paperSize;
-	
-	/** Represents a label of page size combo in Page Setup Dialog. */
-	public static String LABEL_PAGE_SIZE = DiagramUIMessages.PageSetupDialog_text_page_size;
-	
-	/** Represents a label of page width text field in Page Setup Dialog. */
-	public static String LABEL_PAGE_WIDTH_INCHES = DiagramUIMessages.PageSetupDialog_text_page_width_inches;
-    
-    /** Represents a label of page width text field in Page Setup Dialog. */
-    public static String LABEL_PAGE_WIDTH_MM = DiagramUIMessages.PageSetupDialog_text_page_width_mm;
-	
-	/** Represents a label of page height text field in Page Setup Dialog. */
-	public static String LABEL_PAGE_HEIGHT_INCHES = DiagramUIMessages.PageSetupDialog_text_page_height_inches;
-    
-    /** Represents a label of page height text field in Page Setup Dialog. */
-    public static String LABEL_PAGE_HEIGHT_MM = DiagramUIMessages.PageSetupDialog_text_page_height_mm;
-	
-	// Margin group
-	/** Represents a label of margin group in Page Setup Dialog. */
-	public static String LABEL_TITLE_GROUP_MARGIN= DiagramUIMessages.PageSetupDialog_title_group_margin;
-	
-	/** Represents a label of top margin text field in Page Setup Dialog. */
-	public static String LABEL_MARGIN_TOP_INCHES = DiagramUIMessages.PageSetupDialog_text_page_margin_top_inches;
-    
-    /** Represents a label of top margin text field in Page Setup Dialog. */
-    public static String LABEL_MARGIN_TOP_MM = DiagramUIMessages.PageSetupDialog_text_page_margin_top_mm;
-	
-	/** Represents a label of bottom margin text field in Page Setup Dialog. */
-	public static String LABEL_MARGIN_BOTTOM_INCHES = DiagramUIMessages.PageSetupDialog_text_page_margin_bottom_inches;
-    
-    /** Represents a label of bottom margin text field in Page Setup Dialog. */
-    public static String LABEL_MARGIN_BOTTOM_MM = DiagramUIMessages.PageSetupDialog_text_page_margin_bottom_mm;
-	
-	/** Represents a label of left margin text field in Page Setup Dialog. */
-	public static String LABEL_MARGIN_LEFT_INCHES = DiagramUIMessages.PageSetupDialog_text_page_margin_left_inches;
-    
-    /** Represents a label of left margin text field in Page Setup Dialog. */
-    public static String LABEL_MARGIN_LEFT_MM = DiagramUIMessages.PageSetupDialog_text_page_margin_left_mm;
-	
-	/** Represents a label of right margin text field in Page Setup Dialog. */
-	public static String LABEL_MARGIN_RIGHT_INCHES = DiagramUIMessages.PageSetupDialog_text_page_margin_right_inches;
-    
-    /** Represents a label of right margin text field in Page Setup Dialog. */
-    public static String LABEL_MARGIN_RIGHT_MM = DiagramUIMessages.PageSetupDialog_text_page_margin_right_mm;
-	
-	/** Represents an inches label appearing after margin text field in Page Setup Dialog. */
-	public static String LABEL_INCHES = DiagramUIMessages.PageSetupDialog_label_inches;
-	
-	/** Represents a millimetres label appearing after margin text field in Page Setup Dialog. */
-	public static String LABEL_MILLIMETRES = DiagramUIMessages.PageSetupDialog_label_millimetres;
-	
-	///////////////////////////////////
-	// PSSelectionConfigurationBlock //
-	///////////////////////////////////
-	/** Represents an inches label appearing after margin text field in Page Setup Dialog. */
-	public static String TITLE_PAGE_SETUP_TAB_ITEM = DiagramUIMessages.PageSetupDialog_title_tab;
-	
-	/** Represents an label for use workspace settings button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_USE_WORKSPACE_SETTINGS = DiagramUIMessages.PageSetupDialog_button_workspace;
-	
-	/** Represents a label for configure workspace settings button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_CONFIGURE_WORKSPACE_SETTINGS = DiagramUIMessages.PageSetupDialog_button_configure;
-	
-	/** Represents a label for use diagram settings button in Page Setup Dialog. */
-	public static String LABEL_BUTTON_USE_DIAGRAM_SETTINGS = DiagramUIMessages.PageSetupDialog_button_diagram;
-	
-	//////////////////////////////
-	// Printing Preference Page //
-	//////////////////////////////
-	/** Represents a title of Printing Preference Page.*/
-	public static String LABEL_PREFERENCE_PAGE_PRINTING = DiagramUIMessages.PageSetupPreferencePage_title;
-
-	/** Represents an error message appearing in Print Preference Page if one of the user input values is invalid. */
-	public static String LABEL_PRINT_PREFERENCE_PAGE_ERROR_MSG = DiagramUIMessages.PrintPreferencePage_message_error;
-
-	/** Represents instructional text appearing at the top of Print Preference Page. */
-	public static String LABEL_PRINT_PREFERENCE_PAGE_INSTRUCTION = DiagramUIMessages.PrintPreferencePage_instruction;
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java
deleted file mode 100644
index 17071bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.pagesetup;
-
-import java.awt.geom.Point2D;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-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.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.printing.Printer;
-
-/**
- * Helper to get information about a page.  Used by page breaks and print
- * preview.
- * 
- * @author Wayne Diu, wdiu
- */
-public class PageInfoHelper {
-    /**
-     * Calculate the diagram bounds excluding the page breaks figure
-     * 
-     * @param diagramEditPart, the diagram edit part containing the diagram
-     * we are calculating the bounds for.
-     * @param pageBreakClass, figures of this class should be ignored
-     * 
-     * @return rectangle bounds of the diagram's children
-     */
-    public static Rectangle getChildrenBounds(DiagramEditPart diagramEditPart, Class pageBreakClass) {
-        Rectangle diagramRec = null;
-        Point location = new Point();
-        IFigure f = diagramEditPart.getContentPane();
-        List list = f.getChildren();
-
-        if (java.util.Collections.EMPTY_LIST == list) {
-            return new Rectangle();
-        }
-        boolean init = true;
-        for (int i = 0; i < list.size(); i++) {
-            Figure childFigure = (Figure) list.get(i);
-            if (pageBreakClass != null && pageBreakClass.isInstance(childFigure)) {
-                continue;
-            }
-
-            Rectangle r = null;
-            Point childLocation = null;
-            if (childFigure instanceof IExpandableFigure){
-                r = ((IExpandableFigure)childFigure).getExtendedBounds();
-                childLocation = r.getLocation();
-                
-            }else {
-                r = childFigure.getBounds();
-                childLocation = childFigure.getLocation();
-            }
-            
-            
-            if (init) {
-                location.x = childLocation.x;
-                location.y = childLocation.y;
-                diagramRec = r;
-                init = false;
-            }
-
-            diagramRec = diagramRec.getUnion(r);
-
-            if (childLocation.x < location.x) {
-                location.x = childLocation.x;
-            }
-            if (childLocation.y < location.y) {
-                location.y = childLocation.y;
-            }
-
-        }
-
-        if (diagramRec == null) {
-            // The diagram is empty
-            return new Rectangle();
-        } else {
-            diagramRec.x = location.x;
-            diagramRec.y = location.y;
-        }
-
-        return diagramRec;
-    }
-    
-
-    /**
-     * Utility method that calculate the printer page size.      
-     * @return point the page size point.x == width, point.y == height
-     */
-    public static Point getPageSize(IPreferenceStore store, IMapMode mm) {
-    	return getPageSize(store, true, mm);
-    }
-    
-    /**
-     * Utility method that calculate the printer page size.      
-     * @return point the page size point.x == width, point.y == height
-     */
-    public static Point getPageSize(IPreferenceStore store, boolean subtractMargins, IMapMode mm) {
-
-		double paperSizeWidth =
-			store.getDouble(WorkspaceViewerProperties.PREF_PAGE_WIDTH);
-		double paperSizeHeight =
-			store.getDouble(WorkspaceViewerProperties.PREF_PAGE_HEIGHT);
-		double leftMargin =
-			store.getDouble(WorkspaceViewerProperties.PREF_MARGIN_LEFT);
-		double topMargin =
-			store.getDouble(WorkspaceViewerProperties.PREF_MARGIN_TOP);
-		double bottomMargin =
-			store.getDouble(WorkspaceViewerProperties.PREF_MARGIN_BOTTOM);
-		double rightMargin =
-			store.getDouble(WorkspaceViewerProperties.PREF_MARGIN_RIGHT);
-
-		//if (nnn
-		//	.LANDSCAPE
-		//	.equals(
-		//		store.getString(WorkspaceViewerProperties.PAGE_ORIENTATION))) {
-		//	double temp = paperSizeWidth;
-		//	paperSizeWidth = paperSizeHeight;
-		//	paperSizeHeight = temp;
-		//}
-
-		if (store.getBoolean(WorkspaceViewerProperties.PREF_USE_LANDSCAPE)) {
-			double temp = paperSizeWidth;
-			paperSizeWidth = paperSizeHeight;
-			paperSizeHeight = temp;
-		}
-		// inches
-		double width = paperSizeWidth;
-		double height = paperSizeHeight;
-		
-		if (subtractMargins) {
-			width -= (leftMargin + rightMargin);
-			height -= (topMargin + bottomMargin);
-		}
-
-		int[] paperSize = { 0, 0 };
-		org.eclipse.swt.widgets.Display display = DisplayUtils.getDisplay();
-		org.eclipse.swt.graphics.Point displayDPI = display.getDPI();
-		paperSize[0] = mm.DPtoLP((int)(width * displayDPI.x));
-		paperSize[1] = mm.DPtoLP((int)(height * displayDPI.y));
-
-		return new Point(paperSize[0], paperSize[1]);
-    }
-    
-    /**
-     * Returns a page type (e.g. PSPageType.A4) based on the 
-     * size of the page in the default printer.  If no printer is
-     * installed a default of PSPageType.LETTER is returned.
-     * 
-     * @return String the default page size name
-     */    
-    static public String getPrinterPageType() {
-    	
-    	//String pageType = nnn.LETTER;
-    	String pageType = PageSetupPageType.LETTER.getName();
-    	
-    	Printer printer = null;
-
-		try {
-			printer = new Printer();
-		} catch (SWTError e) {
-			//I cannot printer.dispose(); because it may not have been
-			//initialized
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				PageInfoHelper.class, "getPrinterPage", //$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 pageType;
-			}
-
-			//if (e.code != SWT.ERROR_NO_HANDLES)
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.GENERAL_UI_FAILURE,
-				"Failed to make instance of Printer object", e); //$NON-NLS-1$
-
-			//else if another swt error
-			Trace.throwing(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				PageInfoHelper.class, "getPrinterPage", //$NON-NLS-1$
-				e);
-			throw e;
-		}
-    	
-    	if (printer != null) {
-    		
-    		// Physical page size in pixels
-    		org.eclipse.swt.graphics.Rectangle physicalSize = printer.getBounds();
-    		org.eclipse.swt.graphics.Point dpi = printer.getDPI();
-    		
-    		// Convert physical size to inches.
-    		Point2D.Double size = new Point2D.Double(physicalSize.width / dpi.x, physicalSize.height / dpi.y);
-    		
-    		Map pageTypes = getPaperSizesMap();
-    		Set<Entry<?,?>> pageTypeEntrySet = pageTypes.entrySet();
-    		boolean first = true;
-    		double bestFit = 0.0;
-    		
-    		for (Entry<?, ?> pageTypeEntry : pageTypeEntrySet) {
-    			String thisPageType = (String)pageTypeEntry.getKey();
-    			Point2D.Double thisSize = (Point2D.Double)pageTypeEntry.getValue();
-    			
-    			if (first) {
-    				bestFit = size.distance(thisSize);
-    				pageType = thisPageType;
-    				first = false;
-    				continue;
-    			}
-    			
-    			double thisFit = size.distance(thisSize);
-    			if (thisFit < bestFit) {
-    				bestFit = thisFit;
-    				pageType = thisPageType;
-    			}
-			}
-
-    		printer.dispose();	    		
-    	}     	   	
-    	
-    	return pageType;
-    }
-    
-	private static final Map pageSizes = new HashMap();
-
-	static {
-		pageSizes.put(PageSetupPageType.LETTER, new Point2D.Double(8.5, 11));
-		pageSizes.put(PageSetupPageType.LEGAL, new Point2D.Double(8.5, 14));
-		pageSizes.put(PageSetupPageType.EXECUTIVE, new Point2D.Double(7.25, 10.5));
-		pageSizes.put(PageSetupPageType.llX17, new Point2D.Double(11, 17));
-		pageSizes.put(PageSetupPageType.A3, new Point2D.Double(11.69, 16.54));
-		pageSizes.put(PageSetupPageType.A4, new Point2D.Double(8.268, 11.69));
-		pageSizes.put(PageSetupPageType.B4, new Point2D.Double(14.33, 10.12));
-		pageSizes.put(PageSetupPageType.B5, new Point2D.Double(7.165, 10.12));
-	}
-	
-	public static final Map getPaperSizesMap() {
-		return pageSizes;
-	}
-	
-	public static final class PageMargins {
-		public int left;
-		public int right;
-		public int top;
-		public int bottom;
-	}	
-	
-	
-	public static PageMargins getPageMargins(IPreferenceStore preferenceStore, IMapMode mm) {		
-		org.eclipse.swt.graphics.Point displayDPI = DisplayUtils.getDisplay().getDPI();
-		PageMargins margins = new PageMargins();
-		margins.left = mm.DPtoLP((int) ( displayDPI.x * preferenceStore
-			.getDouble(WorkspaceViewerProperties.PREF_MARGIN_LEFT)));
-		margins.right = mm.DPtoLP((int) ( displayDPI.x * preferenceStore
-			.getDouble(WorkspaceViewerProperties.PREF_MARGIN_RIGHT)));
-		margins.top = mm.DPtoLP((int) ( displayDPI.y * preferenceStore
-			.getDouble(WorkspaceViewerProperties.PREF_MARGIN_TOP)));
-		margins.bottom = mm.DPtoLP((int) ( displayDPI.y * preferenceStore
-			.getDouble(WorkspaceViewerProperties.PREF_MARGIN_BOTTOM)));
-		
-		return margins;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupPageType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupPageType.java
deleted file mode 100644
index 5056437..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupPageType.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.diagram.ui.internal.pagesetup;
-
-import java.awt.geom.Point2D;
-
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-
-/**
- * The following page types are supported by Page Setup Dialog:
- * { LETTER, LEBAL, EXECUTIVE, 11x17, A3, A4, B4, B5, USER_DEFINED }
- * 
- * @author etworkow
- */
-public class PageSetupPageType {
-
-	private String fName;
-	private Point2D.Double fDimension;
-	private int fIndex;
-	
-	/** Represents LETTER page size. */
-	public static PageSetupPageType LETTER = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_letter, new Point2D.Double(8.5, 11), 0); 
-	
-	/** Represents LEGAL page size. */
-	public static PageSetupPageType LEGAL = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_legal, new Point2D.Double(8.5, 14), 1);
-	
-	/** Represents EXECUTIVE page size. */
-	public static PageSetupPageType EXECUTIVE = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_executive, new Point2D.Double(7.25, 10.5), 2);
-	
-	/** Represents 11x17 page size. */
-	public static PageSetupPageType llX17 = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_11by17, new Point2D.Double(11, 17), 3);
-	
-	/** Represents A3 page size. */
-	public static PageSetupPageType A3 = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_A3, new Point2D.Double(11.6929134d, 16.5354331d), 4);
-	
-	/** Represents A4 page size. */
-	public static PageSetupPageType A4 = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_A4, new Point2D.Double(8.26771654d, 11.6929134d), 5);
-	
-	/** Represents B4 page size. */
-	public static PageSetupPageType B4 = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_B4, new Point2D.Double(9.84251969d, 13.8976378d), 6);
-	
-	/** Represents B5 page size. */
-	public static PageSetupPageType B5 = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_B5, new Point2D.Double(6.92913386d, 9.84251969d), 7);
-	
-	/** Represents USER_DEFINED page size. */
-	public static PageSetupPageType USER_DEFINED = new PageSetupPageType
-		(DiagramUIMessages.PageSetupDialog_paper_size_userDefined, new Point2D.Double(0.0, 0.0), 8);
-	
-	/**
-	 * Creates an instance of PageSetupPageType.
-	 * 
-	 * @param name String name of the page size
-	 * @param dimension Point2D.Double dimension of page (height and width)
-	 * @param index int index of page size
-	 */
-	private PageSetupPageType(String name, Point2D.Double dimension, int index) {
-		fName = name;
-		fDimension = dimension;
-		fIndex = index;
-	}
-	
-	/**
-	 * Get page size name.
-	 * 
-	 * @return Strin name of page size, ex. "Letter"
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * Get width of page.
-	 * 
-	 * @return double page width
-	 */
-	public double getWidth() {
-		return fDimension.x;
-	}
-	
-	/**
-	 * Get height of page.
-	 * 
-	 * @return double page height
-	 */
-	public double getHeight() {
-		return fDimension.y;
-	}
-	
-	/**
-	 * Get index of page.
-	 * 
-	 * @return double page width
-	 */
-	public int getIndex() {
-		return fIndex;
-	}
-	
-	/**
-	 * List of all supported page sizes.
-	 */
-	public static PageSetupPageType[] pages = {
-		LETTER,
-		LEGAL,
-		EXECUTIVE,
-		llX17,
-		A3,
-		A4,
-		B4,
-		B5,
-		USER_DEFINED
-	};
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupWidgetFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupWidgetFactory.java
deleted file mode 100644
index f025186..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageSetupWidgetFactory.java
+++ /dev/null
@@ -1,269 +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.internal.pagesetup;
-
-import org.eclipse.swt.SWT;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * PSWidgetFactory contains static methods to create widgets used in
- * PageSetupConfigBlock and PageSetupSelectionConfigBlock.
- * 
- * @author etworkow
- */
-public class PageSetupWidgetFactory {
-	
-	/**
-	 * Create a radio button allowing the user to use inches as a unit of measurement.
-	 * 
-	 * @param parent Composite hosting the button
-	 * @param label String butotn label
-	 * @return Button radio button
-	 */
-	public static Button createRadioButtonInches(Composite parent, String label) {
-		final Button button = createRadioButton(parent, label);
-		return button;
-	}
-	
-	/**
-	 * Create a radio button allowing the user to use millimetres as a unit of measurement.
-	 * 
-	 * @param parent Composite hosting the button
-	 * @param label String butotn label
-	 * @return Button radio button
-	 */
-	public static Button createRadioButtonMillim(Composite parent, String label) {
-		final Button button = createRadioButton(parent, label);
-		return button;
-	}
-	
-	/**
-	 * Create a radio button with specified label.
-	 * 
-	 * @param parent Composite hosting the button
-	 * @param label String butotn label
-	 * @return Button radio button
-	 */
-	public static Button createRadioButton(Composite parent, String label) {
-		final Button button = new Button(parent, SWT.RADIO);
-		GridData groupGridData = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_HORIZONTAL);
-		button.setLayoutData(groupGridData);
-		button.setText(label);
-		
-		return button;
-	}
-	
-	/**
-	 * Create a push button with specified label.
-	 * 
-	 * @param parent Composite hosting the button
-	 * @param label String butotn label
-	 * @return Button radio button
-	 */
-	public static Button createPushButton(Composite parent, String label) {
-		final Button button = new Button(parent, SWT.PUSH | SWT.RIGHT);
-		button.setText(label);
-		return button;
-	}
-	
-	/**
-	 * Create a group with specified label.
-	 * 
-	 * @param parent Composite hosting the group
-	 * @param label String butotn label
-	 * @return Group created group
-	 */
-	public static Group createGroup(Composite parent, String label) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(label);
-		GridLayout layout = new GridLayout(2, true);
-		group.setLayout(layout);
-				
-		GridData groupGridData = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_HORIZONTAL);
-		groupGridData.horizontalSpan = 2;
-		group.setLayoutData(groupGridData);
-		
-		return group;
-	}
-	
-	/**
-	 * Create a group allowing the user to choose page size.
-	 * 
-	 * @param parent Composite hosting the group
-	 * @param label String label for the group
-	 * @return Group created group
-	 */
-	public static Group createGroupPaperSize(Composite parent, String label) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(label);
-		
-		group.setLayout(new GridLayout(5, true));
-		
-		GridData paperSizeGridData = new GridData(GridData.FILL_HORIZONTAL);
-		paperSizeGridData.horizontalSpan = 5;
-		group.setLayoutData(paperSizeGridData);
-	
-		return group;
-	}
-	
-	/**
-	 * Create a group allowing the user to specify margins.
-	 * 
-	 * @param parent Composite hosting the group
-	 * @param label String label for the group
-	 * @return Group created group
-	 */
-	public static Group createGroupMargin(Composite parent, String label) {
-		Group group = new Group(parent, SWT.NULL);
-		group.setText(label);
-		
-		group.setLayout(new GridLayout(5, true));
-		
-		GridData paperSizeGridData = new GridData(GridData.FILL_HORIZONTAL);
-		paperSizeGridData.horizontalSpan = 5;
-		group.setLayoutData(paperSizeGridData);
-		
-		return group;
-	}
-	
-	/**
-	 * Create a label and add it to specified group.
-	 * 
-	 * @param group Group gorup hosting the label
-	 * @param labelText String represents label for label
-	 * @return Label created label
-	 */
-	public static Label createLabel(Group group, String labelText) {
-		Label label = new Label(group, SWT.LEFT);
-		label.setText(labelText);
-        
-        GridData gridData = new GridData(GridData.GRAB_HORIZONTAL);
-        gridData.grabExcessHorizontalSpace = true;
-    
-        label.setLayoutData(gridData);
-		
-		return label;
-	}
-	
-	/**
-	 * Create a filler label to fill space between fields.
-	 * 
-	 * @param group Group group hosting the label
-	 * @return Label created label
-	 */
-	public static Label createLabelFiller(Group group) {
-		Label label = new Label(group, SWT.LEFT);
-		
-		GridData gridData = new GridData(GridData.GRAB_HORIZONTAL);
-        gridData.grabExcessHorizontalSpace = true;
-	
-		label.setLayoutData(gridData);
-		
-		return label;
-	}
-	
-	/**
-	 * Create a combo allowing the user to choose a paper size.
-	 * 
-	 * @param group Group group that will host the combo size
-	 * @return Combo creates combo displaying all supported paper sizes
-	 */
-	public static Combo createComboSize(Group group) {
-		Combo combo = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY);
-		GridData scGridData =
-				new GridData(
-					GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING);
-		scGridData.horizontalSpan = 4;
-		scGridData.grabExcessHorizontalSpace = true;
-		combo.setLayoutData(scGridData);
-		
-		String[] names = { 
-			PageSetupPageType.LETTER.getName(),
-			PageSetupPageType.LEGAL.getName(),
-			PageSetupPageType.EXECUTIVE.getName(),
-			PageSetupPageType.llX17.getName(),
-			PageSetupPageType.A3.getName(),
-			PageSetupPageType.A4.getName(),
-			PageSetupPageType.B4.getName(),
-			PageSetupPageType.B5.getName(),
-			PageSetupPageType.USER_DEFINED.getName(),
-		};
-		
-		combo.setItems(names);
-		
-		return combo;
-	}
-		
-	/**
-	 * Create a text field allowing the user to specify margin value.
-	 * 
-	 * @param group Group group hosting the margin text field
-	 * @return Text created text field
-	 */
-	public static Text createTextMargin(Group group) {
-		int MARGIN_HEIGHT_HINT = 40;
-		
-		Text text = new Text(group, SWT.BORDER);
-		GridData phGridData = new GridData(
-			GridData.FILL_HORIZONTAL
-			| GridData.HORIZONTAL_ALIGN_BEGINNING);
-		phGridData.widthHint = MARGIN_HEIGHT_HINT;
-		text.setLayoutData(phGridData);
-				
-		return text;
-	}
-	
-	/**
-	 * Create a text field allowing the user to specify page height.
-	 * 
-	 * @param group
-	 * @return Text
-	 */
-	public static Text createTextHeight(Group group) {
-		int MARGIN_HEIGHT_HINT = 40;
-		
-		Text text = new Text(group, SWT.BORDER);
-		GridData phGridData = new GridData(
-			GridData.FILL_HORIZONTAL
-			| GridData.HORIZONTAL_ALIGN_BEGINNING);
-		phGridData.widthHint = MARGIN_HEIGHT_HINT;
-		text.setLayoutData(phGridData);
-				
-		return text;
-	}
-	
-	/**
-	 * Create a text field allowing the user to specify page height.
-	 * 
-	 * @param group Group group hosting the text field
-	 * @return Text created text field
-	 */
-	public static Text createTextWidth(Group group) {
-		int MARGIN_WIDTH_HINT = 40;
-		
-		Text text = new Text(group, SWT.BORDER);
-		GridData pwGridData = new GridData(
-			GridData.FILL_HORIZONTAL
-			| GridData.HORIZONTAL_ALIGN_BEGINNING);
-		pwGridData.widthHint = MARGIN_WIDTH_HINT;
-		text.setLayoutData(pwGridData);
-		
-		return text;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DiagramGraphicalViewerKeyHandler.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DiagramGraphicalViewerKeyHandler.java
deleted file mode 100644
index eed6250..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DiagramGraphicalViewerKeyHandler.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2009  IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.parts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-
-/**
- * @author melaasar
- * <p>
- * Code taken from Eclipse reference bugzilla #98820
- *
- */
-public class DiagramGraphicalViewerKeyHandler
-	extends GraphicalViewerKeyHandler {
-
-	/**
-	 * @param viewer
-	 */
-	public DiagramGraphicalViewerKeyHandler(GraphicalViewer viewer) {
-		super(viewer);
-	}
-
-	/**
-	 * @see org.eclipse.gef.KeyHandler#keyPressed(org.eclipse.swt.events.KeyEvent)
-	 */
-	public boolean keyPressed(KeyEvent event) {
-		switch (event.keyCode) {
-			case SWT.HOME :
-				if ((event.stateMask & SWT.ALT) != 0) {
-					if (navigateEndSibling(event, PositionConstants.WEST))
-						return true;
-				} else {
-					if (navigateEndSibling(event, PositionConstants.NORTH))
-						return true;
-				}
-                break;
-			case SWT.END :
-				if ((event.stateMask & SWT.ALT) != 0) {
-					if (navigateEndSibling(event, PositionConstants.EAST))
-						return true;
-				} else {
-					if (navigateEndSibling(event, PositionConstants.SOUTH))
-						return true;
-				}
-                break;
-			case SWT.PAGE_UP :
-				if ((event.stateMask & SWT.ALT) != 0) {
-					if (navigatePageSibling(event, PositionConstants.WEST))
-						return true;
-				} else {
-					if (navigatePageSibling(event, PositionConstants.NORTH))
-						return true;
-				}
-                break;
-			case SWT.PAGE_DOWN :
-				if ((event.stateMask & SWT.ALT) != 0) {
-					if (navigatePageSibling(event, PositionConstants.EAST))
-						return true;
-				} else {
-					if (navigatePageSibling(event, PositionConstants.SOUTH))
-						return true;
-				}
-				break;
-	        case SWT.TAB:
-	            if ((event.stateMask & SWT.SHIFT) != 0) {
-                    if (navigateNextHorizontalSibling(isViewerMirrored() ? PositionConstants.EAST
-                        : PositionConstants.WEST)) {
-                        return true;
-                    }
-                } else {
-                    if (navigateNextHorizontalSibling(isViewerMirrored() ? PositionConstants.WEST
-                        : PositionConstants.EAST)) {
-                        return true;
-                    }
-                }
-                break;
-		}
-		return super.keyPressed(event);
-	}
-
-	/**
-	 * @return
-	 */
-	protected GraphicalEditPart getFocusPart() {
-		return (GraphicalEditPart) getViewer().getFocusEditPart();
-	}
-
-	/**
-	 * @param part
-	 * @param event
-	 */
-	protected void navigateToPart(EditPart part, KeyEvent event) {
-		if (part == null)
-			return;
-		if (!part.isSelectable()) {
-			getViewer().deselectAll();
-			getViewer().setFocus(part);
-		} else if ((event.stateMask & SWT.SHIFT) != 0) {
-			getViewer().appendSelection(part);
-			getViewer().setFocus(part);
-		} else if ((event.stateMask & SWT.CONTROL) != 0)
-			getViewer().setFocus(part);
-		else
-			getViewer().select(part);
-		getViewer().reveal(part);
-	}
-
-	/**
-	 * @return
-	 */
-	protected List getPartNavigationSiblings() {
-        EditPart epParent = findParent(getFocusPart());
-        if (epParent != null)
-            return epParent.getChildren();
-        else
-            return null;
-	}
-
-	/**
-	 * @param figure
-	 * @return
-	 */
-	protected Point getFigureInterestingPoint(IFigure figure) {
-		return figure.getBounds().getCenter();
-	}
-
-	protected Viewport findViewport(GraphicalEditPart part) {
-        if (part == null) 
-            return null;
-        
-		IFigure figure = null;
-		Viewport port = null;
-		do {
-			if (figure == null)
-				figure = part.getContentPane();
-			else
-				figure = figure.getParent();
-			if (figure instanceof Viewport) {
-				port = (Viewport) figure;
-				break;
-			}
-		} while (figure != null);
-		return port;
-	}
-
-	/**
-	 * @param event
-	 * @param direction
-	 * @param page
-	 * @param list
-	 * @return
-	 */
-	protected boolean navigatePageSibling(KeyEvent event, int direction) {
-		GraphicalEditPart epStart = getFocusPart();
-		IFigure figure = epStart.getFigure();
-		Point pStart = getFigureInterestingPoint(figure);
-		figure.translateToAbsolute(pStart);
-
-		GraphicalEditPart epParent = (GraphicalEditPart) findParent(epStart);
-		Viewport viewport = findViewport(epParent);
-		Rectangle bounds =
-			(viewport != null)
-				? new Rectangle(viewport.getBounds())
-				: epParent.getFigure().getClientArea();
-		int pageDistance = 0;
-		switch (direction) {
-			case PositionConstants.NORTH :
-			case PositionConstants.SOUTH :
-				pageDistance = bounds.height;
-				break;
-			case PositionConstants.EAST :
-			case PositionConstants.WEST :
-				pageDistance = bounds.width;
-				break;
-		}
-		
-	    if (epStart instanceof DiagramEditPart) {
-	        Point location = viewport.getViewLocation().getCopy();
-	        switch (direction) {
-	            case PositionConstants.NORTH :
-	                location.translate(0, -pageDistance);
-	                break;              
-	            case PositionConstants.SOUTH :
-	                location.translate(0, pageDistance);
-	                break;
-	            case PositionConstants.EAST :
-	                location.translate(pageDistance, 0);
-	                break;
-	            case PositionConstants.WEST :
-                    location.translate(-pageDistance, 0);
-	                break;
-	        }
-	        viewport.setViewLocation(location);
-        }
-
-		List<GraphicalEditPart> editParts =
-			findPageSibling(
-				getPartNavigationSiblings(),
-				pStart,
-				pageDistance,
-				direction,
-				epStart);
-		if (editParts.isEmpty())
-			return false;
-		if ((event.stateMask & SWT.SHIFT) != 0) {
-			Iterator<GraphicalEditPart> parts = editParts.iterator();
-			while (parts.hasNext())
-				navigateToPart(parts.next(), event);
-		} else {
-			EditPart part = editParts.get(editParts.size() - 1);
-			navigateToPart(part, event);
-		}
-		return true;
-	}
-
-	/**
-	 * @param event
-	 * @param direction
-	 * @param list
-	 * @return
-	 */
-	protected boolean navigateEndSibling(KeyEvent event, int direction) {
-		GraphicalEditPart epStart = getFocusPart();
-		
-		// go to top-left or bottom-right corner if nothing is selected
-		if (epStart instanceof DiagramEditPart) {
-            Viewport viewport = findViewport(epStart);
-            switch (direction) {
-                case PositionConstants.NORTH:
-                case PositionConstants.WEST:
-                    viewport.setViewLocation(viewport.getHorizontalRangeModel()
-                        .getMinimum(), viewport.getVerticalRangeModel()
-                        .getMinimum());
-                    break;
-                case PositionConstants.SOUTH:
-                case PositionConstants.EAST:
-                    viewport.setViewLocation(viewport.getHorizontalRangeModel()
-                        .getMaximum(), viewport.getVerticalRangeModel()
-                        .getMaximum());
-                    break;
-            }
-        }
-		
-		IFigure figure = epStart.getFigure();
-		Point pStart = getFigureInterestingPoint(figure);
-		figure.translateToAbsolute(pStart);
-		List<GraphicalEditPart> editParts =
-			findEndSibling(
-				getPartNavigationSiblings(),
-				pStart,
-				direction,
-				epStart);
-		if (editParts.isEmpty())
-			return false;
-		if ((event.stateMask & SWT.SHIFT) != 0) {
-			Iterator<GraphicalEditPart> parts = editParts.iterator();
-			while (parts.hasNext())
-				navigateToPart(parts.next(), event);
-		} else {
-			EditPart part = editParts.get(editParts.size() - 1);
-			navigateToPart(part, event);
-		}
-		return true;
-	}
-
-	/**
-	 * @param siblings
-	 * @param pStart
-	 * @param minDistance
-	 * @param direction
-	 * @param exclude
-	 * @return
-	 */
-	private List<GraphicalEditPart> findPageSibling(
-		List siblings,
-		Point pStart,
-		int pageDistance,
-		int direction,
-		EditPart exclude) {
-	    
-		GraphicalEditPart epCurrent;
-		GraphicalEditPart epFinal = null;
-		GraphicalEditPart epFurthest = null;  // in case there is not a full pageDistance left to scroll
-		List<GraphicalEditPart> selection = new ArrayList<GraphicalEditPart>();
-		IFigure figure;
-		Point pCurrent;
-		int distance = Integer.MAX_VALUE;
-		int furthestDistance = 0;
-
-		Iterator iter = siblings.iterator();
-		while (iter.hasNext()) {
-			epCurrent = (GraphicalEditPart) iter.next();
-			if (epCurrent == exclude
-				|| !epCurrent.getFigure().isVisible()
-				|| epCurrent.getFigure().getBounds().isEmpty())
-				continue;
-			figure = epCurrent.getFigure();
-			pCurrent = getFigureInterestingPoint(figure);
-			figure.translateToAbsolute(pCurrent);
-			if (!isInDirection(direction, pStart, pCurrent))
-				continue;
-
-			int d = pCurrent.getDistanceOrthogonal(pStart);
-			if (d >= pageDistance) {
-				selection.add(epCurrent);
-				if (d < distance) {
-					distance = d;
-					epFinal = epCurrent;
-				}
-			}
-			if (d > furthestDistance) {
-			    epFurthest = epCurrent;
-			}
-			if (epFinal != null) {
-				selection.remove(epFinal);
-				selection.add(epFinal);
-			}
-		}
-		if (selection.isEmpty() && epFurthest != null) {
-		    return Collections.singletonList(epFurthest);
-		}
-		return selection;
-	}
-
-	/**
-	 * @param siblings
-	 * @param pStart
-	 * @param direction
-	 * @param exclude
-	 * @return
-	 */
-	private List<GraphicalEditPart> findEndSibling(
-		List siblings,
-		Point pStart,
-		int direction,
-		EditPart exclude) {
-		GraphicalEditPart epCurrent;
-		GraphicalEditPart epFinal = null;
-		List<GraphicalEditPart> selection = new ArrayList<GraphicalEditPart>();
-		IFigure figure;
-		Point pCurrent;
-		int distance = 0;
-
-		Iterator iter = siblings.iterator();
-		while (iter.hasNext()) {
-			epCurrent = (GraphicalEditPart) iter.next();
-			if (epCurrent == exclude
-				|| !epCurrent.getFigure().isVisible()
-				|| epCurrent.getFigure().getBounds().isEmpty())
-				continue;
-			figure = epCurrent.getFigure();
-			pCurrent = getFigureInterestingPoint(figure);
-			figure.translateToAbsolute(pCurrent);
-			if (!isInDirection(direction, pStart, pCurrent))
-				continue;
-
-			selection.add(epCurrent);
-			int d = pCurrent.getDistanceOrthogonal(pStart);
-			if (d > distance) {
-				distance = d;
-				epFinal = epCurrent;
-			}
-		}
-		if (epFinal != null) {
-			selection.remove(epFinal);
-			selection.add(epFinal);
-		}
-		return selection;
-	}
-    
-    
-    /**
-     * @param child
-     * @return EditPart
-     */
-    private EditPart findParent(EditPart child) {
-        //check to see if we are not looking for a parent on RootEditPart, 
-        //as it does not have a parent.
-        if (child instanceof RootEditPart)
-            return child;
-        else
-            return child.getParent(); //any other EditPart    
-    }
-
-    /**
-     * Traverses to the closest EditPart in the given list that is also in the
-     * given direction (EAST or WEST). The x-location alone is used to determine
-     * the closest sibling. If the direction is EAST and there are no EditParts
-     * to the EAST then the farthest WEST EditPart is returned (and vice versa).
-     * This allows the user to cycle through all the EditParts using the TAB
-     * key.
-     * 
-     * @param direction
-     *            the direction in which to navigate (either
-     *            PositionConstants.WEST or PositionConstants.EAST)
-     * @return true if a sibling was found to navigate to; false otherwise.
-     */
-    private boolean navigateNextHorizontalSibling(int direction) {
-        GraphicalEditPart epStart = getFocusEditPart();
-        EditPart next = null;
-        if (epStart instanceof DiagramEditPart) {
-            next = findClosestHorizontalSibling(epStart.getChildren(),
-                new Point(0, 0), PositionConstants.EAST, null);
-        } else {
-            IFigure figure = epStart.getFigure();
-            Point pStart = figure.getBounds().getCenter();
-            figure.translateToAbsolute(pStart);
-            next = findClosestHorizontalSibling(getNavigationSiblings(),
-                pStart, direction, epStart);
-        }
-        if (next == null)
-            return false;
-
-        getViewer().select(next);
-        getViewer().reveal(next);
-        return true;
-    }
-
-	/**
-	 * Given an absolute point (pStart) and a list of EditParts, this method
-	 * finds the closest EditPart (except for the one to be excluded) in the
-	 * given direction (EAST or WEST). The x-location is used to determine the
-	 * closest sibling. Also, if going EAST and there is vertically aligned
-	 * figure underneath pStart, then that figure is the result. If going WEST
-	 * and there is a figure above pStartm then that figure is the result.If the
-	 * direction is EAST and there are no EditParts to the EAST and SOUTH then
-	 * the farthest WEST EditPart is returned (and vice versa). This allows the
-	 * user to cycle through all the EditParts using the TAB key.
-	 * 
-	 * @param siblings
-	 *            List of sibling EditParts
-	 * @param pStart
-	 *            The starting point (must be in absolute coordinates) from
-	 *            which the next sibling is to be found.
-	 * @param direction
-	 *            PositionConstants.EAST or PositionConstants.WEST
-	 * @param exclude
-	 *            The EditPart to be excluded from the search
-	 */
-    private GraphicalEditPart findClosestHorizontalSibling(List siblings,
-            Point pStart, int direction, EditPart exclude) {
-        GraphicalEditPart epCurrent;
-        GraphicalEditPart epFinal = null;
-        GraphicalEditPart epCycle = null; // in case there are no more shapes in this direction
-        GraphicalEditPart epCycleVertical = null; // in case there are no more shapes in EAST or WEST direction
-        
-        IFigure figure;
-        Point pCurrent;
-        int distanceX = Integer.MAX_VALUE;
-        int distanceY = Integer.MAX_VALUE;
-        int finalY = 0;
-        boolean goVertical = false;
-        int xCycle = direction == PositionConstants.EAST ? Integer.MAX_VALUE : 0;
-        int yCycle = xCycle;
-        int yCycleVertical = xCycle;
-
-        Iterator iter = siblings.iterator();
-        while (iter.hasNext()) {
-            epCurrent = (GraphicalEditPart) iter.next();
-            if (epCurrent == exclude || !epCurrent.isSelectable())
-                continue;
-            figure = epCurrent.getFigure();
-            pCurrent = figure.getBounds().getCenter();
-            figure.translateToAbsolute(pCurrent);
-
-            int dx = pCurrent.x - pStart.x;
-
-            if (!goVertical && 
-            		((direction == PositionConstants.EAST && dx > 0)
-            				|| (direction == PositionConstants.WEST && dx < 0))) {
-                int abs_dx = Math.abs(dx);
-                if (abs_dx < distanceX) {
-                    distanceX = abs_dx;
-                    finalY = pCurrent.y;
-                    epFinal = epCurrent;
-                } else if (abs_dx == distanceX) {
-                	// There are vertically aligned figures that could be horizontally closest to the current figure.
-                	// If we go east, choose the top one, if we go west, choose the bottom one.
-                	// finalY is always assigned in this case
-                	if ((direction == PositionConstants.EAST && pCurrent.y < finalY) || 
-                			(direction == PositionConstants.WEST && pCurrent.y > finalY))	{
-                        finalY = pCurrent.y;
-                        epFinal = epCurrent;
-                	}
-                }
-            }
-            if (dx == 0) {
-            	// Once we find a figure that is vertically aligned with the current, we have to go vertically
-            	// (to this or closest figure vertically aligned) since there will be no other chance to traverse it.
-            	// The exception: we reached the far east end while going east, or far west end while going west.            	
-            	int dy = pCurrent.y - pStart.y;
-                if ((direction == PositionConstants.EAST && dy > 0)
-                        || (direction == PositionConstants.WEST && dy < 0)) {
-                	goVertical = true;
-                	int abs_dy = Math.abs(dy);                	
-                    if (abs_dy < distanceY) {
-                    	distanceY = abs_dy;
-                    	epFinal = epCurrent;
-                    }                    
-            	}
-            }
-        	// Consider the case when we need to go east (south) or west (north) and the current figure is on the 
-        	// far east (south) or west (north) end, respectively.
-            if (epFinal == null) {
-            	if (dx == 0) {
-            		// Case when the figure is at the end and there is one or more vertically aligned figure.
-            		// This will be the result only if there are no figures to the left or right.
-                    if (direction == PositionConstants.EAST && pCurrent.y < yCycleVertical) {
-                    	yCycleVertical = pCurrent.y;
-                        epCycleVertical = epCurrent;
-                    } else if (direction == PositionConstants.WEST && pCurrent.y > yCycleVertical) {
-                    	yCycleVertical = pCurrent.y;
-                        epCycleVertical = epCurrent;
-                    }            		
-            	} else {
-            		boolean assign = false;
-	                if (direction == PositionConstants.EAST) {
-	                	if (pCurrent.x < xCycle) {
-	                		assign = true;
-	                	} else if (pCurrent.x == xCycle) {
-	                		// Current figure is vertically aligned with the possible result figure.
-	                		// Choose the top figure.
-	                		if (pCurrent.y < yCycle) {
-	                			assign = true;
-	                		}
-	                	}
-	                } else if (direction == PositionConstants.WEST) {
-	                	if (pCurrent.x > xCycle) {	                
-	                		assign = true;
-	                	} else if (pCurrent.x == xCycle) {
-	                		// Current figure is vertically aligned with the possible result figure.
-	                		// Choose the top figure.
-	                		if (pCurrent.y > yCycle) {
-	                			assign = true;
-	                		}
-	                	}
-	                }
-	                if (assign) {
-                		xCycle = pCurrent.x;
-                		yCycle = pCurrent.y;
-                		epCycle = epCurrent;
-	                }
-            	}
-            }
-        }
-        if (epFinal == null) {
-        	if (epCycle == null) {
-        		return epCycleVertical;
-        	} else {
-        		return epCycle;
-        	}
-        }
-        return epFinal;
-    }
-
-    /**
-     * Returns true if the point in question is in the given direction from the
-     * starting point.
-     * 
-     * @param direction
-     *            the direction
-     * @param start
-     *            the starting point
-     * @param point
-     *            the point in question
-     * @return true if the point in question is in the given direction from the
-     *         starting point; false otherwise
-     */
-    private boolean isInDirection(int direction, Point start, Point point) {
-        switch (direction) {
-            case PositionConstants.WEST:
-                return start.x > point.x;
-            case PositionConstants.EAST:
-                return start.x < point.x;
-            case PositionConstants.NORTH:
-                return start.y > point.y;
-            case PositionConstants.SOUTH:
-                return start.y < point.y;
-        }
-        return false;
-    }
-    
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DirectEditKeyHandler.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DirectEditKeyHandler.java
deleted file mode 100644
index 703d172..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/DirectEditKeyHandler.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 
- *    Dmitry Stadnik (Borland) - contribution for bugzilla 136582
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.internal.parts;
-
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-
-public class DirectEditKeyHandler extends KeyHandler {
-
-	private GraphicalViewer viewer;
-
-	/**
-     * Constructor 
-     * 
-	 * @param viewer the <code>GraphicalViewer</code> that is the receiving viewer of the direct edit
-     * request.
-	 */
-	public DirectEditKeyHandler(GraphicalViewer viewer) {
-		this.viewer = viewer;
-	}
-
-	/**
-	 * @return the <code>GraphicalViewer</code> that is the receiving viewer of the direct edit
-     * request.
-	 */
-	protected GraphicalViewer getViewer() {
-		return viewer;
-	}
-
-	/**
-	 * @return the <code>GraphicalEditPart</code> that is the currently in focus inside
-     * the <code>GraphicalViewer</code>
-	 */
-	protected GraphicalEditPart getFocusPart() {
-		return (GraphicalEditPart) getViewer().getFocusEditPart();
-	}
-
-	/**
-	 * Tests to see if the key pressed was an letter or number
-	 * @param event KeyEvent to be tested
-	 * @return true if the key pressed is Alpha Numeric, otherwise false.
-	 */
-	protected boolean isAlphaNum(KeyEvent event) {
-
-		final String allowedStartingCharacters = "`~!@#$%^&*()-_=+{}[]|;:',.<>?\""; //$NON-NLS-1$
-
-		// IF the character is a letter or number or is contained
-		// in the list of allowed starting characters ...
-		if (Character.isLetterOrDigit(event.character)
-			|| !(allowedStartingCharacters.indexOf(event.character) == -1)) {
-
-			// And the character hasn't been modified or is only modified
-			// with SHIFT
-			if (event.stateMask == 0 || event.stateMask == SWT.SHIFT)
-				return true;
-		}
-
-		return false;
-	}
-
-	/* 
-     * (non-Javadoc)
-	 * @see org.eclipse.gef.KeyHandler#keyPressed(org.eclipse.swt.events.KeyEvent)
-	 */
-	public boolean keyPressed(KeyEvent event) {
-		if (isAlphaNum(event)) {
-			// Create a Direct Edit Request and cache the character typed
-			Request request = new Request(RequestConstants.REQ_DIRECT_EDIT);
-			request.getExtendedData().put(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR, Character.valueOf(event.character));
-			// Send the request to the current edit part in focus
-			getFocusPart().performRequest(request);
-			return true;
-		}
-		return super.keyPressed(event);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ElementToEditPartsMap.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ElementToEditPartsMap.java
deleted file mode 100644
index 1bf60dd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ElementToEditPartsMap.java
+++ /dev/null
@@ -1,102 +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.internal.parts;
-
-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.gef.EditPart;
-
-/**
- * This class encapsulates the functionality required for entering
- * and retrieving from the 'element to editparts' map required by our
- * viewers.
- * 
- * @author chmahone
- */
-public class ElementToEditPartsMap {
-
-	/**
-	 * A registry of editparts, mapping an element's id string
-	 * to a list of <code>EditParts</code>.  
-	 */
-	private Map map = new HashMap();
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#findEditPartsForElement(java.lang.String, java.lang.Class)
-	 */
-	public List findEditPartsForElement(
-		String elementIdStr,
-		Class editPartClass) {
-
-		List allEPs = (List)map.get(elementIdStr);
-		if (allEPs == null) {
-			return Collections.EMPTY_LIST;
-		}
-		List specificEPs = new ArrayList();
-		for (Iterator iter = allEPs.iterator(); iter.hasNext();) {
-			Object ep = iter.next();
-			if (editPartClass.isInstance(ep)) {
-				specificEPs.add(ep);
-			}
-		}
-		return specificEPs;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#registerEditPartForElement(java.lang.String, org.eclipse.gef.EditPart)
-	 */
-	public void registerEditPartForElement(
-		String elementIdStr,
-		EditPart ep) {
-
-		if (elementIdStr == null || ep == null) {
-			return;
-		}
-
-		List epList = (List)map.get(elementIdStr);
-		if (epList != null) {
-			if (!epList.contains(ep)) {
-				epList.add(ep);
-			}
-		} else {
-			ArrayList newList = new ArrayList(1);
-			newList.add(ep);
-			map.put(elementIdStr, newList);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#unregisterEditPartForElement(java.lang.String, org.eclipse.gef.EditPart)
-	 */
-	public void unregisterEditPartForElement(
-		String elementIdStr,
-		EditPart ep) {
-
-		if (elementIdStr == null || ep == null) {
-			return;
-		}
-
-		List epList = (List)map.get(elementIdStr);
-		if (epList != null && epList.contains(ep)) {
-			epList.remove(ep);
-			if (epList.isEmpty()) {
-				map.remove(elementIdStr);
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ImageFileDropTargetListener.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ImageFileDropTargetListener.java
deleted file mode 100644
index bc267de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/ImageFileDropTargetListener.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.parts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.FileTransfer;
-
-/**
- * Drop target listener to support dropping of image files onto the diagram
- * surface.
- *
- * @author sshaw
- */
-public class ImageFileDropTargetListener
-    extends DiagramDropTargetListener {
-
-    /**
-     * @param viewer
-     * @param xfer
-     */
-    public ImageFileDropTargetListener(EditPartViewer viewer) {
-        super(viewer, FileTransfer.getInstance());
-    }
-
-    /**
-     * This implementation includes in the list only elements that are instances
-     * of IElement.
-     *
-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener#getElementsBeingDropped()
-     */
-    protected List getObjectsBeingDropped() {
-        List<String> filesList = new ArrayList<String>();
-        if (getCurrentEvent().data instanceof String[]) {
-            insertFileNamesFromStringArray(filesList,
-                    (String[]) getCurrentEvent().data);
-        } else if (getCurrentEvent().data instanceof IStructuredSelection) {
-			Object[] array = ((IStructuredSelection)getCurrentEvent().data).toArray();
-			for (int j = 0; j < array.length; j++) {
-				if (array[j] instanceof IFile) {
-					IFile dropFile = (IFile)array[j];
-					filesList.add(dropFile.getLocation().toOSString());
-				}
-			}
-        	
-        } else {
-        	/*
-        	 * No needs to check if transfered data we're looking at is FileTransfer type data.
-        	 * This drop target listener is invoked as <code>DelegatingDropAdapter</code>, hence
-        	 * if we get here the transfer is supported for the DropTargetEvent#currentDataType 
-        	 */
-            try {
-                Object files = FileTransfer.getInstance().nativeToJava(
-                        getCurrentEvent().currentDataType);
-                if (files instanceof String[]) {
-                    insertFileNamesFromStringArray(filesList, (String[]) files);
-                }
-            } catch (SWTException e) {
-                return null;
-            }
-        }
-
-        if (filesList.size() > 0) {
-            return filesList;
-        }
-
-        return null;
-    }
-        
-    private void insertFileNamesFromStringArray(List<String> filesList, String[] fileNames) {
-        for (int i = 0; i < fileNames.length; i++) {
-            filesList.add(fileNames[i]);
-        }
-    }
-    
-    /**
-     * This implementation assumes that elements being dropped are instances of
-     * IElement.
-     *
-     */
-    public boolean isEnabled(DropTargetEvent event) {
-        if (super.isEnabled(event)) {
-            Object modelObj = getViewer().getContents().getModel();
-            
-            if (modelObj instanceof EObject) {
-                return true;
-            } else if (modelObj instanceof IAdaptable) {
-                final EObject target = (EObject) ((IAdaptable) modelObj)
-                    .getAdapter(EObject.class);
-
-                // additional check
-                if (target == null) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/MinimalActionBarContributor.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/MinimalActionBarContributor.java
deleted file mode 100644
index 4c47e5b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/MinimalActionBarContributor.java
+++ /dev/null
@@ -1,43 +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.internal.parts;
-
-import org.eclipse.gef.ui.actions.ActionBarContributor;
-
-
-/**
- * Minimal action bar contributor that does not use the Contribution
- * Item Service.
- * 
- * @author wdiu, Wayne Diu
- */
-public class MinimalActionBarContributor extends ActionBarContributor{
-
-	/**
-	 * Do nothing.
-	 * 
-	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions()
-	 */
-	protected void buildActions() {
-		//do nothing
-	}
-
-	/**
-	 * Do nothing.
-	 * 
-	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#declareGlobalActionKeys()
-	 */
-	protected void declareGlobalActionKeys() {
-		//do nothing
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDragSourceListener.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDragSourceListener.java
deleted file mode 100644
index 5ed09ef..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDragSourceListener.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.diagram.ui.internal.parts;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-
-/**
- * Allows a single palette entry with a creation tool to be dragged from an
- * EditPartViewer. The palette entry must be a
- * {@link org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry}
- * that uses a {@link org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool}.
- * 
- * @see org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDropTargetListener
- * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette
- * 
- * @author cmahoney
- */
-public class PaletteToolTransferDragSourceListener
-	extends TemplateTransferDragSourceListener {
-
-	/**
-	 * Constructs a listener on the specified viewer.
-	 * 
-	 * @param viewer
-	 */
-	public PaletteToolTransferDragSourceListener(EditPartViewer viewer) {
-		super(viewer);
-	}
-
-	protected Object getTemplate() {
-		Object template = super.getTemplate();
-		if (template instanceof PaletteToolEntry) {
-			Tool tool = ((PaletteToolEntry) template).createTool();
-			if (tool instanceof CreationTool) {
-				return template;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDropTargetListener.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDropTargetListener.java
deleted file mode 100644
index 8dc2458..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/PaletteToolTransferDropTargetListener.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.parts;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.dnd.TemplateTransfer;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-
-/**
- * Performs a native Drop using the {@link TemplateTransfer} where the template
- * is a
- * {@link org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry}
- * that uses a {@link org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool}.
- * The request from the creation tool is used to get a command to create the new
- * shape. The creation tool is also used to select the new added shape.
- * 
- * @see org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener
- * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorWithFlyOutPalette
- * 
- * @author cmahoney
- */
-public class PaletteToolTransferDropTargetListener
-	extends org.eclipse.gef.dnd.TemplateTransferDropTargetListener {
-
-	/**
-	 * Constructs a listener on the specified viewer.
-	 * 
-	 * @param viewer
-	 *            the EditPartViewer
-	 */
-	public PaletteToolTransferDropTargetListener(EditPartViewer viewer) {
-		super(viewer);
-	}
-
-	/**
-	 * If the template is a palette entry with a creation tool, then the request
-	 * from the creation tool is used.
-	 */
-	protected Request createTargetRequest() {
-
-		CreationTool tool = getCreationTool();
-
-		if (tool != null) {
-
-			tool.setViewer(getViewer());
-			tool.setEditDomain(getViewer().getEditDomain());
-
-			return tool.createCreateRequest();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the creation tool from the template if it is a palette entry.
-	 * 
-	 * @return The creation tool or null if not applicable.
-	 */
-	private CreationTool getCreationTool() {
-		Object template = TemplateTransfer.getInstance().getTemplate();
-		if (template instanceof PaletteToolEntry) {
-			Tool tool = ((PaletteToolEntry) template).createTool();
-			if (tool instanceof CreationTool) {
-				return (CreationTool) tool;
-			}
-		}
-		return null;
-	}
-
-	protected void handleDrop() {
-
-		super.handleDrop();
-
-		if (getTargetRequest() instanceof CreateRequest) {
-			Object newObject = getCreateRequest().getNewObject();
-
-			Collection newObjectCollection = (newObject instanceof Collection ? (Collection) newObject
-				: Collections.singletonList(newObject));
-			getCreationTool().selectNewShapes(getViewer(),
-				newObjectCollection);
-
-		}
-	}
-
-	/**
-	 * This template transfer uses the creation tool in the template instead of
-	 * a creation factory.
-	 */
-	protected CreationFactory getFactory(Object template) {
-		throw new UnsupportedOperationException("Factory method not used."); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/parts/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/Properties.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/Properties.java
deleted file mode 100644
index dad58e1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/Properties.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.properties;
-
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * constants for the Diagtam ui
- * @author sshae
- *
- */
-public interface Properties {
-	/**
-	 * the persisted edges Structural featrue Id
-	 */
-	public static String ID_PERSISTED_EDGES = PackageUtil.getID(NotationPackage.eINSTANCE.getDiagram_PersistedEdges());
-	/**
-	 * the transient edges Structural featrue Id
-	 */
-	public static String ID_TRANSIENT_EDGES = PackageUtil.getID(NotationPackage.eINSTANCE.getDiagram_TransientEdges());
-
-	/**
-	 * the  visible property ID
-	 */
-	public static String ID_ISVISIBLE = PackageUtil.getID(NotationPackage.eINSTANCE.getView_Visible());
-	
-	/**
-	 * the  persisted children property ID
-	 */
-	public static String ID_PERSISTED_CHILDREN = PackageUtil.getID(NotationPackage.eINSTANCE.getView_PersistedChildren());
-	
-	/**
-	 * the  transient children property ID
-	 */
-	public static String ID_TRANSIENT_CHILDREN = PackageUtil.getID(NotationPackage.eINSTANCE.getView_TransientChildren());
-	
-	/**
-	 * the  source connections  property ID
-	 */
-	public static String ID_SOURCECONNECTIONS = PackageUtil.getID(NotationPackage.eINSTANCE.getView_SourceEdges());
-	
-	/**
-	 * the  target  connections  property ID
-	 */
-	public static String ID_TARGETCONNECTIONS = PackageUtil.getID(NotationPackage.eINSTANCE.getView_TargetEdges());
-
-	/**
-	 * the  bend point property ID
-	 */
-	public static String ID_BENDPOINT = PackageUtil.getID(NotationPackage.eINSTANCE.getRelativeBendpoints_Points());
-
-	/**
-	 * the  semantic hint  property ID
-	 */
-	public static String ID_SEMANTICREF = PackageUtil.getID(NotationPackage.eINSTANCE.getView_Element());
-
-	/**
-	 * the  font name   property ID
-	 */
-	public static String ID_FONTNAME = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_FontName());
-	/**
-	 * the  font size   property ID
-	 */
-	public static String ID_FONTSIZE = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_FontHeight());
-	/**
-	 * the  font bold   property ID
-	 */
-	public static String ID_FONTBOLD = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_Bold());
-	/**
-	 * the  font Italic  property ID
-	 */
-	public static String ID_FONTITALIC = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_Italic());
-	/**
-	 * the  font under line  property ID
-	 */
-	public static String ID_FONTUNDERLINE = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_Underline());
-	/**
-	 * the  font strike through  property ID
-	 */
-	public static String ID_FONTSTRIKETHROUGH = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough());
-	/**
-	 * the  font color   property ID
-	 */
-	public static String ID_FONTCOLOR = PackageUtil.getID(NotationPackage.eINSTANCE.getFontStyle_FontColor());
-	/**
-	 * the  line color property ID
-	 */
-	public static String ID_LINECOLOR = PackageUtil.getID(NotationPackage.eINSTANCE.getLineStyle_LineColor());
-	/**
-	 * the  fill color property ID
-	 */
-	public static String ID_FILLCOLOR = PackageUtil.getID(NotationPackage.eINSTANCE.getFillStyle_FillColor());
-	/**
-	 * the  gradient property ID
-	 */
-	public static String ID_FILLGRADIENT = PackageUtil.getID(NotationPackage.eINSTANCE.getFillStyle_Gradient());	
-	/**
-	 * the  gradient property ID
-	 */
-	public static String ID_FILLTRANSPARENCY = PackageUtil.getID(NotationPackage.eINSTANCE.getFillStyle_Transparency());			
-	/**
-	 * the  show compartment title  property ID
-	 */
-	public static String ID_SHOWCOMPARTMENTTITLE = PackageUtil.getID(NotationPackage.eINSTANCE.getTitleStyle_ShowTitle());
-	/**
-	 * the  collapsed property ID
-	 */
-	public static String ID_COLLAPSED = PackageUtil.getID(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed());
-	/**
-	 * the  routing  property ID
-	 */
-	public static String ID_ROUTING = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_Routing());
-	/**
-	 * the  smoothness   property ID
-	 */
-	public static String ID_SMOOTHNESS = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_Smoothness());
-	/**
-	 * the  avoid obstructions  property ID
-	 */
-	public static String ID_AVOIDOBSTRUCTIONS = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions());
-	/**
-	 * the  closest distance   property ID
-	 */
-	public static String ID_CLOSESTDISTANCE = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance());
-	/**
-	 *the rounded bendpoints property ID 
-	 */
-	public static String ID_ROUNDED_BENDPOINTS_RADIUS = PackageUtil.getID(NotationPackage.eINSTANCE.getRoundedCornersStyle_RoundedBendpointsRadius());
-	/**
-	 * the  jump links status property ID
-	 */
-	public static String ID_JUMPLINKS_STATUS = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus());
-	/**
-	 * the  jump links type property ID
-	 */
-	public static String ID_JUMPLINKS_TYPE = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType());
-	/**
-	 * the  jump links reverse property ID
-	 */
-	public static String ID_JUMPLINKS_REVERSE = PackageUtil.getID(NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse());
-	/**
-	 * the  description   property ID
-	 */
-	public static String ID_DESCRIPTION = PackageUtil.getID(NotationPackage.eINSTANCE.getDescriptionStyle_Description());
-	/**
-	 * the is canonical   property ID
-	 */
-	public static String ID_ISCANONICAL = PackageUtil.getID(NotationPackage.eINSTANCE.getCanonicalStyle_Canonical());
-	/**
-	 * the  sorting  property ID
-	 */
-	public static String ID_SORTING = PackageUtil.getID(NotationPackage.eINSTANCE.getSortingStyle_Sorting());
-	/**
-	 * the  sorting keys   property ID
-	 */
-	public static String ID_SORTING_KEYS = PackageUtil.getID(NotationPackage.eINSTANCE.getSortingStyle_SortingKeys());
-	/**
-	 * the  sorted objects property ID
-	 */
-	public static String ID_SORTED_OBJECTS = PackageUtil.getID(NotationPackage.eINSTANCE.getSortingStyle_SortedObjects());
-	/**
-	 * the  filtering  property ID
-	 */
-	public static String ID_FILTERING = PackageUtil.getID(NotationPackage.eINSTANCE.getFilteringStyle_Filtering());
-	/**
-	 * the  filtering keys   property ID
-	 */
-	public static String ID_FILTERING_KEYS = PackageUtil.getID(NotationPackage.eINSTANCE.getFilteringStyle_FilteringKeys());
-	/**
-	 * the  filtered objects   property ID
-	 */
-	public static String ID_FILTERED_OBJECTS = PackageUtil.getID(NotationPackage.eINSTANCE.getFilteringStyle_FilteredObjects());
-
-	/**
-	 * the  page x   property ID
-	 */
-	public static String ID_PAGEX = PackageUtil.getID(NotationPackage.eINSTANCE.getPageStyle_PageX());
-	/**
-	 * the  page y  property ID
-	 */
-	public static String ID_PAGEY = PackageUtil.getID(NotationPackage.eINSTANCE.getPageStyle_PageY());
-	/**
-	 * the  page width   property ID
-	 */
-	public static String ID_PAGE_WIDTH = PackageUtil.getID(NotationPackage.eINSTANCE.getPageStyle_PageWidth());
-	/**
-	 * the  page height   property ID
-	 */
-	public static String ID_PAGE_HEIGHT = PackageUtil.getID(NotationPackage.eINSTANCE.getPageStyle_PageHeight());
-	
-	/**
-	 * the  extent x   property ID
-	 */
-	public static String ID_EXTENTX = PackageUtil.getID(NotationPackage.eINSTANCE.getSize_Width());
-	/**
-	 * the  extent y   property ID
-	 */
-	public static String ID_EXTENTY = PackageUtil.getID(NotationPackage.eINSTANCE.getSize_Height());
-	/**
-	 * the  position x   property ID
-	 */
-	public static String ID_POSITIONX = PackageUtil.getID(NotationPackage.eINSTANCE.getLocation_X());
-	/**
-	 * the  position y   property ID
-	 */
-	public static String ID_POSITIONY = PackageUtil.getID(NotationPackage.eINSTANCE.getLocation_Y());
-	/**
-	 * the  ratio   property ID
-	 */
-	public static String ID_RATIO = PackageUtil.getID(NotationPackage.eINSTANCE.getRatio_Value());
-
-	/**
-	 * the diagram link annotation source
-	 */
-	public static String DIAGRAMLINK_ANNOTATION = "DiagramLink"; //$NON-NLS-1$
-	
-	/**
-	 * the text alignment property id
-	 */
-	public static String ID_TEXT_ALIGNMENT = PackageUtil.getID(NotationPackage.eINSTANCE.getTextStyle_TextAlignment());
-	
-	/**
-	 * the line width property id
-	 */
-	public static String ID_LINE_WIDTH = PackageUtil.getID(NotationPackage.eINSTANCE.getLineStyle_LineWidth());
-	
-	/**
-	 * the line type property id
-	 */
-	public static String ID_LINE_TYPE = PackageUtil.getID(NotationPackage.eINSTANCE.getLineTypeStyle_LineType());
-	
-	/**
-	 * the arrow source decoration property id
-	 */
-	public static String ID_ARROW_SOURCE = PackageUtil.getID(NotationPackage.eINSTANCE.getArrowStyle_ArrowSource());
-	
-	/**
-	 * the arrow target decoration property id
-	 */
-	public static String ID_ARROW_TARGET = PackageUtil.getID(NotationPackage.eINSTANCE.getArrowStyle_ArrowTarget());
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/WorkspaceViewerProperties.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/WorkspaceViewerProperties.java
deleted file mode 100644
index 241237c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/WorkspaceViewerProperties.java
+++ /dev/null
@@ -1,74 +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.internal.properties;
-
-/**
- * Contains the property identifiers for the workspace preferences.
- * 
- * @author jcorchis
- */
-public interface WorkspaceViewerProperties {
-
-	/**
-	 * Viewer property identifiers.  This values are used to access the
-	 * workspace viewer preference store.  Do not localize these strings.
-	 */
-	public final String VIEWPORTX = "viewport.x";//$NON-NLS-1$
-	public final String VIEWPORTY = "viewport.y";//$NON-NLS-1$
-	
-	public final String ZOOM = "zoom";//$NON-NLS-1$
-	
-	public final String VIEWPAGEBREAKS ="viewpagebreaks";//$NON-NLS-1$
-	
-	public final String PAGEBREAK_X ="pagebreak.x";//$NON-NLS-1$	
-	public final String PAGEBREAK_Y ="pagebreak.y";//$NON-NLS-1$
-	
-	// Ruler and grid properties
-	public final String VIEWGRID = "rulergrid.viewgrid"; //$NON-NLS-1$
-	public final String GRIDLINESTYLE = "rulergrid.gridlinestyle"; //$NON-NLS-1$
-	public final String GRIDLINECOLOR = "rulergrid.gridlinecolor"; //$NON-NLS-1$
-	public final String SNAPTOGEOMETRY = "rulergrid.snaptogeometry"; //$NON-NLS-1$
-	public final String SNAPTOGRID = "rulergrid.snaptogrid"; //$NON-NLS-1$
-	public final String GRIDORDER = "rulergrid.gridlevel"; //$NON-NLS-1$
-	public final String GRIDSPACING = "rulergrid.gridspacing"; //$NON-NLS-1$
-
-	public final String RULERUNIT = "rulergrid.rulerunit"; //$NON-NLS-1$
-	public final String VIEWRULERS = "rulergrid.viewrulers"; //$NON-NLS-1$
-	
-	// PRINTING PREFERENCES
-	public static String PREF_USE_WORKSPACE_SETTINGS = "print.useWorkspaceSettings"; //$NON-NLS-1$
-	public static String PREF_USE_DIAGRAM_SETTINGS = "print.useDiagramSettings"; //$NON-NLS-1$
-	
-	public static String PREF_USE_INCHES = "print.useInches"; //$NON-NLS-1$
-	public static String PREF_USE_MILLIM = "print.useMillim"; //$NON-NLS-1$
-	
-	public static String PREF_USE_PORTRAIT = "print.usePortrait"; //$NON-NLS-1$
-	public static String PREF_USE_LANDSCAPE = "print.useLandscape"; //$NON-NLS-1$
-	
-	public static String PREF_PAGE_SIZE = "print.page.size"; //$NON-NLS-1$
-	public static String PREF_PAGE_HEIGHT = "print.page.height"; //$NON-NLS-1$
-	public static String PREF_PAGE_WIDTH = "print.page.width"; //$NON-NLS-1$
-	
-	public static String PREF_MARGIN_TOP = "print.margin.top"; //$NON-NLS-1$
-	public static String PREF_MARGIN_BOTTOM = "print.margin.bottom"; //$NON-NLS-1$
-	public static String PREF_MARGIN_LEFT = "print.margin.left"; //$NON-NLS-1$
-	public static String PREF_MARGIN_RIGHT = "print.margin.right"; //$NON-NLS-1$
-	// END PRINTING PREFERENCES
-	
-	public static final String HEADER_PREFIX = "header"; //$NON-NLS-1$
-	public static final String FOOTER_PREFIX = "footer"; //$NON-NLS-1$
-	public static final String PRINT_TEXT_SUFFIX = "PrintText"; //$NON-NLS-1$
-	public static final String PRINT_TITLE_SUFFIX = "PrintTitle"; //$NON-NLS-1$
-	public static final String PRINT_DATE_SUFFIX = "PrintDate"; //$NON-NLS-1$
-	public static final String PRINT_PAGE_SUFFIX = "PrintPage"; //$NON-NLS-1$
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/properties/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ApplyAppearancePropertiesRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ApplyAppearancePropertiesRequest.java
deleted file mode 100644
index ab0b26c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ApplyAppearancePropertiesRequest.java
+++ /dev/null
@@ -1,50 +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.internal.requests;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A class that encapsulates data for appearance properties change request.
- * 
- * @author sshaw / nbalaba
- */
-public class ApplyAppearancePropertiesRequest extends Request {
-
-	/**
-	 * reference to the <code>View</code> to copy the appearance styles from.
-	 */
-	private View viewToCopyFrom = null;
-	
-	/**
-	 * Create ApplyAppearancePropertiesRequest given the properties map.
-	 */
-	public ApplyAppearancePropertiesRequest() {
-		super(RequestConstants.REQ_APPLY_APPEARANCE_PROPERTIES);
-	}
-
-	/**
-	 * @return <code>View</code> that is used as a baseline for copying the appearance styles of.
-	 */
-	public View getViewToCopyFrom() {
-		return viewToCopyFrom;
-	}
-
-	/**
-	 * @param viewToCopyFrom the <code>View</code> that is used as a baseline for copying the appearance styles of.
-	 */
-	public void setViewToCopyFrom(View viewToCopyFrom) {
-		this.viewToCopyFrom = viewToCopyFrom;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ChangeBoundsDeferredRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ChangeBoundsDeferredRequest.java
deleted file mode 100644
index 1096d9d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/ChangeBoundsDeferredRequest.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.internal.requests;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * @author sshaw
- */
-public class ChangeBoundsDeferredRequest extends Request {
-
-	IAdaptable adapter;
-	
-	/**
-	 * Constructor for ChangePropertyValueRequest
-	 * @param propertyID String value representing the property ID to change
-	 */
-	public ChangeBoundsDeferredRequest(IAdaptable adapter) {
-		super(RequestConstants.REQ_MOVE_DEFERRED);
-		this.adapter = adapter;
-	}
-	
-	/**
-	 * Method getLocationAdapter.
-	 * @return IAdaptable
-	 */
-	public IAdaptable getLocationAdapter() {
-		return adapter;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/RecalculatePageBreaksRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/RecalculatePageBreaksRequest.java
deleted file mode 100644
index 0a67f17..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/RecalculatePageBreaksRequest.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.internal.requests;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * Request to Recalculate Page Breaks.
- * 
- * @author jcorchis
- */
-public class RecalculatePageBreaksRequest extends Request {
-
-    /**
-     * Constructor for RecalculatePageBreaks.
-     */
-    public RecalculatePageBreaksRequest() {
-        super(RequestConstants.REQ_RECALCULATE_PAGEBREAKS);
-    }
-
-    /**
-     * Constructor for RecalculatePageBreaks.
-     * @param type
-     */
-    public RecalculatePageBreaksRequest(Object type) {
-        super(RequestConstants.REQ_RECALCULATE_PAGEBREAKS);
-    }
-    
-    public Object getType() {
-    	return RequestConstants.REQ_RECALCULATE_PAGEBREAKS;
-    }    
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterCompartmentItemsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterCompartmentItemsRequest.java
deleted file mode 100644
index d33bb03..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterCompartmentItemsRequest.java
+++ /dev/null
@@ -1,32 +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.diagram.ui.internal.requests;
-
-import org.eclipse.gef.requests.GroupRequest;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * Request to sort/filter list compartment items.
- * 
- * @author jcorchis
- */
-public class SortFilterCompartmentItemsRequest
-	extends GroupRequest {
-
-	/**
-	 * Default constructor. Creates a Request of type <code>RequestConstants.REQ_SORT_FILTER_COMPARTMENT</code>
-	 */
-	public SortFilterCompartmentItemsRequest() {
-		super(RequestConstants.REQ_SORT_FILTER_COMPARTMENT);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterContentRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterContentRequest.java
deleted file mode 100644
index 9d68e38..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SortFilterContentRequest.java
+++ /dev/null
@@ -1,48 +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.internal.requests;
-
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-
-/**
- * Request for Sort/Filter dialog contents.  EditPolicy ask for SortFilterPage s
- * from <code>ListCompartmentEditPart</code> which support the REQ_SORT_FILTER_CONTENT
- * role.
- * 
- * @author jcorchis
- */
-public class SortFilterContentRequest extends Request {
-
-	private List pageList;
-
-	/**
-	 * Constructor
-	 * @param the pageList
-	 */
-	public SortFilterContentRequest(List pageList) {
-		super(RequestConstants.REQ_SORT_FILTER_CONTENT);
-		this.pageList = pageList;
-	}
-
-	/**
-	 * Gets the SortFilterPage <code>List</code> so contributions may
-	 * be added to the <code>SortFilterDialog</code> 
-	 * @return the <code>List</code> of page contributions
-	 */
-	public List getSortFilterPageList() {
-		return this.pageList;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SuppressibleUIRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SuppressibleUIRequest.java
deleted file mode 100644
index 603adbd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/SuppressibleUIRequest.java
+++ /dev/null
@@ -1,26 +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.internal.requests;
-
-
-/**
- * 
- * Request that can optional have any UI suppressed.
- * @author choang
- */
-public interface SuppressibleUIRequest {
-
-	public void setSuppressibleUI(boolean suppressUI);
-	
-	public boolean isUISupressed();
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/requests/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/AddBookmarkHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/AddBookmarkHelper.java
deleted file mode 100644
index 09c56dc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/AddBookmarkHelper.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.resources;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-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.xmi.XMLResource;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPart;
-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.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Helper class for creating a bookmark for the selected element
- * 
- * @author Kevin Cornell
- * @author Michael Yee
- */
-public class AddBookmarkHelper {
-	/**
-	 * Add bookmark to given selection.  Note that the assertion statements
-	 * are taken from the canBookmark() constraints
-	 * 
-	 * @param editorPart the editorPart 
-	 */
-	static public void addBookmark(final IDiagramWorkbenchPart editorPart) {
-		final IStructuredSelection selection =
-			(IStructuredSelection) editorPart
-				.getSite()
-				.getWorkbenchWindow()
-				.getSelectionService()
-				.getSelection();
-
-		try {
-			TransactionUtil.getEditingDomain(editorPart.getDiagram())
-				.runExclusive(new Runnable() {
-
-					public void run() {
-					for (Iterator i = selection.toList().iterator();
-						i.hasNext();
-						) {
-						// Get the selected object as an element.
-						Object selectedObject = i.next();
-						Assert.isTrue(selectedObject instanceof EditPart);
-	
-						View view =
-							(View)((EditPart) selectedObject).getAdapter(
-								View.class);
-						Assert.isTrue(selectedObject instanceof IPrimaryEditPart);
-						Assert.isNotNull(view);
-						Assert.isTrue(view.eResource()!=null);
-	
-						// Create the "add bookmark" command if the view is defined.
-						// By default, name the bookmark with the element's fully qualified name
-						String elementName = StringStatics.BLANK;
-						EObject semanticElement = ViewUtil.resolveSemanticElement(view);
-	
-						if (semanticElement != null) {
-							elementName = EMFCoreUtil.getQualifiedName(semanticElement,true);
-						}
-	
-						// Obtain the marker description from the user.  
-						String description =
-							getDescription(elementName, editorPart);
-	
-						// If the user did not cancel the dialog (the prompt for the description)
-						if (description != null) {
-							// Create the marker
-							HashMap attribMap = new HashMap();
-							attribMap.put(IMarker.MESSAGE, description);
-							attribMap.put(IMarker.LOCATION, elementName);
-							attribMap.put(IBookmark.ELEMENT_ID,
-									((XMLResource) view.eResource())
-										.getID(view));
-	
-							IResource resource = getResource(editorPart);
-							Assert.isNotNull(resource);
-	
-							try {
-								IMarker marker =
-									resource.createMarker(IBookmark.TYPE);
-								marker.setAttributes(attribMap);
-							} catch (CoreException e) {
-								Trace.catching(DiagramUIPlugin.getInstance(), DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), "addBookmark", e); //$NON-NLS-1$
-								Log.error(DiagramUIPlugin.getInstance(), IStatus.ERROR, "addBookmark"); //$NON-NLS-1$
-							}
-						}
-					}
-				}
-			});
-		}catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, AddBookmarkHelper.class,
-					"addBookmark()", //$NON-NLS-1$
-					e);
-		}
-	}
-
-	/**
-	 * Gets the resource for the given workbench part
-	 * @param part the given workbench part
-	 * @return the resource for the given workbench part, otherwise <code>null</code>
-	 */
-	static private IResource getResource(IWorkbenchPart part) {
-		// Attempt a generic way to get the resource from the editor input.
-		if (part instanceof IEditorPart) {
-			IEditorInput input = ((IEditorPart) part).getEditorInput();
-			return (IFile) input.getAdapter(IFile.class);
-		}
-		return null;
-	}
-
-	/**
-//	 * Gets the root resource of the workspace
-//	 * @return the root resource of the workspace
-//	 */
-//	static private IWorkspaceRoot getWorkspaceRoot() {
-//		return ResourcesPlugin.getWorkspace().getRoot();
-//	}
-
-	/**
-	 * Get the bookmark description.
-	 * @param defaultDescription the suggested bookmark name
-	 * @return the bookmark name or <code>null</code> if cancelled.
-	 */
-	static private String getDescription(
-		String defaultDescription,
-		IWorkbenchPart part) {
-		String title = DiagramUIMessages.AddBookmarkAction_dialog_title;
-		String message = DiagramUIMessages.AddBookmarkAction_dialog_message;
-
-		IInputValidator inputValidator = new IInputValidator() {
-			public String isValid(String newText) {
-				return (newText == null || newText.length() == 0)
-					? StringStatics.SPACE
-					: null;
-			}
-		};
-		InputDialog dialog =
-			new InputDialog(
-				part.getSite().getShell(),
-				title,
-				message,
-				defaultDescription,
-				inputValidator);
-
-		// If the user cancelled the dialog, do not create the bookmark.
-		if (dialog.open() != Window.CANCEL) {
-			String name = dialog.getValue();
-			if (name == null)
-				return null;
-			name = name.trim();
-			return (name.length() == 0) ? null : name;
-		} else {
-			return null;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/resources/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/CompoundSnapToHelperEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/CompoundSnapToHelperEx.java
deleted file mode 100644
index 78cd840..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/CompoundSnapToHelperEx.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.ruler;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.CompoundSnapToHelper;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SnapToHelper;
-
-/**
- * Overridden to:
- * <li> support snapping to geometry in a restricted direction. See
- * {@link SnapToHelperUtil#RESTRICTED_DIRECTIONS}.</li>
- * 
- * @author crevells
- */
-public class CompoundSnapToHelperEx
-    extends CompoundSnapToHelper {
-
-    public CompoundSnapToHelperEx(SnapToHelper[] delegates) {
-        super(delegates);
-    }
-
-    public int snapRectangle(Request request, int snapOrientation,
-            PrecisionRectangle baseRect, PrecisionRectangle result) {
-
-        Integer restrictedDirections = (Integer) request.getExtendedData().get(
-            SnapToHelperUtil.RESTRICTED_DIRECTIONS);
-        if (restrictedDirections == null
-            || restrictedDirections == PositionConstants.NONE) {
-            return super.snapRectangle(request, snapOrientation, baseRect,
-                result);
-        }
-
-        snapOrientation = SnapToHelperUtil.updateSnapLocations(snapOrientation,
-            restrictedDirections);
-
-        SnapToHelper delegates[] = getDelegates();
-        int snapOrientations[] = new int[delegates.length];
-        PrecisionRectangle results[] = new PrecisionRectangle[delegates.length];
-
-        for (int i = 0; i < delegates.length; i++) {
-            results[i] = new PrecisionRectangle();
-            snapOrientations[i] = getDelegates()[i].snapRectangle(request,
-                snapOrientation, baseRect, results[i]);
-        }
-
-        int snapOrientationToReturn = snapOrientation;
-        for (int i = 0; i < delegates.length; i++) {
-            // find out which snapping bits changed
-            int snapChanged = snapOrientation ^ snapOrientations[i];
-            if (snapChanged != 0) {
-                // some snapping occurred
-                if ((snapChanged & HORIZONTAL) != 0) {
-                    if (result.preciseX == 0
-                        || Math.abs(results[i].preciseX) < Math
-                            .abs(result.preciseX)) {
-                        result.preciseX = results[i].preciseX;
-                    }
-                    snapOrientationToReturn &= ~HORIZONTAL;
-                }
-                if ((snapChanged & VERTICAL) != 0) {
-                    if (result.preciseY == 0
-                        || Math.abs(results[i].preciseY) < Math
-                            .abs(result.preciseY)) {
-                        result.preciseY = results[i].preciseY;
-                    }
-                    snapOrientationToReturn &= ~VERTICAL;
-                }
-            }
-        }
-        result.updateInts();
-        return snapOrientationToReturn;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramGuide.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramGuide.java
deleted file mode 100644
index 38a5ad7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramGuide.java
+++ /dev/null
@@ -1,178 +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.internal.ruler;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.WeakHashMap;
-
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.gmf.runtime.notation.Alignment;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Representation of a guide.  
- *
- * In addition to maintaining information about which parts are attached to the guide,
- * also maintains information about the edge along which those parts are attached.
- * This information is useful during resize operations to determine the attachment status of a part.
- *
- *  @author jschofie
- */
-public class DiagramGuide {
-
-	private static DiagramGuide self = null;
-
-	// This is required to support moving shapes with the guidelines
-	private WeakHashMap guideMap;
-	
-	/**
-	 * Private constructor used to protect Singleton
-	 */
-	private DiagramGuide() {
-		guideMap = new WeakHashMap();
-	}
-
-	public static DiagramGuide getInstance() {
-		if( self == null )
-			self = new DiagramGuide();
-		return self;
-	}
-
-	public List getViews() {
-		return new ArrayList(guideMap.keySet());
-	}
-
-	public Guide getHorizontalGuide(View part) {
-		GuideMap theMap = (GuideMap)guideMap.get(part);
-		if( theMap == null ) {
-			return null;
-		}
-
-		return theMap.getHorizontal();
-	}
-	
-	/**
-	 * This method returns the edge along which the given part is attached to this guide.
-	 * This information is used by the XYLayoutEditPolicy to determine whether to attach
-	 * or detach a part from a guide during resize operations.
-	 * 
-	 * @param	part	The part whose alignment has to be found
-	 * @return	an int representing the edge along which the given part is attached
-	 * 			to this guide
-	 */
-	public int getHorizontalAlignment(View part) {
-		Guide guide = getHorizontalGuide(part);
-		
-		if( guide == null )
-			return -2; // Not attached
-		
-		EMap nodes = guide.getNodeMap();
-		Alignment align = (Alignment)nodes.get(part);
-
-		if (align != null) {
-			switch( align.getValue() ) {
-				case Alignment.TOP:
-				case Alignment.LEFT:
-					return -1;
-				case Alignment.CENTER:
-					return 0;
-				case Alignment.BOTTOM:
-				case Alignment.RIGHT:
-					return 1;
-			}
-		}
-
-		return -2;
-	}
-
-	/**
-	 * This method returns the edge along which the given part is attached to this guide.
-	 * This information is used by the XYLayoutEditPolicy to determine whether to attach
-	 * or detach a part from a guide during resize operations.
-	 * 
-	 * @param	part	The part whose alignment has to be found
-	 * @return	an int representing the edge along which the given part is attached
-	 * 			to this guide
-	 */
-	public int getVerticalAlignment(View part) {
-		Guide guide = getVerticalGuide(part);
-		
-		if( guide == null )
-			return -2; // Not attached
-		
-		EMap nodes = guide.getNodeMap();
-		Alignment align = (Alignment)nodes.get(part);
-
-		if (align != null) {
-			switch( align.getValue() ) {
-				case Alignment.TOP:
-				case Alignment.LEFT:
-					return -1;
-				case Alignment.CENTER:
-					return 0;
-				case Alignment.BOTTOM:
-				case Alignment.RIGHT:
-					return 1;
-			}
-		}
-	
-		return -2;
-	}
-
-	public Guide getVerticalGuide(View part) {
-		GuideMap theMap = (GuideMap)guideMap.get(part);
-		if( theMap == null ) {
-			return null;
-		}
-		
-		return theMap.getVertical();
-	}
-	
-	public void setHorizontalGuide(View view,Guide toSet) {
-		GuideMap theMap = (GuideMap)guideMap.get(view);
-		if( theMap == null && toSet != null ) {
-			theMap = new GuideMap();
-			guideMap.put(view,theMap);
-		}
-		
-		if( theMap != null )
-			theMap.setHorizontal(toSet);
-		
-		checkAndRemove(view, theMap);
-	}
-
-	public void setVerticalGuide(View view, Guide toSet) {
-		GuideMap theMap = (GuideMap)guideMap.get(view);
-		if( theMap == null && toSet != null ) {
-			theMap = new GuideMap();
-			guideMap.put(view,theMap);
-		}
-		
-		if( theMap != null )
-			theMap.setVertical(toSet);
-		
-		checkAndRemove(view, theMap);
-	}
-	
-	private void checkAndRemove(View view, GuideMap map)
-	{
-		if( map != null && map.getHorizontal() == null &&
-				map.getVertical() == null ) {
-			guideMap.remove(view);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRuler.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRuler.java
deleted file mode 100644
index fc09472..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRuler.java
+++ /dev/null
@@ -1,103 +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.internal.ruler;
-
-import java.util.List;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.GuideStyle;
-
-
-/**
- * This Object contains information regarding the ruler and associated guides
- * 
- * @author jschofie
- */
-public class DiagramRuler {
-
-	private int unit;
-	private boolean horizontal;
-	private GuideStyle guideStyle;
-
-	public DiagramRuler(boolean isHorizontal, GuideStyle style) {
-		this(isHorizontal, RulerProvider.UNIT_INCHES, style);
-	}
-
-	public DiagramRuler(boolean isHorizontal, int unit, GuideStyle style) {
-		horizontal = isHorizontal;
-		setUnit(unit);
-		guideStyle = style;
-	}
-
-	private GuideStyle getGuideStyle() {
-		return guideStyle;
-	}
-
-	/**
-	 * Returns a list of Guide(s)
-	 */
-	public List getGuides() {
-		if( !isHorizontal() )
-			return getGuideStyle().getHorizontalGuides();
-		
-		return getGuideStyle().getVerticalGuides();
-	}
-
-	public boolean isHorizontal() {
-		return horizontal;
-	}
-
-	public int getUnit() {
-		return unit;
-	}
-
-	public void setUnit(int newUnit) {
-		if (unit != newUnit) {
-			unit = newUnit;
-		}
-	}
-	
-	public void addGuide(Guide toAdd) {
-		
-		if( !isHorizontal() ) {
-			guideStyle.getHorizontalGuides().add(toAdd);
-		} else {
-			guideStyle.getVerticalGuides().add(toAdd);
-		}
-	}
-	
-	public void addNotificationListener(
-			TransactionalEditingDomain editingDomain,
-			NotificationListener listener) {
-		
-		DiagramEventBroker.getInstance(editingDomain).addNotificationListener(
-			getGuideStyle(), listener);
-	}
-
-	public void removeNotificationListener(
-			TransactionalEditingDomain editingDomain,
-			NotificationListener listener) {
-		
-		DiagramEventBroker.getInstance(editingDomain)
-			.removeNotificationListener(getGuideStyle(), listener);
-	}
-
-	
-	public void setGuideStyle(GuideStyle guideStyle) {
-		this.guideStyle = guideStyle;
-}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRulerProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRulerProvider.java
deleted file mode 100644
index cd4eaa8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/DiagramRulerProvider.java
+++ /dev/null
@@ -1,349 +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.internal.ruler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.rulers.RulerChangeListener;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.commands.CreateGuideCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.commands.DeleteGuideCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.commands.MoveGuideCommand;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-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.View;
-
-
-/**
- * Custom RulerProvider methods.
- * 
- * @author jschofie
- */
-public class DiagramRulerProvider extends RulerProvider {
-
-	/*
-	 * PropertyChangeListerner for Rulers.
-	 */
-	private NotificationListener rulerListener = new NotificationListener() {
-		public void notifyChanged(Notification evt) {
-			handleNotificationEvent(evt);
-		}
-		
-		private void handleNotificationEvent(Notification event) {
-			Object feature = event.getFeature();
-
-			if( (feature == NotationPackage.eINSTANCE.getGuideStyle_HorizontalGuides() &&
-						!theRuler.isHorizontal() ) ||
-				feature == NotationPackage.eINSTANCE.getGuideStyle_VerticalGuides() &&
-						theRuler.isHorizontal())
-			{
-				Guide guide = null;
-
-				// Add a new Guide
-				if( event.getNewValue() != null && event.getOldValue() == null ) {
-					guide = (Guide)event.getNewValue();
-					DiagramEventBroker.getInstance(editingDomain).addNotificationListener(guide,guideListener);
-				}
-
-				// Remove Guide
-				if( event.getNewValue() == null && event.getOldValue() != null ) {
-					guide = (Guide)event.getOldValue();
-					DiagramEventBroker.getInstance(editingDomain).removeNotificationListener(guide,guideListener);
-				}
-				
-				for (int i = 0; i < listeners.size(); i++) {
-					((RulerChangeListener)listeners.get(i))
-							.notifyGuideReparented(guide);
-				}
-			}
-		}
-	};
-
-	private NotificationListener guideListener = new NotificationListener() {
-		public void notifyChanged(Notification evt) {
-			handleNotificationEvent(evt);
-		}
-		
-		private void handleNotificationEvent(Notification event) {
-			Object feature = event.getFeature();
-			// Notify when the guide's position changes
-			if( feature == NotationPackage.eINSTANCE.getGuide_Position() ) {
-				for (int i = 0; i < listeners.size(); i++) {
-					((RulerChangeListener)listeners.get(i))
-							.notifyGuideMoved(event.getNotifier());
-				}
-			}
-			
-			// Notify when parts are attached and detached
-			if( feature == NotationPackage.eINSTANCE.getGuide_NodeMap() ) {
-
-				refreshMap();
-
-				for (int i = 0; i < listeners.size(); i++) {
-					((RulerChangeListener)listeners.get(i))
-							.notifyPartAttachmentChanged(event.getNewValue(), event.getNotifier());
-				}
-			}
-		}
-	};
-	
-	private DiagramRuler theRuler;
-	private IMapMode mm;
-    private final TransactionalEditingDomain editingDomain;
-	
-	public DiagramRulerProvider(TransactionalEditingDomain editingDomain, DiagramRuler ruler, IMapMode mm ) {
-		theRuler = ruler;
-		this.mm = mm;
-        this.editingDomain = editingDomain;
-	}
-	
-	private IMapMode getMapMode() {
-		return mm;
-	}
-	public void init() {
-		theRuler.addNotificationListener(editingDomain, rulerListener);
-
-		Iterator iter = getGuides().iterator();
-		while(iter.hasNext()) {
-			Guide guide = (Guide)iter.next();
-			DiagramEventBroker.getInstance(editingDomain).addNotificationListener(guide,guideListener);
-		}
-		
-		refreshMap();
-	}
-	
-	public void uninit() {
-		theRuler.removeNotificationListener(editingDomain, rulerListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getRuler()
-	 */
-	public Object getRuler() {
-		return theRuler;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getAttachedModelObjects(java.lang.Object)
-	 */
-	public List getAttachedModelObjects(Object guide) {
-		Guide toGet = (Guide)guide;
-		
-		if( toGet.getNodeMap().size() == 0 )
-			return Collections.EMPTY_LIST;
-	
-		List toReturn = new ArrayList();
-		
-		Iterator iter = toGet.getNodeMap().keySet().iterator();
-		while(iter.hasNext()) {
-			Node node = (Node)iter.next();
-			if( node != null )
-				toReturn.add(node);
-		}
-	
-		return toReturn;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getCreateGuideCommand(int)
-	 */
-	public Command getCreateGuideCommand(int position) {
-        return new ICommandProxy(new CreateGuideCommand(
-            editingDomain, theRuler, position));
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getDeleteGuideCommand(java.lang.Object)
-	 */
-	public Command getDeleteGuideCommand(Object guide) {
-		return new ICommandProxy( new DeleteGuideCommand(editingDomain, (Guide)guide) );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getMoveGuideCommand(java.lang.Object, int)
-	 */
-	public Command getMoveGuideCommand(Object guide, int pDelta) {
-		CompoundCommand cmd = new CompoundCommand(DiagramUIMessages.Command_moveGuide);
-
-		// Get the Command to Move the Guide
-		cmd.add( new ICommandProxy( new MoveGuideCommand(editingDomain, (Guide)guide, pDelta) ) );
-		
-		// Get the Commands to Remove attached model objects
-		Iterator iter = getAttachedModelObjects(guide).iterator();
-		while (iter.hasNext()) {
-			View part = (View)iter.next();
-			
-			int x = ((Integer) ViewUtil.getStructuralFeatureValue(part,NotationPackage.eINSTANCE.getLocation_X())).intValue();
-			int y = ((Integer) ViewUtil.getStructuralFeatureValue(part,NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-
-			SetPropertyCommand spc;
-            
-			if( ((DiagramRuler)getRuler()).isHorizontal()) {
-				x += getMapMode().DPtoLP(pDelta);
-				spc = new SetPropertyCommand(editingDomain, new EObjectAdapter(part), Properties.ID_POSITIONX, Properties.ID_POSITIONX, Integer.valueOf(x));
-			} else {
-				y += getMapMode().DPtoLP(pDelta);
-				spc = new SetPropertyCommand(editingDomain, new EObjectAdapter(part), Properties.ID_POSITIONY, Properties.ID_POSITIONY, Integer.valueOf(y));
-			}
-
-			cmd.add( new ICommandProxy(spc) );
-		}
-
-		return cmd.unwrap();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getGuideAt(int)
-	 */
-	public Object getGuideAt(int position) {
-		List guides = getGuides();
-		for (int i = 0; i < guides.size(); i++) {
-			Object guide = guides.get(i);
-			if (position >= (getGuidePosition(guide)-2) &&
-					position <= (getGuidePosition(guide)+2) ) {
-				return guide;
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getGuidePositions()
-	 */
-	public int[] getGuidePositions() {
-		List guides = getGuides();
-		int[] result = new int[guides.size()];
-		for (int i = 0; i < guides.size(); i++) {
-			result[i] = ((Guide)guides.get(i)).getPosition();
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getUnit()
-	 */
-	public int getUnit() {
-		return theRuler.getUnit();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#setUnit(int)
-	 */
-	public void setUnit(int newUnit) {
-		theRuler.setUnit(newUnit);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getGuidePosition(java.lang.Object)
-	 */
-	public int getGuidePosition(Object guide) {
-		return ((Guide)guide).getPosition();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.rulers.RulerProvider#getGuides()
-	 */
-	public List getGuides() {
-		return theRuler.getGuides();
-	}
-
-	public void refreshMap() {
-		if( theRuler.isHorizontal() )
-			refreshVerticalGuideMap();
-		else 
-			refreshHorizontalGuideMap();
-	}
-
-	/**
-	 * 
-	 */
-	private void refreshHorizontalGuideMap()
-	{
-		List guideList = getGuides();
-		List viewList = DiagramGuide.getInstance().getViews();
-
-		Iterator iter = guideList.iterator();
-		while( iter.hasNext() ) {
-			Guide guide = (Guide)iter.next();
-			List attachedViewsList = getAttachedModelObjects(guide);
-			
-			Iterator viewIter = attachedViewsList.iterator();
-			while( viewIter.hasNext() ) {
-				View view = (View)viewIter.next();
-				if( viewList.contains(view) )
-					viewList.remove(view);
-				else
-					DiagramGuide.getInstance().setHorizontalGuide(view,guide);
-			}
-			
-			// Remove remaining views
-			viewIter = viewList.iterator();
-			while( viewIter.hasNext() ) {
-				View view = (View)viewIter.next();
-				DiagramGuide.getInstance().setHorizontalGuide(view, null);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void refreshVerticalGuideMap()
-	{
-		List guideList = getGuides();
-		List viewList = DiagramGuide.getInstance().getViews();
-
-		Iterator iter = guideList.iterator();
-		while( iter.hasNext() ) {
-			Guide guide = (Guide)iter.next();
-			List attachedViewsList = getAttachedModelObjects(guide);
-			
-			Iterator viewIter = attachedViewsList.iterator();
-			while( viewIter.hasNext() ) {
-				View view = (View)viewIter.next();
-				//Node node = (Node)view.getAdapter(Node.class);
-
-				if( viewList.contains(view) )
-					viewList.remove(view);
-				else
-					DiagramGuide.getInstance().setVerticalGuide(view,guide);
-			}
-			
-			// Remove remaining views
-			viewIter = viewList.iterator();
-			while( viewIter.hasNext() ) {
-				View view = (View)viewIter.next();
-				DiagramGuide.getInstance().setVerticalGuide(view, null);
-			}
-		}
-	}
-
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/GuideMap.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/GuideMap.java
deleted file mode 100644
index 33fb637..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/GuideMap.java
+++ /dev/null
@@ -1,43 +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.internal.ruler;
-
-import org.eclipse.gmf.runtime.notation.Guide;
-
-
-/**
- * This is required to support the mapping between views and guides
- *
- * @author jschofie
- */
-class GuideMap {
-	
-	private Guide _horizontal;
-	private Guide _vertical;
-	
-	public Guide getHorizontal() {
-		return _horizontal;
-	}
-	
-	public void setHorizontal(Guide toSet) {
-		_horizontal = toSet;
-	}
-	
-	public Guide getVertical() {
-		return _vertical;
-	}
-	
-	public void setVertical(Guide toSet) {
-		_vertical = toSet;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGeometryEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGeometryEx.java
deleted file mode 100644
index 6f322dc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGeometryEx.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.ruler;
-
-import java.util.Map;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.SnapToGeometry;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Overridden to:
- * <li> support various mapmode units</li>
- * <li> support snapping to geometry in a restricted direction. See
- * {@link SnapToHelperUtil#RESTRICTED_DIRECTIONS}.</li>
- * 
- * @author cli, crevells
- */
-public class SnapToGeometryEx
-    extends SnapToGeometry {
-
-    public SnapToGeometryEx(GraphicalEditPart container) {
-        super(container);
-    }
-
-    // This code will be required to translate the figure's coordinates
-    // accordingly if Bugzilla 188308 is fixed
-    // protected static class EntryEx extends Entry {
-    //
-    // protected EntryEx(int type, int location) {
-    // super(type, location);
-    // }
-    // }
-    //
-
-    // protected void populateRowsAndCols(List parts) {
-    //		
-    // rows = new Entry[parts.size() * 3];
-    // cols = new Entry[parts.size() * 3];
-    // GraphicalEditPart diagramEditPart = (GraphicalEditPart)parts.get(0);
-    //		
-    // while (diagramEditPart.getParent() != null){
-    // diagramEditPart = (GraphicalEditPart)diagramEditPart.getParent();
-    // if (diagramEditPart instanceof DiagramEditPart) break;
-    // }
-    //		
-    // for (int i = 0; i < parts.size(); i++) {
-    //			
-    // GraphicalEditPart child = (GraphicalEditPart)parts.get(i);
-    // Rectangle bounds = getFigureBounds(child).getCopy();
-    //			
-    // //translate the figure's coordinates to absolute, then relative
-    // //to the diagram (i.e the figure's layout constraint on the diagram)
-    // child.getFigure().translateToAbsolute(bounds);
-    // diagramEditPart.getFigure().translateToRelative(bounds);
-    //			
-    // cols[i * 3] = new EntryEx(-1, bounds.x);
-    // rows[i * 3] = new EntryEx(-1, bounds.y);
-    // cols[i * 3 + 1] = new EntryEx(0, bounds.x + (bounds.width - 1) / 2);
-    // rows[i * 3 + 1] = new EntryEx(0, bounds.y + (bounds.height - 1) / 2);
-    // cols[i * 3 + 2] = new EntryEx(1, bounds.right() - 1);
-    // rows[i * 3 + 2] = new EntryEx(1, bounds.bottom() - 1);
-    //
-    // }
-    // }
-
-    protected double getThreshold() {
-        IMapMode mm = MapModeUtil.getMapMode(container.getFigure());
-        return mm.DPtoLP((int) super.getThreshold());
-    }
-
-    protected double getCorrectionFor(Entry entries[], Map extendedData,
-            boolean vert, double value, int side) {
-
-        Integer restrictedDirections = (Integer) extendedData
-            .get(SnapToHelperUtil.RESTRICTED_DIRECTIONS);
-        if (restrictedDirections == null
-            || restrictedDirections == PositionConstants.NONE) {
-            return super.getCorrectionFor(entries, extendedData, vert, value,
-                side);
-        }
-
-        boolean increaseOK = vert ? (restrictedDirections & EAST) != 0
-            : (restrictedDirections & SOUTH) != 0;
-        boolean decreaseOK = vert ? (restrictedDirections & WEST) != 0
-            : (restrictedDirections & NORTH) != 0;
-
-        Entry filteredEntries[] = new Entry[entries.length];
-        int count = 0;
-        for (int i = 0; i < entries.length; i++) {
-            if ((increaseOK && entries[i].getLocation() > value)
-                || (decreaseOK && entries[i].getLocation() < value)) {
-                filteredEntries[count++] = entries[i];
-            }
-        }
-
-        // remove empty entries
-        Entry[] filteredEntries2 = new Entry[count];
-        for (int i = 0; i < count; i++) {
-            filteredEntries2[i] = filteredEntries[i];
-        }
-
-        return super.getCorrectionFor(filteredEntries2, extendedData, vert,
-            value, side);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGridEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGridEx.java
deleted file mode 100644
index da42655..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGridEx.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.ruler;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SnapToGrid;
-
-/**
- * Overridden to:
- * <li> support snapping to grid in a restricted direction. See
- * {@link SnapToHelperUtil#RESTRICTED_DIRECTIONS}.</li>
- * 
- * @author crevells
- */
-public class SnapToGridEx
-    extends SnapToGrid {
-
-    public SnapToGridEx(GraphicalEditPart container) {
-        super(container);
-    }
-
-    public int snapRectangle(Request request, int snapLocations,
-            PrecisionRectangle rect, PrecisionRectangle result) {
-
-        Integer restrictedDirections = (Integer) request.getExtendedData().get(
-            SnapToHelperUtil.RESTRICTED_DIRECTIONS);
-        if (restrictedDirections == null
-            || restrictedDirections == PositionConstants.NONE) {
-            return super.snapRectangle(request, snapLocations, rect, result);
-        }
-
-        snapLocations = SnapToHelperUtil.updateSnapLocations(snapLocations,
-            restrictedDirections);
-
-        rect = rect.getPreciseCopy();
-        makeRelative(container.getContentPane(), rect);
-        PrecisionRectangle correction = new PrecisionRectangle();
-        makeRelative(container.getContentPane(), correction);
-
-        if (gridX > 0 && (snapLocations & EAST) != 0) {
-            correction.preciseWidth -= Math.IEEEremainder(rect.preciseRight()
-                - origin.x - 1, gridX);
-            snapLocations &= ~EAST;
-        }
-
-        if ((snapLocations & (WEST | HORIZONTAL)) != 0 && gridX > 0) {
-            double leftCorrection = Math.IEEEremainder(
-                rect.preciseX - origin.x, gridX);
-
-            // /////////////////// ADDED THIS CODE
-            if ((restrictedDirections & EAST) != 0
-                && (restrictedDirections & WEST) == 0 && leftCorrection > 0) {
-                // restricted to moving EAST
-                correction.preciseX += gridX - leftCorrection;
-            } else if ((restrictedDirections & WEST) != 0
-                && (restrictedDirections & EAST) == 0 && leftCorrection < 0) {
-                // restricted to moving WEST
-                correction.preciseX -= gridX + leftCorrection;
-            } else {
-                // no horizontal restrictions
-                correction.preciseX -= leftCorrection;
-            }
-            // ///////////////////
-
-            if ((snapLocations & HORIZONTAL) == 0)
-                correction.preciseWidth += leftCorrection;
-            snapLocations &= ~(WEST | HORIZONTAL);
-        }
-
-        if ((snapLocations & SOUTH) != 0 && gridY > 0) {
-            correction.preciseHeight -= Math.IEEEremainder(rect.preciseBottom()
-                - origin.y - 1, gridY);
-            snapLocations &= ~SOUTH;
-        }
-
-        if ((snapLocations & (NORTH | VERTICAL)) != 0 && gridY > 0) {
-            double topCorrection = Math.IEEEremainder(rect.preciseY - origin.y,
-                gridY);
-
-            // /////////////////// ADDED THIS CODE
-            if ((restrictedDirections & SOUTH) != 0
-                && (restrictedDirections & NORTH) == 0 && topCorrection > 0) {
-                // restricted to moving SOUTH
-                correction.preciseY += gridY - topCorrection;
-            } else if ((restrictedDirections & NORTH) != 0
-                && (restrictedDirections & SOUTH) == 0 && topCorrection < 0) {
-                // restricted to moving NORTH
-                correction.preciseY -= gridY + topCorrection;
-            } else {
-                // no vertical restrictions
-                correction.preciseY -= topCorrection;
-            }
-            // ///////////////////
-
-            if ((snapLocations & VERTICAL) == 0)
-                correction.preciseHeight += topCorrection;
-            snapLocations &= ~(NORTH | VERTICAL);
-        }
-
-        correction.updateInts();
-        makeAbsolute(container.getContentPane(), correction);
-        result.preciseX += correction.preciseX;
-        result.preciseY += correction.preciseY;
-        result.preciseWidth += correction.preciseWidth;
-        result.preciseHeight += correction.preciseHeight;
-        result.updateInts();
-
-        return snapLocations;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGuidesEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGuidesEx.java
deleted file mode 100644
index 6779805..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToGuidesEx.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.ruler;
-
-import java.util.Map;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.SnapToGuides;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Overridden to:
- * <li> support various mapmode units</li>
- * <li> support snapping to geometry in a restricted direction. See
- * {@link SnapToHelperUtil#RESTRICTED_DIRECTIONS}.</li>
- * 
- * @author jschofie, crevells
- */
-public class SnapToGuidesEx
-    extends SnapToGuides {
-
-    /**
-     * The vertical guides in logical mapmode units.
-     */
-    private int[] verticalGuidesMM;
-
-    /**
-     * The horizontal guides in logical mapmode units.
-     */
-    private int[] horizontalGuidesMM;
-
-    public SnapToGuidesEx(GraphicalEditPart container) {
-        super(container);
-    }
-
-    protected double getThreshold() {
-        IMapMode mm = MapModeUtil.getMapMode(container.getFigure());
-        return mm.DPtoLP((int) super.getThreshold());
-    }
-
-    protected int[] getHorizontalGuides() {
-        if (horizontalGuidesMM == null) {
-            int guides[] = super.getHorizontalGuides();
-            IMapMode mm = MapModeUtil.getMapMode(container.getFigure());
-            horizontalGuidesMM = new int[guides.length];
-            for (int i = 0; i < guides.length; i++) {
-                int guide = guides[i];
-                horizontalGuidesMM[i] = mm.DPtoLP(guide);
-            }
-        }
-        return horizontalGuidesMM;
-    }
-
-    protected int[] getVerticalGuides() {
-        if (verticalGuidesMM == null) {
-            int guides[] = super.getVerticalGuides();
-            IMapMode mm = MapModeUtil.getMapMode(container.getFigure());
-            verticalGuidesMM = new int[guides.length];
-            for (int i = 0; i < guides.length; i++) {
-                int guide = guides[i];
-                verticalGuidesMM[i] = mm.DPtoLP(guide);
-            }
-        }
-        return verticalGuidesMM;
-    }
-
-    protected double getCorrectionFor(int[] guides, double value,
-            Map extendedData, boolean vert, int side) {
-
-        Integer restrictedDirections = (Integer) extendedData
-            .get(SnapToHelperUtil.RESTRICTED_DIRECTIONS);
-        if (restrictedDirections == null
-            || restrictedDirections == PositionConstants.NONE) {
-            return super.getCorrectionFor(guides, value, extendedData, vert,
-                side);
-        }
-
-        if (restrictedDirections == NONE) {
-            return super.getCorrectionFor(guides, value, extendedData, vert,
-                side);
-        }
-
-        boolean increaseOK = vert ? (restrictedDirections & EAST) != 0
-            : (restrictedDirections & SOUTH) != 0;
-        boolean decreaseOK = vert ? (restrictedDirections & WEST) != 0
-            : (restrictedDirections & NORTH) != 0;
-
-        int filteredGuides[] = new int[guides.length];
-        int count = 0;
-        for (int i = 0; i < guides.length; i++) {
-            if ((increaseOK && guides[i] > value)
-                || (decreaseOK && guides[i] < value)) {
-                filteredGuides[count++] = guides[i];
-            }
-        }
-
-        // remove empty entries
-        int[] filteredGuides2 = new int[count];
-        for (int i = 0; i < count; i++) {
-            filteredGuides2[i] = filteredGuides[i];
-        }
-
-        return super.getCorrectionFor(filteredGuides2, value, extendedData,
-            vert, side);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToHelperUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToHelperUtil.java
deleted file mode 100644
index bec662e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/SnapToHelperUtil.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.ruler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.SnapToGeometry;
-import org.eclipse.gef.SnapToGrid;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-
-/**
- * @author mmostafa, crevells
- * 
- * Utility class for the snapping behavior.
- * 
- */
-public class SnapToHelperUtil implements PositionConstants {
-    
-    /**
-     * This string can be used as a key in the extended map of the request sent
-     * to the <code>SnapToHelper</code> to support snapipng in restricted
-     * directions. This key should be associated with an Integer whose value is
-     * either PositionConstants.NONE or a combination of EAST, WEST, NORTH, and
-     * SOUTH. See the individual <code>SnapToHelpers</code> to see how this
-     * affects the snapping algorithms. See <code>DragEditPartsTrackerEx</code>
-     * to see the use case in which this is set.
-     */
-    public static final String RESTRICTED_DIRECTIONS = "org.eclipse.gmf.runtime.diagram.ui.RestrictedDirections"; //$NON-NLS-1$
-
-    /**
-     * returns the the appropriate snap helper(s), this method will always reach
-     * for the first reachable DiagramEditPart using the passed edit part, then
-     * use this Diagram edit part to get the snap helper
-     * 
-     * @param editPart ,
-     *            edit part to get the snap helper for
-     * @return
-     */
-    static public Object getSnapHelper(GraphicalEditPart editPart) {
-        // get the diagram Edit Part
-        GraphicalEditPart diagramEditPart = editPart;
-        while (diagramEditPart != null
-            && !(diagramEditPart instanceof DiagramEditPart)) {
-            diagramEditPart = (GraphicalEditPart) diagramEditPart.getParent();
-        }
-
-        if (diagramEditPart == null)
-            return null;
-
-        // for snap to geometry, attempt to locate a compartment as a parent
-        GraphicalEditPart parent = editPart;
-        while (parent != null && !(parent instanceof ISurfaceEditPart)) {
-            parent = (GraphicalEditPart) parent.getParent();
-        }
-
-        if (parent == null)
-            parent = diagramEditPart;
-
-        List<SnapToHelper> snapStrategies = new ArrayList<SnapToHelper>();
-        EditPartViewer viewer = diagramEditPart.getViewer();
-
-        Boolean val = (Boolean) editPart.getViewer().getProperty(
-            RulerProvider.PROPERTY_RULER_VISIBILITY);
-
-        if (val != null && val.booleanValue())
-            snapStrategies.add(new SnapToGuidesEx(diagramEditPart));
-
-        val = (Boolean) viewer
-            .getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED);
-        if (val != null && val.booleanValue())
-            snapStrategies.add(new SnapToGeometryEx(parent));
-
-        val = (Boolean) viewer.getProperty(SnapToGrid.PROPERTY_GRID_ENABLED);
-
-        if (val != null && val.booleanValue())
-            snapStrategies.add(new SnapToGridEx(diagramEditPart));
-
-        if (snapStrategies.size() == 0)
-            return null;
-
-        if (snapStrategies.size() == 1)
-            return snapStrategies.get(0);
-
-        SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()];
-        for (int i = 0; i < snapStrategies.size(); i++)
-            ss[i] = snapStrategies.get(i);
-        return new CompoundSnapToHelperEx(ss);
-    }
-
-    /**
-     * Updates the snapLocations if it violates the restricted directions.
-     * 
-     * @param snapLocations
-     *            the locations in which snapping will occur
-     * @param restrictedDirections
-     *            the restricted directions for snapping
-     * @return the updated snapLocations
-     */
-    public static int updateSnapLocations(int snapLocations,
-            int restrictedDirections) {
-
-        if (restrictedDirections == NONE) {
-            return snapLocations;
-        }
-        if ((snapLocations & HORIZONTAL) != 0
-            && (restrictedDirections & EAST) == 0
-            && (restrictedDirections & WEST) == 0) {
-            snapLocations &= ~HORIZONTAL;
-        }
-        if ((snapLocations & VERTICAL) != 0
-            && (restrictedDirections & SOUTH) == 0
-            && (restrictedDirections & NORTH) == 0) {
-            snapLocations &= ~VERTICAL;
-        }
-        return snapLocations;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/ChangeGuideCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/ChangeGuideCommand.java
deleted file mode 100644
index 62890fa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/ChangeGuideCommand.java
+++ /dev/null
@@ -1,130 +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.internal.ruler.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.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.DiagramGuide;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Alignment;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This command is used to change a guide's attached part
- * @author Jody Schofield
- */
-public class ChangeGuideCommand extends AbstractTransactionalCommand {
-
-	private EditPartViewer editPartViewer;
-	private IAdaptable adapterPart = null;
-	private View attachedPart = null;
-
-	private Guide   theNewGuide;
-	private Alignment theNewAlign;
-
-	private boolean horizontal;
-
-    /**
-     * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param viewer
-     * @param part
-     * @param horizontalGuide
-     */
-	public ChangeGuideCommand(TransactionalEditingDomain editingDomain, EditPartViewer viewer, IAdaptable part, boolean horizontalGuide) {
-		super(editingDomain, null, null);
-		editPartViewer = viewer;
-		adapterPart = part;
-		horizontal = horizontalGuide;
-	}
-
-    /**
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-     * @param part
-     * @param horizontalGuide
-     */
-	public ChangeGuideCommand(TransactionalEditingDomain editingDomain, View part, boolean horizontalGuide) {
-		super(editingDomain, null, null);
-		attachedPart = part;
-		horizontal = horizontalGuide;
-	}
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		// Detach the part from it's old guide
-		Guide theOldGuide = horizontal ? DiagramGuide.getInstance().getHorizontalGuide(attachedPart) :
-			DiagramGuide.getInstance().getVerticalGuide(attachedPart);
-
-		if (theOldGuide != null) {
-			theOldGuide.getNodeMap().remove(getViewNode());
-		}
-
-		// Attach the part to it's new guide
-		if (theNewGuide != null) {
-			theNewGuide.getNodeMap().put(getViewNode(), theNewAlign);
-		}
-
-		editPartViewer = null;
-		adapterPart    = null;
-		attachedPart   = null;
-		theNewGuide    = null;
-		theNewAlign    = null;
-		
-		return CommandResult.newOKCommandResult();
-	}
-
-	public void setNewGuide(Guide guide, int alignment) {
-		theNewGuide = guide;
-		int value = 0;
-		switch( alignment ) {
-			case -1:
-				value = horizontal ? Alignment.TOP : Alignment.LEFT;
-				break;
-			case 0:
-				value = Alignment.CENTER;
-				break;
-			case 1:
-				value = horizontal ? Alignment.BOTTOM : Alignment.RIGHT;
-		}
-		theNewAlign = Alignment.get(value);
-	}
-
-	private Node getViewNode() {
-		
-		if( adapterPart != null && attachedPart != null ) {
-
-			Map epRegistry =
-				editPartViewer.getEditPartRegistry();
-
-			IGraphicalEditPart attachedEP =
-				(IGraphicalEditPart) epRegistry.get(
-					adapterPart.getAdapter(View.class));
-			
-			attachedPart = (View)attachedEP.getModel();
-		}
-		
-		return (Node)attachedPart;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/CreateGuideCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/CreateGuideCommand.java
deleted file mode 100644
index 14b575c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/CreateGuideCommand.java
+++ /dev/null
@@ -1,62 +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.internal.ruler.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.ui.internal.ruler.DiagramRuler;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-
-/**
- * This command is used to create a guide line
- * @author Jody Schofield
- */
-public class CreateGuideCommand extends AbstractTransactionalCommand {
-
-	private DiagramRuler parent;
-	private int position;
-
-	/**
-	 * Constructor
-	 * This Command is used to create a new guide for a given ruler
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param parent the ruler that will own the guide
-	 * @param position the position that the guide will initially be created at
-	 */
-	public CreateGuideCommand(TransactionalEditingDomain editingDomain, DiagramRuler parent, int position) {
-		super(editingDomain, DiagramUIMessages.Command_createGuide, null);
-		this.parent = parent;
-		this.position = position;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-
-		Guide theGuide = NotationFactory.eINSTANCE.createGuide();
-		theGuide.setPosition(position);
-		parent.addGuide(theGuide);
-
-		parent = null;
-		return CommandResult.newOKCommandResult(theGuide);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/DeleteGuideCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/DeleteGuideCommand.java
deleted file mode 100644
index 97c1d1c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/DeleteGuideCommand.java
+++ /dev/null
@@ -1,62 +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.internal.ruler.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.EMap;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Guide;
-import org.eclipse.gmf.runtime.notation.GuideStyle;
-
-/**
- * This command is used to delete guidelines
- *
- *  @author jschofie
- */
-public class DeleteGuideCommand extends AbstractTransactionalCommand {
-
-	private Guide theGuide;
-
-	/**
-	 * Command used to Delete a guide.
-	 * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param guide the guide to be deleted
-	 */
-	public DeleteGuideCommand(TransactionalEditingDomain editingDomain, Guide guide) {
-        super(editingDomain, DiagramUIMessages.Command_deleteGuide,
-            getWorkspaceFiles(guide));
-        theGuide = guide;
-    }
-
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-	    throws ExecutionException {
-
-		// Clear the attached editparts
-		EMap guideMap = theGuide.getNodeMap();
-		guideMap.clear();
-		
-		// Remove the guide from it's container
-		GuideStyle container = (GuideStyle)theGuide.eContainer();
-		container.getHorizontalGuides().remove(theGuide);
-		container.getVerticalGuides().remove(theGuide);
-
-		theGuide = null;
-		return CommandResult.newOKCommandResult();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/MoveGuideCommand.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/MoveGuideCommand.java
deleted file mode 100644
index a55c1d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/MoveGuideCommand.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.runtime.diagram.ui.internal.ruler.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.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Guide;
-
-
-/**
- * This command is used to move a guideline
- *
- *  @author jschofie
- */
-public class MoveGuideCommand extends AbstractTransactionalCommand {
-
-	private int pDelta;
-	private Guide theGuide;
-		
-	/**
-	 * This command is used to move the position of a given Guide
-	 * 
-     * @param editingDomain
-     *            the editing domain through which model changes are made
-	 * @param guide to be repositioned
-	 * @param positionDelta the relative distance to move the guide
-	 */
-	public MoveGuideCommand(TransactionalEditingDomain editingDomain, Guide guide, int positionDelta) {
-		super(editingDomain, DiagramUIMessages.Command_moveGuide,
-			getWorkspaceFiles(guide));
-		theGuide = guide;
-		pDelta = positionDelta;
-	}
-
-	protected CommandResult doExecuteWithResult(
-            IProgressMonitor progressMonitor, IAdaptable info)
-        throws ExecutionException {
-        
-		// Set the Guides new position
-		theGuide.setPosition(theGuide.getPosition() + pDelta);
-		theGuide = null;
-		return CommandResult.newOKCommandResult();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/commands/package.html
deleted file mode 100644
index 238f6f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/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.runtime.diagram.ui.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/package.html
deleted file mode 100644
index 238f6f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/ruler/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.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/Decoration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/Decoration.java
deleted file mode 100644
index 838e2e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/Decoration.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.decorator;
-
-/**
- * This class wraps a decoration figure to provide capability common to all
- * decorations. It references the owner figure so that it can move with it. It
- * can use a locator for relocating the figure. The real decoration figure is
- * added to this figure.
- * @deprecated Use {org.eclipse.gmf.runtime.diagram.ui.services.decorator.Decoration}
- */
-public class Decoration extends
-		org.eclipse.gmf.runtime.diagram.ui.services.decorator.Decoration {
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorProviderConfiguration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorProviderConfiguration.java
deleted file mode 100644
index 9f97520..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorProviderConfiguration.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.decorator;
-
-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.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-
-
-/**
- * A provider configuration for the Decorator Service. It helps in filtering out
- * and delay the loading of unrelated providers.
- * 
- * @see AbstractProviderConfiguration
- * 
- * @author cmahoney
- */
-public class DecoratorProviderConfiguration
-	extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extension schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-	private static final String DECORATOR_TARGETS = "decoratorTargets"; //$NON-NLS-1$
-
-	/** a list of object descriptors supported by this provider */
-	private List contextDescriptors = new ArrayList();
-
-	/**
-	 * Creates and builds a new provider contribution descriptor (<code>DecoratorProviderConfiguration</code>) by parsing its configuration element.
-	 * 
-	 * @param configElement A provider XML configuration element
-	 * @return A provider XML contribution descriptor
-	 */
-	public static DecoratorProviderConfiguration parse(IConfigurationElement configElement) {
-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
-		return new DecoratorProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * by parsing its configuration element.
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private DecoratorProviderConfiguration(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++) {
-			List decoratorTargets =
-				getObjectList(
-					configChildren[i].getAttribute(DECORATOR_TARGETS),
-					objects, configElement);
-			if (decoratorTargets != null)
-				contextDescriptors.add(new ContextDescriptor(decoratorTargets));
-		}
-	}
-
-	/**
-	 * 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 decoratorTarget the decoratorTarget
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(IDecoratorTarget decoratorTarget) {
-		if (contextDescriptors.isEmpty())
-			return true;
-
-		Iterator iter = contextDescriptors.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor descriptor = (ContextDescriptor) iter.next();
-			if (descriptor.matches(decoratorTarget))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-
-		/** the decoratorTargets */
-		private final List decoratorTargets;
-
-		/**
-		 * creates a new context descriptor from some context info
-		 * 
-		 * @param decoratorTargets the list of decoratorTargets
-		 */
-		public ContextDescriptor(List decoratorTargets) {
-			this.decoratorTargets = decoratorTargets;
-		}
-
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-		 * @param decoratorTarget the decoratorTarget
-		 * @return boolean
-		 */
-		public boolean matches(IDecoratorTarget decoratorTarget) {
-			if (decoratorTargets != null) {
-				if (!objectMatches(decoratorTarget, decoratorTargets))
-					return false;
-			}
-			return true;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java
deleted file mode 100644
index fdb1457..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.decorator;
-
-import org.eclipse.core.runtime.Assert;
-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.diagram.ui.internal.DiagramUIPlugin;
-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;
-
-/**
- * This service is used to add decorators so that shapes and connections on a
- * diagram can be decorated with adornments.
- * 
- * @author cmahoney
- */
-public class DecoratorService
-	extends Service
-	implements IDecoratorProvider {
-
-	/**
-	 * A descriptor for <code>IDecoratorProvider</code> defined by a
-	 * configuration element.
-	 */
-	protected static class ProviderDescriptor
-		extends Service.ProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private DecoratorProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs an <code>IDecoratorProvider</code> descriptor for the
-		 * specified configuration element.
-		 * 
-		 * @param element
-		 *            The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration = DecoratorProviderConfiguration
-				.parse(element);
-			Assert.isNotNull(providerConfiguration);
-		}
-
-		/**
-		 * @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);
-		}
-
-		/**
-		 * Checks if the operation is supported by the XML extension
-		 * 
-		 * @param operation
-		 * @return true if the operation is supported by the XML extension,
-		 *         false otherwise
-		 */
-		private boolean isSupportedInExtention(IOperation operation) {
-			if (operation instanceof CreateDecoratorsOperation) {
-				CreateDecoratorsOperation o = (CreateDecoratorsOperation) operation;
-
-				return providerConfiguration.supports(o.getDecoratorTarget());
-			}
-			return false;
-		}
-	}
-
-	/** The singleton instance of the decorator service. */
-	private final static DecoratorService service = new DecoratorService();
-
-	static {
-		service.configureProviders(DiagramUIPlugin.getPluginId(), "decoratorProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Retrieves the singleton instance of the decorator service.
-	 * 
-	 * @return The decorator service singleton.
-	 */
-	public static DecoratorService getInstance() {
-		return service;
-	}
-
-	/**
-	 * Executes a <code>CreateDecoratorsOperation</code> with a
-	 * <code>REVERSE</code> execution strategy. This allows higher priority
-	 * providers to install their decorators after lower priority providers so
-	 * that their decorations will appear on top.
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider#createDecorators(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget)
-	 */
-	public void createDecorators(IDecoratorTarget decoratorTarget) {
-		execute(ExecutionStrategy.REVERSE, new CreateDecoratorsOperation(
-			decoratorTarget));
-	}
-
-	/**
-	 * @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);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartOperation.java
deleted file mode 100644
index f84234b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.editpart;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Abstract operation that simply stores the associated view and provides an
- * accessor method to all subclasses.
- * 
- * @author gsturov
- */
-public abstract class EditPartOperation
-	implements IEditPartOperation {
-
-	/** cached view. */
-	private final View view;
-	
-	/** a dummy caching key */
-	private static final String dummyHiny = "dummy";  //$NON-NLS-1$
-
-	/**
-	 * Constructor. Caches the supplied view.
-	 * 
-	 * @param view
-	 *            the view element to be <i>controlled </i> by the created
-	 *            editpart.
-	 */
-	protected EditPartOperation(View view) {
-		Assert.isNotNull(view);
-		this.view = view;
-	}
-	
-	/** cached caching key */
-	private String cachingKey;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartOperation#getCachingKey()
-	 */
-	public String getCachingKey() {
-		if (cachingKey == null)
-			cachingKey = determineCachingKey();
-		return cachingKey;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartOperation#getView()
-	 */
-	public final View getView() {
-		return view;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.EditPartOperation#determineCachingKey()
-	 */
-	protected String determineCachingKey() {
-		String type = getView().getType();
-		if (type != null && type.length() > 0)
-			return type;
-	
-		String classId = ViewUtil.getSemanticElementClassId(getView());
-		if (classId != null)
-			return classId;
-	
-		return dummyHiny;
-	}
-
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartProviderConfiguration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartProviderConfiguration.java
deleted file mode 100644
index f8a2b73..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/EditPartProviderConfiguration.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.editpart;
-
-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.Assert;
-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 EditPartService. It helps in filtering out
- * and delay loading unrelated providers.
- */
-public class EditPartProviderConfiguration extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-	private static final String VIEWS = "views"; //$NON-NLS-1$
-	private static final String PROVIDES_ROOT_EDITPART = "providesRootEditPart"; //$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 EditPartProviderConfiguration parse(IConfigurationElement configElement) {
-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
-		return new EditPartProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private EditPartProviderConfiguration(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++) {
-			List views =
-				getObjectList(
-					configChildren[i].getAttribute(VIEWS),
-					objects, configElement);
-			if (views != null)
-				requests.add(
-					new ContextDescriptor(views));
-			
-			String s = configChildren[i].getAttribute(PROVIDES_ROOT_EDITPART);
-			if (s != null) {
-				requests.add(new ContextDescriptor(Boolean.valueOf(s)
-					.booleanValue()));
-			}
-		}
-	}
-
-	/**
-	 * 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 view The view
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(View view) {
-		if (requests.isEmpty())
-			return true;
-
-		Iterator iter = requests.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor request = (ContextDescriptor) iter.next();
-			if (request.matches(view))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Determines if the provider supports creation of a <code>RootEditPart</code>
-	 * The provider understands the request if:
-	 * 1- There are no listed provider contexts
-	 * 2- The context has <code>providesRootEditPart</code> set to true 
-	 * 
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supportsRootEditPart() {
-		if (requests.isEmpty())
-			return true;
-
-		Iterator iter = requests.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor request = (ContextDescriptor) iter.next();
-			if (request.providesRootEditPart())
-				return true;
-		}
-		return false;
-	}
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-		/** the views */
-		private List views;
-		
-		/** boolean flag for <code>RootEditPart</code> creation */
-		private boolean providesRootEditPart;
-
-		/**
-		 * creates a new context descriptor from its context info
-		 * 
-		 * @param views The views
-		 */
-		public ContextDescriptor(List views) {
-			this.views = views;
-		}
-		
-		/**
-		 * creates a new context descriptor from its context info
-		 * 
-		 * @param boolean
-		 *            flag for <code>RootEditPart</code> creation
-		 */
-		public ContextDescriptor(boolean providesRootEditPart) {
-			this.providesRootEditPart = providesRootEditPart;
-		}
-		
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-		 * @param view The view context
-		 * @return boolean
-		 */
-		public boolean matches(View view) {
-			return views != null && objectMatches(view, views);
-		}
-		
-		/**
-		 * Returns true if this context provides for
-		 * <code>RootEditPart</code> creation.
-		 * 
-		 * @return boolean
-		 */
-		public boolean providesRootEditPart() {
-			return providesRootEditPart;
-		}	
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/IEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/IEditPartProvider.java
deleted file mode 100644
index b1ce521..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/IEditPartProvider.java
+++ /dev/null
@@ -1,36 +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.internal.services.editpart;
-
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Defines the factory methods for creating the various editpart elements.
- */
-public interface IEditPartProvider extends IProvider 
-{
-
-	/** Create an editpart mapped to the supplied view element. */
-	public IGraphicalEditPart createGraphicEditPart(View view);
-	
-	/**
-	 * Creates a <code>RootEditPart</code>. 
-	 * @param diagram <code>Diagram</code> notation object that is the context for the operation.
-	 * @return the <code>RootEditPart</code>
-	 */
-	public RootEditPart createRootEditPart(Diagram diagram);
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/package.html
deleted file mode 100644
index 0de9132..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpart/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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyProviderConfiguration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyProviderConfiguration.java
deleted file mode 100644
index 253090d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyProviderConfiguration.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.editpolicy;
-
-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.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-
-/**
- * A provider configuration for the EditPolicy Service. It helps in filtering out
- * and delay loading unrelated providers.
- * 
- * @author chmahone
- */
-public class EditPolicyProviderConfiguration
-	extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String CONTEXT = "context"; //$NON-NLS-1$
-	private static final String EDITPARTS = "editparts"; //$NON-NLS-1$
-
-	/** a map of requests 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 EditPolicyProviderConfiguration parse(IConfigurationElement configElement) {
-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
-		return new EditPolicyProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private EditPolicyProviderConfiguration(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++) {
-			List editParts =
-				getObjectList(
-					configChildren[i].getAttribute(EDITPARTS),
-					objects, configElement);
-			if (editParts != null)
-				contextDescriptors.add(new ContextDescriptor(editParts));
-		}
-	}
-
-	/**
-	 * 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 editPart the editPart
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(EditPart editPart) {
-		if (contextDescriptors.isEmpty())
-			return true;
-
-		Iterator iter = contextDescriptors.iterator();
-		while (iter.hasNext()) {
-			ContextDescriptor descriptor = (ContextDescriptor) iter.next();
-			if (descriptor.matches(editPart))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * A descriptor for a provider context
-	 */
-	private static class ContextDescriptor {
-
-		/** the editparts */
-		private final List editParts;
-
-		/**
-		 * creates a new context descriptor from some context info
-		 * 
-		 * @param editParts the list of editParts
-		 */
-		public ContextDescriptor(List editParts) {
-			this.editParts = editParts;
-		}
-
-		/**
-		 * Determines if the context descriptor matches the given context
-		 * 
-		 * @param editPart the editPart
-		 * @return boolean
-		 */
-		public boolean matches(EditPart editPart) {
-			if (editParts != null) {
-				if (!objectMatches(editPart, editParts))
-					return false;
-			}
-			return true;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java
deleted file mode 100644
index ca1ded9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.editpolicy;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gef.EditPart;
-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.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
-
-/**
- * This service is used to install editpolicies on editparts.
- * 
- * @author chmahone
- */
-public class EditPolicyService extends Service implements IEditPolicyProvider {
-
-	/**
-	 * 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 EditPolicyProviderConfiguration providerConfiguration;
-
-		/**
-		 * Constructs an <code>IEditPolicyProvider</code> descriptor for
-		 * the specified configuration element.
-		 * 
-		 * @param element The configuration element describing the provider.
-		 */
-		public ProviderDescriptor(IConfigurationElement element) {
-			super(element);
-
-			this.providerConfiguration =
-				EditPolicyProviderConfiguration.parse(element);
-			Assert.isNotNull(providerConfiguration);
-		}
-
-		/**
-		 * @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) {
-			CreateEditPoliciesOperation o =
-				(CreateEditPoliciesOperation) operation;
-
-			return providerConfiguration.supports(o.getEditPart());
-		}
-		
-		/** 
-		 * 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$
-	}
-	}
-
-	/** The singleton instance of the editpolicy service. */
-	private final static EditPolicyService service = new EditPolicyService();
-	
-	static {
-		service.configureProviders(DiagramUIPlugin.getPluginId(), "editpolicyProviders"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Retrieves the singleton instance of the editpolicy service.
-	 * @return The editpolicy service singleton.
-	 */
-	public static EditPolicyService getInstance() {
-		return service;
-	}
-
-	/**
-	 * Executes the specified operation using the REVERSE execution strategy.
-	 * @param operation The model operation to be executed.
-	 */
-	private void execute(IOperation operation) {
-		execute(ExecutionStrategy.REVERSE, operation);
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider#createEditPolicies(org.eclipse.gef.EditPart)
-	 */
-	public void createEditPolicies(EditPart editPart) {
-		execute(new CreateEditPoliciesOperation(editPart));
-	}
-
-	/**
-	 * @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);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/package.html
deleted file mode 100644
index 6d9af5e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/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, selection…etc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy org.eclipse.gmf.runtime.diagram.ui.*
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/CanLayoutNodesOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/CanLayoutNodesOperation.java
deleted file mode 100644
index 9b99044..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/CanLayoutNodesOperation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.layout;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider;
-
-/**
- * The operation that determines whether the nodes can be laid out
- * 
- * @author aboyko
- *
- * @since 1.3.1
- */
-public class CanLayoutNodesOperation extends LayoutNodesOperation {
-
-	/**
-	 * Constructs an instance
-	 * 
-	 * @param layoutNodes
-	 *            nodes to layout
-	 * @param offsetFromBoundingBox
-	 *            <code>true</code> if part of the graph is laid out,
-	 *            <code>false<code> for the whole graph layout
-	 * @param layoutHint
-	 *            the layout hint parameter
-	 */
-	public CanLayoutNodesOperation(List layoutNodes,
-			boolean offsetFromBoundingBox, IAdaptable layoutHint) {
-		super(layoutNodes, offsetFromBoundingBox, layoutHint);
-	}
-
-	@Override
-	public Object execute(IProvider provider) {
-        Assert.isNotNull(provider);
-
-        return ((ILayoutNodeProvider) provider).canLayoutNodes(
-        	getLayoutNodes(), shouldOffsetFromBoundingBox(), getLayoutHint());
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/IInternalLayoutRunnable.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/IInternalLayoutRunnable.java
deleted file mode 100644
index 948d773..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/IInternalLayoutRunnable.java
+++ /dev/null
@@ -1,28 +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.internal.services.layout;
-
-import org.eclipse.gef.commands.Command;
-
-
-/**
- * @author sshaw
- *
- * Interface for accessing the wrapped GEF command
- */
-public interface IInternalLayoutRunnable extends Runnable {
-	
-	/**
-	 * @return the wrapped GEF command to be executed from the layout service.
-	 */
-	public Command getCommand();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNode.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNode.java
deleted file mode 100644
index 02ca4ee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNode.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.diagram.ui.internal.services.layout;
-
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode;
-import org.eclipse.gmf.runtime.notation.Node;
-
-
-/**
- * @author sshaw
- *
- * Concrete class implementing the ILayoutNode interface
- */
-public class LayoutNode
-	implements ILayoutNode {
-
-	private Node node;
-	private int width;
-	private int height;
-	
-	public LayoutNode(Node node, int width, int height) {
-		this.node = node;
-		this.width = width;
-		this.height = height;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode#getNode()
-	 */
-	public Node getNode() {
-		return node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode#getSize()
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode#getSize()
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNodesOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNodesOperation.java
deleted file mode 100644
index 5a761b2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutNodesOperation.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.layout;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider;
-
-
-/**
- * @author sshaw
- *
- * The LayoutNodesOperation is an operation used to layout all of the members of a map
- * of Nodes. 
- */
-public class LayoutNodesOperation implements ILayoutNodeOperation {
-	
-	private List layoutNodes = null;
-	private boolean offsetFromBoundingBox;
-	private final IAdaptable layoutHint;
-    
-    /**
-     *  Constructs a new layout operation with the specified parameters
-     * @param layoutNodes   nodes to layout
-     * @param offsetFromBoundingBox  the offset
-     * @param layoutHint the layout hint
-     */
-    public LayoutNodesOperation(
-        List layoutNodes, boolean offsetFromBoundingBox,
-		IAdaptable layoutHint) {            
-            super();
-            Assert.isNotNull(layoutNodes);	            
-            this.layoutNodes = layoutNodes; 
-            this.offsetFromBoundingBox = offsetFromBoundingBox;
-            this.layoutHint = layoutHint;
-    }
-    
-	public List getLayoutNodes() {
-		return layoutNodes;
-	}
-	
-	public boolean shouldOffsetFromBoundingBox() {
-		return offsetFromBoundingBox;
-	}
-	
-    /**
-     * Retrieves the value of the <code>layoutHint</code> instance variable.
-     * 
-     * @return IAdaptable layoutHint
-     */
-    public final IAdaptable getLayoutHint() {
-        return this.layoutHint;
-    } 
-	
-    /* (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.isNotNull(provider);
-
-        return ((ILayoutNodeProvider) provider).layoutLayoutNodes(
-        	getLayoutNodes(), shouldOffsetFromBoundingBox(), getLayoutHint());
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/ContributeToPaletteOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/ContributeToPaletteOperation.java
deleted file mode 100644
index 46c0b20..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/ContributeToPaletteOperation.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.palette;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author melaasar
- *
- * The contribute to palette operation
- */
-public class ContributeToPaletteOperation implements IOperation {
-	/** the editor hosting the palette */
-	private final IEditorPart editor;
-	/** the editor's contents */
-	private final Object content;
-	/** the palette root */
-	private final PaletteRoot root;
-    /** map of predefined entries, populated by each provider */
-    private final Map predefinedEntries;
-
-	/**
-	 * Constructs a new ContributeToPalette operation from an editor and its content
-	 * 
-	 * @param editor The given editor
-	 * @param content The editor's contents
-	 * @param root
-     * @param predefinedEntries
-     *            map of predefined palette entries where the key is the palette
-     *            entry id and the value is the palette entry
-	 */
-	public ContributeToPaletteOperation(
-		IEditorPart editor,
-		Object content,
-		PaletteRoot root, 
-        Map predefinedEntries) {
-		Assert.isNotNull(editor);
-		Assert.isNotNull(content);
-		Assert.isNotNull(root);
-        Assert.isNotNull(predefinedEntries);
-
-		this.editor = editor;
-		this.content = content;
-		this.root = root;
-        this.predefinedEntries = predefinedEntries;
-	}
-
-	/**
-	 * Gets the editor's contents
-	 * 
-	 * @return The editor's contents
-	 */
-	public Object getContent() {
-		return content;
-	}
-
-	/**
-	 * Gets the editor hosting the palette
-	 * 
-	 * @return The editor's hosting the palette
-	 */
-	public IEditorPart getEditor() {
-		return editor;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(org.eclipse.gmf.runtime.common.core.service.IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		((IPaletteProvider) provider).contributeToPalette(
-			getEditor(),
-			getContent(),
-			getPaletteRoot(), getPredefinedEntries());
-		return null;
-	}
-
-	/**
-	 * Gets the palette root
-	 * @return
-	 */
-	public PaletteRoot getPaletteRoot() {
-		return root;
-	}
-
-    /**
-     * Gets the predefined entries map.
-     * @return
-     */
-    public Map getPredefinedEntries() {
-        return predefinedEntries;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/DiagramPaletteFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/DiagramPaletteFactory.java
deleted file mode 100644
index d6ef8bd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/DiagramPaletteFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.palette;
-
-import org.eclipse.gef.Tool;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.ZoomTool;
-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.type.DiagramNotationType;
-
-/**
- * A palette factory for common diagram entries.
- * 
- * @author melaasar
- */
-public class DiagramPaletteFactory extends PaletteFactory.Adapter {
-
-	private static final String TOOL_ZOOM_IN = "zoomInTool"; //$NON-NLS-1$
-    private static final String TOOL_ZOOM_OUT = "zoomOutTool"; //$NON-NLS-1$
-	private static final String TOOL_NOTE = "noteTool"; //$NON-NLS-1$
-	private static final String TOOL_TEXT = "textTool"; //$NON-NLS-1$
-	private static final String TOOL_NOTEATTACHMENT = "noteattachmentTool"; //$NON-NLS-1$
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory#createTool(java.lang.String)
-	 */
-	public Tool createTool(String toolId) {
-		if (toolId.equals(TOOL_ZOOM_IN)) {
-  			return new ZoomTool(true); 
-		}
-	    if (toolId.equals(TOOL_ZOOM_OUT)) {
-	        return new ZoomTool(false);
-	    }
-		if (toolId.equals(TOOL_NOTE)) {
-  			return new CreationTool(DiagramNotationType.NOTE);
-		}
-		if (toolId.equals(TOOL_TEXT)) {			
-			return new CreationTool(DiagramNotationType.TEXT);
-		}
-		if (toolId.equals(TOOL_NOTEATTACHMENT)){
-			return new ConnectionCreationTool(DiagramNotationType.NOTE_ATTACHMENT);
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteProviderConfiguration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteProviderConfiguration.java
deleted file mode 100644
index 4ca9381..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteProviderConfiguration.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.services.palette;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProviderConfiguration;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author melaasar
- *
- * A provider configuration for the PaletteService. It helps in filtering out
- * and delay loading unrelated providers.
- */
-public class PaletteProviderConfiguration extends AbstractProviderConfiguration {
-
-	/** constants corresponding to different symbols in the extention schema */
-	private static final String EDITOR = "editor"; //$NON-NLS-1$
-	private static final String CONTENT = "content"; //$NON-NLS-1$
-
-	/** the target editor */
-	private EditorDescriptor editor;
-	/** the target editor's content */
-	private ObjectDescriptor content;
-
-	/**
-	 * 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 PaletteProviderConfiguration parse(IConfigurationElement configElement) {
-		Assert.isNotNull(configElement, "null provider configuration element"); //$NON-NLS-1$
-		return new PaletteProviderConfiguration(configElement);
-	}
-
-	/**
-	 * Creates a new <code>ProviderContributionDescriptor</code> instance
-	 * given a provider configuration element
-	 * 
-	 * @param configElement The provider XML configuration element
-	 */
-	private PaletteProviderConfiguration(IConfigurationElement configElement) {
-		IConfigurationElement configChildren[];
-
-		// read the editor object if any
-		configChildren = configElement.getChildren(EDITOR);
-		if (configChildren.length > 0)
-			editor = new EditorDescriptor(configChildren[0]);
-
-		// read the content object if any
-		configChildren = configElement.getChildren(CONTENT);
-		if (configChildren.length > 0)
-			content = new ObjectDescriptor(configChildren[0]);
-	}
-
-	/**
-	 * Determines if the provider understands the given context
-	 * 
-	 * @param targetEditor The target editor
-	 * @param targetContent The target editor's content
-	 * @return boolean <code>true</code> if it supports; <code>false</code> otherwise
-	 */
-	public boolean supports(IEditorPart targetEditor, Object targetContent) {
-		if (editor != null && !editor.sameAs(targetEditor))
-			return false;
-		if (content != null && !content.sameAs(targetContent))
-			return false;
-		return true;
-	}
-
-	/**
-	 * An descriptor for an editor in XML by a contribution item provider. 
-	 */
-	private static class EditorDescriptor extends ObjectDescriptor{
-		/** the target id */
-		private final String targetId;
-
-		/**
-		 * Initializes a new editor descriptor by reading the configuration element
-		 * 
-		 * @param configElement The contribution configuration element
-		 */
-		public EditorDescriptor(IConfigurationElement configElement) {
-			super(configElement);
-			targetId = configElement.getAttribute(ID);
-		}
-
-		/**
-		 * Determines whether this contribution is applicable to the given editor
-		 * 
-		 * @param editor The target editor
-		 * @return <code>true</code> if applicable <code>false</code> if not
-		 */
-		public boolean sameAs(Object object) {
-			if (!(object instanceof IEditorPart))
-				return false;
-			
-			if (targetId != null)
-				if (!targetId.equals(((IEditorPart)object).getSite().getId()))
-					return false;
-			
-			return super.sameAs(object);
-		}
-
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteTemplateEntry.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteTemplateEntry.java
deleted file mode 100644
index 34683f5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteTemplateEntry.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.ui.internal.services.palette;
-
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-
-/**
- * A template palette entry with identity
- * 
- * @author melaasar
- */
-public class PaletteTemplateEntry
-	extends org.eclipse.gef.palette.PaletteTemplateEntry {
-
-	/** the drawer's id */
-	private PaletteFactory factory;
-
-	/**
-	 * @param id
-	 * @param label
-	 * @param factory
-	 */
-	public PaletteTemplateEntry(String id, String label, PaletteFactory factory) {
-		super(label, null, null, null, null);
-		setId(id);
-		this.factory = factory;
-	}
-
-	/**
-	 * @see org.eclipse.gef.palette.PaletteTemplateEntry#getTemplate()
-	 */
-	public Object getTemplate() {
-		return factory.getTemplate(getId());
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteToolEntry.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteToolEntry.java
deleted file mode 100644
index 0b668d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/PaletteToolEntry.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.internal.services.palette;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-
-/**
- * A tool palette entry with identity
- * 
- * @author melaasar
- */
-public class PaletteToolEntry
-	extends CombinedTemplateCreationEntry {
-	
-	/** the drawer's id */
-	private Tool tool;
-	private PaletteFactory factory;
-	
-	/**
-	 * @param id
-	 * @param label
-	 * @param factory
-	 */
-	public PaletteToolEntry(
-		String id,
-		String label,
-		PaletteFactory factory) {
-		super(label, null, null, null, null, null);
-		setId(id);
-		this.factory = factory;
-		setTemplate(this);
-	}
-
-	public Tool createTool() {
-		return tool != null ? tool : factory.createTool(getId());
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/palette/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/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 %level1
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/CompartmentCollapseTracker.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/CompartmentCollapseTracker.java
deleted file mode 100644
index 001e605..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/CompartmentCollapseTracker.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.diagram.ui.internal.tools;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.tools.AbstractTool;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart;
-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.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.notation.DrawerStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-
-public class CompartmentCollapseTracker
-	extends AbstractTool
-	implements DragTracker {
-
-	private IResizableCompartmentEditPart compartmentEditPart;
-
-	public CompartmentCollapseTracker(IResizableCompartmentEditPart compartmentEditPart) {
-		this.compartmentEditPart = compartmentEditPart;
-	}
-
-	protected List createOperationSet() {
-		List list = new ArrayList(1);
-		list.add(compartmentEditPart);
-		return list;
-	}
-
-	protected Command getCommand(Boolean expand) {
-		ChangePropertyValueRequest request = new ChangePropertyValueRequest(
-			DiagramUIMessages.PropertyDescriptorFactory_CollapseCompartment,
-			Properties.ID_COLLAPSED, expand);
-		return compartmentEditPart.getCommand(request);
-	}
-
-	protected String getCommandName() {
-		return "Collapse Compartment"; //$NON-NLS-1$
-	}
-
-	protected String getDebugName() {
-		return "Collapse Compartment Tool"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
-	 */
-	protected boolean handleButtonDown(int button) {
-		View view  = compartmentEditPart.getNotationView();
-		if (view!=null){
-			DrawerStyle style = (DrawerStyle)view.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
-			if (style != null) {
-				Boolean newValue = style.isCollapsed() ? Boolean.FALSE : Boolean.TRUE;
-				setCurrentCommand(getCommand(newValue));
-				executeCurrentCommand();
-				return true;
-			} 
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)
-	 */
-	protected boolean handleKeyDown(KeyEvent e) {
-		if (e.keyCode == SWT.ARROW_RIGHT || e.keyCode == SWT.ARROW_LEFT) {
-			Boolean b =
-				e.keyCode == SWT.ARROW_RIGHT ? Boolean.FALSE : Boolean.TRUE;
-			setCurrentCommand(getCommand(b));
-			executeCurrentCommand();
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ConnectionHandleTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ConnectionHandleTool.java
deleted file mode 100644
index 244bd98..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ConnectionHandleTool.java
+++ /dev/null
@@ -1,320 +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.internal.tools;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.dialogs.ExpansionType;
-import org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand;
-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.handles.ConnectionHandle;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.ElementTypeLabelProvider;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ShowRelatedElementsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * This tool is responsible for reacting to mouse events on the connection
- * handles. It will get a command to create a connection when the user clicks
- * and drags the handle. It will get a command to expand elements, when the user
- * clicks the handle. It also adds support to create relationships from target
- * to source.
- * 
- * @author cmahoney
- */
-public class ConnectionHandleTool
-	extends ConnectionCreationTool
-	implements DragTracker {
-
-	/** Time in ms to display error icon when there are no related elements. */
-	private static final int NO_RELATED_ELEMENTS_DISPLAY_TIME = 2000;
-
-	/** the connection handle containing required information */
-	private ConnectionHandle connectionHandle;
-
-	/**
-	 * Constructor for ConnectionHandleTool.
-	 * 
-	 * @param connectionHandle
-	 *            the connection handle
-	 */
-	public ConnectionHandleTool(ConnectionHandle connectionHandle) {
-		this.connectionHandle = connectionHandle;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		if (getConnectionHandle().isIncoming()) {
-			CreateUnspecifiedTypeConnectionRequest request = new CreateUnspecifiedTypeConnectionRequest(
-				ModelingAssistantService.getInstance().getRelTypesOnTarget(
-					getConnectionHandle().getOwner()), true,
-				getPreferencesHint());
-			request.setDirectionReversed(true);
-			return request;
-		} else {
-			return new CreateUnspecifiedTypeConnectionRequest(
-				ModelingAssistantService.getInstance().getRelTypesOnSource(
-					getConnectionHandle().getOwner()), true,
-				getPreferencesHint());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
-	 */
-	protected Command getCommand() {
-		if (getConnectionHandle().isIncoming()) {
-			CreateUnspecifiedTypeConnectionRequest unspecifiedTypeRequest = (CreateUnspecifiedTypeConnectionRequest) getTargetRequest();
-			unspecifiedTypeRequest.setDirectionReversed(true);
-		}
-
-		return super.getCommand();
-	}
-
-	/**
-	 * When a double-click occurs, this is called first on the first mouse
-	 * button up. In the case where a double-click is going to occur, we do not
-	 * want the default behavior here (which is to create a self-connection).
-	 * Therefore, we will only permit self-connections if the user has moved the
-	 * mouse.
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
-	 */
-	protected boolean handleButtonUp(int button) {
-		if (getDragMoveDelta().equals(0, 0)) {
-			return true; // ignore this button up
-		}
-		return super.handleButtonUp(button);
-	}
-
-	/**
-	 * On a double-click, the related elements are expanded.
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDoubleClick(int)
-	 */
-	protected boolean handleDoubleClick(int button) {
-		// When a connection is to be created, a dialog box may appear which
-		// will cause
-		// this tool to be deactivated. This behavior is overridden by setting
-		// the
-		// avoid deactivation flag.
-		eraseSourceFeedback();
-		setAvoidDeactivation(true);
-
-		List relatedShapes = executeShowRelatedElementsCommand();
-		if (relatedShapes != null && relatedShapes.size() < 2) {
-			signalNoRelatedElements();
-		}
-		setAvoidDeactivation(false);
-		deactivate();
-
-		return true;
-	}
-
-	/**
-	 * Gets the command to show related elements and arrange the new views.
-	 * Prompts the user for the relationship types to choose if there are
-	 * multiple types. Executes the command with a progress monitor.
-	 * 
-	 * @return the list of related shapes
-	 */
-	protected List executeShowRelatedElementsCommand() {
-		IGraphicalEditPart targetEP = (IGraphicalEditPart) getTargetEditPart();
-
-		DiagramEditPart diagramEP = ((DiagramEditDomain) targetEP
-			.getDiagramEditDomain()).getDiagramEditorPart()
-			.getDiagramEditPart();
-
-		List popupContent = getConnectionHandle().isIncoming() ? ModelingAssistantService
-			.getInstance().getRelTypesForSREOnTarget(targetEP)
-			: ModelingAssistantService.getInstance().getRelTypesForSREOnSource(
-				targetEP);
-
-		if (popupContent.isEmpty()) {
-			return null;
-		}
-
-		// TODO: Get this working
-		// popupContent.add(0, DiagramResourceManager
-		// .getI18NString("ConnectionHandle.Popup.ShowRelatedElementsDialog"));
-		// //$NON-NLS-1$
-
-		LabelProvider labelProvider = new ElementTypeLabelProvider() {
-
-			public String getText(Object element) {
-				String elementName = super.getText(element);
-				if (element instanceof IElementType) {
-					String theInputStr = DiagramUIMessages.ConnectionHandle_Popup_ShowRelatedXRelationships;
-					String text = NLS.bind(theInputStr, elementName);
-					return text;
-				}
-				return elementName;
-			}
-		};
-
-		PopupMenu popupMenu = new PopupMenu(popupContent, labelProvider);
-		PopupMenuCommand popupCmd = new PopupMenuCommand("", Display //$NON-NLS-1$
-			.getCurrent().getActiveShell(), popupMenu);
-       
-        try {
-            popupCmd.execute(new NullProgressMonitor(), null);
-            
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                ConnectionHandleTool.class,
-                "executeShowRelatedElementsCommand", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                "executeShowRelatedElementsCommand", e); //$NON-NLS-1$
-            
-            // cancel the gesture
-            return null;
-        }
-        
-		if (!popupCmd.getCommandResult().getStatus().isOK()) {
-			// user cancelled gesture
-			return null;
-		}
-		Object result = popupCmd.getCommandResult().getReturnValue();
-
-		if (result instanceof IElementType) {
-			ExpansionType expansionType = (getConnectionHandle().isIncoming()) ? ExpansionType.INCOMING
-				: ExpansionType.OUTGOING;
-			ShowRelatedElementsRequest showRelatedRequest = new ShowRelatedElementsRequest(
-				Collections.singletonList(targetEP), Collections
-					.singletonList(result), false, 1, expansionType);
-
-			Command sreCommand = diagramEP.getCommand(showRelatedRequest);
-
-			if (sreCommand == null) {
-				return null;
-			}
-
-			final CompoundCommand cc = new CompoundCommand(sreCommand
-				.getLabel());
-
-			cc.add(sreCommand);
-
-			ArrangeRequest request = new ArrangeRequest(
-				RequestConstants.REQ_ARRANGE_DEFERRED);
-			request.setViewAdaptersToArrange(showRelatedRequest
-				.getRelatedShapes());
-			Command arrangeCommand = diagramEP.getCommand(request);
-
-			cc.add(arrangeCommand);
-			executeWithProgressMonitor(cc);
-			return showRelatedRequest.getRelatedShapes();
-		} else {
-			// TODO: Pop up SRE dialog.
-			MessageDialog.openInformation(
-				Display.getCurrent().getActiveShell(), "To Be Implemented", //$NON-NLS-1$
-				"The Show Related Elements Dialog will popup."); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/**
-	 * Executes the command using a dispatching progress dialog utility - in
-	 * order to get a cancellable progress monitor
-	 * 
-	 * @param cmd
-	 *            the <code>ICommand</code> to execute
-	 */
-	protected void executeWithProgressMonitor(final Command command) {
-
-		final DiagramCommandStack commandStack = ((IGraphicalEditPart) getTargetEditPart())
-			.getDiagramEditDomain().getDiagramCommandStack();
-
-		try {
-			new ProgressMonitorDialog(null).run(false, true, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-					commandStack.execute(command, monitor);
-				}
-			});
-		} catch (InvocationTargetException ite) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				ConnectionHandleTool.class,
-				"executeWithProgressMonitor", ite); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"executeWithProgressMonitor", ite); //$NON-NLS-1$
-		} catch (InterruptedException ie) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				ConnectionHandleTool.class,
-				"executeWithProgressMonitor", ie); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Temporary shows a red X over the connection handle to indicate that there
-	 * are no related elements to be expanded.
-	 */
-	protected void signalNoRelatedElements() {
-		getConnectionHandle().addErrorIcon();
-		Display.getCurrent().timerExec(NO_RELATED_ELEMENTS_DISPLAY_TIME,
-			new Runnable() {
-
-				public void run() {
-					getConnectionHandle().removeErrorIcon();
-				}
-			});
-	}
-
-	/**
-	 * Returns the connection handle.
-	 * 
-	 * @return the connection handle
-	 */
-	protected ConnectionHandle getConnectionHandle() {
-		return connectionHandle;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RotateTracker.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RotateTracker.java
deleted file mode 100644
index f522d6a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RotateTracker.java
+++ /dev/null
@@ -1,95 +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.internal.tools;
-
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.tools.ResizeTracker;
-import org.eclipse.swt.graphics.Cursor;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IRotatableEditPart;
-import org.eclipse.gmf.runtime.gef.ui.internal.requests.RotateShapeRequest;
-
-/**
- * Rotate tracker provides support for figure rotations.
- * Creates and passes off RotateShapeRequests to the EditPolicies
- * The request specifies whether the EditPart can be rotated
- * 
- * @author oboyko
- * 
- */
-public class RotateTracker extends ResizeTracker {
-	
-	// We need to remember which of the handles has been used for rotations
-	private int direction;
-
-	/**
-	 * Constructs a resize tracker that resizes in the specified direction.  The direction is
-	 * specified using {@link PositionConstants#NORTH}, {@link PositionConstants#NORTH_EAST},
-	 * etc.
-	 * 
-	 * @param direction the direction of the resize gesture
-	 * @param owner of the resize handle which returned this tracker
-	 */
-	public RotateTracker(GraphicalEditPart owner, int direction) {
-		super(owner, direction);
-		this.direction = direction;
-	}
-	
-	/*
-	 * Determines whether the selected EditPart can be rotated
-	 */
-	private boolean isRotationRequired() {
-		boolean result = true;
-		// check if the selected edit parts implement rotatable interface and 
-		// if they are check if they are rotatable
-		for (int i=0; i<getOperationSet().size() && result; i++) {
-			result = getOperationSet().get(i) instanceof IRotatableEditPart ?  
-			((IRotatableEditPart) getOperationSet().get(i)).isRotatable() : false; 
-		}
-		return result;
-	}
-	
-	/**
-	 * This method must be overriden to give the RotateShapeRequest information on
-	 * whether the rotation is for the EditPart is permited or not   
-	 */
-	protected void updateSourceRequest() {
-		super.updateSourceRequest();
-		RotateShapeRequest request = (RotateShapeRequest) getSourceRequest();
-		request.setRotate(isRotationRequired());
-	}
-	
-	/**
-	 * Creates the new RotateShapeRequest for which the rotation p-ermission is
-	 * evaluated later on
-	 */
-	protected Request createSourceRequest() {
-		RotateShapeRequest request;
-		request = new RotateShapeRequest(REQ_RESIZE);
-		request.setResizeDirection(getResizeDirection());
-		return request;
-	}
-	
-	/**
-	 * If rotation is not permited for the selected EditParts then by dragging a rotate
-	 * handle the rotate tracker becomes resize tracker and the selected figures are being
-	 * resized, hence the cursor dispalyed will be an arrow corresponding to the dragging 
-	 * direction. Otherwise, the cursor returned is "hand"
-	 */
-	protected Cursor getDefaultCursor() {
-		return isRotationRequired() ? Cursors.HAND : Cursors.getDirectionalCursor(direction);
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandDragTracker.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandDragTracker.java
deleted file mode 100644
index 3845fc0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandDragTracker.java
+++ /dev/null
@@ -1,33 +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.internal.tools;
-
-import org.eclipse.gef.DragTracker;
-
-
-/**
- * @author tisrar
- */
-public class RubberbandDragTracker
-	extends RubberbandSelectionTool
-	implements DragTracker {
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#handleFinished()
-	 */
-	protected void handleFinished() {
-		//nothing goes here
-		
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandSelectionTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandSelectionTool.java
deleted file mode 100644
index 5913221..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/RubberbandSelectionTool.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.tools;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import javax.swing.plaf.basic.BasicComboBoxUI.KeyHandler;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gef.tools.AbstractTool;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.util.SelectInDiagramHelper;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A Tool which selects multiple objects inside a rectangular area of a Graphical Viewer. 
- * If the SHIFT key is pressed at the beginning of the drag, the enclosed items will be
- * appended to the current selection.  If the CONTROL key is pressed at the beginning of
- * the drag, the enclosed items will have their selection state inverted.
- * <P>
- * By default, only editparts whose figure's are on the primary layer will be considered
- * within the enclosed rectangle.
- * 
- * Tauseef Israr
- * September 20, 04.  This class is a copy of MarqueeSelectionTool but provides two
- * additional functionality. 
- * 1. The selection of connectors which is reported here
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=74360
-
-           Summary: MarqueeSelectionTool does not select connectors.
-           Product: GEF
-           Version: unspecified
-          Platform: PC
-        OS/Version: Windows XP
-            Status: NEW
-          Severity: normal
-          Priority: P3
-         Component: GEF
-        AssignedTo: gef-inbox@eclipse.org
-        ReportedBy: tisrar@ca.ibm.com
- *
- *and the 2. is the auto-scroll capability.
- */
-public class RubberbandSelectionTool
-	extends AbstractTool
-{
-
-static final int TOGGLE_MODE = 1;
-static final int APPEND_MODE = 2;
-
-private int mode;
-
-private Figure marqueeRectangleFigure;
-private HashSet allChildren = new HashSet();
-private List selectedEditParts;
-private Request targetRequest;
-
-private Point feedBackStartLocation = null;
-
-private WeakReference weakReference;
-
-private static final Request MARQUEE_REQUEST =
-	new Request(RequestConstants.REQ_SELECTION); 
-
-/**
- * Creates a new MarqueeSelectionTool.
- */
-public RubberbandSelectionTool() {
-	setDefaultCursor(SharedCursors.CROSS); 
-	setUnloadWhenFinished(false);
-}
-
-private List calculateNewSelection() {
-
-	List newSelections = new ArrayList();
-	Iterator children = getAllChildren().iterator();
-	Rectangle marqueeBounds = getMarqueeBounds();
-	
-	// Calculate new selections based on which children fall
-	// inside the marquee selection rectangle.  Do not select
-	// children who are not visible
-	while (children.hasNext()){	
-		EditPart child = (EditPart) children.next();
-		IFigure figure = ((GraphicalEditPart)child).getFigure();
-		if (!child.isSelectable() 
-			|| child.getTargetEditPart(MARQUEE_REQUEST) != child
-			|| !isFigureVisible(figure)) 
-		{
-			continue;
-		}	
-		Rectangle r;
-		if (child instanceof ConnectionEditPart) {
-			// RATLC00569348 For connection, get the bounds of connection points rather than connection figure since the 
-			// figure's bounds contain the bounds of all connection children and would require selection rectangle 
-			// to be larger than expected in some cases
-			r = ((Connection)figure).getPoints().getBounds().getCopy();
-		} else {
-			r = figure.getBounds().getCopy();
-		}
-		figure.translateToAbsolute(r);			
-		getMarqueeFeedbackFigure().translateToRelative(r);
-		if (marqueeBounds.contains(r.getTopLeft())
-			&& marqueeBounds.contains(r.getBottomRight()))
-		{
-			newSelections.add(child);
-		}		
-	}
-	return newSelections;
-}
-
-private boolean isFigureVisible(IFigure fig) {
-	Rectangle figBounds = fig.getBounds().getCopy();
-	IFigure walker = fig.getParent();
-	Viewport topViewport = ((FigureCanvas)getCurrentViewer().getControl()).getViewport();
-	while (!figBounds.isEmpty() && walker != null && walker != topViewport) {
-		walker.translateToParent(figBounds);
-		figBounds.intersect(walker.getBounds());
-		walker = walker.getParent();
-	}
-	return !figBounds.isEmpty();
-}
-
-private Request createTargetRequest() {
-	return MARQUEE_REQUEST;
-}
-
-/**
- * Erases feedback if necessary and puts the tool into the terminal state.
- */
-public void deactivate() {
-	if (isInState(STATE_DRAG_IN_PROGRESS)) {
-		eraseMarqueeFeedback();
-		eraseTargetFeedback();
-	}
-	super.deactivate();
-	allChildren = new HashSet();
-	setState(STATE_TERMINAL);
-}
-
-private void eraseMarqueeFeedback() {
-	if (marqueeRectangleFigure != null) {
-		removeFeedback(marqueeRectangleFigure);
-		marqueeRectangleFigure = null;		
-	}
-	feedBackStartLocation = null;
-}
-
-private void eraseTargetFeedback() {
-	if (selectedEditParts == null)
-		return;
-	ListIterator oldEditParts = selectedEditParts.listIterator();
-	while (oldEditParts.hasNext()) {
-		EditPart editPart = (EditPart)oldEditParts.next();
-		editPart.eraseTargetFeedback(getTargetRequest());
-	}
-}
-
-/**
- * Returns a list including all of the children
- * of the edit part passed in.
- */
-private HashSet getAllChildren(EditPart editPart, HashSet allChildren1){	
-	List children = editPart.getChildren();
-	for (int i = 0; i < children.size(); i++) {
-		GraphicalEditPart child = (GraphicalEditPart) children.get(i);
-		if (!(child instanceof IBorderItemEditPart)){
-			allChildren1.add(child);
-			getAllChildren(child, allChildren1);
-		}
-		allChildren1.addAll(child.getSourceConnections());
-		allChildren1.addAll(child.getTargetConnections());		
-	}
-	return allChildren1;
-}
-
-/**
- * Return a vector including all of the children
- * of the root editpart
- */
-private HashSet getAllChildren() {
-	if (allChildren.isEmpty())
-		allChildren = getAllChildren(
-			getCurrentViewer().getContents(),
-			new HashSet());
-	return allChildren;
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
- */
-protected String getCommandName() {
-	return REQ_SELECTION;
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
- */
-protected String getDebugName() {
-	return "Marquee Tool";//$NON-NLS-1$
-}
-
-protected IFigure getMarqueeFeedbackFigure() {		
-	if (marqueeRectangleFigure == null) {
-		marqueeRectangleFigure = new MarqueeRectangleFigure();
-		addFeedback(marqueeRectangleFigure);
-	}
-	return marqueeRectangleFigure;
-}
-
-protected Rectangle getMarqueeSelectionRectangle() {
-	return new Rectangle(getStartLocation(),getLocation());
-}
-
-/**
- * Gets the relative bounds of the marquee feedback figure.
- * @return
- */
-private Rectangle getMarqueeBounds(){
-	if (getMarqueeFeedbackFigure() == null)
-		return new Rectangle();
-	
-	Rectangle rect = new Rectangle();
-	if (feedBackStartLocation == null){
-		rect = getMarqueeSelectionRectangle();
-		getMarqueeFeedbackFigure().translateToRelative(rect);
-		feedBackStartLocation = rect.getLocation();
-		return rect;
-	}else{
-		Point location = getLocation().getCopy();
-		getMarqueeFeedbackFigure().translateToRelative(location);
-		rect = new Rectangle(feedBackStartLocation,location);
-		return rect;
-	}
-	
-}
-
-private int getSelectionMode() {
-	return mode;
-}
-
-private Request getTargetRequest() {
-	if (targetRequest == null)
-		targetRequest = createTargetRequest();
-	return targetRequest;
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)
- */
-protected boolean handleButtonDown(int button) {
-	if (!isGraphicalViewer())
-		return true;
-	if (button != 1) {
-		setState(STATE_INVALID);
-		handleInvalidInput();
-	}
-	if (stateTransition(STATE_INITIAL, STATE_DRAG_IN_PROGRESS)) {
-		if (getCurrentInput().isControlKeyDown())
-			setSelectionMode(TOGGLE_MODE);
-		else if (getCurrentInput().isShiftKeyDown())
-			setSelectionMode(APPEND_MODE);
-		
-		// RATLC00740277:
-		// clear current focus (if any) before we start computing selections,
-		//   because we don't want to select any compartments in the focus
-		//   edit part if they shouldn't be selectable
-		clearFocus();
-	}
-	return true;
-}
-
-/**
- * Effectively clears the current focus edit part by deliberately setting the
- * diagram contents edit part as the focus.  This ensures that the rubber band
- * won't mistakenly select the selectable compartments and items in the current
- * focus edit part.
- */
-private void clearFocus() {
-	EditPart focusPart = getCurrentViewer().getFocusEditPart();
-	
-	if (focusPart != null) {
-		// replace the current focus with the contents edit part, which effectively
-		//   blocks unwanted selectability of compartments within the previous
-		//  focus edit part
-		getCurrentViewer().setFocus(getCurrentViewer().getContents());
-	}
-}
-
-/**
- * Extends the inherited method by first restoring the current viewer's focus
- * edit part to the default (which is the last selected edit part).  This undoes
- * the work-around that sets the diagram root as the focus.
- * 
- * @see #clearFocus()
- */
-protected void handleFinished() {
-	getCurrentViewer().setFocus(null);
-	
-	super.handleFinished();
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
- */
-protected boolean handleButtonUp(int button) {
-	if (stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {
-		eraseTargetFeedback();
-		performMarqueeSelect();
-		eraseMarqueeFeedback();		
-	}
-	handleFinished();
-	return true;
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()
- */
-protected boolean handleDragInProgress() {
-	if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {		
-		
-		showMarqueeFeedback();
-		eraseTargetFeedback();		
-		selectedEditParts = calculateNewSelection();
-		showTargetFeedback();
-		SelectInDiagramHelper.exposeLocation((FigureCanvas)getCurrentViewer().getControl(),getLocation());
-				
-	}
-	return true;
-}
-
-/**
- * @see org.eclipse.gef.tools.AbstractTool#handleFocusLost()
- */
-protected boolean handleFocusLost() {
-	if (isInState(STATE_DRAG | STATE_DRAG_IN_PROGRESS)) {
-		handleFinished();
-		return true;
-	}
-	return false;
-}
-
-/**
- * This method is called when mouse or keyboard input is invalid and erases the feedback.
- * @return <code>true</code>
- */
-protected boolean handleInvalidInput() {
-	eraseTargetFeedback();
-	eraseMarqueeFeedback();
-	return true;
-}
-
-/**
- * Handles high-level processing of a key down event. 
- * KeyEvents are forwarded to the current viewer's {@link KeyHandler}, 
- * via {@link KeyHandler#keyPressed(KeyEvent)}.
- * @see AbstractTool#handleKeyDown(KeyEvent)
- */
-protected boolean handleKeyDown(KeyEvent e) {
-	if (super.handleKeyDown(e))
-		return true;
-	if (getCurrentViewer().getKeyHandler() != null
-		&& getCurrentViewer().getKeyHandler().keyPressed(e))
-		return true;
-	return false;		
-}
-
-private boolean isGraphicalViewer() {
-	return getCurrentViewer() instanceof GraphicalViewer;
-}
-
-protected void performMarqueeSelect() {
-	EditPartViewer viewer = getCurrentViewer();
-
-	List newSelections = calculateNewSelection();
-
-	// If in multi select mode, add the new selections to the already
-	// selected group; otherwise, clear the selection and select the new group
-	if (getSelectionMode() == APPEND_MODE) {
-		for (int i = 0; i < newSelections.size(); i++) {
-			EditPart editPart = (EditPart)newSelections.get(i);	
-			viewer.appendSelection(editPart); 
-		} 
-	} else if (getSelectionMode() == TOGGLE_MODE) {
-		List selected = new ArrayList(viewer.getSelectedEditParts());
-		for (int i = 0; i < newSelections.size(); i++) {
-			EditPart editPart = (EditPart)newSelections.get(i);	
-			if (editPart.getSelected() != EditPart.SELECTED_NONE)
-				selected.remove(editPart);
-			else
-				selected.add(editPart);
-		}
-		viewer.setSelection(new StructuredSelection(selected));
-	} else {
-		viewer.setSelection(new StructuredSelection(newSelections));
-	}
-}
-
-/**
- * @see org.eclipse.gef.Tool#setViewer(org.eclipse.gef.EditPartViewer)
- */
-public void setViewer(EditPartViewer viewer) {
-	if (viewer == getCurrentViewer())
-		return;
-	super.setViewer(viewer);
-	if (viewer instanceof GraphicalViewer)
-		setDefaultCursor(SharedCursors.CROSS);
-	else
-		setDefaultCursor(SharedCursors.NO);
-	if (viewer != null)
-		weakReference = new WeakReference(viewer);
-}
-
-private void setSelectionMode(int mode) {
-	this.mode = mode;
-}
-
-private void showMarqueeFeedback() {
-	getMarqueeFeedbackFigure().setBounds(getMarqueeBounds());
-}
-
-private void showTargetFeedback() {
-	for (int i = 0; i < selectedEditParts.size(); i++) {
-		EditPart editPart = (EditPart) selectedEditParts.get(i);
-		editPart.showTargetFeedback(getTargetRequest());
-	}
-}/**
- * Convenience method to removes a figure from the feedback layer.
- * @param figure the figure being removed
- */
-	protected void removeFeedback(IFigure figure) {
-		EditPartViewer viewer = getCurrentViewer();
-		if ((viewer == null)&&(weakReference != null))
-			viewer = (EditPartViewer) weakReference.get();
-		if (viewer != null) {
-			LayerManager lm = (LayerManager) viewer.getEditPartRegistry().get(
-				LayerManager.ID);
-			if (lm == null)
-				return;
-			lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);
-		}
-	}
-
-class MarqueeRectangleFigure 
-extends Figure {
-
-private int offset = 0;
-private boolean schedulePaint = true;
-private static final int DELAY = 110; //animation delay in millisecond
-/**
- * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)
- */
-protected void paintFigure(Graphics graphics) {	
-	Rectangle bounds1 = getBounds().getCopy();
-	graphics.translate(getLocation());
-	
-	graphics.setXORMode(true);
-	graphics.setForegroundColor(ColorConstants.white);
-	graphics.setBackgroundColor(ColorConstants.black);
-	
-	graphics.setLineStyle(Graphics.LINE_DOT);
-	
-	int[] points = new int[6];
-	
-	points[0] = 0 + offset;
-	points[1] = 0;
-	points[2] = bounds1.width - 1;
-	points[3] = 0;
-	points[4] = bounds1.width - 1;
-	points[5] = bounds1.height - 1;
-	
-	graphics.drawPolyline(points);
-	
-	points[0] = 0;
-	points[1] = 0 + offset;
-	points[2] = 0;
-	points[3] = bounds1.height - 1;
-	points[4] = bounds1.width - 1;
-	points[5] = bounds1.height - 1;
-	
-	graphics.drawPolyline(points);
-	
-	graphics.translate(getLocation().getNegated());
-	
-	if (schedulePaint) {
-		Display.getCurrent().timerExec(DELAY, new Runnable() {
-			public void run() {
-				offset++;
-				if (offset > 5)
-					offset = 0;	
-				
-				schedulePaint = true;
-				repaint();
-			}
-		});
-	}
-	
-	schedulePaint = false;
-}
-	
-}
-
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ZoomTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ZoomTool.java
deleted file mode 100644
index 9569e71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/ZoomTool.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.tools;
-
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ZoomableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Cursor;
-
-/**
- * @author sshaw
- * 
- * Implementation for the ZoomTool that supports marquee selection of zoom area
- * and zoom-in / zoom-out capability.
- */
-public class ZoomTool
-	extends RubberbandSelectionTool {
-
-	static private final int ZOOM_IN_MODE = 1;
-	static private final int ZOOM_OUT_MODE = 2;
-	static private final int ZOOM_PAN_MODE = 3;
-
-	static final Cursor zoom_out_cursor = new Cursor(null,
-		DiagramUIPluginImages.DESC_ZOOM_OUT.getImageData(), 0, 0); 
-
-	static final Cursor zoom_in_cursor = new Cursor(null,
-		DiagramUIPluginImages.DESC_ZOOM_IN.getImageData(), 0, 0);
-
-	static final Cursor zoom_pan_cursor = Cursors.HAND;
-
-    /**
-     * true if this is a zoom in tool; false if this is a zoom out tool
-     */
-    private boolean zoomIn = true;
-    
-	private int zoommode = 1;
-	
-	/**
-	 * Creates a new ZoomTool.
-	 * @param zoomIn true if this is a zoom in tool; false if this is a zoom out tool
-	 */
-	public ZoomTool(boolean zoomIn) {
-	    this.zoomIn = zoomIn;
-	    zoommode = getInitialZoomMode();
-		setUnloadWhenFinished(false);
-	}
-
-	protected Cursor getDefaultCursor() {
-		if (getCurrentViewer() instanceof GraphicalViewer) {
-			if (getZoomMode() == ZOOM_IN_MODE)
-				return zoom_in_cursor;
-			else if (getZoomMode() == ZOOM_OUT_MODE)
-				return zoom_out_cursor;
-			else if (getZoomMode() == ZOOM_PAN_MODE)
-				return zoom_pan_cursor;
-		}
-		return Cursors.NO;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
-	 */
-	protected String getCommandName() {
-		return REQ_SELECTION;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
-	 */
-	protected String getDebugName() {
-		return "Zoom Tool";//$NON-NLS-1$
-	}
-
-	private int getZoomMode() {
-		return zoommode;
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.tools.AbstractTool#handleViewerEntered()
-     */
-    protected boolean handleViewerEntered() {
-        boolean handled = super.handleViewerEntered();
-        if (getCurrentViewer() != null) {
-        	getCurrentViewer().getControl().forceFocus();
-       		handled = true;
-       	}
-       	
-       	return handled;
-    }
-    
-	/**
-	 * Handles high-level processing of a key down event. KeyEvents are
-	 * forwarded to the current viewer's {@link KeyHandler}, via
-	 * {@link KeyHandler#keyPressed(KeyEvent)}.
-	 * 
-	 * @see AbstractTool#handleKeyDown(KeyEvent)
-	 */
-	protected boolean handleKeyDown(KeyEvent e) {
-		if (super.handleKeyDown(e))
-			return true;
-		if (getCurrentViewer().getKeyHandler() != null
-			&& getCurrentViewer().getKeyHandler().keyPressed(e))
-			return true;
-		if (e.keyCode == SWT.SHIFT)
-			setZoomMode(zoomIn ? ZOOM_OUT_MODE : ZOOM_IN_MODE);
-		if (e.keyCode == SWT.ALT && zoomIn)
-			setZoomMode(ZOOM_PAN_MODE);
-		return false;
-	}
-
-	/**
-	 * Handles high-level processing of a key down event. KeyEvents are
-	 * forwarded to the current viewer's {@link KeyHandler}, via
-	 * {@link KeyHandler#keyPressed(KeyEvent)}.
-	 * 
-	 * @see AbstractTool#handleKeyDown(KeyEvent)
-	 */
-	protected boolean handleKeyUp(KeyEvent e) {
-		if (super.handleKeyUp(e))
-			return true;
-		if (e.keyCode == SWT.SHIFT ||
-			e.keyCode == SWT.ALT)
-			setZoomMode(getInitialZoomMode());
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandSelectionTool#performMarqueeSelect()
-	 */
-	protected void performMarqueeSelect() {
-		EditPartViewer viewer = getCurrentViewer();
-		ZoomableEditPart zoomableEditPart = null;
-		if (viewer.getRootEditPart() instanceof ZoomableEditPart)
-			zoomableEditPart = (ZoomableEditPart)viewer.getRootEditPart();
-		
-		Rectangle zoomRect = getMarqueeSelectionRectangle();
-		if (zoomRect.width < 2 || zoomRect.height < 2) {
-			if (getZoomMode() == ZOOM_OUT_MODE) {
-				zoomableEditPart.zoomOut(getLocation());
-			} else if (getZoomMode() == ZOOM_IN_MODE) {
-				zoomableEditPart.zoomIn(getLocation());
-			}
-		}
-		else {
-			zoomableEditPart.zoomTo(zoomRect);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.Tool#setViewer(org.eclipse.gef.EditPartViewer)
-	 */
-	public void setViewer(EditPartViewer viewer) {
-		if (viewer == getCurrentViewer())
-			return;
-		super.setViewer(viewer);
-	}
-
-	private void setZoomMode(int zoommode) {
-		this.zoommode = zoommode;
-		setCursor(getDefaultCursor());
-	}
-	
-	private int getInitialZoomMode() {
-	    return zoomIn ? ZOOM_IN_MODE : ZOOM_OUT_MODE;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/tools/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeFactory.java
deleted file mode 100644
index 9193deb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeFactory.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.diagram.ui.internal.type;
-
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-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;
-
-/**
- * Factory for notation element types, which are specializations types that have
- * a semantic hint parameter.
- * 
- * @author ldamus
- */
-public class NotationTypeFactory
-	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.diagram.ui.util.INotationType"; //$NON-NLS-1$
-
-	/**
-	 * The semantic hint parameter name.
-	 */
-	private static final String SEMANTIC_HINT_PARAM_NAME = "semanticHint"; //$NON-NLS-1$
-
-	/**
-	 * The notation type class.
-	 */
-	private static final class NotationType
-		extends SpecializationType
-		implements INotationType {
-
-		/**
-		 * The semantic hint.
-		 */
-		private final String semanticHint;
-
-		/**
-		 * Constructs a new notation type.
-		 * 
-		 * @param descriptor
-		 *            the specialization type descriptor
-		 * @param semanticHint
-		 *            the semantic hint
-		 */
-		public NotationType(ISpecializationTypeDescriptor 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 NotationType(descriptor, semanticHint);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeUtil.java
deleted file mode 100644
index 1734b49..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/NotationTypeUtil.java
+++ /dev/null
@@ -1,60 +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.internal.type;
-
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Defines utility methods for notation type views.
- * 
- * @author ldamus
- */
-public class NotationTypeUtil {
-
-	/**
-	 * Relies on the fact the INotationType is used to distinguish notation-only
-	 * elements and connections at the time of their creation.
-	 * 
-	 * @param view
-	 *            the view to be tested; must never be <code>null</code>
-	 */
-	public static boolean hasNotationType(View view) {
-		return getNotationType(view) != null;
-	}
-
-	private static INotationType getNotationType(View view) {
-
-		ISpecializationType[] specializations = ElementTypeRegistry
-				.getInstance().getSpecializationsOf(NullElementType.ID);
-
-		for (int i = 0; i < specializations.length; i++) {
-			ISpecializationType nextSpecialization = specializations[i];
-
-			if (nextSpecialization instanceof INotationType) {
-				String notationHint = ((INotationType) nextSpecialization)
-						.getSemanticHint();
-
-				if (notationHint != null) {
-
-					if (notationHint.equals(view.getType())) {
-						return (INotationType) nextSpecialization;
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/package.html
deleted file mode 100644
index 3fd2936..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/type/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/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/FontHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/FontHelper.java
deleted file mode 100644
index 1b7aaf4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/FontHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.internal.util;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.swt.graphics.FontData;
-
-
-/**
- * Helper for fonts.
- * 
- * For now, it contains a method to get the font names.
- * 
- * @author wdiu, Wayne Diu
- */
-public class FontHelper {
-	
-	private static String[] FONT_NAMES;
-	
-	/**
-	 * array of font sizes
-	 */
-	protected static final String[] FONT_SIZES = { "8", //$NON-NLS-1$
-		"9", //$NON-NLS-1$
-		"10", //$NON-NLS-1$
-		"11", //$NON-NLS-1$
-		"12", //$NON-NLS-1$
-		"14", //$NON-NLS-1$
-		"16", //$NON-NLS-1$
-		"18", //$NON-NLS-1$
-		"20", //$NON-NLS-1$
-		"22", //$NON-NLS-1$
-		"24", //$NON-NLS-1$
-		"26", //$NON-NLS-1$
-		"28", //$NON-NLS-1$
-		"36", //$NON-NLS-1$
-		"48", //$NON-NLS-1$
-		"72" }; //$NON-NLS-1$
-	
-	/**
-	 * Return the font names for the default display.
-	 *  
-	 * @return String array of font names as String objects for the default
-	 * display. 
-	 */
-	static public String[] getFontNames() {
-		if (FONT_NAMES != null)
-			return FONT_NAMES;
-		
-		//add the names into a set to get a set of unique names
-		Set<String> stringItems = new HashSet<String>();
-		FontData[] fontDatas = DisplayUtils.getDisplay().getFontList(null, true);
-		for (int i = 0; i < fontDatas.length; i++) {
-			if (fontDatas[i].getName() != null) {
-				stringItems.add(fontDatas[i].getName());
-			}
-		}
-		
-		//add strings into the array
-		String strings[] = new String[stringItems.size()];
-		int i = 0;
-		for (String item : stringItems) {
-			strings[i++] = item;
-		}
-		
-		//sort the array
-		Arrays.sort(strings);
-
-		return FONT_NAMES = strings;
-	}
-	
-	/**
-	 * @return - array of fomt sizes
-	 */
-	public static final String[] getFontSizes(){
-		return FONT_SIZES;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/IUIConstants.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/IUIConstants.java
deleted file mode 100644
index 3ec07c6..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/IUIConstants.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.diagram.ui.internal.util;
-
-/**
- * Internal user interface constants used by the diagram.ui layer.
- * 
- * @author wdiu, Wayne Diu
- */
-public interface IUIConstants {
-
-	/**
-	 * Default number of items to display in a drop down list.
-	 * Can be passed into the setVisibleItemCount method of the
-	 * Combo class. 
-	 * 
-	 * @see org.eclipse.swt.widgets.Combo#setVisibleItemCount(int) 
-	 */
-	public static final int DEFAULT_DROP_DOWN_SIZE = 20;
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/LabelViewConstants.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/LabelViewConstants.java
deleted file mode 100644
index 3d4753a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/LabelViewConstants.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.diagram.ui.internal.util;
-
-
-/**
- * @author mmostafa
- * this interface defines all label View constants
- */
-public interface LabelViewConstants {
-	/** 
-	 * Percentage location for labels that are located
-	 * relative to the source end of a <code>Connection</code>
-	 */
-	public static final int SOURCE_LOCATION = 15;
-	/** 
-	 * Percentage location for labels that are located
-	 * relative to the target of a <code>Connection</code>
-	 */
-	public static final int TARGET_LOCATION = 85;
-	/** 
-	 * Percentage location for labels that are located
-	 * relative to the middle of a <code>Connection</code>
-	 */
-	public static final int MIDDLE_LOCATION = 50;	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/util/package.html
deleted file mode 100644
index 0cd4662..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramColorRegistry.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramColorRegistry.java
deleted file mode 100644
index 88b88c4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramColorRegistry.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.l10n;
-
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.ColorRegistry;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * Manages color resources.
- * 
- * @author cmahoney
- */
-public class DiagramColorRegistry {
-
-	/**
-	 * Singleton instance for the color registry.
-	 */
-	private static DiagramColorRegistry singletonInstance = new DiagramColorRegistry();
-
-	/**
-	 * Return singleton instance of the color registry.
-	 * 
-	 * @return the color registry
-	 */
-	public static DiagramColorRegistry getInstance() {
-		return singletonInstance;
-	}
-
-	/**
-	 * Private constructor.
-	 */
-	private DiagramColorRegistry() {
-		super();
-	}
-
-	/**
-	 * Returns the Color based on the id. If the color does not exist in the
-	 * cache, creates a new one and caches.
-	 * 
-	 * @param id -
-	 *            the integer representation of a color
-	 * @return Color
-	 */
-	public Color getColor(Integer id) {
-		return ColorRegistry.getInstance().getColor(id);
-	}
-
-	/**
-	 * Returns the Color based on the RGB. If the color does not exist in the
-	 * cache, creates a new one and caches.
-	 * 
-	 * @param RGB
-	 * @return Color
-	 */
-	public Color getColor(RGB rgb) {
-		return ColorRegistry.getInstance().getColor(rgb);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.java
deleted file mode 100644
index 506d9aa..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.l10n;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * An accessor class for externalized strings.
- *
- * @author cmahoney
- */
-public final class DiagramUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages";//$NON-NLS-1$
-
-	private DiagramUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String DiagramEditor_Delete_from_Diagram;
-	public static String DiagramEditor_Delete_from_Model;
-	public static String DiagramEditor_Delete_from_ModelToolTip;
-	public static String DiagramEditor_partInitExceptionMessage;
-	public static String Accessible_Connection_Label;
-
-	public static String Accessible_Connection_From_Source;
-	public static String Accessible_Connection_To_Target;
-	public static String Accessible_Connection_From_Source_To_Target;
-
-	public static String DiagramEditor_performSaveAs_message;
-	public static String DiagramEditor_handleDeleteEvent_dialog_title;
-	public static String DiagramEditor_handleDeleteEvent_dialog_message;
-	public static String DiagramEditor_handleDeleteEvent_dialog_button_save;
-	public static String DiagramEditor_handleDeleteEvent_dialog_button_close;
-	public static String DiagramEditor_activated_outofsync_dialog_title;
-	public static String DiagramEditor_activated_outofsync_dialog_message;
-	public static String DiagramEditor_save_outofsync_dialog_title;
-	public static String DiagramEditor_save_outofsync_dialog_message;
-	public static String DiagramEditor_save_readonly_dialog_title;
-	public static String DiagramEditor_save_readonly_dialog_message;
-	public static String DiagramEditor_modifyWorkspace_label;
-	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_Router_Tree;
-	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 DimensionProperty_Property_Width_Label;
-	public static String DimensionProperty_Property_Height_Label;
-	public static String PointProperty_Property_X_Label;
-	public static String PointProperty_Property_Y_Label;
-	public static String StandardGroup_Label;
-	public static String StandardGroup_Description;
-	public static String PaletteEntry_DefaultLabel;
-	public static String PresentationGlobalActionHandler_deleteFromDiagram;
-	public static String PresentationGlobalActionHandler_deleteFromDiagramToolTip;
-	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 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 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;
-	public static String ShowPropertiesViewAction_ActionLabelText;
-	public static String ShowPropertiesViewAction_ActionToolTipText;
-	public static String OpenWithMenu_OpenWithMenuText;
-	public static String OpenWithMenu_OpenWithMenuTooltip;
-	public static String AutoSizeAction_ActionLabelText;
-	public static String AutoSizeAction_ActionToolTipText;
-	public static String SnapBackAction_ActionLabelText;
-	public static String SnapBackAction_ActionToolTipText;
-	public static String CopyAppearancePropertiesAction_text;
-	public static String CopyAppearancePropertiesAction_toolTip;
-	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 ArrangeAction_ArrangeSelection_ActionLabelText;
-	public static String ArrangeAction_ArrangeSelection_ActionToolTipText;
-	public static String ArrangeAction_ArrangeAll_ActionLabelText;
-	public static String ArrangeAction_ArrangeAll_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 ShowInMenu_ShowInMenuText;
-	public static String ShowInMenu_ShowInMenuTooltip;
-	public static String DiagramMainMenu_DiagramMainMenuText;
-	public static String RouterActionMenu_LineStyleDropDownText;
-	public static String RouterActionMenu_LineStyleDropDownTooltip;
-	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 ShowCompartmentTitle_ActionLabelText;
-	public static String ShowCompartmentTitle_ActionToolTipText;
-	public static String ZoomActionMenu_ZoomTooltip;
-	public static String ZoomAction_ZoomCombo_Zoom100;
-	public static String ZoomAction_ZoomCombo_ZoomIn;
-	public static String ZoomAction_ZoomCombo_ZoomOut;
-	public static String ZoomAction_ZoomCombo_ZoomToFit;
-	public static String ZoomAction_ZoomCombo_ZoomToWidth;
-	public static String ZoomAction_ZoomCombo_ZoomToHeight;
-	public static String ZoomAction_ZoomCombo_ZoomToSelection;
-	public static String ZoomActionMenu_ZoomLabel;
-	public static String ZoomAction_ZoomIn;
-	public static String ZoomAction_ZoomOut;
-	public static String ZoomAction_Zoom100;
-	public static String ZoomAction_ZoomToFit;
-	public static String ZoomAction_ZoomToWidth;
-	public static String ZoomAction_ZoomToHeight;
-	public static String ZoomAction_ZoomToSelection;
-	public static String ViewPageBreaks_textLabel;
-	public static String ViewPageBreaks_toolTip;
-	public static String RecalcPageBreaks_textLabel;
-	public static String RecalcPageBreaks_toolTip;
-	public static String ViewGrid_textLabel;
-	public static String ViewGrid_toolTip;
-	public static String SnapToGrid_textLabel;	
-	public static String ViewRuler_textLabel;
-	public static String ViewRuler_toolTip;
-	public static String CopyAction_Copy;
-	public static String AddBookmarkAction_dialog_title;
-	public static String AddBookmarkAction_dialog_message;
-	public static String SortFilterCompartmentsAction_ActionLabelText;
-	public static String SortFilterCompartmentsAction_ActionToolTipText;
-	public static String Note_menuItem;
-	public static String Text_menuItem;
-	public static String Add_menuItem;
-	public static String AddNoteAction_ActionLabelText;
-	public static String AddNoteAction_ActionToolTipText;
-	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 Open_ActionLabelText;
-	public static String Open_ActionToolTipText;
-	public static String Command_Create_Label;
-	public static String Command_createGuide;
-	public static String Command_deleteGuide;
-	public static String Command_moveGuide;
-	public static String Command_Show_Hide_Relationships;
-	public static String Command_ShowRelatedElements;
-	public static String Commands_SetBendpointsCommand_Label;
-	public static String SetAutoSizeCommand_Label;
-	public static String CreateConnectionCommand_Label;
-	public static String DeleteCommand_Label;
-	public static String AddCommand_Label;
-	public static String Command_CreateDiagramLink;
-	public static String CreateCommand_Label;
-	public static String SetLocationCommand_Label_Resize;
-	public static String Command_ChangeViewProperty_ChangePropertyPattern;
-	public static String Commands_CreateCommand_Connection_Label;
-	public static String Command_Deferred_Layout;
-	public static String SnapCommand_Label;
-	public static String Commands_SetConnectionEndsCommand_Target;
-	public static String Commands_SetConnectionEndsCommand_Source;
-	public static String Commands_DestroyElement;
-	public static String Commands_MoveElement;
-	public static String MoveLabelCommand_Label_Location;
-	public static String Command_AdjustRatioCommand_Label;
-	public static String Command_openDiagram;
-	public static String Command_hideLabel_Label;
-	public static String ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label;
-	public static String GraphicalNodeEditPolicy_createRelationshipCommand_label;
-	public static String ResizableShapeEditPolicy_MoveDeferredCommand_label;
-	public static String RadialProvider_changeFontRequest_label;
-	public static String RadialProvider_changeVisibilityRequest_label;
-	public static String Command_SortFilterCommand;
-	public static String SnapBackCommand_Label;
-	public static String PasteCommand_Label;
-	public static String ToggleCanonicalModeCommand_Label;
-	public static String SetViewMutabilityCommand_Label;
-	public static String CanonicalLayoutCommand_Label;
-	public static String ShowHideLabelsCommand_Label;
-	public static String Command_CreateRelationship_Label;
-	public static String Command_GetRelationshipTypeAndEndFromUser_Label;
-	public static String Commands_Duplicate_Label;
-	public static String CopyToImageDialog_title;
-	public static String CopyToImageDialog_folder_label;
-	public static String CopyToImageDialog_filename_label;
-	public static String CopyToImageDialog_filename_default;
-	public static String CopyToImageDialog_imageformat_label;
-	/**
-	 * @since 1.4
-	 */
-	public static String CopyToImageDialog_quality_label;
-	/**
-	 * @since 1.4
-	 */
-	public static String CopyToImageDialog_quality_error_message;
-	public static String CopyToImageDialog_browse_label;
-	public static String CopyToImageDialog_DirectoryDialog_text;
-	public static String CopyToImageDialog_DirectoryDialog_message;
-	public static String CopyToImageDialog_overwriteExisting_label;
-	public static String CopyToImageDialog_validateFolderText_folderBlank;
-	public static String CopyToImageDialog_validateFolderText_folderInvalid;
-	public static String CopyToImageDialog_validateFolderText_folderNotExist;
-	public static String CopyToImageDialog_exportToHTML_label;
-	public static String CopyToHTMLImageTask_generateImageFile;
-	public static String CopyToHTMLImageTask_exportingToHTML;
-	public static String SortFilterDialog_title;
-	public static String SortFilterDialog_rootTitle;
-	public static String SortFilter_moveItemUp;
-	public static String SortFilter_moveItemDown;
-	public static String SortFilter_filterItemsListLabel;
-	public static String SortFilter_fitlerListLabel;
-	public static String SortFilter_addTo;
-	public static String SortFilter_removeFrom;
-	public static String SortFilter_addAll;
-	public static String SortFilter_removeAll;
-	public static String SortFilter_apply;
-	public static String MessageDialogWithToggle_DoNotPromptAgainToggle_label;
-	public static String PromptingDeleteAction_DeleteFromDiagramDialog_Title;
-	public static String PromptingDeleteAction_DeleteFromDiagramDialog_Message;
-	public static String PromptingDeleteFromModelAction_DeleteFromModelDialog_Title;
-	public static String PromptingDeleteFromModelAction_DeleteFromModelDialog_Message;
-	public static String DiagramsPreferencePage_showConnectionHandles_label;
-	public static String DiagramsPreferencePage_globalGroup_label;
-	public static String DiagramsPreferencePage_showPopupBars_label;
-	public static String DiagramsPreferencePage_enableAnimatedLayout_label;
-	public static String DiagramsPreferencePage_enableAnimatedZoom_label;
-	public static String DiagramsPreferencePage_enableAntiAlias_label;
-	/**
-	 * @since 1.2
-	 */
-	public static String DiagramsPreferencePage_showStatusLine_label;
-	public static String GridRulerPreferencePage_rulerGroup_label;
-	public static String GridRulerPreferencePage_showRulers_label;
-	public static String GridRulerPreferencePage_rulerUnits_label;
-	public static String GridRulerPreferencePage_rulerUnits_inch_label;
-	public static String GridRulerPreferencePage_rulerUnits_cm_label;
-	public static String GridRulerPreferencePage_rulerUnits_pixel_label;
-	public static String GridRulerPreferencePage_gridGroup_label;
-	public static String GridRulerPreferencePage_showGrid_label;
-	public static String GridRulerPreferencePage_snapToGrid_label;
-	public static String GridRulerPreferencePage_snapToGeometry_label;
-	public static String GridRulerPreferencePage_gridSpacing_label_inches;
-    public static String GridRulerPreferencePage_gridSpacing_label_cm;
-    public static String GridRulerPreferencePage_gridSpacing_label_pixels;
-	public static String GeneralPreferencePage_defaultFont_label;
-	public static String GeneralPreferencePage_fontColor_label;
-	public static String GeneralPreferencePage_fillColor_label;
-	public static String GeneralPreferencePage_lineColor_label;
-	public static String GeneralPreferencePage_noteFillColor_label;
-	public static String GeneralPreferencePage_noteLineColor_label;
-	public static String GeneralPreferencePage_colorAndFontGroupBox_label;
-	public static String ConnectionsPreferencePage_lineStyle_label;
-	public static String ConnectionsPreferencePage_ConnectionView_Manual_text;
-	public static String ConnectionsPreferencePage_ConnectionView_Rectilinear_text;
-	public static String AbstractEditPartProvider_new_graphicaleditpart_failed_ERROR_;
-	public static String AbstractViewProvider_create_view_failed_ERROR_;
-	public static String CanonicalEditPolicy_create_view_failed_ERROR_;
-	public static String CanonicalEditPolicy_refresh_failed_ERROR_;
-	public static String RefreshEditPartCompartment_execute_failed_ERROR_;
-	public static String PopupBar_AddNew;
-	public static String ConnectionHandle_ToolTip_ShowRelatedElementsOnly;
-	public static String ConnectionHandle_ToolTip_ShowRelatedElementsAndCreateRelationship;
-	public static String ConnectionHandle_ToolTip_CreateRelationshipOnly;
-	public static String ConnectionHandle_Popup_ShowRelatedElementsDialog;
-	public static String ConnectionHandle_Popup_ShowRelatedXRelationships;
-	public static String ConnectionHandle_Popup_ExistingElement;
-	public static String ConnectionHandle_Popup_NewX;
-	public static String ConnectionHandle_Popup_CreateXFrom;
-	public static String ConnectionHandle_Popup_CreateXTo;
-	public static String ConnectionHandle_Popup_CreateXFromY;
-	public static String ConnectionHandle_Popup_CreateXToY;
-	public static String ConnectionHandle_Popup_CreateXFromNewY;
-	public static String ConnectionHandle_Popup_CreateXToNewY;
-	public static String CreateViewAndOptionallyElementCommand_ViewExists_Message;
-	public static String CreateViewAndOptionallyElementCommand_ViewExists_Title;
-	public static String PageSetupPreferencePage_title;
-	public static String PrintPreferencePage_instruction;
-	public static String PageSetupDialog_title;
-	public static String PageSetupDialog_title_tab;
-	public static String PageSetupDialog_title_group_unit;
-	public static String PageSetupDialog_button_inches;
-	public static String PageSetupDialog_button_millimetres;
-	public static String PageSetupDialog_title_group_orientation;
-	public static String PageSetupDialog_button_portrait;
-	public static String PageSetupDialog_button_landscape;
-	public static String PageSetupDialog_title_group_paperSize;
-	public static String PageSetupDialog_text_page_size;
-	public static String PageSetupDialog_text_page_width_inches;
-    public static String PageSetupDialog_text_page_width_mm;
-    public static String PageSetupDialog_text_page_height_inches;
-    public static String PageSetupDialog_text_page_height_mm;
-	public static String PageSetupDialog_title_group_margin;
-	public static String PageSetupDialog_text_page_margin_top_inches;
-    public static String PageSetupDialog_text_page_margin_top_mm;
-	public static String PageSetupDialog_text_page_margin_bottom_inches;
-    public static String PageSetupDialog_text_page_margin_bottom_mm;
-	public static String PageSetupDialog_text_page_margin_left_inches;
-    public static String PageSetupDialog_text_page_margin_left_mm;
-	public static String PageSetupDialog_text_page_margin_right_inches;
-    public static String PageSetupDialog_text_page_margin_right_mm;
-	public static String PageSetupDialog_label_inches;
-	public static String PageSetupDialog_label_millimetres;
-	public static String PrintPreferencePage_message_error;
-	public static String PageSetupDialog_button_workspace;
-	public static String PageSetupDialog_button_diagram;
-	public static String PageSetupDialog_button_configure;
-	public static String PageSetupDialog_paper_size_letter;
-	public static String PageSetupDialog_paper_size_legal;
-	public static String PageSetupDialog_paper_size_executive;
-	public static String PageSetupDialog_paper_size_11by17;
-	public static String PageSetupDialog_paper_size_A3;
-	public static String PageSetupDialog_paper_size_A4;
-	public static String PageSetupDialog_paper_size_B4;
-	public static String PageSetupDialog_paper_size_B5;
-	public static String PageSetupDialog_paper_size_userDefined;
-	public static String PageSetupAction_Label;
-	public static String Note_DisplayName;
-	public static String NoteAttachment_DisplayName;
-	public static String Text_DisplayName;
-	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 ConnectionAppearancePropertySection_Router_Manual;
-	public static String ConnectionAppearancePropertySection_Router_Rectilinear;
-	public static String ConnectionAppearancePropertySection_Router_Tree;
-	public static String InvalidView;
-	public static String OutlineView_OutlineTipText;
-	public static String OutlineView_OverviewTipText;
-	public static String DeleteFromModelAction_ErrorDialog_Title;
-	public static String DeleteFromModelAction_ErrorDialog_Text;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, DiagramUIMessages.class);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.properties b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.properties
deleted file mode 100644
index 6ffb89b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/DiagramUIMessages.properties
+++ /dev/null
@@ -1,571 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2002, 2009  IBM Corporation and others.                   |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-# ==============================================================================
-
-DiagramEditor_Delete_from_Diagram=&Delete from Diagram
-DiagramEditor_Delete_from_Model=De&lete from Model
-DiagramEditor_Delete_from_ModelToolTip = Delete
-DiagramEditor_partInitExceptionMessage=Failed To Open Diagram Editor
-
-# --- accessibility strings ---
-Accessible_Connection_Label=connection
-Accessible_Connection_From_Source={0} from Element: {1}
-Accessible_Connection_To_Target={0} to Element: {1}
-Accessible_Connection_From_Source_To_Target={0} from Element: {1} to Element: {2}
-
-# --- umlvisualizereditorPart
-DiagramEditor_performSaveAs_message=: This file is open in the editor. Please close the editor first.
-DiagramEditor_handleDeleteEvent_dialog_title=File Deleted
-DiagramEditor_handleDeleteEvent_dialog_message=The file has been deleted from the file system.  Do you want to save your changes or close the editor without saving?
-DiagramEditor_handleDeleteEvent_dialog_button_save=Save
-DiagramEditor_handleDeleteEvent_dialog_button_close=Close
-DiagramEditor_activated_outofsync_dialog_title=File Changed
-DiagramEditor_activated_outofsync_dialog_message=The file has been changed on the file system. Do you want to load the changes?
-DiagramEditor_save_outofsync_dialog_title=Update conflict
-DiagramEditor_save_outofsync_dialog_message=The file has been changed on the file system. Do you want to overwrite the changes?
-DiagramEditor_save_readonly_dialog_title=Save problems
-DiagramEditor_save_readonly_dialog_message=Save could not be completed.\n\nReason\n{0} is read-only.
-DiagramEditor_modifyWorkspace_label=Modify Workspace
-
-
-# --- Internal ---
-
-# --- 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_Router_Tree=Tree 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
-
-DimensionProperty_Property_Width_Label=Width
-DimensionProperty_Property_Height_Label=Height
-
-PointProperty_Property_X_Label=X
-PointProperty_Property_Y_Label=Y
-
-# ==============================================================================
-# Outline and Overview - Translation Instruction: section to be translated
-# ==============================================================================
-
-OutlineView_OutlineTipText = Outline
-OutlineView_OverviewTipText = Overview
-
-# ==============================================================================
-# Palette Info - Translation Instruction: section to be translated
-# ==============================================================================
-
-StandardGroup_Label = Standard
-StandardGroup_Description = Standard Group
-PaletteEntry_DefaultLabel = Empty Label
-
-# ==============================================================================
-# Actions - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Global Actions
-PresentationGlobalActionHandler_deleteFromDiagram = &Delete from Diagram
-PresentationGlobalActionHandler_deleteFromDiagramToolTip = Delete
-
-# --- 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
-
-
-# --- 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
-
-# --- 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
-
-# --- show properties view action ---
-ShowPropertiesViewAction_ActionLabelText=S&how Properties View
-ShowPropertiesViewAction_ActionToolTipText=Show Properties View
-
-# --- open with action menu ---
-OpenWithMenu_OpenWithMenuText=Open &With
-OpenWithMenu_OpenWithMenuTooltip=Open With
-
-# --- auto size action ---
-AutoSizeAction_ActionLabelText=&Auto Size
-AutoSizeAction_ActionToolTipText=Auto Size
-
-# --- snap back action ---
-SnapBackAction_ActionLabelText=Snap &Back
-SnapBackAction_ActionToolTipText=Snap Back
-
-# --- 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.
-
-# --- 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
-
-# --- arrange action and menu ---
-ArrangeAction_ArrangeSelection_ActionLabelText=&Selection
-ArrangeAction_ArrangeSelection_ActionToolTipText=Selection
-ArrangeAction_ArrangeAll_ActionLabelText=&All
-ArrangeAction_ArrangeAll_ActionToolTipText=All
-
-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
-
-# --- showIn action menu ---
-ShowInMenu_ShowInMenuText=&Show in
-ShowInMenu_ShowInMenuTooltip=Show in
-
-#Diagram and Format main menus
-# --- Diagram Main Menu ---
-DiagramMainMenu_DiagramMainMenuText=&Diagram
-
-# --- router action menu ---
-RouterActionMenu_LineStyleDropDownText=Line &Style
-RouterActionMenu_LineStyleDropDownTooltip=Line Style
-
-# --- 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
-
-#-- show compartment title action ---
-ShowCompartmentTitle_ActionLabelText=Show Compartment Title
-ShowCompartmentTitle_ActionToolTipText=Show/Hide Compartment Title
-
-
-DeleteFromModelAction_ErrorDialog_Title = Delete Error
-DeleteFromModelAction_ErrorDialog_Text = The element could not be deleted.
-	
-# --- zoom ---
-
-ZoomActionMenu_ZoomTooltip=Zoom
-ZoomAction_ZoomCombo_Zoom100=Zoom to 100%
-ZoomAction_ZoomCombo_ZoomIn=Zoom In
-ZoomAction_ZoomCombo_ZoomOut=Zoom Out
-ZoomAction_ZoomCombo_ZoomToFit=Zoom to Fit
-ZoomAction_ZoomCombo_ZoomToWidth=Fit to Width
-ZoomAction_ZoomCombo_ZoomToHeight=Fit to Height
-ZoomAction_ZoomCombo_ZoomToSelection=Fit to Selection
-
-ZoomActionMenu_ZoomLabel=&Zoom
-ZoomAction_ZoomIn=Zoom &In
-ZoomAction_ZoomOut=Zoom &Out
-ZoomAction_Zoom100=Zoom &to 100%
-ZoomAction_ZoomToFit=Zoom to &Fit
-ZoomAction_ZoomToWidth=Fit to &Width
-ZoomAction_ZoomToHeight=Fit to &Height
-ZoomAction_ZoomToSelection=Fit to &Selection
-
-# --- 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
-
-# --- Grid actions ---
-ViewGrid_textLabel=&Grid
-ViewGrid_toolTip=Toggle the grid lines on the diagram
-SnapToGrid_textLabel=&Snap to Grid
-
-# --- Ruler actions ---
-ViewRuler_textLabel=&Rulers
-ViewRuler_toolTip=Toggle the rulers on the diagram
-
-# --- copy action, used to copy diagram to bitmap file ---
-CopyAction_Copy=&Copy Bitmap
-
-# --- Add bookmark action ---
-AddBookmarkAction_dialog_title=Add Bookmark
-AddBookmarkAction_dialog_message=Enter bookmark description:
-
-# --- Sort Filter action ---
-SortFilterCompartmentsAction_ActionLabelText = Sort/&Filter Compartment Items...
-SortFilterCompartmentsAction_ActionToolTipText = Sort or Filter Compartments Items for this shape
-
-# --- PresentationContributionItemProvider ---
-Note_menuItem = &Note
-Text_menuItem = &Text
-Add_menuItem = &Add
-
-# --- add note action ---
-AddNoteAction_ActionLabelText=Add N&ote
-AddNoteAction_ActionToolTipText=Add Note
-
-# --- 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
-
-# --- Navigate - Actions ---
-Open_ActionLabelText=&Open
-Open_ActionToolTipText=Open
-
-# ==============================================================================
-# Commands - Translation Instruction: section to be translated
-# ==============================================================================
-
-# Label for creating new shape or connection ( not the view create but the semantic one)
-Command_Create_Label=Create {0}
-
-Command_createGuide=Create Guideline
-Command_deleteGuide=Delete Guideline
-Command_moveGuide=Move Guideline
-Command_Show_Hide_Relationships=Show/Hide Relationships
-Command_ShowRelatedElements=Show Related Elements
-Commands_SetBendpointsCommand_Label=Change Connector Bendpoints
-SetAutoSizeCommand_Label=Auto Size
-CreateConnectionCommand_Label=Create Connection
-DeleteCommand_Label=Delete
-AddCommand_Label=Add View
-Command_CreateDiagramLink=Create Diagram Link
-CreateCommand_Label=Create View
-SetLocationCommand_Label_Resize=Set Location or Size
-SnapCommand_Label = Snap To Grid
-Command_ChangeViewProperty_ChangePropertyPattern=Change {0}
-Commands_CreateCommand_Connection_Label=Create Connector
-Command_Deferred_Layout=Deferred Layout
-Commands_SetConnectionEndsCommand_Target=Change Connection Target
-Commands_SetConnectionEndsCommand_Source=Change Connection Source
-Commands_DestroyElement= Delete Element
-Commands_MoveElement = Move Element
-MoveLabelCommand_Label_Location=Move Label
-Command_AdjustRatioCommand_Label=Adjust Compartment Ratio
-Command_openDiagram=Open Diagram
-Command_hideLabel_Label=Show/Hide Label
-
-ConstrainedFlowLayoutEditPolicy_changeVisibilityCommand_label=Visibility
-GraphicalNodeEditPolicy_createRelationshipCommand_label=Create Relationship
-ResizableShapeEditPolicy_MoveDeferredCommand_label=Position
-RadialProvider_changeFontRequest_label=Font
-RadialProvider_changeVisibilityRequest_label=Visibility
-Command_SortFilterCommand=Sort/Filter
-SnapBackCommand_Label=Snap Back
-PasteCommand_Label =Paste
-
-ToggleCanonicalModeCommand_Label = Enable Canonical Mode
-SetViewMutabilityCommand_Label = Set View Mutability
-CanonicalLayoutCommand_Label = Canonical Layout
-ShowHideLabelsCommand_Label = Show/Hide Connector Labels
-Command_CreateRelationship_Label = Create Relationship
-Command_GetRelationshipTypeAndEndFromUser_Label = Get Relationship Type and End From User
-Commands_Duplicate_Label = Duplicate
-
-# ==============================================================================
-# Dialogs - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Copy to Image dialog ---
-CopyToImageDialog_title=Save As Image File
-CopyToImageDialog_folder_label=F&older:
-CopyToImageDialog_filename_label=&File Name:
-CopyToImageDialog_filename_default=image
-CopyToImageDialog_imageformat_label=&Image Format:
-CopyToImageDialog_quality_label=&Quality (%):
-CopyToImageDialog_quality_error_message= is not a number
-CopyToImageDialog_browse_label=&Browse...
-CopyToImageDialog_DirectoryDialog_text=Browse for Folder
-CopyToImageDialog_DirectoryDialog_message=Select the destination folder:
-CopyToImageDialog_overwriteExisting_label=Over&write existing file without warning
-CopyToImageDialog_validateFolderText_folderBlank=Folder cannot be blank
-CopyToImageDialog_validateFolderText_folderInvalid=Folder is not a valid path
-CopyToImageDialog_validateFolderText_folderNotExist=Folder does not exist
-CopyToImageDialog_exportToHTML_label=Export to HTML
-
-CopyToHTMLImageTask_generateImageFile=Generating file: 
-CopyToHTMLImageTask_exportingToHTML=Exporting to HTML
-
-# -- Sort/Filter dialog ---
-SortFilterDialog_title=Sort/Filter Compartment Items
-SortFilterDialog_rootTitle=All Compartments
-SortFilter_moveItemUp=Move Item Up
-SortFilter_moveItemDown=Move Item Down
-SortFilter_filterItemsListLabel=Filter Items Containing
-SortFilter_fitlerListLabel=Filter criteria
-SortFilter_addTo=Add To
-SortFilter_removeFrom=Remove From
-SortFilter_addAll=Add All
-SortFilter_removeAll=Remove All
-SortFilter_apply=Apply
-
-
-# -- Prompt on Element Delete dialogs ---
-MessageDialogWithToggle_DoNotPromptAgainToggle_label = &Don't show this dialog again
-PromptingDeleteAction_DeleteFromDiagramDialog_Title =Delete From Diagram
-PromptingDeleteAction_DeleteFromDiagramDialog_Message=Are you sure you want to delete this element from the diagram?\n\nIf you proceed, the element is removed from the diagram only.\n\nTo delete this element from all diagrams and the model, right-click it; then click Delete from Model.\n
-PromptingDeleteFromModelAction_DeleteFromModelDialog_Title =Delete From Model
-PromptingDeleteFromModelAction_DeleteFromModelDialog_Message =Are you sure you want to delete this element from the model?\n\nIf you proceed, the element is removed from all diagrams and the model.\n\nTo delete this element from the diagram only, right-click it; then click Delete from Diagram.\n
-
-# ==============================================================================
-# Preference Pages - Translation Instruction: section to be translated
-# ==============================================================================
-
-# --- Global Settings preference page ---
-DiagramsPreferencePage_showConnectionHandles_label=Show &connector handles
-DiagramsPreferencePage_globalGroup_label=Global settings
-DiagramsPreferencePage_showPopupBars_label=Show &popup bars
-DiagramsPreferencePage_enableAnimatedLayout_label=Enable animated &layout
-DiagramsPreferencePage_enableAnimatedZoom_label=Enable animated &zoom
-DiagramsPreferencePage_enableAntiAlias_label=Enable anti-aliasing
-DiagramsPreferencePage_showStatusLine_label=Show status line
-
-# --- Grid and Ruler preference page ---
-GridRulerPreferencePage_rulerGroup_label=Ruler options
-GridRulerPreferencePage_showRulers_label=Show &rulers for new diagram
-GridRulerPreferencePage_rulerUnits_label=Ruler &units:
-GridRulerPreferencePage_rulerUnits_inch_label=Inches
-GridRulerPreferencePage_rulerUnits_cm_label=Centimeters
-GridRulerPreferencePage_rulerUnits_pixel_label=Pixels
-GridRulerPreferencePage_gridGroup_label=Grid options
-GridRulerPreferencePage_showGrid_label=Show &grid for new diagrams
-GridRulerPreferencePage_snapToGrid_label=Snap &to grid for new diagrams
-GridRulerPreferencePage_snapToGeometry_label=S&nap to shapes for new diagrams
-GridRulerPreferencePage_gridSpacing_label_inches=Grid &spacing (in inches):
-GridRulerPreferencePage_gridSpacing_label_cm=Grid &spacing (in centimeters):
-GridRulerPreferencePage_gridSpacing_label_pixels=Grid &spacing (in pixels):
-
-# --- General preference page ---
-GeneralPreferencePage_defaultFont_label=Default font:
-GeneralPreferencePage_fontColor_label=&Font color:
-GeneralPreferencePage_fillColor_label=F&ill color:
-GeneralPreferencePage_lineColor_label=&Line color:
-GeneralPreferencePage_noteFillColor_label=&Note fill color:
-GeneralPreferencePage_noteLineColor_label=N&ote line color:
-GeneralPreferencePage_colorAndFontGroupBox_label=Colors and fonts
-
-# --- Connections preference page ---
-ConnectionsPreferencePage_lineStyle_label=&Line style:
-ConnectionsPreferencePage_ConnectionView_Manual_text = Oblique
-ConnectionsPreferencePage_ConnectionView_Rectilinear_text = Rectilinear
-
-# ==============================================================================
-# Exceptions and Errors - Translation Instruction: section to be translated
-# ==============================================================================
-AbstractEditPartProvider_new_graphicaleditpart_failed_ERROR_ = IRJS0004E Failed to create editpart {0}
-AbstractViewProvider_create_view_failed_ERROR_ = IRJS0005E Failed to create view {0}
-CanonicalEditPolicy_create_view_failed_ERROR_ = IRJS0006E Could not create a view for {0}
-CanonicalEditPolicy_refresh_failed_ERROR_ = IRJS0007E Semantic refresh failed.
-RefreshEditPartCompartment_execute_failed_ERROR_ = IRJS0008E Could not find an editpart for {0}
-
-# ==============================================================================
-# Popup Bar - Translation Instruction : section to be translated
-# ==============================================================================
-
-PopupBar_AddNew=Add {0}
-
-# ==============================================================================
-# Connection Handles - Translation Instruction : section to be translated
-# ==============================================================================
-
-# --- Connection Handle Tooltips ---
-ConnectionHandle_ToolTip_ShowRelatedElementsOnly = Double-click to show related elements.
-ConnectionHandle_ToolTip_ShowRelatedElementsAndCreateRelationship = Double-click to show related elements, click and drag to create a connection.
-ConnectionHandle_ToolTip_CreateRelationshipOnly = Click and drag to create a connection.
-
-# --- Connection Handle Popup Menus ---
-ConnectionHandle_Popup_ShowRelatedElementsDialog = Show Related Elements Dialog...
-ConnectionHandle_Popup_ShowRelatedXRelationships = Show Related {0} Relationships
-ConnectionHandle_Popup_ExistingElement = Existing Element
-ConnectionHandle_Popup_NewX = New Element: {0}
-ConnectionHandle_Popup_CreateXFrom = Create {0} From
-ConnectionHandle_Popup_CreateXTo = Create {0} To
-ConnectionHandle_Popup_CreateXFromY = Create {0} From {1}
-ConnectionHandle_Popup_CreateXToY = Create {0} To {1}
-ConnectionHandle_Popup_CreateXFromNewY = Create {0} From New Element: {1}
-ConnectionHandle_Popup_CreateXToNewY = Create {0} To New Element: {1}
-
-CreateViewAndOptionallyElementCommand_ViewExists_Message = An existing view of {0} has been detected on the diagram.\nDo you wish to connect to it?
-CreateViewAndOptionallyElementCommand_ViewExists_Title = Existing view detected
-
-
-# ==============================================================================
-# Page Setup Dialog - Translation Instruction : section to be translated
-# ==============================================================================
-
-# ================
-# Preference Page
-# ================
-PageSetupPreferencePage_title=Printing
-PrintPreferencePage_instruction=General printing settings:
-
-# Page Setup Dialog
-PageSetupDialog_title=Page Setup
-
-# =====================
-# PSConfigurationBlock
-# =====================
-PageSetupDialog_title_tab=Page setup
-
-PageSetupDialog_title_group_unit=Units
-PageSetupDialog_button_inches=&Inches
-PageSetupDialog_button_millimetres=&Millimetres
-
-PageSetupDialog_title_group_orientation=Orientation
-PageSetupDialog_button_portrait=&Portrait
-PageSetupDialog_button_landscape=&Landscape
-
-PageSetupDialog_title_group_paperSize=Size
-PageSetupDialog_text_page_size=&Size:
-PageSetupDialog_text_page_width_inches=&Width (in inches):
-PageSetupDialog_text_page_width_mm=&Width (in mm):
-PageSetupDialog_text_page_height_inches=&Height (in inches):
-PageSetupDialog_text_page_height_mm=&Height (in mm):
-
-PageSetupDialog_title_group_margin=Margins
-PageSetupDialog_text_page_margin_top_inches=T&op (in inches):
-PageSetupDialog_text_page_margin_top_mm=T&op (in mm):
-PageSetupDialog_text_page_margin_bottom_inches=&Bottom (in inches):
-PageSetupDialog_text_page_margin_bottom_mm=&Bottom (in mm):
-PageSetupDialog_text_page_margin_left_inches=L&eft (in inches):
-PageSetupDialog_text_page_margin_left_mm=L&eft (in mm):
-PageSetupDialog_text_page_margin_right_inches=&Right (in inches):
-PageSetupDialog_text_page_margin_right_mm=&Right(in mm):
-
-PageSetupDialog_label_inches=inches
-PageSetupDialog_label_millimetres=mm
-
-PrintPreferencePage_message_error=One of the field(s) contains invalid value
-
-# ==============================
-# PSSelectionConfigurationBlock
-# ==============================
-PageSetupDialog_button_workspace=Use &workspace settings
-PageSetupDialog_button_diagram=Use &diagram settings
-PageSetupDialog_button_configure=&Configure workspace settings
-
-# ============
-# Paper names
-# ============
-PageSetupDialog_paper_size_letter=Letter
-PageSetupDialog_paper_size_legal=Legal
-PageSetupDialog_paper_size_executive=Executive
-PageSetupDialog_paper_size_11by17=11x17
-PageSetupDialog_paper_size_A3=A3
-PageSetupDialog_paper_size_A4=A4
-PageSetupDialog_paper_size_B4=B4
-PageSetupDialog_paper_size_B5=B5
-PageSetupDialog_paper_size_userDefined=User Defined
-
-PageSetupAction_Label=Page Setup...
-
-# ==============================================================================
-# Creation Types - Display Name - Translation Instruction : section to be translated
-# ==============================================================================
-Note_DisplayName = Note
-NoteAttachment_DisplayName = Note Attachment
-Text_DisplayName = Text
-
-# ==============================================================================
-# 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
-
-ConnectionAppearancePropertySection_Router_Manual=Oblique
-ConnectionAppearancePropertySection_Router_Rectilinear=Rectilinear
-ConnectionAppearancePropertySection_Router_Tree=Tree
-
-# ==============================================================================
-# Invalid view - Translation Instruction: section to be translated
-# ==============================================================================
-InvalidView = Invalid view - remove from diagram.
-# ==================================== END =====================================
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/SharedImages.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/SharedImages.java
deleted file mode 100644
index c7a079e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/SharedImages.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.diagram.ui.l10n;
-
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Bundle of all shared images available for other plugins. 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 final class SharedImages {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "icons/"; //$NON-NLS-1$
-
-	/**
-	 * The name of the error icon whose cached image is available by using
-	 * {@link #get(String)}
-	 */
-	public static final String IMG_ERROR = PREFIX_ROOT + "error.gif"; //$NON-NLS-1$
-
-	/**
-	 * The name of the note icon whose cached image is available by using
-	 * {@link #get(String)}
-	 */
-	public static final String IMG_NOTE = PREFIX_ROOT + "note.gif";//$NON-NLS-1$
-
-	/**
-	 * The name of the text icon whose cached image is available by using
-	 * {@link #get(String)}
-	 */
-	public static final String IMG_TEXT = PREFIX_ROOT + "text.gif";//$NON-NLS-1$
-
-	/**
-	 * Image descriptor for the error icon.
-	 */
-	public static final ImageDescriptor DESC_ERROR = createAndCache(IMG_ERROR);
-
-	/**
-	 * Image descriptor for the note icon.
-	 */
-	public static final ImageDescriptor DESC_NOTE = createAndCache(IMG_NOTE);
-
-	/**
-	 * Image descriptor for the text icon.
-	 */
-	public static final ImageDescriptor DESC_TEXT = createAndCache(IMG_TEXT);
-
-	/**
-	 * Image descriptor for the note attachment icon.
-	 */
-	public static final ImageDescriptor DESC_NOTE_ATTACHMENT = create(PREFIX_ROOT
-		+ "noteattachment.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(DiagramUIPlugin
-			.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);
-		DiagramUIPlugin.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 DiagramUIPlugin.getInstance().getImageRegistry().get(imageName);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/l10n/package.html
deleted file mode 100644
index 6647ea5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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 %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/ILabelDelegate.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/ILabelDelegate.java
deleted file mode 100644
index 418b371..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/ILabelDelegate.java
+++ /dev/null
@@ -1,379 +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.ui.label;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The purpose of this interface is to provide a generic way for editparts,
- * editpolicies, text direct edit managers, etc. to deal with label figures
- * (i.e. figures containing text and/or an image). This way, if a client would
- * like to provide their own type of label figure they may not need to override
- * all the pieces that interact with the label figure.
- * <p>
- * The methods in this interface are documented in a way that they were intended
- * to be used; however, if the client is overriding the pieces of GMF that
- * interact with the label (e.g. editpart, editpolicies, text direct edit
- * manager) and creating their own label figure, they are free to use this API
- * as they see fit. For this reason, the supported alignment and placement
- * values are not documented here. These would be determined by the the client's
- * label figure being used.
- * <p>
- * IMPORTANT: This interface is <EM>not</EM> intended to be implemented by
- * clients. Clients should inherit from {@link ILabelDelegate.Stub}. New
- * methods may be added to this interface in the future.
- * </p>
- * 
- * @since 2.1
- * @author crevells
- * 
- */
-public interface ILabelDelegate {
-
-    /**
-     * Sets the focus state of the label. Implementors may want to react by
-     * drawing a focus rectangle around the text in the label.
-     * 
-     * @param focus
-     *            the focus state
-     */
-    public void setFocus(boolean focus);
-
-    /**
-     * Gets the focus state of the label.
-     * 
-     * @return the focus state of the label
-     */
-    public boolean hasFocus();
-
-    /**
-     * Sets the selected state of the label. Implementors may want to react by
-     * drawing a selection rectangle around the text in the label.
-     * 
-     * @param selected
-     *            the selected state
-     */
-    public void setSelected(boolean selected);
-
-    /**
-     * Gets the selected state of the label.
-     * 
-     * @return the selected state of the label
-     */
-    public boolean isSelected();
-
-    /**
-     * Sets the text in the label. This will be called when the text has changed
-     * and the label figure should be updated.
-     * 
-     * @param text
-     *            the new text
-     */
-    public void setText(String text);
-
-    /**
-     * Returns the text of the label. Unless clients require customized
-     * behavior, implementors should generally return the complete text of the
-     * label, regardless of whether it is currently being truncated.
-     * 
-     * @return the text in the label
-     */
-    public String getText();
-
-    /**
-     * 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);
-
-    /**
-     * Gets the label's icon at given index.
-     * 
-     * @param index
-     *            the icon index
-     * @return the image
-     */
-    public Image getIcon(int index);
-
-    /**
-     * Sets whether the label's text should be striked-through
-     * 
-     * @param strikeThrough
-     *            whether the label's text should be striked-through
-     */
-    public void setTextStrikeThrough(boolean strikeThrough);
-
-    /**
-     * Should the label's text should be striked-through?
-     * 
-     * @return true if the label's text should be striked-through; false
-     *         otherwise
-     */
-    public boolean isTextStrikedThrough();
-
-    /**
-     * Sets whether the label's text should be underlined
-     * 
-     * @param underline
-     *            whether the label's text should be underlined
-     */
-    public void setTextUnderline(boolean underline);
-
-    /**
-     * Should the label's text should be underlined?
-     * 
-     * @return true if the label's text should be underlined; false otherwise
-     */
-    public boolean isTextUnderlined();
-
-    /**
-     * Sets the alignment of the label (icon and text) within the figure. If
-     * this figure's bounds are larger than the size needed to display the
-     * label, the label will be aligned accordingly.
-     * 
-     * @param alignment
-     *            label alignment
-     */
-    public void setAlignment(int alignment);
-
-    /**
-     * Gets the alignment of the label (icon and text) within the figure.
-     * 
-     * @return the alignment
-     */
-    public int getAlignment();
-
-    /**
-     * Sets the current placement of the label's text relative to its icon. If
-     * the text placement is set to {@link PositionConstants#EAST}, then the
-     * text would be placed on the right of the icon. Similarly, if text
-     * placement is set to {@link PositionConstants#WEST}, the text will be
-     * placed on the left of the icon; {@link PositionConstants#NORTH} would put
-     * the text above the icon; and {@link PositionConstants#SOUTH} would place
-     * the text below the icon.
-     * 
-     * @param placement
-     *            the text placement relative to the icon
-     */
-    public void setTextPlacement(int placement);
-
-    /**
-     * Gets the placement of the label's text relative to its icon.
-     * 
-     * @return the placement
-     */
-    public int getTextPlacement();
-
-    /**
-     * Sets the alignment of the label's icon relative to the label's text
-     * bounds. This is only relevant if the icon's width or height (depending on
-     * the location of the icon relative to the text) is smaller than the text's
-     * width or height.
-     * 
-     * @param alignment
-     *            the icon alignment relative to the text bounds
-     */
-    public void setIconAlignment(int alignment);
-
-    /**
-     * Gets the alignment of the label's icon relative to the label's text
-     * bounds.
-     * 
-     * @return the alignment
-     */
-    public int getIconAlignment();
-
-    /**
-     * Sets the alignment of the label's text relative to the label's icon
-     * bounds. This is only relevant if the text's width or height (depending on
-     * the location of the text relative to the icon) is smaller than the icon's
-     * width or height.
-     * 
-     * @param alignment
-     *            the text alignment relative to the icon bounds
-     */
-    public void setTextAlignment(int alignment);
-
-    /**
-     * Gets the alignment of the label's text relative to the label's icon
-     * bounds.
-     * 
-     * @return the alignment
-     */
-    public int getTextAlignment();
-
-    /**
-     * Sets the text justification of the label's text.
-     * 
-     * @param justification
-     *            the text justification
-     */
-    public void setTextJustification(int justification);
-
-    /**
-     * Gets the text justification of the label's text.
-     * 
-     * @return the text justification
-     */
-    public int getTextJustification();
-
-    /**
-     * Returns true if the label's text wrapping feature is turned on; false
-     * otherwise.
-     * 
-     * @return true if the label's text wrapping feature is turned on; false
-     *         otherwise
-     */
-    public boolean isTextWrapOn();
-
-    /**
-     * Turns the label's text wrapping feature on or off.
-     * 
-     * @param textWrapOn
-     *            true if the label's text wrapping feature is to be turned on;
-     *            false otherwise
-     */
-    public void setTextWrapOn(boolean textWrapOn);
-
-    /**
-     * Returns the bounds of the label's complete text in absolute coordinates.
-     * One use of this method is by the text direct edit manager to determine
-     * the size and location of the cell editor popup.
-     * 
-     * @return the bounds of the label's complete text in absolute coordinates
-     */
-    public Rectangle getTextBounds();
-
-    /**
-     * This is a stub implementation of the <code>ILabelDelegate</code>
-     * interface. Clients should subclass this stub to avoid any breakage if API
-     * is added to the ILabelDelegate in the future. Clients only need to
-     * override methods in this stub that our applicable to their label. For
-     * example, if the client's label does not support complicated label
-     * alignment then there is no need to override such methods. All methods do
-     * nothing by default or return some default value.
-     * 
-     * @since 2.1
-     * @author crevells
-     */
-    public class Stub
-        implements ILabelDelegate {
-
-        public void setFocus(boolean b) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public boolean hasFocus() {
-            return false;
-        }
-
-        public void setSelected(boolean b) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public boolean isSelected() {
-            return false;
-        }
-
-        public int getTextJustification() {
-            return PositionConstants.LEFT;
-        }
-
-        public void setTextJustification(int justification) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public void setIcon(Image image, int index) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public Image getIcon(int index) {
-            return null;
-        }
-
-        public String getText() {
-            return ""; //$NON-NLS-1$
-        }
-
-        public void setText(String text) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public void setAlignment(int alignment) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public int getAlignment() {
-            return PositionConstants.CENTER;
-        }
-
-        public void setTextPlacement(int placement) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public int getTextPlacement() {
-            return PositionConstants.CENTER;
-        }
-
-        public void setTextAlignment(int alignment) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public int getTextAlignment() {
-            return PositionConstants.CENTER;
-        }
-
-        public void setIconAlignment(int alignment) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public int getIconAlignment() {
-            return PositionConstants.CENTER;
-        }
-
-        public void setTextStrikeThrough(boolean strikeThrough) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public boolean isTextStrikedThrough() {
-            return false;
-        }
-
-        public void setTextUnderline(boolean underline) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public boolean isTextUnderlined() {
-            return false;
-        }
-
-        public void setTextWrapOn(boolean textWrappingOn) {
-            // do nothing by default, clients may override if desired
-        }
-
-        public boolean isTextWrapOn() {
-            return false;
-        }
-
-        public Rectangle getTextBounds() {
-            return new Rectangle();
-        }
-
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/LabelExDelegate.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/LabelExDelegate.java
deleted file mode 100644
index 2ed09b0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/LabelExDelegate.java
+++ /dev/null
@@ -1,120 +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.ui.label;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.LabelEx;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The label delegate for a {@link LabelEx}.
- * 
- * @since 2.1
- * @author crevells
- */
-public class LabelExDelegate
-    extends ILabelDelegate.Stub {
-
-    private LabelEx label;
-
-    public LabelExDelegate(LabelEx label) {
-        this.label = label;
-    }
-
-    public void setFocus(boolean b) {
-        label.setFocus(b);
-    }
-
-    public void setSelected(boolean b) {
-        label.setSelected(b);
-    }
-
-    public String getText() {
-        return label.getText();
-    }
-
-    public void setIcon(Image image, int index) {
-        if (index == 0) {
-            label.setIcon(image);
-        }
-    }
-
-    public void setAlignment(int right) {
-        label.setLabelAlignment(right);
-    }
-
-    public void setText(String text) {
-        label.setText(text);
-    }
-
-    public void setTextAlignment(int alignment) {
-        label.setTextAlignment(alignment);
-    }
-
-    public void setIconAlignment(int alignment) {
-        label.setIconAlignment(alignment);
-    }
-
-    public Rectangle getTextBounds() {
-        Rectangle rect = label.getTextBounds().getCopy();
-        label.translateToAbsolute(rect);
-        return rect;
-    }
-
-    public void setTextPlacement(int placement) {
-        label.setTextPlacement(placement);
-    }
-
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        label.setTextStrikeThrough(strikeThrough);
-    }
-
-    public void setTextUnderline(boolean underline) {
-        label.setTextUnderline(underline);
-    }
-
-    public Image getIcon(int index) {
-        if (index == 0) {
-            return label.getIcon();
-        }
-        return null;
-    }
-
-    public int getIconAlignment() {
-        return label.getIconAlignment();
-    }
-
-    public int getTextAlignment() {
-        return label.getTextAlignment();
-    }
-
-    public int getTextPlacement() {
-        return label.getTextPlacement();
-    }
-
-    public boolean hasFocus() {
-        return label.hasFocus();
-    }
-
-    public boolean isSelected() {
-        return label.isSelected();
-    }
-
-    public boolean isTextStrikedThrough() {
-        return label.isTextStrikedThrough();
-    }
-
-    public boolean isTextUnderlined() {
-        return label.isTextUnderlined();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/WrappingLabelDelegate.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/WrappingLabelDelegate.java
deleted file mode 100644
index dc2a7ac..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/label/WrappingLabelDelegate.java
+++ /dev/null
@@ -1,135 +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.ui.label;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The label delegate for a {@link WrappingLabel}.
- * 
- * @since 2.1
- * @author crevells
- */
-public class WrappingLabelDelegate
-    extends ILabelDelegate.Stub {
-
-    private WrappingLabel label;
-
-    public WrappingLabelDelegate(WrappingLabel wrappingLabel) {
-        this.label = wrappingLabel;
-    }
-
-    public void setText(String text) {
-        label.setText(text);
-    }
-    
-    public String getText() {
-        return label.getText();
-    }
-
-    public void setIcon(Image image, int index) {
-        label.setIcon(image, index);
-    }
-    
-    public Image getIcon(int index) {
-        return label.getIcon(index);
-    }
-
-    public void setAlignment(int right) {
-        label.setAlignment(right);
-    }
-
-    public int getAlignment() {
-        return label.getAlignment();
-    }
-
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        label.setTextStrikeThrough(strikeThrough);
-    }
-
-    public boolean isTextStrikedThrough() {
-        return label.isTextStrikedThrough();
-    }
-
-    public void setTextUnderline(boolean underline) {
-        label.setTextUnderline(underline);
-    }
-
-    public boolean isTextUnderlined() {
-        return label.isTextUnderlined();
-    }
-
-    public void setTextJustification(int justification) {
-        label.setTextJustification(justification);
-    }
-
-    public int getTextJustification() {
-        return label.getTextJustification();
-    }
-
-    public void setFocus(boolean b) {
-        label.setFocus(b);
-    }
-
-    public boolean hasFocus() {
-        return label.hasFocus();
-    }
-
-    public void setSelected(boolean b) {
-        label.setSelected(b);
-    }
-
-    public boolean isSelected() {
-        return label.isSelected();
-    }
-
-    public void setTextAlignment(int alignment) {
-        label.setTextAlignment(alignment);
-    }
-
-    public int getTextAlignment() {
-        return label.getTextAlignment();
-    }
-
-    public void setIconAlignment(int alignment) {
-        label.setIconAlignment(alignment);
-    }
-
-    public int getIconAlignment() {
-        return label.getIconAlignment();
-    }
-
-    public void setTextWrapOn(boolean textWrappingOn) {
-        label.setTextWrap(textWrappingOn);
-    }
-    
-    public boolean isTextWrapOn() {
-        return label.isTextWrapOn();
-    }
-
-    public Rectangle getTextBounds() {
-        Rectangle rect = label.getTextBounds();
-        label.translateToAbsolute(rect);
-        return rect;
-    }
-
-    public void setTextPlacement(int placement) {
-        label.setTextPlacement(placement);
-    }
-
-    public int getTextPlacement() {
-        return label.getTextPlacement();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/layout/FreeFormLayoutEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/layout/FreeFormLayoutEx.java
deleted file mode 100644
index 4c8fac1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/layout/FreeFormLayoutEx.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.layout;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Free form layout that respect the min and max size of the shape 
- *  
- * @author mmostafa
- *
- */
-
-public class FreeFormLayoutEx
-    extends FreeformLayout {
-
-    public void layout(IFigure parent) {
-        Iterator children = parent.getChildren().iterator();
-        Point offset = getOrigin(parent);
-        IFigure f;
-        while (children.hasNext()) {
-            f = (IFigure)children.next();
-            Rectangle bounds = (Rectangle) getConstraint(f);
-            if (bounds == null) continue;
-            bounds = bounds.getCopy();
-
-            int widthHint = bounds.width;
-            int heightHint = bounds.height;
-            if (widthHint == -1 || heightHint == -1) {
-                Dimension _preferredSize = f.getPreferredSize(widthHint, heightHint);
-                if (widthHint == -1)
-                    bounds.width = _preferredSize.width;
-                if (heightHint == -1)
-                    bounds.height = _preferredSize.height;
-            }
-            Dimension min = f.getMinimumSize(widthHint, heightHint);
-            Dimension max = f.getMaximumSize();
-            
-            if (min.width>bounds.width)
-                bounds.width = min.width;
-            else if (max.width < bounds.width)
-                bounds.width = max.width;
-            
-            if (min.height>bounds.height)
-                bounds.height = min.height;
-            else if (max.height < bounds.height)
-                bounds.height = max.height;
-            f.setBounds(bounds.translate(offset));
-        }
-    }
-    
-    
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/PopupMenu.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/PopupMenu.java
deleted file mode 100644
index 84d90fb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/PopupMenu.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.menus;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-
-/**
- * A simple pop-up menu with a list from which the user can select one item.
- * 
- * <p>
- * The <code>show()</code> method returns false if the user cancelled the
- * gesture or clicked outside the popup.
- * </p>
- * 
- * <p>
- * The <code>getResult()</code> method returns the result which is the object
- * from the content list that the user selected, or in the case of cascading
- * menus, a list of the results from each popup.
- * 
- * @author cmahoney
- */
-public class PopupMenu {
-
-	/**
-	 * An instance of this class can be created to add a submenu to a menu item
-	 * in a <code>PopupMenu</code>.
-	 */
-	public static class CascadingMenu {
-
-		/** the content of the parent menu item */
-		private Object parentMenuItem;
-
-		/** the sub menu */
-		private PopupMenu subMenu;
-
-		/**
-		 * Creates a new <code>CascadingMenu</code>.
-		 * 
-		 * @param aParentMenuItem
-		 *            content of the parent menu item
-		 * @param aSubMenu
-		 *            PopupMenu to be used as a submenu
-		 */
-		public CascadingMenu(Object aParentMenuItem, PopupMenu aSubMenu) {
-			this.parentMenuItem = aParentMenuItem;
-			this.subMenu = aSubMenu;
-		}
-
-		/**
-		 * Gets the parentMenuItem.
-		 * 
-		 * @return Returns the parentMenuItem.
-		 */
-		public Object getParentMenuItem() {
-			return parentMenuItem;
-		}
-
-		/**
-		 * Gets the subMenu.
-		 * 
-		 * @return Returns the subMenu.
-		 */
-		public PopupMenu getSubMenu() {
-			return subMenu;
-		}
-	}
-
-	/**
-	 * The content of this menu. Each entry in the list becomes a menu item.
-	 */
-	private List content;
-
-	/**
-	 * Provides the text and icon for each menu item.
-	 */
-	private ILabelProvider labelProvider;
-
-	/**
-	 * The object from the content list that the user selected. In the case of
-	 * cascading menus, this will have multiple objects.
-	 */
-	private List resultList = new ArrayList();
-
-	/**
-	 * Creates a new <code>PopupMenu</code>.
-	 * 
-	 * @param aContent
-	 *            the content for the menu, each object in the list represents a
-	 *            menu item
-	 * @param aLabelProvider
-	 *            the label provider used to provide the text for each object in
-	 *            the content list
-	 */
-	public PopupMenu(List aContent, ILabelProvider aLabelProvider) {
-		setContent(aContent);
-		setLabelProvider(aLabelProvider);
-	}
-
-	/**
-	 * Shows the popup menu and sets the resultList selected by the user.
-	 * 
-	 * @param parent
-	 *            menu will be shown in this parent Control
-	 * @return true if this succeeded, false otherwise (e.g. if the user
-	 *         cancelled the gesture).
-	 */
-	public boolean show(Control parent) {
-		Menu menu = new Menu(parent);
-		createMenuItems(menu, this, new ArrayList());
-
-		menu.setVisible(true);
-
-		Display display = menu.getDisplay();
-		while (!menu.isDisposed() && menu.isVisible()) {
-			if (!display.readAndDispatch())
-				display.sleep();
-		}
-
-		if (!menu.isDisposed()) {
-			menu.dispose();
-
-			if (getResult() != null) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Creates the menu items based on the content list.
-	 * 
-	 * @param parentMenu
-	 *            the parent Menu that the menu items will be created in
-	 * @param rootMenu
-	 *            the root level Menu
-	 * @param resultThusFar
-	 *            List of content objects, e.g. CascadingMenu objects
-	 */
-	protected void createMenuItems(Menu parentMenu, final PopupMenu rootMenu,
-			final List resultThusFar) {
-		Assert.isNotNull(getContent());
-		Assert.isNotNull(getLabelProvider());
-
-		for (Iterator iter = getContent().iterator(); iter.hasNext();) {
-			Object contentObject = iter.next();
-
-			MenuItem menuItem;
-
-			if (contentObject instanceof CascadingMenu) {
-				PopupMenu subMenu = ((CascadingMenu) contentObject)
-					.getSubMenu();
-				contentObject = ((CascadingMenu) contentObject)
-					.getParentMenuItem();
-				List thisResult = new ArrayList(resultThusFar);
-				thisResult.add(contentObject);
-				menuItem = new MenuItem(parentMenu, SWT.CASCADE);
-				menuItem.setMenu(new Menu(parentMenu));
-
-				subMenu.createMenuItems(menuItem.getMenu(), rootMenu,
-					thisResult);
-			} else {
-				menuItem = new MenuItem(parentMenu, SWT.NONE);
-			}
-
-			final Object fContentObject = contentObject;
-			menuItem.setText(getLabelProvider().getText(contentObject));
-			menuItem.setImage(getLabelProvider().getImage(contentObject));
-			menuItem.addSelectionListener(new SelectionListener() {
-
-				public void widgetSelected(SelectionEvent e) {
-					resultThusFar.add(fContentObject);
-					rootMenu.setResult(resultThusFar);
-				}
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-					resultThusFar.add(fContentObject);
-					rootMenu.setResult(resultThusFar);
-				}
-			});
-		}
-	}
-
-	/**
-	 * Gets the content.
-	 * 
-	 * @return Returns the content.
-	 */
-	protected List getContent() {
-		return content;
-	}
-
-	/**
-	 * Sets the content.
-	 * 
-	 * @param aContent
-	 *            The content of this menu. Each entry in the list becomes a
-	 *            menu item.
-	 */
-	public void setContent(List aContent) {
-		this.content = aContent;
-	}
-
-	/**
-	 * Gets the labelProvider.
-	 * 
-	 * @return Returns the labelProvider.
-	 */
-	protected ILabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-	/**
-	 * Sets the labelProvider.
-	 * 
-	 * @param aLabelProvider
-	 *            Provides the text and icon for each menu item.
-	 */
-	public void setLabelProvider(ILabelProvider aLabelProvider) {
-		this.labelProvider = aLabelProvider;
-	}
-
-	/**
-	 * Gets the result which is the object from the content list that the user
-	 * selected, or in the case of cascading menus, a list of the results from
-	 * each popup.
-	 * 
-	 * @return Returns the resultList.
-	 */
-	public Object getResult() {
-		if (resultList == null || resultList.isEmpty()) {
-			return null;
-		} else if (resultList.size() == 1) {
-			return resultList.get(0);
-		}
-		return resultList;
-	}
-
-	/**
-	 * Sets the resultList.
-	 * 
-	 * @param aResultList
-	 *            The resultList to set.
-	 */
-	protected void setResult(List aResultList) {
-		this.resultList = aResultList;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/package.html
deleted file mode 100644
index 3eb5542..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/menus/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>
-
-High level UI menus intended for the diagram surface.
-
-<h2>PopupMenu</h2>
-<P>The {@link org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu PopupMenu}
-displays menus items when {@link
-org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu#PopupMenu(java.util.List,
-org.eclipse.jface.viewers.ILabelProvider) constructed} using a content {@link
-java.util.List list} and a {@link org.eclipse.jface.viewers.ILabelProvider
-label provider} appropriate for the content.  The show method displays the popup
-menu, and the selected menu items are obtained using the {@link
-org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu#getResult() getResult()}
-method.</P>
-
-@canBeSeenBy %partners
- 
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/package.html
deleted file mode 100644
index 4ac37a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramActionBarContributor.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramActionBarContributor.java
deleted file mode 100644
index 061cdd7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramActionBarContributor.java
+++ /dev/null
@@ -1,151 +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.parts;
-
-import org.eclipse.gef.ui.actions.ActionBarContributor;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.common.ui.util.IWorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.common.ui.util.WorkbenchPartDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.ActivityManagerEvent;
-import org.eclipse.ui.activities.IActivityManagerListener;
-
-/**
- * @author melaasar, cmahoney
- * 
- * An abstract implementation of a diagram editor action bar contributor
- * It contributes generic items that applies to all diagrams 
- */
-public abstract class DiagramActionBarContributor
-	extends ActionBarContributor {
-
-	/**
-	 * Listens for activity/capability events.
-	 * 
-	 * @author cmahoney
-	 */
-	class ActivityManagerListener
-		implements IActivityManagerListener {
-
-		public void activityManagerChanged(
-				ActivityManagerEvent activityManagerEvent) {
-			if (activityManagerEvent.haveEnabledActivityIdsChanged()) {
-				updateActionBars();
-			}
-		}
-	}
-	
-	/**
-	 * The activity listener.
-	 */
-	private ActivityManagerListener activityManagerListener;
-	
-	private IWorkbenchPartDescriptor descriptor;
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(org.eclipse.ui.IActionBars)
-	 */
-	public void init(final IActionBars bars) {
-		super.init(bars);
-
-		descriptor =
-			new WorkbenchPartDescriptor(
-				getEditorId(),
-				getEditorClass(),
-				getPage());
-
-		try {
-//			getEditingDomain().runExclusive(new Runnable() {
-//
-//				public void run() {
-					ContributionItemService.getInstance()
-						.contributeToActionBars(bars, descriptor);
-//				}
-//			});
-		}catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"init()", //$NON-NLS-1$
-					e);
-		}
-		
-		bars.updateActionBars();
-		
-		activityManagerListener = new ActivityManagerListener();
-		PlatformUI.getWorkbench().getActivitySupport().getActivityManager()
-			.addActivityManagerListener(activityManagerListener);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorActionBarContributor#dispose()
-	 */
-	public void dispose() {
-		ContributionItemService.getInstance().disposeContributions(descriptor);
-		descriptor = null;
-		
-		if (activityManagerListener != null) {
-			PlatformUI.getWorkbench().getActivitySupport().getActivityManager()
-				.removeActivityManagerListener(activityManagerListener);
-		}
-		activityManagerListener = null;
-		
-		super.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#buildActions()
-	 */
-	protected void buildActions() {
-		// empty impl
-	}
-
-	/**
-	 * @see org.eclipse.gef.ui.actions.ActionBarContributor#declareGlobalActionKeys()
-	 */
-	protected void declareGlobalActionKeys() {
-		// empty impl
-	}
-
-	/**
-	 * Returns the id of the editor configured with this contributor
-	 * 
-	 * @return The editor's id configured with this contribution
-	 */
-	protected abstract String getEditorId();
-
-	/**
-	 * Returns the class of the editor configured with this contributor
-	 * 
-	 * @return The editor's class configured with this contribution
-	 */
-	protected abstract Class getEditorClass();
-	
-//	protected abstract TransactionalEditingDomain getEditingDomain();
-
-	/**
-	 * Updates the actionbars to show/hide contribution items as applicable.
-	 */
-	private void updateActionBars() {
-
-		// get the new contributions
-		ContributionItemService.getInstance().updateActionBars(getActionBars(),
-			descriptor);
-		
-		// refresh the UI
-		getActionBars().updateActionBars();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramCommandStack.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramCommandStack.java
deleted file mode 100644
index 015b72b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramCommandStack.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    Nicolas Rouquette (NASA) - Fix for Bug 260812. 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.parts;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-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.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.commands.CompoundCommand;
-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.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.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.ConnectionHandleTool;
-
-/**
- * GEF command stack that delegates to an {@link IOperationHistory}.
- * 
- * @author sshaw
- * @author Tauseef A, Israr
- * @author ldamus
- */
-public class DiagramCommandStack
-    extends CommandStack {
-
-    private Map stackToManager = new HashMap();
-
-    private IDiagramEditDomain editDomain;
-
-    private Command cmdRecent = null;
-
-    private IOperationHistory delegate;
-
-    private IUndoContext undoContext;
-
-    private final class HistoryEventObject
-        extends EventObject {
-
-        private final OperationHistoryEvent event;
-
-        private HistoryEventObject(OperationHistoryEvent event) {
-            super(event.getHistory());
-            this.event = event;
-        }
-
-        /**
-         * Gets my operation history event.
-         * 
-         * @return my operation history event.
-         */
-        public OperationHistoryEvent getOperationHistoryEvent() {
-            return event;
-        }
-    }
-
-    /**
-     * Initializes me with my diagram edit domain and undo context.
-     * 
-     * @param editDomain
-     *            the editing domain assoicated with this stack
-     * @param undoContext
-     *            my undo context
-     */
-    public DiagramCommandStack(IDiagramEditDomain editDomain) {
-        this.editDomain = editDomain;
-    }
-
-    /**
-     * Adds a listener to this CommandStack.
-     * 
-     * @param listener
-     *            The Object listening to this CommandStack.
-     */
-    public void addCommandStackListener(CommandStackListener listener) {
-
-        final CommandStackListener csl = listener;
-        // The removal of the listener here is done to avoid multiple
-        // commandchangelisteners added to the commandmanager.
-        // Tauseef Israr
-        removeCommandStackListener(csl);
-
-        IOperationHistoryListener cmcl = new IOperationHistoryListener() {
-
-            public void historyNotification(OperationHistoryEvent event) {
-                if (csl != null) {
-                    csl.commandStackChanged(new HistoryEventObject(event));
-                }
-            }
-        };
-
-        stackToManager.put(csl, cmcl);
-        getOperationHistory().addOperationHistoryListener(cmcl);
-    }
-
-    /**
-     * Returns <code>true</code> if there is a Command to redo.
-     * 
-     * @return <code>true</code> if there is a Command to redo.
-     */
-    public boolean canRedo() {
-        return getOperationHistory().canRedo(getUndoContext());
-    }
-
-    /**
-     * Returns <code>true</code> if the last Command executed can be undone.
-     * 
-     * @return <code>true</code> if the last Command executed can be undone.
-     */
-    public boolean canUndo() {
-        return getOperationHistory().canUndo(getUndoContext());
-    }
-
-    /**
-     * Executes the given Command if it can execute.
-     * 
-     * @param command
-     *            The Command to execute.
-     */
-    public void execute(Command command) {
-        execute(command, null);
-    }
-
-    /**
-     * Executes the given Command if it can execute.
-     * 
-     * @param command
-     *            The Command to execute.
-     * @param progressMonitor
-     */
-    public void execute(Command command, IProgressMonitor progressMonitor) {
-        if (command == null || !command.canExecute())
-            return;
-        execute(getICommand(command), progressMonitor);
-    }
-
-    /**
-     * exectus a the supplied command
-     * 
-     * @param command
-     *            the command to execute
-     */
-    protected void execute(ICommand command) {
-        execute(command, null);
-    }
-
-    /**
-     * executes the supplied command
-     * 
-     * @param command
-     *            the command to exectue
-     * @param progressMonitor
-     */
-    protected void execute(ICommand command, IProgressMonitor progressMonitor) {
-
-        if (progressMonitor != null) {
-            try {
-                command.addContext(getUndoContext());
-                getOperationHistory().execute(command, progressMonitor, null);
-
-            } catch (ExecutionException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                    getClass(), "execute", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.COMMAND_FAILURE, "execute", e); //$NON-NLS-1$
-            } 
-        } else {
-            try {
-                command.addContext(getUndoContext());
-                getOperationHistory().execute(command,
-                    new NullProgressMonitor(), null);
-
-            } catch (ExecutionException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                    getClass(), "execute", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.COMMAND_FAILURE, "execute", e); //$NON-NLS-1$
-            }
-        }
-
-    }
-    
-
-    /**
-     * Converts a GEF {@link Command} into a GMF {@link ICommand}
-     * 
-     * @param command
-     *            the GEF command
-     * @return the GMF command
-     */
-    public static ICommand getICommand(Command command) {
-
-        if (command instanceof CompoundCommand) {
-
-            CompositeCommand composite = new CompositeCommand(
-                command.getLabel());
-            Object[] subCommands = ((CompoundCommand) command).getChildren();
-
-            for (int i = 0; i < subCommands.length; i++) {
-                composite.compose(getICommand((Command) subCommands[i]));
-            }
-            return composite.reduce();
-        }
-
-        if (command instanceof ICommandProxy) {
-            return getICommand(((ICommandProxy) command).getICommand());
-        }
-
-        if (null != command) {
-        	return new CommandProxy(command);
-        } else {
-        	return null;
-        }
-    }
-
-    /**
-     * Removes redundancies from <code>command</code> by stripping out layers
-     * of command wrappers used to accomodate the use of GEF commands on an
-     * {@link IOperationHistory} and {@link ICommand}s on the GEF
-     * {@link CommandStack}.
-     * 
-     * @param command
-     *            the command to be processed
-     * @return a command representing the simplified form of the input command.
-     *         May be a new command.
-     */
-    public static ICommand getICommand(ICommand command) {
-
-        ICommand result = command;
-
-        if (command instanceof ICompositeCommand) {
-            // process composite command
-            List processedCommands = new ArrayList();
-
-            ICompositeCommand composite = (ICompositeCommand) command;
-
-            if (!composite.isEmpty()) {
-
-                for (Iterator i = composite.iterator(); i.hasNext();) {
-                    IUndoableOperation nextOperation = (IUndoableOperation) i
-                        .next();
-
-                    // remove the next child from the composite
-                    i.remove();
-
-                    // convert any GEF commands to GMF commands
-                    if (nextOperation instanceof ICommand) {
-                        ICommand nextCommand = (ICommand) nextOperation;
-                        processedCommands.add(getICommand(nextCommand));
-
-                    } else {
-                        processedCommands.add(nextOperation);
-                    }
-                }
-
-                // add all the children back
-                for (Iterator i = processedCommands.iterator(); i.hasNext();) {
-                    composite.add((IUndoableOperation) i.next());
-                }
-
-                // reduce to the simplest equivalent form
-                result = composite.reduce();
-            }
-
-        } else if (command instanceof CommandProxy) {
-        	// process GEF command proxy
-            return getICommand(((CommandProxy) command).getCommand());
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns the most recently executed command.
-     * 
-     * @return The most recently executed command.
-     */
-    public Command getMostRecentCommand() {
-        return cmdRecent;
-    }
-
-    /**
-     * getRedoCommand Returns the command at the top of the redo stack.
-     * 
-     * @see org.eclipse.gef.commands.CommandStack#getRedoCommand()
-     */
-    public Command getRedoCommand() {
-        if (getOperationHistory().canRedo(getUndoContext())) {
-            Command emptyCmd = new Command() {
-                // empty
-            };
-
-            IUndoableOperation redo = getOperationHistory().getRedoOperation(
-                getUndoContext());
-            emptyCmd.setLabel(redo.getLabel());
-            return emptyCmd;
-        }
-
-        return null;
-    }
-
-    /**
-     * getUndoCommand() Returns the next command to be undone.
-     * 
-     * @see org.eclipse.gef.commands.CommandStack#getUndoCommand()
-     */
-    public Command getUndoCommand() {
-        if (getOperationHistory().canUndo(getUndoContext())) {
-            Command emptyCmd = new Command() {
-                // empty
-            };
-
-            IUndoableOperation undo = getOperationHistory().getUndoOperation(
-                getUndoContext());
-            emptyCmd.setLabel(undo.getLabel());
-            return emptyCmd;
-        }
-
-        return null;
-    }
-
-    /**
-     * Executes the last undone Command.
-     */
-    public void redo() {
-        cmdRecent = getRedoCommand();
-
-        try {
-            getOperationHistory().redo(getUndoContext(),
-                new NullProgressMonitor(), null);
-
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                ConnectionHandleTool.class, "redo", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.COMMAND_FAILURE, "redo", e); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Removes the given CommandStackListener.
-     * 
-     * @param listener
-     *            The object to be removed from the list of listeners.
-     */
-    public void removeCommandStackListener(CommandStackListener listener) {
-        final CommandStackListener csl = listener;
-
-        if (csl != null) {
-            IOperationHistoryListener historyListener = (IOperationHistoryListener) stackToManager
-                .get(csl);
-
-            if (historyListener != null) {
-                getOperationHistory().removeOperationHistoryListener(
-                    historyListener);
-            }
-            // mgoyal: removing from stack manager
-            stackToManager.remove(csl);
-        }
-    }
-
-    /**
-     * Undoes the last executed Command.
-     */
-    public void undo() {
-        cmdRecent = getUndoCommand();
-
-        try {
-            getOperationHistory().undo(getUndoContext(),
-                new NullProgressMonitor(), null);
-
-        } catch (ExecutionException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-                ConnectionHandleTool.class, "undo", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.COMMAND_FAILURE, "undo", e); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Returns the editDomain.
-     * 
-     * @return IDiagramEditDomain
-     */
-    protected IDiagramEditDomain getDiagramEditDomain() {
-        return editDomain;
-    }
-
-    /**
-     * Gets my operation history delegate.
-     * 
-     * @return my operation history delegate
-     */
-    protected IOperationHistory getOperationHistory() {
-
-        if (delegate == null) {
-            delegate = OperationHistoryFactory.getOperationHistory();
-        }
-        return delegate;
-    }
-
-    /**
-     * Sets my operation history delegate.
-     * 
-     * @param operationHistory
-     *            my operation history delegate
-     */
-    public void setOperationHistory(IOperationHistory operationHistory) {
-        this.delegate = operationHistory;
-    }
-
-    /**
-     * Gets the return values of the given executed command
-     * 
-     * @param c
-     *            The command
-     * @return A collection of values returned by the given command
-     */
-    public static Collection getReturnValues(Command c) {
-        if (c instanceof CompoundCommand) {
-            CompoundCommand cc = (CompoundCommand) c;
-            List l = new ArrayList(cc.size());
-            for (Iterator i = cc.getCommands().iterator(); i.hasNext();)
-                l.addAll(getReturnValues((Command) i.next()));
-            return l;
-
-        } else if (c instanceof ICommandProxy) {
-            return getReturnValues((ICommandProxy) c);
-        }
-        return Collections.EMPTY_LIST;
-    }
-
-    /**
-     * gets the return the values for the supplied command.
-     * 
-     * @param cmd
-     *            command to use
-     * @return a collection of return values
-     */
-    public static Collection getReturnValues(ICommandProxy cmd) {
-        return getReturnValues(cmd.getICommand());
-    }
-
-
-    
-    
-    /**
-     * gets the return the values for the supplied command.
-     * @param cmd command to use
-     * @return a collection of return values
-     */
-    public static Collection getReturnValues( CommandProxy cmd ) {
-        return getReturnValues( cmd.getCommand() );
-    }
-
-    /**
-     * gets the return the values for the supplied command.
-     * 
-     * @param cmd
-     *            command to use
-     * @return a collection of return values
-     */
-    public static Collection getReturnValues(ICommand cmd) {
-        
-        if (cmd instanceof ICompositeCommand) {
-            ICompositeCommand cc = (ICompositeCommand) cmd;
-            List l = new ArrayList();
-            for (Iterator i = cc.iterator(); i.hasNext();) {
-            	IUndoableOperation child = (IUndoableOperation) i.next();
-            	if (child instanceof ICommand) {
-            		l.addAll(getReturnValues((ICommand) child));
-            	}
-            }
-            return l;
-            
-        } else if ( cmd instanceof CommandProxy ) { //
-            // Need to recurse into the proxy command(s) since they
-            // will not have set the CommandProxy result
-            // This Could be moved into CommandProxy but
-            // #getCommandResult() can no longer be final.
-            return getReturnValues((CommandProxy)cmd);
-        
-        } else {
-            CommandResult r = cmd.getCommandResult();
-            Object o = r != null ? r.getReturnValue()
-                : null;
-            
-            if (o instanceof Collection) {
-                return (Collection) o;
-                
-            } else if (o != null) {
-                return Collections.singletonList(o);
-            }
-        }
-        
-        return Collections.EMPTY_LIST;
-    }
-
-    /**
-     * Gets my undo context. I add my context to all commands executed through
-     * me.
-     * 
-     * @return my undo context
-     */
-    public IUndoContext getUndoContext() {
-
-        if (undoContext == null) {
-            undoContext = new ObjectUndoContext(this);
-        }
-        return undoContext;
-    }
-    
-    /**
-     * Sets my undo context.
-     * 
-     * @param undoContext
-     *            my undo context
-     */
-    public void setUndoContext(IUndoContext undoContext) {
-        this.undoContext = undoContext;
-    }
-
-    public void dispose() {
-        // clean up the known listeners (if there is any remaining)
-        // this will prevent clients from causing memory leaks
-        Set entries = stackToManager.entrySet();
-        for (Iterator iter = entries.iterator(); iter.hasNext();) {
-            Map.Entry element = (Map.Entry) iter.next();
-            IOperationHistoryListener historyListener = (IOperationHistoryListener) element.getValue();
-            if (historyListener != null) {
-                getOperationHistory().removeOperationHistoryListener(
-                    historyListener);
-            }
-        }
-        super.dispose();
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramDropTargetListener.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramDropTargetListener.java
deleted file mode 100644
index 7e913f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramDropTargetListener.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.parts;
-
-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.Cursors;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Performs a drop of one or more semantic elements using a given transfer. The Drop is performed by
- * using a {@link DropObjectsRequest} to obtain a <code>Command</code> from the targeted
- * <code>EditPart</code>. The target edit part might re-interpret the <code>DropElementsRequest</code>
- * to mean another request. Note that some transfers on different OS's occur at the drop time, hence
- * live feedback cannot be provided for these transfers (i.e. command created). If this is the case then to enable
- * drag and drop on different platforms {@link #isDataTransfered()} needs to be implemented.
- * <P>
- * This class is <code>abstract</code>. Subclasses are responsible for providing the
- * appropriate <code>Transfer</code> object based on the type of elements that are being dragged.
- *
- * @author melaasar, aboyko
- */
-public abstract class DiagramDropTargetListener
-    extends AbstractTransferDropTargetListener {
-
-    /**
-     * Constructor for DiagramDropTargetListener.
-     * @param viewer
-     */
-    public DiagramDropTargetListener(EditPartViewer viewer) {
-        super(viewer);
-        setEnablementDeterminedByCommand(true);
-    }
-
-    /**
-     * Constructor for DiagramDropTargetListener.
-     * @param viewer
-     * @param xfer
-     */
-    public DiagramDropTargetListener(EditPartViewer viewer, Transfer xfer) {
-        super(viewer, xfer);
-        setEnablementDeterminedByCommand(true);
-    }
-
-    /**
-     *
-     * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#createTargetRequest()
-     */
-    protected Request createTargetRequest() {
-        return  new DropObjectsRequest();
-    }
-
-    /**
-     * A helper method that casts the target Request to a DropElementsRequest.
-     * @return DropElementsRequest
-     */
-    protected final DropObjectsRequest getDropObjectsRequest() {
-        return ((DropObjectsRequest) getTargetRequest());
-    }
-
-    /**
-     * gets a list of objects being dropped on the diagram
-    * @return <code>List</code>
-     */
-    protected abstract List getObjectsBeingDropped();
-
-    /**
-     * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-     */
-    public void dragEnter(DropTargetEvent event) {
-        super.dragEnter(event);
-        handleDragEnter(); // called to properly initialize the effect
-    }
-
-    /**
-     * Called whenever the User enters the target. By default, the target Request and
-     * target EditPart are updated, and feedback is
-     */
-    protected void handleDragEnter() {
-        handleDragOver();
-    }    
-
-    /**
-     * The purpose of a template is to be copied. Therefore, the drop operation can't be
-     * anything but <code>DND.DROP_COPY</code>.
-     * @see AbstractTransferDropTargetListener#handleDragOperationChanged()
-     */
-    protected void handleDragOperationChanged() {
-        super.handleDragOperationChanged();
-        /*
-         * The edit policies creating the command for the drop request may modify the
-         * required detail field, so it's being set for the event here. However, if the command
-         * can't be created due to the fact that data hasn't been transfered yet then the request will
-         * contain DND.DROP_NONE required detail that we don't want to set for the event.  
-         */
-        if (getDropObjectsRequest().getRequiredDetail() != DND.DROP_NONE) {
-            getCurrentEvent().detail = getDropObjectsRequest().getRequiredDetail();
-        }
-    }
-
-    /**
-     * The purpose of a template is to be copied. Therefore, the Drop operation is set to
-     * <code>DND.DROP_COPY</code> by default.
-     * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#handleDragOver()
-     */
-    protected void handleDragOver() {
-        super.handleDragOver();
-        /*
-         * The edit policies creating the command for the drop request may modify the
-         * required detail field, so it's being set for the event here. However, if the command
-         * can't be created due to the fact that data hasn't been transfered yet then the request will
-         * contain DND.DROP_NONE required detail that we don't want to set for the event.  
-         */
-        if (getDropObjectsRequest().getRequiredDetail() != DND.DROP_NONE) {
-            getCurrentEvent().detail = getDropObjectsRequest().getRequiredDetail();
-        }
-        getCurrentEvent().feedback = DND.FEEDBACK_SCROLL | DND.FEEDBACK_EXPAND;
-    }
-
-    /**
-     * Overridden to select the request result if any
-     * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#handleDrop()
-     */
-    protected void handleDrop() {
-        getViewer().setCursor(Cursors.WAIT);
-        super.handleDrop();
-		getViewer().setCursor(null);
-        selectAddedViews();
-    }
-
-    /**
-     * Selects the created views that could result from the drop request if any
-     */
-    private void selectAddedViews() {
-        Object result = getDropObjectsRequest().getResult();
-        if (result == null || !(result instanceof Collection))
-            return;
-        EditPartViewer viewer = getViewer();
-        List editParts = new ArrayList();
-        Iterator views = ((Collection)result).iterator();
-
-        while (views.hasNext()) {
-            Object view = views.next();
-            if (view instanceof IAdaptable) {
-                EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(((IAdaptable)view).getAdapter(View.class));
-                if (editPart != null)
-                    editParts.add(editPart);
-            }
-        }
-                
-        if (!editParts.isEmpty()) {
-            //Force a layout first.
-            viewer.getControl().forceFocus();
-            getViewer().flush();
-            viewer.setSelection(new StructuredSelection(editParts));
-        }
-    }
-
-    /**
-	 * Assumes that the target request is a {@link DropObjectsRequest}. GEF
-	 * wipes out the request in {@link #isEnabled(DropTargetEvent)} method, we
-	 * don't. Hence we just update the necessary fields: <li>the mouse location
-	 * <li>the objects being dropped <li>the allowed detail that comes from the
-	 * DND event
-	 * 
-	 * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#
-	 * 	updateTargetRequest()
-	 */
-    protected void updateTargetRequest() {
-        DropObjectsRequest request = getDropObjectsRequest();
-        request.setLocation(getDropLocation());
-        request.setObjects(getObjectsBeingDropped());
-        request.setAllowedDetail(getCurrentEvent().operations);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#isEnabled(org.eclipse.swt.dnd.DropTargetEvent)
-     */
-    public boolean isEnabled(DropTargetEvent event) {
-    	/*
-    	 * Cache the current event 
-    	 */
-        setCurrentEvent(event);
-        
-        /*
-         * Update the target request and target editpart
-         */
-        updateTargetRequest();
-        updateTargetEditPart();
-        
-        if (getTargetEditPart() == null) {
-            return false;
-        } else if (isEnablementDeterminedByCommand() && isDataTransfered()) {
-        	/*
-        	 * Check the command only if:
-        	 * 1) The data has been transfered from the drag source to the event
-        	 * 2) The "ask for command" option is on. (It's "on" by default)
-        	 */
-            Command command = getCommand();
-            return command != null && command.canExecute();
-        } else {
-        	/*
-        	 * Otherwise we should enable the drop. Executable command needs to be created at the drop time anyway.
-        	 * Hence, we'll fail the drop there if there is no target editpart or no data transfered. 
-        	 */
-            return true;
-        }
-    }
-
-	/**
-	 * It is not a common use case to have the transfered data at the drag time,
-	 * hence live feedback cannot be provided for all types of DnD. Since the
-	 * occurrence of the data transfer at the drag time depends mostly on the
-	 * used OS and the the type of data transfer, clients are responsible to
-	 * experiment with their DnD and come up with the appropriate implementation
-	 * of this method for their specific DnD support. By default the method
-	 * checks if there is a local selection transfer or data field in the event
-	 * is not null.
-	 * 
-	 * @return <code>true</code> if data has been transfered.
-	 */
-    protected boolean isDataTransfered() {
-        return LocalSelectionTransfer.getTransfer().getSelection() != null || getCurrentEvent().data != null;
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditDomain.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditDomain.java
deleted file mode 100644
index ec313d5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditDomain.java
+++ /dev/null
@@ -1,70 +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.parts;
-
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-
-/**
- * The diagram editor edit domain that holds all data that is contexual
- * to the editor instance 
- * @author melaasar
- *
- */
-public class DiagramEditDomain
-	extends DefaultEditDomain
-	implements IDiagramEditDomain {
-
-	/** the action manager */
-	private ActionManager actionManager;
-
-	/**
-	 * Creates a DefaultEditDomain for the given IEditorPart
-	 * @param editorPart
-	 */
-	public DiagramEditDomain(IEditorPart editorPart) {
-		super(editorPart);
-	}
-
-	/**
-	 * gets the diagram editor part
-	 * @return <code>IDiagramWorkbenchPart</code>
-	 */
-	public IDiagramWorkbenchPart getDiagramEditorPart() {
-		return (IDiagramWorkbenchPart) getEditorPart();
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain#getDiagramCommandStack()
-	 */
-	public DiagramCommandStack getDiagramCommandStack() {
-		return (DiagramCommandStack) getCommandStack();
-	}
-
-	/**
-	 * gets the action manager
-	 * @return <code>ActionManager</code>
-	 */
-	public ActionManager getActionManager() {
-		return actionManager;
-	}
-
-	/**
-	 * @param manager
-	 */
-	public void setActionManager(ActionManager manager) {
-		actionManager = manager;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java
deleted file mode 100644
index d4da927..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditor.java
+++ /dev/null
@@ -1,1596 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    IBM Corporation - initial API and implementation 

- *    Dmitry Stadnik (Borland) - contribution for bugzilla 136582

- ****************************************************************************/

-

-package org.eclipse.gmf.runtime.diagram.ui.parts;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-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.commands.operations.OperationHistoryFactory;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.draw2d.FigureCanvas;

-import org.eclipse.draw2d.LightweightSystem;

-import org.eclipse.draw2d.Viewport;

-import org.eclipse.draw2d.geometry.Point;

-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.RunnableWithResult;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.util.TransactionUtil;

-import org.eclipse.emf.workspace.ResourceUndoContext;

-import org.eclipse.gef.ContextMenuProvider;

-import org.eclipse.gef.DefaultEditDomain;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.EditPartFactory;

-import org.eclipse.gef.EditPartViewer;

-import org.eclipse.gef.KeyHandler;

-import org.eclipse.gef.KeyStroke;

-import org.eclipse.gef.LayerConstants;

-import org.eclipse.gef.MouseWheelHandler;

-import org.eclipse.gef.MouseWheelZoomHandler;

-import org.eclipse.gef.RootEditPart;

-import org.eclipse.gef.SnapToGeometry;

-import org.eclipse.gef.SnapToGrid;

-import org.eclipse.gef.commands.CommandStack;

-import org.eclipse.gef.editparts.ZoomManager;

-import org.eclipse.gef.rulers.RulerProvider;

-import org.eclipse.gef.ui.actions.ActionRegistry;

-import org.eclipse.gef.ui.actions.DirectEditAction;

-import org.eclipse.gef.ui.actions.GEFActionConstants;

-import org.eclipse.gef.ui.actions.ZoomInAction;

-import org.eclipse.gef.ui.actions.ZoomOutAction;

-import org.eclipse.gef.ui.parts.ContentOutlinePage;

-import org.eclipse.gef.ui.parts.GraphicalEditor;

-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;

-import org.eclipse.gef.ui.parts.TreeViewer;

-import org.eclipse.gef.ui.rulers.RulerComposite;

-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.ActionManager;

-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;

-import org.eclipse.gmf.runtime.common.ui.util.IPartSelector;

-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;

-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.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.editparts.TreeContainerEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.TreeDiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.TreeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;

-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;

-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.InsertAction;

-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PromptingDeleteAction;

-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.PromptingDeleteFromModelAction;

-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.ToggleRouterAction;

-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DiagramRootTreeEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;

-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper;

-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.DiagramGraphicalViewerKeyHandler;

-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.DirectEditKeyHandler;

-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.DiagramRuler;

-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.DiagramRulerProvider;

-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.providers.DiagramContextMenuProvider;

-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;

-import org.eclipse.gmf.runtime.draw2d.ui.internal.parts.ScrollableThumbnailEx;

-import org.eclipse.gmf.runtime.draw2d.ui.internal.parts.ThumbnailEx;

-import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.GuideStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceStore;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.SWTException;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.widgets.Canvas;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchPartSite;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.ActionFactory;

-import org.eclipse.ui.contexts.IContextService;

-import org.eclipse.ui.part.IPageSite;

-import org.eclipse.ui.part.IShowInSource;

-import org.eclipse.ui.part.PageBook;

-import org.eclipse.ui.part.ShowInContext;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;

-

-/**

- * @author melaasar

- * 

- * A generic diagram editor with no palette. DiagramEditorWithPalette will

- * provide a palette.

- */

-public abstract class DiagramEditor

-    extends GraphicalEditor

-    implements IDiagramWorkbenchPart, ITabbedPropertySheetPageContributor,

-    IShowInSource {

-	

-	public static String DIAGRAM_CONTEXT_ID = "org.eclipse.gmf.runtime.diagram.ui.diagramContext"; //$NON-NLS-1$

-

-    /**

-     * teh ID of the outline

-     */

-    protected static final int ID_OUTLINE = 0;

-

-    /**

-     * the id of the over view

-     */

-    protected static final int ID_OVERVIEW = 1;

-

-    /**

-     * the work space viewer preference store

-     */

-    protected PreferenceStore workspaceViewerPreferenceStore = null;

-

-    /**

-     * A diagram outline page

-     */

-    class DiagramOutlinePage

-        extends ContentOutlinePage

-        implements IAdaptable {

-

-        private PageBook pageBook;

-

-        private Control outline;

-

-        private Canvas overview;

-

-        private IAction showOutlineAction, showOverviewAction;

-

-        private boolean overviewInitialized;

-

-        private ThumbnailEx thumbnail;

-

-        private DisposeListener disposeListener;

-

-        /**

-         * @param viewer

-         */

-        public DiagramOutlinePage(EditPartViewer viewer) {

-            super(viewer);

-        }

-

-        /*

-         * (non-Javadoc)

-         * 

-         * @see org.eclipse.ui.part.Page#init(org.eclipse.ui.part.IPageSite)

-         */

-        public void init(IPageSite pageSite) {

-            super.init(pageSite);

-            ActionRegistry registry = getActionRegistry();

-            IActionBars bars = pageSite.getActionBars();

-            String id = ActionFactory.UNDO.getId();

-            bars.setGlobalActionHandler(id, registry.getAction(id));

-            id = ActionFactory.REDO.getId();

-            bars.setGlobalActionHandler(id, registry.getAction(id));

-            id = ActionFactory.DELETE.getId();

-            bars.setGlobalActionHandler(id, registry.getAction(id));

-            bars.updateActionBars();

-

-            // Toolbar refresh to solve linux defect RATLC525198

-            bars.getToolBarManager().markDirty();

-        }

-

-        /**

-         * configures the outline viewer

-         */

-        protected void configureOutlineViewer() {

-            getViewer().setEditDomain(getEditDomain());

-            getViewer().setEditPartFactory(getOutlineViewEditPartFactory());

-            

-            MenuManager outlineContextMenuProvider = getOutlineContextMenuProvider(getViewer());

-            if (outlineContextMenuProvider != null) {

-            	getViewer().setContextMenu(outlineContextMenuProvider);

-            }

-

-            getViewer().setKeyHandler(getKeyHandler());

-            // getViewer().addDropTargetListener(

-            // new LogicTemplateTransferDropTargetListener(getViewer()));

-            IToolBarManager tbm = this.getSite().getActionBars()

-                .getToolBarManager();

-            showOutlineAction = new Action() {

-

-                public void run() {

-                    showPage(ID_OUTLINE);

-                }

-            };

-            showOutlineAction

-                .setImageDescriptor(DiagramUIPluginImages.DESC_OUTLINE);

-            showOutlineAction.setToolTipText(DiagramUIMessages.OutlineView_OutlineTipText);

-            tbm.add(showOutlineAction);

-            showOverviewAction = new Action() {

-            	

-                public void run() {

-                    showPage(ID_OVERVIEW);

-                }

-            };

-            showOverviewAction

-                .setImageDescriptor(DiagramUIPluginImages.DESC_OVERVIEW);

-            showOverviewAction.setToolTipText(DiagramUIMessages.OutlineView_OverviewTipText);

-            tbm.add(showOverviewAction);

-            showPage(getDefaultOutlineViewMode());

-        }

-

-        public void createControl(Composite parent) {

-            pageBook = new PageBook(parent, SWT.NONE);

-            outline = getViewer().createControl(pageBook);

-            overview = new Canvas(pageBook, SWT.NONE);

-            pageBook.showPage(outline);

-            configureOutlineViewer();

-            hookOutlineViewer();

-            initializeOutlineViewer();

-        }

-

-        public void dispose() {

-            unhookOutlineViewer();

-            if (thumbnail != null) {

-                thumbnail.deactivate();

-            }

-            this.overviewInitialized = false;

-            super.dispose();

-        }

-

-        public Object getAdapter(Class type) {

-            // if (type == ZoomManager.class)

-            // return getZoomManager();

-            return null;

-        }

-

-        public Control getControl() {

-            return pageBook;

-        }

-

-        /**

-         * hook the outline viewer

-         */

-        protected void hookOutlineViewer() {

-            getSelectionSynchronizer().addViewer(getViewer());

-        }

-

-        /**

-         * initialize the outline viewer

-         */

-        protected void initializeOutlineViewer() {

-            try {

-                TransactionUtil.getEditingDomain(getDiagram()).runExclusive(

-                    new Runnable() {

-

-                        public void run() {

-                            getViewer().setContents(getDiagram());

-                        }

-                    });

-            } catch (InterruptedException e) {

-                Trace.catching(DiagramUIPlugin.getInstance(),

-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),

-                    "initializeOutlineViewer", e); //$NON-NLS-1$

-                Log.error(DiagramUIPlugin.getInstance(),

-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,

-                    "initializeOutlineViewer", e); //$NON-NLS-1$

-            }

-        }

-

-        /**

-         * initialize the overview

-         */

-        protected void initializeOverview() {

-            LightweightSystem lws = new LightweightSystem(overview);

-            RootEditPart rep = getGraphicalViewer().getRootEditPart();

-            DiagramRootEditPart root = (DiagramRootEditPart) rep;

-            thumbnail = new ScrollableThumbnailEx((Viewport) root.getFigure());

-            // thumbnail.setSource(root.getLayer(LayerConstants.PRINTABLE_LAYERS));

-            thumbnail.setSource(root.getLayer(LayerConstants.SCALABLE_LAYERS));

-

-            lws.setContents(thumbnail);

-            disposeListener = new DisposeListener() {

-

-                public void widgetDisposed(DisposeEvent e) {

-                    if (thumbnail != null) {

-                        thumbnail.deactivate();

-                        thumbnail = null;

-                    }

-                }

-            };

-            getEditor().addDisposeListener(disposeListener);

-            this.overviewInitialized = true;

-        }

-

-        /**

-         * show page with a specific ID, possibel values are ID_OUTLINE and

-         * ID_OVERVIEW

-         * 

-         * @param id

-         */

-        protected void showPage(int id) {

-            if (id == ID_OUTLINE) {

-                showOutlineAction.setChecked(true);

-                showOverviewAction.setChecked(false);

-                pageBook.showPage(outline);

-                if (thumbnail != null)

-                    thumbnail.setVisible(false);

-            } else if (id == ID_OVERVIEW) {

-                if (!overviewInitialized)

-                    initializeOverview();

-                showOutlineAction.setChecked(false);

-                showOverviewAction.setChecked(true);

-                pageBook.showPage(overview);

-                thumbnail.setVisible(true);

-            }

-        }

-

-        /**

-         * unhook the outline viewer

-         */

-        protected void unhookOutlineViewer() {

-            getSelectionSynchronizer().removeViewer(getViewer());

-            if (disposeListener != null && getEditor() != null

-                && !getEditor().isDisposed())

-                getEditor().removeDisposeListener(disposeListener);

-        }

-

-        /**

-         * getter for the editor conrolo

-         * 

-         * @return <code>Control</code>

-         */

-        protected Control getEditor() {

-            return getGraphicalViewer().getControl();

-        }

-

-    }

-

-    /**

-     * My editing domain provider.

-     */

-    private IEditingDomainProvider domainProvider = new IEditingDomainProvider() {

-

-        public EditingDomain getEditingDomain() {

-            return DiagramEditor.this.getEditingDomain();

-        }

-    };

-

-    /** The key handler */

-    private KeyHandler keyHandler;

-

-    /**

-     * The workbench site This variable overrides another one defined in

-     * <code>org.eclipse.ui.part<code>

-     *  This is needed to override <code>setSite</code> to simply set the site, rather than also

-     *  initializing the actions like <code>setSite</code> override in <code>org.eclipse.gef.ui.parts</code>

-     */

-    private IWorkbenchPartSite partSite;

-

-    /**

-     * The RulerComposite used to enhance the graphical viewer to display rulers

-     */

-    private RulerComposite rulerComposite;

-

-    /**

-     * My undo context.

-     */

-    private IUndoContext undoContext;

-

-    /**

-     * My operation history listener. By default it adds my undo context to

-     * operations that have affected my editing domain. Subclasses may override

-     * {@link #createHistoryListener()} to do something different.

-     */

-    private IOperationHistoryListener historyListener;

-

-    /**

-     * Alternative operation history listener. By default it adds it disables

-     * updates when command is executing on a separate thread and then reables

-     * afterwards.

-     */

-    private IOperationHistoryListener disableUpdateHistoryListener;

-

-    /**

-     * Returns this editor's outline-page default display mode.

-     * 

-     * @return int the integer value indicating the content-outline-page dispaly

-     *         mode

-     */

-    protected int getDefaultOutlineViewMode() {

-        return ID_OVERVIEW;

-    }

-

-    /**

-     * Returns the context menu provider for the outline view.

-     * 

-     * @param viewer The outline viewer for which this context menu provider

-     *  will be added.

-     *  

-     * @return A menu manager that can be used in the provided outline viewer

-     *  or null if no context menu should be shown.

-     *  

-     */

-    protected MenuManager getOutlineContextMenuProvider(EditPartViewer viewer) {

-		return null;

-	}

-

-	/**

-     * @return Returns the rulerComp.

-     */

-    protected RulerComposite getRulerComposite() {

-        return rulerComposite;

-    }

-

-    /**

-     * @param rulerComp

-     *            The rulerComp to set.

-     */

-    protected void setRulerComposite(RulerComposite rulerComp) {

-        this.rulerComposite = rulerComp;

-    }

-

-    /**

-     * Creates a new DiagramEditor instance

-     */

-    public DiagramEditor() {

-        createDiagramEditDomain();

-

-        // add my operation history listener, if I have one

-        historyListener = createHistoryListener();

-        disableUpdateHistoryListener = createDisableUpdateHistoryListener();

-    }

-

-    /**

-     * Creates a listener on the <code>IOperationHistory</code> that allows

-     * us to turn off updates when execution is performed on a separate

-     * thread.

-     * 

-     * @return 

-     */

-    private IOperationHistoryListener createDisableUpdateHistoryListener() {

-        return new IOperationHistoryListener() {

-

-            public void historyNotification(final OperationHistoryEvent event) {

-

-                if (event.getEventType() == OperationHistoryEvent.ABOUT_TO_EXECUTE ||

-                    event.getEventType() == OperationHistoryEvent.ABOUT_TO_UNDO ||

-                    event.getEventType() == OperationHistoryEvent.ABOUT_TO_REDO) {

-                    DiagramGraphicalViewer viewer = (DiagramGraphicalViewer)getDiagramGraphicalViewer();

-

-                    if (viewer != null && Display.getCurrent() == null)

-                        viewer.enableUpdates(false); 

-                }

-                else if (event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK ||

-                    event.getEventType() == OperationHistoryEvent.DONE ||

-                    event.getEventType() == OperationHistoryEvent.UNDONE ||

-                    event.getEventType() == OperationHistoryEvent.REDONE) {

-                    DiagramGraphicalViewer viewer = (DiagramGraphicalViewer)getDiagramGraphicalViewer();

-

-                    if (viewer != null)

-                        viewer.enableUpdates(true); 

-                }

-            }

-        };

-    }

-    

-    /**

-     * Gets my operation history listener. By default it adds my undo context to

-     * operations that have affected my editing domain.

-     * <P>

-     * Subclasses may override this method to return a different history

-     * listener, or to return <code>null</code> if they do not want to listen

-     * to the operation history.

-     * 

-     * @return my operation history listener

-     */

-    protected IOperationHistoryListener createHistoryListener() {

-

-        return new IOperationHistoryListener() {

-

-            public void historyNotification(final OperationHistoryEvent event) {

-

-                if (event.getEventType() == OperationHistoryEvent.DONE) {

-                    IUndoableOperation operation = event.getOperation();

-

-                    if (shouldAddUndoContext(operation)) {

-                        // add my undo context to populate my undo

-                        // menu

-                        operation.addContext(getUndoContext());

-                    }

-                }

-            }

-        };

-    }

-

-    /**

-     * Answers whether or not I should add my undo context to the undoable

-     * <code>operation</code>, thereby making the operation available from my

-     * undo menu.

-     * <P>

-     * The default implementation adds my context to any operation that affected

-     * the same editing domain that has loaded the resource that contains my

-     * diagram element. Subclasses can override this method if they wish to add

-     * their context to operations for different reasons.

-     * 

-     * @param operation

-     *            the operation

-     * @return <code>true</code> if the operation should appear on my undo

-     *         menu, <code>false</code> otherwise.

-     */

-    protected boolean shouldAddUndoContext(IUndoableOperation operation) {

-        EditingDomain domain = getEditingDomain();

-

-        if (domain != null) {

-            Set affectedResources = ResourceUndoContext

-                .getAffectedResources(operation);

-

-            for (Iterator i = affectedResources.iterator(); i.hasNext();) {

-                Resource nextResource = (Resource) i.next();

-

-                ResourceSet resourceSet = nextResource.getResourceSet();

-

-                if (resourceSet != null) {

-                    TransactionalEditingDomain resourceSetEditingDomain = TransactionalEditingDomain.Factory.INSTANCE

-                        .getEditingDomain(resourceSet);

-

-                    if (domain.equals(resourceSetEditingDomain)) {

-                        return true;

-                    }

-                }

-            }

-        }

-        return false;

-    }

-

-    /**

-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagramEditDomain()

-     */

-    public IDiagramEditDomain getDiagramEditDomain() {

-        return (IDiagramEditDomain) getEditDomain();

-    }

-

-    /**

-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagramGraphicalViewer()

-     */

-    public IDiagramGraphicalViewer getDiagramGraphicalViewer() {

-        return (IDiagramGraphicalViewer) getGraphicalViewer();

-    }

-

-    /**

-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagram()

-     */

-    public Diagram getDiagram() {

-        if (getEditorInput() != null)

-            return ((IDiagramEditorInput) getEditorInput()).getDiagram();

-        return null;

-    }

-

-    /**

-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart#getDiagramEditPart()

-     */

-    public DiagramEditPart getDiagramEditPart() {

-        return (DiagramEditPart) getDiagramGraphicalViewer().getContents();

-    }

-

-    /**

-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)

-     */

-    public Object getAdapter(Class type) {

-        if (type == IContentOutlinePage.class) {

-            TreeViewer viewer = new TreeViewer();

-            viewer.setRootEditPart(new DiagramRootTreeEditPart());

-            return new DiagramOutlinePage(viewer);

-        }

-        if (ActionManager.class == type)

-            return getActionManager();

-        if (IDiagramEditDomain.class == type)

-            return getDiagramEditDomain();

-        if (type == ZoomManager.class)

-            return getZoomManager();

-

-        if (type == IUndoContext.class) {

-            return getUndoContext();

-        }

-        if (type == IOperationHistory.class) {

-            return getOperationHistory();

-        }

-        if (type == IEditingDomainProvider.class) {

-            return domainProvider;

-        }

-

-        return super.getAdapter(type);

-

-    }

-

-    /**

-     * @see org.eclipse.ui.IEditorPart#init(IEditorSite, IEditorInput)

-     */

-    public void init(IEditorSite site, IEditorInput input)

-        throws PartInitException {

-        

-        super.init(site, input);

-        

-        try {

-            EditorService.getInstance().registerEditor(this);

-        } catch (Exception e) {

-            Trace.catching(DiagramUIPlugin.getInstance(),

-                   DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),

-                   "init", e); //$NON-NLS-1$

-            if (e.getMessage() != null)

-                throw new PartInitException(e.getMessage(), e);

-            else

-                throw new PartInitException("DiagramEditor failed to initialize", e);//$NON-NLS-1$

-        }

-    }

-

-    /**

-     * Disposes this editor by: <br>

-     * 3. Stops all registered listeners

-     * 

-     * @see org.eclipse.ui.IWorkbenchPart#dispose()

-     */

-    public void dispose() {

-        persistViewerSettings();

-        EditorService.getInstance().unregisterEditor(DiagramEditor.this);

-        stopListening();

-

-        /*

-         * RATLC00527385 DiagramRulerProvider wasn't uninitialized on dispose of

-         * the editor.

-         */

-        DiagramRulerProvider vertProvider = (DiagramRulerProvider) getDiagramGraphicalViewer()

-            .getProperty(RulerProvider.PROPERTY_VERTICAL_RULER);

-        if (vertProvider != null)

-            vertProvider.uninit();

-

-        // Set the Horizontal Ruler properties

-        DiagramRulerProvider horzProvider = (DiagramRulerProvider) getDiagramGraphicalViewer()

-            .getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER);

-        if (horzProvider != null)

-            horzProvider.uninit();

-

-        // Dispose my GEF command stack

-        getEditDomain().getCommandStack().dispose();

-

-        // stop listening to the history

-        if (historyListener != null) {

-            getOperationHistory().removeOperationHistoryListener(

-                historyListener);

-            

-            // dispose my undo context

-            getOperationHistory().dispose(getUndoContext(), true, true, true);

-        }

-

-        if (disableUpdateHistoryListener != null) {

-            getOperationHistory().removeOperationHistoryListener(

-                disableUpdateHistoryListener);

-        }

-        

-        super.dispose();

-    }

-

-    /**

-     * Returns the KeyHandler with common bindings for both the Outline and

-     * Graphical Views. For example, delete is a common action.

-     * 

-     * @return KeyHandler

-     */

-    protected KeyHandler getKeyHandler() {

-        if (keyHandler == null) {

-            keyHandler = new KeyHandler();

-

-            ActionRegistry registry = getActionRegistry();

-            IAction action;

-

-            action = new PromptingDeleteAction(this);

-            action.setText(DiagramUIMessages.DiagramEditor_Delete_from_Diagram);

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-

-            action = new InsertAction(this);

-            action.setText(""); //$NON-NLS-1$ // no text necessary since this is not a visible action

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-

-            PromptingDeleteFromModelAction deleteModelAction = new PromptingDeleteFromModelAction(

-                this);

-            deleteModelAction.init();

-

-            registry.registerAction(deleteModelAction);

-

-            action = new DirectEditAction((IWorkbenchPart) this);

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-

-            action = new ZoomInAction(getZoomManager());

-            action.setText(""); //$NON-NLS-1$ // no text necessary since this is not a visible action

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-

-            action = new ZoomOutAction(getZoomManager());

-            action.setText(""); //$NON-NLS-1$ // no text necessary since this is not a visible action

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-

-            action = new ToggleRouterAction(((IWorkbenchPart) this).getSite().getPage());

-            ((ToggleRouterAction) action).setPartSelector(new IPartSelector() {

-            	public boolean selects(IWorkbenchPart part) {

-            		return part == DiagramEditor.this;

-            	}

-            });

-            action.setText(""); //$NON-NLS-1$ // no text necessary since this is not a visible action

-            registry.registerAction(action);

-            getSelectionActions().add(action.getId());

-            

-            keyHandler.put(KeyStroke.getPressed(SWT.INSERT, 0),

-                getActionRegistry().getAction(InsertAction.ID));

-            keyHandler.put(KeyStroke.getPressed(SWT.DEL, 127, 0),

-                getActionRegistry().getAction(ActionFactory.DELETE.getId()));

-            keyHandler.put(KeyStroke.getPressed(SWT.BS, 8, 0),

-                getActionRegistry().getAction(ActionFactory.DELETE.getId()));

-            

-            keyHandler.put(/* CTRL + D */

-                    KeyStroke.getPressed((char) 0x4, 100, SWT.CTRL),

-                        getActionRegistry().getAction(

-                            ActionIds.ACTION_DELETE_FROM_MODEL));

-            keyHandler.put(/* CTRL + '=' */

-                    KeyStroke.getPressed('=', 0x3d, SWT.CTRL),

-                        getActionRegistry().getAction(

-                        		GEFActionConstants.ZOOM_IN));

-            keyHandler.put(/* CTRL + '-' */

-                    KeyStroke.getPressed('-', 0x2d, SWT.CTRL),

-                        getActionRegistry().getAction(

-                        		GEFActionConstants.ZOOM_OUT));

-            keyHandler.put(/* CTRL + L */

-                    KeyStroke.getPressed((char) 0xC, 108, SWT.CTRL),

-                        getActionRegistry().getAction(

-                        		ActionIds.ACTION_TOGGLE_ROUTER));

-            keyHandler.put(KeyStroke.getPressed(SWT.F2, 0), getActionRegistry()

-                .getAction(GEFActionConstants.DIRECT_EDIT));

-        }

-        return keyHandler;

-    }

-

-    /**

-     * @see org.eclipse.gef.ui.parts.GraphicalEditor#createGraphicalViewer(Composite)

-     */

-    protected void createGraphicalViewer(Composite parent) {

-        setRulerComposite(new RulerComposite(parent, SWT.NONE));

-

-        ScrollingGraphicalViewer sGViewer = createScrollingGraphicalViewer();

-        sGViewer.createControl(getRulerComposite());

-        setGraphicalViewer(sGViewer);

-        hookGraphicalViewer();

-        configureGraphicalViewer();

-        initializeGraphicalViewer();

-        getRulerComposite().setGraphicalViewer(

-            (ScrollingGraphicalViewer) getGraphicalViewer());

-    }

-

-    /**

-     * Creates a ScrollingGraphicalViewer without the drop adapter which

-     * excludes drag and drop functionality from other defined views (XML)

-     * Subclasses must override this method to include the DnD functionality

-     * 

-     * @return ScrollingGraphicalViewer

-     */

-    protected ScrollingGraphicalViewer createScrollingGraphicalViewer() {

-        return new DiagramGraphicalViewer();

-    }

-

-    /**

-     * Configures the graphical viewer (the primary viewer of the editor)

-     */

-    protected void configureGraphicalViewer() {

-        super.configureGraphicalViewer();

-

-        IDiagramGraphicalViewer viewer = getDiagramGraphicalViewer();

-

-        RootEditPart rootEP = EditPartService.getInstance().createRootEditPart(

-            getDiagram());

-        if (rootEP instanceof IDiagramPreferenceSupport) {

-            ((IDiagramPreferenceSupport) rootEP)

-                .setPreferencesHint(getPreferencesHint());

-        }

-

-        if (getDiagramGraphicalViewer() instanceof DiagramGraphicalViewer) {

-            ((DiagramGraphicalViewer) getDiagramGraphicalViewer())

-                .hookWorkspacePreferenceStore(getWorkspaceViewerPreferenceStore());

-        }

-   

-        viewer.setRootEditPart(rootEP);

-  

-        viewer.setEditPartFactory(EditPartService.getInstance());

-        ContextMenuProvider provider = new DiagramContextMenuProvider(this,

-            viewer);

-        viewer.setContextMenu(provider);

-        getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU,

-            provider, viewer);

-        KeyHandler viewerKeyHandler = new DiagramGraphicalViewerKeyHandler(viewer)

-            .setParent(getKeyHandler());

-        viewer.setKeyHandler(new DirectEditKeyHandler(viewer)

-            .setParent(viewerKeyHandler));

-        if (viewer.getControl() instanceof FigureCanvas) {

-        	((FigureCanvas) viewer.getControl())

-            	.setScrollBarVisibility(FigureCanvas.ALWAYS);

-        }

-    }

-

-    /**

-     * @see org.eclipse.gef.ui.parts.GraphicalEditor#initializeGraphicalViewer()

-     */

-    protected void initializeGraphicalViewer() {

-        initializeGraphicalViewerContents();

-    }

-

-    /**

-     * @see org.eclipse.gef.ui.parts.GraphicalEditor#initializeGraphicalViewer()

-     */

-    protected void initializeGraphicalViewerContents() {

-        getDiagramGraphicalViewer().setContents(getDiagram());

-        initializeContents(getDiagramEditPart());

-    }

-

-    /**

-     * Creates a diagram edit domain

-     */

-    protected void createDiagramEditDomain() {

-        DiagramEditDomain editDomain = new DiagramEditDomain(this);

-        editDomain.setActionManager(createActionManager());

-        setEditDomain(editDomain);

-    }

-

-    /**

-     * Configures my diagram edit domain with its command stack.

-     */

-    protected void configureDiagramEditDomain() {

-

-        DefaultEditDomain editDomain = getEditDomain();

-

-        if (editDomain != null) {

-            CommandStack stack = editDomain.getCommandStack();

-

-            if (stack != null) {

-                // dispose the old stack

-                stack.dispose();

-            }

-

-            // create and assign the new stack

-            DiagramCommandStack diagramStack = new DiagramCommandStack(

-                getDiagramEditDomain());

-            diagramStack.setOperationHistory(getOperationHistory());

-

-            // changes made on the stack can be undone from this editor

-            diagramStack.setUndoContext(getUndoContext());

-

-            editDomain.setCommandStack(diagramStack);

-        }

-    }

-

-    /**

-     * @overridable

-     */

-    protected ActionManager createActionManager() {

-        return new ActionManager(createOperationHistory());

-    }

-

-    /**

-     * Create my operation history.

-     * 

-     * @return my operation history

-     */

-    protected IOperationHistory createOperationHistory() {

-        return OperationHistoryFactory.getOperationHistory();

-    }

-

-    /**

-     * @see org.eclipse.ui.part.EditorPart#setInput(IEditorInput)

-     */

-    protected void setInput(IEditorInput input) {

-        stopListening();

-        if (input != null) {

-        	super.setInput(input);

-        }

-        if (input != null) {

-            Assert.isNotNull(getDiagram(), "Couldn't load/create diagram view"); //$NON-NLS-1$

-        }

-        // dispose the old command stack and create a new one

-        configureDiagramEditDomain();

-        startListening();

-    }

-

-    /**

-     * Do nothing

-     * 

-     * @see org.eclipse.gef.ui.parts.GraphicalEditor#initializeActionRegistry()

-     */

-    protected void createActions() {

-        // null impl.

-    }

-

-    /**

-     * A utility to close the editor

-     * 

-     * @param save

-     */

-    protected void closeEditor(final boolean save) {

-        // Make this call synchronously to avoid the following sequence:

-        // Select me, select the model editor, close the model editor,

-        // closes the model, fires events causing me to close,

-        // if actual close is delayed using an async call then eclipse

-        // tries to set the selection back to me when the model editor

-        // finishes being disposed, but model has been closed so I

-        // am no longer connected to the model, NullPointerExceptions occur.

-        try {

-            getSite().getPage().closeEditor(DiagramEditor.this, save);

-        } catch (SWTException e) {

-            // TODO remove when "Widget is disposed" exceptions are fixed.

-            // Temporarily catch SWT exceptions here to allow model server event

-            // processing to continue.

-            Trace.catching(DiagramUIPlugin.getInstance(),

-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, this.getClass(),

-                "closeEditor", e); //$NON-NLS-1$

-            Log.error(DiagramUIPlugin.getInstance(), IStatus.ERROR, e

-                .getMessage(), e);

-        }

-    }

-    

-    /**

-     * Installs all the listeners needed by the editor

-     */

-    protected void startListening() {

-        // Create a diagram event broker if there isn't already one for this

-        // editing domain.

-        TransactionalEditingDomain domain = getEditingDomain();

-        if (domain != null) {

-            if (historyListener != null) { 

-                getOperationHistory().addOperationHistoryListener(

-                    historyListener);

-            }

-

-            if (disableUpdateHistoryListener != null) { 

-                getOperationHistory().addOperationHistoryListener(

-                    disableUpdateHistoryListener);

-            }

-            

-            DiagramEventBroker eventBroker = DiagramEventBroker

-                .getInstance(domain);

-            if (eventBroker == null) {

-                DiagramEventBroker.startListening(domain);

-            }

-        }

-    }

-

-    /**

-     * Removes all the listeners used by the editor

-     */

-    protected void stopListening() {

-        if (historyListener != null) {

-            

-            if (undoContext != null) {

-                // dispose my undo context

-                getOperationHistory().dispose(getUndoContext(), true, true, true);

-            }

-            

-            getOperationHistory().removeOperationHistoryListener(

-                historyListener);

-        }

-        

-        if (disableUpdateHistoryListener != null) {

-            getOperationHistory().removeOperationHistoryListener(

-                disableUpdateHistoryListener);

-        }

-    }

-

-    /**

-     * Clears the contents of the graphical viewer

-     */

-    protected void clearGraphicalViewerContents() {

-        if (getDiagramGraphicalViewer().getContents() != null) {

-            getDiagramGraphicalViewer().getContents().deactivate();

-            getDiagramGraphicalViewer().getContents().removeNotify();

-        }

-

-        /*

-         * DiagramRulerProvider needs to be uninitialized in case the input has

-         * been changed during editor life cycle.

-         * 

-         * https://bugs.eclipse.org/bugs/show_bug.cgi?id=167523

-         */

-        DiagramRulerProvider vertProvider = (DiagramRulerProvider) getDiagramGraphicalViewer()

-            .getProperty(RulerProvider.PROPERTY_VERTICAL_RULER);

-        if (vertProvider != null)

-            vertProvider.uninit();

-        DiagramRulerProvider horzProvider = (DiagramRulerProvider) getDiagramGraphicalViewer()

-            .getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER);

-        if (horzProvider != null)

-            horzProvider.uninit();

-

-        getDiagramGraphicalViewer().setContents(null);

-    }

-

-    /**

-     * Gets the action manager for this diagram editor. The action manager's

-     * command manager is used by my edit domain's command stack when executing

-     * commands. This is the action manager that is returned when I am asked to

-     * adapt to an <code>ActionManager</code>.

-     * 

-     * @return the action manager

-     */

-    protected ActionManager getActionManager() {

-        return getDiagramEditDomain().getActionManager();

-    }

-

-    /**

-     * A utility method to return the zoom manager from the graphical viewer's

-     * root

-     * 

-     * @return the zoom manager

-     */

-    protected ZoomManager getZoomManager() {

-        return ((DiagramRootEditPart) getRootEditPart()).getZoomManager();

-    }

-

-    private RootEditPart getRootEditPart() {

-        return getGraphicalViewer().getRootEditPart();

-    }

-

-    /**

-     * Returns the operation history from my action manager.

-     * 

-     * @return the operation history

-     */

-    protected IOperationHistory getOperationHistory() {

-        return getActionManager().getOperationHistory();

-    }

-

-    /**

-     * Gets my editing domain derived from my diagram editor input.

-     * <P>

-     * If subclasses have a known editing domain, they should override this

-     * method to return that editing domain as that will be more efficient that

-     * the generic implementation provided here.

-     * 

-     * @return my editing domain

-     */

-    public TransactionalEditingDomain getEditingDomain() {

-        if (getDiagram() != null) {

-            return TransactionUtil.getEditingDomain(getDiagram());

-        }

-        return null;

-    }

-

-    /**

-     * Gets my undo context. Lazily initializes my undo context if it has not

-     * been set.

-     * 

-     * @return my undo context

-     */

-    protected IUndoContext getUndoContext() {

-

-        if (undoContext == null) {

-            undoContext = createUndoContext();

-        }

-        return undoContext;

-    }

-

-    /**

-     * Create the undo context. Subclasses may override to provide custom undo context.

-     * @return the created undo context

-     * @since 1.4

-     */

-    protected IUndoContext createUndoContext() {

-    	IUndoContext context;

-    	TransactionalEditingDomain domain = getEditingDomain();

-        if (domain != null) {

-            context = new EditingDomainUndoContext(domain, createUndoContextLabel());

-

-        } else {

-            context = new ObjectUndoContext(this);

-        }

-        return context;

-    }

-    

-    /**

-     * Determine the label to be used by my undo context. The default implementation

-     * returns null which provides the built-in default label.

-     * 

-     * @return label for undo context

-     * @since 1.4

-     */

-    protected String createUndoContextLabel() {

-           return null;

-	}

-

-    /**

-     * Sets my undo context

-     * 

-     * @param context

-     *            the undo context

-     */

-    protected void setUndoContext(IUndoContext context) {

-        this.undoContext = context;

-    }

-

-    /**

-     * 

-     * @return The getRulerComposite(), which is the graphical control

-     */

-    protected Control getGraphicalControl() {

-        return getRulerComposite();

-

-    }

-

-    /**

-     * @see org.eclipse.ui.IWorkbenchPart#getSite()

-     */

-    public IWorkbenchPartSite getSite() {

-        return partSite;

-    }

-

-    /**

-     * @see org.eclipse.ui.part.WorkbenchPart#setSite(IWorkbenchPartSite)

-     */

-    protected void setSite(IWorkbenchPartSite site) {

-        this.partSite = site;

-

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.eclipse.gmf.runtime.common.ui.properties.ITabbedPropertySheetPageContributor#getContributorId()

-     */

-    public String getContributorId() {

-        return "org.eclipse.gmf.runtime.diagram.ui.properties"; //$NON-NLS-1$

-    }

-

-    /**

-     * Adds the default preferences to the specified preference store.

-     * 

-     * @param store

-     *            store to use

-     * @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 static void addDefaultPreferences(PreferenceStore store,

-            PreferencesHint preferencesHint) {

-        store.setValue(WorkspaceViewerProperties.ZOOM, 1.0);

-        store.setValue(WorkspaceViewerProperties.VIEWPAGEBREAKS, false);

-

-        IPreferenceStore globalPreferenceStore = (IPreferenceStore) preferencesHint

-            .getPreferenceStore();

-

-        // Initialize with the global settings

-        boolean viewGrid = globalPreferenceStore

-            .getBoolean(IPreferenceConstants.PREF_SHOW_GRID);

-

-        boolean snapToGrid = globalPreferenceStore

-            .getBoolean(IPreferenceConstants.PREF_SNAP_TO_GRID);

-        

-        boolean snapToGeometry = globalPreferenceStore

-        .getBoolean(IPreferenceConstants.PREF_SNAP_TO_GEOMETRY);

-

-        boolean viewRulers = globalPreferenceStore

-            .getBoolean(IPreferenceConstants.PREF_SHOW_RULERS);

-

-        // Set defaults for Grid

-        store.setValue(WorkspaceViewerProperties.VIEWGRID, viewGrid);

-        store.setValue(WorkspaceViewerProperties.SNAPTOGRID, snapToGrid);        

-        store.setValue(WorkspaceViewerProperties.SNAPTOGEOMETRY, snapToGeometry);

-

-        // Set defaults for Rulers

-        store.setValue(WorkspaceViewerProperties.VIEWRULERS, viewRulers);

-        

-        // Initialize printing defaults from the workspace preferences 

-        IPreferenceStore workspacePreferences = (IPreferenceStore)preferencesHint.getPreferenceStore();

-     

-        store.setValue(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS,

-						workspacePreferences

-								.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS));

-

-		store.setValue(WorkspaceViewerProperties.PREF_USE_DIAGRAM_SETTINGS,

-						workspacePreferences

-								.getBoolean(WorkspaceViewerProperties.PREF_USE_WORKSPACE_SETTINGS));

-

-		store.setValue(WorkspaceViewerProperties.PREF_USE_INCHES,

-				workspacePreferences

-						.getBoolean(WorkspaceViewerProperties.PREF_USE_INCHES));

-

-		store.setValue(WorkspaceViewerProperties.PREF_USE_MILLIM,

-				workspacePreferences

-						.getBoolean(WorkspaceViewerProperties.PREF_USE_MILLIM));

-

-		store.setValue(WorkspaceViewerProperties.PREF_USE_PORTRAIT,

-						workspacePreferences

-								.getBoolean(WorkspaceViewerProperties.PREF_USE_PORTRAIT));

-		

-		store.setValue(WorkspaceViewerProperties.PREF_USE_LANDSCAPE,

-						workspacePreferences

-								.getBoolean(WorkspaceViewerProperties.PREF_USE_LANDSCAPE));

-

-		store.setValue(WorkspaceViewerProperties.PREF_PAGE_SIZE,

-				workspacePreferences

-						.getString(WorkspaceViewerProperties.PREF_PAGE_SIZE));

-

-		store.setValue(WorkspaceViewerProperties.PREF_PAGE_WIDTH,

-				workspacePreferences

-						.getDouble(WorkspaceViewerProperties.PREF_PAGE_WIDTH));

-		

-		store.setValue(WorkspaceViewerProperties.PREF_PAGE_HEIGHT,

-				workspacePreferences

-						.getDouble(WorkspaceViewerProperties.PREF_PAGE_HEIGHT));

-

-		store.setValue(WorkspaceViewerProperties.PREF_MARGIN_TOP,

-				workspacePreferences

-						.getDouble(WorkspaceViewerProperties.PREF_MARGIN_TOP));

-

-		store.setValue(WorkspaceViewerProperties.PREF_MARGIN_BOTTOM,

-						workspacePreferences

-								.getDouble(WorkspaceViewerProperties.PREF_MARGIN_BOTTOM));

-

-		store.setValue(WorkspaceViewerProperties.PREF_MARGIN_LEFT,

-				workspacePreferences

-						.getDouble(WorkspaceViewerProperties.PREF_MARGIN_LEFT));

-		

-		store.setValue(WorkspaceViewerProperties.PREF_MARGIN_RIGHT,

-						workspacePreferences

-								.getDouble(WorkspaceViewerProperties.PREF_MARGIN_RIGHT));

-    }

-

-    /**

-	 * Returns the workspace viewer <code>PreferenceStore</code>

-	 * 

-	 * @return the workspace viewer <code>PreferenceStore</code>

-	 */

-    public PreferenceStore getWorkspaceViewerPreferenceStore() {

-        if (workspaceViewerPreferenceStore != null) {

-            return workspaceViewerPreferenceStore;

-        } else {

-            // Try to load it

-            IPath path = DiagramUIPlugin.getInstance().getStateLocation();

-            String id = ViewUtil.getIdStr(getDiagram());

-

-            String fileName = path.toString() + "/" + id;//$NON-NLS-1$

-            java.io.File file = new File(fileName);

-            workspaceViewerPreferenceStore = new PreferenceStore(fileName);

-            if (file.exists()) {

-                // Load it

-                try {

-                    workspaceViewerPreferenceStore.load();

-                } catch (Exception e) {

-                    // Create the default

-                    addDefaultPreferences();

-                }

-            } else {

-                // Create it

-                addDefaultPreferences();

-            }

-            return workspaceViewerPreferenceStore;

-        }

-    }

-

-    /**

-     * Adds the default preferences to the workspace viewer preference store.

-     */

-    protected void addDefaultPreferences() {

-        addDefaultPreferences(workspaceViewerPreferenceStore,

-            getPreferencesHint());

-    }

-

-    /**

-     * Persists the viewer settings to which this RootEditPart belongs. This

-     * method should be called when the diagram is being disposed.

-     */

-    public void persistViewerSettings() {

-        Viewport viewport = getDiagramEditPart().getViewport();

-        if (viewport != null) {

-            int x = viewport.getHorizontalRangeModel().getValue();

-            int y = viewport.getVerticalRangeModel().getValue();

-            getWorkspaceViewerPreferenceStore().setValue(

-                WorkspaceViewerProperties.VIEWPORTX, x);

-            getWorkspaceViewerPreferenceStore().setValue(

-                WorkspaceViewerProperties.VIEWPORTY, y);

-        }

-        getWorkspaceViewerPreferenceStore().setValue(

-            WorkspaceViewerProperties.ZOOM, getZoomManager().getZoom());

-

-        // Write the settings, if necessary

-        try {

-            if (getWorkspaceViewerPreferenceStore().needsSaving())

-                getWorkspaceViewerPreferenceStore().save();

-        } catch (IOException ioe) {

-            Trace.catching(DiagramUIPlugin.getInstance(),

-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING,

-                PageInfoHelper.class, "persistViewerSettings", //$NON-NLS-1$

-                ioe);

-        }

-    }

-

-    /**

-     * Initializes the viewer's state from the workspace preference store.

-     * 

-     * @param editpart

-     */

-    private void initializeContents(EditPart editpart) {

-        getZoomManager().setZoom(

-            getWorkspaceViewerPreferenceStore().getDouble(

-                WorkspaceViewerProperties.ZOOM));

-

-        if (getWorkspaceViewerPreferenceStore().getBoolean(

-            WorkspaceViewerProperties.VIEWPAGEBREAKS)) {

-            getDiagramEditPart().getFigure().invalidate();

-            getDiagramEditPart().getFigure().validate();

-        }

-        getDiagramEditPart().refreshPageBreaks();

-

-        // Update the range model of the viewport

-        ((DiagramEditPart) editpart).getViewport().validate();

-        if (editpart instanceof DiagramEditPart) {

-            int x = getWorkspaceViewerPreferenceStore().getInt(

-                WorkspaceViewerProperties.VIEWPORTX);

-            int y = getWorkspaceViewerPreferenceStore().getInt(

-                WorkspaceViewerProperties.VIEWPORTY);

-            ((DiagramEditPart) editpart).getViewport()

-                .getHorizontalRangeModel().setValue(x);

-            ((DiagramEditPart) editpart).getViewport().getVerticalRangeModel()

-                .setValue(y);

-        }

-

-        // Get the Ruler Units properties

-        int rulerUnits = getWorkspaceViewerPreferenceStore().getInt(

-            WorkspaceViewerProperties.RULERUNIT);

-

-        // Get the Guide Style

-        GuideStyle guideStyle = (GuideStyle) getDiagram().getStyle(

-            NotationPackage.eINSTANCE.getGuideStyle());

-

-        if (guideStyle != null) {

-

-            RootEditPart rep = getGraphicalViewer().getRootEditPart();

-            DiagramRootEditPart root = (DiagramRootEditPart) rep;

-

-            // Set the Vertical Ruler properties

-            DiagramRuler verticalRuler = ((DiagramRootEditPart) getRootEditPart())

-                .getVerticalRuler();

-            verticalRuler.setGuideStyle(guideStyle);

-            verticalRuler.setUnit(rulerUnits);

-            DiagramRulerProvider vertProvider = new DiagramRulerProvider(

-                getEditingDomain(), verticalRuler, root.getMapMode());

-            vertProvider.init();

-            getDiagramGraphicalViewer().setProperty(

-                RulerProvider.PROPERTY_VERTICAL_RULER, vertProvider);

-

-            // Set the Horizontal Ruler properties

-            DiagramRuler horizontalRuler = ((DiagramRootEditPart) getRootEditPart())

-                .getHorizontalRuler();

-            horizontalRuler.setGuideStyle(guideStyle);

-            horizontalRuler.setUnit(rulerUnits);

-            DiagramRulerProvider horzProvider = new DiagramRulerProvider(

-                getEditingDomain(), horizontalRuler, root.getMapMode());

-            horzProvider.init();

-            getDiagramGraphicalViewer().setProperty(

-                RulerProvider.PROPERTY_HORIZONTAL_RULER, horzProvider);

-

-            // Show/Hide Rulers

-            getDiagramGraphicalViewer().setProperty(

-                RulerProvider.PROPERTY_RULER_VISIBILITY,

-                Boolean.valueOf(getWorkspaceViewerPreferenceStore().getBoolean(

-                    WorkspaceViewerProperties.VIEWRULERS)));

-

-        }

-

-        // Snap to Geometry        

-        getDiagramGraphicalViewer().setProperty(

-            SnapToGeometry.PROPERTY_SNAP_ENABLED,

-            Boolean.valueOf(getWorkspaceViewerPreferenceStore().getBoolean(

-                    WorkspaceViewerProperties.SNAPTOGEOMETRY))); 

-        // Snap to Grid

-        getDiagramGraphicalViewer().setProperty(

-            SnapToGrid.PROPERTY_GRID_ENABLED,

-            Boolean.valueOf(getWorkspaceViewerPreferenceStore().getBoolean(

-                WorkspaceViewerProperties.SNAPTOGRID)));

-        // Hide/Show Grid

-        getDiagramGraphicalViewer().setProperty(

-            SnapToGrid.PROPERTY_GRID_VISIBLE,

-            Boolean.valueOf(getWorkspaceViewerPreferenceStore().getBoolean(

-                WorkspaceViewerProperties.VIEWGRID)));

-

-        // Grid Origin (always 0, 0)

-        Point origin = new Point();

-        getDiagramGraphicalViewer().setProperty(

-        		SnapToGrid.PROPERTY_GRID_ORIGIN, origin);

-

-        // Grid Spacing

-        double dSpacing = ((DiagramRootEditPart) getDiagramEditPart().getRoot())

-            .getGridSpacing();

-        ((DiagramRootEditPart) getDiagramEditPart().getRoot())

-            .setGridSpacing(dSpacing);

-

-        // Scroll-wheel Zoom

-        getGraphicalViewer().setProperty(MouseWheelHandler.KeyGenerator.getKey(SWT.CTRL), MouseWheelZoomHandler.SINGLETON);

-    }

-

-    /**

-     * Returns the elements in the given selection.

-     * 

-     * @param selection

-     *            the selection

-     * @return a list of <code>EObject</code>

-     */

-    protected List getElements(final ISelection selection) {

-        if (selection instanceof IStructuredSelection && !selection.isEmpty()) {

-

-            try {

-                return (List) TransactionUtil.getEditingDomain(

-                    ((IAdaptable) ((IStructuredSelection) selection).toList()

-                        .get(0)).getAdapter(View.class)).runExclusive(

-                    new RunnableWithResult.Impl() {

-

-                        public void run() {

-                            List retval = new ArrayList();

-                            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) {

-                                            retval.add(eObject);

-                                        } else {

-                                            retval.add(view);

-                                        }

-                                    }

-                                }

-                            }

-                            setResult(retval);

-                        }

-                    });

-            } catch (InterruptedException e) {

-                Trace.catching(DiagramUIPlugin.getInstance(),

-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),

-                    "createEditPart", e); //$NON-NLS-1$

-                return Collections.EMPTY_LIST;

-            }

-        }

-        return Collections.EMPTY_LIST;

-    }

-

-    /*

-     * (non-Javadoc)

-     * 

-     * @see org.eclipse.ui.part.IShowInSource#getShowInContext()

-     */

-    public ShowInContext getShowInContext() {

-

-        ISelection selection = getGraphicalViewer().getSelection();

-        return new ShowInContext(null, selection);

-    }

-

-    /**

-     * Gets the preferences hint that will be used to determine which preference

-     * store to use when retrieving diagram preferences for this diagram editor.

-     * The preference hint is mapped to a preference store in the preference

-     * registry <@link DiagramPreferencesRegistry>. By default, this method

-     * returns a preference hint configured with the id of the editor. If a

-     * preference store has not been registered against this editor id in the

-     * diagram preferences registry, then the default values will be used.

-     * 

-     * @return the preferences hint to be used to configure the

-     *         <code>RootEditPart</code>

-     */

-    protected PreferencesHint getPreferencesHint() {

-        return new PreferencesHint(getEditorSite().getId());

-    };

-    

-    /**

-     * Returns false if the editor is read only and returns true if the editor

-     * is writable.

-     * 

-     * By default, edit parts have their edit mode enabled and this method

-     * returns true.

-     * 

-     * Subclasses may override and disable the edit mode on parts.

-     * 

-     * @see org.eclipse.gmf.runtime.diagram.ui.internal.editparts.IEditableEditPart.

-     * 

-     * @return false if the editor is read only and returns true if the editor

-     * is writable.

-     */

-    public boolean isWritable() {

-        return (getDiagramEditPart() != null && getDiagramEditPart().isEditModeEnabled());

-    }

-    

-    /**

-     * Creates edit part factory that will be creating tree edit parts in

-     * the tree viewer

-     * @return <code>EditPartFactory</code> factory for the tree viewer

-     */

-    protected EditPartFactory getOutlineViewEditPartFactory() {

-		return new EditPartFactory() {

-

-			public EditPart createEditPart(EditPart context, Object model) {

-				if (model instanceof Diagram) {

-					return new TreeDiagramEditPart(model);

-                } else if (model instanceof View

-                    && ViewType.GROUP.equals(((View) model).getType())) {

-                    return new TreeContainerEditPart(model);

-				} else {

-					return new TreeEditPart(model);

-				}

-			}

-		};

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.gef.ui.parts.GraphicalEditor#createPartControl(org.eclipse.swt.widgets.Composite)

-	 */

-	public void createPartControl(Composite parent) {

-		super.createPartControl(parent);

-		IContextService contextService = (IContextService) getSite()

-		  .getService(IContextService.class);

-		if (contextService != null)

-			contextService.activateContext(getContextID());

-	}

-	

-	/**

-	 * Get the context identifier for this diagram editor.

-	 * 

-	 * @return the context identifier.

-	 */

-	protected String getContextID() {

-		return DIAGRAM_CONTEXT_ID;

-	}

-

-}

diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorInput.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorInput.java
deleted file mode 100644
index b0a95eb..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorInput.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.parts;
-
-import java.lang.ref.WeakReference;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RunnableWithResult;
-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.util.Trace;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IPersistableElement;
-
-/**
- * @author melaasar
- * @author mgoyal
- *
- * Basic implementation of the IDiagramEditorInput interface
- * based on the <code>FileEditorInput<code> implementation
- * 
- * This Editor input can be used only for diagrams that are 
- * managed by MSL. If the Diagram is floating without a resource
- * then DiagramEditorInput won't work properly.
- */
-public class DiagramEditorInput implements IDiagramEditorInput {
-
-	/** The editor's diagram */
-	private WeakReference diagram;
-
-	/**
-	 * Method DiagramEditorInput.
-	 * @param diagram
-	 */
-	public DiagramEditorInput( Diagram diagram ) {
-		Assert.isNotNull(diagram);
-		setDiagram(diagram);
-	}
-
-	public Diagram getDiagram() {
-		return (Diagram)diagram.get();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-
-	/**
-	 * gets fully qualified name
-	 * @return <code>String</code>
-	 */
-	public String getQName() {
-		try {
-			return (String) TransactionUtil.getEditingDomain(getDiagram())
-				.runExclusive(new RunnableWithResult.Impl() {
-
-					public void run() {
-						setResult(EMFCoreUtil.getQualifiedName(getDiagram(), false));
-					}
-				});
-		} catch (Exception e) {
-			Trace.catching(
-				DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(),
-				e.getMessage(),
-				e);
-			return null;
-		}
-	}
-	
-	
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		try {
-			return (String) TransactionUtil.getEditingDomain(getDiagram())
-				.runExclusive(new RunnableWithResult.Impl() {
-
-					public void run() {
-						setResult(EMFCoreUtil.getName(getDiagram()));
-					}				
-			});
-		} catch (Exception e) {
-			Trace.catching(
-				DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING,
-				getClass(),
-				e.getMessage(),
-				e);
-			return null;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return getQName();
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == Diagram.class)
-			return getDiagram();
-		if (adapter == IFile.class)
-			return getStorageUnitFile();
-		return null;
-	}
-
-	/**
-	 * @see java.lang.Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!(obj instanceof DiagramEditorInput))
-			return false;
-		DiagramEditorInput other = (DiagramEditorInput) obj;
-		if(getDiagram() != null)
-			return getDiagram().equals(other.getDiagram());
-		else
-			return getDiagram() == other.getDiagram();
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		if(getDiagram() != null)
-			return getDiagram().hashCode();
-		else
-			return super.hashCode();
-	}
-
-	/**
-	 * Sets the diagram.
-	 * @param diagram The diagram to set
-	 */
-	protected void setDiagram(Diagram diagram) {
-		this.diagram = new WeakReference(diagram);
-	}
-
-	/**
-	  * gets the corresponding file resource in the workspace for the diagram. 
-	  * Returns null if the element is not a storage unit.
-	  * @return File The file resource in the workspace
-	  */
-	private IFile getStorageUnitFile() {
-		try {
-			final TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(getDiagram());
-			if (editingDomain == null) {
-			    return null;
-			}
-			return (IFile) editingDomain.runExclusive(new RunnableWithResult.Impl() {
-
-				public void run() {
-					Resource model = getDiagram().eResource();
-						setResult(model != null ? WorkspaceSynchronizer
-							.getFile(model)
-							: null);
-				}
-			});
-		} catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(), e
-					.getMessage(), e);
-			return null;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorWithFlyOutPalette.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorWithFlyOutPalette.java
deleted file mode 100644
index 54f2d56..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramEditorWithFlyOutPalette.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.parts;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite;
-import org.eclipse.gef.ui.palette.PaletteContextMenuProvider;
-import org.eclipse.gef.ui.palette.PaletteCustomizer;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gef.ui.views.palette.PalettePage;
-import org.eclipse.gef.ui.views.palette.PaletteViewerPage;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.ImageFileDropTargetListener;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDropTargetListener;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService;
-import org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-import org.eclipse.gmf.runtime.gef.ui.palette.customize.PaletteCustomizerEx;
-import org.eclipse.gmf.runtime.gef.ui.palette.customize.PaletteViewerEx;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.ActivityManagerEvent;
-import org.eclipse.ui.activities.IActivityManagerListener;
-
-/**
- * A generic diagram editor with a palette.  This supports the palette moved from
- * the diagram to a palette view.  If the palette view is open than the
- * palette in the diagram will be removed.
- * @author choang, cmahoney
- */
-public abstract class DiagramEditorWithFlyOutPalette
-	extends DiagramEditor
-{
-	/**
-	 * Listens for activity/capability events.
-	 * 
-	 * @author cmahoney
-	 */
-	class ActivityManagerListener
-		implements IActivityManagerListener {
-
-		public void activityManagerChanged(
-				ActivityManagerEvent activityManagerEvent) {
-			if (activityManagerEvent.haveEnabledActivityIdsChanged()) {
-				if (getEditDomain() != null
-					&& getEditDomain().getPaletteViewer() != null
-					&& getEditDomain().getPaletteViewer().getPaletteRoot() != null) {
-
-					createPaletteRoot(getEditDomain().getPaletteViewer()
-						.getPaletteRoot());
-				}
-			}
-		}
-	}
-	
-	/**
-	 * The activity listener.
-	 */
-	private IActivityManagerListener activityManagerListener;
-
-	boolean fHasFlyoutPalette = true;
-	public DiagramEditorWithFlyOutPalette() {
-		// empty
-	}
-	
-	public DiagramEditorWithFlyOutPalette(boolean hasFlyout) {
-		fHasFlyoutPalette = hasFlyout;
-	}
-
-	/**
-	 * uncollapsed pinned palette state constant
-	 */
-	protected static final int UNCOLLAPSED_PINNED = 4;
-	/**
-	 * collapsed pinned palette state constant
-	 */
-	protected static final int COLLAPSED = 2;
-
-	// Provider that creates palette viewer
-
-	private PaletteViewerProvider provider;
-	// Splitter the supports the moving of the palette in and out of the diagram
-	// from a palette view.
-	private FlyoutPaletteComposite splitter;
-	// Page that supports the slurping in and out of the palette from the diagram to
-	// and from a palette view.  The palette view is like any other view it can be moved
-	// around.  Similiar in docking functionality as the outline view.
-	private CustomPalettePage page;
-
-	protected void initializeGraphicalViewer() {
-		if(fHasFlyoutPalette) {
-			splitter.hookDropTargetListener(getGraphicalViewer());
-			
-			super.initializeGraphicalViewer();
-
-			/* Add a drop target listener for ME drop events */
-			getDiagramGraphicalViewer().addDropTargetListener(
-				(TransferDropTargetListener) new ImageFileDropTargetListener(
-					getDiagramGraphicalViewer()));
-
-			// Add a transfer drag target listener that is supported on
-			// palette template entries whose template is a creation tool.
-			// This will enable drag and drop of the palette shape creation
-			// tools.
-			getDiagramGraphicalViewer()
-				.addDropTargetListener(
-					new PaletteToolTransferDropTargetListener(
-						getGraphicalViewer()));
-
-		} else {
-			super.initializeGraphicalViewer();
-		}
-	}
-	
-	protected boolean toolSupportsAccessibility(Tool t) {
-		return (t instanceof CreationTool) || 
-				(t instanceof ConnectionCreationTool);
-	}
-	
-	protected PaletteViewer constructPaletteViewer() {
-		return new PaletteViewerEx();
-	}
-
-	/**
-	 * Creates a PaletteViewerProvider.
-	 * @return PaletteViewerProvider that provides for the palette viewer for the diagram
-	 */
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		assert fHasFlyoutPalette == true;
-		getEditDomain().setPaletteRoot(createPaletteRoot(null));
-		return new PaletteViewerProvider(getEditDomain()){
-
-			public PaletteViewer createPaletteViewer(Composite parent) {
-				PaletteViewer pViewer = constructPaletteViewer();
-				pViewer.createControl(parent);
-				configurePaletteViewer(pViewer);
-				hookPaletteViewer(pViewer);
-				return pViewer;
-			}
-			
-			/**
-			 * Override to provide the additional behavior for the tools.
-			 * Will intialize with a PaletteEditPartFactory that has a TrackDragger that
-			 * understand how to handle the mouseDoubleClick event for shape creation tools.
-			 * Also will initialize the palette with a defaultTool that is the SelectToolEx that undestands
-			 * how to handle the enter key which will result in the creation of the shape also.
-			 */
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-
-				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
-				viewer.getControl().addMouseListener(getPaletteMouseListener());
-
-				// Add a transfer drag target listener that is supported on
-				// palette template entries whose template is a creation tool.
-				// This will enable drag and drop of the palette shape creation
-				// tools.
-				viewer
-					.addDragSourceListener(new PaletteToolTransferDragSourceListener(
-						viewer));
-                viewer.setCustomizer(createPaletteCustomizer());
-			}
-
-
-			/**
-			 * @return Palette Key Handler for the palette
-			 */
-			private KeyHandler getPaletteKeyHandler() {
-
-				if (paletteKeyHandler == null) {
-
-					paletteKeyHandler = new KeyHandler() {
-
-						/**
-						 * Processes a <i>key released </i> event. This method
-						 * is called by the Tool whenever a key is released, and
-						 * the Tool is in the proper state. Override to support
-						 * pressing the enter key to create a shape or connection
-						 * (between two selected shapes)
-						 *
-						 * @param event
-						 *            the KeyEvent
-						 * @return <code>true</code> if KeyEvent was handled
-						 *         in some way
-						 */
-						public boolean keyReleased(KeyEvent event) {
-
-							if (event.keyCode == SWT.Selection) {
-
-								Tool tool =
-									getPaletteViewer()
-										.getActiveTool()
-										.createTool();
-
-								if (toolSupportsAccessibility(tool)) {
-
-									tool.keyUp(event, getDiagramGraphicalViewer());
-
-									// 	deactivate current selection
-									getPaletteViewer().setActiveTool(null);
-
-									return true;
-								}
-
-							}
-							return super.keyReleased(event);
-						}
-
-					};
-
-				}
-				return paletteKeyHandler;
-			}
-
-			/**
-			 * @return Palette Mouse listener for the palette
-			 */
-			private MouseListener getPaletteMouseListener() {
-
-				if (paletteMouseListener == null) {
-
-					paletteMouseListener = new MouseListener() {
-
-						/**
-						 * Flag to indicate that the current active tool should
-						 * be cleared after a mouse double-click event.
-						 */
-						private boolean clearActiveTool = false;
-
-						/**
-						 * Override to support double-clicking a palette tool
-						 * entry to create a shape or connection (between two
-						 * selected shapes).
-						 *
-						 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-						 */
-						public void mouseDoubleClick(MouseEvent e) {
-							Tool tool = getPaletteViewer().getActiveTool()
-								.createTool();
-
-							if (toolSupportsAccessibility(tool)) {
-
-								tool.setViewer(getDiagramGraphicalViewer());
-								tool.setEditDomain(getDiagramGraphicalViewer()
-									.getEditDomain());
-								tool.mouseDoubleClick(e,
-									getDiagramGraphicalViewer());
-
-								// Current active tool should be deactivated,
-								// but if it is down here it will get
-								// reactivated deep in GEF palette code after
-								// receiving mouse up events.
-								clearActiveTool = true;
-							}
-						}
-
-						public void mouseDown(MouseEvent e) {
-							// do nothing
-						}
-
-						public void mouseUp(MouseEvent e) {
-							// 	Deactivate current active tool here if a
-							// double-click was handled.
-							if (clearActiveTool) {
-								getPaletteViewer().setActiveTool(null);
-								clearActiveTool = false;
-							}
-
-						}
-					};
-
-				}
-				return paletteMouseListener;
-			}
-
-		};
-	}
-
-	/** Key Handler for the palette */
-	KeyHandler paletteKeyHandler = null;
-
-	/** Mouse listener for the palette */
-	MouseListener paletteMouseListener = null;
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (getGraphicalControl()!=null)
-			getGraphicalControl().setFocus();
-	}
-
-
-	/**
-	 * Creates a splitter composite that will contain
-	 * 2 parts one is for the diagram and the other is for the palette.
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-
-		if(fHasFlyoutPalette) {
-			FlyoutPaletteComposite.FlyoutPreferences flyoutPrefs = new FlyoutPreferencesImpl(
-                getPreferenceStore());
-
-			splitter = new FlyoutPaletteComposite(parent, SWT.NONE, getSite().getPage(), getPaletteViewerProvider(), flyoutPrefs);
-			super.createPartControl(splitter);
-			splitter.setGraphicalControl(getGraphicalControl());
-			if (page != null) {
-				splitter.setExternalViewer(getPaletteViewer());
-				page = null;
-			}
-
-			// CWD: FlyoutPaletteComposite no longer implements the Java Beans
-			//      property change API, nor does it even have a 'default state'
-			//      property in the IES M9 drop
-			//TODO(M9):  Review whether this listener is needed
-//			splitter.addPropertyChangeListener(new PropertyChangeListener() {
-//			public void propertyChange(PropertyChangeEvent evt) {
-//				if (evt.getPropertyName().equals(FlyoutPaletteCompositeEx.PROPERTY_DEFAULT_STATE))
-//					handlePaletteDefaultStateChanged(((Integer)evt.getNewValue()).intValue());
-//				else
-//					handlePaletteResized(((Integer)evt.getNewValue()).intValue());
-//				}
-//			});
-		} else {
-			super.createPartControl(parent);
-		}
-
-	}
-	
-	/**
-     * Returns a preference store where GMF global workspace preferences can be
-     * saved. For example, the palette customizations are saved in this
-     * preference store. These settings are workspace-wide and not specific to
-     * any particular diagram.  Override to customize.
-     * 
-     * @return the preference store
-     * @since 2.1
-     */
-    protected IPreferenceStore getPreferenceStore() {
-        return DiagramUIPlugin.getInstance().getPreferenceStore();
-    }
-	
-	/**
-	 * Adapts to
-	 * <LI> PalettePage.class
-	 * <LI> PaletteViewer.class
-	 * other wise delegates to super.getAdapter()
-	 */
-	public Object getAdapter(Class type) {
-
-		if(fHasFlyoutPalette) {
-			if (type == PalettePage.class) {
-				if (splitter == null) {
-					page = new CustomPalettePage(getPaletteViewerProvider());
-					return page;
-				}
-				return new CustomPalettePage(getPaletteViewerProvider());
-			}
-			// Please do not remove PaletteViewer adapter
-			// QE automation depends on it
-			if (type == PaletteViewer.class){
-	
-				return getPaletteViewer();
-			}
-		}
-		return super.getAdapter(type);
-	}
-
-	/**
-	 * Creates the palette root for the palette viewer or updates the existing
-	 * palette root passed in if entries should be added/removed based on the
-	 * current state.
-	 * 
-	 * @param existingPaletteRoot
-	 *            the existing palette root if the palette has already been
-	 *            created, or null if the palette root has not yet been created
-	 * @return the new palette root or the updated palette root
-	 */
-	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
-	    PaletteRoot paletteRoot;
-		if (existingPaletteRoot == null) {
-			paletteRoot = PaletteService.getInstance().createPalette(this,
-				getDefaultPaletteContent());
-		} else {
-			PaletteService.getInstance().updatePalette(existingPaletteRoot,
-				this, getDefaultPaletteContent());
-			paletteRoot = existingPaletteRoot;
-		}
-        applyCustomizationsToPalette(paletteRoot);
-        return paletteRoot;
-	}
-
-	/**
-	 * Gets the palette content to be sent to the palette service when creating
-	 * the palette.
-	 * 
-	 * @return the palette content
-	 */
-	protected abstract Object getDefaultPaletteContent();
-
-	/**
-	 * Returns the palette view provider that is reponsible for creating and
-	 * palette view.
-	 * 
-	 * @return PaletteViewerProvider
-	 */
-	protected final PaletteViewerProvider getPaletteViewerProvider() {
-		if (provider == null)
-			provider = createPaletteViewerProvider();
-		return provider;
-	}
-
-	/**
-	 * Returns the initial palette size in pixels. Subclasses may override this method to
-	 * return a persisted value.
-	 * @see #handlePaletteResized(int)
-	 * @return the initial size of the palette in pixels.
-	 */
-	protected int getInitialPaletteSize() {
-		// '125' is the value of the FlyoutPaletteComposite.DEFAULT_PALETTE_SIZE constant
-		//   which was formerly public but is now private
-		return 125;
-	}
-
-	/**
-	 * gets the initial palette state, it could be 
-	 * UNCOLLAPSED_PINNED or COLLAPSED
-	 * @return int
-	 */
-	protected int getInitialPaletteState() {
-		// '4' is the value of the FlyoutPaletteComposite.STATE_UNCOLLAPSED constant
-		//   which is private.
-		return UNCOLLAPSED_PINNED;
-	}
-	
-    /**
-     * Returns the initial docking location of the palette either
-     * {@link PositionConstants#EAST} or {@link PositionConstants#WEST}. The
-     * 
-     * @return the initial dock location either {@link PositionConstants#EAST}
-     *         or {@link PositionConstants#WEST}
-     */
-    protected int getInitialDockLocation() {
-        return PositionConstants.EAST;
-    }
-
-	protected void setEditDomain(DefaultEditDomain ed) {
-		super.setEditDomain(ed);
-
-	}
-
-	/**
-	 * Called to configure the viewer before it receives its contents.
-	 */
-	protected void configurePaletteViewer() {
-		assert fHasFlyoutPalette == true;
-		PaletteViewer viewer = getPaletteViewer();
-
-		if (viewer == null) return;
-
-		ContextMenuProvider paletteContextProvider = new PaletteContextMenuProvider(viewer);
-		getPaletteViewer().setContextMenu(paletteContextProvider);
-	}
-
-	/**
-	 * Helper method to returns the PaletteViewer from the
-	 * page.
-	 * @return the palette viewer
-	 */
-	private PaletteViewer getPaletteViewer() {
-
-		return getEditDomain().getPaletteViewer();
-
-	}
-
-	/**
-	 * CustomPalettePage that helps with the switching of the palette
-	 * from the diagram to the palette view.
-	 * @author choang
-	 */
-	protected class CustomPalettePage extends PaletteViewerPage {
-		/**
-		 * constructor
-		 * @param provider
-		 */
-		public CustomPalettePage(PaletteViewerProvider provider) {
-			super(provider);
-		}
-		public void createControl(Composite parent) {
-			super.createControl(parent);
-			if (splitter != null)
-				splitter.setExternalViewer(viewer);
-		}
-		public void dispose() {
-			if (splitter != null)
-				splitter.setExternalViewer(null);
-			super.dispose();
-		}
-		/**
-		 * gets the palette viewer
-		 * @return <code>PaletteViewer</code>
-		 */
-		public PaletteViewer getPaletteViewer() {
-			return viewer;
-		}
-	}
-
-	/**
-	 * Called whenever the user resizes the palette.  Sub-classes can store the new palette
-	 * size.  May want to use this to store preferences as a perferences.
-	 * @param newSize the new size in pixels
-	 */
-	protected void handlePaletteResized(int newSize){
-		//
-	}
-	/**
-	 * Called whenever the user updates the default palette state.  Sub-classes can store
-	 * the new palette state.  May want to use this to store preferences as a perferences.
-	 * @param newState the new state
-	 */
-	protected void handlePaletteDefaultStateChanged(int newState){
-		//
-	}
-
-	/**
-     * An implementation of the fly-out palette preferences that stores the
-     * flyout palette settings in the given Preferences.
-     */
-	private final class FlyoutPreferencesImpl
-			implements FlyoutPaletteComposite.FlyoutPreferences {
-
-        private static final String PALETTE_DOCK_LOCATION = "org.eclipse.gmf.pdock"; //$NON-NLS-1$
-        private static final String PALETTE_SIZE = "org.eclipse.gmf.psize"; //$NON-NLS-1$
-        private static final String PALETTE_STATE = "org.eclipse.gmf.pstate"; //$NON-NLS-1$
-
-        private IPreferenceStore preferences;
-
-        private FlyoutPreferencesImpl(IPreferenceStore preferenceStore) {
-            preferences = preferenceStore;
-        }
-        
-        public int getDockLocation() {
-            if (preferences.contains(PALETTE_DOCK_LOCATION)) {
-                return preferences.getInt(PALETTE_DOCK_LOCATION);
-            } else {
-                return getInitialDockLocation();
-            }
-        }
-
-        public int getPaletteState() {
-            if (preferences.contains(PALETTE_STATE)) {
-                return preferences.getInt(PALETTE_STATE);
-            } else {
-                return getInitialPaletteState();
-            }
-        }
-
-        public int getPaletteWidth() {
-            if (preferences.contains(PALETTE_SIZE)) {
-                return preferences.getInt(PALETTE_SIZE);
-            } else {
-                return getInitialPaletteSize();
-            }
-        }
-        
-        public void setDockLocation(int location) {
-            preferences.setValue(PALETTE_DOCK_LOCATION, location);
-        }
-        
-        public void setPaletteState(int state) {
-            preferences.setValue(PALETTE_STATE, state);
-        }
-        
-        public void setPaletteWidth(int width) {
-            preferences.setValue(PALETTE_SIZE, width);
-        }   
-	}
-
-	protected void startListening() {
-		super.startListening();
-		activityManagerListener = createActivityManagerListener();
-		if (activityManagerListener != null) {
-			PlatformUI.getWorkbench().getActivitySupport().getActivityManager()
-				.addActivityManagerListener(activityManagerListener);
-		}
-	}
-
-	protected void stopListening() {
-		if (activityManagerListener != null) {
-			PlatformUI.getWorkbench().getActivitySupport().getActivityManager()
-				.removeActivityManagerListener(activityManagerListener);
-			activityManagerListener = null;
-		}
-		super.stopListening();
-	}
-	
-    protected IActivityManagerListener createActivityManagerListener() {
-        return new ActivityManagerListener();
-    }
-
-    /**
-     * Applies any current customizations to the palette root. If the palette
-     * viewer is not set or it does not have its palette root set, this method
-     * will do nothing.
-     */
-    protected void applyCustomizationsToPalette(PaletteRoot paletteRoot) {
-        PaletteCustomizer customizer = (getPaletteViewer() != null) ? getPaletteViewer()
-            .getCustomizer()
-            : createPaletteCustomizer();
-        if (customizer instanceof PaletteCustomizerEx) {
-            ((PaletteCustomizerEx) customizer)
-                .applyCustomizationsToPalette(paletteRoot);
-        }
-    }
-
-    /**
-     * Creation factory method for the palette customizer.
-     * @return a new palette customizer
-     */
-    protected PaletteCustomizer createPaletteCustomizer() {
-        return new PaletteCustomizerEx(getPreferenceStore());
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramGraphicalViewer.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramGraphicalViewer.java
deleted file mode 100644
index 6c31812..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/DiagramGraphicalViewer.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.parts;
-
-import java.util.List;
-
-import org.eclipse.draw2d.DeferredUpdateManager;
-import org.eclipse.draw2d.LightweightSystem;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.ElementToEditPartsMap;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author melaasar
- * @author Aurelien Pupier: remove resourceManager as implemented by superclass (bug 180171)
- * 
- * Implementation of a diagram graphical viewer
- */
-public class DiagramGraphicalViewer
-    extends ScrollingGraphicalViewer
-    implements IDiagramGraphicalViewer {
- 
-    /**
-     * Constructor
-     */
-    public DiagramGraphicalViewer() {
-        super();
-    }
-
-    /**
-     * @param enable
-     *            <code>boolean</code> <code>true</code> if client wishes to
-     *            disable updates on the figure canvas, <code>false</code>
-     *            indicates normal updates are to take place.
-     */
-    public void enableUpdates(boolean enable) {
-        if (enable)
-            getLightweightSystemWithUpdateToggle().enableUpdates();
-        else
-            getLightweightSystemWithUpdateToggle().disableUpdates();
-    }
-    
-    /**
-     * @return
-     */
-    public boolean areUpdatesDisabled() {
-        return getLightweightSystemWithUpdateToggle().getToggleUpdateManager().shouldDisableUpdates();
-    }
-
-    private class ToggleUpdateManager
-        extends DeferredUpdateManager {
-
-        private boolean disableUpdates = false;
-
-        /**
-         * @return the disableUpdates
-         */
-        public boolean shouldDisableUpdates() {
-            return disableUpdates;
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.draw2d.DeferredUpdateManager#sendUpdateRequest()
-         */
-        protected void sendUpdateRequest() {
-            DisplayUtils.getDisplay().asyncExec(new UpdateRequest());
-        }
-
-        /**
-         * @param disableUpdates
-         *            the disableUpdates to set
-         */
-        public synchronized void setDisableUpdates(boolean disableUpdates) {
-            boolean prevDisableUpdates = this.disableUpdates;
-            this.disableUpdates = disableUpdates;
-            if (!disableUpdates && prevDisableUpdates != disableUpdates) {
-                sendUpdateRequest();
-            }
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see org.eclipse.draw2d.DeferredUpdateManager#performUpdate()
-         */
-        public synchronized void performUpdate() {
-            if (!shouldDisableUpdates())
-                super.performUpdate();
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see org.eclipse.draw2d.DeferredUpdateManager#performValidation()
-         */
-        public void performValidation() {
-            if (!shouldDisableUpdates())
-                super.performValidation();
-        }
-        
-        /* (non-Javadoc)
-         * @see org.eclipse.draw2d.DeferredUpdateManager#queueWork()
-         */
-        public void queueWork() {
-            if (!shouldDisableUpdates())
-                super.queueWork();
-        }
-    }
-
-    private class LightweightSystemWithUpdateToggle
-        extends LightweightSystem {
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see org.eclipse.draw2d.LightweightSystem#getUpdateManager()
-         */
-        public ToggleUpdateManager getToggleUpdateManager() {
-            return (ToggleUpdateManager) getUpdateManager();
-        }
-
-        /**
-         * disable updates on the figure canvas
-         */
-        public void disableUpdates() {
-            getToggleUpdateManager().setDisableUpdates(true);
-        }
-
-        /**
-         * allow updates on the figure canvas to occcur
-         */
-        public void enableUpdates() {
-            getToggleUpdateManager().setDisableUpdates(false);
-        }
-    }
-
-    private LightweightSystemWithUpdateToggle getLightweightSystemWithUpdateToggle() {
-        return (LightweightSystemWithUpdateToggle) getLightweightSystem();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.ui.parts.GraphicalViewerImpl#createLightweightSystem()
-     */
-    protected LightweightSystem createLightweightSystem() {
-        LightweightSystem lws = new LightweightSystemWithUpdateToggle();
-        lws.setUpdateManager(new ToggleUpdateManager());
-        return lws;
-    }
-
-    /**
-     * A selection event pending flag (for asynchronous firing)
-     */
-    private boolean selectionEventPending = false;
-
-    /**
-     * A registry of editparts on the diagram, mapping an element's id string to
-     * a list of <code>EditParts</code>.
-     */
-    private ElementToEditPartsMap elementToEditPartsMap = new ElementToEditPartsMap();
-
-    /**
-     * Hook a zoom enabled graphics source
-     * 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#hookControl()
-     */
-    protected void hookControl() {
-        super.hookControl();        
-    }
-
-    /**
-     * Refresh drag source adapters regardless if the adapter list is empty
-     * 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#removeDragSourceListener(TransferDragSourceListener)
-     */
-    public void removeDragSourceListener(TransferDragSourceListener listener) {
-        getDelegatingDragAdapter().removeDragSourceListener(listener);
-        refreshDragSourceAdapter();
-    }
-
-    /**
-     * Refresh drag target adapters regardless if the adapter list is empty
-     * 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#removeDropTargetListener(TransferDropTargetListener)
-     */
-    public void removeDropTargetListener(TransferDropTargetListener listener) {
-        getDelegatingDropAdapter().removeDropTargetListener(listener);
-        refreshDropTargetAdapter();
-    }
-
-    /**
-     * Overriden to also flush pending selection events to account for OS
-     * diffences, since we are firing selection change events asynchronously.
-     */
-    public void flush() {
-        super.flush();
-        if (selectionEventPending) {
-            flushSelectionEvents(getSelection());
-        }
-
-    }
-
-    /**
-     * For performance reasons, we fire the event asynchronously
-     */
-    protected void fireSelectionChanged() {
-        if (selectionEventPending)
-            return;
-        selectionEventPending = true;
-        Display display = DisplayUtils.getDisplay();
-        if (display != null) {
-            display.asyncExec(new Runnable() {
-
-                public void run() {
-                    flushSelectionEvents(getSelection());
-                }
-            });
-        }
-    }
-
-    /**
-     * flush the selection events
-     * 
-     * @param sel
-     */
-    protected void flushSelectionEvents(ISelection sel) {
-        selectionEventPending = false;
-        SelectionChangedEvent event = new SelectionChangedEvent(this, sel);
-
-        // avoid exceptions caused by selectionChanged
-        // modifiying selectionListeners
-        Object[] array = selectionListeners.toArray();
-
-        for (int i = 0; i < array.length; i++) {
-            ISelectionChangedListener l = (ISelectionChangedListener) array[i];
-            if (selectionListeners.contains(l))
-                l.selectionChanged(event);
-        }
-    }
-
-    private void fireEmptySelection() {
-        if (selectionEventPending)
-            return;
-        selectionEventPending = true;
-        Display display = getControl().getDisplay();
-        if (display != null) {
-            display.asyncExec(new Runnable() {
-
-                public void run() {
-                    flushSelectionEvents(getSelection());
-                    flushSelectionEvents(StructuredSelection.EMPTY);
-                }
-            });
-        }
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#getDiagramEditDomain()
-     */
-    public IDiagramEditDomain getDiagramEditDomain() {
-        return (IDiagramEditDomain) getEditDomain();
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#findEditPartsForElement(java.lang.String,
-     *      java.lang.Class)
-     */
-    public List findEditPartsForElement(String elementIdStr, Class editPartClass) {
-        return elementToEditPartsMap.findEditPartsForElement(elementIdStr,
-            editPartClass);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#registerEditPartForElement(java.lang.String,
-     *      org.eclipse.gef.EditPart)
-     */
-    public void registerEditPartForElement(String elementIdStr, EditPart ep) {
-        elementToEditPartsMap.registerEditPartForElement(elementIdStr, ep);
-    }
-
-    /**
-     * @see org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer#unregisterEditPartForElement(java.lang.String,
-     *      org.eclipse.gef.EditPart)
-     */
-    public void unregisterEditPartForElement(String elementIdStr, EditPart ep) {
-        elementToEditPartsMap.unregisterEditPartForElement(elementIdStr, ep);
-    }
-
-    /** The work space preference store */
-    private IPreferenceStore workspacePreferenceStore;
-
-    private boolean initializing;
-
-    /**
-     * The editor manages the workspaces preferences store. So viewers not using
-     * a editor do not need to create a preference store. This method provides a
-     * hook for clients requiring access to the preference store.
-     * 
-     * @param store
-     */
-    public void hookWorkspacePreferenceStore(IPreferenceStore store) {
-        this.workspacePreferenceStore = store;
-    }
-
-    /**
-     * Returns the workspace preference store managed by the
-     * <code>DiagramEditor</code>, if one is being used. May return null.
-     * 
-     * @return the work space preference store
-     */
-    public IPreferenceStore getWorkspaceViewerPreferenceStore() {
-        return workspacePreferenceStore;
-    }
-  
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#unhookControl()
-     */
-    protected void unhookControl() {
-        fireEmptySelection();
-        super.unhookControl();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#setContents(org.eclipse.gef.EditPart)
-     */
-    public void setContents(EditPart editpart) {
-        initializing = true;
-        try {
-            super.setContents(editpart);
-        } finally {
-            initializing = false;
-        }
-    }
-
-    /**
-     * checks if the viewer is still in the process of initializing itself
-     * 
-     * @return true if initializing; false if the initializing process is
-     *         finished
-     */
-    public boolean isInitializing() {
-        return initializing;
-    }
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditDomain.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditDomain.java
deleted file mode 100644
index 81dfc98..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditDomain.java
+++ /dev/null
@@ -1,35 +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.parts;
-
-import org.eclipse.gmf.runtime.common.ui.action.ActionManager;
-
-/**
- * Diagram Edit Domain Interface 
- * @author melaasar
- *
- */ 
-public interface IDiagramEditDomain {
-
-	/**
-	 * Returns the DiagramCommandStack to be used with ICommands.
-	 * @return The command stack for this edit domain.
-	 */
-	public DiagramCommandStack getDiagramCommandStack();
-
-	/**
-	 * Returns the ActionManager 
-	 * @return the Action Manager
-	 */
-	public ActionManager getActionManager();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditorInput.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditorInput.java
deleted file mode 100644
index 519c79c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramEditorInput.java
+++ /dev/null
@@ -1,31 +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.parts;
-
-import org.eclipse.ui.IEditorInput;
-
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * Diagram Editor Input interface.
- * 
- * @author melaasar  
- */
-public interface IDiagramEditorInput extends IEditorInput {
-
-	/**
-	 * Method getDiagram.
-	 * @return Diagram
-	 */
-	public Diagram getDiagram();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramGraphicalViewer.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramGraphicalViewer.java
deleted file mode 100644
index 0cc96d7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramGraphicalViewer.java
+++ /dev/null
@@ -1,57 +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.parts;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
- 
-/**
- * @author Tauseef A. Israr mailto: tisrar@rational.com
- * 
- * Gives functionality to:
- * 1. remove drag source listener
- * 2. remove drop target listener.
- *
- */
-public interface IDiagramGraphicalViewer extends GraphicalViewer {
-        
-	/**
-	 * Method getDiagramEditDomain.
-	 * @return IDiagramEditDomain
-	 */
-	IDiagramEditDomain getDiagramEditDomain();
-
-	/**
-	 * Finds all editparts of a specific class type on the diagram that 
-	 * have been registered for the given element.  
-	 * @param elementIdStr the element's id string
-	 * @param editPartClass the class of the editparts to be returned
-	 * @return a List of editparts, if none exist an empty list is returned
-	 */
-	public List findEditPartsForElement(String elementIdStr, Class editPartClass);
-
-	/**
-	 * Registers an editpart for an element in the element/editpart registry.
-	 * @param elementIdStr the element's id string
-	 * @param ep the edit part to register for this element
-	 */
-	public void registerEditPartForElement(String elementIdStr, EditPart ep);
-
-	/**
-	 * Unregisters an editpart for a element in the element/editpart registry.
-	 * @param elementIdStr the element's id string
-	 * @param ep the edit part to register for this element
-	 */
-	public void unregisterEditPartForElement(String elementIdStr, EditPart ep);
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramWorkbenchPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramWorkbenchPart.java
deleted file mode 100644
index 6d8f33b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/IDiagramWorkbenchPart.java
+++ /dev/null
@@ -1,50 +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.parts;
-
-import org.eclipse.ui.IWorkbenchPart;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * @author melaasar
- *
- * The diagram workbench part interface
- */
-public interface IDiagramWorkbenchPart extends IWorkbenchPart {
-
-	/**
-	 * Method getDiagramGraphicalViewer.
-	 * @return IDiagramGraphicalViewer
-	 */
-	public IDiagramGraphicalViewer getDiagramGraphicalViewer();
-
-	/**
-	 * Method getEditDomain.
-	 * @return DefaultEditDomain
-	 */
-	public IDiagramEditDomain getDiagramEditDomain();
-
-	/**
-	 * Method getDiagram.
-	 * @return Diagram
-	 */
-	public Diagram getDiagram();
-
-	/**
-	 * Method getDiagramEditPart.
-	 * @return DiagramEditPart
-	 */
-	public DiagramEditPart getDiagramEditPart();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/parts/package.html
deleted file mode 100644
index 7daca16..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/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>
-this package sontains the editors and the editing domain</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/AppearancePreferencePage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/AppearancePreferencePage.java
deleted file mode 100644
index 1671e93..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/AppearancePreferencePage.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.preferences;
-
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.gmf.runtime.common.ui.preferences.FontFieldEditor;
-import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.preference.ColorFieldEditor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Appearance General preference page.
- * 
- * @author schafe
- */
-public class AppearancePreferencePage
-    extends AbstractPreferencePage {
-
-    //localized labels
-	private String COLORANDFONT_GROUPBOX_LABEL = DiagramUIMessages.GeneralPreferencePage_colorAndFontGroupBox_label;
-	private String DEFAULT_FONT_LABEL = DiagramUIMessages.GeneralPreferencePage_defaultFont_label;
-    private String FONT_COLOR_LABEL = DiagramUIMessages.GeneralPreferencePage_fontColor_label;
-    private String FILL_COLOR_LABEL = DiagramUIMessages.GeneralPreferencePage_fillColor_label;
-    private String LINE_COLOR_LABEL = DiagramUIMessages.GeneralPreferencePage_lineColor_label;
-    private String NOTE_FILL_COLOR_LABEL = DiagramUIMessages.GeneralPreferencePage_noteFillColor_label;
-    private String NOTE_LINE_COLOR_LABEL = DiagramUIMessages.GeneralPreferencePage_noteLineColor_label;
-				
-    //preference page editor controls 
-    private FontFieldEditor defaultFontEditor = null;
-    private ColorFieldEditor fontColorEditor = null;
-    private ColorFieldEditor fillColorEditor = null;
-    private ColorFieldEditor lineColorEditor = null;
-    private ColorFieldEditor noteFillColorEditor = null;
-    private ColorFieldEditor noteLineColorEditor = null;
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#addFields(org.eclipse.swt.widgets.Composite)
-     */
-    protected void addFields(Composite parent) {	  	
-    	Composite main = createPageLayout(parent);
-		createFontAndColorGroup(main); 
-    }
-
-	/**
-	 * Creates a new composite for the entire page and sets up the layout.
-	 * @param parent the parent <code>Composite</code> that the field editors will be added
-	 * to
-	 * @return the new <code>Composite</code>
-	 */
-	protected Composite createPageLayout(Composite parent) {
-		Composite main = new Composite(parent, SWT.NULL);
-		main.setLayout(new GridLayout());
-		main.setLayoutData(
-			new GridData(
-				GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-		return main;
-	}
-        
-	/**
-	 * Create the font and colour group for the
-	 * preference page
-	 * @param parent
-	 * @return composite fontAndColourGroup
-	 */
-	protected Composite createFontAndColorGroup(Composite parent) {
-    	
-    	Group group = new Group(parent, SWT.NONE);
-    	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    	group.setLayout(new GridLayout(3, false));
-    	Composite composite = new Composite(group, SWT.NONE);
-    	GridLayout gridLayout = new GridLayout(3, false);
-    	composite.setLayout(gridLayout);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 3;
-		composite.setLayoutData(gridData);
-		group.setText(COLORANDFONT_GROUPBOX_LABEL);
-    	
- 		addFontAndColorFields(composite);
-		
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.horizontalSpacing = 8;
-		composite.setLayout(layout);               
-    	
-		return group;
-	}
-
-/**
- * Adds the font and color fields to the <code>Composite</code> given.
- * @param composite
- */
-protected void addFontAndColorFields(Composite composite) {
-	defaultFontEditor =
-	    new FontFieldEditor(
-	        IPreferenceConstants.PREF_DEFAULT_FONT,
-	        DEFAULT_FONT_LABEL,
-			composite);
-	addField(defaultFontEditor);
-	
-	fontColorEditor =
-	    new ColorFieldEditor(
-	        IPreferenceConstants.PREF_FONT_COLOR,
-	        FONT_COLOR_LABEL,
-			composite);
-	addField(fontColorEditor);		
-
-	fillColorEditor =
-	    new ColorFieldEditor(
-	        IPreferenceConstants.PREF_FILL_COLOR,
-	        FILL_COLOR_LABEL,
-			composite);
-	addField(fillColorEditor);
-
-	lineColorEditor =
-	    new ColorFieldEditor(
-	        IPreferenceConstants.PREF_LINE_COLOR,
-	        LINE_COLOR_LABEL,
-			composite);
-	addField(lineColorEditor);
-
-	noteFillColorEditor =
-	    new ColorFieldEditor(
-	        IPreferenceConstants.PREF_NOTE_FILL_COLOR,
-	        NOTE_FILL_COLOR_LABEL,
-			composite);
-	addField(noteFillColorEditor);
-
-	noteLineColorEditor =
-	    new ColorFieldEditor(
-	        IPreferenceConstants.PREF_NOTE_LINE_COLOR,
-	        NOTE_LINE_COLOR_LABEL,
-			composite);
-	addField(noteLineColorEditor);
-    
-    
-    //Accessibility helpers...  See bugzilla#142826 ///////////////////////
-    
-    fontColorEditor.getColorSelector().getButton().
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-       public void getName(AccessibleEvent e) {
-            String labelText = fontColorEditor.getLabelText();
-            labelText = Action.removeMnemonics(labelText);
-            e.result = labelText;
-        } 
-    });
-    
-    fillColorEditor.getColorSelector().getButton().
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-       public void getName(AccessibleEvent e) {
-           String labelText = fillColorEditor.getLabelText();
-           labelText = Action.removeMnemonics(labelText);
-           e.result = labelText;
-        } 
-    });
-    
-    lineColorEditor.getColorSelector().getButton().
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-       public void getName(AccessibleEvent e) {
-           String labelText = lineColorEditor.getLabelText();
-           labelText = Action.removeMnemonics(labelText);
-           e.result = labelText;
-        } 
-    });
-    
-    noteFillColorEditor.getColorSelector().getButton().
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-       public void getName(AccessibleEvent e) {
-           String labelText = noteFillColorEditor.getLabelText();
-           labelText = Action.removeMnemonics(labelText);
-           e.result = labelText;
-        } 
-    });
-    
-    noteLineColorEditor.getColorSelector().getButton().
-    getAccessible().addAccessibleListener(new AccessibleAdapter() {
-       public void getName(AccessibleEvent e) {
-           String labelText = noteLineColorEditor.getLabelText();
-           labelText = Action.removeMnemonics(labelText);
-           e.result = labelText;
-        } 
-    });
-    
-}
-
-	/**
-     * 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 = DiagramColorConstants.white;
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_FILL_COLOR,
-            fillColor.getRGB());
-
-        Color lineColor = DiagramColorConstants.diagramGray;
-        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());
-    }
-    	
-	/**
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#initHelp()
-	 */
-	protected void initHelp() {
-		//do nothing, help not ready yet
-		//setPageHelpContextId(IHelpContextIds.VZ_U_APPEAR_PAGE_PREF);
-	}
-	
-	/**	
-	 * The field editor preference page implementation of a <code>PreferencePage</code>
-	 * method loads all the field editors with their default values.
-	 * 
-	 * Override so that the font field editor default is set.
-	 * Note: loadDefault() does not work with FontFieldEditor
-	 */
-	protected void performDefaults() {		
-		setDefaultFontPreference(getPreferenceStore());
-        super.performDefaults();
-	}
-	
-	/**
-	 * Set the default font for this preference store.
-	 * @param store IPreferenceStore
-	 */
-	static protected void setDefaultFontPreference(IPreferenceStore store){
-		final IPreferenceStore theStore = store;
-		if (Display.getCurrent() != null) {
-			initDefaultFontProc(theStore);
-		} else {
-			Display display = PlatformUI.isWorkbenchRunning() ? PlatformUI
-					.getWorkbench().getDisplay() : Display.getDefault();
-			display.syncExec(new Runnable(){
-				public void run() {
-					initDefaultFontProc(theStore);
-				}
-			});
-		}
-	}
-	
-	/**
-	 * Set the default font for this preference store. Assumes that the method
-	 * executed on the UI thread
-	 * 
-	 * @param store
-	 *            IPreferenceStore
-	 */
-	private static void initDefaultFontProc(IPreferenceStore store) {
-		FontData fontDataArray[] =
-            JFaceResources.getDefaultFont().getFontData();
-        FontData fontData = fontDataArray[0];
-        fontData.setHeight(9);
-        PreferenceConverter.setDefault(
-            store,
-            IPreferenceConstants.PREF_DEFAULT_FONT,
-            fontData);		
-	}
-
-	/**
-	 * Gets the field editor used for the default font.
-	 * @return the default font field editor
-	 */
-	protected FontFieldEditor getDefaultFontEditor() {
-		return defaultFontEditor;
-	}
-	
-	/**
-	 * Gets the field editor used for the fill color.
-	 * @return the fill color field editor
-	 */
-	protected ColorFieldEditor getFillColorEditor() {
-		return fillColorEditor;
-	}
-
-	/**
-	 * Gets the field editor used for the line color.
-	 * @return the line color field editor
-	 */
-	protected ColorFieldEditor getLineColorEditor() {
-		return lineColorEditor;
-	}	
-		
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/ConnectionsPreferencePage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/ConnectionsPreferencePage.java
deleted file mode 100644
index 2944c21..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/ConnectionsPreferencePage.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.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.gmf.runtime.common.ui.preferences.ComboFieldEditor;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Connections preferences page for diagram connection preferences.
- * 
- * @author cmahoney
- */
-public class ConnectionsPreferencePage
-	extends AbstractPreferencePage {
-
-	private String LINE_LABEL = DiagramUIMessages.ConnectionsPreferencePage_lineStyle_label;
-
-	private ComboFieldEditor lineStyleFieldEditor = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#addFields(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addFields(Composite parent) {
-		Composite main = createPageLayout(parent);
-		addFieldEditors(main);
-	}
-
-	/**
-	 * Creates a new composite for the entire page and sets up the layout.
-	 * 
-	 * @param parent
-	 *            the parent <code>Composite</code> that the field editors
-	 *            will be added to
-	 * @return the new <code>Composite</code>
-	 */
-	private Composite createPageLayout(Composite parent) {
-		Composite main = new Composite(parent, SWT.NONE);
-		main.setLayout(new GridLayout(2, false));
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-		main.setLayoutData(gridData);
-		return main;
-	}
-
-	/**
-	 * Adds the font and color fields to the <code>Composite</code> given.
-	 * 
-	 * @param composite
-	 */
-	protected void addFieldEditors(Composite composite) {
-		lineStyleFieldEditor = new ComboFieldEditor(
-			IPreferenceConstants.PREF_LINE_STYLE, LINE_LABEL, composite,
-			ComboFieldEditor.INT_TYPE, true, 0, 0, true);
-		lineStyleFieldEditor.autoStorage = true;
-		addField(lineStyleFieldEditor);
-		Combo lineStyleCombo = lineStyleFieldEditor.getComboControl();
-		lineStyleCombo
-			.add(DiagramUIMessages.ConnectionsPreferencePage_ConnectionView_Manual_text);
-		lineStyleCombo
-			.add(DiagramUIMessages.ConnectionsPreferencePage_ConnectionView_Rectilinear_text);	
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#initHelp()
-	 */
-	protected void initHelp() {
-		// do nothing, help not ready yet
-	}
-
-	/**
-	 * Initializes the default preference values for this preference store.
-	 * 
-	 * @param preferenceStore
-	 *            the preference store
-	 */
-	public static void initDefaults(IPreferenceStore preferenceStore) {
-		preferenceStore.setDefault(IPreferenceConstants.PREF_LINE_STYLE,
-			Routing.MANUAL);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DefaultDiagramPreferencesInitializer.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DefaultDiagramPreferencesInitializer.java
deleted file mode 100644
index 993fc6a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DefaultDiagramPreferencesInitializer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.preferences;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Populates default diagram preferences
- * 
- * @author aboyko
- * @since 1.2
- */
-public class DefaultDiagramPreferencesInitializer extends
-		DiagramPreferenceInitializer {
-
-	@Override
-	protected IPreferenceStore getPreferenceStore() {
-		return (IPreferenceStore) PreferencesHint.USE_DEFAULTS.getPreferenceStore();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramPreferenceInitializer.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramPreferenceInitializer.java
deleted file mode 100644
index c73fd43..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramPreferenceInitializer.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.diagram.ui.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The initializer for the generic diagram preferences. Clients that have their
- * own diagram preferences should subclass this so that they inherit default
- * values for the preferences that they do not provide preference pages for.
- * This will ensure that the default values are set for all available diagram
- * preferences.
- * 
- * @author cmahoney
- */
-public abstract class DiagramPreferenceInitializer
-	extends AbstractPreferenceInitializer {
-
-	/**
-	 * Initializes all the generic diagram preferences with their default
-	 * values. Override to initialize new preferences added.
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-
-		DiagramsPreferencePage.initDefaults(store);
-		RulerGridPreferencePage.initDefaults(store);
-		AppearancePreferencePage.initDefaults(store);
-		ConnectionsPreferencePage.initDefaults(store);
-		PrintingPreferencePage.initDefaults(store);
-
-	}
-
-	/**
-	 * Gets the preference store to be initialized.
-	 * 
-	 * @return the preference store to be initialized
-	 */
-	protected abstract IPreferenceStore getPreferenceStore();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramsPreferencePage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramsPreferencePage.java
deleted file mode 100644
index e43076a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/DiagramsPreferencePage.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.preferences;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.GCUtilities;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.IPreferenceStore;
-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.Group;
-
-
-/**
- * Top-level "Diagrams" preference page to hold preferences relating to diagram
- * functionality.
- * 
- * @author schafe, cmahoney
- */
-public class DiagramsPreferencePage
-	extends AbstractPreferencePage {
-
-	//	localized labels
-	private String GLOBAL_SETTINGS_GROUP_LABEL = DiagramUIMessages.DiagramsPreferencePage_globalGroup_label;
-
-	private String SHOW_CONNECTION_HANDLES_LABEL = DiagramUIMessages.DiagramsPreferencePage_showConnectionHandles_label;
-
-	private String SHOW_POPUP_BARS_LABEL = DiagramUIMessages.DiagramsPreferencePage_showPopupBars_label;
-
-	private String ENABLE_ANIMATED_LAYOUT = DiagramUIMessages.DiagramsPreferencePage_enableAnimatedLayout_label;
-
-	private String ENABLE_ANIMATED_ZOOM = DiagramUIMessages.DiagramsPreferencePage_enableAnimatedZoom_label;
-
-	private String ENABLE_ANTIALIAS = DiagramUIMessages.DiagramsPreferencePage_enableAntiAlias_label;	
-	
-	private String SHOW_STATUS_LINE = DiagramUIMessages.DiagramsPreferencePage_showStatusLine_label;
-	
-	// preference page editor controls
-	private BooleanFieldEditor showConnectionHandles = null;
-
-	private BooleanFieldEditor showPopupBars = null;
-	
-	private BooleanFieldEditor enableAnimatedLayout = null;
-
-	private BooleanFieldEditor enableAnimatedZoom = null;
-
-	private BooleanFieldEditor enableAntiAlias = null;
-	
-	private BooleanFieldEditor showStatusLine = null;
-	
-	private Composite globalSettingsComposite;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#addFields(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addFields(Composite parent) {
-
-		Group generalGlobalGroup = new Group(parent, SWT.NONE);
-		GridLayout gridLayout = new GridLayout(2, false);
-		generalGlobalGroup.setLayout(gridLayout);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-		generalGlobalGroup.setLayoutData(gridData);
-		generalGlobalGroup.setText(GLOBAL_SETTINGS_GROUP_LABEL);
-
-		globalSettingsComposite = new Composite(generalGlobalGroup, SWT.NONE);		
-
-		showConnectionHandles = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_SHOW_CONNECTION_HANDLES,
-			SHOW_CONNECTION_HANDLES_LABEL, globalSettingsComposite);
-		addField(showConnectionHandles);
-
-		showPopupBars = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_SHOW_POPUP_BARS, SHOW_POPUP_BARS_LABEL,
-			globalSettingsComposite);
-		addField(showPopupBars);
-		
-		enableAnimatedLayout = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_ENABLE_ANIMATED_LAYOUT, ENABLE_ANIMATED_LAYOUT,
-			globalSettingsComposite);
-		addField(enableAnimatedLayout);
-		
-		enableAnimatedZoom = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_ENABLE_ANIMATED_ZOOM, ENABLE_ANIMATED_ZOOM,
-			globalSettingsComposite);
-		addField(enableAnimatedZoom);
-
-		enableAntiAlias = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_ENABLE_ANTIALIAS, ENABLE_ANTIALIAS,
-			globalSettingsComposite);
-		addField(enableAntiAlias);
-        
-		// enable anti-aliasing only if advanced graphics is supported.
-        enableAntiAlias.setEnabled(GCUtilities.supportsAdvancedGraphics(), globalSettingsComposite);
-        
-        showStatusLine = new BooleanFieldEditor(
-				IPreferenceConstants.PREF_SHOW_STATUS_LINE, SHOW_STATUS_LINE,
-				globalSettingsComposite);
-		addField(showStatusLine);
-		
-	}
-
-	
-	/**
-	 * Initializes the default preference values for this preference store.
-	 * 
-	 * @param IPreferenceStore preferenceStore
-	 */
-	public static void initDefaults(IPreferenceStore preferenceStore) {
-
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_CONNECTION_HANDLES, true);
-
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_POPUP_BARS, true);
-	
-		preferenceStore.setDefault(IPreferenceConstants.PREF_ENABLE_ANIMATED_LAYOUT, true);
-
-		preferenceStore.setDefault(IPreferenceConstants.PREF_ENABLE_ANIMATED_ZOOM, true);
-		
-		preferenceStore.setDefault(IPreferenceConstants.PREF_ENABLE_ANTIALIAS, true);	
-
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_STATUS_LINE, true);	
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#initHelp()
-	 */
-	protected void initHelp() {
-		//setPageHelpContextId(IHelpContextIds.VZ_U_UMLV_PAGE_PREF);
-		//do nothing, no context help for modeler yet
-	}
-	
-	/**
-	 * Returns the Composite containing global settings controls 
-	 * @return global settings controls container
-	 * @since 1.3
-	 */
-	final protected Composite getGlobalSettingsComposite() {
-		return globalSettingsComposite;
-	}
-	
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/IPreferenceConstants.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/IPreferenceConstants.java
deleted file mode 100644
index e1a728d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/IPreferenceConstants.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.preferences;
-
-/**
- * Defines preference constants for the GMF diagram layer.
- * 
- * @noimplement This interface is not intended to be implemented by clients.  
- * @author schafe
- */
-public interface IPreferenceConstants {
-
-    /**
-     * the connection line style; shows up in ConnectionsPreferencePage 
-     */
-    public static final String PREF_LINE_STYLE = "Connectors.lineStyle"; //$NON-NLS-1$
-
-    /**
-     * the font; shows up in AppearancePreferencePage 
-     */
-    public static final String PREF_DEFAULT_FONT = "Appearance.defaultFont"; //$NON-NLS-1$
-    /**
-     * the font color; shows up in AppearancePreferencePage 
-     */
-	public static final String PREF_FONT_COLOR = "Appearance.fontColor"; //$NON-NLS-1$
-	/**
-     * the the fill color; shows up in AppearancePreferencePage 
-     */
-    public static final String PREF_FILL_COLOR = "Appearance.fillColor"; //$NON-NLS-1$
-    /**
-     * the line color; shows up in AppearancePreferencePage 
-     */
-    public static final String PREF_LINE_COLOR = "Appearance.lineColor"; //$NON-NLS-1$
-    /**
-     * the note fill color; shows up in AppearancePreferencePage 
-     */
-	public static final String PREF_NOTE_FILL_COLOR = "Appearance.noteFillColor"; //$NON-NLS-1$
-	/**
-     * the note line color; shows up in AppearancePreferencePage 
-     */
-	public static final String PREF_NOTE_LINE_COLOR = "Appearance.noteLineColor"; //$NON-NLS-1$
-    
-    /**
-     * show connection handles preference; Global Preference 
-     */
-	public static final String PREF_SHOW_CONNECTION_HANDLES = "Global.showConnectionHandles"; //$NON-NLS-1$
-	
-	/**
-     * show popup bars preference;; Global Preference 
-     */
-	public static final String PREF_SHOW_POPUP_BARS = "Global.showPopupBars"; //$NON-NLS-1$
-
-	/**
-     * prompt when user choose delete from model; Global Preference 
-     */
-	public static final String PREF_PROMPT_ON_DEL_FROM_MODEL = "Global.promptOnDelFromModel"; //$NON-NLS-1$
-	/**
-     * prompt when user choose delete from diagram ; Global Preference
-     */
-	public static final String PREF_PROMPT_ON_DEL_FROM_DIAGRAM = "Global.promptOnDelFromDiagram"; //$NON-NLS-1$	
-	/**
-     * enable Layout animation ; Global Preference
-     */
-	public static final String PREF_ENABLE_ANIMATED_LAYOUT = "Global.enableAnimatedLayout"; //$NON-NLS-1$
-	/**
-     * enable zoom animation; Global Preference 
-     */
-	public static final String PREF_ENABLE_ANIMATED_ZOOM = "Global.enableAnimatedZoom"; //$NON-NLS-1$	
-
-	/**
-     * enable anti-aliasing; Global Preference 
-     */
-	public static final String PREF_ENABLE_ANTIALIAS = "Global.enableAntiAlias"; //$NON-NLS-1$	
-
-	/**
-     * enable status line content; Global Preference 
-	 * @since 1.2
-     */
-	public static final String PREF_SHOW_STATUS_LINE = "Global.showStatusLine"; //$NON-NLS-1$	
-	
-	/**
-     * show grid preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_SHOW_GRID    = "GridRuler.showGrid";    //$NON-NLS-1$
-	/**
-     * Show Rulers Preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_SHOW_RULERS  = "GridRuler.showRulers";  //$NON-NLS-1$
-	/**
-     * Snap to grid preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_SNAP_TO_GRID = "GridRuler.snapToGrid";  //$NON-NLS-1$
-	/**
-     * ruler units preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_RULER_UNITS  = "GridRuler.rulerUnits";  //$NON-NLS-1$
-	/**
-     * grid spacing preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_GRID_SPACING = "GridRuler.gridSpacing"; //$NON-NLS-1$
-	/**
-     * snap to geometry preference; Grid/Rulers Preference Page 
-     */
-	public static final String PREF_SNAP_TO_GEOMETRY = "GridRuler.snapToGeometry"; //$NON-NLS-1$
-	
-
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/PrintingPreferencePage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/PrintingPreferencePage.java
deleted file mode 100644
index fc6523a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/PrintingPreferencePage.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.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.gmf.runtime.diagram.ui.internal.dialogs.PageSetupConfigBlock;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.DefaultValues;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.ILabels;
-
-/**
- * PrintingPreferencePage enables the user to specify printing settings such as
- * measurement units, page size, page orientation and margins. 
- * 
- * @author etworkow
- */
-public class PrintingPreferencePage
-	extends AbstractPreferencePage {
-
-	/** Printing preferences page ID. */
-	public static String ID_PAGE_SETUP_PREF_PAGE = "id.pageSetupPreferencePage"; //$NON-NLS-1$
-
-	private PageSetupConfigBlock fPrinterConfigurationBlock;
-
-	/**
-	 * Creates an instance of PrintingPreferencePage.
-	 */
-	public PrintingPreferencePage() {
-		super();
-	}
-	
-	/**
-	 * Creates an instance of PrintingPreferencePage.
-	 */
-	public PrintingPreferencePage(IPreferenceStore store) {
-		super();
-		setPreferenceStore(store);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.preferences.AbstractPreferencePage#addFields(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addFields(Composite parent) {
-		//fPrinterConfigurationBlock.createContents(parent);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.ui.internal.preferences.AbstractPreferencePage#initHelp()
-	 */
-	protected void initHelp() {
-		// TODO Auto-generated method stub, modeler doesn't support it yet
-	}
-
-	/**
-	 * Initializes printing preferences to their default values.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(WorkspaceViewerProperties.PREF_USE_INCHES,
-			DefaultValues.DEFAULT_INCHES);
-		store.setDefault(WorkspaceViewerProperties.PREF_USE_MILLIM,
-			DefaultValues.DEFAULT_MILLIM);
-		store.setDefault(WorkspaceViewerProperties.PREF_USE_PORTRAIT,
-			DefaultValues.DEFAULT_PORTRAIT);
-		store.setDefault(WorkspaceViewerProperties.PREF_USE_LANDSCAPE,
-			DefaultValues.DEFAULT_LANDSCAPE);
-		store.setDefault(WorkspaceViewerProperties.PREF_PAGE_SIZE, DefaultValues
-			.getLocaleSpecificPageType().getName());
-		store.setDefault(WorkspaceViewerProperties.PREF_PAGE_WIDTH,
-			DefaultValues.getLocaleSpecificPageType().getWidth());
-		store.setDefault(WorkspaceViewerProperties.PREF_PAGE_HEIGHT,
-			DefaultValues.getLocaleSpecificPageType().getHeight());
-		store.setDefault(WorkspaceViewerProperties.PREF_MARGIN_TOP,
-			DefaultValues.DEFAULT_MARGIN_TOP);
-		store.setDefault(WorkspaceViewerProperties.PREF_MARGIN_BOTTOM,
-			DefaultValues.DEFAULT_MARGIN_BOTTOM);
-		store.setDefault(WorkspaceViewerProperties.PREF_MARGIN_LEFT,
-			DefaultValues.DEFAULT_MARGIN_LEFT);
-		store.setDefault(WorkspaceViewerProperties.PREF_MARGIN_RIGHT,
-			DefaultValues.DEFAULT_MARGIN_RIGHT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		getFPrinterConfigurationBlock().performDefaults();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		boolean result = super.performOk();
-		getFPrinterConfigurationBlock().save();
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		//super.createContents(parent);
-		Label instruction = new Label(parent, SWT.NONE);
-		instruction.setText(ILabels.LABEL_PRINT_PREFERENCE_PAGE_INSTRUCTION);
-		
-		getFPrinterConfigurationBlock().createContents(parent);
-		return parent;
-	}
-	
-	private PageSetupConfigBlock getFPrinterConfigurationBlock() {
-		if (fPrinterConfigurationBlock == null) {
-			fPrinterConfigurationBlock = new PageSetupConfigBlock(getPreferenceStore(), this);
-		}
-		return fPrinterConfigurationBlock;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java
deleted file mode 100644
index 7665d80..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/preferences/RulerGridPreferencePage.java
+++ /dev/null
@@ -1,429 +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.preferences;
-
-import java.text.ParseException;
-import java.text.ParsePosition;
-import java.util.Locale;
-
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage;
-import org.eclipse.gmf.runtime.common.ui.preferences.ComboFieldEditor;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.SWT;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-
-import com.ibm.icu.text.NumberFormat;
-
-
-/**
- * Diagram Ruler & Grid preference page.
- * 
- * @author jschofie
- */
-public class RulerGridPreferencePage
-	extends AbstractPreferencePage {
-
-	private class DoubleFieldEditor extends StringFieldEditor {
-		
-		private double minValidValue = 00.009;
-		private double maxValidValue = 99.999;
-		
-		public DoubleFieldEditor(String pref, String label, Composite parent ) {
-			super(pref,label,parent);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.StringFieldEditor#doCheckState()
-		 */
-		protected boolean doCheckState() {
-			Text text = getTextControl();
-
-			if (text == null)
-				return false;
-			
-			try {
-				NumberFormat numberFormatter = NumberFormat.getInstance();
-				ParsePosition parsePosition = new ParsePosition(0);
-				Number parsedNumber = numberFormatter.parse(text.getText(), parsePosition);
-				
-				if (parsedNumber == null) {
-					showErrorMessage();
-					return false;
-				}
-				
-				Double pageHeight = forceDouble(parsedNumber);
-				double number = pageHeight.doubleValue();
-				number = convertToBase(number);
-				if (number >= minValidValue && number <= maxValidValue 
-						&& parsePosition.getIndex() == text.getText().length()) {
-					clearErrorMessage();
-					return true;
-				} else {
-					showErrorMessage();
-					return false;
-				}
-			} catch (NumberFormatException e1) {
-				showErrorMessage();
-			}
-
-			return false;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.StringFieldEditor#doLoadDefault()
-		 */
-		protected void doLoadDefault() {
-			Text text = getTextControl();
-			if (text != null) {
-				double value = getPreferenceStore().getDefaultDouble(getPreferenceName());
-				NumberFormat numberFormatter = NumberFormat.getNumberInstance();
-				text.setText(numberFormatter.format(value));
-			}
-			valueChanged();
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on FieldEditor.
-		 */
-		protected void doLoad() {
-			Text text = getTextControl();			
-			if (text != null) {
-				double value = getPreferenceStore().getDouble(getPreferenceName());
-				NumberFormat numberFormatter = NumberFormat.getNumberInstance();
-				text.setText(numberFormatter.format(value));				
-			}
-		}		
-		
-		protected void doStore() {
-			NumberFormat numberFormatter = NumberFormat.getInstance();				
-			Double gridWidth;
-			try {
-				gridWidth = forceDouble(numberFormatter.parse(getTextControl().getText()));
-				getPreferenceStore().setValue(getPreferenceName(), gridWidth.doubleValue());				
-			} catch (ParseException e) {
-				showErrorMessage();
-			}
-			
-		}		
-	}
-
-	private int oldUnits = -1;
-
-	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;
-	
-	private String RULER_GROUP_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerGroup_label;
-	private String SHOW_RULERS_LABEL = DiagramUIMessages.GridRulerPreferencePage_showRulers_label;
-	private String RULER_UNITS_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_label;
-	private String RULER_UNITS_IN_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_inch_label;
-	private String RULER_UNITS_CM_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_cm_label;
-	private String RULER_UNITS_PIXEL_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_pixel_label;
-
-	private String GRID_GROUP_LABEL = DiagramUIMessages.GridRulerPreferencePage_gridGroup_label;
-	private String SHOW_GRID_LABEL = DiagramUIMessages.GridRulerPreferencePage_showGrid_label;
-	private String SNAP_TO_GRID_LABEL = DiagramUIMessages.GridRulerPreferencePage_snapToGrid_label;
-	private String SNAP_TO_GEOMETRY_LABEL = DiagramUIMessages.GridRulerPreferencePage_snapToGeometry_label;
-	private String GRID_SPACING_LABEL_INCHES = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_inches;
-    private String GRID_SPACING_LABEL_CM = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_cm;
-    private String GRID_SPACING_LABEL_PIXELS = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_pixels;
-    
-	
-	// Ruler Field Editors
-	private BooleanFieldEditor showRulers = null;
-    private ComboFieldEditor rulerUnits;
-
-    // Grid Field Editors
-    private BooleanFieldEditor showGrid = null;
-	private BooleanFieldEditor snapToGrid = null;
-	private BooleanFieldEditor snapToGeometry = null;
-	private DoubleFieldEditor gridSpacing = null;
-    private Composite dblGroup = null;
-
-	private String convertUnits(int fromUnits, int toUnits ) {
-		String valueStr = gridSpacing.getStringValue();
-		if( fromUnits == toUnits ) {
-			return valueStr;
-		}
-		
-		//Double value = Double.valueOf( valueStr );
-		NumberFormat numberFormatter = NumberFormat.getInstance();		
-		Double value = new Double(0.125);
-		try {
-			value = forceDouble(numberFormatter.parse(valueStr));
-		} catch (ParseException e) {
-			// Use the default
-		}
-		double pixelValue = 0;
-		
-		Display display = getControl().getDisplay();
-
-		switch( fromUnits ) {
-			case INCHES:
-				pixelValue = value.doubleValue() * display.getDPI().x;
-				break;
-			case CENTIMETERS:
-				pixelValue = value.doubleValue() * display.getDPI().x / INCH2CM;
-				break;
-			case PIXELS:
-				pixelValue = value.intValue();
-		}
-		
-		double returnValue = 0;
-		
-		switch( toUnits ) {
-			case INCHES:
-				returnValue = pixelValue / display.getDPI().x;
-				break;
-			case CENTIMETERS:
-				returnValue = pixelValue * INCH2CM / display.getDPI().x;
-				break;
-			case PIXELS:
-				returnValue = pixelValue;
-		}
-		
-		return numberFormatter.format(returnValue);		
-	}
-
-	
-	/**
-	 * 
-	 * 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( getUnits() ) {
-			case INCHES:
-				returnValue = number;
-				break;
-			case CENTIMETERS:
-				returnValue = number / INCH2CM;
-				break;
-			case PIXELS:
-				returnValue = number / getControl().getDisplay().getDPI().x;
-		}
-		return returnValue;
-	}
-
-	private void updateUnits() {
-		
-		int units = getUnits();
-
-		switch( units )
-		{
-			case INCHES:
-                gridSpacing.setLabelText(GRID_SPACING_LABEL_INCHES);
-				break;
-				
-			case CENTIMETERS:
-                gridSpacing.setLabelText(GRID_SPACING_LABEL_CM);
-				break;
-
-			case PIXELS:
-                gridSpacing.setLabelText(GRID_SPACING_LABEL_PIXELS);
-				break;
-		}
-
-		gridSpacing.setStringValue( convertUnits( oldUnits, units ) );
-		oldUnits = units;
-        
-        dblGroup.layout();
-		
-	}
-
-	private int getUnits() {
-		int units = rulerUnits.getComboControl().getSelectionIndex();
-		
-		// IF no selection has been made
-		if( units == -1 ) {
-			// Read the preference store
-			units = getPreferenceStore().getInt(IPreferenceConstants.PREF_RULER_UNITS);
-			oldUnits = units;
-		}
-		return units;
-	}
-
-	private void addRulerFields( Composite parent ) {
-
-		// Create a Group to hold the ruler fields
-    	Group group = new Group(parent, SWT.NONE);
-		group.setText(RULER_GROUP_LABEL);
- 
-		GridLayout gridLayout = new GridLayout(2, false);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-        
-        // Add the fields to the group
-		showRulers = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_SHOW_RULERS,
-			SHOW_RULERS_LABEL, group);
-		addField(showRulers);
-
-    	rulerUnits = new ComboFieldEditor(
-    		IPreferenceConstants.PREF_RULER_UNITS,
-        	RULER_UNITS_LABEL,
-			group,
-			ComboFieldEditor.INT_TYPE,
-			false,
-			0,
-			0,
-			true);
-    	addField(rulerUnits);
-    	
-    	Combo rulerUnitsCombo;
-    	rulerUnitsCombo = rulerUnits.getComboControl();
-    	rulerUnitsCombo.add(RULER_UNITS_IN_LABEL);
-    	rulerUnitsCombo.add(RULER_UNITS_CM_LABEL);
-    	rulerUnitsCombo.add(RULER_UNITS_PIXEL_LABEL);
-    	
-    	rulerUnitsCombo.addSelectionListener( new SelectionListener() {
-    		public void widgetDefaultSelected(SelectionEvent e){
-    			//do nothing
-    			}
-    		public void widgetSelected(SelectionEvent e){
-    			updateUnits();
-    		}
-    	});
-    	
-		group.setLayoutData(gridData);
-		group.setLayout(gridLayout);
-	}
-	
-	private void addGridFields( Composite parent ) {
-		
-		// Create a Group to hold the grid fields
-    	Group group = new Group(parent, SWT.NONE);
-		group.setText(GRID_GROUP_LABEL);
-
-		GridLayout gridLayout = new GridLayout(2, false);
-
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-
-		showGrid = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_SHOW_GRID,
-			SHOW_GRID_LABEL, group);
-		addField(showGrid);
-
-		snapToGrid = new BooleanFieldEditor(
-			IPreferenceConstants.PREF_SNAP_TO_GRID,
-			SNAP_TO_GRID_LABEL, group);
-		addField(snapToGrid);
-		
-		snapToGeometry = new BooleanFieldEditor(
-				IPreferenceConstants.PREF_SNAP_TO_GEOMETRY,
-				SNAP_TO_GEOMETRY_LABEL, group);
-			addField(snapToGeometry);			
-		
-		addGridSpacing( group );
-
-		group.setLayoutData(gridData);
-		group.setLayout(gridLayout);
-	}
-
-	private void addGridSpacing( Composite parent ) {
-	
-		dblGroup = new Composite(parent, SWT.NONE);
-		
-		GridLayout gridLayout = new GridLayout(2, false);
-
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-
-		gridSpacing = new DoubleFieldEditor(
-			IPreferenceConstants.PREF_GRID_SPACING,
-			GRID_SPACING_LABEL_INCHES, dblGroup);
-		gridSpacing.setTextLimit(10);
-		addField(gridSpacing);
-		
-		updateUnits();
-		
-        dblGroup.setLayoutData(gridData);
-        dblGroup.setLayout(gridLayout);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#addFields(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void addFields(Composite parent) {
-		addRulerFields( parent );
-		addGridFields( parent );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#initHelp()
-	 */
-	protected void initHelp() {
-		// TODO: Implement to support context help
-	}
-
-	/**
-	 * Initializes the default preference values for the preferences.
-	 * 
-	 * @param IPreferenceStore preferences
-	 */
-	public static void initDefaults(IPreferenceStore preferenceStore) {
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_RULERS, false);
-		String defaultCountry = Locale.getDefault().getCountry();
-		if (defaultCountry == null
-				|| defaultCountry.equals(Locale.US.getCountry())
-				|| defaultCountry.equals(Locale.CANADA.getCountry())) {
-			preferenceStore.setDefault(IPreferenceConstants.PREF_RULER_UNITS,
-					RulerProvider.UNIT_INCHES);
-		} else {
-			preferenceStore.setDefault(IPreferenceConstants.PREF_RULER_UNITS,
-					RulerProvider.UNIT_CENTIMETERS);
-		}
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SHOW_GRID, false);
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SNAP_TO_GRID, true);
-		preferenceStore.setDefault(IPreferenceConstants.PREF_SNAP_TO_GEOMETRY, false);
-		preferenceStore.setDefault(IPreferenceConstants.PREF_GRID_SPACING, 0.125);
-	}
-	
-	/**
-	 * 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/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContextMenuProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContextMenuProvider.java
deleted file mode 100644
index 9aff087..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/providers/DiagramContextMenuProvider.java
+++ /dev/null
@@ -1,141 +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.providers;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * 
- * An implementation of a context menu provider for GMF diagrams
- * It adds contributions to the popup menu both programatically and through
- * the contribution item service
- * 
- * @author melaasar
- * @see ContributionItemService
- */
-public class DiagramContextMenuProvider extends ContextMenuProvider {
-
-	/** the workbench part */
-	private IWorkbenchPart part;
-    
-    private Set exclusionSet = new HashSet();
-    
-    /** the following items will be deleted from the context menus by default */
-    private String[] defaultExclusionList = {
-        "replaceWithMenu", //$NON-NLS-1$
-        "compareWithMenu", //$NON-NLS-1$
-        "ValidationAction", //$NON-NLS-1$
-        "team.main", //$NON-NLS-1$
-        "org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu", //$NON-NLS-1$
-        "org.eclipse.tptp.platform.analysis.core.ui.internal.actions.MultiAnalysisActionDelegate", //$NON-NLS-1$
-        "org.eclipse.debug.ui.contextualLaunch.run.submenu", //$NON-NLS-1$
-        "org.eclipse.debug.ui.contextualLaunch.debug.submenu", //$NON-NLS-1$
-        "org.eclipse.debug.ui.contextualLaunch.profile.submenu" //$NON-NLS-1$
-    };
-
-	/**
-	 * Constructor for DiagramContextMenuProvider.
-	 * @param part
-	 * @param viewer
-	 */
-	public DiagramContextMenuProvider(
-		IWorkbenchPart part,
-		EditPartViewer viewer) {
-		super(viewer);
-		this.part = part;
-        addDefaultExclusions();
-	}
-
-	/**
-	 * Returns the actionRegistry.
-	 * @return ActionRegistry
-	 */
-	public ActionRegistry getActionRegistry() {
-		return (ActionRegistry) part.getAdapter(ActionRegistry.class);
-	}
-
-	/**
-	 * @see org.eclipse.gef.ContextMenuProvider#buildContextMenu(IMenuManager)
-	 */
-	public void buildContextMenu(IMenuManager menu) {
-		getViewer().flush();
-
-		try {
-			TransactionUtil.getEditingDomain((EObject)getViewer().getContents().getModel()).runExclusive( new Runnable() {
-				public void run() {
-					ContributionItemService.getInstance().contributeToPopupMenu(
-						DiagramContextMenuProvider.this,
-						part);
-				}
-			});
-		}catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-					"buildContextMenu()", //$NON-NLS-1$
-					e);
-		}
-	}
-    
-    /**
-     * The exclusion <code>Set</code> allows clients to specify which contributed
-     * menu items they do not want to include in their context menus.
-     * @return <code>Set</code> of IDs
-     */
-    public Set getExclusionSet() {
-        return exclusionSet;
-    }
-    
-    /**
-     * set the exclusion <code>Set</code>. 
-     * @see org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider#getExclusionSet
-     * @param exclusionSet the <code>Set</code> of IDs of menu items that need to be 
-     * excluded from the context menu
-     */
-    public void setExclusionSet(Set exclusionSet) {
-        this.exclusionSet = exclusionSet;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.ContributionManager#allowItem(org.eclipse.jface.action.IContributionItem)
-     */
-    protected boolean allowItem(IContributionItem itemToAdd) {
-        if (itemToAdd.getId() != null && exclusionSet.contains(itemToAdd.getId()))
-            //we don't want to return false, as other menu items may depend on it...
-            itemToAdd.setVisible(false);
-
-        return super.allowItem(itemToAdd);
-    }
-    
-    /**
-     * Transfer the String array <code>defaultExclusionList</code>
-     * into the <code>exclusionSet</code>
-     *
-     */
-    protected void addDefaultExclusions() {
-        for (int i=0; i < defaultExclusionList.length; i++)
-            exclusionSet.add(defaultExclusionList[i]);
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ArrangeRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ArrangeRequest.java
deleted file mode 100644
index 64b88a4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ArrangeRequest.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.diagram.ui.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-
-/**
- * A request to arrange a set of elements.
- * 
- * @author chmahone
- */
-public class ArrangeRequest extends Request {
-
-	/** List of <code>EditPart</code> objects */
-	protected List editParts = null;
-
-	/** List of <code>IView</code> objects */
-	protected List viewAdapters = null;
-	
-	private String layoutType;
-
-	/**
-	 * Constructor for ArrangeRequest.
-	 * @param type the request type
-	 */
-	public ArrangeRequest(String type) {
-		super(type);	
-		this.layoutType = LayoutType.DEFAULT;	
-	}
-	
-	/**
-	 * Constructor for ArrangeRequest.
-	 * @param type
-	 * @param requestLayoutType
-	 */
-	public ArrangeRequest(String type, String requestLayoutType) {
-		super(type);
-		if (requestLayoutType != null){
-			this.layoutType = requestLayoutType;
-		}	
-		else{
-			this.layoutType = LayoutType.DEFAULT;
-		}	
-	}
-
-	/**
-	 * Sets the editparts to arrange.
-	 * @param ep List of <code>EditPart</code> objects
-	 */
-	public void setPartsToArrange(List ep) {
-		editParts = new ArrayList(ep);
-	}
-
-	/**
-	 * Gets the editparts to arrange.
-	 * @return List List of <code>EditPart</code> objects;
-	 * null if this was never set
-	 */
-	public List getPartsToArrange() {
-		return editParts;
-	}
-
-	/**
-	 * Sets the view adapters for the views to arrange.
-	 * @param va List of <code>IView</code> objects
-	 */
-	public void setViewAdaptersToArrange(List va) {
-		viewAdapters = va;
-	}
-
-	/**
-	 * Gets the view adapters for the views to arrange.
-	 * @return List List of <code>IView</code> objects;
-	 * null if this was never set
-	 */
-	public List getViewAdaptersToArrange() {
-		return viewAdapters;
-	}
-	
-	/**
-	 * Gets the LayoutType.
-	 * @return LayoutType
-	 */
-	public String getLayoutType(){
-		return this.layoutType;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeChildPropertyValueRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeChildPropertyValueRequest.java
deleted file mode 100644
index e799e0a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeChildPropertyValueRequest.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 
- ****************************************************************************/
-
-
-/**
- * @author mmostafa
- *
- * This class can be used for any request that simply needs change the value 
- * of notation View's child property.
- * The Notation View type and the property Id will give the receiver of the 
- * request a chance to locate the View's child and get the property to change
- * on it. 
- * The request hold the Property Id to indicate which property to 
- * change and a Notation View type which will be used to find the child that
- * will be changed.
- */
-package org.eclipse.gmf.runtime.diagram.ui.requests;
-
-
-public class ChangeChildPropertyValueRequest
-	extends ChangePropertyValueRequest {
-	
-	// variable to hold the notation View type
-	private String notationViewType;
-	
-	
-	/**
-	 * Constructor for ChangeChildPropertyValueRequest
-	 * @param propertyName The name of the property
-	 * @param propertyID String value representing the property ID to change
-	 * @param the Notation view type
-	 */
-	public ChangeChildPropertyValueRequest(String propertyName, String propertyID, String chldSemanticHint) {
-		super(propertyName, propertyID);
-		setType(RequestConstants.REQ_CHILD_PROPERTY_CHANGE);
-		notationViewType = chldSemanticHint;
-	}
-	
-	/**
-	 * getter for the notation view type
-	 * @return the notation view type associated with this request
-	 */
-	public String getNotationViewType(){
-		return notationViewType;
-	}
-	
-	/**
-	 * Constructor for ChangeChildPropertyValueRequest
-	 * @param propertyName The name of the property
-	 * @param propertyID String value representing the property ID to change
-	 * @param value Object which is to be the new value of the property
-	 * @param the Notation view type 
-	 */
-	public ChangeChildPropertyValueRequest(String propertyName, String propertyID, Object value, String chldSemanticHint) {
-		super(propertyName,propertyID,value);
-		setType(RequestConstants.REQ_CHILD_PROPERTY_CHANGE);
-		notationViewType = chldSemanticHint;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangePropertyValueRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangePropertyValueRequest.java
deleted file mode 100644
index c703d42..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangePropertyValueRequest.java
+++ /dev/null
@@ -1,85 +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.requests;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author chmahone
- *
- * This class can be used for any request that simply needs
- * to save a new value.  For example, the type could be the
- * action id and the value would be some new value that the
- * receiver of this request knows how to handle.
- */
-public class ChangePropertyValueRequest extends Request {
-	private Object value;
-	private String propertyID;
-	final private String propertyName;
-
-	/**
-	 * Constructor for ChangePropertyValueRequest
-	 * @param propertyName The name of the property
-	 * @param propertyID String value representing the property ID to change
-	 */
-	public ChangePropertyValueRequest(String propertyName, String propertyID) {
-		super(RequestConstants.REQ_PROPERTY_CHANGE);
-		this.propertyName = propertyName;
-		this.propertyID = propertyID;
-	}
-	
-	/**
-	 * Constructor for ChangePropertyValueRequest
-	 * @param propertyName The name of the property
-	 * @param propertyID String value representing the property ID to change
-	 * @param value Object which is to be the new value of the property
-	 */
-	public ChangePropertyValueRequest(String propertyName, String propertyID, Object value) {
-		super(RequestConstants.REQ_PROPERTY_CHANGE);
-		this.propertyName = propertyName;
-		this.propertyID = propertyID;
-		this.value = value;
-	}
-	
-	/**
-	 * Gets the property name
-     * @return the property name
-     */
-    public String getPropertyName() {
-		return propertyName;
-	}
-	
-	/**
-	 * Gets the property ID
-     * @return the property ID
-     */
-    public String getPropertyID() {
-		return propertyID;
-	}
-	
-	/**
-	 * Returns the value.
-	 * @return Object the value
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * Sets the value.
-	 * @param value The value to set
-	 */
-	public void setValue(Object value) {
-		this.value = value;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeSortFilterRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeSortFilterRequest.java
deleted file mode 100644
index c926183..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ChangeSortFilterRequest.java
+++ /dev/null
@@ -1,145 +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.requests;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.notation.Filtering;
-import org.eclipse.gmf.runtime.notation.Sorting;
-
-
-/**
- * Request to set the sort/filter view properties.
- * 
- * @author jcorchis
- */
-public class ChangeSortFilterRequest
-	extends Request {
-	
-	// Sort items
-	private Filtering filtering;
-	private List filteredObjects;
-	private List filterKeys;
-	
-	// Filter items
-	private Sorting sorting;
-	private List sortedObjects;
-	private Map sortKeys;
-	
-	/**
-	 * 
-	 */
-	public ChangeSortFilterRequest() {
-		super(RequestConstants.REQ_CHANGE_SORT_FILTER);
-		
-	}
-	
-	/**
-	 * 
-	 * @param filtering
-	 * @param filteredObjects
-	 * @param filterKeys
-	 * @param sorting
-	 * @param sortedObjects
-	 * @param sortKeys
-	 */
-	public ChangeSortFilterRequest(Filtering filtering, List filteredObjects, List filterKeys,
-			Sorting sorting, List sortedObjects, Map sortKeys) {
-		
-		super(RequestConstants.REQ_CHANGE_SORT_FILTER);
-		
-		this.filtering = filtering;
-		this.filteredObjects = filteredObjects;
-		this.filterKeys = filterKeys;
-		
-		this.sorting = sorting;
-		this.sortedObjects = sortedObjects;
-		this.sortKeys = sortKeys;
-		
-	}
-
-	/**
-	 * @return Returns the filteredObjects.
-	 */
-	public List getFilteredObjects() {
-		return filteredObjects;
-	}
-	/**
-	 * @param filteredObjects The filteredObjects to set.
-	 */
-	public void setFilteredObjects(List filteredObjects) {
-		this.filteredObjects = filteredObjects;
-	}
-	/**
-	 * @return Returns the filtering.
-	 */
-	public Filtering getFiltering() {
-		return filtering;
-	}
-	/**
-	 * @param filtering The filtering to set.
-	 */
-	public void setFiltering(Filtering filtering) {
-		this.filtering = filtering;
-	}
-	/**
-	 * @return Returns the filterKeys.
-	 */
-	public List getFilterKeys() {
-		return filterKeys;
-	}
-	/**
-	 * @param filterKeys The filterKeys to set.
-	 */
-	public void setFilterKeys(List filterKeys) {
-		this.filterKeys = filterKeys;
-	}
-	/**
-	 * @return Returns the sortedObjects.
-	 */
-	public List getSortedObjects() {
-		return sortedObjects;
-	}
-	/**
-	 * @param sortedObjects The sortedObjects to set.
-	 */
-	public void setSortedObjects(List sortedObjects) {
-		this.sortedObjects = sortedObjects;
-	}
-	/**
-	 * @return Returns the sorting.
-	 */
-	public Sorting getSorting() {
-		return sorting;
-	}
-	/**
-	 * @param sorting The sorting to set.
-	 */
-	public void setSorting(Sorting sorting) {
-		this.sorting = sorting;
-	}
-	/**
-	 * @return Returns the sortKeys.
-	 */
-	public Map getSortKeys() {
-		return sortKeys;
-	}
-	/**
-	 * @param sortKeys The sortKeys to set.
-	 */
-	public void setSortKeys(Map sortKeys) {
-		this.sortKeys = sortKeys;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java
deleted file mode 100644
index dba655e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.requests;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.SuppressibleUIRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-
-/**
- * @author melaasar
- * 
- * A request to create a relationship element and its connection view
- */
-public class CreateConnectionViewAndElementRequest
-	extends CreateConnectionViewRequest
-	implements SuppressibleUIRequest {
-
-	private boolean suppressUI = false;
-
-	/**
-	 * @return true if the command will suppress all ui prompting and just use
-	 *         default data
-	 */
-	public boolean isUISupressed() {
-
-		return suppressUI;
-	}
-
-	/**
-	 * @param suppressUI
-	 *            true if you do not wish the command to prompt with UI but
-	 *            instead take the default value that it would have prompt for.
-	 */
-	public void setSuppressibleUI(boolean suppressUI) {
-		this.suppressUI = suppressUI;
-
-	}
-
-	/**
-	 * An extended view descriptor that takes an <code>ElementDescriptor</code>
-	 * instead of <code>IAdaptable</code> as the element adapter
-	 */
-	public static class ConnectionViewAndElementDescriptor
-		extends ConnectionViewDescriptor {
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param requestAdapter
-		 * @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 ConnectionViewAndElementDescriptor(
-				CreateElementRequestAdapter requestAdapter,
-				PreferencesHint preferencesHint) {
-			super(requestAdapter, preferencesHint);
-		}
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param requestAdapter
-		 * @param semanticHint
-		 * @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 ConnectionViewAndElementDescriptor(
-				CreateElementRequestAdapter requestAdapter,
-				String semanticHint, PreferencesHint preferencesHint) {
-			super(requestAdapter, semanticHint, preferencesHint);
-		}
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param requestAdapter
-		 * @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 ConnectionViewAndElementDescriptor(
-				CreateElementRequestAdapter requestAdapter,
-				String semanticHint, int index, PreferencesHint preferencesHint) {
-			super(requestAdapter, semanticHint, index, preferencesHint);
-		}
-
-		/**
-		 * Method getElementDescriptor.
-		 * 
-		 * @return ElementDescriptor
-		 */
-		public CreateElementRequestAdapter getCreateElementRequestAdapter() {
-			return (CreateElementRequestAdapter) getElementAdapter();
-		}
-
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param connectionViewAndElementDescriptor
-	 */
-	public CreateConnectionViewAndElementRequest(
-			ConnectionViewAndElementDescriptor connectionViewAndElementDescriptor) {
-		super(connectionViewAndElementDescriptor);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param type
-	 * @param semanticHint
-	 * @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 CreateConnectionViewAndElementRequest(IElementType type,
-			String semanticHint, PreferencesHint preferencesHint) {
-		super(
-			new ConnectionViewAndElementDescriptor(
-				new CreateElementRequestAdapter(new CreateRelationshipRequest(
-					type)), semanticHint, preferencesHint));
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param 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>.
-	 */
-	public CreateConnectionViewAndElementRequest(IElementType type,
-			PreferencesHint preferencesHint) {
-		super(
-			new ConnectionViewAndElementDescriptor(
-				new CreateElementRequestAdapter(new CreateRelationshipRequest(
-					type)), preferencesHint));
-	}
-
-	/**
-	 * Gets the descriptor for the connection view and element that is to be
-	 * created.
-	 * 
-	 * @return the descriptor
-	 */
-	public ConnectionViewAndElementDescriptor getConnectionViewAndElementDescriptor() {
-		return (ConnectionViewAndElementDescriptor) getConnectionViewDescriptor();
-	}
-
-	/**
-	 * Method getCreateCommand. TODO: remove after msl migration
-	 * 
-	 * @param request
-	 * @param sourceEditPart
-	 * @param targetEditPart
-	 * @return Command
-	 */
-	public static Command getCreateCommand(
-			CreateConnectionViewAndElementRequest request,
-			EditPart sourceEditPart, EditPart targetEditPart) {
-
-		Assert.isNotNull(request);
-		Assert.isNotNull(sourceEditPart);
-		Assert.isNotNull(targetEditPart);
-
-		request.setSourceEditPart(sourceEditPart);
-		request.setTargetEditPart(targetEditPart);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		sourceEditPart.getCommand(request);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		Command command = targetEditPart.getCommand(request);
-
-		return command;
-	}
-
-	/**
-	 * Method getCreateCommand.
-	 * 
-	 * @param elementType
-	 * @param sourceEditPart
-	 * @param targetEditPart
-	 * @return Command
-	 */
-	public static Command getCreateCommand(IElementType elementType,
-			EditPart sourceEditPart, EditPart targetEditPart,
-			PreferencesHint preferencesHint) {
-		return getCreateCommand(new CreateConnectionViewAndElementRequest(
-			elementType, preferencesHint), sourceEditPart, targetEditPart);
-	}
-
-	/**
-	 * Propagates setting the parameters to the <code>CreateElementRequest</code> in my 
-	 * {@link #getViewAndElementDescriptor()}.
-	 */
-	public void setExtendedData(Map map) {
-		
-		super.setExtendedData(map);
-		
-		ConnectionViewAndElementDescriptor descriptor = getConnectionViewAndElementDescriptor();
-		
-		if (descriptor != null) {
-			CreateElementRequestAdapter adapter = descriptor
-					.getCreateElementRequestAdapter();
-			
-			if (adapter != null) {
-				CreateElementRequest request = (CreateElementRequest) adapter
-						.getAdapter(CreateElementRequest.class);
-		
-				if (request != null) {
-					request.getParameters().clear();
-					request.addParameters(map);
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewRequest.java
deleted file mode 100644
index 0b858f2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewRequest.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.requests;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetConnectionEndsCommand;
-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.commands.CreateCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * 
- * 
- * A request to create new <code>IView</code> (s)
- * 
- * To instantiate this request, clients have to create a
- * <code>ConnectionViewDescriptor</code> or a list of
- * <code>ConnectionViewDescriptor</code> s filling it with view creation
- * parameters. The <code>ConnectionViewDescriptor</code> is a inner class to
- * this request
- * 
- * The request object can be used to obtain a view creation command from a
- * target <code>EditPart</code> Once such command is executed, the request
- * cannot be reused again to create another view. A different instance of the
- * reqyest has to be used instead
- * 
- * @author melaasar
- * 
- */
-public class CreateConnectionViewRequest
-	extends CreateConnectionRequest {
-
-	/**
-	 * A specialized view descriptor for connection views
-	 */
-	public static class ConnectionViewDescriptor
-		extends ViewDescriptor {
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param elementAdapter
-		 * @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 ConnectionViewDescriptor(IAdaptable elementAdapter,
-				PreferencesHint preferencesHint) {
-			super(elementAdapter, Edge.class, preferencesHint);
-		}
-        
-        /**
-         * Constructor.
-         * 
-         * @param elementAdapter
-         * @param persisted
-         *            indicates if ths connector will be created as a persisted
-         *            connector or transient connector
-         * @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 ConnectionViewDescriptor(IAdaptable elementAdapter,
-                boolean persisted, PreferencesHint preferencesHint) {
-            super(elementAdapter, Edge.class,persisted, preferencesHint);
-        }
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param elementAdapter
-		 * @param semanticHint
-		 * @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 ConnectionViewDescriptor(IAdaptable elementAdapter,
-				String semanticHint, PreferencesHint preferencesHint) {
-			super(elementAdapter, Edge.class, semanticHint, preferencesHint);
-		}
-        
-        /**
-         * Constructor.
-         * 
-         * @param elementAdapter
-         * @param semanticHint
-         * @param persisted
-         *            Indicates if the connector will be created as a transient
-         *            or persisted connector 
-         * @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 ConnectionViewDescriptor(IAdaptable elementAdapter,
-                String semanticHint,boolean persisted, PreferencesHint preferencesHint) {
-            super(elementAdapter, Edge.class, semanticHint,persisted, preferencesHint);
-        }
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param elementAdapter
-		 * @param semanticHint
-		 * @param index
-		 */
-		public ConnectionViewDescriptor(IAdaptable elementAdapter,
-				String semanticHint, int index, PreferencesHint preferencesHint) {
-			super(elementAdapter, Edge.class, semanticHint, index,
-				preferencesHint);
-		}
-
-		/**
-		 * Constructor.
-		 * 
-		 * @param elementAdapter
-		 * @param semanticHint
-		 * @param index
-		 * @param persisted
-		 *            flag to indicate if this view will be persisted or not
-		 */
-		public ConnectionViewDescriptor(IAdaptable elementAdapter,
-				String semanticHint, int index, boolean persisted,
-				PreferencesHint preferencesHint) {
-			super(elementAdapter, Edge.class, semanticHint, index, persisted,
-				preferencesHint);
-		}
-	}
-
-	/**
-	 * The connection view descriptor set by the user
-	 */
-	private ConnectionViewDescriptor connectionViewDescriptor;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param element
-	 *            a semantic element
-	 */
-	public CreateConnectionViewRequest(EObject element,
-			PreferencesHint preferencesHint) {
-		this(new ConnectionViewDescriptor(new EObjectAdapter(element),
-			preferencesHint));
-	}
-    
-    /**
-     * Constructor.
-     * 
-     * @param element
-     *            a semantic element
-     * @param boolean
-     *            indicate if the connection will be persisted or not
-     */
-    public CreateConnectionViewRequest(EObject element,
-            boolean persisted, PreferencesHint preferencesHint) {
-        this(new ConnectionViewDescriptor(new EObjectAdapter(element),
-            persisted,preferencesHint));
-    }
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param ViewDescriptor
-	 *            a view descriptor
-	 */
-	public CreateConnectionViewRequest(ConnectionViewDescriptor ViewDescriptor) {
-		Assert.isNotNull(ViewDescriptor);
-		this.connectionViewDescriptor = ViewDescriptor;
-	}
-
-	/**
-	 * Gets the descriptor for the connection view to be created.
-	 * 
-	 * @return the descriptor
-	 */
-	public ConnectionViewDescriptor getConnectionViewDescriptor() {
-		return connectionViewDescriptor;
-	}
-
-	/**
-	 * An <code>IAdaptable</code> object that adapts to <code>IView</code>
-	 * .class
-	 * 
-	 * @see org.eclipse.gef.requests.CreateRequest#getNewObject()
-	 */
-	public Object getNewObject() {
-		return getConnectionViewDescriptor();
-	}
-
-	/**
-	 * The type is a <code>IAdaptable</code> object that adapters to
-	 * <code>IView</code> .class
-	 * 
-	 * @see org.eclipse.gef.requests.CreateRequest#getNewObjectType()
-	 */
-	public Object getNewObjectType() {
-		return IAdaptable.class;
-	}
-
-	/**
-	 * The factory mechanism is not used
-	 * 
-	 * @throws UnsupportedOperationException
-	 */
-	protected CreationFactory getFactory() {
-		throw new UnsupportedOperationException(
-			"The Factory mechanism is not used"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The factory mechanism is not used
-	 */
-
-	public void setFactory(CreationFactory factory) {
-		throw new UnsupportedOperationException(
-			"The Factory mechanism is not used"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Method getCreateCommand.
-	 * 
-	 * @param element
-	 * @param sourceEditPart
-	 * @param targetEditPart
-	 * @return Command
-	 */
-	public static Command getCreateCommand(EObject element,
-			EditPart sourceEditPart, EditPart targetEditPart,
-			PreferencesHint preferencesHint) {
-
-		Assert.isNotNull(element);
-		Assert.isNotNull(sourceEditPart);
-		Assert.isNotNull(targetEditPart);
-        boolean transientTargetOrSource = hasTransientSourceOrTarget(sourceEditPart, targetEditPart);
-
-		CreateConnectionViewRequest request = new CreateConnectionViewRequest(
-			element,!transientTargetOrSource, preferencesHint);
-
-		request.setSourceEditPart(sourceEditPart);
-		request.setTargetEditPart(targetEditPart);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		sourceEditPart.getCommand(request);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		return targetEditPart.getCommand(request);
-	}
-
-    private static boolean hasTransientSourceOrTarget(EditPart sourceEditPart, EditPart targetEditPart) {
-        boolean transientTargetOrSource = hasTransientView(sourceEditPart);
-        if (!transientTargetOrSource){
-            transientTargetOrSource = hasTransientView(targetEditPart);
-        }
-        return transientTargetOrSource;
-    }
-    
-    private static boolean hasTransientSourceOrTarget(IAdaptable sourceView,IAdaptable targetView) {
-        boolean transientTargetOrSource = hasTransientView(sourceView);
-        if (!transientTargetOrSource){
-            transientTargetOrSource = hasTransientView(targetView);
-        }
-        return transientTargetOrSource;
-    }
-
-    private static boolean hasTransientView(EditPart sourceEditPart) {
-        boolean transientTargetOrSource = false;
-        if (sourceEditPart.getModel() instanceof View){
-            View srcView = (View)sourceEditPart.getModel();
-            if (ViewUtil.isTransient(srcView)){
-                transientTargetOrSource = true;
-            }
-        }
-        return transientTargetOrSource;
-    }
-    
-    private static boolean hasTransientView(IAdaptable adaptable) {
-        View view = (View)adaptable.getAdapter(View.class);
-        if (view !=null){
-            if (ViewUtil.isTransient(view)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-	/**
-	 * Method getCreateCommand Gets the command given a request, source and
-	 * target edit parts. (No semantic element required.)
-	 * 
-	 * @param request
-	 * @param sourceEditPart
-	 * @param targetEditPart
-	 * @return <code>Command</code>
-	 */
-	public static Command getCreateCommand(CreateConnectionViewRequest request,
-			EditPart sourceEditPart, EditPart targetEditPart) {
-
-		Assert.isNotNull(request);
-		Assert.isNotNull(sourceEditPart);
-		Assert.isNotNull(targetEditPart);
-
-		request.setSourceEditPart(sourceEditPart);
-		request.setTargetEditPart(targetEditPart);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		sourceEditPart.getCommand(request);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		return targetEditPart.getCommand(request);
-	}
-
-	/**
-	 * getCreateCommand.
-	 * 
-	 * @param elementAdapter
-	 * @param sourceViewAdapter
-	 * @param targetViewAdapter
-	 * @param diagramEditPart
-	 * @return Command
-	 */
-	public static Command getCreateCommand(IAdaptable elementAdapter,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			DiagramEditPart diagramEditPart, PreferencesHint preferencesHint) {
-
-        Diagram diagram = diagramEditPart.getDiagramView().getDiagram();
-        boolean transientTargetOrSource = hasTransientSourceOrTarget(sourceViewAdapter, targetViewAdapter);
-		CreateCommand createCommand = new CreateCommand(diagramEditPart.getEditingDomain(),
-			new ConnectionViewDescriptor(elementAdapter,!transientTargetOrSource, preferencesHint),
-            diagram);
-
-		IAdaptable viewAdapter = (IAdaptable) createCommand.getCommandResult()
-			.getReturnValue();
-        
-        TransactionalEditingDomain editingDomain = diagramEditPart.getEditingDomain();
-
-		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, 
-			DiagramUIMessages.Commands_SetConnectionEndsCommand_Source);
-		sceCommand.setEdgeAdaptor(viewAdapter);
-		sceCommand.setNewSourceAdaptor(sourceViewAdapter);
-		sceCommand.setNewTargetAdaptor(targetViewAdapter);
-
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(diagramEditPart.getEditingDomain(), null);
-		cc.compose(createCommand);
-		cc.compose(sceCommand);
-		return new ICommandProxy(cc);
-	}
-
-	/**
-	 * Method getCreateCommand.
-	 * 
-	 * @param viewDescriptor
-	 * @param sourceViewAdapter
-	 * @param targetViewAdapter
-	 * @param diagramEditPart
-	 * @return Command
-	 */
-	public static Command getCreateCommand(ViewDescriptor viewDescriptor,
-			IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter,
-			DiagramEditPart diagramEditPart) {
-
-        Diagram diagram = diagramEditPart.getDiagramView().getDiagram();
-		CreateCommand createCommand = new CreateCommand(diagramEditPart.getEditingDomain(), viewDescriptor,
-            diagram);
-		IAdaptable viewAdapter = (IAdaptable) createCommand.getCommandResult()
-			.getReturnValue();
-        TransactionalEditingDomain editingDomain = diagramEditPart.getEditingDomain();
-		SetConnectionEndsCommand sceCommand = new SetConnectionEndsCommand(editingDomain, 
-			DiagramUIMessages.Commands_SetConnectionEndsCommand_Source);
-		sceCommand.setEdgeAdaptor(viewAdapter);
-		sceCommand.setNewSourceAdaptor(sourceViewAdapter);
-		sceCommand.setNewTargetAdaptor(targetViewAdapter);
-		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(diagramEditPart.getEditingDomain(), null);
-		cc.compose(createCommand);
-		cc.compose(sceCommand);
-		return new ICommandProxy(cc);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedAdapter.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedAdapter.java
deleted file mode 100644
index 1760756..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010, BonitaSoft S.A.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Mickael Istria, BonitaSoft S.A. - Initial implementation (bug 288695) 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This class implements an IAdaptable to be used with {@link CreateUnspecifiedTypeRequest}.
- * It delegates the {@link IAdaptable#getAdapter(Class)} to the {@link CreateRequest} that
- * realizes this creation.
- * 
- * @author Mickael Istria, BonitaSoft S.A.
- * @since 1.5
- */
-public class CreateUnspecifiedAdapter implements IAdaptable {
-
-	private List<CreateRequest> requests;
-
-	public CreateUnspecifiedAdapter() {
-		this.requests = new ArrayList<CreateRequest>();
-	}
-	
-	/**
-	 * Adapt delegating to the {@link CreateRequest} that was actually executed.
-	 */
-	public Object getAdapter(Class adapter) {
-		for (CreateRequest request : requests) {
-			Object newObject = request.getNewObject(); 
-			if (newObject != null &&
-				newObject instanceof List<?> &&
-				! ((List<?>)newObject).isEmpty()) {
-				IAdaptable adaptable = (IAdaptable) ((List<?>)newObject).get(0);
-				View view = (View) adaptable.getAdapter(View.class);
-				if (view != null && view.getElement() != null) {
-					return adaptable.getAdapter(adapter);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param request A new request to add to the list of potentially executed
-	 * requests
-	 */
-	public void add(CreateRequest request) {
-		this.requests.add(request);
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeConnectionRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeConnectionRequest.java
deleted file mode 100644
index 5d4467a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeConnectionRequest.java
+++ /dev/null
@@ -1,254 +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.requests;
-
-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.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreateRequest;
-
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-
-/**
- * This request encapsulates a list of
- * <code>CreateConnectionViewAndElementRequest</code> for each relationship
- * type that this tool supports. Each method in
- * <code>CreateConnectionRequest</code> that is called to configure the
- * request in <code>ConnectionCreationTool</code> is propagated to each
- * individual request.
- * 
- * @author cmahoney
- */
-public class CreateUnspecifiedTypeConnectionRequest
-	extends CreateConnectionRequest {
-
-	/**
-	 * List of relationship types of which one will be created (of type
-	 * <code>IElementType</code>).
-	 */
-	private List relationshipTypes;
-
-	/**
-	 * A map containing the <code>CreateConnectionRequest</code> for each
-	 * element type.
-	 */
-	private Map requests = new HashMap();
-
-	/**
-	 * A flag to indicate if the Modeling Assistant Service should be used to
-	 * find the types when the other end of the connection is known.
-	 */
-	private boolean useModelingAssistantService;
-
-	/**
-	 * A flag to indicate if this request is to create a connection from target
-	 * to source.
-	 */
-	private boolean directionReversed = false;
-	
-	/**
-	 * 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;
-
-	/**
-	 * Creates a new <code>CreateUnspecifiedTypeConnectionRequest</code>.
-	 * 
-	 * @param relationshipTypes
-	 *            List of relationship types of which one will be created (of
-	 *            type <code>IElementType</code>).
-	 * @param useModelingAssistantService
-	 *            True if the Modeling Assistant Service should be used to find
-	 *            the types when the other end of the connection is known.
-	 * @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 CreateUnspecifiedTypeConnectionRequest(List relationshipTypes,
-			boolean useModelingAssistantService, PreferencesHint preferencesHint) {
-		super();
-		this.useModelingAssistantService = useModelingAssistantService;
-		this.relationshipTypes = relationshipTypes;
-		this.preferencesHint = preferencesHint;
-		createRequests();
-	}
-
-	/**
-	 * Creates a <code>CreateConnectionRequest</code> for each relationship
-	 * type and adds it to the map of requests.
-	 */
-	private void createRequests() {
-		for (Iterator iter = relationshipTypes.iterator(); iter.hasNext();) {
-			IElementType elementType = (IElementType) iter.next();
-
-			Request request = CreateViewRequestFactory
-				.getCreateConnectionRequest(elementType, getPreferencesHint());
-			request.setType(getType());
-			requests.put(elementType, request);
-		}
-	}
-
-	/**
-	 * Returns the <code>CreateRequest</code> for the relationship type passed in.
-	 * 
-	 * @param relationshipType
-	 * @return the <code>CreateRequest</code>
-	 */
-	public CreateRequest getRequestForType(IElementType relationshipType) {
-		if (requests != null) {
-			return (CreateConnectionRequest) requests.get(relationshipType);
-		}
-		return null;
-	}
-
-    
-    public void addRequest(IElementType relationshipType, Request request) {
-        if (requests != null) {
-            requests.put(relationshipType, request);
-        }        
-    }
-    
-	/**
-	 * Returns a list of all the requests.
-	 * 
-	 * @return the requests
-	 */
-	public List getAllRequests() {
-		if (requests != null) {
-			return new ArrayList(requests.values());
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Returns the list of element types.
-	 * 
-	 * @return Returns the list of element types.
-	 */
-	public List getElementTypes() {
-		return relationshipTypes;
-	}
-
-	/**
-	 * @see org.eclipse.gef.requests.CreateConnectionRequest#setSourceEditPart(org.eclipse.gef.EditPart)
-	 */
-	public void setSourceEditPart(EditPart part) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateConnectionRequest request = (CreateConnectionRequest) iter
-					.next();
-				request.setSourceEditPart(part);
-			}
-		}
-		super.setSourceEditPart(part);
-	}
-
-	/**
-	 * @see org.eclipse.gef.requests.TargetRequest#setTargetEditPart(org.eclipse.gef.EditPart)
-	 */
-	public void setTargetEditPart(EditPart part) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateConnectionRequest request = (CreateConnectionRequest) iter
-					.next();
-				request.setTargetEditPart(part);
-			}
-		}
-		super.setTargetEditPart(part);
-	}
-
-	/**
-	 * @see org.eclipse.gef.requests.CreateRequest#setLocation(org.eclipse.draw2d.geometry.Point)
-	 */
-	public void setLocation(Point location) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateConnectionRequest request = (CreateConnectionRequest) iter
-					.next();
-				request.setLocation(location);
-			}
-		}
-		super.setLocation(location);
-	}
-
-	/**
-	 * @see org.eclipse.gef.Request#setType(java.lang.Object)
-	 */
-	public void setType(Object type) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateConnectionRequest request = (CreateConnectionRequest) iter
-					.next();
-				request.setType(type);
-			}
-		}
-		super.setType(type);
-	}
-
-	/**
-	 * Returns true if this request is to create a connection from target to
-	 * source.
-	 * 
-	 * @return Returns the directionReversed.
-	 */
-	public boolean isDirectionReversed() {
-		return directionReversed;
-	}
-
-	/**
-	 * Sets the directionReversed flag.
-	 * 
-	 * @param directionReversed
-	 *            The directionReversed to set.
-	 */
-	public void setDirectionReversed(boolean directionReversed) {
-		this.directionReversed = directionReversed;
-	}
-
-	/**
-	 * Should the Modeling Assistant Service be used?
-	 * 
-	 * @return Returns true if the Modeling Assistant Service should be used to
-	 *         find the types when the other end of the connection is known.
-	 */
-	public boolean useModelingAssistantService() {
-		return useModelingAssistantService;
-	}
-	
-	/**
-	 * 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.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeRequest.java
deleted file mode 100644
index 730fbb5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateUnspecifiedTypeRequest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-
-/**
- * This request encapsulates a list of <code>CreateViewRequest</code> or
- * <code>CreateViewAndElementRequest</code> for each type that this tool
- * supports. Each method in <code>CreateRequest</code> that is called to
- * configure the request in <code>CreationTool</code> is propagated to each
- * individual request.
- * 
- * @author cmahoney
- * @author Mickael Istria, BonitaSoft - bug 288695
- */
-public class CreateUnspecifiedTypeRequest
-	extends CreateRequest {
-
-	/**
-	 * List of element types of which one will be created (of type
-	 * <code>IElementType</code>).
-	 */
-	protected List elementTypes;
-
-	/**
-	 * A map containing the <code>CreateRequest</code> for each element type.
-	 */
-	protected Map requests = new HashMap();
-
-	/** The result to be returned from which the new views can be retrieved. */
-	private List newObjectList = new ArrayList();
-
-	/**
-	 * 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;
-	
-	/**
-	 * Creates a new <code>CreateUnspecifiedTypeRequest</code>.
-	 * 
-	 * @param elementTypes
-	 *            List of element types of which one will be created (of type
-	 *            <code>IElementType</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>.
-	 */
-	public CreateUnspecifiedTypeRequest(List elementTypes, PreferencesHint preferencesHint) {
-		super();
-		this.elementTypes = elementTypes;
-		this.preferencesHint = preferencesHint;
-		createRequests();
-	}
-
-	/**
-	 * Creates a <code>CreateViewRequest</code> or
-	 * <code>CreateViewAndElementRequest</code> for each creation hint and
-	 * adds it to the map of requests.
-	 */
-	protected void createRequests() {
-		for (Iterator iter = elementTypes.iterator(); iter.hasNext();) {
-			IElementType elementType = (IElementType) iter.next();
-
-			Request request = null;
-			if (elementType instanceof INotationType) {
-				ViewDescriptor viewDescriptor = new ViewDescriptor(null,
-					Node.class, ((INotationType) elementType)
-						.getSemanticHint(), getPreferencesHint());
-				request = new CreateViewRequest(viewDescriptor);
-			} else if (elementType instanceof IHintedType) {
-				ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(
-					new CreateElementRequestAdapter(new CreateElementRequest(
-						elementType)), Node.class,
-					((IHintedType) elementType).getSemanticHint(), getPreferencesHint());
-				request = new CreateViewAndElementRequest(viewDescriptor);
-				request.setExtendedData(getExtendedData());
-			} else {
-				ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(
-					new CreateElementRequestAdapter(new CreateElementRequest(
-						elementType)), Node.class, getPreferencesHint());
-				request = new CreateViewAndElementRequest(viewDescriptor);
-				request.setExtendedData(getExtendedData());
-			}
-
-			request.setType(getType());
-			requests.put(elementType, request);
-		}
-	}
-
-	/**
-	 * Returns the <code>CreateRequest</code> for the element type passed in.
-	 * 
-	 * @param creationHint
-	 * @return the <code>CreateRequest</code>
-	 */
-	public CreateRequest getRequestForType(IElementType creationHint) {
-		if (requests != null) {
-			return (CreateRequest) requests.get(creationHint);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the list of element types.
-	 * 
-	 * @return Returns the list of element types.
-	 */
-	public List getElementTypes() {
-		return elementTypes;
-	}
-	
-	/**
-	 * 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;
-	}
-
-	public void setLocation(Point location) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateRequest request = (CreateRequest) iter.next();
-				request.setLocation(location);
-			}
-		}
-		super.setLocation(location);
-	}
-
-	public void setType(Object type) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateRequest request = (CreateRequest) iter.next();
-				request.setType(type);
-			}
-		}
-		super.setType(type);
-	}
-
-	public void setSize(Dimension size) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateRequest request = (CreateRequest) iter.next();
-				request.setSize(size);
-			}
-		}
-		super.setSize(size);
-	}
-
-	public void setFactory(CreationFactory factory) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateRequest request = (CreateRequest) iter.next();
-				request.setFactory(factory);
-			}
-		}
-		super.setFactory(factory);
-	}
-
-	public void setExtendedData(Map map) {
-		if (requests != null) {
-			for (Iterator iter = requests.values().iterator(); iter.hasNext();) {
-				CreateRequest request = (CreateRequest) iter.next();
-				request.setExtendedData(map);
-			}
-		}
-		super.setExtendedData(map);
-	}
-
-	/**
-	 * Sets the new object to be returned. Must be of the type expected in
-	 * getNewObjectType().
-	 * @param theNewObjects
-	 */
-	public void setNewObject(Collection theNewObjects) {
-		newObjectList.addAll(theNewObjects);
-	}
-
-	/**
-	 * See bug 288695
-	 * 
-	 * if there is only one {@link CreateRequest}, returns this {@link CreateRequest#getNewObject()},
-	 * else, returns a list containing a single {@link IAdaptable} that delegates to the
-	 * {@link CreateRequest#getNewObject()} after the command is executed.
-	 * It is safe to use the return {@link IAdaptable} in a {@link DeferredCreateConnectionViewCommand}.
-	 */
-	public Object getNewObject() {
-		if (newObjectList.isEmpty()) {
-			if (requests.size() == 1) {
-	            Object createRequest = requests.values().toArray()[0];
-	            if (createRequest instanceof CreateRequest) {
-	                return ((CreateRequest) createRequest).getNewObject();
-	            }
-	        } else if (requests.size() > 1) {
-	        	/* See bug 288695 */
-	        	CreateUnspecifiedAdapter adapter = new CreateUnspecifiedAdapter();
-	        	for (Object request : requests.values()) {
-	        		if (request instanceof CreateRequest) {
-	        			adapter.add((CreateRequest)request);
-	        		}
-	        	}
-	        	List<IAdaptable> newObjects = new ArrayList<IAdaptable>();
-	        	newObjects.add(adapter);
-	        	return newObjects;
-	        }
-		}
-        return newObjectList;
-    }
-
-	public Object getNewObjectType() {
-		return List.class;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewAndElementRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewAndElementRequest.java
deleted file mode 100644
index 0f92cdf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewAndElementRequest.java
+++ /dev/null
@@ -1,175 +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.requests;
- 
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-/**
- * A request to create an element and its view
- * @author melaasar
- */
-public class CreateViewAndElementRequest extends CreateViewRequest {
-
-	/**
-	 * An extended view descriptor that takes an <code>ElementDescriptor</code> 
-	 * instead of <code>IAdaptable</code> as the element adapter
-	 */
-	public static class ViewAndElementDescriptor extends ViewDescriptor {
-		/**
-		 * Constructor for ViewAndElementDescriptor.
-		 * @param requestAdapter
-		 * @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 ViewAndElementDescriptor(CreateElementRequestAdapter requestAdapter, PreferencesHint preferencesHint) {
-			super(requestAdapter, preferencesHint);
-		}
-
-		/**
-		 * Constructor for ViewAndElementDescriptor.
-		 * @param requestAdapter
-		 * @param viewkind
-		 */
-		public ViewAndElementDescriptor(
-			CreateElementRequestAdapter requestAdapter,
-			Class viewkind,
-			PreferencesHint preferencesHint) {
-			super(requestAdapter, viewkind, preferencesHint);
-		}
-
-		/**
-		 * Constructor for ViewAndElementDescriptor.
-		 * @param requestAdapter
-		 * @param viewkind
-		 * @param semanticHint
-		 */
-		public ViewAndElementDescriptor(
-			CreateElementRequestAdapter requestAdapter,
-			Class viewkind,
-			String semanticHint, 
-			PreferencesHint preferencesHint) {
-			super(requestAdapter, viewkind, semanticHint, preferencesHint);
-		}
-
-		/**
-		 * Constructor for ViewAndElementDescriptor.
-		 * @param requestAdapter
-		 * @param viewKind
-		 * @param semanticHint
-		 * @param index
-		 */
-		public ViewAndElementDescriptor(
-			CreateElementRequestAdapter requestAdapter,
-			Class viewKind,
-			String semanticHint,
-			int index, 
-			PreferencesHint preferencesHint) {
-			super(requestAdapter, viewKind, semanticHint, index, preferencesHint);
-		}
-
-		/**
-		 * Method getElementDescriptor.
-		 * @return ElementDescriptor
-		 */
-		public CreateElementRequestAdapter getCreateElementRequestAdapter() {
-			return (CreateElementRequestAdapter) getElementAdapter();
-		}
-	}
-
-	
-	/**
-	 * Constructor for CreateViewAndElementRequest.
-	 * @param viewAndElementDescriptor
-	 */
-	public CreateViewAndElementRequest(ViewAndElementDescriptor viewAndElementDescriptor) {
-		super(RequestConstants.REQ_CREATE, viewAndElementDescriptor);
-	}
-	
-	/**
-	 * Constructor for CreateViewAndElementRequest.
-	 * @param 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>.
-	 */
-	public CreateViewAndElementRequest(IElementType type, PreferencesHint preferencesHint) {
-		super(
-			new ViewAndElementDescriptor(
-				new CreateElementRequestAdapter(
-					new CreateElementRequest(type)), preferencesHint));
-	}
-	
-	/**
-	 * Constructor for CreateViewAndElementRequest.
-	 * @param type
-	 * @param context
-	 * @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 CreateViewAndElementRequest(IElementType type, EObject context, PreferencesHint preferencesHint) {
-		super(
-			new ViewAndElementDescriptor(
-				new CreateElementRequestAdapter(
-					new CreateElementRequest(TransactionUtil.getEditingDomain(context),
-                context, type)), preferencesHint));
-    }
-
-	/**
-	 * Method getViewAndElementDescriptor.
-	 * @return ViewAndElementDescriptor
-	 */
-	public ViewAndElementDescriptor getViewAndElementDescriptor() {
-		return (ViewAndElementDescriptor) getViewDescriptors().get(0);
-	}
-
-	
-	/**
-	 * Propagates setting the parameters to the <code>CreateElementRequest</code> in my 
-	 * {@link #getViewAndElementDescriptor()}.
-	 */
-	public void setExtendedData(Map map) {
-		
-		super.setExtendedData(map);
-		
-		ViewAndElementDescriptor descriptor = getViewAndElementDescriptor();
-		
-		if (descriptor != null) {
-			CreateElementRequestAdapter adapter = descriptor
-					.getCreateElementRequestAdapter();
-			
-			if (adapter != null) {
-				CreateElementRequest request = (CreateElementRequest) adapter
-						.getAdapter(CreateElementRequest.class);
-		
-				if (request != null) {
-					request.getParameters().clear();
-					request.addParameters(map);
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequest.java
deleted file mode 100644
index 8d026a5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequest.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * 
- * A request to create new <code>IView</code> (s)
- * 
- * To instantiate this request, clients have to create a <code>ViewDescriptor</code>
- * or a list of <code>ViewDescriptor</code> s filling it with view creation
- * parameters. The <code>ViewDescriptor</code> is a inner class to this
- * request
- * 
- * The request object can be used to obtain a view creation command from a
- * target <code>EditPart</code> Once such command is executed, the request
- * cannot be reused again to create another view. A different instance of the
- * reqyest has to be used instead
- *  
- * @author melaasar
- * 
- */
-public class CreateViewRequest extends CreateRequest {
-
-	/**
-	 * A view descriptor that contains attributes needed to create the view The
-	 * class is also a mutable adapter that initially adapts to nothing, but
-	 * can adapt to <code> IView </code> after the view has been created (by
-	 * executing the creation command returned from edit policies in response
-	 * to this request) This is how GEF works!!
-	 */
-	public static class ViewDescriptor implements IAdaptable {
-		/** the element adapter */
-		private final IAdaptable elementAdapter;
-
-		/** the view kind */
-		private final Class viewKind;
-
-		/** the semantic hint */
-		private final String semanticHint;
-
-		/** the index */
-		private final int index;
-
-		/** The underlying view element */
-		private View view;
-
-		/** persisted view flag. */
-		private boolean _persisted;
-		
-		/**
-		 * 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;
-		
-		/**
-		 * Creates a new view descriptor using element adapter
-		 * 
-		 * @param elementAdapter the element adapter referened by the view
-		 * @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 ViewDescriptor(IAdaptable elementAdapter, PreferencesHint preferencesHint) {
-			this(elementAdapter, Node.class, preferencesHint);
-		}
-
-		/**
-		 * Creates a new view descriptor using element adapter and a view kind
-		 * 
-		 * @param elementAdapter the element adapter referened by the view
-		 * @param viewkind the kind of the view to be created (a concrete class
-		 *            derived from IView)
-		 * @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 ViewDescriptor(IAdaptable elementAdapter, Class viewkind, PreferencesHint preferencesHint) {
-			this(elementAdapter, viewkind, "", preferencesHint); //$NON-NLS-1$
-		}
-        
-        /**
-         * Creates a new view descriptor using element adapter and a view kind
-         * 
-         * @param elementAdapter the element adapter referened by the view
-         * @param viewkind the kind of the view to be created (a concrete class
-         *            derived from IView)
-         * @param persisted
-         *            indicates if the view will be created as a persisted
-         *            view or transient 
-         * @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 ViewDescriptor(IAdaptable elementAdapter, Class viewkind,boolean persisted, PreferencesHint preferencesHint) {
-            this(elementAdapter, viewkind, "",persisted, preferencesHint); //$NON-NLS-1$
-        }
-
-		/**
-		 * Creates a new view descriptor using element adapter, a view kind and
-		 * a factory hint
-		 * 
-		 * @param elementAdapter the element adapter referened by the view
-		 * @param viewkind the kind of the view to be created 
-		 * @param semanticHint the semantic hint of the view
-         * @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 ViewDescriptor(
-			IAdaptable elementAdapter,
-			Class viewkind,
-			String semanticHint,
-			PreferencesHint preferencesHint) {
-			this(elementAdapter, viewkind, semanticHint, ViewUtil.APPEND, preferencesHint);
-		}
-        
-        /**
-         * Creates a new view descriptor using element adapter, a view kind and
-         * a factory hint
-         * 
-         * @param elementAdapter the element adapter referened by the view
-         * @param viewkind the kind of the view to be created 
-         * @param semanticHint the semantic hint of the view
-         * @param persisted
-         *            indicates if the view will be created as a persisted
-         *            view or transient 
-         * @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 ViewDescriptor(
-            IAdaptable elementAdapter,
-            Class viewkind,
-            String semanticHint,
-            boolean persisted,
-            PreferencesHint preferencesHint) {
-            this(elementAdapter, viewkind, semanticHint, ViewUtil.APPEND,persisted, preferencesHint);
-        }
-
-		/**
-		 * Creates a new view descriptor using the supplied element adapter, 
-		 * view kind, factory hint and index.
-		 * <P>
-		 * Same as calling <code>new ViewDescriptor(elementAdapter, viewKind, factoryHint, index, true);</code>
-		 * @param elementAdapter the element adapter referened by the view
-		 * @param viewKind the kind of the view to be created (a concrete class derived from View)
-		 * @param factoryHint the semantic hint of the view
-		 * @param index the index of the view in its parent's children collection
-		 */
-		public ViewDescriptor(
-			IAdaptable elementAdapter,
-			Class viewKind,
-			String factoryHint,
-			int index,
-			PreferencesHint preferencesHint) {
-			this(elementAdapter, viewKind, factoryHint, index, true, preferencesHint);
-		}
-
-		/**
-		 * Creates a new view descriptor using the supplied element adapter, 
-		 * view kind, factory hint, index and persistence flag.
-		 * @param elementAdapter the element adapter referened by the view
-		 * @param viewKind the kind of the view to be created (a concrete class derived from View)
-		 * @param semanticHint the semantic hint of the view
-		 * @param index the index of the view in its parent's children collection
-		 * @param persisted set <true> to create a persisted (attached) view; 
-		 * <tt>false</tt> to create a detached (non-persisted) view.
-		 */
-		public ViewDescriptor(
-			IAdaptable elementAdapter,
-			Class viewKind,
-			String semanticHint,
-			int index,
-			boolean persisted,
-			PreferencesHint preferencesHint) {
-
-			Assert.isNotNull(viewKind);
-			Assert.isTrue(index >= ViewUtil.APPEND);
-
-			this.elementAdapter = elementAdapter;
-			this.viewKind = viewKind;
-			this.semanticHint = semanticHint;
-			this.index = index;
-			_persisted = persisted;
-			this.preferencesHint = preferencesHint;
-		}
-
-		/**
-		 * Adapts to IView
-		 * 
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			if (adapter.isInstance(view))
-				return view;
-			return null;
-		}
-
-		/**
-		 * Method setView.
-		 * 
-		 * @param view
-		 */
-		public void setView(View view) {
-			this.view = view;
-		}
-		/**
-		 * Method setPersisted.
-		 * 
-		 * @param persisted
-		 */
-		public void setPersisted( boolean persisted ) {
-			_persisted = persisted;
-		}
-		
-		/**
-		 * Method getelementAdapter.
-		 * 
-		 * @return IAdaptable
-		 */
-		public IAdaptable getElementAdapter() {
-			return elementAdapter;
-		}
-		
-		/**
-		 * Method getViewKind.
-		 * 
-		 * @return Class
-		 */
-		public Class getViewKind() {
-			return viewKind;
-		}
-
-		/**
-		 * Method getSemanticHint.
-		 * 
-		 * @return String
-		 */
-		public String getSemanticHint() {
-			return semanticHint;
-		}
-
-		/**
-		 * Method getIndex.
-		 * 
-		 * @return int
-		 */
-		public int getIndex() {
-			return index;
-		}
-
-		/**
-		 * Return <tt>true</tt> if the view will be persisted; otherwise <tt>false</tt>
-		 * @return <code>true</code> or <code>false</code>
-		 */
-		public final boolean isPersisted() {
-			return _persisted;
-		}
-
-		/**
-		 * 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 PreferencesHint getPreferencesHint() {
-			return preferencesHint;
-		}
-	}
-
-	/**
-	 * The view descriptors set by the user
-	 */
-	private List<? extends ViewDescriptor> viewDescriptors;
-
-	/**
-	 * Convenience constructor for CreateViewRequest using a <code>IElement</code>
-	 * 
-	 * @param element a semantic element
-	 * @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 CreateViewRequest(EObject element, PreferencesHint preferencesHint) {
-		this(new ViewDescriptor(new EObjectAdapter(element), preferencesHint));
-	}
-
-	/**
-	 * Constructor for CreateViewRequest using a <code>ViewDescriptor</code>
-	 * 
-	 * @param viewDescriptor a view descriptor
-	 */
-	public CreateViewRequest(ViewDescriptor viewDescriptor) {
-		this(Collections.singletonList(viewDescriptor));
-	}
-
-	/**
-	 * Constructor for CreateViewRequest using a list of <code>ViewDescriptor</code>
-	 * s
-	 * 
-	 * @param viewDescriptors a list of view descriptors
-	 */
-	public CreateViewRequest(List<? extends ViewDescriptor> viewDescriptors) {
-		Assert.isNotNull(viewDescriptors);
-		this.viewDescriptors = viewDescriptors;
-		setLocation(new Point(-1,-1));
-	}
-
-	/**
-	 * Constructor for CreateViewRequest using a request type and a <code>ViewDescriptor</code>
-	 * 
-	 * @param type request type
-	 * @param viewDescriptor a view descriptor
-	 */
-	public CreateViewRequest(Object type, ViewDescriptor viewDescriptor) {
-		this(type, Collections.singletonList(viewDescriptor));
-	}
-
-	/**
-	 * Constructor for CreateViewRequest using a request type and list of
-	 * <code>ViewDescriptor</code> s
-	 * 
-	 * @param type the request type
-	 * @param viewDescriptors a list of view descriptors
-	 */
-	public CreateViewRequest(Object type, List<? extends ViewDescriptor> viewDescriptors) {
-		super(type);
-		Assert.isNotNull(viewDescriptors);
-		this.viewDescriptors = viewDescriptors;
-		setLocation(new Point(-1,-1));
-	}
-
-	/**
-	 * Returns the viewDescriptors list
-	 * 
-	 * @return List of <code>ViewDescriptor</code> s
-	 */
-	public List<? extends ViewDescriptor> getViewDescriptors() {
-		return viewDescriptors;
-	}
-
-	/**
-	 * A list of <code>IAdaptable</code> objects that adapt to <code>View</code>
-	 * .class
-	 * 
-	 * @see org.eclipse.gef.requests.CreateRequest#getNewObject()
-	 */
-	public Object getNewObject() {
-		return getViewDescriptors();
-	}
-
-	/**
-	 * The type is a List of <code>IAdaptable</code> objects that adapt to
-	 * <code>IView</code> .class
-	 * 
-	 * @see org.eclipse.gef.requests.CreateRequest#getNewObjectType()
-	 */
-	public Object getNewObjectType() {
-		return List.class;
-	}
-
-	/**
-	 * The factory mechanism is not used
-	 * @throws UnsupportedOperationException
-	 */
-	protected CreationFactory getFactory() {
-		throw new UnsupportedOperationException("The Factory mechanism is not used"); //$NON-NLS-1$
-	}
-
-	/**
-	 * The factory mechanism is not used
-	 */
-	public void setFactory(CreationFactory factory) {
-		throw new UnsupportedOperationException("The Factory mechanism is not used"); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequestFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequestFactory.java
deleted file mode 100644
index 92477f7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateViewRequestFactory.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.requests;
-
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest.ViewAndElementDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Node;
-
-/**
- * Knows how to create a view and element (if applicable) request given an
- * IElementType.
- * 
- * @author cmahoney
- */
-public class CreateViewRequestFactory {
-
-	/**
-	 * Creates a new <code>CreateViewRequest</code> or
-	 * <code>CreateViewAndElementRequest</code> based on the
-	 * <code>IElementType</code> passed in.
-	 * 
-	 * @param type
-	 *            the <code>IElementType</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>.
-	 * @return the new request
-	 */
-	public static CreateViewRequest getCreateShapeRequest(IElementType type, PreferencesHint preferencesHint) {
-		if (type instanceof INotationType) {
-			ViewDescriptor viewDescriptor = new ViewDescriptor(null,
-				Node.class, ((INotationType) type).getSemanticHint(), preferencesHint);
-			return new CreateViewRequest(viewDescriptor);
-		} else if (type instanceof IHintedType) {
-			ViewAndElementDescriptor viewDescriptor = new ViewAndElementDescriptor(
-				new CreateElementRequestAdapter(new CreateElementRequest(type)),
-				Node.class, ((IHintedType) type).getSemanticHint(), preferencesHint);
-			return new CreateViewAndElementRequest(viewDescriptor);
-		} else {
-			return new CreateViewAndElementRequest(type, preferencesHint);
-		}
-	}
-
-	/**
-	 * Creates a new <code>CreateConnectionViewRequest</code> or
-	 * <code>CreateConnectionViewAndElementRequest</code> based on the
-	 * <code>IElementType</code> passed in.
-	 * 
-	 * @param type
-	 *            the <code>IElementType</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>.
-	 * @return the new request
-	 */
-	public static CreateConnectionViewRequest getCreateConnectionRequest(
-			IElementType type, PreferencesHint preferencesHint) {
-		if (type instanceof INotationType) {
-			// Pass in the type as the element adapter so that it can be
-			// retrieved in the cases where a popup menu is to appear with a
-			// list of types.
-			ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(
-				type, ((INotationType) type).getSemanticHint(), preferencesHint);
-			return new CreateConnectionViewRequest(viewDescriptor);
-		} else if (type instanceof IHintedType) {
-			return new CreateConnectionViewAndElementRequest(type,
-				((IHintedType) type).getSemanticHint(), preferencesHint);
-		} else {
-			return new CreateConnectionViewAndElementRequest(type, preferencesHint);
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DropObjectsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DropObjectsRequest.java
deleted file mode 100644
index d4b02b8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DropObjectsRequest.java
+++ /dev/null
@@ -1,135 +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.requests;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.swt.dnd.DND;
-
-/**
- * A Drop request that has a List of <code>Object</code>s 
- * to drop at a specific location on the target editpart
- * The request can also return an object representing the
- * result of the drop requiredDetail
- * 
- * @author melaasar
- */
-public class DropObjectsRequest extends Request
-	implements DropRequest {
-		
-	/** the drop location */
-	private Point location; 
-	/** the list of objects to drop */	
-	private List objects = Collections.EMPTY_LIST;
-	/** the result of satisfying the drop request */
-	private Object result;
-	/** the allowed requiredDetail as in the DND event */
-	private int allowedDetail = DND.DROP_NONE;
-	/** the required DND requiredDetail */
-	private int requiredDetail = DND.DROP_NONE;
-	 
-	/**
-	 * Method CreateViewRequest.
-	 */
-	public DropObjectsRequest() {
-		super(RequestConstants.REQ_DROP_OBJECTS);
-	}
-
-	/**
-	 * Returns the objects.
-	 * @return List
-	 */
-	public final List getObjects() {
-		return objects;
-	}
-
-	/**
-	 * Returns the location.
-	 * @return Point
-	 */
-	public Point getLocation() {
-		return location;
-	}
-
-	/**
-	 * Returns the result of the drop request
-	 * @return any DROP_* field of the <code>DND</code> interface
-	 */
-	public Object getResult() {
-		return result;
-	}
-
-	/**
-	 * gets the drag requiredDetail
-	 * @return int
-	 */
-	public int getRequiredDetail() {
-		return requiredDetail;
-	}
-
-	/**
-	 * Gets the allowed requiredDetail as in the DND event
-	 * @return the allowed requiredDetail as in the DND event
-	 */
-	public int getAllowedDetail() {
-		return allowedDetail;
-	}
-
-	/**
-	 * Sets the objects.
-	 * @param objects The objects to set
-	 */
-	public final void setObjects(List objects) {
-		if (objects == null)
-			this.objects = Collections.EMPTY_LIST;
-		else
-			this.objects = objects;
-	}
-
-	/**
-	 * Sets the location.
-	 * @param location The location to set
-	 */
-	public void setLocation(Point location) {
-		this.location = location;
-	}
-
-	/**
-	 * Sets the result of the drop request
-	 * Editpolicies can use this method to set the result of the request
-	 * @param result The result to set
-	 */
-	public void setResult(Object result) {
-		this.result = result;
-	}
-
-	/**
-	 * Sets the drag requiredDetail
-	 * @param operation can be any DROP_* field of the <code>DND</code> interface
-	 */
-	public void setRequiredDetail(int operation) {
-		this.requiredDetail = operation;
-	}
-
-	/**
-	 * Sets the allowed requiredDetail as in the DND event
-	 * @param allowedDetail the allowed requiredDetail in the DND event
-	 */
-	public void setAllowedDetail(int allowedDetail) {
-		this.allowedDetail = allowedDetail;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DuplicateRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DuplicateRequest.java
deleted file mode 100644
index 22743bc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/DuplicateRequest.java
+++ /dev/null
@@ -1,81 +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.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.requests.GroupRequest;
-
-/**
- * The request used to duplicate a list of editparts. A list that will hold the
- * new duplicated views after the command is executed can be retrieved via
- * <code>getDuplicatedViews()</code>.
- * 
- * @author cmahoney
- */
-public final class DuplicateRequest
-	extends GroupRequest {
-
-	/**
-	 * This will be populated with the views that are duplicated after the
-	 * command executes.
-	 */
-	private List duplicatedViews = new ArrayList();
-    
-    /**
-     * The offset from the location of the original views where the new views
-     * will be placed.
-     */
-    private Point offset;
-
-
-	/**
-	 * Creates a new <code>DuplicateElementsRequest</code>.
-	 */
-	public DuplicateRequest() {
-		super(RequestConstants.REQ_DUPLICATE);
-	}
-
-	/**
-	 * Gets the list that will hold the new duplicated views after the command
-	 * is executed.
-	 * 
-	 * @return Returns the duplicatedViews.
-	 */
-	public final List getDuplicatedViews() {
-		return duplicatedViews;
-	}
-
-    /**
-     * Gets the offset from the location of the original views where the new
-     * views will be placed.
-     * 
-     * @return the offset
-     */
-    public final Point getOffset() {
-        return offset;
-    }
-
-    /**
-     * Sets the offset from the location of the original views where the new
-     * views will be placed.
-     * 
-     * @param offset
-     *            The offset to set.
-     */
-    public final void setOffset(Point offset) {
-        this.offset = offset;
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/EditCommandRequestWrapper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/EditCommandRequestWrapper.java
deleted file mode 100644
index 39e3412..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/EditCommandRequestWrapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.requests;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-/**
- * Wraps an edit command request in a GEF request.
- * 
- * @author ldamus
- */
-public class EditCommandRequestWrapper
-	extends Request {
-
-	/**
-	 * The edit command request that is wrapped.
-	 */
-	private IEditCommandRequest editCommandRequest;
-
-	/**
-	 * Constructs a new request wrapper.
-	 * 
-	 * @param editCommandRequest
-	 *            the edit command request to be wrapped. Must not be
-	 *            <code>null</code>.
-	 */
-	public EditCommandRequestWrapper(IEditCommandRequest editCommandRequest) {
-		this(RequestConstants.REQ_SEMANTIC_WRAPPER, editCommandRequest, null);
-	}
-
-	/**
-	 * Constructs a new request wrapper.
-	 * 
-	 * @param editCommandRequest
-	 *            the edit command request to be wrapped. Must not be
-	 *            <code>null</code>.
-	 * @param requestParameters
-	 *            custom request parameters
-	 */
-	public EditCommandRequestWrapper(IEditCommandRequest editCommandRequest, Map requestParameters) {
-
-		this(RequestConstants.REQ_SEMANTIC_WRAPPER, editCommandRequest, requestParameters);
-	}
-	
-	/**
-	 * Constructs a new request wrapper.
-	 * 
-	 * @param requestType
-	 *            the request type
-	 * @param editCommandRequest
-	 *            the edit command request to be wrapped. Must not be
-	 *            <code>null</code>.
-	 * @param requestParameters
-	 *            custom request parameters
-	 */
-	public EditCommandRequestWrapper(Object requestType,
-			IEditCommandRequest editCommandRequest) {
-
-		this(requestType, editCommandRequest, null);
-	}
-	
-	/**
-	 * Constructs a new request wrapper.
-	 * 
-	 * @param requestType
-	 *            the request type
-	 * @param editCommandRequest
-	 *            the edit command request to be wrapped. Must not be
-	 *            <code>null</code>.
-	 * @param requestParameters
-	 *            custom request parameters
-	 */
-	public EditCommandRequestWrapper(Object requestType,
-			IEditCommandRequest editCommandRequest, Map requestParameters) {
-
-		setType(requestType);
-		Assert.isNotNull(editCommandRequest);
-		this.editCommandRequest = editCommandRequest;
-		editCommandRequest.addParameters(requestParameters);
-	}
-
-	/**
-	 * Gets the edit command request.
-	 * 
-	 * @return the edit command request
-	 */
-	public IEditCommandRequest getEditCommandRequest() {
-		return editCommandRequest;
-	}
-	
-	/**
-	 * Sets the parameters on the wrapped request.
-	 */
-	public void setExtendedData(Map map) {
-		IEditCommandRequest delegate = getEditCommandRequest();
-		
-		if (delegate != null) {
-			delegate.getParameters().clear();
-			delegate.addParameters(map);
-		}
-	}
-	
-	/**
-	 * Gets the parameters from the wrapped request.
-	 */
-	public Map getExtendedData() {
-		IEditCommandRequest delegate = getEditCommandRequest();
-		
-		if (delegate != null) {
-			return delegate.getParameters();
-		}
-		
-		return super.getExtendedData();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/GroupRequestViaKeyboard.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/GroupRequestViaKeyboard.java
deleted file mode 100644
index 9312542..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/GroupRequestViaKeyboard.java
+++ /dev/null
@@ -1,62 +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.requests;
-
-import org.eclipse.gef.requests.GroupRequest;
-
-
-/**
- * A group request that originated from the Keyboard due to the use of a hot/shortcut key
- * @author bagrodia
- * Created on Jul 13, 2004
- */
-public class GroupRequestViaKeyboard
-	extends GroupRequest {
-
-	/**
-	 * flag that lets the editpolicy show informational dialog. 
-	 */
-	private boolean showInformationDialog = true;
-	
-	
-	/**
-	 * Creates a GroupRequest with the given type.
-	 *
-	 * @param type The type of Request.
-	 */
-	public GroupRequestViaKeyboard(Object type) {
-		super(type);		
-	}
-
-	/**
-	 * Default constructor.
-	 */
-	public GroupRequestViaKeyboard() {
-		super();		
-	}
-	
-	
-
-	/**
-	 * @return Returns the showInformationDialog.
-	 */
-	public boolean isShowInformationDialog() {
-		return showInformationDialog;
-	}
-	/**
-	 * @param showInformationDialog The showInformationDialog to set.
-	 */
-	public void setShowInformationDialog(boolean showInformationDialog) {
-		this.showInformationDialog = showInformationDialog;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/PasteViewRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/PasteViewRequest.java
deleted file mode 100644
index f2004f4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/PasteViewRequest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.requests;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.common.ui.util.ICustomData;
-
-/**
- * A request to paste the clipboard data on to the view.
- * 
- * @author vramaswa
- * @since 2.1
- */
-public class PasteViewRequest
-    extends Request {
-
-    /**
-     * The clipboard data used for the paste
-     */
-    private final ICustomData[] data;
-
-    /**
-     * Constructor for PasteViewRequest.
-     * 
-     * @param data
-     *            The clipboard data
-     */
-    public PasteViewRequest(ICustomData[] data) {
-        super(RequestConstants.REQ_PASTE);
-
-        Assert.isNotNull(data);
-        this.data = data;
-    }
-
-    /**
-     * Returns the data.
-     * 
-     * @return ICustomData[]
-     */
-    public ICustomData[] getData() {
-        return data;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RefreshConnectionsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RefreshConnectionsRequest.java
deleted file mode 100644
index 1056e16..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RefreshConnectionsRequest.java
+++ /dev/null
@@ -1,82 +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.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-/**
- * A request to refresh the connections. This request could have different
- * options indicating which or how the connections should be refreshed. Or we
- * could have different types depending on what type of relationships to
- * refresh.
- * 
- * @author cmahoney
- */
-public class RefreshConnectionsRequest
-	extends Request {
-
-	/** A list of the view objects in <code>IAdaptable</code> form. */
-	List shapes;
-
-	/**
-	 * true to turn on filtering, false to turn off filtering. By default,
-	 * filtering is turned on
-	 */
-	boolean filter = true;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param shapes
-	 *            list of the view objects in <code>IAdaptable</code> form
-	 */
-	public RefreshConnectionsRequest(List shapes) {
-		super(RequestConstants.REQ_REFRESH_CONNECTIONS);
-
-		this.shapes = new ArrayList(shapes);
-	}
-
-	/**
-	 * Constructor. You can explicitly set the filtering with this constructor.
-	 * 
-	 * @param shapes
-	 *            list of the view objects in <code>IAdaptable</code> form
-	 * @param filter
-	 *            true to turn on filtering, false to turn it off
-	 */
-	public RefreshConnectionsRequest(List shapes, boolean filter) {
-		this(shapes);
-		this.filter = filter;
-	}
-
-	/**
-	 * Method getShapes.
-	 * 
-	 * @return List the list of <code>IAdaptable</code> shapes
-	 */
-	public List getShapes() {
-		return shapes;
-	}
-
-	/**
-	 * Returns if filtering is turned on or off.
-	 * 
-	 * @return true if filtering is turned on, false if it is turned off
-	 */
-	public boolean isFilter() {
-		return filter;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RequestConstants.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RequestConstants.java
deleted file mode 100644
index b22bbe0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/RequestConstants.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 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.requests;
- 
-
-/**
- * this class defines the request constants
- * <p>
- * This interface is <EM>not</EM> intended to be implemented by clients as new
- * methods may be added in the future. 
- * </p>
- * @author sshaw
- *
- */
-public interface RequestConstants extends org.eclipse.gef.RequestConstants {
-
-	/**
-	 * constants for auto size request
-	 */
-	public static final String 	REQ_AUTOSIZE = "autosize"; //$NON-NLS-1$
-    /**
-	 * constants for refresh request
-	 */
-	public static final String	REQ_REFRESH = "refresh";		   //$NON-NLS-1$
-    /**
-	 * constants for refresh connections request
-	 */
-	public static final String REQ_REFRESH_CONNECTIONS = "refresh_connections"; //$NON-NLS-1$
-    /**
-	 * constants for drag request
-	 */
-	public static final String REQ_DRAG = "drag";//$NON-NLS-1$
-    /**
-	 * constants for drop request
-	 */
-	public static final String 	REQ_DROP = "drop";//$NON-NLS-1$
-    /**
-	 * constants for drop objects request
-	 */
-	public static final String 	REQ_DROP_OBJECTS = "drop_objects";  //$NON-NLS-1$
-    /**
-	 * constants for paste request
-	 */
-	public static final String 	REQ_PASTE = "paste";  //$NON-NLS-1$ 
-    /**
-	 * constants for property change request
-	 */
-	public static final String 	REQ_PROPERTY_CHANGE = "property_change";		   //$NON-NLS-1$
-	
-    /**
-	 * constants for wrap semantic  request
-	 */
-	public static final String REQ_SEMANTIC_WRAPPER = "wrap semantic request"; //$NON-NLS-1$
-    /**
-	 * constants for set all connection bendpoint request
-	 */
-	public static final String REQ_SET_ALL_BENDPOINT = "set_all_connection_bendpoint";	   //$NON-NLS-1$ 
-    /**
-	 * constants for arrange radial request
-	 */
-	public static final String REQ_ARRANGE_RADIAL = "arrange_radial";			   //$NON-NLS-1$
-    /**
-	 * constants for arrange deferred request
-	 */
-	public static final String 	REQ_ARRANGE_DEFERRED = "arrange_deferred";			   //$NON-NLS-1$		
-    /**
-	 * constants for move deferred request
-	 */
-	public static final String REQ_MOVE_DEFERRED = "move_shape_deferred";		   //$NON-NLS-1$
-    /**
-	 * constants for apply appearance properties  request
-	 */
-	public static final String 	REQ_APPLY_APPEARANCE_PROPERTIES = "apply_appearance_properties"; //$NON-NLS-1$		
-    /**
-	 * constants for show related elements request
-	 */
-	public static final String 	REQ_SHOW_RELATED_ELEMENTS = "show_related_elements"; //$NON-NLS-1$
-    /**
-	 * constants for show/hide relationships
-	 */
-	public static final String 	REQ_SHOWHIDE_RELATIONSHIPS = "showhide_relationships"; //$NON-NLS-1$		
-    /**
-	 * constants for recalculate page breaks request
-	 */
-	public static final String 	REQ_RECALCULATE_PAGEBREAKS = "recalculate_pagebreaks"; //$NON-NLS-1$
-    /**
-	 * constants for sort filter compartment
-	 */
-	public static final String 	REQ_SORT_FILTER_COMPARTMENT = "sort_filter_compartment"; //$NON-NLS-1$
-    /**
-	 * constants for sort filter content request
-	 */
-	public static final String REQ_SORT_FILTER_CONTENT = "sort_filter_content"; //$NON-NLS-1$
-    /**
-	 * constants for filter compartment items
-	 */
-	public static final String 	REQ_FILTER_COMPARTMENT_ITEMS = "filter_compartment_items"; //$NON-NLS-1$
-    /**
-	 * constants for sort copartment items request
-	 */
-	public static final String 	REQ_SORT_COMPARTMENT_ITEMS = "sort_compartment_items"; //$NON-NLS-1$	
-    /**
-	 * constants for change sort filter request
-	 */
-	public static final String REQ_CHANGE_SORT_FILTER = "change_sort_filter"; //$NON-NLS-1$
-    /**
-	 * constants for show as alternate view  request
-	 */
-	public static final String REQ_SHOW_AS_ALTERNATE_VIEW = "show_as_alternate_view"; //$NON-NLS-1$
-    /**
-	 * constants for snap back request
-	 */
-	public static final String 	REQ_SNAP_BACK = "snap_back"; //$NON-NLS-1$
-    /**
-	 * constants for toggle connection labels request
-	 */
-	public static final String 	REQ_TOGGLE_CONNECTION_LABELS = "toggle_connection_label"; //$NON-NLS-1$
-    /**
-	 * constants for toggle canonical mode request
-	 */
-	public static final String 	REQ_TOGGLE_CANONICAL_MODE = "toggle_canonical_mode";//$NON-NLS-1$
-    /**
-	 * constants for insert semantic request
-	 */
-	public static final String 	REQ_INSERT_SEMANTIC = "insert_semantic"; //$NON-NLS-1$
-    /**
-	 * constants for duplicate  request
-	 */
-	public static final String REQ_DUPLICATE = "duplicate"; //$NON-NLS-1$
-	
-	/**
-	 * constant for child property change request
-	 */
-	public static final String REQ_CHILD_PROPERTY_CHANGE = "child_property_change"; //$NON-NLS-1$
-	
-	/**
-	 * constant for show all compartments request
-	 */
-	public static final String REQ_SHOW_ALL_COMPARTMENTS = "show_all_compartments"; //$NON-NLS-1$
-    
-	/**
-	 * constant key for extended data in the DirectEditRequest for the initial character
-	 */
-	public static final String REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR = "directedit_extendeddata_initial_char"; //$NON-NLS-1$
-	
-	/**
-	 * constant key for snapping editpart to grid request
-	 */
-	public static final String REQ_SNAP_TO_GRID = "snap_to_grid"; //$NON-NLS-1$
-}
- 
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SelectConnectionEndRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SelectConnectionEndRequest.java
deleted file mode 100644
index 34f1bde..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SelectConnectionEndRequest.java
+++ /dev/null
@@ -1,69 +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.ui.requests;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-
-/**
- * @author mmostafa
- * 
- * request to select one of the connection's ends
- *
- */
-public class SelectConnectionEndRequest extends Request{
-	
-	ConnectionEditPart connectionEditPart = null;
-	boolean selectSource = false;
-	
-	
-	/**
-     * constructor
-	 * @param selectSource, true means select source otherwise it will select target
-	 */
-	public SelectConnectionEndRequest(boolean selectSource){
-		this.selectSource = selectSource;
-	}
-	
-	/**
-     * checks if this is a select source request
-	 * @return true is select source request, otherwise false
-	 */
-	public boolean isSelectSource(){
-		return selectSource;
-	}
-	
-    /**
-     * checks if this is a select target request
-     * @return true is select target request, otherwise false
-     */
-	public boolean isSelectTarget(){
-		return !selectSource;
-	}
-	
-	/**
-     * sets the connection edit part on the request
-	 * @param connectionEditPart
-	 */
-	public void setConnectionEdtiPart(ConnectionEditPart connectionEditPart){
-		this.connectionEditPart = connectionEditPart;
-	}
-	
-	/**
-     * access the connection edit part of this request
-	 * @return the request's connection edit part
-	 */
-	public ConnectionEditPart getConnectionEdtiPart(){
-		return connectionEditPart;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SetAllBendpointRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SetAllBendpointRequest.java
deleted file mode 100644
index 76dd420..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/SetAllBendpointRequest.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.diagram.ui.requests;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gef.Request;
-
-/**
- * @author sshaw
- */
-public class SetAllBendpointRequest extends Request {
-	private PointList points;
-	private Point ptSourceRef = null;
-	private Point ptTargetRef = null;
-	
-	/**
-	 * Method SetAllBendPointsRequest.
-	 * @param sz
-	 * @param points
-	 */
-	public SetAllBendpointRequest(String sz, PointList points) {
-		super(sz);
-		this.points = points;
-	}
-	
-	/**
-	 * Method SetAllBendPointsRequest.
-	 * @param sz
-	 * @param points
-	 * @param ptSourceRef
-	 * @param ptTargetRef
-	 */
-	public SetAllBendpointRequest(String sz, PointList points, Point ptSourceRef, Point ptTargetRef) {
-		super(sz);
-		this.points = points;
-		this.ptSourceRef = ptSourceRef;
-		this.ptTargetRef = ptTargetRef;
-	}
-	
-	/**
-	 * Method setPoints.
-	 * @param points
-	 */
-	public void setPoints(PointList points) {
-		this.points = points;
-	}
-	
-	/**
-	 * Method getPoints.
-	 * @return PointList
-	 */
-	public PointList getPoints() {
-		return points;
-	}
-	
-	/**
-	 * @return Returns the ptRef1.
-	 */
-	public Point getSourceReference() {
-		return ptSourceRef;
-	}
-	/**
-	 * @return Returns the ptRef2.
-	 */
-	public Point getTargetReference() {
-		return ptTargetRef;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowHideRelationshipsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowHideRelationshipsRequest.java
deleted file mode 100644
index 8edbf25..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowHideRelationshipsRequest.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.diagram.ui.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author schafe
- *
- * Request for showing and hiding relationships.
- */
-public class ShowHideRelationshipsRequest extends Request{
-	
-	List selectedShapes;	
-	List relationshipsToShow;
-	List relationshipsToHide;
-
-	/**
-	 * Constructor for ShowHideRelationshipsRequest.
-	 * @param shapes
-	 * @param relationshipTypesToShow
-	 * @param relationshipTypesToHide
-	 */
-	public ShowHideRelationshipsRequest(List shapes, List relationshipTypesToShow, List relationshipTypesToHide) {
-		super(RequestConstants.REQ_SHOWHIDE_RELATIONSHIPS);
-
-		this.selectedShapes = new ArrayList(shapes);
-		this.relationshipsToShow = relationshipTypesToShow;
-		this.relationshipsToHide = relationshipTypesToHide;
-	}
-
-	/**
-	 * Method getShapes.
-	 * @return List the list of <code>IAdaptable</code> shapes
-	 */
-	public List getSelectedShapes() {
-		return this.selectedShapes;
-	}
-	
-	
-	/**
-	 * Method getRelationshipsToShow.
-	 * @return List
-	 */
-	public List getRelationshipsToShow() {
-		return this.relationshipsToShow;
-	}
-	
-	
-	/**
-	 * Method getRelationshipsToHide.
-	 * @return List
-	 */
-	public List getRelationshipsToHide() {
-		return this.relationshipsToHide;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowRelatedElementsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowRelatedElementsRequest.java
deleted file mode 100644
index 5e8471a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ShowRelatedElementsRequest.java
+++ /dev/null
@@ -1,233 +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.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.common.ui.dialogs.ExpansionType;
-
-/**
- * @author schafe 
- *
- * Request for showing related elements.
- */
-public class ShowRelatedElementsRequest extends Request {
-
-	private List selectedShapes;
-	private List relatedShapes;
-	private List relationshipsToShow;
-	private boolean isExpandIndefinite;
-	private int expandLevel;
-
-	/**
-	 * The expansion type, which could be incoming, outgoing, both, or all connected
-	 */
-	protected ExpansionType expansionType;
-	
-	/**
-	 * The Stopping List 
-	 */
-	protected List stoppingList;
-	
-	/**
-	 * List of Models.  Do not use IModels because it does not have a
-	 * contains method.
-	 */
-	protected List models;
-
-	/**
-	 * Use the IRelationshipFilter when true, don't use it when false
-	 */
-	protected boolean useFilter;
-
-	/**
-	 * Constructor for ShowRelatedElementsRequest.
-	 * @param shapes List of IShapeView objects that were selected
-	 * @param relationshipTypesToShow  List of relationship type hints
-	 * to show.  
-	 * @param isExpandIndefinite true to expand indefinitely, false not to.
-	 * @param expandLevel specify an int level here for the number of
-	 * levels to expand if you set isExpandIndefinite to false.
-	 * @param expansionType the ExpansionType for deciding which
-	 * direction to expand in.
-	 * @param useFilter use the IRelationshipFilter when true, 
-	 * don't use it when false
-	 * @param models List of IModel objects, if null, the default will
-	 * be used.
-	 * @param stoppingList List of the stopping conditions
-	 * for related elements if this is true
-	 */
-	public ShowRelatedElementsRequest(
-		List shapes,
-		List relationshipTypesToShow,
-		boolean isExpandIndefinite,
-		int expandLevel,
-		ExpansionType expansionType,
-		boolean useFilter, 
-		List models,
-		List stoppingList) {
-
-		super(RequestConstants.REQ_SHOW_RELATED_ELEMENTS);
-		this.selectedShapes = new ArrayList(shapes);
-		this.relatedShapes = new ArrayList();
-		this.relationshipsToShow = relationshipTypesToShow;
-		this.isExpandIndefinite = isExpandIndefinite;
-		this.expandLevel = expandLevel;
-		this.expansionType = expansionType;
-		this.useFilter = useFilter;
-		this.models = models;
-		this.stoppingList = stoppingList;
-	}
-
-	/**
-	 * Constructor for ShowRelatedElementsRequest.
-	 * Filter is set to the default of true and the default list of models
-	 * will be used.
-	 * 
-	 * @param shapes List of IShapeView objects that were selected
-	 * @param relationshipTypesToShow  List of relationship type hints
-	 * to show.  Use CoreUMLTypeInfo.
-	 * @param isExpandIndefinite true to expand indefinitely, false not to.
-	 * @param expandLevel specify an int level here for the number of
-	 * levels to expand if you set isExpandIndefinite to false.
-	 * @param expansionType should include incoming or outgoing  relationships when searching
-	 * for related elements if this is true
-	 */
-	public ShowRelatedElementsRequest(
-		List shapes,
-		List relationshipTypesToShow,
-		boolean isExpandIndefinite,
-		int expandLevel,
-		ExpansionType expansionType) {
-
-		this(
-			shapes,
-			relationshipTypesToShow,
-			isExpandIndefinite,
-			expandLevel,
-			expansionType,
-			true,
-			null,
-			new ArrayList());
-	}
-
-	/**
-	 * Method getShapes.
-	 * @return List the list of <code>IAdaptable</code> shapes
-	 */
-	public List getSelectedShapes() {
-		return this.selectedShapes;
-	}
-
-	/**
-	 * Method getRelatedShapes.
-	 * @return List the list of <code>IAdaptable</code> shapes
-	 */
-	public List getRelatedShapes() {
-		return this.relatedShapes;
-	}
-
-	/**
-	 * Method setRelatedShapes.
-	 * @param relatedShapes List the list of <code>IAdaptable</code> shapes
-	 */
-	public void setRelatedShapes(List relatedShapes) {
-		this.relatedShapes = relatedShapes;
-	}
-
-	/**
-	 * Method getRelationshipsToShow.
-	 * @return List
-	 */
-	public List getRelationshipsToShow() {
-		return this.relationshipsToShow;
-	}
-
-	/**
-	 * Method isExpandIndefinite.
-	 * @return boolean
-	 */
-	public boolean isExpandIndefinite() {
-		return this.isExpandIndefinite;
-	}
-
-	/**
-	 * Method getExpandLevel.
-	 * @return int
-	 */
-	public int getExpandLevel() {
-		return this.expandLevel;
-	}
-
-	/**
-	 * Method getUseIncoming.
-	 * This will be deprecated when all SRE implementors implement the all
-	 * connected option.  Use getExpansionType() instead. 
-	 * 
-	 * @return boolean
-	 */
-	public boolean getUseIncoming() {
-		return expansionType.equals(ExpansionType.INCOMING) ||
-			expansionType.equals(ExpansionType.BOTH);
-	}
-
-	/**
-	 * Method getUseOutgoing.
-	 * This will be deprecated when all SRE implementors implement the all
-	 * connected option.  Use getExpansionType() instead.
-	 * 
-	 * @return boolean
-	 */
-	public boolean getUseOutgoing() {
-		return expansionType.equals(ExpansionType.OUTGOING) ||
-			expansionType.equals(ExpansionType.BOTH);
-	}
-	
-	/**
-	 * Return the expansion type that was passed into the constructor.
-	 * 
-	 * @return ExpansionType
-	 */
-	public ExpansionType getExpansionType() {
-		return expansionType;
-	}	
-
-	/**
-	 * Returns if the filter should be used or not
-	 * Use the IRelationshipFilter when true, don't use it when false
-	 * @return true if the IRelationshipFilter should be used, false if it
-	 * shouldn't
-	 */
-	public boolean getUseFilter() {
-		return this.useFilter;
-	}
-
-	/**
-     * Return a List of IModel objects
-	 * 
-	 * @return List of IModel objects
-	 */
-	public List getModels() {
-		return models;
-	}
-
-	/**
-	 * Method getStoppingList
-	 * @return stoppingList
-	 */	
-	public List getStoppingList() {
-		return stoppingList;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ToggleConnectionLabelsRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ToggleConnectionLabelsRequest.java
deleted file mode 100644
index dd6a7b5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ToggleConnectionLabelsRequest.java
+++ /dev/null
@@ -1,46 +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.requests;
-
-import org.eclipse.gef.Request;
-
-/**
- * Request to set the visiblity of the labels.
- * 
- * @author jcorchis
- */
-public class ToggleConnectionLabelsRequest
-	extends Request {
-
-	/** show or hide flag */
-	private boolean showConnectionLabel;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param showConnectionLabel
-	 *            to show/hide the labels
-	 */
-	public ToggleConnectionLabelsRequest(boolean showConnectionLabel) {
-		super(RequestConstants.REQ_TOGGLE_CONNECTION_LABELS);
-		this.showConnectionLabel = showConnectionLabel;
-	}
-
-	/**
-	 * gets the show/hide flag.
-	 * 
-	 * @return <code>true</code> or <code>flase</code>
-	 */
-	public final boolean showConnectionLabel() {
-		return showConnectionLabel;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ZOrderRequest.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ZOrderRequest.java
deleted file mode 100644
index bfb3845..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/ZOrderRequest.java
+++ /dev/null
@@ -1,74 +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.requests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-
-/**
- * A Request to change the Z-Order
- */
-public class ZOrderRequest extends Request {
-	
-	/**
-	 * the type for bring to front request 
-	 */
-	public static final String REQ_BRING_TO_FRONT = ActionIds.ACTION_BRING_TO_FRONT;
-	/**
-	 * the type for send to back request 
-	 */
-	public static final String 	REQ_SEND_TO_BACK = ActionIds.ACTION_SEND_TO_BACK;
-	/**
-	 * the type for bring forward request 
-	 */
-	public static final String 	REQ_BRING_FORWARD = ActionIds.ACTION_BRING_FORWARD;
-	
-	/**
-	 * the type for send backward request 
-	 */
-	public static final String REQ_SEND_BACKWARD = ActionIds.ACTION_SEND_BACKWARD;
-
-	/** List of <code>EditPart</code> objects to be ordered */
-	protected List editParts = null;
-
-	/**
-	 * Creates a ZOrderRequest with a specified type.
-	 * @param type 
-	 * @todo Generated comment
-	 */
-	public ZOrderRequest(String type) {
-		super(type);
-	}
-	
-	/**
-	 * Sets the editparts to order.
-	 * @param theEditParts List of <code>EditPart</code> objects
-	 */
-	public void setPartsToOrder(List theEditParts) {
-		editParts = new ArrayList(theEditParts);
-	}
-
-	/**
-	 * Gets the editparts to order.
-	 * @return List of <code>EditPart</code> objects;
-	 * null if this was never set
-	 */
-	public List getPartsToOrder() {
-		return editParts;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/package.html
deleted file mode 100644
index 0cccabf..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/requests/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>
-thispackage contains the supported request classes </p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java
deleted file mode 100644
index 45d3d1e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2004, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and 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.services.decorator;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy.DecoratorTarget;

-

-/**

- * Abstract Decorator class. Clients can have their decorator subclass this to

- * inherit utility methods for adding decoration figures.

- * 

- * @see IDecorator

- * 

- * @author cmahoney

- */

-public abstract class AbstractDecorator

-	implements IDecorator {

-

-	/** the object to be decorated */

-	private DecoratorTarget decoratorTarget;

-

-	/** the decoration being displayed */

-	private Decoration decoration;

-

-	/**

-	 * Creates a new <code>AbstractDecorator</code> for the decorator target

-	 * passed in.

-	 * 

-	 * @param decoratorTarget

-	 *            the object to be decorated

-	 */

-	public AbstractDecorator(IDecoratorTarget decoratorTarget) {

-		Assert.isTrue(decoratorTarget instanceof DecoratorTarget);

-		this.decoratorTarget = (DecoratorTarget) decoratorTarget;

-	}

-

-	/**

-	 * Gets the object to be decorated.

-	 * 

-	 * @return Returns the object to be decorated

-	 */

-	protected DecoratorTarget getDecoratorTarget() {

-		return decoratorTarget;

-	}

-

-	/**

-	 * @return Returns the decoration.

-	 * @since 1.4

-	 */

-	public Decoration getDecoration() {

-		return decoration;

-	}

-

-	/**

-	 * @param decoration

-	 *            The decoration to set.

-	 */

-	public void setDecoration(IDecoration decoration) {

-		Assert.isTrue(decoration instanceof Decoration);

-		this.decoration = (Decoration) decoration;

-	}

-

-	/**

-	 * Removes the decoration if it exists and sets it to null.

-	 */

-	protected void removeDecoration() {

-		if (decoration != null) {

-			decoratorTarget.removeDecoration(decoration);

-			decoration = null;

-		}

-	}

-

-	/**

-	 * Removes the decoration.

-	 * 

-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator#deactivate()

-	 */

-	public void deactivate() {

-		removeDecoration();

-	}

-

-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/CreateDecoratorsOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/CreateDecoratorsOperation.java
deleted file mode 100644
index b393f22..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/CreateDecoratorsOperation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.decorator;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the Decoration Service.
- * The CreateDecoratorsOperation is instantiated with an IDecoratorTarget.
- * 
- * The decorator target is the object that is to be decorated with an image
- * or figure.
- * 
- * @author cmahoney
- */
-public /*final*/ class CreateDecoratorsOperation
-	implements IOperation {
-
-    /** the decorator target */
-    protected final IDecoratorTarget decoratorTarget;
-
-    /**
-     * Constructor for <code>CreateDecoratorsOperation</code>.
-     * 
-     * @param decoratorTarget
-     *            the object to be decorated
-     */
-    public CreateDecoratorsOperation(IDecoratorTarget decoratorTarget) {
-        Assert.isNotNull(decoratorTarget);
-        this.decoratorTarget = decoratorTarget;
-    }
-
-	/**
-	 * @see org.eclipse.gmf.runtime.common.core.service.IOperation#execute(IProvider)
-	 */
-	public Object execute(IProvider provider) {
-		((IDecoratorProvider) provider).createDecorators(getDecoratorTarget());
-		return null;
-	}
-	
-	/**
-	 * Returns the object to be decorated.
-	 * 
-	 * @return the decorator target
-	 */
-	public final IDecoratorTarget getDecoratorTarget() {
-		return decoratorTarget;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/Decoration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/Decoration.java
deleted file mode 100644
index d7141b4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/Decoration.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.decorator;
-
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration;
-
-/**
- * This class wraps a decoration figure to provide capability common to all
- * decorations. It references the owner figure so that it can move with it. It
- * can use a locator for relocating the figure. The real decoration figure is
- * added to this figure.
- * 
- * @author cmahoney
- * @since 1.4
- */
-public class Decoration
-	extends Figure
-	implements AncestorListener, IDecoration {
-
-	/** locator used to put the decoration in the appropriate position */
-	private Locator locator;
-
-	/** the owner figure used for tracking movement */
-	private IFigure owner;
-
-	/**
-	 * True if the decoration's visibility is not to be affected by the parent's
-	 * visibility; false otherwise.
-	 */
-	private boolean ignoreParentVisibility;
-
-	/**
-     * Creates a new instance.
-     */
-    public Decoration() {
-        super();
-        setFocusTraversable(false);
-    }
-
-    /**
-	 * Overridden to avoid having decorations show outside of resizeable
-	 * compartment figures when they are not in the viewable area.
-	 * 
-	 * @see org.eclipse.draw2d.IFigure#isVisible()
-	 */
-	public boolean isVisible() {
-
-		Rectangle decorationBounds = getBounds().getCopy();
-		translateToAbsolute(decorationBounds);
-
-		IFigure parentFigure = getOwnerFigure();
-		while (parentFigure != null) {
-			if (!shouldIgnoreParentVisibility() && !parentFigure.isVisible()) {
-				return false;
-			}
-			if (parentFigure instanceof ResizableCompartmentFigure) {
-
-				Rectangle parentClientArea = parentFigure.getClientArea()
-					.getCopy();
-				parentFigure.translateToAbsolute(parentClientArea);
-
-				if (!(parentClientArea.contains(decorationBounds))) {
-					return false;
-				}
-
-			}
-			parentFigure = parentFigure.getParent();
-		}
-		return super.isVisible();
-	}
-
-	/**
-	 * If a locator has been set, it is used to locate this figure.
-	 * 
-	 * @see org.eclipse.draw2d.IFigure#validate()
-	 */
-	public void validate() {
-		if (getLocator() != null) {
-			getLocator().relocate(this);
-		}
-		super.validate();
-	}
-
-	/**
-	 * Gets the locator.
-	 * 
-	 * @return the locator
-	 */
-	public Locator getLocator() {
-		return locator;
-	}
-
-	/**
-	 * Sets the locator.
-	 * 
-	 * @param locator
-	 *            the locator to set
-	 */
-	public void setLocator(Locator locator) {
-		this.locator = locator;
-	}
-
-	/**
-	 * Gets the owner figure.
-	 * 
-	 * @return the owner figure
-	 */
-	public IFigure getOwnerFigure() {
-		return owner;
-	}
-
-	/**
-	 * Sets the owner figure.
-	 * 
-	 * @param figure
-	 *            the owner figure
-	 */
-	public void setOwnerFigure(IFigure figure) {
-		owner = figure;
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#addNotify()
-	 */
-	public void addNotify() {
-		super.addNotify();
-
-		// Listen to the owner figure so the decoration moves when the
-		// figure moves.
-		getOwnerFigure().addAncestorListener(this);
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.IFigure#removeNotify()
-	 */
-	public void removeNotify() {
-		getOwnerFigure().removeAncestorListener(this);
-		super.removeNotify();
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AncestorListener#ancestorMoved(org.eclipse.draw2d.IFigure)
-	 */
-	public void ancestorMoved(IFigure ancestor) {
-		revalidate();
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AncestorListener#ancestorAdded(org.eclipse.draw2d.IFigure)
-	 */
-	public void ancestorAdded(IFigure ancestor) {
-		// NULL implementation
-	}
-
-	/**
-	 * @see org.eclipse.draw2d.AncestorListener#ancestorRemoved(org.eclipse.draw2d.IFigure)
-	 */
-	public void ancestorRemoved(IFigure ancestor) {
-		// NULL implementation
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration#setIgnoreParentVisibility(boolean)
-	 */
-	public void setIgnoreParentVisibility(boolean ignoreParentVisibility) {
-		this.ignoreParentVisibility = ignoreParentVisibility;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration#shouldIgnoreParentVisibility()
-	 */
-	public boolean shouldIgnoreParentVisibility() {
-		return ignoreParentVisibility;
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoration.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoration.java
deleted file mode 100644
index 4ac2cb1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoration.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.ui.services.decorator;
-
-
-/**
- * This represents a decoration object returned by a decorator target. The
- * client holds onto this so that it can be deleted later.
- * 
- * @author cmahoney
- */
-public interface IDecoration {
-
-	/**
-	 * If this flag is set to true, then the decoration's visibility is not to
-	 * be affected by the parent's visibility. If this flag is set to false, if
-	 * the any figures in the parent hierarchy of this decoration is not
-	 * visible, then the decoration will be hidden.
-	 * 
-	 * @param ignoreParentVisibility
-	 *            True if the decoration's visibility is not to be affected by
-	 *            the parent's visibility; false otherwise.
-	 */
-	public void setIgnoreParentVisibility(boolean ignoreParentVisibility);
-
-	/**
-	 * Should this decoration's visibility be affected by the parent's
-	 * visibility?
-	 * 
-	 * @return True if the decoration's visibility is not to be affected by the
-	 *         parent's visibility; false otherwise.
-	 */
-	public boolean shouldIgnoreParentVisibility();
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecorator.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecorator.java
deleted file mode 100644
index 16b8ff0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecorator.java
+++ /dev/null
@@ -1,50 +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.services.decorator;
-
-
-/**
- * Clients providing an extension to the DecoratorService need to create  
- * a decorator class that implements the IDecorator interface.
- * 
- * This is the interface that a decorator must implement. A decorator is
- * installed on a decorator target to which it will add decoration figures.
- * 
- * @see IDecoratorProvider
- * 
- * @author cmahoney
- */
-public interface IDecorator {
-    /**
-     * Activates this decorator. The decorator might need to hook listeners.
-     * These listeners should be unhooked in <code>deactivate()</code>.
-     * 
-     * @see #deactivate()
-     */
-    public void activate();
-
-    /**
-     * Deactivates this decorator, the inverse of {@link #activate()}.
-     * Deactivate is called when the host decorator target is deactivated.
-     * Deactivate unhooks any listeners, and removes decoration figures that
-     * have been added.
-     * 
-     * @see #activate()
-     */
-    public void deactivate();
-
-    /**
-     * Refreshes the decorations. This is called when the host decorator target
-     * is refreshed.
-     */
-    public void refresh();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorKeys.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorKeys.java
deleted file mode 100644
index 10510a1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorKeys.java
+++ /dev/null
@@ -1,39 +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.services.decorator;
-
-/**
- * A list of keys defining decorators that could potentially be overridden. A
- * decorator is installed on a decorator target using a key (a String
- * identifier), if another decorator is installed on the same target with the
- * same key then it will override the previous one installed. This is similar to
- * how EditPolicy roles work. If a decorator is installed that may need to be
- * overridden, add its key here.
- * <p>
- * This interface defines constants only, it is <EM>not</EM> intended to be
- * implemented by clients.
- * </p>
- * 
- * @author cmahoney
- */
-public interface IDecoratorKeys {
-
-	/** The key used for the cross model reference decoration. */
-	public static final String CROSS_MODEL_REFERENCE = "CrossModelReference"; //$NON-NLS-1$
-
-	/** The key used for the unresolved view decoration. */
-	public static final String UNRESOLVED_VIEW = "UnresolvedView"; //$NON-NLS-1$
-
-	/** The key used for the bookmark decoration. */
-	public static final String BOOKMARK = "Bookmark"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorProvider.java
deleted file mode 100644
index b371439..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorProvider.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.diagram.ui.services.decorator;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * Clients providing an extension to the DecoratorService need to create a
- * decorator provider class that implements the IDecoratorProvider interface.
- * 
- * <p>
- * IDecoratorProvider is the interface for providers of the decorator service. A
- * decorator provider is responsible for installing its decorators on the
- * decorator targets that it wishes to decorate.
- * </p>
- * 
- * <p>
- * The provides method determines whether this decorator provider supports
- * adding decorations to a given decoration target. The operation in the
- * provides method will be of type <code>CreateDecoratorsOperation</code> from
- * which the decorator target can be extracted.
- * </p>
- * 
- * <p>
- * Here is an example:
- * 
- * <pre>
- * 
- *  
- *    public boolean provides(IOperation operation) {
- *  		if (!(operation instanceof CreateDecoratorsOperation)) {
- *  			return false;
- *  		}
- *  
- *  		IAdaptable adapter = ((CreateDecoratorsOperation) operation)
- *  			.getDecoratorTarget();
- *  		Object element = adapter.getAdapter(org.eclipse.uml2.Element.class);
- *  		
- *  		return CHECK CONDITION ON ELEMENT;
- *  	}
- *  
- *    public void createDecorators(IDecoratorTarget decoratorTarget) {
- *  		Object element = decoratorTarget.getAdapter(org.eclipse.uml2.Element.class));
- *       if (CHECK CONDITION ON ELEMENT) {
- *   		decoratorTarget.installDecorator(MY_DECORATOR_ID,
- *  			new MyDecorator(decoratorTarget));
- *       }
- *   }
- *   
- *  
- * </pre>
- * 
- * </p>
- * 
- * @see IDecoratorTarget
- * @see IDecorator
- * 
- * @author cmahoney
- */
-public interface IDecoratorProvider
-	extends IProvider {
-
-	/**
-	 * Creates the decorators and installs them on the decorator target. See
-	 * example above.
-	 * 
-	 * @param decoratorTarget
-	 *            the object to be decorated
-	 */
-	public void createDecorators(IDecoratorTarget decoratorTarget);
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorTarget.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorTarget.java
deleted file mode 100644
index e323dd4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/IDecoratorTarget.java
+++ /dev/null
@@ -1,199 +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.services.decorator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * An object that can be decorated. The decorator target is an adaptable.
- * Minimally, it adapts to an <code>EditPart</code> and
- * <code>org.eclipse.uml2.Element</code> if the shape/connection has an
- * underlying element.
- * 
- * <p>
- * Here is an example:
- * 
- * <pre>
- * theDecoratorTarget.getAdapter(EditPart.class)
- * </pre>
- * 
- * </p>
- * <p>
- * This interface is <EM>not</EM> intended to be implemented by clients as new
- * methods may be added in the future. 
- * </p>
- * 
- * @author cmahoney
- */
-public interface IDecoratorTarget
-
-	extends IAdaptable {
-    
-  /**
-   * Enumeration of directions for the location of shape decorations.
-   */
-    public class Direction {
-
-        private Direction() {
-            super();
-        }
-        
-        /** Center */
-        public static final Direction CENTER = new Direction();
-
-        /** North */
-        public static final Direction NORTH = new Direction();
-
-        /** South */
-        public static final Direction SOUTH = new Direction();
-
-        /** West */
-        public static final Direction WEST = new Direction();
-
-        /** East */
-        public static final Direction EAST = new Direction();
-
-        /** North-East */
-        public static final Direction NORTH_EAST = new Direction();
-
-        /** North-West */
-        public static final Direction NORTH_WEST = new Direction();
-
-        /** South-East */
-        public static final Direction SOUTH_EAST = new Direction();
-
-        /** South-West */
-        public static final Direction SOUTH_WEST = new Direction();
-    
-    }
-    
-	/**
-	 * Installs a decorator on this decorator target using a key (a String
-	 * identifier). If another decorator is installed on the same target with
-	 * the same key then it will override the previous one installed.
-	 * 
-	 * @param key
-	 *            the key for the decorator, used to override a decorator
-	 *            previously installed on this decoratorTarget object
-	 * @param decorator
-	 *            the decorator to install
-	 */
-	public void installDecorator(Object key, IDecorator decorator);
-
-	/**
-	 * Adds an image as a decoration on a shape.
-	 * 
-	 * @param image
-	 *            The image to be used as the decoration.
-	 * @param direction
-	 *            The direction relative to the shape to place the decoration.
-	 * @param margin
-	 *            The margin is the space, in himetric units, between the
-	 *            shape's edge and the decoration. A positive margin will place
-	 *            the figure outside the shape, a negative margin will place the
-	 *            decoration inside the shape.
-	 * @param isVolatile
-	 *            True if this decoration is volatile (i.e. not to be included
-	 *            in the printed output of a diagram); false otherwise.
-	 * @return The decoration object, which will be needed to remove the
-	 *         decoration from the shape.
-	 */
-	public IDecoration addShapeDecoration(Image image, Direction direction,
-			int margin, boolean isVolatile);
-
-	/**
-	 * Adds an image as a decoration on a connection.
-	 * 
-	 * @param image
-	 *            The image to be used as the decoration.
-	 * @param percentageFromSource
-	 *            The percentage of the connection length away from the source
-	 *            end (range is from 0 to 100) where the decoration should be
-	 *            positioned.
-	 * @param isVolatile
-	 *            True if this decoration is volatile (i.e. not to be included
-	 *            in the printed output of a diagram); false otherwise.
-	 * @return The decoration object, which will be needed to remove the
-	 *         decoration from the connection.
-	 */
-	public IDecoration addConnectionDecoration(Image image,
-			int percentageFromSource, boolean isVolatile);
-
-	/**
-	 * Removes the decoration from the shape or connection it has been added to.
-	 * 
-	 * @param decoration
-	 *            The decoration to be removed.
-	 */
-	public void removeDecoration(IDecoration decoration);
-    
-    /**
-     * Adds a figure as a decoration on a shape.
-     * 
-     * @param figure
-     *            the figure to be used as the decoration
-     * @param direction
-     *            The direction relative to the shape to place the
-     *            decoration.
-     * @param margin
-     *            The margin is the space, in himetric units, between the
-     *            shape's edge and the decoration. A positive margin will
-     *            place the figure outside the shape, a negative margin will
-     *            place the decoration inside the shape.
-     * @param isVolatile
-     *            True if this decoration is volatile (i.e. not to be
-     *            included in the printed output of a diagram); false
-     *            otherwise.
-     * @return The decoration object, which is needed to later remove the
-     *         decoration.
-     */
-    public IDecoration addShapeDecoration(IFigure figure,
-            Direction direction, int margin, boolean isVolatile);
-
-    /**
-     * Adds a figure as a decoration on a connection.
-     * 
-     * @param figure
-     *            the figure to be used as the decoration
-     * @param percentageFromSource
-     *            The percentage of the connection length away from the
-     *            source end (range is from 0 to 100) where the decoration
-     *            should be positioned.
-     * @param isVolatile
-     *            True if this decoration is volatile (i.e. not to be
-     *            included in the printed output of a diagram); false
-     *            otherwise.
-     * @return The decoration object, which is needed to later remove the
-     *         decoration.
-     */
-    public IDecoration addConnectionDecoration(IFigure figure,
-            int percentageFromSource, boolean isVolatile);
-    /**
-     * Adds a figure as a decoration on a shape or connection.
-     * 
-     * @param figure
-     *            the figure to be used as the decoration
-     * @param locator
-     *            The locator to be used to position the decoration
-     * @param isVolatile
-     *            True if this decoration is volatile (i.e. not to be
-     *            included in the printed output of a diagram); false
-     *            otherwise.
-     * @return The decoration object, which is needed to later remove the
-     *         decoration.
-     */
-    public IDecoration addDecoration(IFigure figure, Locator locator,
-            boolean isVolatile);
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/package.html
deleted file mode 100644
index 7a3299f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/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 the decorator specific classes like the provider, operation and the decorator itself</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/AbstractEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/AbstractEditPartProvider.java
deleted file mode 100644
index 55d29af..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/AbstractEditPartProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.editpart;
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.gef.RootEditPart;
-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.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-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;
-
-
-/**
- * An AbstractFactory implementation of the <code>IEditPartProvider</code> interface.  
- * This implementations invokes the approrpiate factory method by inspecting the supplied
- * operation and provides the actual editpart creation functionality.
- * @see #provides(IOperation)
- * 
- */
-public abstract class AbstractEditPartProvider extends AbstractProvider
-	implements IEditPartProvider, Properties {
-
-	/**
-	 * create an instance of <code>GraphicEditPaty</code>.   The instance is created
-	 * via reflection and the supplied paramter is the editpart's constructor paramter.
-	 * @param view the view to be controlled by the created editpart.
-	 */
-	public IGraphicalEditPart createGraphicEditPart(View view) {
-		Class editpartClass = getEditPartClass(view);
-		IGraphicalEditPart graphicEditPart = createNewGraphicEditPart(editpartClass, new Object[] {view});
-		Assert.isNotNull(graphicEditPart);
-		return graphicEditPart;
-	}
-	
-	/**
-	 * Cycles through the various operations supported by this provider and  
-	 * invokes the appropriate <code>setXXXEditPartClass</code> method.
-	 * 
-	 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(IOperation)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation#getView()
-	 * @param operation an instance of a <code>CreateGraphicEditPartOperation</code>
-	 * @return <tt>true</tt> if an editpart class was set, otherwise <tt>false</tt>. (i.e., 
-	 * <pre>return getEditPartClass() != null; </pre>
-	 */
-	public boolean provides(IOperation operation) {
-		if ( operation instanceof CreateGraphicEditPartOperation ) {
-			View view = (( IEditPartOperation)operation).getView();
-			return getEditPartClass(view) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * Gets an editpart class for the given view
-	 * @param view
-	 * @return <code>Class</code>
-	 */
-	private Class getEditPartClass(View view) {
-		if ( view instanceof Diagram)
-			return getDiagramEditPartClass(view );
-		else if ( view instanceof Edge )
-			return getEdgeEditPartClass(view);
-		else if (view instanceof Node)
-			return getNodeEditPartClass(view);
-		return null;
-	}
-	
-	/** 
-	 * Gets a connection'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
-	 * @return <code>Class</code>
-	 */
-	protected Class getEdgeEditPartClass(View view ) {
-		return null;
-	}
-
-	/**
-	 * 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
-	 * @return <code>Class</code> 
-	 */
-	protected Class getDiagramEditPartClass(View view ) {
-		return null;
-	}
-	
-	/**
-	 * 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
-	 * @return <code>Class</code>
-	 */
-	protected Class getNodeEditPartClass(View view ) {
-		return null;
-	}
-	
-	/**
-	 * Creates an editpart via reflection.
-	 * @param constructorParams the editpart's constructor paramters.
-	 */
-	private IGraphicalEditPart createNewGraphicEditPart(Class editpartClass, Object[] constructorParams) {
-		try {
-			Constructor constructor = getCreationConstructor(editpartClass);
-			Assert.isNotNull(constructor);
-
-			return (constructor == null)? null : (IGraphicalEditPart) constructor.newInstance(constructorParams);
-		} 
-		catch (Throwable e) {
-			String eMsg = NLS.bind(  
-				DiagramUIMessages.AbstractEditPartProvider_new_graphicaleditpart_failed_ERROR_,
-				editpartClass);
-			Log.warning(DiagramUIPlugin.getInstance(), IStatus.WARNING, eMsg, e);
-			return null;
-		}
-	}
-
-	/** 
-	 * Return the appropriate constuctor for the cached editpart class. 
-	 * @return a constructor (<tt>null</tt> if none could be found).
-	 */
-	private Constructor getCreationConstructor(Class editpartClass) {
-		Assert.isNotNull(editpartClass);
-
-		if (editpartClass != null) {
-			Constructor[] consts = editpartClass.getConstructors();
-			if (consts.length != 0)
-				return consts[0];
-		}
-		return null;
-	}
-	
-	/**
-	 * gets the supplied view's underlying notation element's eClass
-	 * @param view 
-	 * @return the view's <code>EClass</code>
-	 */
-	protected static EClass getReferencedElementEClass(View view ) {
-		return EMFCoreUtil.getProxyClass(view.getElement());
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider#createRootEditPart(org.eclipse.gmf.runtime.notation.Diagram)
-	 */
-	public RootEditPart createRootEditPart(Diagram diagram) {
-		return null;
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java
deleted file mode 100644
index 5cab786..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java
+++ /dev/null
@@ -1,46 +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.services.editpart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.EditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider;
-import org.eclipse.gmf.runtime.notation.View;
- 
-/**
- * Concrete operation to create a <code>IGraphicalEditPart</code> (or subclass) element.
- * 
- * @author gsturov
- */
-public class CreateGraphicEditPartOperation
-	extends EditPartOperation {
-	
-	/**
-	 * Constructor. Caches the supplied view.
-	 * 
-	 * @param view
-	 *            the view element to be <i>controlled </i> by the created
-	 *            editpart.
-	 */
-	protected CreateGraphicEditPartOperation(View view) {
-		super(view);
-	}
-
-	/** 
-	 * creates the editpart.
-	 * @param provider the provider capable of honoring this operation.
-	 * @return the created editpart instance.
-	 */
-	public Object execute(IProvider provider) {
-		return ((IEditPartProvider) provider).createGraphicEditPart(getView());
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.java
deleted file mode 100644
index b5e2136..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.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.diagram.ui.services.editpart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.EditPartOperation;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-/**
- * Concrete operation to create a <code>RootEditPart</code> (or
- * subclass) element.
- * 
- * @author cmahoney
- */
-public class CreateRootEditPartOperation extends EditPartOperation {
-
-	/**
-	 * Constructor
-	 * @param diagram <code>Diagram</code> notation object that is the context for the operation.
-	 */
-	public CreateRootEditPartOperation(Diagram diagram) {
-		super(diagram);
-	}
-
-	/**
-	 * Creates the editpart.
-	 * 
-	 * @param provider
-	 *            the provider capable of honoring this operation.
-	 * @return the created editpart instance.
-	 */
-	public Object execute(IProvider provider) {
-		return ((IEditPartProvider) provider).createRootEditPart((Diagram)getView());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java
deleted file mode 100644
index 96c0094..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.editpart;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.RootEditPart;
-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.Trace;
-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.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DefaultCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DefaultConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.DefaultNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.EditPartProviderConfiguration;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider;
-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.Ratio;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * A service that supports the creation of editpart elements.  Default editparts will be created
- * if no sub-implementation creates one.
- * @see #createGraphicEditPart(View)
- */
-final public class EditPartService
-	extends Service
-	implements IEditPartProvider, EditPartFactory {
-	
-	/**
-	 * 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 EditPartProviderConfiguration 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 =
-				EditPartProviderConfiguration.parse(element);
-			Assert.isNotNull(providerConfiguration);
-		}
-
-		/**
-		 * @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 <code> true</code> or <code>false</code>
-		 */
-		private boolean isSupportedInExtention(IOperation operation) {
-			if (operation instanceof CreateGraphicEditPartOperation) {
-				CreateGraphicEditPartOperation o = (CreateGraphicEditPartOperation) operation;
-				return providerConfiguration.supports(o.getView());
-			} else if (operation instanceof CreateRootEditPartOperation) {
-				return providerConfiguration.supportsRootEditPart();
-			}
-			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$
-		}
-	}
-
-	/** singelton instance. */
-	private final static EditPartService instance = new EditPartService();
-
-	/**
-     * constructor
-	 */
-	private EditPartService() {
-		super(true, false);
-		configureProviders(DiagramUIPlugin.getPluginId(), "editpartProviders"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Signleton constructor.
-	 * @return the Signleton instance
-	 */
-	public static EditPartService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @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();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.common.core.service.Service#getCachingKey(org.eclipse.gmf.runtime.common.core.service.IOperation)
-	 */
-	protected Object getCachingKey(IOperation operation) {
-		return ((IEditPartOperation)operation).getCachingKey();
-	}
-
-	/** 
-	 * Creates an <code>IGraphicalEditPart</code> instance by forwarding a <code>CreateGraphicEditPartOperation</code>
-	 * to the registered providers.  The supplied parameter is the editpart's constructor
-	 * parameter. <P>
-	 * The following <i>default</i> editparts are created if none is created by a provider.
-	 * <UL>
-	 * <LI> <code>IDiagramView</code> ... <code>DiagramEditPart</code>
-	 * <LI> <code>ILabelView</code< ... <code>LabelEditPart</code>
-	 * <LI> <code>ITextCompartmentView</code> ... <code>TextCompartmentEditPart</code>
-	 * </UL>
-	 * @param view the view element <i>controlled</i> by the created editpart
-	 * @return an instance.
-	 */
-	public IGraphicalEditPart createGraphicEditPart(View view) {
-		if (view == null)
-			return null;
-
-		IGraphicalEditPart result = null;
-		CreateGraphicEditPartOperation createGraphicEditPartOperation = 
-			new CreateGraphicEditPartOperation(view);
-		result =
-				(IGraphicalEditPart) execute(createGraphicEditPartOperation);
-		
-		if (result == null) {
-			if (view instanceof Node) {
-				if (((Node)view).getLayoutConstraint() instanceof Ratio) {
-					result = new DefaultCompartmentEditPart(view);					
-				} else {
-					result = new DefaultNodeEditPart(view);
-				}
-			} else if (view instanceof Edge) {
-				result = new DefaultConnectionEditPart(view);
-			} else if (view instanceof Diagram) {
-				result = new DiagramEditPart(view);
-			}
-		}
-		return result;
-	}
-
-	/**
-	  * Executes the specified operation using the FIRST execution strategy;
-	  * the first provider capable of honoring the supplied operation.
-	  * @param operation
-	  * @return the provider's return value (or <tt>null</tt> if there was no
-	  * provider able to honor the supplied operation.
-	  */
-	private Object execute(IOperation operation) {
-		List results = execute(ExecutionStrategy.FIRST, operation);
-		return results.isEmpty() ? null : results.get(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, java.lang.Object)
-	 */
-	public EditPart createEditPart(EditPart context, final Object model) {
-		try {
-			return (EditPart)TransactionUtil.getEditingDomain(model).runExclusive( new RunnableWithResult.Impl() {
-				public void run() {
-					setResult(createGraphicEditPart((View)model));
-				}
-			});
-		} catch (InterruptedException e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-				"createEditPart", e); //$NON-NLS-1$
-			Log.error(DiagramUIPlugin.getInstance(),
-				DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-				"createEditPart", e); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider#createRootEditPart(org.eclipse.gmf.runtime.notation.Diagram)
-	 */
-	public RootEditPart createRootEditPart(Diagram diagram) {
-		RootEditPart result;
-		CreateRootEditPartOperation createRootEditPartOperation = new CreateRootEditPartOperation(diagram);
-		result = (RootEditPart) execute(createRootEditPartOperation);
-
-		// provide default implementation
-		return (result == null) ? new DiagramRootEditPart(diagram.getMeasurementUnit())
-			: result;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/IEditPartOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/IEditPartOperation.java
deleted file mode 100644
index f33dfee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/IEditPartOperation.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.services.editpart;
-
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * <p>
- * This interface is <EM>not</EM> intended to be implemented by clients as new
- * methods may be added in the future. 
- * </p>
- *
- * @author cmahoney
- */
-public interface IEditPartOperation extends IOperation {
-
-	/**
-	 * Gets the caching key.
-	 * 
-	 * @return a string to be used as the caching key
-	 */
-	public abstract String getCachingKey();
-
-	/**
-	 * gets the cached view.
-	 * @return the notation View
-	 */
-	public abstract View getView();
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/package.html
deleted file mode 100644
index c3e9d5c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/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 %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/CreateEditPoliciesOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/CreateEditPoliciesOperation.java
deleted file mode 100644
index 6c3cf4a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/CreateEditPoliciesOperation.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.editpolicy;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The operation used with the EditPolicy Service.
- * 
- * @author chmahone
- */
-public class CreateEditPoliciesOperation implements IOperation {
-
-	/** the editPart */
-	private final EditPart editPart;
-
-	/**
-	 * Constructor for <code>CreateEditPoliciesOperation</code>.
-	 * @param editPart edit part to associate with this opertion
-	 */
-	public CreateEditPoliciesOperation(EditPart editPart) {
-		Assert.isNotNull(editPart);
-		this.editPart = editPart;
-	}
-
-	/* (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.isNotNull(provider);
-
-		((IEditPolicyProvider) provider).createEditPolicies(getEditPart());
-		return null;
-	}
-
-	/**
-	 * Returns the editpart.
-	 * @return the editpart
-	 */
-	public final EditPart getEditPart() {
-		return editPart;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/IEditPolicyProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/IEditPolicyProvider.java
deleted file mode 100644
index a082213..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/IEditPolicyProvider.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.diagram.ui.services.editpolicy;
-
-import org.eclipse.gef.EditPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for providers of the EditPolicy Service.
- * 
- * @author chmahone
- */
-public interface IEditPolicyProvider extends IProvider {
-
-	/**
-	 * Creates and installs the applicable editpolicies on the given editpart.
-	 * @param editPart the <code>EditPart</code>
-	 */
-	public void createEditPolicies(EditPart editPart);
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/package.html
deleted file mode 100644
index 9afb8b1..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpolicy/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, selection…etc).
-<li> Every role is responsible for satisfying one or more requests by returning commands
-</ul>
-
-</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutEditPartProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutEditPartProvider.java
deleted file mode 100644
index eb97989..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutEditPartProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.layout;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.IInternalLayoutRunnable;
-import org.eclipse.gmf.runtime.notation.Node;
-
-/**
- * @author sshaw
- * 
- * Abstract provider for internal layout providers. Provides a redirection from
- * the Node based api to the internal EditPart based api.
- */
-abstract public class AbstractLayoutEditPartProvider extends
-		AbstractLayoutNodeProvider {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider#layoutNodes(java.util.List,
-	 *      boolean, org.eclipse.core.runtime.IAdaptable)
-	 */
-	public Runnable layoutLayoutNodes(List layoutNodes,
-			boolean offsetFromBoundingBox, IAdaptable layoutHint) {
-		IGraphicalEditPart gep = (IGraphicalEditPart) layoutHint
-				.getAdapter(IGraphicalEditPart.class);
-		Assert.isNotNull(gep, "The Graphical EditPart is null"); //$NON-NLS-1$
-
-        if (offsetFromBoundingBox) {
-            List editparts = new ArrayList(layoutNodes.size());
-            Map registry = gep.getViewer().getEditPartRegistry();
-            Iterator nodes = layoutNodes.listIterator();
-            while (nodes.hasNext()) {
-                Node view = ((ILayoutNode) nodes.next()).getNode();
-                editparts.add(registry.get(view));
-            }
-			final Command cmdSelect = layoutEditParts(editparts, layoutHint);
-			return new IInternalLayoutRunnable() {
-				public void run() {
-					if (cmdSelect != null && cmdSelect.canExecute()) {
-						cmdSelect.execute();
-					}
-				}
-
-				public Command getCommand() {
-					return cmdSelect;
-				}
-			};
-		} else {
-			final Command cmdDiag = layoutEditParts(gep, layoutHint);
-
-			return new IInternalLayoutRunnable() {
-				public void run() {
-					if (cmdDiag != null && cmdDiag.canExecute()) {
-						cmdDiag.execute();
-					}
-				}
-
-				public Command getCommand() {
-					return cmdDiag;
-				}
-			};
-		}
-	}
-
-	/**
-	 * Layout the objects in this container using the specified layout type.
-	 * 
-	 * @param containerEditPart
-	 *            <code>GraphicalEditPart</code> that is the container for the
-	 *            layout operation.
-	 * @param layoutHint
-	 *            <code>IAdaptable</code> hint to the provider to determine
-	 *            the layout kind.
-	 * @return <code>Command</code> that when executed will layout the edit
-	 *         parts in the container
-	 */
-	abstract public Command layoutEditParts(
-			GraphicalEditPart containerEditPart, IAdaptable layoutHint);
-
-	/**
-	 * Layout this list of selected objects, using the specified layout hint.
-	 * The selected objects all reside within the same parent container. Other
-	 * elements that are part of the container but not specified in the list of
-	 * objects, are ignored.
-	 * 
-	 * @param selectedObjects
-	 *            <code>List</code> of <code>EditPart</code> objects that
-	 *            are to be layed out.
-	 * @param layoutHint
-	 *            <code>IAdaptable</code> hint to the provider to determine
-	 *            the layout kind.
-	 * @return <code>Command</code> that when executed will layout the edit
-	 *         parts in the container
-	 */
-	abstract public Command layoutEditParts(List selectedObjects,
-			IAdaptable layoutHint);
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutNodeProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutNodeProvider.java
deleted file mode 100644
index 15dde78..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/AbstractLayoutNodeProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.layout;
-
-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.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author sshaw
- * 
- * Abstract provider for internal layout providers. Provides a redirection from
- * the Node based api to the internal EditPart based api.
- */
-abstract public class AbstractLayoutNodeProvider extends AbstractProvider
-		implements ILayoutNodeProvider {
-
-	/**
-	 * Retrieves the common container that will be the target for the layout
-	 * operation.
-	 * 
-	 * @param operation
-	 *            the <code>IOperation</code> that gets thee contributing
-	 *            nodes to the layout to calculate the container from.
-	 * @return the <code>View</code> that will be the target for the layout
-	 *         operation
-	 */
-	protected View getContainer(IOperation operation) {
-		View container = null;
-
-		if (operation instanceof ILayoutNodeOperation) {
-			Iterator nodes = ((ILayoutNodeOperation) operation)
-					.getLayoutNodes().listIterator();
-			if (nodes.hasNext()) {
-				Node node = ((ILayoutNode) nodes.next()).getNode();
-				container = ViewUtil.getContainerView(node);
-			}
-		} else {
-			return null;
-		}
-
-		return container;
-	}
-
-	/**
-	 * Gets a <code>Map</code> where the keys are the notation
-	 * <code>Node</code> and the associated value is a
-	 * <code>org.eclipse.draw2d.geometry.Dimension</code> object.
-	 * 
-	 * @param operation
-	 *            <code>ILayoutNodeOperation</code> to retrieve the nodes
-	 *            sizes
-	 * @return <code>Map</code>
-	 */
-	protected Map getNodeToSizeMap(ILayoutNodeOperation operation) {
-		List layoutNodes = operation.getLayoutNodes();
-		Map viewsToSizesMap = new HashMap(layoutNodes.size());
-		Iterator nodes = layoutNodes.listIterator();
-		while (nodes.hasNext()) {
-			ILayoutNode layoutNode = ((ILayoutNode) nodes.next());
-			Node node = layoutNode.getNode();
-
-			viewsToSizesMap.put(node,
-					new org.eclipse.draw2d.geometry.Dimension(layoutNode
-							.getWidth(), layoutNode.getHeight()));
-		}
-
-		return viewsToSizesMap;
-	}
-
-	/**
-	 * @since 1.4
-	 */
-	public boolean canLayoutNodes(List layoutNodes,
-			boolean shouldOffsetFromBoundingBox, IAdaptable layoutHint) {
-		return layoutNodes != null && !layoutNodes.isEmpty();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNode.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNode.java
deleted file mode 100644
index 09aa95b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNode.java
+++ /dev/null
@@ -1,55 +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.services.layout;
-
-import org.eclipse.gmf.runtime.notation.Node;
-
-/**
- * Interface that wraps the Node view in order to retrieve the size when the
- * Node's extent (either width or height) have been autosized.
- * 
- * This interface can be used in the layout provider implementation class.
- * 
- * 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 ILayoutNode {
-
-	/**
-	 * Accessor method to return the notation meta-model <code>Node</code>
-	 * object.
-	 * 
-	 * @return <code>Node</code> that this interface object wraps
-	 */
-	public Node getNode();
-
-	/**
-	 * Accessor method to return the actual height of the node irrespective of
-	 * whether the Nodes extent (width/height) is in auto-size mode.
-	 * 
-	 * @return <code>int</code> value representing the actual height of the
-	 *         <code>Node</code>.
-	 */
-
-	public int getHeight();
-
-	/**
-	 * Accessor method to return the actual width of the node irrespective of
-	 * whether the Nodes extent (width/height) is in auto-size mode.
-	 * 
-	 * @return <code>int</code> value representing the actual width of the
-	 *         <code>Node</code>.
-	 */
-	public int getWidth();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeOperation.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeOperation.java
deleted file mode 100644
index bf5d37d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeOperation.java
+++ /dev/null
@@ -1,56 +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.services.layout;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-
-/**
- * Interface describing the layout operation for a set of nodes with
- * corresponding sizes.
- * 
- * This interface can be used in the layout provider implementation class.
- * 
- * 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 ILayoutNodeOperation extends IOperation {
-
-	/**
-	 * Gets the list of nodes to layout.
-	 * 
-	 * @return <code>List</code> of <code>ILayoutNode</code> objects that
-	 *         are to participate in the layout operation.
-	 */
-	public abstract List getLayoutNodes();
-
-	/**
-	 * @return <code>boolean</code> indicating whether the nodes should be
-	 *         laid out relative to the bounding box of the original position of
-	 *         the nodes that are participating in the layout operation.
-	 */
-	public abstract boolean shouldOffsetFromBoundingBox();
-
-	/**
-	 * Retrieves the value of the <code>layoutHint</code> instance variable.
-	 * 
-	 * @return <code>IAdaptable</code> hint to the provider to determine the
-	 *         layout kind. <code>IAdaptable</code> will typically adapt to
-	 *         string that can be one of <code>LayoutType.DEFAULT</code> or
-	 *         <code>LayoutType.RADIAL</code>
-	 */
-	public IAdaptable getLayoutHint();
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeProvider.java
deleted file mode 100644
index 2b8751d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/ILayoutNodeProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.layout;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * The interface for providers of the layout provider extension point.
- * 
- * The {@link ILayoutNodeProvider#layoutLayoutNodes(List, boolean, IAdaptable)}
- * method call is invoked by internal diagram code for "arrange" actions.
- * 
- * Consideration of dependencies has to be done when choosing the priority of
- * the provider. The layout operation is executed on the first provider (in
- * descending order of priority) that is found to provide the operation.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * IMPORTANT: This interface is <EM>not</EM> intended to be implemented by
- * clients. Clients should inherit from
- * {@link org.eclipse.gmf.runtime.diagram.ui.services.layout.AbstractLayoutNodeProvider}.
- * New methods may be added in the future.
- * 
- * @author sshaw
- */
-public interface ILayoutNodeProvider extends IProvider {
-
-	/**
-	 * Layout this map of nodes, using the specified layout hint.
-	 * 
-	 * @param layoutNodes
-	 *            List of <code>ILayoutNode</code> objects that are to
-	 *            participate in the layout.
-	 * @param offsetFromBoundingBox
-	 *            <code>boolean</code> indicating whether the Nodes should be
-	 *            laid out relative to the bounding box of the Nodes in the
-	 *            nodesToSizes Map.
-	 * @param layoutHint
-	 *            <code>IAdaptable</code> hint to the provider to determine
-	 *            the layout kind. <code>IAdaptable</code> will typically
-	 *            adapt to string that can be one of
-	 *            <code>LayoutType.DEFAULT</code> or
-	 *            <code>LayoutType.RADIAL</code>.
-	 * @return <code>Runnable</code> that contains the layout changes to be
-	 *         executed.
-	 */
-	public Runnable layoutLayoutNodes(List layoutNodes,
-			boolean offsetFromBoundingBox, IAdaptable layoutHint);
-
-	/**
-	 * Returns <code>true</code> if the nodes can be laid out by the provider,
-	 * e.g whether the layout is needed.
-	 * 
-	 * @param layoutNodes
-	 *            List of <code>ILayoutNode</code> objects that are to
-	 *            participate in the layout.
-	 * @param offsetFromBoundingBox
-	 *            <code>boolean</code> indicating whether the Nodes should be
-	 *            laid out relative to the bounding box of the Nodes in the
-	 *            nodesToSizes Map.
-	 * @param layoutHint
-	 *            <code>IAdaptable</code> hint to the provider to determine the
-	 *            layout kind. <code>IAdaptable</code> will typically adapt to
-	 *            string that can be one of <code>LayoutType.DEFAULT</code> or
-	 *            <code>LayoutType.RADIAL</code>.
-	 * @return <code>true</code> if nodes can be laid out
-	 * 
-	 * @since 1.4
-	 */
-	public boolean canLayoutNodes(List layoutNodes,
-			boolean shouldOffsetFromBoundingBox, IAdaptable layoutHint);
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutService.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutService.java
deleted file mode 100644
index e82efcc..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutService.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.layout;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
-import org.eclipse.gmf.runtime.common.core.service.Service;
-import org.eclipse.gmf.runtime.common.core.util.ObjectAdapter;
-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.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.CanLayoutNodesOperation;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutNode;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutNodesOperation;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A service that provides for diagram layout.
- * 
- * @author schafe / sshaw
- */
-final public class LayoutService extends Service implements
-		ILayoutNodeProvider {
-
-	private final static LayoutService instance = new LayoutService();
-
-	private LayoutService() {
-		super(); // no caching for now
-		configureProviders(DiagramUIPlugin.getPluginId(), "layoutProviders"); //$NON-NLS-1$
-	}
-
-	public static LayoutService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Executes the specified layout operation using the <code>ExecutionStrategy.FIRST</code> 
-	 * execution strategy.
-	 * 
-	 * @param operation
-	 * @return Object
-	 */
-	private Object execute(LayoutNodesOperation operation) {
-		List results = execute(ExecutionStrategy.FIRST, operation);
-		return results.isEmpty() ? null : results.get(0);
-	}
-
-	/**
-	 * Gets the <code>ILayoutNode</code> in order to retrieve the actual size
-	 * of the Node object irrespective of the autosize properties.
-	 * 
-	 * @param node
-	 *            Node to get the layout node equivalent from
-	 * @return <code>ILayoutNode</code>object
-	 * 
-	 * @throws NullPointerException
-	 *             <code>node</code> is <code>null</code>
-	 */
-	public ILayoutNode getLayoutNode(Node node) {
-		if (null == node) {
-			throw new NullPointerException("Argument 'node' is null"); //$NON-NLS-1$
-		}
-
-        Shell shell = new Shell();
-        try {
-            Diagram diagram = node.getDiagram();
-            DiagramEditPart diagramEP = OffscreenEditPartFactory.getInstance()
-                .createDiagramEditPart(diagram, shell);
-            Map registry = diagramEP.getViewer().getEditPartRegistry();
-            GraphicalEditPart gep = (GraphicalEditPart) registry.get(node);
-            Dimension size = gep.getFigure().getBounds().getSize();
-
-            return new LayoutNode(node, size.width, size.height);
-        } finally {
-            shell.dispose();
-        }
-	}
-
-	private void checkValidLayoutNodes(List nodes) {
-		if (null == nodes) {
-			throw new NullPointerException("Argument 'nodes' is null"); //$NON-NLS-1$
-		}
-		if (nodes.size() == 0) {
-			throw new IllegalArgumentException("Argument 'nodes' is empty"); //$NON-NLS-1$
-		}
-
-		ListIterator li = nodes.listIterator();
-		EObject parent = null;
-		while (li.hasNext()) {
-			Object next = li.next();
-			if (!(next instanceof ILayoutNode))
-				throw new IllegalArgumentException(
-						"Argument 'nodes' contains objects which aren't of type 'ILayoutNode'"); //$NON-NLS-1$
-			ILayoutNode node = (ILayoutNode) next;
-
-			if (parent == null)
-				parent = ViewUtil.getContainerView(node.getNode());
-			else if (ViewUtil.getContainerView(node.getNode()) != parent)
-				throw new IllegalArgumentException(
-						"Argument 'nodes' contains objects which have a different parent containment"); //$NON-NLS-1$
-		}
-	}
-	
-	private void checkValidNodes(List nodes) {
-		if (null == nodes) {
-			throw new NullPointerException("Argument 'nodes' is null"); //$NON-NLS-1$
-		}
-		if (nodes.size() == 0) {
-			throw new IllegalArgumentException("Argument 'nodes' is empty"); //$NON-NLS-1$
-		}
-
-		ListIterator li = nodes.listIterator();
-		EObject parent = null;
-		while (li.hasNext()) {
-			Object next = li.next();
-			if (!(next instanceof Node))
-				throw new IllegalArgumentException(
-						"Argument 'nodes' contains objects which aren't of type 'Node'"); //$NON-NLS-1$
-			Node node = (Node) next;
-
-			if (parent == null)
-				parent = ViewUtil.getContainerView(node);
-			else if (ViewUtil.getContainerView(node) != parent)
-				throw new IllegalArgumentException(
-						"Argument 'nodes' contains objects which have a different parent containment"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @param diagramEP
-	 *            the diagram edit part to use
-	 * @param nodes
-	 *            List of <code>Node</code> objects
-	 * @return List of <code>ILayoutNodes</code> objects
-	 */
-	public List getLayoutNodes(DiagramEditPart diagramEP, List nodes) {
-		checkValidNodes(nodes);
-
-        Shell shell = null;
-        try {
-            if (diagramEP == null) {
-                shell = new Shell();
-                Diagram diagram = ((Node) nodes.get(0)).getDiagram();
-                diagramEP = OffscreenEditPartFactory.getInstance()
-                    .createDiagramEditPart(diagram, shell);
-            }
-            Map registry = diagramEP.getViewer().getEditPartRegistry();
-
-            List layoutNodes = new ArrayList(nodes.size());
-            ListIterator li = nodes.listIterator();
-            while (li.hasNext()) {
-                Node node = (Node) li.next();
-                GraphicalEditPart gep = (GraphicalEditPart) registry.get(node);
-                Dimension size = gep.getFigure().getBounds().getSize();
-
-                layoutNodes.add(new LayoutNode(node, size.width, size.height));
-            }
-
-            return layoutNodes;
-        } finally {
-            if (shell != null) {
-                shell.dispose();
-            }
-        }
-	}
-
-	/**
-	 * Utility method to layout the children of a view container.
-	 * 
-	 * @param container
-	 *            <code>View</code> object that is the container whose children will be laid
-	 *            out.
-	 * @param hint
-	 *            <code>String</code> representing a hint for what kind of layout will be
-	 *            applied. Value can be one of
-	 *            <code>ILayoutType.DEFAULT</code>, <code>ILayoutType.RADIAL</code>.
-	 *            Other values would have to understand by custom providers.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider
-	 * @throws NullPointerException
-	 *             <code>View</code> is <code>null</code>
-	 * @throws NullPointerException
-	 *             <code>hint</code> is <code>null</code>
-	 */
-	public void layout(View container, String hint) {
-		if (null == container) {
-			throw new NullPointerException("Argument 'view' is null"); //$NON-NLS-1$
-		}
-		if (null == hint) {
-			throw new NullPointerException("Argument 'hint' is null"); //$NON-NLS-1$
-		}
-
-        Shell shell = new Shell();
-        try {
-            Diagram diagram = container.getDiagram();
-            DiagramEditPart diagramEP = OffscreenEditPartFactory.getInstance()
-                .createDiagramEditPart(diagram, shell);
-
-            List hints = new ArrayList(2);
-            hints.add(hint);
-            hints.add(diagramEP);
-            IAdaptable layoutHint = new ObjectAdapter(hints);
-            final Runnable layoutRun = LayoutService.getInstance()
-                .layoutLayoutNodes(
-                    getLayoutNodes(diagramEP, container.getChildren()), false,
-                    layoutHint);
-            layoutRun.run();
-        } finally {
-            shell.dispose();
-        }
-    }
-
-	/**
-	 * Utility method to layout a list of Node children on a diagram.
-	 * 
-	 * @param nodes
-	 *            <code>List</code> of {@link org.eclipse.gmf.runtime.notation.Node} objects or
-	 *            <code>List</code> of {@link org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNode} objects
-	 * @param offsetFromBoundingBox
-	 *            <code>boolean</code> indicating whether the Nodes should be
-	 *            laid out relative to the bounding box of the Nodes in the
-	 *            nodesToSizes Map.       
-	 * @param hint
-	 *            String representing a hint for what kind of layout will be
-	 *            applied. Value can be one of
-	 *            <code>ILayoutType.DEFAULT</code>, <code>ILayoutType.RADIAL</code>.
-	 *            Other values can be provided but would have to be understand by custom providers.
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodeProvider
-	 * @throws NullPointerException
-	 *             <code>nodes</code> is <code>null</code>
-	 * @throws IllegalArgumentException
-	 *             nodes is an empty list
-	 * @throws NullPointerException
-	 *             <code>hint</code> is <code>null</code>
-	 * @throws IllegalArgumentException
-	 *             Argument <code>nodes</code> contains objects which aren't
-	 *             of type <code>Node</code>
-	 * @throws IllegalArgumentException
-	 *             Argument <code>nodes</code> contains objects which have a
-	 *             different parent containment
-	 */
-	public void layoutNodes(List nodes, boolean offsetFromBoundingBox, String hint) {
-		checkValidNodes(nodes);
-
-		if (null == hint) {
-			throw new NullPointerException("Argument 'hint' is null"); //$NON-NLS-1$
-		}
-
-        Shell shell = new Shell();
-        try {
-            Node nodeFirst = (Node) nodes.get(0);
-            Diagram diagram = nodeFirst.getDiagram();
-            DiagramEditPart diagramEP = OffscreenEditPartFactory.getInstance()
-                .createDiagramEditPart(diagram, shell);
-
-            List hints = new ArrayList(2);
-            hints.add(hint);
-            hints.add(diagramEP);
-            IAdaptable layoutHint = new ObjectAdapter(hints);
-            final Runnable layoutRun = LayoutService.getInstance()
-                .layoutLayoutNodes(getLayoutNodes(diagramEP, nodes), true,
-                    layoutHint);
-            layoutRun.run();
-        } finally {
-            shell.dispose();
-        }
-    }
-	
-	public Runnable layoutLayoutNodes(List layoutNodes,
-			boolean offsetFromBoundingBox, IAdaptable layoutHint) {
-		if (null == layoutHint) {
-			throw new NullPointerException("Argument 'layoutHint' is null"); //$NON-NLS-1$
-		}
-		checkValidLayoutNodes(layoutNodes);
-		
-		Assert.isNotNull(layoutNodes);
-		Assert.isNotNull(layoutHint);
-		return (Runnable) execute(new LayoutNodesOperation(layoutNodes,
-				offsetFromBoundingBox, layoutHint));
-	}
-
-	/**
-	 * @since 1.4
-	 */
-	public boolean canLayoutNodes(List layoutNodes,
-			boolean shouldOffsetFromBoundingBox, IAdaptable layoutHint) {
-		return execute(new CanLayoutNodesOperation(layoutNodes, shouldOffsetFromBoundingBox, layoutHint)) == Boolean.TRUE;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutType.java
deleted file mode 100644
index 0d7520c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/LayoutType.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.runtime.diagram.ui.services.layout;
-
-
-/**
- * A String table for the Layout types.
- * 
- * @author tmacdoug  
- */
-final public class LayoutType {
-
-	/**
-	 * the default layout type
-	 */
-	public static final String DEFAULT = "DEFAULT"; //$NON-NLS-1$
-	
-	/**
-	 * the radial layout type
-	 */
-	public static final String RADIAL = "RADIAL"; //$NON-NLS-1$
-    
-    /**
-     * the composite layout type
-     */
-    public static final String COMPOSITE = "COMPOSITE"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/package.html
deleted file mode 100644
index d75330d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/layout/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>Lauout specific classes either operations or types</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/IPaletteProvider.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/IPaletteProvider.java
deleted file mode 100644
index f6ce34a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/IPaletteProvider.java
+++ /dev/null
@@ -1,52 +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.services.palette;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.common.core.service.IProvider;
-
-/**
- * @author melaasar
- *
- * The palette provider interface.
- */
-public interface IPaletteProvider extends IProvider {
-
-	/**
-	 * Contributes to the palette of the given editor with the given content
-	 * 
-	 * @param editor The editor hosting the palette
-	 * @param content The editor's contents
-	 * @param root The editor's palette root
-     * @param predefinedEntries
-     *            map of predefined palette entries where the key is the palette
-     *            entry id and the value is the palette entry
-	 */
-	public void contributeToPalette(IEditorPart editor, Object content,
-            PaletteRoot root, Map predefinedEntries);
-
-	
-	/**
-	 * 
-	 * Sets the contributions data using the configuration elements  
-	 * 
-	 * @param configElement
-	 */
-	public void setContributions(IConfigurationElement configElement);
-	
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteFactory.java
deleted file mode 100644
index 64773c8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteFactory.java
+++ /dev/null
@@ -1,63 +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.services.palette;
-
-import org.eclipse.gef.Tool;
-
-/**
- * @author melaasar
- * 
- * An interface for defining a factory for palette entries : toolss & templates
- * <p>
- * This interface is <EM>not</EM> intended to be implemented by clients as new
- * methods may be added in the future. Extend the <code>Adapter</code> class
- * instead.
- * </p>
- */
-public interface PaletteFactory {
-
-	/**
-	 * Creates a new instance of the tool with the given id
-	 * 
-	 * @param toolId The tool Id
-	 * @return the created tool
-	 */
-	public Tool createTool(String toolId);
-
-	/**
-	 * Gets the palette template with the given id
-	 * 
-	 * @param templateId The template id
-	 * @return the template
-	 */
-	public Object getTemplate(String templateId);
-
-
-	/**
-	 * An empty adapter for the interface
-	 */
-	public class Adapter implements PaletteFactory {
-		/**
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory#getTemplate(java.lang.String)
-		 */
-		public Object getTemplate(String templateId) {
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory#createTool(java.lang.String)
-		 */
-		public Tool createTool(String toolId) {
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java
deleted file mode 100644
index 8d0ddc4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.palette;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PanningSelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-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.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.services.util.ActivityFilterProviderDescriptor;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.ContributeToPaletteOperation;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteProviderConfiguration;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteSeparator;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteToolbar;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author melaasar
- *
- * A service to contributes to the palette of a given editor with a given content
- */
-public class PaletteService extends Service implements IPaletteProvider {
-
-	/**
-	 * @author schafe
-	 * @author melaasar
-	 *
-	 * A descriptor for palette providers defined by a configuration
-	 * element.
-	 */
-	protected static class ProviderDescriptor
-		extends ActivityFilterProviderDescriptor {
-
-		/** the provider configuration parsed from XML */
-		private PaletteProviderConfiguration 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 =
-				PaletteProviderConfiguration.parse(element);
-			Assert.isNotNull(providerConfiguration);
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.common.core.service.IProvider#provides(org.eclipse.gmf.runtime.common.core.service.IOperation)
-		 */
-		public boolean provides(IOperation operation) {
-			if (!super.provides(operation)) {
-				return false;
-			}
-			if (!policyInitialized){
-				policy = getPolicy();
-				policyInitialized = true;
-			}
-			if (policy != null)
-				return policy.provides(operation);
-			
-			if (operation instanceof ContributeToPaletteOperation) {
-				ContributeToPaletteOperation o =
-					(ContributeToPaletteOperation) operation;
-
-				return providerConfiguration.supports(
-					o.getEditor(),
-					o.getContent());
-			}
-			return false;
-		}
-
-		/**
-		 * @see org.eclipse.gmf.runtime.common.core.service.Service.ProviderDescriptor#getProvider()
-		 */
-		public IProvider getProvider() {
-			if (provider == null) {
-				IProvider newProvider = super.getProvider();
-				if (provider instanceof IPaletteProvider) {
-					IPaletteProvider defaultProvider =
-						(IPaletteProvider) newProvider;
-					defaultProvider.setContributions(getElement());
-				}
-				return newProvider;
-			}
-			return super.getProvider();
-		}
-	}
-
-	
-	/**
-	 * Sets contribution
-	 * Empty because contributions are stored in the providers
-	 * 
-	 * @param configElement
-	 */
-	public void setContributions(IConfigurationElement configElement) {
-	//  
-	}
-
-	/** the singleton instance of the palette service */
-	private final static PaletteService instance = new PaletteService();
-
-	static {
-		instance.configureProviders(DiagramUIPlugin.getPluginId(), "paletteProviders"); //$NON-NLS-1$
-	}
-
-	/** the standard group id */
-	public final static String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$
-
-	/** the standard separator id */
-	public final static String SEPARATOR_STANDARD = "standardSeparator"; //$NON-NLS-1$
-
-	/** the standard separator id */
-	public final static String TOOL_SELECTION = "selectionTool"; //$NON-NLS-1$
-
-	/**
-	 *  Creates a new instance of the Palette Service
-	 */
-	protected PaletteService() {
-		super();
-	}
-
-	/**
-	 * gets the singleton instance
-	 * @return <code>PaletteService</code>
-	 */
-	public static PaletteService getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @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.diagram.ui.services.palette.IPaletteProvider#contributeToPalette(org.eclipse.ui.IEditorPart, java.lang.Object, org.eclipse.gef.palette.PaletteRoot, Map)
-	 */
-	public void contributeToPalette(
-		IEditorPart editor,
-		Object content,
-		PaletteRoot root, Map predefinedEntries) {
-
-	    PaletteToolbar standardGroup = new PaletteToolbar(GROUP_STANDARD, DiagramUIMessages.StandardGroup_Label);
-		standardGroup.setDescription(DiagramUIMessages.StandardGroup_Description);
-		root.add(standardGroup);
-
-		PaletteSeparator standardSeparator = new PaletteSeparator(SEPARATOR_STANDARD);
-		standardGroup.add(standardSeparator);
-
-		ToolEntry selectTool = new PanningSelectionToolEntry();
-		selectTool.setId(TOOL_SELECTION);
-		selectTool.setToolClass(SelectionToolEx.class);
-		standardGroup.add(selectTool);
-		root.setDefaultEntry(selectTool);
-
-		execute(new ContributeToPaletteOperation(editor, content, root, predefinedEntries));       
-	}
-
-
-    /**
-	 * Executes the palette operation using 
-	 * the REVERSE execution strategy.
-	 * 
-	 * @param operation
-	 * @return List of results
-	 */
-	private List execute(IOperation operation) {
-		return execute(ExecutionStrategy.REVERSE, operation);
-	}
-
-	/**
-	 * Creates default palette root.
-	 * 
-	 * @param editor
-	 *            the editor
-	 * @param content
-	 *            the palette content
-	 * @return a new palette root with contributions from all providers
-	 */
-	public PaletteRoot createPalette(
-		final IEditorPart editor,
-		final Object content) {
-		final PaletteRoot root = new PaletteRoot();
-		try {
-			IEditingDomainProvider provider = (IEditingDomainProvider) editor
-				.getAdapter(IEditingDomainProvider.class);
-			if (provider != null) {
-				EditingDomain domain = provider.getEditingDomain();
-				if (domain instanceof TransactionalEditingDomain) {
-					((TransactionalEditingDomain) domain)
-						.runExclusive(new Runnable() {
-
-							public void run() {
-								contributeToPalette(editor, content, root, new HashMap());
-							}
-						});
-				}
-			}
-		} catch (Exception e) {
-			Trace.catching(DiagramUIPlugin.getInstance(),
-					DiagramUIDebugOptions.EXCEPTIONS_CATCHING, PaletteService.class,
-					"createPalette()", //$NON-NLS-1$
-					e);
-		}
-		return root;
-	}
-	
-	/**
-	 * Updates the palette root given.
-	 * 
-	 * @param existingRoot
-	 *            existing palette root in which to add/remove entries that are
-	 *            now provided for or no longer provided for
-	 * @param editor
-	 *            the editor
-	 * @param content
-	 *            the palette content
-	 */
-	public void updatePalette(
-		PaletteRoot existingRoot,
-		final IEditorPart editor,
-		final Object content) {
-		
-		PaletteRoot newRoot = createPalette(editor, content);
-		updatePaletteContainerEntries(existingRoot, newRoot);
-	}
-	
-	/**
-	 * Updates the children of an existing palette container to match the
-	 * palette entries in a new palette container by adding or removing new
-	 * palette entries only. This method works recursively on any children that
-	 * are palette container entries. Existing leaf palette entries that are to
-	 * be kept remain the same -- they are not replaced with the new palette
-	 * entry. This is so that palette state (such as whether a drawer is pinned
-	 * or expanded) can be preserved when the palette is updated.
-	 * 
-	 * @param existingContainer
-	 *            the palette container to be updated with new entries, have
-	 *            obsolete entries removed, and whose existing entries will
-	 *            remain the same
-	 * @param newContainer
-	 *            the new palette entries
-	 */
-	private void updatePaletteContainerEntries(
-			PaletteContainer existingContainer, PaletteContainer newContainer) {
-
-		HashMap existingEntryIds = new HashMap();
-		for (Iterator iter = existingContainer.getChildren().iterator(); iter
-			.hasNext();) {
-			PaletteEntry entry = (PaletteEntry) iter.next();
-			existingEntryIds.put(entry.getId(), entry);
-		}
-
-		int nextNewIndex = 0;
-		// cycle through the new entries
-		for (Iterator iter = newContainer.getChildren().iterator(); iter
-			.hasNext();) {
-			PaletteEntry newEntry = (PaletteEntry) iter.next();
-
-			PaletteEntry existingEntry = (PaletteEntry) existingEntryIds
-				.get(newEntry.getId());
-			if (existingEntry != null) { // is already in existing container
-				// update the index
-				nextNewIndex = existingContainer.getChildren()
-					.indexOf(existingEntry) + 1;
-
-				// remove the entry that was just updated from the map
-				existingEntryIds.remove(existingEntry.getId());
-
-				if (existingEntry instanceof PaletteContainer
-					&& newEntry instanceof PaletteContainer) {
-					// look for new/deleted entries in
-					// palette containers
-					updatePaletteContainerEntries(
-						(PaletteContainer) existingEntry,
-						(PaletteContainer) newEntry);
-				}
-			} else { // this is a new entry that did not previously exist
-				existingContainer.add(nextNewIndex++, newEntry);
-			}
-		}
-
-		// remove existing entries that were not found in the new container
-		for (Iterator iter = existingEntryIds.values().iterator(); iter
-			.hasNext();) {
-			PaletteEntry entry = (PaletteEntry) iter.next();
-			existingContainer.remove(entry);
-		}
-
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/SelectionToolEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/SelectionToolEx.java
deleted file mode 100644
index bab9eee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/SelectionToolEx.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.services.palette;
-
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.tools.PanningSelectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.BorderItemContainerFigure;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.TraverseEvent;
-
-/**
- * GMF's customized version of GEF's <code>SelectionTool</code> overridden to:
- * <li>support traversing of shapes on a diagram using the TAB and SHIFT + TAB
- * keys</li>
- * <li>support moving a shape with the arrow keys without first accessing the
- * traverse handles</li>
- * 
- * @author crevells
- */
-public class SelectionToolEx
-    extends PanningSelectionTool {
-
-    /**
-     * Are the traverse handles being used? That is, has the '.' key been
-     * pressed first before using the arrow keys?
-     */
-    private boolean isUsingTraverseHandles = false;
-
-    protected void handleKeyTraversed(TraverseEvent e) {
-        resetHover();
-
-        // Tab and shift tab will be used for shape selection on the diagram, so
-        // we must override the system tab traversal and ensure we get the key
-        // pressed events.
-        if (acceptTabKey(e)) {
-            e.doit = false;
-        } else {
-            super.handleKeyTraversed(e);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.tools.SelectionTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)
-     */
-    protected boolean handleKeyDown(KeyEvent e) {
-		resetHover();
-
-		if (acceptTabKey(e)) {
-			if (getCurrentViewer().getKeyHandler() != null) {
-				return getCurrentViewer().getKeyHandler().keyPressed(e);
-			}
-		}
-
-		if (acceptArrowKeyOnly(e) && getState() == STATE_INITIAL
-				&& !getCurrentViewer().getSelectedEditParts().isEmpty()) {
-
-			EditPart selectedEP = (EditPart) getCurrentViewer()
-					.getSelectedEditParts().get(0);
-			
-			if (selectedEP instanceof GraphicalEditPart) {
-			
-				GraphicalEditPart gep = (GraphicalEditPart) selectedEP; 
-	
-				/*
-				 * The shape we'll be moved in the direction of the arrow key iff:
-				 * 1) It has the appropriate edit policy that supports shape moving installed on the editpart
-				 * 2) The editparts figure's parent layout manager is some sort of XYLayout
-				 * In all other cases we just change the selection based on arrow key (implemented in GEF).  
-				 */
-				if (gep.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) instanceof NonResizableEditPolicy
-						&& gep.getFigure().getParent() != null
-						&& (gep.getFigure().getParent().getLayoutManager() instanceof XYLayout
-								|| gep.getFigure().getParent() instanceof BorderItemContainerFigure)) {
-	
-					resetHover();
-		
-					if (getDragTracker() != null)
-						getDragTracker().deactivate();
-		
-					setState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS);
-		
-					setTargetEditPart(gep);
-		
-					updateTargetRequest();
-					DragTracker dragTracker = gep
-							.getDragTracker(getTargetRequest());
-					if (dragTracker != null) {
-						setDragTracker(dragTracker);
-						dragTracker.keyDown(e, getCurrentViewer());
-						lockTargetEditPart(gep);
-						return true;
-					}
-					return false;
-				}
-			}
-		}
-		return super.handleKeyDown(e);
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gef.tools.SelectionTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)
-     */
-    protected boolean handleKeyUp(KeyEvent e) {
-        boolean returnVal = super.handleKeyUp(e);
-        if (acceptArrowKeyOnly(e) && !isUsingTraverseHandles) {
-            if (getDragTracker() != null) {
-                getDragTracker().commitDrag();
-            }
-            setDragTracker(null);
-            setState(STATE_INITIAL);
-            unlockTargetEditPart();
-        }
-        return returnVal;
-    }
-
-    /**
-     * Returns true if the event corresponds to a tab key and if the system is
-     * in a state where the tab key should be accepted.
-     * 
-     * @param e
-     *            the <code>KeyEvent</code>
-     * @return true if the tab key should be accepted.
-     */
-    private boolean acceptTabKey(KeyEvent e) {
-        return isInState(STATE_INITIAL | STATE_ACCESSIBLE_DRAG
-            | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)
-            && e.keyCode == SWT.TAB
-            && (e.stateMask & (SWT.ALT | SWT.CONTROL)) == 0;
-    }
-
-    /**
-     * Returns true if the event corresponds to an arrow key without any
-     * modifiers and if the system is in a state where the arrow key should be
-     * accepted.
-     * 
-     * @param e
-     *            the <code>KeyEvent</code>
-     * @return true if the tab key should be accepted.
-     */
-    private boolean acceptArrowKeyOnly(KeyEvent e) {
-        int key = e.keyCode;
-        if (!(isInState(STATE_INITIAL | STATE_ACCESSIBLE_DRAG
-            | STATE_ACCESSIBLE_DRAG_IN_PROGRESS))) {
-            return false;
-        }
-        return ((key == SWT.ARROW_UP) || (key == SWT.ARROW_RIGHT)
-            || (key == SWT.ARROW_DOWN) || (key == SWT.ARROW_LEFT))
-            && (e.stateMask & (SWT.ALT | SWT.CONTROL | SWT.SHIFT)) == 0;
-    }
-
-    protected void setState(int state) {
-        if (state == STATE_TRAVERSE_HANDLE) {
-            isUsingTraverseHandles = true;
-        } else if (state == STATE_INITIAL) {
-            isUsingTraverseHandles = false;
-        }
-        super.setState(state);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/package.html
deleted file mode 100644
index c4b081c..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/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>
-contains the palette service and the palette type</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AbstractPopupBarTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AbstractPopupBarTool.java
deleted file mode 100644
index 9ebabea..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AbstractPopupBarTool.java
+++ /dev/null
@@ -1,256 +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.tools;
-
-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.emf.ecore.EObject;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.tools.TargetingTool;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Abstract class for popup bar tools. This is the tool used for the Add
- * commands associated with the popup bars. The creation tools for popup bars
- * also need to impl DragTracker since the SelectionTool calls
- * Handle.getDragTracker during mouseDown.
- * 
- * @author affrantz
- */
-
-public abstract class AbstractPopupBarTool
-	extends TargetingTool
-	implements DragTracker {
-
-	private EditPart myHostEditPart = null;
-
-	/** the requested element kind */
-    private IElementType myElementType = null;
-
-	/** the create request to be used (optional) */
-    private CreateRequest myRequest = null;
-
-    /**
-	 * @param epHost
-	 *            the host editpart
-	 * @param elementType
-	 *            the element type to be created
-	 */
-	public AbstractPopupBarTool(EditPart epHost, IElementType elementType) {
-		myElementType = elementType;
-		myHostEditPart = epHost;
-		lockTargetEditPart(epHost);
-	}
-
-	/**
-	 * @param epHost
-	 *            the host editpart
-	 * @param theRequest
-	 *            the create request to be used
-	 */
-	public AbstractPopupBarTool(EditPart epHost, CreateRequest theRequest) {
-		myHostEditPart = epHost;
-		myRequest = theRequest;
-		lockTargetEditPart(epHost);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	abstract protected Request createTargetRequest();
-
-	/**
-	 * @see org.eclipse.gef.tools.TargetingTool#getCommand()
-	 */
-	abstract protected Command getCommand();
-
-	/**
-	 * Test to see if the tool's associated cmd is available to be run
-	 */
-	public boolean isCommandEnabled() {
-		Command cmd = this.getCommand();
-		if (cmd == null) {
-			return false;
-		}
-
-		return cmd.canExecute();
-	}
-
-	/**
-	 * @see org.eclipse.gef.DragTracker#commitDrag()
-	 */
-	public void commitDrag() {
-		// NULL implementation
-	}
-
-	protected boolean handleButtonDown(int button) {
-		// push the cmd that will be used by performCreation
-		setCurrentCommand(getCommand());
-		return super.handleButtonDown(button);
-
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
-	 */
-	protected boolean handleButtonUp(int button) {
-		performCreation(button);
-
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#performCreation(int)
-	 * @param button
-	 */
-	private void performCreation(int button) {
-		EditPartViewer viewer = getCurrentViewer();
-		Command c = getCurrentCommand();
-		executeCurrentCommand();
-
-		List editparts = new ArrayList(1);
-		Collection newObjects = DiagramCommandStack.getReturnValues(c);
-		for (Iterator i = newObjects.iterator(); i.hasNext();) {
-			Object o = i.next();
-			EditPart editpart = null;
-			if (o instanceof IAdaptable) {
-				IAdaptable adapter = (IAdaptable) o;
-				View view = (View) adapter.getAdapter(View.class);
-				if (view != null)
-					editpart = (EditPart) viewer.getEditPartRegistry()
-						.get(view);
-			} else if (o instanceof EObject) {
-				IGraphicalEditPart host = (IGraphicalEditPart) myHostEditPart;
-				editpart = host.findEditPart(host, (EObject) o);
-			}
-			if (editpart != null)
-				editparts.add(editpart);
-		}
-		selectAddedObject(viewer, editparts);
-	}
-
-	/**
-	 * Finds the newly created editpart associated with the element that has
-	 * been added and then selects the editpart and requests direct editing
-	 * 
-	 */
-	protected void selectAddedObject(final EditPartViewer viewer,
-			final List editparts) {
-		if (editparts.isEmpty())
-			return;
-        
-        // Don't change the selection unless at least one editpart is
-        // selectable.
-        boolean selectable = false;
-        for (Iterator iter = editparts.iterator(); iter.hasNext();) {
-            EditPart editpart = (EditPart) iter.next();
-            if (editpart.isSelectable()) {
-                selectable = true;
-                break;
-            }
-         }
-        
-        if (selectable) {
-    		// automatically put the first shape into edit-mode
-    		Display.getCurrent().asyncExec(new Runnable() {
-    
-    			public void run() {
-    				viewer.setSelection(new StructuredSelection(editparts));
-    				EditPart editpart = (EditPart) editparts.get(0);
-    				editpart.performRequest(new Request(
-    					RequestConstants.REQ_DIRECT_EDIT));
-    			}
-    		});
-        }
-	}
-
-	/**
-	 * HACK in order to lock the editpart for the duration that this tool is
-	 * active and avoid updateTargetUnderMouse, getting called we need to
-	 * override this method to perform a NOP
-	 * 
-	 * @see org.eclipse.gef.tools.TargetingTool#unlockTargetEditPart()
-	 */
-	protected void unlockTargetEditPart() {
-		// NULL implementation
-	}
-
-	protected IElementType getElementType() {
-		return myElementType;
-	}
-
-	protected void setElementKind(IElementType elementType) {
-		myElementType = elementType;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
-	 */
-	protected String getCommandName() {
-		return REQ_CREATE;
-
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()
-	 */
-	protected String getDebugName() {
-		return "Popup Bar Creation Tool"; //$NON-NLS-1$
-
-	}
-
-	protected EditPart getHost() {
-		return myHostEditPart;
-	}
-
-	/**
-	 * 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() {
-		PreferencesHint preferencesHint = null;
-		if (myHostEditPart != null) {
-			preferencesHint = ((IGraphicalEditPart) myHostEditPart)
-				.getDiagramPreferencesHint();
-		}
-		return preferencesHint;
-	}
-        
-    /**
-     * Gets the the create request to be used if one was specified in the constructor.
-     * @return Returns the create request.
-     */
-    protected CreateRequest getCreateRequest() {
-        return myRequest;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AddPopupBarTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AddPopupBarTool.java
deleted file mode 100644
index 51ff6c2..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/AddPopupBarTool.java
+++ /dev/null
@@ -1,49 +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.tools;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * This is the tool used for the AddUML commands associated with the action bars.
- * The creation tools for action bars also need to impl DragTracker since the SelectionTool
- * calls Handle.getDragTracker during mouseDown.
- * 
- * @author affrantz, cmahoney
- * @deprecated Use {@link PopupBarTool instead}
- * 
- */
-
-public class AddPopupBarTool extends PopupBarTool {
-
-	/**
-	 * constructor
-	 * @param epHost the host edit part for this tool
-	 * @param elementType
-	 */
-	public AddPopupBarTool(EditPart epHost, IElementType elementType) {
-		super(epHost, elementType);
-	}
-	
-	/**
-	 * constructor
-	 * @param epHost
-	 * @param theRequest the create request to be used
-	 */
-	public AddPopupBarTool(EditPart epHost, CreateRequest theRequest) {
-		super(epHost, theRequest);
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/ConnectionCreationTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/ConnectionCreationTool.java
deleted file mode 100644
index 8873252..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/ConnectionCreationTool.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.tools;
-
-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.FigureCanvas;
-import org.eclipse.draw2d.Viewport;
-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.Request;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
-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.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Generic Connection Creation Tool - creates a semantic model element and a
- * view for it.
- * 
- * Supports creation of a connection when there is not information is not all
- * available even after ther user has selected the target. When the user clicks
- * on the target element, then they will be presented with a diaglog to permit
- * them to enter the additional information.
- * 
- * @author melaasar
- */
-public class ConnectionCreationTool
-	extends org.eclipse.gef.tools.ConnectionCreationTool {
-
-	private IElementType elementType = null;
-
-	/** Should deactivation be avoided? */
-	private boolean avoidDeactivation = false;
-
-	/** Does the user have the ctrl key pressed? */
-	private boolean isCtrlKeyDown;
-
-	static private Cursor CURSOR_CONNECTION = new Cursor(Display.getDefault(),
-		DiagramUIPluginImages.DESC_CONNECTION_CURSOR_SOURCE.getImageData(),
-		DiagramUIPluginImages.DESC_CONNECTION_CURSOR_MASK.getImageData(), 0, 0);
-
-	static private Cursor CURSOR_CONNECTION_NOT = new Cursor(Display
-		.getDefault(), DiagramUIPluginImages.DESC_NO_CONNECTION_CURSOR_SOURCE
-		.getImageData(), DiagramUIPluginImages.DESC_NO_CONNECTION_CURSOR_MASK
-		.getImageData(), 0, 0);
-	
-	static private Cursor CURSOR_TARGET_MENU = new Cursor(Display.getDefault(), SWT.CURSOR_HAND);
-
-	/**
-	 * Creates a new ConnectionCreationTool, the elementTypeInfo and
-	 * viewFactoryhint will be set later.
-	 */
-	public ConnectionCreationTool() {
-		setUnloadWhenFinished(true);
-		setDefaultCursor(CURSOR_CONNECTION);
-		setDisabledCursor(CURSOR_CONNECTION_NOT);
-	}
-
-	/**
-	 * Method CreationTool. Creates a new CreationTool with the given
-	 * elementType
-	 * 
-	 * @param elementType
-	 */
-	public ConnectionCreationTool(IElementType elementType) {
-		this();
-		setSemanticRequestType(elementType);
-	}
-
-	/**
-	 * @return Returns the elementType.
-	 * @since 1.5
-	 */
-	public IElementType getElementType() {
-		return elementType;
-	}
-
-	/**
-	 * Sets the elementType.
-	 * 
-	 * @param elementType
-	 *            The elementType to set
-	 */
-	protected void setSemanticRequestType(IElementType elementType) {
-		this.elementType = elementType;
-	}
-
-	/**
-	 * 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() {
-		EditPartViewer viewer = getCurrentViewer();
-		if (viewer != null) {
-			RootEditPart rootEP = viewer.getRootEditPart();
-			if (rootEP instanceof IDiagramPreferenceSupport) {
-				return ((IDiagramPreferenceSupport) rootEP)
-					.getPreferencesHint();
-			}
-		}
-		return PreferencesHint.USE_DEFAULTS;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return CreateViewRequestFactory.getCreateConnectionRequest(
-			getElementType(), getPreferencesHint());
-	}
-
-	/**
-	 * Since both the view and semantic requests contain results we need to free
-	 * them when the tool is deactivated
-	 * 
-	 * @see org.eclipse.gef.Tool#deactivate()
-	 */
-	public void deactivate() {
-
-		if (!avoidDeactivation()) {
-			super.deactivate();
-			setTargetRequest(null);
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractConnectionCreationTool#eraseSourceFeedback()
-	 */
-	protected void eraseSourceFeedback() {
-		if (!avoidDeactivation()) {
-			super.eraseSourceFeedback();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
-	 */
-	protected boolean handleButtonUp(int button) {
-		setCtrlKeyDown(getCurrentInput().isControlKeyDown());
-
-		if (isInState(STATE_CONNECTION_STARTED))
-			handleCreateConnection();
-		setState(STATE_TERMINAL);
-
-		if (isInState(STATE_TERMINAL | STATE_INVALID)) {
-			handleFinished();
-		}
-
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#handleFinished() Called when the
-	 *      current tool operation is complete.
-	 */
-	protected void handleFinished() {
-		if (!isCtrlKeyDown()) {
-			super.handleFinished();
-		} else {
-			reactivate();
-		}
-	}
-
-	/**
-	 * Method selectAddedObject. Select the newly added connection
-	 */
-	protected void selectAddedObject(EditPartViewer viewer, Collection objects) {
-		final List editparts = new ArrayList();
-        final EditPart[] primaryEP = new EditPart[1];
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			Object object = i.next();
-			if (object instanceof IAdaptable) {
-				Object editPart = viewer.getEditPartRegistry().get(
-					((IAdaptable) object).getAdapter(View.class));
-
-                if (editPart instanceof IPrimaryEditPart) {
-                    editparts.add(editPart);
-                }
-                
-                // Priority is to put a shape into direct edit mode.
-                if (editPart instanceof ShapeEditPart) {
-                    primaryEP[0] = (ShapeEditPart) 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() {
-                    if (primaryEP[0] == null) {
-                        primaryEP[0] = (EditPart) editparts.get(0);
-                    }
-					//
-					// add active test since test scripts are failing on this
-					// basically, the editpart has been deleted when this
-					// code is being executed. (see RATLC00527114)
-					if (primaryEP[0].isActive()) {
-                        primaryEP[0].performRequest(new Request(
-							RequestConstants.REQ_DIRECT_EDIT));
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * Handles double click to create the shape in defualt position
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDoubleClick(int)
-	 */
-	protected boolean handleDoubleClick(int button) {
-		createConnection();
-		return true;
-
-	}
-
-	/**
-	 * Creates a connection between the two select shapes. edit parts.
-	 */
-	protected void createConnection() {
-
-		List selectedEditParts = getCurrentViewer().getSelectedEditParts();
-
-		// only attempt to create connection if there are two shapes selected
-		if (!selectedEditParts.isEmpty()) {
-
-			IGraphicalEditPart sourceEditPart = (IGraphicalEditPart) selectedEditParts
-				.get(0);
-
-			IGraphicalEditPart targetEditPart = selectedEditParts.size() == 2 ? (IGraphicalEditPart) selectedEditParts
-				.get(1)
-				: sourceEditPart;
-
-			CreateConnectionRequest connectionRequest = (CreateConnectionRequest) createTargetRequest();
-
-			connectionRequest.setTargetEditPart(sourceEditPart);
-			connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
-			connectionRequest.setLocation(new Point(0, 0));
-
-			// only if the connection is supported will we get a non null
-			// command from the sourceEditPart
-			if (sourceEditPart.getCommand(connectionRequest) != null) {
-
-				connectionRequest.setSourceEditPart(sourceEditPart);
-				connectionRequest.setTargetEditPart(targetEditPart);
-				connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
-				connectionRequest.setLocation(new Point(0, 0));
-
-				Command command = targetEditPart.getCommand(connectionRequest);
-
-				if (command != null) {
-					setCurrentCommand(command);
-					executeCurrentCommand();
-					selectAddedObject(getCurrentViewer(), DiagramCommandStack
-						.getReturnValues(command));
-				}
-			}
-			deactivate();
-
-		}
-
-	}
-
-	/**
-	 * Overide to handle use case when the user has selected a tool and then
-	 * click on the enter key which translated to SWT.Selection it will result
-	 * in the new shape being created
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)
-	 */
-	protected boolean handleKeyUp(KeyEvent e) {
-		if (e.keyCode == SWT.Selection) {
-			setEditDomain(getCurrentViewer().getEditDomain());
-			createConnection();
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Overridden so that the tool doesn't get deactivated and the feedback
-	 * erased if popup dialogs appear to complete the command.
-	 * 
-	 * @see org.eclipse.gef.tools.AbstractConnectionCreationTool#handleCreateConnection()
-	 */
-	protected boolean handleCreateConnection() {
-
-		// When a connection is to be created, a dialog box may appear which
-		// will cause this tool to be deactivated and the feedback to be
-		// erased. This behavior is overridden by setting the avoid
-		// deactivation flag.
-		setAvoidDeactivation(true);
-
-		EditPartViewer viewer = getCurrentViewer();
-		Command endCommand = getCommand();
-		setCurrentCommand(endCommand);
-
-		executeCurrentCommand();
-
-		selectAddedObject(viewer, DiagramCommandStack
-			.getReturnValues(endCommand));
-
-		setAvoidDeactivation(false);
-		eraseSourceFeedback();
-		deactivate();
-
-		return true;
-	}
-
-	/**
-	 * Should deactivation be avoided?
-	 * 
-	 * @return true if deactivation is to be avoided
-	 */
-	protected boolean avoidDeactivation() {
-		return avoidDeactivation;
-	}
-
-	/**
-	 * Sets if deactivation be temporarily avoided.
-	 * 
-	 * @param avoidDeactivation
-	 *            true if deactivation is to be avoided
-	 */
-	protected void setAvoidDeactivation(boolean avoidDeactivation) {
-		this.avoidDeactivation = avoidDeactivation;
-	}
-
-	/**
-	 * @return Returns the isCtrlKeyDown.
-	 */
-	protected boolean isCtrlKeyDown() {
-		return isCtrlKeyDown;
-	}
-
-	/**
-	 * @param isCtrlKeyDown
-	 *            The isCtrlKeyDown to set.
-	 */
-	protected void setCtrlKeyDown(boolean isCtrlKeyDown) {
-		this.isCtrlKeyDown = isCtrlKeyDown;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.tools.CreationTool#handleMove()
-	 */
-	protected boolean handleMove() {
-		boolean bool = super.handleMove();
-		if (isInState(STATE_CONNECTION_STARTED)) {
-            // Expose the diagram as the user scrolls in the area handled by the
-            // autoexpose helper.
-            updateAutoexposeHelper();
-		}
-		return bool;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractConnectionCreationTool#calculateCursor()
-	 */
-	protected Cursor calculateCursor() {
-        if (isInState(STATE_CONNECTION_STARTED)) {
-
-            // Give some feedback so the user knows the area where autoscrolling
-            // will occur.
-            if (getAutoexposeHelper() != null) {
-                return SharedCursors.HAND;
-            } else {
-
-                // Give some feedback so the user knows that they can't drag
-                // outside the viewport.
-                if (getCurrentViewer() != null) {
-                Control control = getCurrentViewer().getControl();
-                if (control instanceof FigureCanvas) {
-                        Viewport viewport = ((FigureCanvas) control)
-                            .getViewport();
-                        Rectangle rect = Rectangle.SINGLETON;
-                        viewport.getClientArea(rect);
-                        viewport.translateToParent(rect);
-                        viewport.translateToAbsolute(rect);
-
-                        if (!rect.contains(getLocation())) {
-                            return getDisabledCursor();
-                        }
-                    }
-                }
-            }
-        }
-		Command command = getCurrentCommand();
-		if (command != null && command.canExecute())
-		{
-			EditPart ep = getTargetEditPart();
-			if (ep instanceof DiagramEditPart || ep instanceof CompartmentEditPart)
-				return CURSOR_TARGET_MENU;
-		}
-		return super.calculateCursor();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/CreationTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/CreationTool.java
deleted file mode 100644
index a369b2f..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/CreationTool.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.tools;
-
-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.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.Command;
-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.figures.LayoutHelper;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.DiagramUIPluginImages;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Generic Creation Tool - creates a semantic model element and a view for it
- *
- * The usual usecase is to create "one" element and view. However, in case multiple
- * elements are needed, specialized Semantic and View requests are needed to create
- * new adapters that can adapt to multiple semantic elements and views in the same time
- * 
- * @author melaasar
- */
-public class CreationTool extends org.eclipse.gef.tools.CreationTool {
-
-	// temporarily disable the autoexpose helper since it interferes with menu selection.
-	// see defect RATLC00525995	
-	/**
-	 * the anti scroll flag
-	 */
-	protected boolean antiScroll = false;
-	
-	/** Constant used to specify no point has been defined for the shape creation
-	 * request.  It will be up to the layout edit policy to lay the shape in 
-	 * the correct position*/
-	private static final Point UNDEFINED_POINT = LayoutHelper.UNDEFINED.getLocation();
-	/** the requested element kind */
-	private IElementType elementType =null;
-
-	static private Cursor CURSOR_SHAPE = new Cursor(Display.getDefault(),
-		DiagramUIPluginImages.DESC_SHAPECURSOR_SOURCE.getImageData(),
-		DiagramUIPluginImages.DESC_SHAPECURSOR_MASK.getImageData(), 7, 7);
-
-	static private Cursor CURSOR_SHAPE_NOT = new Cursor(Display.getDefault(),
-		DiagramUIPluginImages.DESC_NOSHAPECURSOR_SOURCE.getImageData(),
-		DiagramUIPluginImages.DESC_NOSHAPECURSOR_MASK.getImageData(), 7, 7);		
-
-	/**
-	 * Method CreationTool.
-	 * Creates a new CreationTool with the given elementTypeInfo, and a defailt viewKind equals IShapeView
-	 * and a default empty semanticHint
-	 * @param elementType
-	 */
-	public CreationTool(IElementType elementType) {
-		setElementType(elementType);
-		setDefaultCursor(CURSOR_SHAPE);
-		setDisabledCursor(CURSOR_SHAPE_NOT);
-	}
-	
-	/**
-	 * Default constructor to allow subclasses to not require an element type.
-	 */
-	protected CreationTool() {
-		// do nothing
-	}
-	
-	/**
-	 * 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() {
-		EditPartViewer viewer = getCurrentViewer();
-		if (viewer != null) {
-			RootEditPart rootEP = viewer.getRootEditPart();
-			if (rootEP instanceof IDiagramPreferenceSupport) {
-				return ((IDiagramPreferenceSupport) rootEP)
-					.getPreferencesHint();
-			}
-		}
-		return PreferencesHint.USE_DEFAULTS;
-	}
-
-	protected Request createTargetRequest() {
-		return CreateViewRequestFactory.getCreateShapeRequest(getElementType(),
-			getPreferencesHint());
-	}
-
-	/**
-	 * Since both the view and semantic requests contain results we need to free
-	 * them when the tool is deactivated
-	 */
-	public void deactivate() {
-		super.deactivate();
-		setTargetRequest(null);
-	}
-
-	protected void performCreation(int button) {
-		
-		antiScroll = true;
-				
-		EditPartViewer viewer = getCurrentViewer();
-		Command c = getCurrentCommand();
-		executeCurrentCommand();
-		selectAddedObject(viewer, DiagramCommandStack.getReturnValues(c));
-		
-		antiScroll = false;
-	}
-
-	/**
-	 * Select the newly added shape view by default
-	 * @param viewer
-	 * @param objects
-	 */
-	protected void selectAddedObject(EditPartViewer viewer, Collection objects) {
-		final List editparts = new ArrayList();
-		for (Iterator i = objects.iterator(); i.hasNext();) {
-			Object object = i.next();
-			if (object instanceof IAdaptable) {
-				Object editPart =
-					viewer.getEditPartRegistry().get(
-						((IAdaptable)object).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);
-					//
-					// add active test since test scripts are failing on this
-					// basically, the editpart has been deleted when this 
-					// code is being executed. (see RATLC00527114)
-					if ( editPart.isActive() ) {
-						editPart.performRequest(new Request(RequestConstants.REQ_DIRECT_EDIT));
-						revealEditPart((EditPart)editparts.get(0));
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	*  Handles double click to create the shape in defualt position
-	*/
-	protected boolean handleDoubleClick(int button) {
-
-		createShapeAt(UNDEFINED_POINT);
-		setState(STATE_TERMINAL);
-		handleFinished();
-		
-		return true;
-
-	}
-	
-	/**
-	 * Create the shape corresponding to the current selected tool
-	 * on the current diagram at the <code>point</code> specified
-	 * @param point to create shape at
-	 */
-	protected void createShapeAt(Point point) {
-		setTargetEditPart(getCurrentViewer().getRootEditPart().getContents());
-		getCreateRequest().setLocation(point);
-		setCurrentCommand(getCommand());
-		performCreation(0);
-	}
-
-	/*  Overide to handle use case when the user has selected an tool
-	 * and then click on the enter key which translated to SWT.Selection
-	 * it will result in the new shape being created
-	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)
-	 */
-	protected boolean handleKeyUp(KeyEvent e) {
-		if (e.keyCode==SWT.Selection){
-			setEditDomain(getCurrentViewer().getEditDomain());
-			createShapeAt(UNDEFINED_POINT);
-			setState(STATE_TERMINAL);
-			handleFinished();
-			return true;
-		}
-		return false;
-	}
-
-	protected void setTargetEditPart(EditPart editpart) {
-		// Set the target request to null if the target editpart has changed.
-		// This needs to be done so that the context element (if applicable) in
-		// the request can be reset.
-		if (editpart != getTargetEditPart()) {
-			setTargetRequest(null);
-		}
-		super.setTargetEditPart(editpart);
-	}
-	/**
-	 * @return Returns the elementType.
-	 */
-	public IElementType getElementType() {
-		return elementType;
-	}
-	/**
-	 * @param elementType The elementType to set.
-	 */
-	private void setElementType(IElementType elementType) {
-		this.elementType = elementType;
-	}
-
-	/**
-	 * Overridden so that the current tool will remain active (locked) if the
-	 * user is pressing the ctrl key.
-	 */
-	protected void handleFinished() {
-		if (!getCurrentInput().isControlKeyDown()) {
-			super.handleFinished();
-		} else {
-			reactivate();
-		}
-	}
-	
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.CreationTool#handleMove()
-	 */
-	protected boolean handleMove() {
-		if (!antiScroll)
-			return super.handleMove();
-		return false;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.TargetingTool#doAutoexpose()
-	 */
-	protected void doAutoexpose() {
-		if (!antiScroll)
-			super.doAutoexpose();
-		return;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.TargetingTool#getCommand()
-	 */
-	protected Command getCommand() {	
-		if (!antiScroll)
-			return super.getCommand();
-		return null;
-	}
-	
-	/**
-	 * Reveals the newly created editpart
-	 * @param editPart
-	 */
-	protected void revealEditPart(EditPart editPart){
-		if ((editPart != null)&&
-				(editPart.getViewer() != null))
-				editPart.getViewer().reveal(editPart);
-	}
-
-	/**
-	 * Creates the request.
-	 * 
-	 * @see #createTargetRequest()
-	 */
-	public final Request createCreateRequest() {
-		return createTargetRequest();
-}
-	/**
-	 * Selects the new shapes and puts them in direct edit mode if desired.
-	 * 
-	 * @param viewer
-	 *            the editpart viewer
-	 * @param objects
-	 *            the collection of new shapes
-	 * @see #selectAddedObject(EditPartViewer, Collection)
-	 */
-	public final void selectNewShapes(EditPartViewer viewer, Collection objects) {
-		selectAddedObject(viewer, objects);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/DragEditPartsTrackerEx.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/DragEditPartsTrackerEx.java
deleted file mode 100644
index c800389..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/DragEditPartsTrackerEx.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.tools;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN
- * and REQ_DROP instead of REQ_ADD
- * 
- * @author melaasar
- */
-public class DragEditPartsTrackerEx extends DragEditPartsTracker {
-
-    /**
-	 * @param sourceEditPart
-	 */
-	public DragEditPartsTrackerEx(EditPart sourceEditPart) {
-		super(sourceEditPart);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()
-	 */
-	protected Command getCommand() {
-		if (!isMove()) {
-			CompoundCommand command = new CompoundCommand();
-			addSourceCommands(false, command); 
-			if (getTargetEditPart()!=null){
-				command.add(getTargetEditPart().getCommand(getTargetRequest()));
-				if (command.canExecute())
-					return command;
-			} 
-			
-			
-		}
-		CompoundCommand command = new CompoundCommand();
-		addSourceCommands(true, command);
-		return command;
-	}
-
-	/**
-	 * Collects the move/drag commands from the operation set
-	 * @param isMove
-	 * @param command
-	 */
-	protected void addSourceCommands(boolean isMove, CompoundCommand command) {
-        Request request = getTargetRequest();
-
-        if (isCloneActive()) {
-
-            // do not use operation set in this case as connections will get
-            // filtered out
-            List editparts = ToolUtilities
-                .getSelectionWithoutDependants(getCurrentViewer());
-
-            DuplicateRequest duplicateRequest = new DuplicateRequest();
-            duplicateRequest.setEditParts(editparts);
-            duplicateRequest.setExtendedData(request.getExtendedData());
-            if (request instanceof ChangeBoundsRequest) {
-                Point delta = ((ChangeBoundsRequest) request).getMoveDelta();
-                MapModeUtil.getMapMode(
-                    ((IGraphicalEditPart) getTargetEditPart()).getFigure())
-                    .DPtoLP(delta);
-
-                duplicateRequest.setOffset(delta);
-            }
-            command.add(getTargetEditPart().getCommand(duplicateRequest));
-        } else {
-            request.setType(isMove ? REQ_MOVE
-                : RequestConstants.REQ_DRAG);
-            Iterator iter = getOperationSet().iterator();
-            while (iter.hasNext()) {
-                EditPart editPart = (EditPart) iter.next();
-                command.add(editPart.getCommand(request));
-            }
-        }
-
-        request.setType(RequestConstants.REQ_DROP);
-    }
-
-	/**
-	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()
-	 */
-	protected String getCommandName() {
-		if (!isMove())
-			return RequestConstants.REQ_DROP;
-		return super.getCommandName();
-	}
-
-	/**
-	 * If the source is not in the operation set, it is not a move
-	 * @see org.eclipse.gef.tool s.DragEditPartsTracker#isMove()
-	 */
-	protected boolean isMove() {		
-		for (int i = 0 ; i < getOperationSet().size(); i++){
-			if (getOperationSet().get(i).equals(getSourceEditPart())){
-				return super.isMove();
-			}
-			//additional case for GroupEditPart, check the children
-			//this is for snap to geometry			
-			if (getOperationSet().get(i) instanceof GroupEditPart){
-				GroupEditPart currPart = (GroupEditPart)getOperationSet().get(i);
-				for (int j = 0 ; j < currPart.getChildren().size() ; j++){
-					if (currPart.getChildren().get(j).equals(getSourceEditPart())){
-						return super.isMove();
-					}
-				}
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gef.tools.AbstractTool#executeCurrentCommand()
-	 */
-	protected void executeCurrentCommand() {
-		super.executeCurrentCommand();
-		if (isActive()) {
-			if (getOperationSet().size() > 0) {
-				if (getOperationSet().get(0) instanceof IGraphicalEditPart) {
-					IGraphicalEditPart editpart = (IGraphicalEditPart) getOperationSet()
-						.get(0);
-					if ((editpart.getFigure() == null)
-						|| (editpart.getFigure().getParent() == null)
-						|| (editpart.getFigure().getParent().getLayoutManager() == null))
-						return;
-					editpart.getFigure().getParent().getLayoutManager().layout(
-						editpart.getFigure().getParent());
-					reveal(editpart);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @param editpart
-	 */
-	protected void reveal(EditPart editpart){
-		editpart.getViewer().reveal(editpart);
-	}
-   
-    protected boolean handleDragInProgress() {
-        boolean returnValue = super.handleDragInProgress();
-        if (isInState(STATE_DRAG_IN_PROGRESS)
-            || isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
-            
-            // Expose the diagram as the user scrolls in the area handled by the
-            // autoexpose helper.
-            updateAutoexposeHelper();
-        }
-        return returnValue;
-    }
-
-    protected Cursor calculateCursor() {
-        if (isInState(STATE_DRAG_IN_PROGRESS)
-            || isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
-
-            // Give some feedback so the user knows the area where autoscrolling
-            // will occur.
-            if (getAutoexposeHelper() != null) {
-                return SharedCursors.HAND;
-            } else {
-
-                // Give some feedback so the user knows that they can't drag
-                // outside the viewport.
-                Control control = getCurrentViewer().getControl();
-                if (control instanceof FigureCanvas) {
-                    Viewport viewport = ((FigureCanvas) control).getViewport();
-                    Rectangle rect = Rectangle.SINGLETON;
-                    viewport.getClientArea(rect);
-                    viewport.translateToParent(rect);
-                    viewport.translateToAbsolute(rect);
-
-                    if (!rect.contains(getLocation())) {
-                        return getDisabledCursor();
-                    }
-                }
-            }
-        }
-        return super.calculateCursor();
-    }
-    
-    protected boolean handleButtonDown(int button) {
-
-        // If the group is selected, and the user clicks on a shape, defer the
-        // selection of the shape until the mouse button is released instead of
-        // selecting on mouse down because if the user does a drag they will
-        // move the entire group and not the shape.
-        if (button == 1
-            && getSourceEditPart().getParent() instanceof GroupEditPart
-            && getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {
-
-            stateTransition(STATE_INITIAL, STATE_DRAG);
-            return true;
-        }
-
-        return super.handleButtonDown(button);
-    }
-
-    protected boolean handleDoubleClick(int button) {
-        // If the user double-clicks a shape in a group and the shape is not
-        // selected, select the shape.
-        if (getSourceEditPart().getParent() instanceof GroupEditPart
-            && getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {
-            performSelection();
-            return true;
-        } else {
-            return super.handleDoubleClick(button);
-        }
-    }
-
-    protected void performSelection() {
-        super.performSelection();
-
-        // If the new selection is a child of a group, we want to deselect the group.
-        if (getSourceEditPart().getParent() instanceof GroupEditPart
-            && getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {
-            getCurrentViewer().deselect(getSourceEditPart().getParent());
-        }
-    }
-    
-    /**
-     * Overridden to add extended data to the request to restrict snapping to
-     * specific directions based on the move delta.
-     */
-    protected void snapPoint(ChangeBoundsRequest request) {
-        Point moveDelta = request.getMoveDelta();
-        if (getState() == STATE_ACCESSIBLE_DRAG_IN_PROGRESS) {
-            int restrictedDirection = 0;
-
-            if (moveDelta.x > 0) {
-                restrictedDirection = restrictedDirection
-                    | PositionConstants.EAST;
-            } else if (moveDelta.x < 0) {
-                restrictedDirection = restrictedDirection
-                    | PositionConstants.WEST;
-            }
-
-            if (moveDelta.y > 0) {
-                restrictedDirection = restrictedDirection
-                    | PositionConstants.SOUTH;
-            } else if (moveDelta.y < 0) {
-                restrictedDirection = restrictedDirection
-                    | PositionConstants.NORTH;
-            }
-
-            request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS,
-                restrictedDirection);
-        }
-
-        super.snapPoint(request);
-    }
-    
-    protected boolean handleKeyDown(KeyEvent e) {
-        if (acceptArrowKey(e)) {
-            if (isInState(STATE_INITIAL)) {
-                IGraphicalEditPart ep = (IGraphicalEditPart) getSourceEditPart();
-                if (ep != null) {
-                    Point location = ep.getFigure().getBounds().getCenter();
-                    ep.getFigure().translateToAbsolute(location);
-                    placeMouseInViewer(location);       
-                    getCurrentInput().setMouseLocation(location.x, location.y);
-                }
-            }
-        }
-        return super.handleKeyDown(e);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/PopupBarTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/PopupBarTool.java
deleted file mode 100644
index 1a52232..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/PopupBarTool.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.tools;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This is the tool used for the AddUML commands associated with the popup bars.
- * The creation tools for popup bars also need to impl DragTracker since the
- * SelectionTool calls Handle.getDragTracker during mouseDown.
- * 
- * @author affrantz, cmahoney
- * 
- */
-
-public class PopupBarTool
-	extends AbstractPopupBarTool
-	implements DragTracker {
-
-	/**
-	 * When creating shapes on a dgrm using the abar, we do not want to cover
-	 * the new shape with the abar, so we offset the creation pnt by a y-offset
-	 * 32 is not not arbitrary it is 2x16 which is the height of an icon. and 2
-	 * pixels bigger than the height of an action-bar row.
-	 */
-	static private int Y_OFFSET = 32;
-
-	/**
-	 * constructor
-	 * 
-	 * @param epHost
-	 *            the host edit part for this tool
-	 * @param elementType
-	 */
-	public PopupBarTool(EditPart epHost, IElementType elementType) {
-		super(epHost, elementType);
-	}
-
-	/**
-	 * constructor
-	 * 
-	 * @param epHost
-	 * @param theRequest
-	 *            the create request to be used
-	 */
-	public PopupBarTool(EditPart epHost, CreateRequest theRequest) {
-		super(epHost, theRequest);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-
-		/* if we have a request, use it */
-		if (getCreateRequest() != null) {
-			return getCreateRequest();
-		}
-
-		return CreateViewRequestFactory.getCreateShapeRequest(getElementType(),
-			getPreferencesHint());
-	}
-
-	/**
-	 * First tries to get a command based on the target request (a create view
-	 * and element request). If this fails, tries to get a command with a
-	 * request to create an element only.
-	 * 
-	 * @see org.eclipse.gef.tools.TargetingTool#getCommand()
-	 */
-	protected Command getCommand() {
-		Request theRequest = this.getTargetRequest();
-
-		if (theRequest instanceof CreateRequest) {
-			Point thePoint = this.getCurrentInput().getMouseLocation();
-			thePoint.y += Y_OFFSET;
-			((CreateRequest) theRequest).setLocation(thePoint);
-		}
-
-		EditPart target = getHost().getTargetEditPart(theRequest);
-		if (target == null){
-			target = getHost();
-		}
-		Command theCmd = target.getCommand(theRequest);
-		// if we return a cmd that cannot execute then later downstream an
-		// NPE can be generated.
-		if (theCmd != null && theCmd.canExecute()) {
-			return theCmd;
-		}
-
-		return getCommandToCreateElementOnly();
-	}
-
-	/**
-	 * Tries to get a command to create a new semantic element only.
-	 * 
-	 * @return the command if valid; null otherwise
-	 */
-	private Command getCommandToCreateElementOnly() {
-		EObject hostElement = ViewUtil
-			.resolveSemanticElement((View) getHost().getModel());
-
-		if (hostElement != null && getElementType() != null) {
-			CreateElementRequest theReq = new CreateElementRequest(
-                TransactionUtil.getEditingDomain(hostElement), hostElement,
-                getElementType());
-			EditCommandRequestWrapper semReq = new EditCommandRequestWrapper(
-				theReq);
-
-			// an ICommandProxy that wraps the ICommand of the from the
-			// semantic provider
-			Command theRealCmd = ((IGraphicalEditPart) getHost())
-				.getCommand(semReq);
-
-			// if we return a cmd that cannot execute then later downstream an
-			// NPE can be generated.
-			if (theRealCmd != null && theRealCmd.canExecute()) {
-				return theRealCmd;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Asks the target editpart to show target feedback and sets the target
-	 * feedback flag.
-	 */
-	protected void showTargetFeedback() {
-		// After adding items to the popup bar, the targeting tool sends
-		// createViewRequests
-		// potentially causing incorrect feedback updates. We must prevent these
-		// from
-		// getting though.
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java
deleted file mode 100644
index 3deea5d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    Dmitry Stadnik (Borland) - contribution for bugzilla 135694
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.diagram.ui.tools;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.TextUtilities;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-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.contentassist.ContentAssistantHelper;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.internal.parts.TextCellEditorEx;
-import org.eclipse.gmf.runtime.gef.ui.internal.parts.WrapTextCellEditor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.DeviceResourceException;
-import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.CellEditor;
-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.Point;
-import org.eclipse.swt.graphics.RGB;
-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.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.CellEditorActionHandler;
-
-
-/**
- * @author melaasar
- */
-public class TextDirectEditManager
-    extends DirectEditManager {
-
-    /**
-     * content assist background color
-     */
-    private Color proposalPopupBackgroundColor = null;
-
-    /**
-     * content assist foreground color
-     */
-    private Color proposalPopupForegroundColor = null;
-
-    private boolean committed = false;
-
-    /**
-     * flag used to avoid unhooking listeners twice if the UI thread is blocked
-     */
-    private boolean listenersAttached = true;
-
-    /** String buffer to hold initial characters * */
-    private StringBuffer initialString = new StringBuffer();
-
-    /**
-     * Cache the font descriptor when a font is created so that it can be
-     * disposed later.
-     */
-    private List cachedFontDescriptors = new ArrayList();
-
-    private IActionBars actionBars;
-
-    private CellEditorActionHandler actionHandler;
-
-    private IAction copy, cut, paste, undo, redo, find, selectAll, delete;
-
-    private Font zoomLevelFont = null;
-
-    /**
-     * The superclass only relocates the cell editor when the location of the
-     * editpart's figure moves, but we need to also relocate the cell editor
-     * when the text figure's location changes.
-     */
-    private AncestorListener textFigureListener;
-
-    /**
-     * Cache locally so we can check if the user specified an editorType.
-     */
-    private Class editorType;
-
-    /**
-     * constructor
-     * 
-     * @param source
-     *            <code>GraphicalEditPart</code> to support direct edit of.
-     *            The figure of the <code>source</code> edit part must be of
-     *            type <code>WrapLabel</code>.
-     */
-    public TextDirectEditManager(ITextAwareEditPart source) {
-        this(source, null,
-            getTextCellEditorLocator(source));
-    }
-
-    /**
-     * @param source
-     * @param editorType
-     * @param locator
-     */
-    public TextDirectEditManager(GraphicalEditPart source, Class editorType,
-            CellEditorLocator locator) {
-        super(source, editorType, locator);
-        this.editorType = editorType;
-    }
-
-    /**
-     * @param source
-     *            the <code>ITextAwareEditPart</code> to determine the cell
-     *            editor for
-     * @return the <code>CellEditorLocator</code> that is appropriate for the
-     *         source <code>EditPart</code>
-     */
-    public static CellEditorLocator getTextCellEditorLocator(
-            final ITextAwareEditPart source) {
-
-        final ILabelDelegate label = (ILabelDelegate) source
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return new CellEditorLocator() {
-
-                public void relocate(CellEditor celleditor) {
-                    Text text = (Text) celleditor.getControl();
-
-                    Rectangle rect = label.getTextBounds().getCopy();
-                    if (label.getText().length() <= 0) {
-                        // if there is no text, let's assume a default size
-                        // of one character because it looks silly when the cell
-                        // editor is tiny.
-                        rect.setSize(TextUtilities.INSTANCE.getTextExtents(
-                            "a", text.getFont())); //$NON-NLS-1$
-
-                        if (label.isTextWrapOn()) {
-                            // adjust the location of the cell editor based on text
-                            // justification (i.e. where the cursor will be
-                            if (label.getTextJustification() == PositionConstants.RIGHT) {
-                                rect.translate(-rect.width, 0);
-                            } else 
-                                if (label.getTextJustification() == PositionConstants.CENTER) {
-                                rect.translate(-rect.width / 2, 0);
-                            }
-                        }
-                    }
-                    
-                   	if (!text.getFont().isDisposed()) {
-                   		// Font may be disposed if the locator is called while
-						// this manager is being brought down in which case the
-						// calls below that use the font will result in an
-						// exception.
-	                    if (label.isTextWrapOn()) {
-	                		// When zoomed in, the height of this rectangle is not
-	                		// sufficient because the text is shifted downwards a
-	                		// little bit. Add some to the height to compensate for
-	                		// this. I'm not sure why this is happening, but I can
-	                		// see the text shifting down even in a label on a GEF
-	                		// logic diagram when zoomed into 400%.
-	                		int charHeight = FigureUtilities.getFontMetrics(
-	                				text.getFont()).getHeight();
-	                		rect.resize(0, charHeight / 2);
-	                    } else { 
-	                        
-	                      rect.setSize(new Dimension(text.computeSize(
-	                            SWT.DEFAULT, SWT.DEFAULT)));
-	
-	                        // If SWT.WRAP is not passed in as a style of the
-	                        // TextCellEditor, then for some reason the first
-	                        // character disappears upon entering the second 
-	                        // character. This should be investigated and an 
-	                        // SWT bug logged.
-	                        int avr = FigureUtilities
-	                            .getFontMetrics(text.getFont())
-	                            .getAverageCharWidth();
-	                        rect.setSize(new Dimension(text.computeSize(
-	                            SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));
-	                    }
-                   	}
-
-                    org.eclipse.swt.graphics.Rectangle newRect = text
-                        .computeTrim(rect.x, rect.y, rect.width, rect.height);
-                    if (!newRect.equals(text.getBounds())) {
-                        text.setBounds(newRect.x, newRect.y, newRect.width,
-                            newRect.height);
-                    }
-                }
-            };
-        }
-
-        // return a default figure locator
-        return new CellEditorLocator() {
-            public void relocate(CellEditor celleditor) {
-                Text text = (Text) celleditor.getControl();
-                Rectangle rect = source.getFigure().getBounds().getCopy();
-                source.getFigure().translateToAbsolute(rect);
-                if (!rect.equals(new Rectangle(text.getBounds()))) {
-                    text.setBounds(rect.x, rect.y, rect.width, rect.height);
-                }
-            }
-        };
-    }
-
-    /**
-     * @param source
-     *            the <code>GraphicalEditPart</code> that is used to determine
-     *            which <code>CellEditor</code> class to use.
-     * @return the <code>Class</code> of the <code>CellEditor</code> to use
-     *         for the text editing.
-     * @deprecated to override the cell editor class, use
-     *             {@link #createCellEditorOn(Composite)}, this provides the
-     *             flexibility necessary to initialize the cell editor with a
-     *             style.
-     */
-    public static Class getTextCellEditorClass(GraphicalEditPart source) {
-        IFigure figure = source.getFigure();
-                
-        if (figure instanceof WrapLabel && ((WrapLabel) figure).isTextWrapped())
-            return WrapTextCellEditor.class;
-        
-        return TextCellEditorEx.class;
-    }
-
-    /**
-     * This method is overridden so that the editor class can have a style as
-     * the style needs to be passed into the editor class when it is created. It
-     * will default to the super behavior if an <code>editorType</code> was
-     * passed into the constructor.
-     * @since 2.1
-     */
-    protected CellEditor createCellEditorOn(Composite composite) {
-
-        // if the client has overridden this class and provided their own editor
-        // type, then we should use that
-        if (editorType != null) {
-            return super.createCellEditorOn(composite);
-        }
-
-        ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(
-            ILabelDelegate.class);
-        if (label != null && label.isTextWrapOn()) {
-            int style = SWT.WRAP | SWT.MULTI;
-            
-            switch (label.getTextJustification()) {
-                case PositionConstants.LEFT:
-                    style = style | SWT.LEAD;
-                    break;
-                case PositionConstants.RIGHT:
-                    style = style | SWT.TRAIL;
-                    break;
-                case PositionConstants.CENTER:
-                    style = style | SWT.CENTER;
-                    break;
-                default:
-                    break;
-            }
-            return new WrapTextCellEditor(composite, style);
-        } else {
-            return new TextCellEditorEx(composite);
-        }
-    }
-
-    /**
-     * Given a label figure object, this will calculate the 
-     * correct Font needed to display into screen coordinates, taking into 
-     * account the current mapmode.  This will typically be used by direct
-     * edit cell editors that need to display independent of the zoom or any
-     * coordinate mapping that is taking place on the drawing surface.
-     * 
-     * @param label the label to use for the font calculation
-     * @return the <code>Font</code> that is scaled to the screen coordinates.
-     * Note: the returned <code>Font</code> should not be disposed since it is
-     * cached by a common resource manager.
-     */
-    protected Font getScaledFont(IFigure label) {
-        Font scaledFont = label.getFont();
-        FontData data = scaledFont.getFontData()[0];
-        Dimension fontSize = new Dimension(0, MapModeUtil.getMapMode(label).DPtoLP(data.getHeight()));
-        label.translateToAbsolute(fontSize);
-        
-        if( Math.abs( data.getHeight() - fontSize.height ) < 2 )
-            fontSize.height = data.getHeight();
-
-        try {
-            FontDescriptor fontDescriptor = FontDescriptor.createFrom(data);
-            cachedFontDescriptors.add(fontDescriptor);
-            return getResourceManager().createFont(fontDescriptor);
-        } catch (DeviceResourceException e) {
-            Trace.catching(DiagramUIPlugin.getInstance(),
-                DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                "getScaledFont", e); //$NON-NLS-1$
-            Log.error(DiagramUIPlugin.getInstance(),
-                DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getScaledFont", e); //$NON-NLS-1$
-        }
-        return JFaceResources.getDefaultFont();
-    }
-
-    
-    protected void initCellEditor() {
-        committed = false;
-
-        // Get the Text Compartments Edit Part
-        ITextAwareEditPart textEP = (ITextAwareEditPart) getEditPart();
-
-        setEditText(textEP.getEditText());
-
-        IFigure label = textEP.getFigure();
-        Assert.isNotNull(label);
-        Text text = (Text) getCellEditor().getControl();
-        // scale the font accordingly to the zoom level
-        text.setFont(getScaledFont(label));
-        
-        
-        // register a validator on the cell editor
-        getCellEditor().setValidator(textEP.getEditTextValidator());
-
-        if (textEP.getParser() != null) {
-            IContentAssistProcessor processor = textEP.getCompletionProcessor();
-            if (processor != null) {
-                // register content assist
-                proposalPopupBackgroundColor = new Color(getCellEditor()
-                    .getControl().getShell().getDisplay(), new RGB(254, 241,
-                    233));
-                proposalPopupForegroundColor = new Color(getCellEditor()
-                    .getControl().getShell().getDisplay(), new RGB(0, 0, 0));
-
-                ContentAssistantHelper.createTextContentAssistant(text,
-                    proposalPopupForegroundColor, proposalPopupBackgroundColor,
-                    processor);
-            }
-        }
-        
-        //Hook the cell editor's copy/paste actions to the actionBars so that they can
-        // be invoked via keyboard shortcuts.
-        actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-                .getActiveEditor().getEditorSite().getActionBars();
-        saveCurrentActions(actionBars);
-        actionHandler = new CellEditorActionHandler(actionBars);
-        actionHandler.addCellEditor(getCellEditor());
-        actionBars.updateActionBars();
-    }
-
-    /**
-     * @see org.eclipse.gef.tools.DirectEditManager#commit()
-     */
-    protected void commit() {
-        Shell activeShell = Display.getCurrent().getActiveShell();
-        if (activeShell != null
-            && getCellEditor().getControl().getShell().equals(
-                activeShell.getParent())) {
-            Control[] children = activeShell.getChildren();
-            if (children.length == 1 && children[0] instanceof Table) {
-                /*
-                 * CONTENT ASSIST: focus is lost to the content assist pop up -
-                 * stay in focus
-                 */
-                getCellEditor().getControl().setVisible(true);
-                ((TextCellEditorEx) getCellEditor()).setDeactivationLock(true);
-                return;
-            }
-        }
-
-        // content assist hacks
-        if (committed) {
-            bringDown();
-            return;
-        }
-        committed = true;
-        super.commit();
-    }
-
-    /**
-     * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-     */
-    protected void bringDown() {
-        if (proposalPopupForegroundColor != null) {
-            proposalPopupForegroundColor.dispose();
-            proposalPopupForegroundColor = null;
-        }
-        if (proposalPopupBackgroundColor != null) {
-            proposalPopupBackgroundColor.dispose();
-            proposalPopupBackgroundColor = null;
-        }
-
-        // myee - RATLC00523014: crashes when queued in asyncExec()
-        eraseFeedback();
-        
-        initialString = new StringBuffer();
-        
-        Display.getCurrent().asyncExec(new Runnable() {
-
-            public void run() {
-                // Content Assist hack - allow proper cleanup on childen
-                // controls
-                TextDirectEditManager.super.bringDown();
-            }
-        });
-        
-        for (Iterator iter = cachedFontDescriptors.iterator(); iter.hasNext();) {
-            getResourceManager().destroyFont((FontDescriptor) iter.next());           
-        }
-        cachedFontDescriptors.clear();
-        
-        if (actionHandler != null) {
-            actionHandler.dispose();
-            actionHandler = null;
-        }
-        if (actionBars != null) {
-            restoreSavedActions(actionBars);
-            actionBars.updateActionBars();
-            actionBars = null;
-        }
-    }
-
-    /**
-     * This method is used to set the cell editors text
-     * 
-     * @param toEdit
-     *            String to be set in the cell editor
-     */
-    public void setEditText(String toEdit) {
-
-        // Get the cell editor
-        CellEditor cellEditor = getCellEditor();
-
-        // IF the cell editor doesn't exist yet...
-        if (cellEditor == null) {
-            // Do nothing
-            return;
-        }
-
-        // Get the Text Compartment Edit Part
-        ITextAwareEditPart textEP = (ITextAwareEditPart) getEditPart();
-
-        // Get the Text control
-        Text textControl = (Text) cellEditor.getControl();
-
-        // Set the Figures text
-        textEP.setLabelText(toEdit);
-        
-        
-        // See RATLC00522324
-        if (cellEditor instanceof TextCellEditorEx){
-            ((TextCellEditorEx)cellEditor).setValueAndProcessEditOccured(toEdit);
-        } else {
-            cellEditor.setValue(toEdit);
-        }
-        
-        // Set the controls text and position the caret at the end of the text
-        textControl.setSelection(toEdit.length());
-    }
-
-    /**
-     * Performs show and sets the edit string to be the initial character or string
-     * @param initialChar
-     */
-    public void show(char initialChar) {
-        initialString = initialString.append(initialChar);
-        show();
-        if (SWT.getPlatform() != "carbon") { //$NON-NLS-1$ 
-            // Set the cell editor text to the initial character
-            setEditText(initialString.toString());
-        }
-    }
-    
-    /**
-     * This method obtains the fonts that are being used by the figure at its zoom level.
-     * @param gep the associated <code>GraphicalEditPart</code> of the figure
-     * @param actualFont font being used by the figure
-     * @param display
-     * @return <code>actualFont</code> if zoom level is 1.0 (or when there's an error),
-     * new Font otherwise.
-     */
-    private Font getZoomLevelFont(Font actualFont, Display display) {
-        Object zoom = getEditPart().getViewer().getProperty(ZoomManager.class.toString());
-        
-        if (zoom != null) {
-            double zoomLevel = ((ZoomManager)zoom).getZoom();
-            
-            if (zoomLevel == 1.0f) 
-                return actualFont;
-            
-            FontData[] fd = new FontData[actualFont.getFontData().length];
-            FontData tempFD = null;
-            
-            for (int i=0; i < fd.length; i++) {
-                tempFD = actualFont.getFontData()[i];
-                
-                fd[i] = new FontData(tempFD.getName(),(int)(zoomLevel * tempFD.getHeight()),tempFD.getStyle());
-            }
-            
-            try {
-                FontDescriptor fontDescriptor = FontDescriptor.createFrom(fd);
-                cachedFontDescriptors.add(fontDescriptor);
-                return getResourceManager().createFont(fontDescriptor);
-            } catch (DeviceResourceException e) {
-                Trace.catching(DiagramUIPlugin.getInstance(),
-                    DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                    "getZoomLevelFonts", e); //$NON-NLS-1$
-                Log.error(DiagramUIPlugin.getInstance(),
-                    DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING, "getZoomLevelFonts", e); //$NON-NLS-1$
-                
-                return actualFont;
-            }
-        }
-        else
-            return actualFont;
-    }
-
-    public void show() {
-        super.show();
-
-        IFigure fig = getEditPart().getFigure();
-
-        Control control = getCellEditor().getControl();
-        this.zoomLevelFont = getZoomLevelFont(fig.getFont(), control.getDisplay());
-
-        control.setFont(this.zoomLevelFont);
-
-        //since the font's have been resized, we need to resize the  Text control...
-        getLocator().relocate(getCellEditor());
-
-    }
-    
-    /**
-     * 
-     * Performs show and sends an extra mouse click to the point location so
-     * that cursor appears at the mouse click point
-     * 
-     * The Text control does not allow for the cursor to appear at point location but
-     * at a character location
-     * 
-     * @param location
-     */
-    public void show(Point location) {      
-        show();
-        sendClickToCellEditor(location);
-    }
-
-    private void sendClickToCellEditor(final Point location) {
-        //make sure the diagram doesn't receive the click event..
-        getCellEditor().getControl().setCapture(true);
-        
-        if (getCellEditor() != null && getCellEditor().getControl().getBounds().contains(location))
-            sendMouseClick(location);
-    }
-
-    
-    /**
-     * 
-     * Sends a SWT MouseUp and MouseDown event to the point location 
-     * to the current Display
-     * 
-     * @param location
-     */
-    private void sendMouseClick(final Point location) {     
-        
-        final Display currDisplay = Display.getCurrent();
-        currDisplay.asyncExec(new Runnable() {
-	        public void run() {
-	         Event event;
-                event = new Event();
-                event.type = SWT.MouseDown;
-                event.button = 1;
-                event.x = location.x;
-                event.y = location.y;
-                currDisplay.post(event);
-                event.type = SWT.MouseUp;
-                currDisplay.post(event);
-	        }
-	    });
-    }
-
-    protected void hookListeners() {
-        super.hookListeners();
-
-        // TODO: This gets around the problem of the cell editor not growing big
-        // enough when in autosize mode because it doesn't listen to textflow
-        // size changes. The superclass should be modified to not assume we want
-        // to listen to the editpart's figure.
-        ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(
-            ILabelDelegate.class);
-        if (label != null && getEditPart().getFigure() instanceof WrappingLabel) {
-
-            textFigureListener = new AncestorListener.Stub() {
-
-                public void ancestorMoved(IFigure ancestor) {
-                    getLocator().relocate(getCellEditor());
-                }
-            };
-            ((IFigure) ((WrappingLabel) getEditPart().getFigure())
-                .getTextFigure().getChildren().get(0))
-                .addAncestorListener(textFigureListener);
-        }
-    }
-
-    /*
-     * Overrides super unhookListeners to set listeners attached flag This
-     * method prevents unhooking listeners twice if the UI thread is blocked.
-     * For example, a validation dialog may block the thread
-     */
-    protected void unhookListeners() {
-        if (listenersAttached) {
-            listenersAttached = false;
-            super.unhookListeners();
-
-            ILabelDelegate label = (ILabelDelegate) getEditPart().getAdapter(
-                ILabelDelegate.class);
-            if (label != null && textFigureListener != null) {
-                ((IFigure) ((WrappingLabel) getEditPart().getFigure())
-                    .getTextFigure().getChildren().get(0))
-                    .removeAncestorListener(textFigureListener);
-                textFigureListener = null;
-            }
-        }
-    }
-
-    /* 
-     * Sets the listeners attached flag if the cell editor exists
-     */
-    protected void setCellEditor(CellEditor editor) {
-        super.setCellEditor(editor);
-        if (editor != null) {
-            listenersAttached = true;
-        }
-    }
-
-    public void showFeedback() {
-        try {
-            getEditPart().getRoot();
-            super.showFeedback();
-        } catch (Exception e) {
-            // TODO: handle exception
-        }
-        
-    }    
-    
-    /**
-     * Gets the resource manager to remember the resources allocated for this
-     * graphical viewer. All resources will be disposed when the graphical
-     * viewer is closed if they have not already been disposed.
-     * @return
-     */
-    protected ResourceManager getResourceManager() {
-        return ((DiagramGraphicalViewer) getEditPart().getViewer())
-            .getResourceManager();
-    }
-    
-    private void saveCurrentActions(IActionBars _actionBars) {
-        copy = _actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
-        paste = _actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
-        delete = _actionBars.getGlobalActionHandler(ActionFactory.DELETE.getId());
-        selectAll = _actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL.getId());
-        cut = _actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
-        find = _actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
-        undo = _actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
-        redo = _actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
-    }
-    
-    private void restoreSavedActions(IActionBars _actionBars){
-        _actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
-        _actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
-        _actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
-        _actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), selectAll);
-        _actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
-        _actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
-        _actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
-        _actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeConnectionTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeConnectionTool.java
deleted file mode 100644
index 748460d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeConnectionTool.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.diagram.ui.tools;
-
-import java.util.List;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-
-/**
- * This specialized connection tool adds support for a multi-type connection tool.
- * That is, the tool is given a list of connection types and when the user
- * completes the gesture, a popup appears asking the user to pick one of the
- * connection types.
- * 
- * @author cmahoney
- */
-public class UnspecifiedTypeConnectionTool
-	extends ConnectionCreationTool {
-
-	/**
-	 * The possible connection types to appear in the popup (of type
-	 * <code>IElementType</code>).
-	 */
-	private List connectionTypes;
-
-	/**
-	 * Creates a new instance with a list of possible connection types.
-	 * 
-	 * @param connectionTypes
-	 *            The possible connection types to appear in the popup (of
-	 *            type <code>IElementType</code>).
-	 */
-	public UnspecifiedTypeConnectionTool(List connectionTypes) {
-		super();
-		this.connectionTypes = connectionTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new CreateUnspecifiedTypeConnectionRequest(connectionTypes,
-			false, getPreferencesHint());
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeCreationTool.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeCreationTool.java
deleted file mode 100644
index d43903b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/UnspecifiedTypeCreationTool.java
+++ /dev/null
@@ -1,57 +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.tools;
-
-import java.util.List;
-
-import org.eclipse.gef.Request;
-
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
-
-/**
- * This specialized creation tool adds support for a multi-type creation tool.
- * That is, the tool is given a list of element types and when the user completes
- * the gesture, a popup appears asking the user to pick one of the element types
- * to be created.
- * 
- * @author cmahoney
- */
-public class UnspecifiedTypeCreationTool
-	extends CreationTool {
-
-	/**
-	 * List of element types of which one will be created (of type
-	 * <code>IElementType</code>).
-	 */
-	private List elementTypes;
-
-	/**
-	 * Creates a new instance with a list of possible element types.
-	 * 
-	 * @param elementTypes
-	 *            List of element types of which one will be created (of type
-	 *            <code>IElementType</code>).
-	 */
-	public UnspecifiedTypeCreationTool(List elementTypes) {
-		super();
-		this.elementTypes = elementTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()
-	 */
-	protected Request createTargetRequest() {
-		return new CreateUnspecifiedTypeRequest(elementTypes, getPreferencesHint());
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/package.html
deleted file mode 100644
index dcf9388..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/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 creation tool specific classes, they could
-create Notation views or Semantic elemetn sor both</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/type/DiagramNotationType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/type/DiagramNotationType.java
deleted file mode 100644
index d78d1d4..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/type/DiagramNotationType.java
+++ /dev/null
@@ -1,31 +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.type;
-
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-
-/**
- * Element types for notation elements defined in the Diagram UI plugin.
- * 
- * @author cmahoney, ldamus
- */
-public class DiagramNotationType
-	extends AbstractElementTypeEnumerator {
-
-	public static final INotationType NOTE = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.presentation.note"); //$NON-NLS-1$
-
-	public static final INotationType NOTE_ATTACHMENT = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.presentation.noteAttachment"); //$NON-NLS-1$
-
-	public static final INotationType TEXT = (INotationType) getElementType("org.eclipse.gmf.runtime.diagram.ui.presentation.text"); //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/DiagramEditorUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/DiagramEditorUtil.java
deleted file mode 100644
index 56a3c38..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/DiagramEditorUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    Intalio, Inc. patch for bug 264483 and some javadoc
- ****************************************************************************/
-package org.eclipse.gmf.runtime.diagram.ui.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-
-/**
- * Helper class to help find a view in an opened editor.
- *
- */
-public class DiagramEditorUtil {
-
-	/**
-	 * Finds the <code>DiagramEditor</code> that is opened for the diagram
-	 * with the given diagram view id.
-	 * 
-	 * @param id
-	 *            diagram view's id
-	 * @return an opened editor that displays the diagram with the given diagram
-	 *         view id
-	 */
-	public static DiagramEditor findOpenedDiagramEditorForID(String id) {
-		if (id != null) {
-			List diagramEditors = EditorService.getInstance()
-					.getRegisteredEditorParts();
-			Iterator it = diagramEditors.iterator();
-			while (it.hasNext()) {
-				Object obj = it.next();
-				if (obj instanceof DiagramEditor) {
-					DiagramEditor diagramEditor = (DiagramEditor) obj;
-					if (diagramEditor.getDiagramEditPart() == null) {
-					    continue;
-					}
-					if (id.equals(ViewUtil.getIdStr(diagramEditor
-							.getDiagramEditPart().getDiagramView()))) {
-						return diagramEditor;
-					}
-				}
-			}
-		}
-		// no matching guid found
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/EditPartUtil.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/EditPartUtil.java
deleted file mode 100644
index 7e402e7..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/EditPartUtil.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * provides different utility functions for the EditPart
- * @author mmostafa
- */
-
-public class EditPartUtil {
-	
-	/** 
-	 * gets the <code>Editpart</code>'s semantic element Class Id, this could be used to
-	 * check the semantic element type
-	 * @param editpart the owner of the semantic element
-	 * @return the semantic element class Id
-	 */
-	public static String getSemanticEClassName(IGraphicalEditPart editPart) {
-		if (editPart.getModel() instanceof View){
-			View view = (View)editPart.getModel();
-			EObject element = view.getElement();
-			return element == null ? null : PackageUtil.getID(EMFCoreUtil.getProxyClass(element));
-		}
-		return null;
-	}
-    
-    /**
-     * remove all the canonical edit policies on the passed edit part, if the considerChildren 
-     * flag is ON, it will remove the canonical editpolicies on every edit part in the 
-     * passed edit part hirarchy
-     * @param editPart the edit part to remove the edit policy from
-     * @param considerChildren determine the the canonical edit policies will be removed from 
-     *        children as well or not
-     */
-    public static void removeCanonicalEditPolicies(EditPart editPart, boolean considerChildren) {
-        EditPolicy ep = editPart.getEditPolicy(EditPolicyRoles.CANONICAL_ROLE);
-        if (ep!=null){
-            editPart.removeEditPolicy(ep);
-        }
-        if (considerChildren){
-            Iterator childrenIterator = editPart.getChildren().iterator();
-            removeCanonicalEditPolicies(childrenIterator);
-            if (editPart instanceof AbstractGraphicalEditPart){
-                AbstractGraphicalEditPart gEP = (AbstractGraphicalEditPart)editPart;
-                Iterator sourceConnectionsIterator = gEP.getSourceConnections().iterator();
-                removeCanonicalEditPolicies(sourceConnectionsIterator);
-                Iterator targetConnectionsIterator = gEP.getTargetConnections().iterator();
-                removeCanonicalEditPolicies(targetConnectionsIterator);
-            }
-        }
-    }
-
-    private static void removeCanonicalEditPolicies(Iterator childrenIterator) {
-        while (childrenIterator.hasNext()) {
-            EditPart child = (EditPart)childrenIterator.next();
-            removeCanonicalEditPolicies(child,true);
-        }
-    }
-	
-	/**
-	 * Used as general utility usually in the context of handling notifications to ensure that a runnable will
-	 * be run in the appropriate thread context so that SWT or other reservered resources can be accessed.  Should be only
-	 * be used when the client is sure that in the stack of execution SWT resources will be accessed directly.  Otherwise,
-	 * this could incur a performance penalty when handling notifications.  Also, it may spawn the runnable asynchronously
-	 * to the main thread which may break assumptions on ordering when the events are handled.
-	 * 
-	 * @param editPart the <code>EditPart</code> that is receiving notification or is being accessed potentially
-	 * on a worker thread that needs to ensure safe access to SWT or other resources reserved for the main thread.
-	 * @param runThreadSafe the <code>Runnable</code> that is to be executed in a thread safe manner.
-	 */
-	public static void synchronizeRunnableToMainThread(IGraphicalEditPart editPart, Runnable runThreadSafe) {
-		InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain)editPart.getEditingDomain();
-        
-		if (Display.getCurrent() == null && editingDomain != null && editingDomain.getActiveTransaction() != null) {
-			Display display = PlatformUI.isWorkbenchRunning() ? PlatformUI.getWorkbench().getDisplay() : Display.getDefault();
-			if (editingDomain != null) {
-	        	display.syncExec(editingDomain.createPrivilegedRunnable(runThreadSafe));
-	        }
-	        else {
-	        	display.asyncExec(runThreadSafe);
-			}
-		}
-		else {
-			runThreadSafe.run();
-		}
-	}
-	
-    /**
-     * Checks if the current active transaction is a Write transaction or not
-     * unprotected transaction are not considered write transaction
-     * 
-     * @param editPart the <code>IGraphicalEditPart</code> that is used as a context to find the currently
-     * running transaction if any.
-     * @param includeUnprotected <code>boolean</code> value that if <code>true</code> will consider unprotected
-     * transactions when determining if a write transaction is in progress.
-     * @param otherThread <code>boolean</code> value that if <code>true</code>, will verify whether there is
-     * an active transaction only when on a different thread then the caller.  This is useful to determine if a 
-     * deadlock scenario will occur.
-     * @return <code>true</code> if the current active transaction is a write transaction 
-     */
-    public static boolean isWriteTransactionInProgress(IGraphicalEditPart editPart, boolean includeUnprotected, boolean otherThread) {
-        TransactionalEditingDomain theEditingDomain = editPart.getEditingDomain();
-        if (theEditingDomain instanceof InternalTransactionalEditingDomain){
-            InternalTransactionalEditingDomain internalEditingDomain = 
-                (InternalTransactionalEditingDomain)theEditingDomain;
-            InternalTransaction transaction = internalEditingDomain.getActiveTransaction();
-            if (transaction!=null && !transaction.isReadOnly()) {
-            	if (!includeUnprotected) {
-	                Object unprotectedMode = transaction.getOptions().get(Transaction.OPTION_UNPROTECTED); 
-	                if (Boolean.TRUE.equals(unprotectedMode)) {
-	                	return false;
-	                }
-            	}
-                
-            	if (otherThread && Thread.currentThread() != transaction.getOwner())
-            		return true;
-            	else if (!otherThread)
-            		return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/INotationType.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/INotationType.java
deleted file mode 100644
index a48e643..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/INotationType.java
+++ /dev/null
@@ -1,33 +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.util;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-
-
-/**
- * Identifies a notation type, that is a type that is represented by a view
- * only.
- * <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 INotationType
-	extends IHintedType {
-// no def api
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/MeasurementUnitHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/MeasurementUnitHelper.java
deleted file mode 100644
index 70dd71e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/MeasurementUnitHelper.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.runtime.diagram.ui.util;
-
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-
-
-/**
- * @author sshaw
- * Helper class to retrieve appropriate IMapMode implementation
- * for a given MeasurementUnit enumerated type.
- *
- */
-public class MeasurementUnitHelper {
-
-	/**
-	 * @param unit the <code>MeasurementUnit</code> to find the appropriate
-	 * <code>IMapMode</code> implementation that will convert from the coordinate
-	 * system of the unit to device coordinates.
-	 * @return the <code>IMapMode</code> class that knows how to convert the unit
-	 * to device coordinates.
-	 */
-	static public IMapMode getMapMode(MeasurementUnit unit) {
-		if (unit.equals(MeasurementUnit.PIXEL_LITERAL))
-			return MapModeTypes.IDENTITY_MM;
-		else if (unit.equals(MeasurementUnit.HIMETRIC_LITERAL))
-			return MapModeTypes.HIMETRIC_MM;
-		
-		return MapModeTypes.DEFAULT_MM;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/SelectInDiagramHelper.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/SelectInDiagramHelper.java
deleted file mode 100644
index 4e2432a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/SelectInDiagramHelper.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.RangeModel;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Helper for selecting an element on a diagram.  Works for closed diagrams
- * when you open the diagram first.  You can use View's getDiagram()
- * to determine the diagram to open.  getDiagram() returns itself if the
- * View is a Diagram.
- *
- * @author wdiu, Wayne Diu
- */
-public class SelectInDiagramHelper {
-
-	/**
-	 * Do not instantiate this helper class
-	 */
-	private SelectInDiagramHelper() {
-		//do not instantiate
-	}
-
-	/**
-	 * Activate the diagram if it's already open.
-	 * If not, return null.
-	 * 
-	 * @param diagram Diagram to activate
-	 * @return DiagramEditor of the activated diagram.  null if it was not open
-	 * and could not be activated.
-	 */
-	public static DiagramEditor activateDiagram(Diagram diagram) {
-
-		List editors = EditorService.getInstance().getRegisteredEditorParts();
-		Iterator it = editors.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-
-			if (obj instanceof DiagramEditor) {
-				DiagramEditor diagramEditor = ((DiagramEditor) obj);
-				if (diagramEditor.getDiagram().equals(diagram)) {
-					//it's already open, just activate
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getActivePage().activate(diagramEditor);
-					return diagramEditor;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Select the View element from the DiagramEditor.
-	 * 
-	 * The DiagramEditor for the view must be the active editor for this
-	 * workbench, otherwise it does not make sense to call this method.
-	 * 
-	 * Call activateDiagram to set the active DiagramEditor or open it
-	 * manually.
-	 * 
-	 * @param view View to select
-	 */
-	public static void selectElement(View view) {
-		IEditorPart editorPart = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
-		//DiagramEditor should be activated
-		Assert.isTrue(editorPart instanceof DiagramEditor);
-
-		DiagramEditor diagramEditor = (DiagramEditor) editorPart;
-
-		//activated DiagramEditor must be the one that corresponds to
-		//this view's diagram
-		Assert.isTrue(diagramEditor.getDiagram().equals(view.getDiagram()));
-
-		//diagramEditor instanceof IDiagramWorkbenchPart
-		IDiagramGraphicalViewer viewer = diagramEditor
-			.getDiagramGraphicalViewer();
-		Assert.isNotNull(viewer);
-
-		//find the edit part
-		Object obj = viewer.getEditPartRegistry().get(view);
-
-		if (obj instanceof EditPart) {
-			viewer.select((EditPart) obj);
-		} else {
-			//could not activate the edit part from the registry
-			Assert.isTrue(false);
-		}
-
-	}
-
-	/**
-	 * This api will expose the diagram at the location given in absolute co-ordinates.
-	 * @param canvas
-	 * @param location
-	 */
-	public static void exposeLocation(FigureCanvas canvas,Point location){
-		location = location.getCopy();
-		int padding = 50;
-		if (location.x >= 0){
-			location.x += padding;  
-		}else{
-			location.x -= padding;
-		}
-		
-		if (location.y >= 0){
-			location.y += padding;  
-		}else{
-			location.y -= padding;
-		}
-		
-		int viewPortXLocation = canvas.getBounds().x;
-		int viewPortXExtent = canvas.getBounds().x+canvas.getBounds().width;
-		
-		int viewPortYLocation = canvas.getBounds().y;
-		int viewPortYExtent = canvas.getBounds().y+canvas.getBounds().height;
-		
-		int deltaX = 0;
-		int deltaY = 0;
-		
-		if (location.x < viewPortXLocation){
-			deltaX = location.x - viewPortXLocation;
-		}else if (location.x > viewPortXExtent){
-			deltaX = location.x - viewPortXExtent;
-		}
-		
-		if (location.y < viewPortYLocation){
-			deltaY = location.y - viewPortYLocation;
-		} else if (location.y > viewPortYExtent){
-			deltaY = location.y - viewPortYExtent;
-		}
-		
-		RangeModel hRange = canvas.getViewport().getHorizontalRangeModel();
-		RangeModel vRange = canvas.getViewport().getVerticalRangeModel();
-		if ((deltaX != 0) || (deltaY != 0)){
-			canvas.getViewport().setIgnoreScroll(true);
-			int x = hRange.getValue() + deltaX;
-			int y = vRange.getValue() + deltaY;
-			canvas.scrollSmoothTo(x,y);
-			canvas.getViewport().setIgnoreScroll(false);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/util/package.html
deleted file mode 100644
index 326308b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/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.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractLabelViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractLabelViewFactory.java
deleted file mode 100644
index 84d2758..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractLabelViewFactory.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.diagram.ui.view.factories;
-
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * the base factory class for all label views
- * @see  org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory
- * @author mmostafa
- */
-abstract public class AbstractLabelViewFactory
-	extends BasicNodeViewFactory {
-
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createLocation();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractShapeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractShapeViewFactory.java
deleted file mode 100644
index cdf85f0..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractShapeViewFactory.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.view.factories; 
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-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 base abstract node view factory 
- * @see  org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory
- * @author mmostafa
- */
-abstract public class AbstractShapeViewFactory extends BasicNodeViewFactory {
-
-	/**
-	 * Method used to create the layout constraint that will get set on the 
-	 * created view. You can override this method in your own factory to change
-	 * the default constraint. This method is called by @link #createView(IAdaptable, View, String, int, boolean) 
-	 * @return a new layout constraint for the view
-	 */
-	protected LayoutConstraint createLayoutConstraint() {
-		return NotationFactory.eINSTANCE.createBounds();
-	}
-	
-	/**
-	 * Initialize the newly created view from the preference store, this
-	 * method get called by @link #decorateView(View, IAdaptable, String)
-	 * @param view the view to initialize
-	 */
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		
-		FillStyle fillStyle = (FillStyle) view
-			.getStyle(NotationPackage.Literals.FILL_STYLE);
-		if (fillStyle != null) {
-			// fill color
-			RGB fillRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_FILL_COLOR);
-
-			fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-				.intValue());
-		}		
-	}
-	
-	/**
-	 * this method is called by @link #createView(IAdaptable, View, String, int, boolean) to 
-	 * create the styles for the view that will be created, you can override this 
-	 * method in you factory sub class to provide additional styles
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
-		return styles;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java
deleted file mode 100644
index a23637a..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java
+++ /dev/null
@@ -1,196 +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.view.factories;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.view.factories.ViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-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.SWT;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
-
-
-/**
- * The abstract implementation of the ViewFactory interface. This class could be the 
- * base class for any generic View  
- * @author mmostafa
- */
-abstract public class AbstractViewFactory implements ViewFactory {
-	
-
-	/**
-	 * 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;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.core.view.factories.ViewFactory#createView(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, java.lang.String)
-	 */
-	abstract public View createView(final IAdaptable semanticAdapter,
-			final View containerView, final String semanticHint,
-			final int index, final boolean persisted, final PreferencesHint thePreferencesHint);
-
-	/**
-	 * creates styles for the passed view and return them as List; the returned list 
-	 * could be empty if the view does not need any style
-	 * 
-	 * @return a list of style for the passed view, or an empty list if none (do not return null)
-	 * 
-	 */
-	protected List createStyles(View view) {
-		return new ArrayList();
-	}
-	
-	/**
-	 * Indicates if the passed view requires an element inside it or it can use
-	 * its container's element
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @return
-	 */
-	protected boolean requiresElement(IAdaptable semanticAdapter, View view) {		
-		if (semanticAdapter!=null){			
-			return requiresElement((EObject)semanticAdapter.getAdapter(EObject.class),view);
-		}
-		return true;
-	}
-	
-	/**
-	 * Indicates if the passed view requires an element inside it or it can use
-	 * its container's element
-	 * 
-	 * @param semanticAdapter
-	 * @param containerView
-	 * @return
-	 */
-	protected boolean requiresElement(EObject semanticElement, View view) {		
-		return !(semanticElement == view.getElement());		
-	}
-	
-	/**
-	 * Initialize the passed view from the preference store
-	 * @param view the view to initialize
-	 */
-	protected void initializeFromPreferences(View view) {
-		
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-		if (store == null) {
-			return;
-		}
-
-        LineStyle lineStyle = (LineStyle) view
-			.getStyle(NotationPackage.Literals.LINE_STYLE);
-		if (lineStyle != null) {
-			// line color
-			RGB lineRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_LINE_COLOR);
-
-			lineStyle.setLineColor(FigureUtilities.RGBToInteger(lineRGB)
-				.intValue());
-		}
-
-		FontStyle fontStyle = (FontStyle) view
-			.getStyle(NotationPackage.Literals.FONT_STYLE);
-
-		if (fontStyle != null) {
-			// default font
-			FontData fontData = PreferenceConverter.getFontData(store,
-				IPreferenceConstants.PREF_DEFAULT_FONT);
-			fontStyle.setFontName(fontData.getName());
-			fontStyle.setFontHeight(fontData.getHeight());
-			fontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
-			fontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-			// font color
-			RGB fontRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_FONT_COLOR);
-			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)
-				.intValue());
-		}
-
-	}
-	
-	
-	/**
-	 * Method getViewService.
-	 * a utility function to return the view service instance
-	 * @return ViewService
-	 */
-	protected static ViewService getViewService() {
-		return ViewService.getInstance();
-	}
-	
-	/**
-	 * 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;
-	}
-	
-	/**
-	 * Sets 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>.
-	 * 
-	 * @param preferencesHint the preferences hint
-	 */
-	protected void setPreferencesHint(PreferencesHint preferencesHint) {
-		this.preferencesHint = preferencesHint;
-	}
-
-    /**
-     * Determines the editing domain for the view creation.
-     * 
-     * @param semanticElement
-     *            the semantic elemement; may be null
-     * @param containerView
-     *            the container view
-     * @return the editing domain
-     */
-    protected TransactionalEditingDomain getEditingDomain(EObject semanticElement, View containerView) {
-    
-        TransactionalEditingDomain result = null;
-    
-        if (semanticElement != null) {
-            result = TransactionUtil.getEditingDomain(semanticElement);
-        }
-    
-        if (result == null) {
-            result = TransactionUtil.getEditingDomain(containerView);
-        }
-        return result;
-    }
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/BasicNodeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/BasicNodeViewFactory.java
deleted file mode 100644
index 35cd4dd..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/BasicNodeViewFactory.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories; 
-
-import java.util.HashMap;
-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.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-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.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.notation.LayoutConstraint;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This is the base factory class for all Node views, it will 
- * create the view and decorate it using the default decorations
- * you can subclass it to add more decorations, or customize the 
- * way it looks, like adding new style
- * @see #createView(IAdaptable, View, String, int, boolean, String)
- * @see #decorateView(View, View, IAdaptable, String, int, boolean)
- * @see #createStyles(View)
- * @author mmostafa
- * 
- */
-public class BasicNodeViewFactory extends AbstractViewFactory {
-	private static final Map options = new HashMap();	
-    static {
-        options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
-        options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
-        options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
-    }
-
-    private static final Map setElementOptions = new HashMap();   
-    static {
-        options.put(Transaction.OPTION_UNPROTECTED, Boolean.FALSE);
-        options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
-        options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
-    }
-    
-	/**
-	 * 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
-	 */
-	public View createView(final IAdaptable semanticAdapter,
-						   final View containerView,
-						   final String semanticHint,
-						   final int index,
-		boolean persisted, final PreferencesHint preferencesHint) {
-		setPreferencesHint(preferencesHint);
-		final Node node = createNode();
-		List styles = createStyles(node);
-        if (styles.size() > 0) {
-            node.getStyles().addAll(styles);
-        }
-		
-        LayoutConstraint layoutConstraint = createLayoutConstraint();
-        if (layoutConstraint != null) {
-            node.setLayoutConstraint(layoutConstraint);
-        }
-
-		
-		
-		node.setType(semanticHint);
-		
-	    // decorate view assumes that the view had been inserted already, so
-		// we had to call insert child before calling decorate view
-		ViewUtil.insertChildView(containerView, node, index, persisted);	
-        
-        final EObject semanticEl = semanticAdapter==null ? null : (EObject)semanticAdapter.getAdapter(EObject.class);
-        if (semanticEl==null)
-            // enforce a set to NULL
-            node.setElement(null);
-        else if (requiresElement(semanticAdapter,containerView)){
-            TransactionalEditingDomain domain = getEditingDomain(semanticEl,
-                containerView);
-            if (domain != null) {
-                AbstractEMFOperation operation = new AbstractEMFOperation(
-                    domain, StringStatics.BLANK, setElementOptions) {
-        
-                    protected IStatus doExecute(IProgressMonitor monitor,
-                            IAdaptable info)
-                        throws ExecutionException {
-                        // setElement must create a record in the ChangeRecorder,
-                        // otherwise setting the element will never be undone on Undo
-                        // and cross reference adapters will always report this new node as having reference to semanticEl
-                        // even when the node is itself dead.
-                        // This will cause all kind of problems, semanticEl becoming "undeletable" being one.
-                        node.setElement(semanticEl);
-                        return Status.OK_STATUS;
-                    }
-                };
-                try {
-                	operation.setReuseParentTransaction(true);
-                    operation.execute(new NullProgressMonitor(), null);
-                } catch (ExecutionException e) {
-                    Trace.catching(DiagramUIPlugin.getInstance(),
-                        DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-                        "createView", e); //$NON-NLS-1$
-                    Log
-                        .warning(DiagramUIPlugin.getInstance(),
-                            DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-                            "createView", e); //$NON-NLS-1$
-                }
-            }
-        }
-		
-        TransactionalEditingDomain domain = getEditingDomain(semanticEl,
-            containerView);
-        
-        if (domain != null) {
-            // try to reuse the transaction
-            if (isUnProtectedSilentTransactionInProgress(domain)){
-                // decorate view had to run as a silent operation other wise
-                // it will generate too many events
-                decorateView(containerView, node, semanticAdapter,
-                    semanticHint, index, true);
-                
-            }else{
-        		AbstractEMFOperation operation = new AbstractEMFOperation(
-                    domain, StringStatics.BLANK, options) {
-        
-        			protected IStatus doExecute(IProgressMonitor monitor,
-        					IAdaptable info)
-        				throws ExecutionException {
-        				// decorate view had to run as a silent operation otherwise
-        				// it will generate too many events
-        				decorateView(containerView, node, semanticAdapter,
-        					semanticHint, index, true);
-        
-        				return Status.OK_STATUS;
-        			}
-        		};
-        		try {
-        			operation.setReuseParentTransaction(true);
-        			operation.execute(new NullProgressMonitor(), null);
-        		} catch (ExecutionException e) {
-        			Trace.catching(DiagramUIPlugin.getInstance(),
-        				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-        				"createView", e); //$NON-NLS-1$
-        			Log
-        				.warning(DiagramUIPlugin.getInstance(),
-        					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-        					"createView", e); //$NON-NLS-1$
-        		}
-            }
-        }
-		return node;
-	}
-    
-    /**
-     * This method is responsible for decorating the created view, it get called
-     * by the Factory method
-     * 
-     * @link #createView(IAdaptable, View, String, int, boolean), it will
-     *       intiliaze the view with the default preferences also it will create
-     *       the default elements of the <code>View</code> if it had any
-     * @param containerView
-     *            the container of the view
-     * @param view
-     *            the view itself
-     * @param semanticAdapter
-     *            the semantic elemnent of the view (it could be null)
-     * @param semanticHint
-     *            the semantic hint of the view
-     * @param index
-     *            the index of the view
-     * @param persisted
-     *            flag indicating the the view was created as persisted or not
-     */
-	protected void decorateView(View containerView,
-								View view,
-								IAdaptable semanticAdapter,
-								String semanticHint,
-								int index,
-								boolean persisted){
-		initializeFromPreferences(view);
-	}
-
-	/**
-	 * Method used to create the layout constraint that will get set on the 
-	 * created view. You can override this method in your own factory to change
-	 * the default constraint. This method is called by @link #createView(IAdaptable, View, String, int, boolean) 
-	 * @return a new layout constraint for the view
-	 */
-	protected LayoutConstraint createLayoutConstraint() {
-		return null;
-	}
-
-	
-	/**
-	 * method to create the Notation meta model <code>Node</code>
-	 * object that represents the view, you can override this method in your
-	 * own factories to create you own node while extends the <code>Node</code> class
-	 * this method is invoked by @link #createView(IAdaptable, View, String, int, boolean)
-	 * @return the created <code>Node</code>
-	 */
-	protected Node createNode(){
-		return NotationFactory.eINSTANCE.createNode();
-	}
-    
-     /**
-     * Checks if the current active transaction is a unprotected amd silent
-     * 
-     * @param domain , the domain to use during the check
-     * @return <code>true</code> if the current active transaction is unprotected and silent 
-     */
-    protected static boolean isUnProtectedSilentTransactionInProgress(TransactionalEditingDomain domain) {
-        if (domain instanceof InternalTransactionalEditingDomain){
-            InternalTransactionalEditingDomain internalEditingDomain = 
-                (InternalTransactionalEditingDomain)domain;
-            InternalTransaction transaction = internalEditingDomain.getActiveTransaction();
-            if (transaction!=null && !transaction.isReadOnly()) {
-                Object unprotectedMode = transaction.getOptions().get(Transaction.OPTION_UNPROTECTED); 
-                if (Boolean.TRUE.equals(unprotectedMode)) {
-                    // check for silent
-                    Object noNotificationMode = transaction.getOptions().get(Transaction.OPTION_NO_NOTIFICATIONS);
-                    Object noTriggersMode = transaction.getOptions().get(Transaction.OPTION_NO_TRIGGERS);
-                    if (Boolean.TRUE.equals(noNotificationMode) &&
-                    	Boolean.TRUE.equals(noTriggersMode)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-	
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ConnectionViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ConnectionViewFactory.java
deleted file mode 100644
index 564eee8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ConnectionViewFactory.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransaction;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-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.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.core.view.factories.ViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.notation.Bendpoints;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.RoutingStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * This is the bas factory class for all connection views, it will 
- * create the view and decorate it using the default decorations
- * you can subclass it to add more decorations, or customize the 
- * way it looks, like adding new style
- * @see #createView(IAdaptable, View, String, int, boolean, String)
- * @see #decorateView(View, View, IAdaptable, String, int, boolean)
- * @see #createStyles()
- * @author mmostafa
- * 
- */
-
-public class ConnectionViewFactory
-	extends AbstractViewFactory implements ViewFactory {
-	private static final Map options = new HashMap();	
-    static {
-        options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
-        options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
-        options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.core.view.factories.ViewFactory#createView(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean, java.lang.String)
-	 */
-	public View createView(final IAdaptable semanticAdapter,
-			final View containerView, final String semanticHint,
-			final int index, final boolean persisted,
-			final PreferencesHint preferencesHint) {
-
-		setPreferencesHint(preferencesHint);
-
-		final Edge edge = createEdge();
-		List styles = createStyles(edge);
-        if (styles.size() > 0) {
-        	edge.getStyles().addAll(styles);
-        }
-        
-        Bendpoints bendPoints = createBendpoints();
-        if (bendPoints != null) {
-			edge.setBendpoints(bendPoints);
-		}
-
-		edge.setType(semanticHint);
-		
-		// decorate view assumes the view had been inserted already, so 
-		// we had to call insert child before calling decorate view
-		ViewUtil.insertChildView(containerView,edge, index, persisted);
-        
-        EObject semanticEl = semanticAdapter==null ? null : (EObject)semanticAdapter.getAdapter(EObject.class);
-        if (semanticEl==null)
-            // enforce a set to NULL
-            edge.setElement(null);
-        else if (requiresElement(semanticAdapter,containerView)){
-            edge.setElement(semanticEl);
-        }
-        
-        TransactionalEditingDomain domain = getEditingDomain(semanticEl, containerView);
-		
-        if (isUnProtectedSilentTransactionInProgress(domain)){
-            // decorate view had to run as a silent operation other wise
-            // it will generate too many events
-            decorateView(containerView, edge, semanticAdapter,
-                semanticHint, index, true);
-            
-        }else{
-    		AbstractEMFOperation operation = new AbstractEMFOperation(
-                domain, StringStatics.BLANK,
-    			options) {
-    
-    			protected IStatus doExecute(IProgressMonitor monitor,
-    					IAdaptable info)
-    				throws ExecutionException {
-    			    decorateView(containerView, edge, semanticAdapter,
-    					semanticHint, index, true);
-    
-    				return Status.OK_STATUS;
-    			}
-    		};
-    		try {
-    			operation.setReuseParentTransaction(true);
-    			operation.execute(new NullProgressMonitor(), null);
-    		} catch (ExecutionException e) {
-    			Trace.catching(DiagramUIPlugin.getInstance(),
-    				DiagramUIDebugOptions.EXCEPTIONS_CATCHING, getClass(),
-    				"createView", e); //$NON-NLS-1$
-    			Log
-    				.warning(DiagramUIPlugin.getInstance(),
-    					DiagramUIStatusCodes.IGNORED_EXCEPTION_WARNING,
-    					"createView", e); //$NON-NLS-1$
-    		}
-        }
-
-		return edge;
-	}
-	
-	/**
-	 * Creates a blank notation model element for edge.
-	 * 
-	 * @return the new edge
-	 * @since 1.2
-	 */
-	protected Edge createEdge() {
-		return NotationFactory.eINSTANCE.createEdge();
-	}
-	
-	/**
-	 * this method will create the default bend point on the connection, connections are
-	 * created as Straight linem you can override this method in your own factory that 
-	 * subclass this class and change this behavior by adding extra bend points or returning
-	 * a new list of bend points. This method get called by @link #createView(IAdaptable, View, String, int, boolean) 
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected Bendpoints createBendpoints() {
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE
-			.createRelativeBendpoints();
-		List points = new ArrayList(2);
-		points.add(new RelativeBendpoint());
-		points.add(new RelativeBendpoint());
-		bendpoints.setPoints(points);
-		return bendpoints;
-	}
-
-	/**
-	 * This method is responsible for decorating the created view, it get called
-	 * by the Factory method @link #createView(IAdaptable, View, String, int, boolean),
-	 * it will intiliaze the view with the default preferences also it will create 
-	 * the default elements of the <code>View</code> if it had any
-	 * @param containerView the container of the view
-	 * @param view the view itself
-	 * @param element the semantic elemnent of the view (it could be null)
-	 * @param semanticHint the semantic hint of the view
-	 * @param index the index of the view
-	 * @param persisted flag indicating the the view was created as persisted or not
-	 */
-	protected void decorateView(View containerView, View view, IAdaptable element,
-			String semanticHint, int index, boolean persisted) {
-		initializeFromPreferences(view);
-	}
-	
-
-	/**
-	 * this method is called by @link #createView(IAdaptable, View, String, int, boolean) to 
-	 * create the styles for the view that will be created, you can override this 
-	 * method in you factory sub class to provide additional styles
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createConnectorStyle());
-		return styles;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.view.factories.AbstractViewFactory#initializeFromPreferences(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint()
-			.getPreferenceStore();
-
-		RoutingStyle routingStyle = (RoutingStyle)view.getStyle(NotationPackage.Literals.ROUTING_STYLE);
-		if (routingStyle != null) {
-			Routing routing = Routing.get(store
-				.getInt(IPreferenceConstants.PREF_LINE_STYLE));
-			if (routing != null) {
-				routingStyle.setRouting(routing);
-			}
-		}				
-	}
-    
-    /**
-     * Checks if the current active transaction is a unprotected amd silent
-     * 
-     * @param domain , the domain to use during the check
-     * @return <code>true</code> if the current active transaction is unprotected and silent 
-     */
-    protected static boolean isUnProtectedSilentTransactionInProgress(TransactionalEditingDomain domain) {
-        if (domain instanceof InternalTransactionalEditingDomain){
-            InternalTransactionalEditingDomain internalEditingDomain = 
-                (InternalTransactionalEditingDomain)domain;
-            InternalTransaction transaction = internalEditingDomain.getActiveTransaction();
-            if (transaction!=null && !transaction.isReadOnly()) {
-                Object unprotectedMode = transaction.getOptions().get(Transaction.OPTION_UNPROTECTED); 
-                if (Boolean.TRUE.equals(unprotectedMode)) {
-                    // check for silent
-                    Object noNotificationMode = transaction.getOptions().get(Transaction.OPTION_NO_NOTIFICATIONS);
-                    Object noTriggersMode = transaction.getOptions().get(Transaction.OPTION_NO_TRIGGERS);
-                    if (Boolean.TRUE.equals(noNotificationMode) &&
-                        Boolean.TRUE.equals(noTriggersMode)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/DiagramViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/DiagramViewFactory.java
deleted file mode 100644
index 0bce53e..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/DiagramViewFactory.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories; 
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.view.factories.DiagramFactory;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-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.SWT;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * This is the bas factory class for all Diagram views, it will 
- * create the <code>Diagram</code> and decorate it using the default
- * decorations you can subclass it to add more decorations, or customize the 
- * way it looks, like adding new style
- * @see #createDiagram(IAdaptable, String, PreferencesHint)
- * @see #decorateView(View, IAdaptable, String)
- * @see #createStyles()
- * @author mmostafa
- * 
- */
-public class DiagramViewFactory implements DiagramFactory{
-
-	/**
-	 * 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;
-
-    /**
-	 * factory method, that will be called by the view service to creat the
-	 * <code>Diagram</code>
-	 * 
-	 * @param semanticAdapter
-	 *            semanitc element of the diagram, it can be null
-	 * @param diagramKind
-	 *            a semantic hint to reflect the diagram type, it can be empty
-	 * @param thePreferencesHint
-	 *            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 Diagram createDiagram(IAdaptable semanticAdapter,
-						 String diagramKind, PreferencesHint thePreferencesHint) {
-
-		setPreferencesHint(thePreferencesHint);		
-		Diagram diagram = createDiagramView();
-		List styles = createStyles(diagram);
-		if (styles.size() > 0) {
-			diagram.getStyles().addAll(styles);
-		}
-
-		if (diagramKind != null)
-			diagram.setType(diagramKind);
-		if (semanticAdapter != null)
-			diagram.setElement((EObject)semanticAdapter.getAdapter(EObject.class));
-		else
-			// enforce a set to NULL
-			diagram.setElement(null);
-
-		initializeMeasurementUnit(diagram);
-		
-		// do the necessary initializations (creating children, setting properties...etc)
-		decorateView(diagram,semanticAdapter, diagramKind);
-		
-		return diagram;
-	}
-	
-	/**
-	 * Creates blank diagram view object
-	 * 
-	 * @return {@link org.eclipse.gmf.runtime.notation.Diagram}
-	 * @since 1.2
-	 */
-	protected Diagram createDiagramView() {
-		return NotationFactory.eINSTANCE.createDiagram();
-	}
-	
-	/**
-	 * Clients should override if they wish to initialize their <code>Diagram</code>
-	 * to have a different coordinate system then the default <code>Himetric</code>.
-	 * 
-	 * @return the <code>MeasurementUnit</code> that will be used to initialize the
-	 * <code>Diagram</code> object that is being created by the factory.
-	 */
-	protected MeasurementUnit getMeasurementUnit() {
-		return MeasurementUnit.HIMETRIC_LITERAL;
-	}
-	
-	private void initializeMeasurementUnit(Diagram diagram) {
-        if (!diagram.isSetMeasurementUnit()){
-            diagram.setMeasurementUnit(getMeasurementUnit());
-        }
-	}
-
-	/**
-	 * This method is responsible for decorating the created view, it get called
-	 * by the Factory method @link #createView(IAdaptable, View, String, int, boolean),
-	 * it will intiliaze the view with the default preferences also it will create 
-	 * the default elements of the <code>View</code> if it had any
-	 * @param view the view itself
-	 * @param semanticAdapter the semantic elemnent of the view (it could be null)
-	 * @param diagramKind the semantic hint of the diagram
-	 */
-	protected void decorateView(View view, IAdaptable semanticAdapter, String diagramKind){
-		initializeFromPreferences(view);
-	}
-
-	/**
-	 * this method is called by @link #createView(IAdaptable, View, String, int, boolean) to 
-	 * create the styles for the view that will be created, you can override this 
-	 * method in you factory sub class to provide additional styles
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected List createStyles(View view) {
-		List styles = new ArrayList();
-		styles.add(NotationFactory.eINSTANCE.createDiagramStyle());
-		return styles;
-	}
-	
-	/**
-	 * Initialize the newly created view from the preference store, this
-	 * method get called by @link #decorateView(View, IAdaptable, String)
-	 * @param view the view to initialize
-	 */
-	protected void initializeFromPreferences(View view) {
-		
-		IPreferenceStore store = (IPreferenceStore) getPreferencesHint().getPreferenceStore();
-
-		
-		LineStyle lineStyle = (LineStyle) view
-			.getStyle(NotationPackage.Literals.LINE_STYLE);
-		if (lineStyle != null) {
-			// line color
-			RGB lineRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_LINE_COLOR);
-
-			lineStyle.setLineColor(FigureUtilities.RGBToInteger(lineRGB)
-				.intValue());
-		}
-
-
-		FontStyle fontStyle = (FontStyle) view
-			.getStyle(NotationPackage.Literals.FONT_STYLE);
-		if (fontStyle != null) {
-			// default font
-			FontData fontData = PreferenceConverter.getFontData(store,
-				IPreferenceConstants.PREF_DEFAULT_FONT);
-			fontStyle.setFontName(fontData.getName());
-			fontStyle.setFontHeight(fontData.getHeight());
-			fontStyle.setBold((fontData.getStyle() & SWT.BOLD) != 0);
-			fontStyle.setItalic((fontData.getStyle() & SWT.ITALIC) != 0);
-			// font color
-			RGB fontRGB = PreferenceConverter.getColor(store,
-				IPreferenceConstants.PREF_FONT_COLOR);
-			fontStyle.setFontColor(FigureUtilities.RGBToInteger(fontRGB)
-				.intValue());
-		}
-	}
-	
-			
-	/**
-	 * a utility method to return the view service instance
-	 * @return ViewService
-	 */
-	protected static ViewService getViewService() {
-		return ViewService.getInstance();
-	}
-	
-	/**
-	 * 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;
-	}
-	
-	/**
-	 * Sets 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>.
-	 * 
-	 * @param preferencesHint the preferences hint
-	 */
-	protected void setPreferencesHint(PreferencesHint preferencesHint) {
-		this.preferencesHint = preferencesHint;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ListCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ListCompartmentViewFactory.java
deleted file mode 100644
index 27b22e8..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ListCompartmentViewFactory.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.diagram.ui.view.factories; 
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * This is the bas factory class for all  List compartment views, it will 
- * create the view and decorate it using the default decorations
- * you can subclass it to add more decorations, or customize the 
- * way it looks, like adding new style
- * @see #createView(IAdaptable, View, String, int, boolean, String)
- * @see #decorateView(View, View, IAdaptable, String, int, boolean)
- * @see #createStyles(View)
- * @author mmostafa
- * 
- */
-public class ListCompartmentViewFactory extends ResizableCompartmentViewFactory {
-
-
-	/**
-	 * this method is called by @link #createView(IAdaptable, View, String, int, boolean) to 
-	 * create the styles for the view that will be created, you can override this 
-	 * method in you factory sub class to provide additional styles
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
-		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
-		return styles;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteAttachmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteAttachmentViewFactory.java
deleted file mode 100644
index 7151592..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteAttachmentViewFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ConnectorViewFactory;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * View factory for the note attachment (line).
- * 
- * @author Anthony Hunter
- * @since 2.1
- */
-public class NoteAttachmentViewFactory extends ConnectorViewFactory {
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory#createStyles(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);		
-		styles.add(NotationFactory.eINSTANCE.createArrowStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineTypeStyle());
-		return styles;
-	}
-
-	@Override
-	protected void decorateView(View containerView, View view,
-			IAdaptable element, String semanticHint, int index,
-			boolean persisted) {
-		ConnectorStyle style = (ConnectorStyle) view.getStyle(NotationPackage.eINSTANCE.getConnectorStyle());
-		if (style != null) {
-			style.setLineWidth(1);
-		}
-		super
-				.decorateView(containerView, view, element, semanticHint, index,
-						persisted);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteViewFactory.java
deleted file mode 100644
index fd1bf71..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/NoteViewFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.LineStyle;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-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 Factory class responsible for creating Note Views
- * @author mmostafa
- */
-public class NoteViewFactory
-	extends TextShapeViewFactory {
-
-	/**
-	 * Method NoteView. creation constructor
-	 * 
-	 * @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);
-		// if a note view get created with a diagram semantic element
-		// linked to it then we mark the note view as a diagram link
-		// this will trigger the noteEdit part to switch the figure
-		// to the DiagramLink mode (no border, no fill color and center
-		// alignment)
-		if (view.getElement() instanceof Diagram){
-			if(semanticHint==null || semanticHint.length()==0)
-			   view.setType(ViewType.NOTE);
-			EAnnotation annotation  = EcoreFactory.eINSTANCE.createEAnnotation();
-			annotation.setSource(Properties.DIAGRAMLINK_ANNOTATION);
-			view.getEAnnotations().add(annotation);
-		}
-		return view;
-	}
-
-	protected void initializeFromPreferences(View view) {
-		super.initializeFromPreferences(view);
-		// support the diagram link mode
-		if (!(view.getElement() instanceof Diagram)) {
-			IPreferenceStore store = (IPreferenceStore) getPreferencesHint()
-				.getPreferenceStore();
-			FillStyle fillStyle = (FillStyle) view
-				.getStyle(NotationPackage.Literals.FILL_STYLE);
-			if (fillStyle != null) {
-				// fill color
-				RGB fillRGB = PreferenceConverter.getColor(store,
-					IPreferenceConstants.PREF_NOTE_FILL_COLOR);
-
-				fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-					.intValue());
-			}
-
-			LineStyle lineStyle = (LineStyle) view
-				.getStyle(NotationPackage.Literals.LINE_STYLE);
-			if (lineStyle != null) {
-				// line color
-				RGB lineRGB = PreferenceConverter.getColor(store,
-					IPreferenceConstants.PREF_NOTE_LINE_COLOR);
-
-				lineStyle.setLineColor(FigureUtilities.RGBToInteger(lineRGB)
-					.intValue());
-			}
-		}
-	}
-
-	@Override
-	protected void decorateView(View containerView, View view,
-			IAdaptable semanticAdapter, String semanticHint, int index,
-			boolean persisted) {
-		ShapeStyle style = (ShapeStyle) view.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-		if (style != null) {
-			style.setLineWidth(1);
-			style.setTransparency(0);
-		}
-		super.decorateView(containerView, view, semanticAdapter, semanticHint, index,
-				persisted);
-	}
-
-	/*
-	 * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory#createStyles(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		styles.add(NotationFactory.eINSTANCE.createTextStyle());
-		styles.add(NotationFactory.eINSTANCE.createLineTypeStyle());
-		return styles;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ResizableCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ResizableCompartmentViewFactory.java
deleted file mode 100644
index 3869d88..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/ResizableCompartmentViewFactory.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.diagram.ui.view.factories;
-
-import java.util.List;
-
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The factory class responsible for creating the Resizable Compartment View 
- * @author mmostafa
- */
-public class ResizableCompartmentViewFactory
-	extends BasicNodeViewFactory {
-
-	/**
-	 * @return a list of style for the newly created view or an empty list if none (do not return null)
-	 */
-	protected List createStyles(View view) {
-		List styles = super.createStyles(view);
-		styles.add(NotationFactory.eINSTANCE.createDrawerStyle());
-		styles.add(NotationFactory.eINSTANCE.createTitleStyle());
-		return styles;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/TextShapeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/TextShapeViewFactory.java
deleted file mode 100644
index 258f176..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/TextShapeViewFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.l10n.InternalDiagramUIMessages;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.ShapeViewFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * The Factory class responsible for creating the Text shape view 
- * @author mmostafa
- */
-public class TextShapeViewFactory
-	extends ShapeViewFactory {
-
-	/**
-	 * @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);
-
-		getViewService().createNode(semanticAdapter, view,
-			ViewType.DIAGRAM_NAME, ViewUtil.APPEND, persisted, getPreferencesHint());
-
-		getViewService().createNode(semanticAdapter, view,
-			CommonParserHint.DESCRIPTION, ViewUtil.APPEND, persisted, getPreferencesHint());
-		
-		// Set initial description to "Text"
-		ShapeStyle shapeStyle = (ShapeStyle)view.getStyle(NotationPackage.Literals.SHAPE_STYLE);
-		if (shapeStyle != null) {
-			shapeStyle.setDescription(InternalDiagramUIMessages.Text_InitialValue);
-		}		
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicCompartmentViewFactory.java
deleted file mode 100644
index 5e61f4d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicCompartmentViewFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-import org.eclipse.gmf.runtime.notation.BasicCompartment;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.BasicCompartment} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.DrawerStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Node + Style.</p>
- * <p>
- * Does not support addition/removal of:
- * <ul>
- * <li>Source Edges
- * <li>Target Edges
- * </ul>
- * </p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class BasicCompartmentViewFactory extends BasicNodeViewFactory {
-
-	@Override
-	protected BasicCompartment createNode() {
-		return NotationFactory.eINSTANCE.createBasicCompartment();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicDecorationViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicDecorationViewFactory.java
deleted file mode 100644
index aa3a57b..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicDecorationViewFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.BasicDecorationNode} view.
- * <p>Styles always present:
- * <ul>
- * <li>None
- * </ul> 
- * </p>
- * <p>Smaller memmory footprint then Node.</p>
- * <p>
- * Does not support addition/removal of:
- * <ul>
- * <li>Source Edges
- * <li>Target Edges
- * <li>Layout Constraint
- * <li>Children
- * <li>Styles
- * </ul>
- * </p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class BasicDecorationViewFactory extends BasicNodeViewFactory {
-
-	@Override
-	protected Node createNode() {
-		return NotationFactory.eINSTANCE.createBasicDecorationNode();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicSemanticCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicSemanticCompartmentViewFactory.java
deleted file mode 100644
index 78c6390..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/BasicSemanticCompartmentViewFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Factory for BasicSemanticComaprtment view
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class BasicSemanticCompartmentViewFactory extends BasicNodeViewFactory {
-
-	@Override
-	protected BasicSemanticCompartment createNode() {
-		return NotationFactory.eINSTANCE.createBasicSemanticCompartment();
-	}
-
-	@Override
-	final protected List<Style> createStyles(View view) {
-		return Collections.emptyList();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/CompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/CompartmentViewFactory.java
deleted file mode 100644
index bd38db9..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/CompartmentViewFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.notation.Compartment;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.Compartment} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.DrawerStyle}
- * <li>{@link org.eclipse.gmf.runtime.notation.TitleStyle}
- * <li>{@link org.eclipse.gmf.runtime.notation.CanonicalStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Node + Style.</p>
- * <p>
- * Does not support addition/removal of:
- * <ul>
- * <li>Source Edges
- * <li>Target Edges
- * </ul>
- * </p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class CompartmentViewFactory extends BasicCompartmentViewFactory {
-
-	@Override
-	protected Compartment createNode() {
-		return NotationFactory.eINSTANCE.createCompartment();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ConnectorViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ConnectorViewFactory.java
deleted file mode 100644
index 39801de..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ConnectorViewFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
-import org.eclipse.gmf.runtime.notation.Connector;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.Connector} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.ConnectorStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Edge + Style.</p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class ConnectorViewFactory extends ConnectionViewFactory {
-
-	@Override
-	protected Connector createEdge() {
-		return NotationFactory.eINSTANCE.createConnector();
-	}
-
-	@Override
-	protected List createStyles(View view) {
-		return new ArrayList<Style>();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/DecorationNodeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/DecorationNodeViewFactory.java
deleted file mode 100644
index 264d055..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/DecorationNodeViewFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.DecorationNode} view.
- * <p>Styles always present:
- * <ul>
- * <li>None
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Node.</p>
- * <p>
- * Does not support addition/removal of:
- * <ul>
- * <li>Source Edges
- * <li>Target Edges
- * </ul>
- * </p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class DecorationNodeViewFactory extends BasicDecorationViewFactory {
-
-	@Override
-	protected Node createNode() {
-		return NotationFactory.eINSTANCE.createDecorationNode();
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ListCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ListCompartmentViewFactory.java
deleted file mode 100644
index 219310d..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ListCompartmentViewFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.notation.ListCompartment;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.ListCompartment} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.DrawerStyle}
- * <li>{@link org.eclipse.gmf.runtime.notation.SortingStyle}
- * <li>{@link org.eclipse.gmf.runtime.notation.FilteringStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Node + Style.</p>
- * <p>
- * Does not support addition/removal of:
- * <ul>
- * <li>Source Edges
- * <li>Target Edges
- * </ul>
- * </p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class ListCompartmentViewFactory extends BasicCompartmentViewFactory {
-
-	@Override
-	protected ListCompartment createNode() {
-		return NotationFactory.eINSTANCE.createListCompartment();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/SemanticListCompartmentViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/SemanticListCompartmentViewFactory.java
deleted file mode 100644
index 307d673..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/SemanticListCompartmentViewFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import org.eclipse.gmf.runtime.notation.BasicSemanticCompartment;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Factory for SemanticListCompartment view, ideal for
- * {@link org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart}
- * controller
- * 
- * @author aboyko
- * @since 1.2
- * 
- */
-public class SemanticListCompartmentViewFactory extends
-		BasicSemanticCompartmentViewFactory {
-
-	@Override
-	protected BasicSemanticCompartment createNode() {
-		return NotationFactory.eINSTANCE.createSemanticListCompartment();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ShapeViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ShapeViewFactory.java
deleted file mode 100644
index 5460ed5..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/ShapeViewFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.Shape} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.ShapeStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Node + Style.</p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class ShapeViewFactory extends AbstractShapeViewFactory {
-
-	@Override
-	protected List createStyles(View view) {
-		return new ArrayList<Style>();
-	}
-
-	@Override
-	protected Shape createNode() {
-		return NotationFactory.eINSTANCE.createShape();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/StandardDiagramViewFactory.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/StandardDiagramViewFactory.java
deleted file mode 100644
index 8c72711..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/optimal/StandardDiagramViewFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.view.factories.optimal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * Factory for {@link org.eclipse.gmf.runtime.notation.StandardDiagram} view.
- * <p>Styles always present:
- * <ul>
- * <li>{@link org.eclipse.gmf.runtime.notation.DiagramStyle}
- * </ul> 
- * </p>
- * <p>Smaller memory footprint then Diagram + Style.</p>
- * 
- * @author aboyko
- * @since 1.2
- *
- */
-public class StandardDiagramViewFactory extends DiagramViewFactory {
-
-	@Override
-	protected Diagram createDiagramView() {
-		return NotationFactory.eINSTANCE.createStandardDiagram();
-	}
-
-	@Override
-	protected List createStyles(View view) {
-		return new ArrayList<Style>();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/package.html b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/package.html
deleted file mode 100644
index 2644bee..0000000
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/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 Notation meta model View Factories.
-View factory expose a factory method called createView, which 
-is called by the view service to create the notation views</p>
-
-@canBeSeenBy %partners
-</body>
-</html>
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.classpath b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.cvsignore b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.cvsignore
deleted file mode 100644
index e09165c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.options b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.options
deleted file mode 100644
index 87bf14c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.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.awt/debug=true
-
-# Trace when exceptions are caught
-org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching=false
-# Trace when exceptions are thrown
-org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing=false
-
-# Trace when methods are entered
-org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/entering=false
-# Trace when methods are exited
-org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/methods/exiting=false
-
-# Trace dnd
-org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing=false
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.project b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.project
deleted file mode 100644
index 4feea1d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.draw2d.ui.render.awt</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/.api_filters b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/.api_filters
deleted file mode 100644
index fbde9c2..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<component id="org.eclipse.gmf.runtime.draw2d.ui.render.awt" version="2">

-    <resource path="src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java" type="org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor">

-        <filter id="571473929">

-            <message_arguments>

-                <message_argument value="Graphics"/>

-                <message_argument value="GraphicsToGraphics2DAdaptor"/>

-            </message_arguments>

-        </filter>

-    </resource>

-</component>

diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2f565db..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:04:44 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 165c1ea..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-#Wed Apr 28 20:24:37 EDT 2010
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Warning
-automatically_removed_unused_problem_filters=false
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/META-INF/MANIFEST.MF
deleted file mode 100644
index 7673a26..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/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.runtime.draw2d.ui.render.awt;singleton:=true
-Bundle-Version: 1.4.1.qualifier
-Bundle-Activator: org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.printing.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render",
- org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile;x-friends:="org.eclipse.gmf.tests.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.render"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)",
- org.apache.batik.ext.awt;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.transcoder;bundle-version="[1.6.0,1.7.0)";visibility:=reexport,
- org.apache.batik.bridge;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.pdf;bundle-version="[1.6.0,1.7.0)",
- org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/about.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/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, 2007</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.awt/build.properties b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/build.properties
deleted file mode 100644
index fd9690c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/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 = 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.awt/plugin.properties b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/plugin.properties
deleted file mode 100644
index 848efe7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/plugin.properties
+++ /dev/null
@@ -1,19 +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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# Presentation - Translation Instruction: section to be translated
-# ==============================================================================
-
-Plugin.name = GMF Draw2d Image AWT based Rendering Additions
-Plugin.providerName = Eclipse Modeling Project
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/plugin.xml b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/plugin.xml
deleted file mode 100644
index 326093d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension 
-    	point="org.eclipse.gmf.runtime.draw2d.ui.render.renderedImageFactory">
-      <factory 
-      		class="org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImageType">   
-    </factory> 
- </extension>
-</plugin>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/pom.xml b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/pom.xml
deleted file mode 100644
index 77cc565..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.draw2d.ui.render.awt</groupId>
-  <artifactId>org.eclipse.gmf.runtime.draw2d.ui.render.awt</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/Draw2dRenderPlugin.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/Draw2dRenderPlugin.java
deleted file mode 100644
index a992fa4..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/Draw2dRenderPlugin.java
+++ /dev/null
@@ -1,60 +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.awt.internal;
-
-import java.awt.Color;
-
-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;
-		
-		// force loading of AWT - bugzilla 119649
-		initAWT();
-	}
-
-	private void initAWT() {
-		Color initColor = new Color(0, 0, 0);
-		initColor.getRed();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/Graphics2DToGraphicsAdaptor.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/Graphics2DToGraphicsAdaptor.java
deleted file mode 100644
index 731b10e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/Graphics2DToGraphicsAdaptor.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.graphics;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.Paint;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.PathIterator;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-
-import org.apache.batik.ext.awt.g2d.DefaultGraphics2D;
-import org.apache.batik.ext.awt.g2d.GraphicContext;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Transform;
-
-/**
- * Objects of this class can be used with awt to render to a SWT Graphics
- * object.
- * 
- * @author sshaw
- * 
- */
-public class Graphics2DToGraphicsAdaptor
-	extends DefaultGraphics2D {
-
-	private Graphics swtGraphics;
-	private org.eclipse.swt.graphics.Font currentFont = null;
-	private org.eclipse.swt.graphics.Color currentColor = null;
-	private Transform currentTransform = null;
-	private GC swtGC;
-	private RGB transparency;
-	private RGB transparency_replace;
-	private Path clipPath;
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param swtGC the <code>GC</code> to render to
-	 * @param transparency the <code>RGB</code> that will be the transparent color
-	 * @param transparency_replace the <code>RGB</code> that will replace the transparent color
-	 * in the rendering.
-	 */
-	public Graphics2DToGraphicsAdaptor(GC swtGC, RGB transparency, RGB transparency_replace) {
-		super(true);
-		gc = new GraphicContext();
-		this.swtGC = swtGC;
-		swtGC.setAdvanced(true);
-		if (swtGC.getAdvanced() != true)
-			throw new UnsupportedOperationException("Advanced graphics support is required"); //$NON-NLS-1$
-		
-		this.swtGraphics = new SWTGraphics(swtGC);
-		this.transparency = transparency;
-		this.transparency_replace = transparency_replace;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#dispose()
-	 */
-	public void dispose() {
-		if (currentColor != null)
-			currentColor.dispose();
-		currentColor = null;
-		if (currentFont != null)
-			currentFont.dispose();
-		currentFont = null;
-		if (currentTransform != null) 
-			currentTransform.dispose();
-		currentTransform = null;
-		
-		if (clipPath != null && !clipPath.isDisposed()) {
-			clipPath.dispose();
-		}
-		
-		if (swtGraphics != null)
-			swtGraphics.dispose();
-		swtGraphics = null;
-	}
-
-	/**
-	 * Setup the swt graphics object with the appropriate configuration details.
-	 */
-	protected final boolean configureGraphics() {
-		swtGraphics.pushState();
-
-		boolean supported = true;
-		
-		supported &= configureStroke(getStroke());
-		supported &= configureTransformation(getTransform());
-		supported &= configureClipping(getClip());
-		supported &= configureComposite(getComposite());
-		supported &= configurePaintMode(getPaint());
-		supported &= configureRenderingHints();
-
-		return supported;
-	}
-
-	private boolean configureRenderingHints() {
-		Object antiAlias = getRenderingHint(RenderingHints.KEY_ANTIALIASING);
-		if (antiAlias != null) {
-			if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_ON))
-				swtGraphics.setAntialias(SWT.ON);
-			else if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_OFF))
-				swtGraphics.setAntialias(SWT.OFF);
-			else if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_DEFAULT))
-				swtGraphics.setAntialias(SWT.DEFAULT);
-		}
-
-		Object textAntiAlias = getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING);
-		if (textAntiAlias != null) {
-			if (textAntiAlias.equals(RenderingHints.VALUE_TEXT_ANTIALIAS_ON))
-				swtGraphics.setTextAntialias(SWT.ON);
-			else if (textAntiAlias
-				.equals(RenderingHints.VALUE_TEXT_ANTIALIAS_OFF))
-				swtGraphics.setTextAntialias(SWT.OFF);
-			else if (textAntiAlias
-				.equals(RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT))
-				swtGraphics.setTextAntialias(SWT.DEFAULT);
-		}
-
-		Object interpolation = getRenderingHint(RenderingHints.KEY_INTERPOLATION);
-		if (interpolation != null) {
-			if (interpolation
-				.equals(RenderingHints.VALUE_INTERPOLATION_BICUBIC))
-				swtGraphics.setInterpolation(SWT.HIGH);
-			else if (interpolation
-				.equals(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
-				swtGraphics.setInterpolation(SWT.LOW);
-			else if (interpolation
-				.equals(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
-				swtGraphics.setInterpolation(SWT.NONE);
-		}
-		return true;
-	}
-
-	private boolean configureStroke(Stroke s) {
-		if (s instanceof BasicStroke) {
-			BasicStroke basicStroke = (BasicStroke) s;
-			switch (basicStroke.getEndCap()) {
-				case BasicStroke.CAP_BUTT:
-					swtGC.setLineCap(SWT.CAP_FLAT);
-					break;
-				case BasicStroke.CAP_ROUND:
-					swtGC.setLineCap(SWT.CAP_ROUND);
-					break;
-				case BasicStroke.CAP_SQUARE:
-					swtGC.setLineCap(SWT.CAP_SQUARE);
-					break;
-				default:
-					return false;
-			}
-
-			if (basicStroke.getDashArray() != null) {
-				swtGC.setLineStyle(SWT.LINE_CUSTOM);
-				float[] currentDash = basicStroke.getDashArray();
-				int[] dash = new int[currentDash.length];
-				for (int i = 0; i < currentDash.length; i++)
-					dash[i] = Math.round(currentDash[i]);
-				swtGC.setLineDash(dash);
-			} else {
-				swtGC.setLineStyle(SWT.LINE_SOLID);
-				swtGC.setLineDash(null);
-			}
-
-			switch (basicStroke.getLineJoin()) {
-				case BasicStroke.JOIN_BEVEL:
-					swtGC.setLineJoin(SWT.JOIN_BEVEL);
-					break;
-				case BasicStroke.JOIN_MITER:
-					swtGC.setLineJoin(SWT.JOIN_MITER);
-					break;
-				case BasicStroke.JOIN_ROUND:
-					swtGC.setLineJoin(SWT.JOIN_ROUND);
-					break;
-				default:
-					return false;
-			}
-
-			// since we don't have precision of less then 1 pixel in
-			// swt, if the image is defined as very small in the original
-			// file, then the linewidth gets scaled out of proportion.
-			if (basicStroke.getLineWidth() < 1 &&
-				basicStroke.getLineWidth() > 0)
-				throw new UnsupportedOperationException();
-			
-			swtGC.setLineWidth(Math.round(basicStroke.getLineWidth()));
-			return true;
-		}
-
-		return false;
-	}
-
-	private boolean configurePaintMode(Paint p) {
-		if (p instanceof Color) {
-			Color c = (Color) p;
-			
-			if (c.getAlpha() != 255) {
-				// swt graphics doesn't support blitting onto transparency mask explicitly.
-				throw new UnsupportedOperationException();
-			}
-		
-			RGB rgb = new RGB(c.getRed(), c.getGreen(), c.getBlue());
-			if (rgb.equals(transparency))
-				rgb = transparency_replace;
-			
-			if (currentColor != null)
-				currentColor.dispose();
-			currentColor = new org.eclipse.swt.graphics.Color(
-				null, rgb.red, rgb.green, rgb.blue);
-			swtGraphics.setBackgroundColor(currentColor);
-			swtGraphics.setForegroundColor(currentColor);
-			return true;
-		} 
-
-		return false;
-	}
-
-	private boolean configureComposite(Composite c) {
-		if (c instanceof AlphaComposite) {
-			AlphaComposite ac = (AlphaComposite)c;
-			
-			// swt graphics doesn't support blitting onto transparency mask explicitly.
-			if (ac.getAlpha() != 1.0)
-				throw new UnsupportedOperationException();
-			
-			swtGC.setAlpha(Math.round(ac.getAlpha() * 255));
-			if (ac.getRule() == AlphaComposite.SRC_OVER)
-				return true;
-		} 
-
-		return false;
-	}
-
-	private boolean configureTransformation(AffineTransform cxPrime) {
-		double[] values = new double[6];
-		cxPrime.getMatrix(values);
-		
-		float[] fltVals = new float[6];
-		for (int i=0; i<values.length; i++)
-			fltVals[i] = (float)values[i];
-		
-		if (currentTransform != null)
-			currentTransform.dispose();
-		currentTransform = new Transform(null, fltVals);
-		swtGC.setTransform(currentTransform);
-		
-		return true;
-	}
-
-	private boolean configureClipping(Shape clipShape) {
-		if (clipPath != null && !clipPath.isDisposed()) {
-			clipPath.dispose();
-		}
-		clipPath = getPath(clipShape);
-		java.awt.Rectangle rectClip = clipShape.getBounds();
-		if (clipPath != null) {
-			swtGraphics.setClip(new Rectangle(rectClip.x, rectClip.y,
-				rectClip.width, rectClip.height));
-			swtGC.setClipping(clipPath);
-		}
-		return true;
-	}
-
-	private final AffineTransform identityTransform = new AffineTransform();
-	private final Stroke defaultStroke = new BasicStroke();
-	
-	/**
-	 * Reset the graphics objects back to defaults
-	 */
-	protected final void resetGraphics() {
-		configureTransformation(identityTransform);
-		configurePaintMode(Color.WHITE);
-		configureStroke(defaultStroke);
-		configureComposite(AlphaComposite.SrcOver);
-		
-		if (currentColor != null)
-			currentColor.dispose();
-		currentColor = null;
-		if (currentFont != null)
-			currentFont.dispose();
-		currentFont = null;
-		if (currentTransform != null) 
-			currentTransform.dispose();
-		currentTransform = null;
-		
-		swtGC.setClipping((Path)null);
-		
-		if (clipPath != null && !clipPath.isDisposed()) {
-			clipPath.dispose();
-		}
-		
-		swtGraphics.popState();
-	}
-
-	private void drawImageBase(BufferedImage bufImg, int x, int y) {
-		drawImageBase(bufImg, 0, 0, bufImg.getWidth(), bufImg.getHeight(), x, y, 
-			bufImg.getWidth(), bufImg.getHeight());
-	}
-	
-	private void drawImageBase(BufferedImage bufImg, int x, int y, int width, int height, 
-			int tx, int ty, int twidth, int theight) {
-		org.eclipse.swt.graphics.Image swtImage = ImageConverter.convert(bufImg);
-		swtGraphics.drawImage(swtImage, x, y, width, height, tx, ty, twidth, theight);
-		swtImage.dispose();
-	}
-	
-	private BufferedImage createImage(Shape s) {
-		java.awt.Rectangle rect = s.getBounds();
-		if (rect.width == 0)
-			rect.width = 1;
-		if (rect.height == 0)
-			rect.height = 1;
-		return new BufferedImage(rect.width, rect.height, BufferedImage.TYPE_INT_ARGB);
-	}
-	
-	private Graphics2D configureGraphics2D(BufferedImage bufImg, int x, int y) {
-		Graphics2D g = bufImg.createGraphics();
-		g.setPaint(getPaint());
-		g.setComposite(getComposite());
-		g.setStroke(getStroke());
-		g.setRenderingHints(getRenderingHints());
-		g.setFont(getFont());
-		g.translate(-x, -y);
-		return g;
-	}
-	
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#draw(java.awt.Shape)
-	 */
-	public void draw(Shape s) {
-		boolean supportedByDraw2d = configureGraphics();
-		if (supportedByDraw2d) {
-			Path path = getPath(s);
-			if (path != null) {
-				swtGraphics.drawPath(path);
-				path.dispose();
-			}
-		} else {
-			java.awt.Rectangle rect = s.getBounds();
-			BufferedImage bufImg = createImage(s);
-			Graphics2D g = configureGraphics2D(bufImg, rect.x, rect.y);
-			g.draw(s);
-			
-			drawImageBase(bufImg, rect.x, rect.y);
-		}
-
-		resetGraphics();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#fill(java.awt.Shape)
-	 */
-	public void fill(Shape s) {
-		boolean supportedByDraw2d = configureGraphics();
-		if (supportedByDraw2d) {
-			Path path = getPath(s);
-			if (path != null) {
-				swtGraphics.fillPath(path);
-				path.dispose();
-			}
-		} else {
-			java.awt.Rectangle rect = s.getBounds();
-			BufferedImage bufImg = createImage(s);
-			Graphics2D g = configureGraphics2D(bufImg, rect.x, rect.y);
-			g.fill(s);
-			
-			drawImageBase(bufImg, rect.x, rect.y);
-		}
-
-		resetGraphics();
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawImage(java.awt.Image,
-	 *      int, int, java.awt.image.ImageObserver)
-	 */
-	public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
-		boolean supportedByDraw2d = configureGraphics();
-
-		if (img instanceof BufferedImage && supportedByDraw2d) {
-			drawImageBase((BufferedImage)img, x, y);
-		} else {
-			throw new UnsupportedOperationException();
-		}
-
-		resetGraphics();
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawImage(java.awt.Image,
-	 *      int, int, int, int, java.awt.image.ImageObserver)
-	 */
-	public boolean drawImage(Image img, int x, int y, int width, int height,
-			ImageObserver observer) {
-		boolean supportedByDraw2d = configureGraphics();
-
-		if (img instanceof BufferedImage && supportedByDraw2d) {
-			BufferedImage bufImg = (BufferedImage)img;
-			drawImageBase((BufferedImage)img, 0, 0, bufImg.getWidth(), bufImg.getHeight(),
-					x, y, width, height);
-		} else {
-			throw new UnsupportedOperationException();
-		}
-
-		resetGraphics();
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawRenderableImage(java.awt.image.renderable.RenderableImage,
-	 *      java.awt.geom.AffineTransform)
-	 */
-	public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawRenderedImage(java.awt.image.RenderedImage,
-	 *      java.awt.geom.AffineTransform)
-	 */
-	public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawString(java.text.AttributedCharacterIterator,
-	 *      float, float)
-	 */
-	public void drawString(AttributedCharacterIterator iterator, float x,
-			float y) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#drawString(java.lang.String,
-	 *      float, float)
-	 */
-	public void drawString(String s, float x, float y) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Used to create proper font metrics
-	 */
-	private GraphicsConfiguration gconfig;
-
-	{
-		BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-		gconfig = bi.createGraphics().getDeviceConfiguration();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.batik.ext.awt.g2d.DefaultGraphics2D#getDeviceConfiguration()
-	 */
-	public GraphicsConfiguration getDeviceConfiguration() {
-		return gconfig;
-	}
-
-	private Path getPath(Shape s) {
-		PathIterator pi = s.getPathIterator(null);
-		Path path = new Path(null);
-		float seg[] = new float[6];
-		int segType = 0;
-		while (!pi.isDone()) {
-			segType = pi.currentSegment(seg);
-			switch (segType) {
-				case PathIterator.SEG_LINETO:
-					path.lineTo(seg[0], seg[1]);
-					break;
-				case PathIterator.SEG_CLOSE:
-					path.close();
-					break;
-				case PathIterator.SEG_MOVETO:
-					path.moveTo(seg[0], seg[1]);
-					break;
-				case PathIterator.SEG_QUADTO:
-					path.quadTo(seg[0], seg[1], seg[2], seg[3]);
-					break;
-				case PathIterator.SEG_CUBICTO:
-					path
-						.cubicTo(seg[0], seg[1], seg[2], seg[3], seg[4], seg[5]);
-					break;
-				default:
-					throw new Error();
-			}
-			pi.next();
-		}
-
-		return path;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java
deleted file mode 100644
index 294b828..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/GraphicsToGraphics2DAdaptor.java
+++ /dev/null
@@ -1,1578 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.graphics;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Composite;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Polygon;
-import java.awt.RenderingHints;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Arc2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.util.Stack;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-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.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes;
-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.awt.internal.image.ImageConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiFont;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-import org.eclipse.gmf.runtime.draw2d.ui.text.TextUtilitiesEx;
-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.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.LineAttributes;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.PathData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.TextLayout;
-
-/**
- * Objects of this class can be used with draw2d to render to a Graphics2D object.
- * 
- * @author jschofie / sshaw
- */
-public class GraphicsToGraphics2DAdaptor extends Graphics implements DrawableRenderedImage {
-
-	private static class State {
-
-		/**
-		 * translateX
-		 */
-		public int translateX = 0;
-		
-		/**
-		 * translateY
-		 */
-		public int translateY = 0;
-
-		/**
-		 * clipping rectangle x coordinate
-		 */
-		public int clipX = 0;
-		/**
-		 * clipping rectangle y coordinate
-		 */
-		public int clipY = 0;
-		/**
-		 * clipping rectangle width
-		 */
-		public int clipW = 0;
-		/**
-		 * clipping rectangle height
-		 */
-		public int clipH = 0;
-
-		/** Font value **/
-		/**
-		 * cached font
-		 */
-		public Font font;
-		
-		/**
-		 * cached xor mode value
-		 */
-		public boolean XorMode = false;
-		/**
-		 * cached foreground color
-		 */
-		public Color fgColor;
-		/**
-		 * cached background color
-		 */
-		public Color bgColor;
-        
-        /**
-         * cached alpha value
-         */
-        public int alpha;
-        
-        /**
-         * Line attributes value
-         */
-        public LineAttributes lineAttributes = new LineAttributes(1);
-        
-    	int graphicHints;
-    	
-		/**
-		 * Copy the values from a given state to this state
-		 * 
-		 * @param state
-		 *            the state to copy from
-		 */
-		public void copyFrom(State state) {
-
-			translateX = state.translateX;
-			translateY = state.translateY;
-
-			clipX = state.clipX;
-			clipY = state.clipY;
-			clipW = state.clipW;
-			clipH = state.clipH;
-			
-			font = state.font;
-			fgColor = state.fgColor;
-			bgColor = state.bgColor;
-			XorMode = state.XorMode;
-            alpha = state.alpha;
-            graphicHints = state.graphicHints;
-            
-            lineAttributes = SWTGraphics.clone(state.lineAttributes);
-		}
-	}
-
-	static final int ADVANCED_GRAPHICS_MASK;
-	static final int ADVANCED_SHIFT;
-	static final int FILL_RULE_MASK;
-	static final int FILL_RULE_SHIFT;
-	static final int FILL_RULE_WHOLE_NUMBER = -1;
-
-	/*
-	 * It's consistent with SWTGraphics flags in case some other flags from SWTGraphics need to be here
-	 */
-	static {
-		FILL_RULE_SHIFT = 14;
-		ADVANCED_SHIFT = 15;
-		FILL_RULE_MASK = 1 << FILL_RULE_SHIFT; //If changed to more than 1-bit, check references!
-		ADVANCED_GRAPHICS_MASK = 1 << ADVANCED_SHIFT;
-	}
-	
-	private SWTGraphics swtGraphics;
-	private Graphics2D graphics2D;
-	private BasicStroke stroke;
-	private Stack<State> states = new Stack<State>();
-	private final State currentState = new State();
-	private final State appliedState = new State();
-	
-	/**
-	 * Some strings, Asian string in particular, are painted differently between
-	 * SWT and AWT. SWT falls back to some default locale font if Asian string
-	 * cannot be painted with the current font - this is done via the platform.
-	 * AWT, unlike platform biased SWT, does not. Hence, Asian string widths are
-	 * very different between SWT and AWT. To workaround the issue, if the flag
-	 * below is set to <code>true</code> then once SWT and AWT string width are
-	 * not equal, a bitmap of the SWT string will be painted. Otherwise the
-	 * string is always painted with AWT Graphics 2D string rendering.
-	 */
-	protected boolean paintNotCompatibleStringsAsBitmaps = true;
-	
-	private static final TextUtilitiesEx TEXT_UTILITIES = new TextUtilitiesEx(MapModeTypes.IDENTITY_MM);
-	
-	private Rectangle relativeClipRegion;
-	
-	private org.eclipse.swt.graphics.Rectangle viewBox;
-	private Image image;
-	
-	/**
-	 * x coordinate for graphics translation
-	 */
-	private int transX = 0;
-	/**
-	 * y coordinate for graphics translation
-	 */
-	private int transY = 0;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param graphics the <code>Graphics2D</code> object that this object is delegating
-	 * calls to.
-	 * @param viewPort the <code>Rectangle</code> that defines the logical area being rendered
-	 * by the graphics object.
-	 */
-	public GraphicsToGraphics2DAdaptor( Graphics2D graphics, Rectangle viewPort ) {
-		
-		this( graphics, new org.eclipse.swt.graphics.Rectangle( viewPort.x,
-						viewPort.y,
-						viewPort.width,
-						viewPort.height) );
-	}
-
-	/**
-	 * Alternate Constructor that takes an swt Rectangle
-	 * 
-	 * @param graphics the <code>Graphics2D</code> object that this object is delegating
-	 * calls to.
-	 * @param viewPort the <code>org.eclipse.swt.graphics.Rectangle</code> that defines the logical area 
-	 * being rendered by the graphics object.
-	 */
-	public GraphicsToGraphics2DAdaptor(Graphics2D graphics, org.eclipse.swt.graphics.Rectangle viewPort) {
-
-		// Save the ViewPort to add to the root DOM element
-		viewBox = viewPort;
-
-		// Create the SWT Graphics Object
-		createSWTGraphics();
-
-		// Initialize the SVG Graphics Object
-		initSVGGraphics(graphics);
-
-		// Initialize the States
-		init();
-	}
-
-	/**
-	 * This is a helper method used to create the SWT Graphics object
-	 */
-	private void createSWTGraphics() {
-		
-		//we need this temp Rect just to instantiate an swt image in order to keep
-		//state, the size of this Rect is of no consequence and we just set it to
-		//such a small size in order to minimize memory allocation 
-		org.eclipse.swt.graphics.Rectangle tempRect = new org.eclipse.swt.graphics.Rectangle(0,
-			0,
-			10,
-			10);
-		image = new Image(DisplayUtils.getDisplay(), tempRect);		
-		GC gc = new GC(image);
-		swtGraphics = new SWTGraphics(gc);
-	}
-
-	/**
-	 * Create the SVG graphics object and initializes it with the current line
-	 * stlye and width
-	 */
-	private void initSVGGraphics(Graphics2D graphics) {
-		this.graphics2D = graphics;
-
-		relativeClipRegion =
-			new Rectangle(viewBox.x, viewBox.y, viewBox.width, viewBox.height);
-
-		// Initialize the line style and width
-		stroke =
-			new BasicStroke(
-				swtGraphics.getLineWidth(),
-				BasicStroke.CAP_SQUARE,
-				BasicStroke.JOIN_ROUND,
-				0,
-				null,
-				0);
-		LineAttributes lineAttributes = new LineAttributes(1);
-		swtGraphics.getLineAttributes(lineAttributes);
-		setLineAttributes(lineAttributes);
-		setFillRule(swtGraphics.getFillRule());
-		setAdvanced(swtGraphics.getAdvanced());
-		getGraphics2D().setStroke(stroke);
-	}
-
-	/**
-	 * This method should only be called by the constructor. Initializes state
-	 * information for the currentState
-	 */
-	private void init() {
-
-		// Initialize drawing styles
-		setForegroundColor(getForegroundColor());
-		setBackgroundColor(getBackgroundColor());
-		setXORMode(getXORMode());
-
-		// Initialize Font
-		setFont(getFont());
-		currentState.font = appliedState.font = getFont();
-
-		// Initialize translations
-		currentState.translateX = appliedState.translateX = transX;
-		currentState.translateY = appliedState.translateY = transY;
-
-		// Initialize Clip Regions
-		currentState.clipX = appliedState.clipX = relativeClipRegion.x;
-		currentState.clipY = appliedState.clipY = relativeClipRegion.y;
-		currentState.clipW = appliedState.clipW = relativeClipRegion.width;
-		currentState.clipH = appliedState.clipH = relativeClipRegion.height;
-
-        currentState.alpha = appliedState.alpha = getAlpha();
-
-    }
-
-	/**
-	 * Verifies that the applied state is up to date with the current state and updates
-	 * the applied state accordingly.  
-	 */
-	protected void checkState() {
-
-		if( appliedState.font != currentState.font ) {
-			appliedState.font = currentState.font;
-			
-			setFont(currentState.font);
-		}
-
-		if (appliedState.clipX != currentState.clipX
-			|| appliedState.clipY != currentState.clipY
-			|| appliedState.clipW != currentState.clipW
-			|| appliedState.clipH != currentState.clipH) {
-
-			appliedState.clipX = currentState.clipX;
-			appliedState.clipY = currentState.clipY;
-			appliedState.clipW = currentState.clipW;
-			appliedState.clipH = currentState.clipH;
-
-			// Adjust the clip for SVG
-			getGraphics2D().setClip(
-				currentState.clipX - 1,
-				currentState.clipY - 1,
-				currentState.clipW + 2,
-				currentState.clipH + 2);
-		}
-        
-        if( appliedState.alpha != currentState.alpha ) {
-            appliedState.alpha = currentState.alpha;
-            
-            setAlpha(currentState.alpha);
-        }
-        
-        appliedState.graphicHints = currentState.graphicHints;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#clipRect(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public void clipRect(Rectangle rect) {
-		relativeClipRegion.intersect(rect);
-		setClipAbsolute(
-			relativeClipRegion.x + transX,
-			relativeClipRegion.y + transY,
-			relativeClipRegion.width,
-			relativeClipRegion.height);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#dispose()
-	 */
-	public void dispose() {
-		swtGraphics.dispose();
-		
-		if (image != null) {
-			image.dispose();
-		}
-		
-		states.clear();
-	}
-
-	/**
-	 * This method is used to convert an SWT Color to an AWT Color.
-	 * 
-	 * @param toConvert
-	 *            SWT Color to convert
-	 * @return AWT Color
-	 */
-	protected java.awt.Color getColor(Color toConvert) {
-
-		return new java.awt.Color(
-			toConvert.getRed(),
-			toConvert.getGreen(),
-			toConvert.getBlue());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawArc(int, int, int, int, int, int)
-	 */
-	public void drawArc(
-		int x,
-		int y,
-		int width,
-		int height,
-		int startAngle,
-		int endAngle) {
-
-		Arc2D arc =
-			new Arc2D.Float(
-				x + transX,
-				y + transY,
-				width - 1,
-				height,
-				startAngle,
-				endAngle,
-				Arc2D.OPEN);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(arc);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillArc(int, int, int, int, int, int)
-	 */
-	public void fillArc(int x, int y, int w, int h, int offset, int length) {
-
-		Arc2D arc =
-			new Arc2D.Float(
-				x + transX,
-				y + transY,
-				w,
-				h,
-				offset,
-				length,
-				Arc2D.OPEN);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(arc);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawFocus(int, int, int, int)
-	 */
-	public void drawFocus(int x, int y, int w, int h) {
-		drawRectangle(x, y, w, h);
-	}
-
-	@Override
-	public void drawTextLayout(TextLayout layout, int x, int y,
-			int selectionStart, int selectionEnd, Color selectionForeground,
-			Color selectionBackground) {		
-		checkState();
-		if (!layout.getBounds().isEmpty()) {
-			Image image = new Image(DisplayUtils.getDisplay(), layout.getBounds().width, layout.getBounds().height);
-			GC gc = new GC(image);
-			cloneGC(gc);
-			layout.draw(gc, 0, 0, selectionStart, selectionEnd, selectionForeground, selectionBackground);
-			
-			ImageData imageData = image.getImageData();
-			imageData.transparentPixel = imageData.palette.getPixel(getBackgroundColor().getRGB());
-	
-			gc.dispose();
-			image.dispose();
-			
-			getGraphics2D().drawImage(ImageConverter.convertFromImageData(imageData), x + transX, y + transY, null);
-		}
-	}
-	
-	private void cloneGC(GC gc) {
-		gc.setAdvanced(getAdvanced());
-		gc.setAlpha(getAlpha());
-		gc.setAntialias(getAntialias());
-		gc.setFillRule(getFillRule());
-		gc.setFont(getFont());
-		gc.setInterpolation(getInterpolation());
-		gc.setLineAttributes(getLineAttributes());
-		gc.setTextAntialias(getTextAntialias());
-		gc.setBackground(getBackgroundColor());
-		gc.setForeground(getForegroundColor());
-	}
-	
-	@Override
-	public int getInterpolation() {
-		return swtGraphics.getInterpolation();
-	}
-
-	@Override
-	public LineAttributes getLineAttributes() {
-		LineAttributes la = new LineAttributes(1);
-		swtGraphics.getLineAttributes(la);
-		return la;
-	}
-
-	@Override
-	public int getTextAntialias() {
-		return swtGraphics.getTextAntialias();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image,
-	 *      int, int)
-	 */
-	public void drawImage(Image srcImage, int xpos, int ypos) {
-
-		// Translate the Coordinates
-		xpos += transX;
-		ypos += transY;
-
-		// Convert the SWT Image into an AWT BufferedImage
-		BufferedImage toDraw = ImageConverter.convert(srcImage);
-
-		checkState();
-		getGraphics2D().drawImage(
-			toDraw,
-			new AffineTransform(1f, 0f, 0f, 1f, xpos, ypos),
-			null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @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 x1,
-		int y1,
-		int w1,
-		int h1,
-		int x2,
-		int y2,
-		int w2,
-		int h2) {
-
-		x2 += transX;
-		y2 += transY;
-
-		BufferedImage toDraw = ImageConverter.convert(srcImage);
-		checkState();
-		getGraphics2D().drawImage(toDraw, x2, y2, w2, h2, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawLine(int, int, int, int)
-	 */
-	public void drawLine(int x1, int y1, int x2, int y2) {
-
-		Line2D line =
-			new Line2D.Float(
-				x1 + transX,
-				y1 + transY,
-				x2 + transX,
-				y2 + transY);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(line);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawOval(int, int, int, int)
-	 */
-	public void drawOval(int x, int y, int w, int h) {
-
-		Ellipse2D ellipse =
-			new Ellipse2D.Float(x + transX, y + transY, w, h);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(ellipse);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillOval(int, int, int, int)
-	 */
-	public void fillOval(int x, int y, int w, int h) {
-	
-		Ellipse2D ellipse =
-			new Ellipse2D.Float(x + transX, y + transY, w-1, h-1);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(ellipse);
-	}
-
-	private Polygon createPolygon(PointList pointList) {
-
-		Polygon toCreate = new Polygon();
-
-		for (int i = 0; i < pointList.size(); i++) {
-			Point pt = pointList.getPoint(i);
-
-			toCreate.addPoint(pt.x + transX, pt.y + transY);
-		}
-
-		return toCreate;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawPolygon(org.eclipse.draw2d.geometry.PointList)
-	 */
-	public void drawPolygon(PointList pointList) {
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(createPolygon(pointList));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillPolygon(org.eclipse.draw2d.geometry.PointList)
-	 */
-	public void fillPolygon(PointList pointList) {
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(createPolygon(pointList));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawPolyline(org.eclipse.draw2d.geometry.PointList)
-	 */
-	public void drawPolyline(PointList pointList) {
-
-		// Draw polylines as a series of lines
-		for (int x = 1; x < pointList.size(); x++) {
-
-			Point p1 = pointList.getPoint(x - 1);
-			Point p2 = pointList.getPoint(x);
-
-			drawLine(p1.x, p1.y, p2.x, p2.y);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawRectangle(int, int, int, int)
-	 */
-	public void drawRectangle(int x, int y, int w, int h) {
-
-		Rectangle2D rect =
-			new Rectangle2D.Float(x + transX, y + transY, w, h);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(rect);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillRectangle(int, int, int, int)
-	 */
-	public void fillRectangle(int x, int y, int width, int height) {
-
-		Rectangle2D rect =
-			new Rectangle2D.Float(
-				x + transX,
-				y + transY,
-				width,
-				height);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(rect);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawRoundRectangle(org.eclipse.draw2d.geometry.Rectangle,
-	 *      int, int)
-	 */
-	public void drawRoundRectangle(
-		Rectangle rect,
-		int arcWidth,
-		int arcHeight) {
-
-		RoundRectangle2D roundRect =
-			new RoundRectangle2D.Float(
-				rect.x + transX,
-				rect.y + transY,
-				rect.width,
-				rect.height,
-				arcWidth,
-				arcHeight);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(roundRect);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillRoundRectangle(org.eclipse.draw2d.geometry.Rectangle,
-	 *      int, int)
-	 */
-	public void fillRoundRectangle(
-		Rectangle rect,
-		int arcWidth,
-		int arcHeight) {
-
-		RoundRectangle2D roundRect =
-			new RoundRectangle2D.Float(
-				rect.x + transX,
-				rect.y + transY,
-				rect.width,
-				rect.height,
-				arcWidth,
-				arcHeight);
-
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(roundRect);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawText(java.lang.String, int, int)
-	 */
-	public void drawText(String s, int x, int y) {
-		drawString(s, x, y);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#drawString(java.lang.String, int, int)
-	 */
-	public void drawString(String s, int x, int y) {
-
-		if (s == null)
-			return;
-
-		java.awt.FontMetrics metrics = getGraphics2D().getFontMetrics();
-		int stringLength = metrics.stringWidth(s);
-		Dimension swtStringSize = TEXT_UTILITIES.getStringExtents(s, swtGraphics.getFont());
-
-		float xpos = x + transX;
-		float ypos = y + transY;
-		int lineWidth;
-
-		if (paintNotCompatibleStringsAsBitmaps && Math.abs(swtStringSize.width - stringLength) > 2) {
-			// create SWT bitmap of the string then
-			Image image = new Image(DisplayUtils.getDisplay(),
-					swtStringSize.width, swtStringSize.height);
-			GC gc = new GC(image);
-			gc.setForeground(getForegroundColor());
-			gc.setBackground(getBackgroundColor());
-			gc.setAntialias(getAntialias());
-			gc.setFont(getFont());
-			gc.drawString(s, 0, 0);
-			gc.dispose();
-			ImageData data = image.getImageData();
-			image.dispose();
-			RGB backgroundRGB = getBackgroundColor().getRGB();
-			for (int i = 0; i < data.width; i++) {
-				for (int j = 0; j < data.height; j++) {
-					if (data.palette.getRGB(data.getPixel(i, j)).equals(
-							backgroundRGB)) {
-						data.setAlpha(i, j, 0);
-					} else {
-						data.setAlpha(i, j, 255);
-					}
-				}
-			}
-			getGraphics2D().drawImage(
-					ImageConverter.convertFromImageData(data),
-					new AffineTransform(1f, 0f, 0f, 1f, xpos, ypos), null);
-			stringLength = swtStringSize.width;
-		} else {
-
-			ypos += metrics.getAscent();
-
-			checkState();
-			getGraphics2D()
-					.setPaint(getColor(swtGraphics.getForegroundColor()));
-			getGraphics2D().drawString(s, xpos, ypos);
-		}
-
-		if (isFontUnderlined(getFont())) {
-			int baseline = y + metrics.getAscent();
-			lineWidth = getLineWidth();
-
-			setLineWidth(1);
-			drawLine(x, baseline, x + stringLength, baseline);
-			setLineWidth(lineWidth);
-		}
-		
-		if (isFontStrikeout(getFont())) {
-			int strikeline = y + (metrics.getHeight() / 2);
-			lineWidth = getLineWidth();
-
-			setLineWidth(1);
-			drawLine(x, strikeline, x + stringLength, strikeline);
-			setLineWidth(lineWidth);
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillString(java.lang.String, int, int)
-	 */
-	public void fillString(String s, int x, int y) {
-		// Not implemented
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#fillText(java.lang.String, int, int)
-	 */
-	public void fillText(String s, int x, int y) {
-		// Not implemented
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getBackgroundColor()
-	 */
-	public Color getBackgroundColor() {
-		return swtGraphics.getBackgroundColor();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getClip(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public Rectangle getClip(Rectangle rect) {
-		rect.setBounds(relativeClipRegion);
-		return rect;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getFont()
-	 */
-	public Font getFont() {
-		return swtGraphics.getFont();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getFontMetrics()
-	 */
-	public FontMetrics getFontMetrics() {
-		return swtGraphics.getFontMetrics();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getForegroundColor()
-	 */
-	public Color getForegroundColor() {
-		return swtGraphics.getForegroundColor();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getLineStyle()
-	 */
-	public int getLineStyle() {
-		return swtGraphics.getLineStyle();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getLineWidth()
-	 */
-	public int getLineWidth() {
-		return swtGraphics.getLineWidth();
-	}
-	
-	public float getLineWidthFloat() {
-		return swtGraphics.getLineWidthFloat();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#getXORMode()
-	 */
-	public boolean getXORMode() {
-		return swtGraphics.getXORMode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#popState()
-	 */
-	public void popState() {
-		swtGraphics.popState();
-
-		restoreState(states.pop());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#pushState()
-	 */
-	public void pushState() {
-		swtGraphics.pushState();
-
-		// Make a copy of the current state and push it onto the stack
-		State toPush = new State();
-		toPush.copyFrom(currentState);
-		states.push(toPush);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#restoreState()
-	 */
-	public void restoreState() {
-		swtGraphics.restoreState();
-
-		restoreState(states.peek());
-	}
-
-	private void restoreState(State state) {
-		
-		setBackgroundColor(state.bgColor);
-		setForegroundColor(state.fgColor);
-		setLineAttributes(state.lineAttributes);
-		setXORMode(state.XorMode);
-		
-		setClipAbsolute(state.clipX, state.clipY, state.clipW, state.clipH);
-
-		transX = currentState.translateX = state.translateX;
-		transY = currentState.translateY = state.translateY;
-
-		relativeClipRegion.x = state.clipX - transX;
-		relativeClipRegion.y = state.clipY - transY;
-		relativeClipRegion.width = state.clipW;
-		relativeClipRegion.height = state.clipH;
-		
-		currentState.font = state.font;
-        currentState.alpha = state.alpha;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#scale(double)
-	 */
-	public void scale(double amount) {
-		swtGraphics.scale(amount);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setBackgroundColor(org.eclipse.swt.graphics.Color)
-	 */
-	public void setBackgroundColor(Color rgb) {
-		currentState.bgColor = rgb;
-		swtGraphics.setBackgroundColor(rgb);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.draw2d.geometry.Rectangle)
-	 */
-	public void setClip(Rectangle rect) {
-
-		relativeClipRegion.x = rect.x;
-		relativeClipRegion.y = rect.y;
-		relativeClipRegion.width = rect.width;
-		relativeClipRegion.height = rect.height;
-
-		setClipAbsolute(
-			rect.x + transX,
-			rect.y + transY,
-			rect.width,
-			rect.height);
-	}
-
-	/**
-	 * Sets the current clip values
-	 * 
-	 * @param x
-	 *            the x value
-	 * @param y
-	 *            the y value
-	 * @param width
-	 *            the width value
-	 * @param height
-	 *            the height value
-	 */
-	private void setClipAbsolute(int x, int y, int width, int height) {
-		currentState.clipX = x;
-		currentState.clipY = y;
-		currentState.clipW = width;
-		currentState.clipH = height;
-	}
-
-	private boolean isFontUnderlined(Font f) {
-		return false;
-	}
-
-	private boolean isFontStrikeout(Font f) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setFont(org.eclipse.swt.graphics.Font)
-	 */
-	@Override
-	public void setFont(Font f) {
-
-		swtGraphics.setFont(f);
-		currentState.font = f;
-
-		FontData[] fontInfo = f.getFontData();
-
-		if (fontInfo[0] != null) {
-
-			int height = fontInfo[0].getHeight();
-			
-			float fsize = (float) height
-					* (float) DisplayUtils.getDisplay().getDPI().x
-					/ 72.0f;
-			height = Math.round(fsize);
-			
-			int style = fontInfo[0].getStyle();
-			boolean bItalic = (style & SWT.ITALIC) == SWT.ITALIC;
-			boolean bBold = (style & SWT.BOLD) == SWT.BOLD;
-			String faceName = fontInfo[0].getName();
-			int escapement = 0;
-
-			boolean bUnderline = isFontUnderlined(f);
-			boolean bStrikeout = isFontStrikeout(f);
-			
-			GdiFont font =
-				new GdiFont(
-					height,
-					bItalic,
-					bUnderline,
-					bStrikeout,
-					bBold,
-					faceName,
-					escapement);
-
-			getGraphics2D().setFont(font.getFont());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setForegroundColor(org.eclipse.swt.graphics.Color)
-	 */
-	@Override
-	public void setForegroundColor(Color rgb) {
-		currentState.fgColor = rgb;
-		swtGraphics.setForegroundColor(rgb);
-	}
-
-	/**
-	 * Sets the dash pattern when the custom line style is in use. Because this
-	 * feature is rarely used, the dash pattern may not be preserved when calling
-	 * {@link #pushState()} and {@link #popState()}.
-	 * @param dash the pixel pattern
-	 * 
-	 */
-	@Override
-	public void setLineDash(int[] dash) {
-		float dashFlt[] = new float[dash.length];
-		for (int i=0; i<dash.length; i++) {
-			dashFlt[i] = dash[i];
-		}
-		setLineDash(dashFlt);
-	}
-	
-	@Override
-	public void setLineDash(float[] dash) {
-		currentState.lineAttributes.dash = dash;
-		setLineStyle(SWTGraphics.LINE_CUSTOM);
-		swtGraphics.setLineDash(dash);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setLineStyle(int)
-	 */
-	@Override
-	public void setLineStyle(int style) {
-		currentState.lineAttributes.style = style;		
-		swtGraphics.setLineStyle(style);
-	}
-	
-	/**
-	 * ignored
-	 */
-	@Override
-	public void setLineMiterLimit(float miterLimit) {
-		// do nothing
-	}
-	
-	/**
-	 * ignored
-	 */
-	@Override
-	public void setLineCap(int cap) {
-		// do nothing
-	}
-	
-	/**
-	 * ignored
-	 */
-	@Override
-	public void setLineJoin(int join) {
-		// do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setLineWidth(int)
-	 */
-	@Override
-	public void setLineWidth(int width) {
-		setLineWidthFloat(width);
-	}
-	
-	@Override
-	public void setLineWidthFloat(float width) {
-		currentState.lineAttributes.width = width;
-		swtGraphics.setLineWidthFloat(width);
-	}
-	
-	@Override
-	public void setLineAttributes(LineAttributes lineAttributes) {
-		SWTGraphics.copyLineAttributes(currentState.lineAttributes, lineAttributes);
-		swtGraphics.setLineAttributes(lineAttributes);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.draw2d.Graphics#setXORMode(boolean)
-	 */
-	@Override
-	public void setXORMode(boolean xorMode) {
-		currentState.XorMode = xorMode;
-		swtGraphics.setXORMode(xorMode);
-	}
-
-	/**
-	 * Sets the current translation values
-	 * 
-	 * @param x
-	 *            the x translation value
-	 * @param y
-	 *            the y translation value
-	 */
-	private void setTranslation(int x, int y) {
-		transX = currentState.translateX = x;
-		transY = currentState.translateY = y;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#translate(int, int)
-	 */
-	@Override
-	public void translate(int dx, int dy) {
-		swtGraphics.translate(dx, dy);
-
-		setTranslation(transX + dx, transY + dy);
-		relativeClipRegion.x -= dx;
-		relativeClipRegion.y -= dy;
-	}
-
-	/**
-	 * @return the <code>Graphics2D</code> that this is delegating to.
-	 */
-	protected Graphics2D getGraphics2D() {
-		return graphics2D;
-	}
-	
-	/**
-	 * @return Returns the swtGraphics.
-	 */
-	private SWTGraphics getSWTGraphics() {
-		return swtGraphics;
-	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#fillGradient(int, int, int, int, boolean)
-	 */
-	@Override
-	public void fillGradient(int x, int y, int w, int h, boolean vertical) {
-		GradientPaint gradient;
-		
-		checkState();
-
-		// Gradients in SWT start with Foreground Color and end at Background
-		java.awt.Color start = getColor( getSWTGraphics().getForegroundColor() );
-		java.awt.Color stop = getColor( getSWTGraphics().getBackgroundColor() );
-
-		// Create the Gradient based on horizontal or vertical
-		if( vertical ) {
-			gradient = new GradientPaint(x+transX,y+transY, start, x+transX, y+h+transY, stop);
-		} else {
-			gradient = new GradientPaint(x+transX,y+transY, start, x+w+transX, y+transY, stop);			
-		}
-        
-        Paint oldPaint = getGraphics2D().getPaint();
-        getGraphics2D().setPaint(gradient);
-        getGraphics2D().fill(new Rectangle2D.Double(x+transX, y+transY, w, h));
-        getGraphics2D().setPaint(oldPaint);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#drawPath(org.eclipse.swt.graphics.Path)
-	 */
-	public void drawPath(Path path) {
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getForegroundColor()));
-		getGraphics2D().setStroke(createStroke());
-		getGraphics2D().draw(createPathAWT(path));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#fillPath(org.eclipse.swt.graphics.Path)
-	 */
-	public void fillPath(Path path) {
-		checkState();
-		getGraphics2D().setPaint(getColor(swtGraphics.getBackgroundColor()));
-		getGraphics2D().fill(createPathAWT(path));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.swt.graphics.Path)
-	 */
-	public void setClip(Path path) {
-		if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
-			//If there is a pending change to the fill rule, apply it first.
-			//As long as the FILL_RULE is stored in a single bit, just toggling it works.
-			appliedState.graphicHints ^= FILL_RULE_MASK;
-		}
-		getGraphics2D().setClip(createPathAWT(path));
-		appliedState.clipX = currentState.clipX = 0;
-		appliedState.clipY = currentState.clipY = 0;
-		appliedState.clipW = currentState.clipW = 0;
-		appliedState.clipH = currentState.clipH = 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#getFillRule()
-	 */
-	public int getFillRule() {
-		return ((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT) - FILL_RULE_WHOLE_NUMBER; 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.Graphics#setFillRule(int)
-	 */
-	public void setFillRule(int rule) {
-		currentState.graphicHints &= ~FILL_RULE_MASK;
-		currentState.graphicHints |= (rule + FILL_RULE_WHOLE_NUMBER) << FILL_RULE_SHIFT;
-	}
-
-	private GeneralPath createPathAWT(Path path) {
-		GeneralPath pathAWT = new GeneralPath();
-		PathData pathData = path.getPathData();
-		int idx = 0;
-		for (int i = 0; i < pathData.types.length; i++) {
-			switch (pathData.types[i]) {
-			case SWT.PATH_MOVE_TO:
-				pathAWT.moveTo(pathData.points[idx++] + transX,
-						pathData.points[idx++] + transY);
-				break;
-			case SWT.PATH_LINE_TO:
-				pathAWT.lineTo(pathData.points[idx++] + transX,
-						pathData.points[idx++] + transY);
-				break;
-			case SWT.PATH_CUBIC_TO:
-				pathAWT.curveTo(pathData.points[idx++] + transX,
-						pathData.points[idx++] + transY, pathData.points[idx++]
-								+ transX, pathData.points[idx++] + transY,
-						pathData.points[idx++] + transX, pathData.points[idx++]
-								+ transY);
-				break;
-			case SWT.PATH_QUAD_TO:
-				pathAWT.quadTo(pathData.points[idx++] + transX,
-						pathData.points[idx++] + transY, pathData.points[idx++]
-								+ transX, pathData.points[idx++] + transY);
-				break;
-			case SWT.PATH_CLOSE:
-				pathAWT.closePath();
-				break;
-			default:
-				dispose();
-				SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-			}
-		}
-		int swtWindingRule = ((appliedState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)
-				- FILL_RULE_WHOLE_NUMBER;
-		if (swtWindingRule == SWT.FILL_WINDING) {
-			pathAWT.setWindingRule(GeneralPath.WIND_NON_ZERO);
-		} else if (swtWindingRule == SWT.FILL_EVEN_ODD) {
-			pathAWT.setWindingRule(GeneralPath.WIND_EVEN_ODD);
-		} else {
-			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-		}
-		return pathAWT;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.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) {
-		RenderInfo info = srcImage.getRenderInfo();
-		info.setValues(rect.width, rect.height,  
-						info.shouldMaintainAspectRatio(), info.shouldAntiAlias(),
-						info.getBackgroundColor(), info.getForegroundColor());
-		
-		RenderedImage img = srcImage.getNewRenderedImage(info);
-		
-		BufferedImage bufImg = (BufferedImage)img.getAdapter(BufferedImage.class);
-		if (bufImg == null) {
-			bufImg = ImageConverter.convert(img.getSWTImage());
-		}
-		
-		// Translate the Coordinates
-		int x = rect.x + transX;
-		int y = rect.y + transY + rect.height - bufImg.getHeight();
-
-		checkState();
-		getGraphics2D().drawImage(
-			bufImg,
-			new AffineTransform(1f, 0f, 0f, 1f, x, y),
-			null);
-		
-		return img;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage#allowDelayRender()
-	 */
-	public boolean shouldAllowDelayRender() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage#getMaximumRenderSize()
-	 */
-	public Dimension getMaximumRenderSize() {
-		return null;
-	}
-
-	/**
-	 * Accessor method to return the translation offset for the graphics object
-	 * 
-	 * @return <code>Point</code> x coordinate for graphics translation
-	 */
-	protected Point getTranslationOffset() {
-		return new Point(transX, transY);
-	}
-    
-    /* 
-     * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getAntialias()
-     */
-	@Override
-    public int getAntialias() {
-        Object antiAlias = getGraphics2D().getRenderingHint(RenderingHints.KEY_ANTIALIASING);
-        if (antiAlias != null) {
-            if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_ON))
-                return SWT.ON;
-            else if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_OFF))
-                return SWT.OFF;
-            else if (antiAlias.equals(RenderingHints.VALUE_ANTIALIAS_DEFAULT))
-                return SWT.DEFAULT;
-        }
-        
-        return SWT.DEFAULT;
-    }
-    
-    /* 
-     * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setAntialias(int)
-     */
-	@Override
-    public void setAntialias(int value) {
-        if (value == SWT.ON) {
-            getGraphics2D().setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        }
-        else if (value == SWT.OFF) {
-            getGraphics2D().setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-        }
-        setAdvanced(true);
-    }
-
-	@Override
-    public int getAlpha() {
-        return swtGraphics.getAlpha();
-    }
-
-	@Override
-    public void setAlpha(int alpha) {
-        swtGraphics.setAlpha(alpha);
-        currentState.alpha = alpha;
-        
-        Composite composite = getGraphics2D().getComposite();
-        if (composite instanceof AlphaComposite) {
-            AlphaComposite newComposite = AlphaComposite.getInstance(
-                ((AlphaComposite) composite).getRule(), (float) alpha / (float) 255);
-            getGraphics2D().setComposite(newComposite);
-        }
-    }
-    
-    protected BasicStroke getStroke(){
-    	return stroke;
-    }
-    
-    protected void setStroke(BasicStroke stroke){
-    	this.stroke = stroke;
-    	getGraphics2D().setStroke(stroke);
-    }
-    
-    /**
-	 * Sets and retirns AWT Stroke based on the value of
-	 * <code>LineAttributes</code> within the current state object
-	 * 
-	 * @return the new AWT stroke
-	 */
-    private Stroke createStroke() {    	
-    	float factor = currentState.lineAttributes.width > 0 ? currentState.lineAttributes.width : 3;
-    	float awt_dash[];
-    	int awt_cap;
-    	int awt_join;
-    	
-		switch (currentState.lineAttributes.style) {
-			case SWTGraphics.LINE_DASH :
-				awt_dash = new float[]{ factor * 6, factor * 3 };
-				break;
-			case SWTGraphics.LINE_DASHDOT :
-				awt_dash = new float[] { factor * 3, factor, factor, factor };
-				break;
-			case SWTGraphics.LINE_DASHDOTDOT :
-				awt_dash = new float[] { factor * 3, factor, factor, factor, factor, factor };
-				break;
-			case SWTGraphics.LINE_DOT :
-				awt_dash = new float[] { factor, factor };
-				break;
-			case SWTGraphics.LINE_CUSTOM :
-				awt_dash = currentState.lineAttributes.dash;
-				break;
-			default :
-				awt_dash = null;
-		}
-		
-		switch (currentState.lineAttributes.cap) {
-			case SWT.CAP_FLAT:
-				awt_cap = BasicStroke.CAP_BUTT;
-				break;
-			case SWT.CAP_ROUND:
-				awt_cap = BasicStroke.CAP_ROUND;
-				break;
-			case SWT.CAP_SQUARE:
-				awt_cap = BasicStroke.CAP_SQUARE;
-				break;
-			default:
-				awt_cap = BasicStroke.CAP_BUTT;				
-		}
-		
-		switch (currentState.lineAttributes.join) {
-			case SWT.JOIN_BEVEL:
-				awt_join = BasicStroke.JOIN_BEVEL;
-				break;
-			case SWT.JOIN_MITER:
-				awt_join = BasicStroke.JOIN_MITER;
-				break;
-			case SWT.JOIN_ROUND:
-				awt_join = BasicStroke.JOIN_ROUND;
-				break;
-			default:
-				awt_join = BasicStroke.JOIN_MITER;
-		}
-		
-		/*
-		 * SWT paints line width == 0 as if it is == 1, so AWT is synced up with that below.
-		 */
-		stroke =
-			new BasicStroke(
-				currentState.lineAttributes.width != 0 ? currentState.lineAttributes.width : 1,
-				awt_cap,
-				awt_join,
-				currentState.lineAttributes.miterLimit,
-				awt_dash,
-				currentState.lineAttributes.dashOffset);
-		return stroke;
-    }
-
-    public boolean getAdvanced() {
-    	return (currentState.graphicHints & ADVANCED_GRAPHICS_MASK) != 0;
-    }
-
-    public void setAdvanced(boolean value) {
-    	if(value) {
-    		currentState.graphicHints |= ADVANCED_GRAPHICS_MASK;
-    	} else {
-    		currentState.graphicHints &= ~ADVANCED_GRAPHICS_MASK;
-    	}
-    }
-
-	@Override
-	public void clipPath(Path path) {
-		if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
-			//If there is a pending change to the fill rule, apply it first.
-			//As long as the FILL_RULE is stored in a single bit, just toggling it works.
-			appliedState.graphicHints ^= FILL_RULE_MASK;
-		}
-		setClip(path);
-		getGraphics2D().clipRect(relativeClipRegion.x + transX, relativeClipRegion.y + transY, relativeClipRegion.width, relativeClipRegion.height);
-		java.awt.Rectangle bounds = getGraphics2D().getClip().getBounds();
-		relativeClipRegion = new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/graphics/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/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.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageConverter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageConverter.java
deleted file mode 100644
index b507732..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageConverter.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.image;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
-
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * This is a helper class used to convert an SWT Image into an AWT
- * BufferedImage.
- * 
- * @author Jody Schofield / sshaw
- *
- */
-public class ImageConverter {
-
-	private static final PaletteData PALETTE_DATA = new PaletteData(0xFF0000, 0xFF00, 0xFF);
-	
-	/**
-	 * Converts an AWT based buffered image into an SWT <code>Image</code>.  This will always return an
-	 * <code>Image</code> that has 24 bit depth regardless of the type of AWT buffered image that is 
-	 * passed into the method.
-	 * 
-	 * @param srcImage the {@link java.awt.image.BufferedImage} to be converted to an <code>Image</code>
-	 * @return an <code>Image</code> that represents the same image data as the AWT 
-	 * <code>BufferedImage</code> type.
-	 */
-	public static Image convert( BufferedImage srcImage) {
-		return new Image(DisplayUtils.getDisplay(), convertToImageData(srcImage));
-	}
-	
-	/**
-	 * Converts an AWT based buffered image into an SWT <code>ImageData</code>.  This will always return an
-	 * <code>ImageData</code> that has 24 bit depth regardless of the type of AWT buffered image that is 
-	 * passed into the method.
-	 * 
-	 * @param srcImage the {@link java.awt.image.BufferedImage} to be converted to an <code>Image</code>
-	 * @return an <code>Image</code> that represents the same image data as the AWT 
-	 * <code>BufferedImage</code> type.
-	 * 
-	 * @since 1.3.1
-	 */
-	public static ImageData convertToImageData(BufferedImage srcImage) {
-		// We can force bitdepth to be 24 bit because BufferedImage getRGB allows us to always
-		// retrieve 24 bit data regardless of source color depth.
-		ImageData swtImageData =
-			new ImageData(srcImage.getWidth(), srcImage.getHeight(), 24, PALETTE_DATA);
-
-		// ensure scansize is aligned on 32 bit.
-		int scansize = (((srcImage.getWidth() * 3) + 3) * 4) / 4;
-		
-		WritableRaster alphaRaster = srcImage.getAlphaRaster();
-		byte[] alphaBytes = new byte[srcImage.getWidth()];
-			
-		for (int y=0; y<srcImage.getHeight(); y++) {
-			int[] buff = srcImage.getRGB(0, y, srcImage.getWidth(), 1, null, 0, scansize);
-			swtImageData.setPixels(0, y, srcImage.getWidth(), buff, 0);
-			
-			// check for alpha channel
-			if (alphaRaster != null) {
-				int[] alpha = alphaRaster.getPixels(0, y, srcImage.getWidth(), 1, (int[])null);
-				for (int i=0; i<srcImage.getWidth(); i++)
-					alphaBytes[i] = (byte)alpha[i];
-				swtImageData.setAlphas(0, y, srcImage.getWidth(), alphaBytes, 0);
-			}
-		}
-		return swtImageData;
-	}
-	
-	/**
-	 * Converts an swt based image into an AWT <code>BufferedImage</code>.  This will always return a
-	 * <code>BufferedImage</code> that is of type <code>BufferedImage.TYPE_INT_ARGB</code> regardless of
-	 * the type of swt image that is passed into the method.
-	 * 
-	 * @param srcImage the {@link org.eclipse.swt.graphics.Image} to be converted to a <code>BufferedImage</code>
-	 * @return a <code>BufferedImage</code> that represents the same image data as the swt <code>Image</code>
-	 */
-	public static BufferedImage convert( Image srcImage ) {
-		return convertFromImageData(srcImage.getImageData());
-	}
-	
-	/**
-	 * Converts an swt based image data into an AWT <code>BufferedImage</code>.  This will always return a
-	 * <code>BufferedImage</code> that is of type <code>BufferedImage.TYPE_INT_ARGB</code> regardless of
-	 * the type of swt image that is passed into the method.
-	 * 
-	 * @param srcImage the {@link org.eclipse.swt.graphics.Image} to be converted to a <code>BufferedImage</code>
-	 * @return a <code>BufferedImage</code> that represents the same image data as the swt <code>Image</code>
-	 * 
-	 * @since 1.3.1
-	 */
-	public static BufferedImage convertFromImageData(ImageData imageData) {
-		int width = imageData.width;
-		int height = imageData.height;
-		ImageData maskData = null;
-		int alpha[] = new int[1];
-		
-		if (imageData.alphaData == null)
-			maskData = imageData.getTransparencyMask();
-		
-		// now we should have the image data for the bitmap, decompressed in imageData[0].data.
-		// Convert that to a Buffered Image.
-		BufferedImage image = new BufferedImage( imageData.width, imageData.height, BufferedImage.TYPE_INT_ARGB );
-	    
-	    WritableRaster alphaRaster = image.getAlphaRaster();
-
-		// loop over the imagedata and set each pixel in the BufferedImage to the appropriate color.
-		for( int y = 0; y < height; y++ )
-		{
-			for( int x = 0; x < width; x++ )
-			{
-				RGB color = imageData.palette.getRGB(imageData.getPixel(x, y));
-				image.setRGB( x, y, new java.awt.Color(color.red, color.green, color.blue).getRGB());
-		
-				// check for alpha channel
-				if (alphaRaster != null) {
-					if( imageData.alphaData != null) {
-						alpha[0] = imageData.getAlpha( x, y );
-						alphaRaster.setPixel( x, y, alpha );
-					}
-					else {
-						// check for transparency mask
-						if( maskData != null) {
-							alpha[0] = maskData.getPixel( x, y ) == 0 ? 0 : 255;
-							alphaRaster.setPixel( x, y, alpha );
-						}
-					}
-				}
-			}
-		}
-
-		return image;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageExporter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageExporter.java
deleted file mode 100644
index c48835e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/image/ImageExporter.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.image;
-
-import java.awt.Graphics;
-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.io.OutputStream;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.batik.transcoder.image.JPEGTranscoder;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-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.draw2d.ui.render.awt.internal.Draw2dRenderPlugin;
-
-
-/**
- * Class utility for exporting to JPEG, TIFF and PNG file formats.
- * @author sshaw
- */
-public class ImageExporter {
-    
-    static public final String JPEG_FILE = "JPEG"; //$NON-NLS-1$
-    static public final String PNG_FILE = "PNG"; //$NON-NLS-1$
-	static private final Float DEFAULT_QUALITY = new Float(1.00);
-    /**
-     * Allows export of an image to specific supported image file formats.
-     * 
-     * @param destination the <code>IPath</code> that is the path of the destination file to be created.
-     * @param image the <code>BufferedImage</code> class to be exported to the image file format.
-     * @param imageFormat the <code>String</code> that is the type of image file format to export to.  Can
-     * be one of <code>JPEG_FILE</code> or <code>PNG_FILE</code>
-     * @param monitor the <code>IProgressMonitor</code> that will update the progress monitor during the operation.
-     */
-    public static void exportToFile(IPath destination, BufferedImage image,
-            String imageFormat, IProgressMonitor monitor) throws CoreException {
-    	exportToFile(destination, image, imageFormat, monitor, DEFAULT_QUALITY);
-    }
-    
-    /**
-     * Allows export of an image to specific supported image file formats.
-     * 
-     * @param destination the <code>IPath</code> that is the path of the destination file to be created.
-     * @param image the <code>BufferedImage</code> class to be exported to the image file format.
-     * @param imageFormat the <code>String</code> that is the type of image file format to export to.  Can
-     * be one of <code>JPEG_FILE</code> or <code>PNG_FILE</code>
-     * @param monitor the <code>IProgressMonitor</code> that will update the progress monitor during the operation.
-     */
-    public static void exportToFile(IPath destination, BufferedImage image,
-            String imageFormat, IProgressMonitor monitor, float quality) 
-        throws CoreException {
-
-        IStatus fileModificationStatus = createFile(destination);
-        
-        if (!fileModificationStatus.isOK()) {
-        	// can't write to the file
-        	return;
-        }
-        
-        try {
-            FileOutputStream os = new FileOutputStream(destination.toOSString());
-            exportToOutputStream(os, image, imageFormat, monitor, quality);
-            os.close();
-            monitor.worked(1);
-            refreshLocal(destination);
-        } catch (IOException ex) {
-            Log.error(Draw2dRenderPlugin.getInstance(), IStatus.ERROR, ex
-                .getMessage(), ex);
-            IStatus status =
-                new Status(IStatus.ERROR, "exportToFile", IStatus.OK, //$NON-NLS-1$
-                    ex.getMessage(), null);
-            throw new CoreException(status);
-        }
-    }
-    
-    /**
-     * Allows export of an image to specific supported image file formats.
-	 *
-     * @param stream stream to write the data to
-     * @param image the image
-     * @param imageFormat image format
-     * @param monitor progress monitor
-     * @throws CoreException
-     */
-    public static void exportToOutputStream(OutputStream stream, BufferedImage image,
-			String imageFormat, IProgressMonitor monitor) throws CoreException {
-    	exportToOutputStream(stream, image, imageFormat, monitor, DEFAULT_QUALITY);
-	}
-    
-    /**
-     * Allows export of an image to specific supported image file formats.
-	 *
-     * @param stream stream to write the data to
-     * @param image the image
-     * @param imageFormat image format
-     * @param monitor progress monitor
-     * @param quality the quality
-     * @throws CoreException
-     */
-    public static void exportToOutputStream(OutputStream stream, BufferedImage image,
-			String imageFormat, IProgressMonitor monitor, float quality) throws CoreException {
-		monitor.worked(1);
-		ImageTranscoder imageTranscoder = null;
-		BufferedImage newImg = image;
-
-		if (imageFormat == JPEG_FILE) {
-			imageTranscoder = new JPEGTranscoder();
-			if (image.getType() != BufferedImage.TYPE_INT_RGB) {
-				newImg = new BufferedImage(image.getWidth(), image.getHeight(),
-						BufferedImage.TYPE_INT_RGB);
-				Graphics g = newImg.getGraphics();
-				g.drawImage(image, 0, 0, null);
-				g.dispose();
-			}
-			imageTranscoder.addTranscodingHint(JPEGTranscoder.KEY_QUALITY,
-					quality);
-		} else if (imageFormat == PNG_FILE) {
-			imageTranscoder = new PNGTranscoder();
-		} else {
-			throw new IllegalArgumentException();
-		}
-
-		TranscoderOutput to = new TranscoderOutput(stream);
-
-		try {
-			imageTranscoder.writeImage(newImg, to);
-		} catch (TranscoderException e) {
-			Log.error(Draw2dRenderPlugin.getInstance(), IStatus.ERROR, e
-					.getMessage(), e);
-			IStatus status = new Status(IStatus.ERROR,
-					"exportToStream", IStatus.OK, //$NON-NLS-1$
-					e.getMessage(), null);
-			throw new CoreException(status);
-		}
-		monitor.worked(1);
-    }
-    
-    /**
-	 * 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 static 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 static void refreshLocal(IPath destination)
-        throws CoreException {
-        IFile file = ResourcesPlugin.getWorkspace().getRoot()
-            .getFileForLocation(destination);
-        if (file != null) {
-            file.refreshLocal(IResource.DEPTH_ZERO, null);
-        }
-    }
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/package.html
deleted file mode 100644
index 67ba89a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/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.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ColorKey.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ColorKey.java
deleted file mode 100644
index 7731b44..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ColorKey.java
+++ /dev/null
@@ -1,32 +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.awt.internal.svg;
-
-import java.awt.Color;
-
-import org.apache.batik.transcoder.TranscodingHints.Key;
-
-/**
- * @author sshaw
- *
- * ColorKey class used for storing hints with the SWTImageTranscoder
- */
-public class ColorKey extends Key {
-
-	/* (non-Javadoc)
-	 * @see org.apache.batik.transcoder.TranscodingHints.Key#isCompatibleValue(java.lang.Object)
-	 */
-	public boolean isCompatibleValue(Object v) {
-		return (v instanceof Color);
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderEx.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderEx.java
deleted file mode 100644
index d7a79a5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderEx.java
+++ /dev/null
@@ -1,411 +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.awt.internal.svg;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Dimension2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.batik.bridge.BaseScriptingEnvironment;
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.BridgeException;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.ViewBox;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.util.DOMUtilities;
-import org.apache.batik.ext.awt.image.GraphicsUtil;
-import org.apache.batik.gvt.CanvasGraphicsNode;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.batik.transcoder.keys.BooleanKey;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.svg.SVGSVGElement;
-
-/**
- * @author sshaw
- *
- * Class extension for handling turning on/off anti-aliasing, replacing black and white
- * colors with choice colors and turning on/off maintain aspect ratio capability.
- */
-public class ImageTranscoderEx extends ImageTranscoder {
-	/**
-	 * @author sshaw
-	 *
-	 * Utility class for returning float width and height values from a method.
-	 */
-	public class DimensionFloat extends Dimension2D {
-
-		private float w;
-		private float h;
-		
-		/**
-		 * 
-		 */
-		public DimensionFloat(float width, float height) {
-			super();
-			this.w = width;
-			this.h = height;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.awt.geom.Dimension2D#getWidth()
-		 */
-		public double getWidth() {
-			return w;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.awt.geom.Dimension2D#getHeight()
-		 */
-		public double getHeight() {
-			return h;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.awt.geom.Dimension2D#setSize(double, double)
-		 */
-		public void setSize(double width, double height) {
-			this.w = (float)width;
-			this.h = (float)height;
-
-		}
-
-	}
-
-	/**
-	 * Constructor to create an instance of SWTImageTranscoder.
-	 */
-	public ImageTranscoderEx() {
-		// empty constructor
-	}
-	
-	public static final TranscodingHints.Key KEY_MAINTAIN_ASPECT_RATIO
-		= new BooleanKey();
-	
-	public static final TranscodingHints.Key KEY_FILL_COLOR
-		= new ColorKey();
-	
-	public static final TranscodingHints.Key KEY_OUTLINE_COLOR
-		= new ColorKey();
-	
-	public static final TranscodingHints.Key KEY_ANTI_ALIASING
-		= new BooleanKey();
-						
-	/**
-	 * initSVGDocument
-	 * This is an initialization method for setting alternate stylesheet if
-	 * set as a hint and also initializes the SVG document with the appropriate
-	 * context.
-	 * 
-	 * @param svgDoc SVGODocument to initialize.
-	 */
-	protected void initSVGDocument(SVGOMDocument svgDoc) {
-		Color fillColor = null;
-		Color outlineColor = null;
-		if (hints.containsKey(KEY_FILL_COLOR)) {
-			fillColor = (Color)hints.get(KEY_FILL_COLOR);
-		}
-		
-		if (hints.containsKey(KEY_OUTLINE_COLOR)) {
-			outlineColor = (Color)hints.get(KEY_OUTLINE_COLOR);
-		}
-		
-		if (fillColor == null && outlineColor == null)
-			return;
-		
-		SVGColorConverter.getInstance().replaceDocumentColors(svgDoc, fillColor, outlineColor);
-	}
-	
-	/**
-	 * buildGVTTree
-	 * This method builds the GVT tree that is used to render the SVG data.
-	 * 
-	 * @param svgDoc SVGOMDocument representing the physical SVG document.
-	 * @param context BridgeContext containing information of the render to occur.
-	 * @return GraphicsNode object.
-	 * @throws TranscoderException thrown if a BridgeException occurs when building the root object.
-	 */
-	protected GraphicsNode buildGVTTree(SVGOMDocument svgDoc, BridgeContext context)  
-										throws TranscoderException {
-		GVTBuilder gvtBuilder = new GVTBuilder();
-		GraphicsNode gvtRoot = null;
-		try {
-			gvtRoot = gvtBuilder.build(context, svgDoc);
-
-		} catch (BridgeException ex) {
-			throw new TranscoderException(ex);
-		}
-		
-		return gvtRoot;
-	}
-	
-	
-	/**
-	 * calculateSizeTransform
-	 * Calculates the transformation matrix that is applied during the render operation.  Specifically,
-	 * the transformation for changing the size of the rendered data.
-	 * 
-	 * @param svgRoot SVGSVGElement root element of the SVG tree.
-	 * @param gvtRoot GraphicsNode graphic node root
-	 * @param uri String of the SVG document URI
-	 * @param docWidth float width values of the original vector.
-	 * @param docHeight float height values of the original vector.
-	 * @param newWidth float width values of the rendered image.
-	 * @param newHeight float height values of the rendered image.
-	 * @return AffineTransform object that represents the size transformation to take place.
-	 * @throws TranscoderException thrown if a BridgeException occurs when building the root object.
-	 */
-	protected AffineTransform calculateSizeTransform(SVGSVGElement svgRoot, GraphicsNode gvtRoot, String uri, 
-			float docWidth, float docHeight, 
-			float newWidth, float newHeight) 
-	throws TranscoderException {
-		AffineTransform Px;
-		String ref = null;
-		try {
-			ref = new URL(uri == null ? "": uri).getRef(); //$NON-NLS-1$
-		} catch (MalformedURLException ex) {
-			// nothing to do, catched previously
-		}
-		
-		boolean maintainAspectRatio = true;
-		if (hints.containsKey(KEY_MAINTAIN_ASPECT_RATIO)) {
-			maintainAspectRatio = ((Boolean)hints.get(KEY_MAINTAIN_ASPECT_RATIO)).booleanValue();
-		}
-		
-		if (maintainAspectRatio) {
-			try {
-				Px = ViewBox.getViewTransform(ref, svgRoot, newWidth, newHeight);
-			} catch (BridgeException ex) {
-				throw new TranscoderException(ex);
-			}
-			
-			if (Px.isIdentity() && (newWidth != docWidth || newHeight != docHeight)) {
-				// The document has no viewBox, we need to resize it by hand.
-				// we want to keep the document size ratio
-				float xscale = newWidth / docWidth;
-                float yscale = newHeight / docHeight;
-                if (docHeight / docWidth > newHeight / newWidth) {
-                    xscale = yscale;
-                } else {
-                    yscale = xscale;
-                }
-                
-				Px = AffineTransform.getScaleInstance(xscale, yscale);
-			}
-		}
-		else {
-			float xscale = newWidth / docWidth;
-			float yscale = newHeight / docHeight; 
-			Px = AffineTransform.getScaleInstance(xscale, yscale);
-		}
-		
-		// take the AOI into account if any
-		if (hints.containsKey(KEY_AOI)) {
-			Rectangle2D aoi = (Rectangle2D)hints.get(KEY_AOI);
-			// transform the AOI into the image's coordinate system
-			aoi = Px.createTransformedShape(aoi).getBounds2D();
-			AffineTransform Mx = new AffineTransform();
-			double sx = newWidth / aoi.getWidth();
-			double sy = newHeight / aoi.getHeight();
-			Mx.scale(sx, sy);
-			double tx = -aoi.getX();
-			double ty = -aoi.getY();
-			Mx.translate(tx, ty);
-
-			// take the AOI transformation matrix into account
-			// we apply first the preserveAspectRatio matrix
-			Px.preConcatenate(Mx);
-		}
-		
-		CanvasGraphicsNode cgn = getCanvasGraphicsNode(gvtRoot);
-        if (cgn != null) {
-            cgn.setViewingTransform(Px);
-            curTxf = new AffineTransform();
-        } else {
-            curTxf = Px;
-        }
-        
-		return curTxf;
-	}
-	
-	private boolean shouldCopyDocument(Document document) {
-		if (!(document.getImplementation() instanceof SVGDOMImplementation))
-			return true;
-		
-		if (hints.containsKey(KEY_FILL_COLOR) ||
-			hints.containsKey(KEY_OUTLINE_COLOR)) {
-			return true;
-		}
-		
-		return false;
-	}
-	/**
-	 * Transcodes the specified Document as an image in the specified output.
-	 *
-	 * @param document the document to transcode
-	 * @param uri the uri of the document or null if any
-	 * @param output the ouput where to transcode
-	 * @exception TranscoderException if an error occured while transcoding
-	 */
-	protected void transcode(Document document,
-			String uri,
-			TranscoderOutput output)
-	throws TranscoderException {
-
-		if (shouldCopyDocument(document)) {
-			DOMImplementation impl;
-			impl = SVGDOMImplementation.getDOMImplementation();
-			document = DOMUtilities.deepCloneDocument(document, impl);
-			if (uri != null) {
-				try { 
-					URL url = new URL(uri);
-					((SVGOMDocument)document).setURLObject(url);
-				} catch (MalformedURLException mue) {
-
-					//TODO: Implement error handling
-				}
-			}
-		}
-
-		ctx = new BridgeContext(userAgent);
-		SVGOMDocument svgDoc = (SVGOMDocument)document;
-		SVGSVGElement svgRoot = svgDoc.getRootElement();
-
-		// build the GVT tree
-		builder = new GVTBuilder();
-		// flag that indicates if the document is dynamic
-		boolean isDynamic = 
-			(hints.containsKey(KEY_EXECUTE_ONLOAD) &&
-					((Boolean)hints.get(KEY_EXECUTE_ONLOAD)).booleanValue() &&
-					BaseScriptingEnvironment.isDynamicDocument(ctx, svgDoc));
-
-		if (isDynamic)
-			ctx.setDynamicState(BridgeContext.DYNAMIC);
-
-		initSVGDocument(svgDoc);
-		
-		GraphicsNode gvtRoot;
-		try {
-			gvtRoot = builder.build(ctx, svgDoc);
-		} catch (BridgeException ex) {
-			throw new TranscoderException(ex);
-		}
-		
-		// get the 'width' and 'height' attributes of the SVG document
-		float docWidth = (float)ctx.getDocumentSize().getWidth();
-		float docHeight = (float)ctx.getDocumentSize().getHeight();
-
-		setImageSize(docWidth, docHeight);
-
-		//compute the transformation matrix
-		AffineTransform Px = calculateSizeTransform(svgRoot, gvtRoot, uri, docWidth, docHeight, width, height);
-
-		gvtRoot = renderImage(output, gvtRoot, Px, (int)width, (int)height);
-
-		this.root = gvtRoot;
-	}
-	
-	/**
-	 * @param output
-	 * @param gvtRoot
-	 * @param Px
-	 * @param w
-	 * @param h
-	 * @return
-	 * @throws TranscoderException
-	 */
-	private GraphicsNode renderImage(TranscoderOutput output, GraphicsNode gvtRoot, AffineTransform Px, int w, int h)
-		throws TranscoderException {
-		
-		Graphics2D g2d = createGraphics(w, h);
-
-		// Check anti-aliasing preference
-		if (hints.containsKey(KEY_ANTI_ALIASING)) {	
-			boolean antialias = ((Boolean)hints.get(KEY_ANTI_ALIASING)).booleanValue();
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				antialias ? RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
-		} else {
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				RenderingHints.VALUE_ANTIALIAS_ON);
-		}
-		
-		g2d.clip(new java.awt.Rectangle(0, 0, w, h));
-		
-		g2d.transform(Px);
-		
-		gvtRoot.paint(g2d);
-		
-		postRenderImage(g2d);
-		
-		return null;
-	}
-
-	/**
-	 * @param w
-	 * @param h
-	 * @return
-	 */
-	protected Graphics2D createGraphics(int w, int h) {
-		bufferedImage = createImage(w, h);
-		Graphics2D g2d = GraphicsUtil.createGraphics(bufferedImage);
-		return g2d;
-	}
-
-	protected void postRenderImage(Graphics2D g2d) {
-		g2d.dispose();
-	}
-	
-	private BufferedImage bufferedImage = null;
-	
-	/**
-	 * getBufferedImage
-	 * Accessor to return the buffered image used for rendering.
-	 * 
-	 * @return BufferedImage
-	 */
-	public BufferedImage getBufferedImage() {
-		return bufferedImage;
-	}
-	
-	/**
-	 * Override to create a BufferedImage type that support an alpha channel for
-	 * transparency.
-	 * 
-	 * @see org.apache.batik.transcoder.image.ImageTranscoder#createImage(int, int)
-	 */
-	public BufferedImage createImage(int w, int h) {
-		return new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-	}
-	
-	/** 
-	 * Override to support the translation of the BufferedImage type into the SWT Image
-	 * format.
-	 * 
-	 * @see org.apache.batik.transcoder.image.ImageTranscoder#writeImage(java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
-	 */
-	public void writeImage(BufferedImage img, TranscoderOutput arg1)
-		throws TranscoderException {
-
-		bufferedImage = img;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderOutput.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderOutput.java
deleted file mode 100644
index aee1c88..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/ImageTranscoderOutput.java
+++ /dev/null
@@ -1,31 +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.awt.internal.svg;
-
-import org.apache.batik.transcoder.TranscoderOutput;
-
-/**
- * @author sshaw
- *
- * This is a dummy class used by the SWTImageTranscoder to satisfy the api 
- * requirements for the Batik transcoder class.  It doesn't do anything except
- * provide type information.
- */
-class ImageTranscoderOutput extends TranscoderOutput {
-	
-	/**
-	 * Creates a new instance of SWTImageTranscoderOutput
-	 */
-	public ImageTranscoderOutput() {
-		// empty block
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGColorConverter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGColorConverter.java
deleted file mode 100644
index 71d2532..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGColorConverter.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg;
-
-import java.awt.Color;
-
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.svggen.SVGColor;
-import org.apache.batik.svggen.SVGGeneratorContext;
-import org.apache.batik.svggen.SVGPaintDescriptor;
-import org.apache.batik.util.SVGConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.svg.SVGSVGElement;
-import org.w3c.dom.traversal.NodeFilter;
-import org.w3c.dom.traversal.NodeIterator;
-
-/**
- * @author sshaw
- *
- * Utility class that will replace Black and white with corresponding outline and
- * fill colors respectively.
- */
-public class SVGColorConverter {
-	
-	static private SVGColorConverter INSTANCE = new SVGColorConverter();
-	
-	/**
-	 * getInstance
-	 * Implementation of the singleton pattern
-	 * 
-	 * @return the Singleton Instance of SVGColorConverter
-	 */
-	static public SVGColorConverter getInstance() {
-		return INSTANCE;
-	}
-	/**
-	 * 
-	 */
-	private SVGColorConverter() {
-		super();
-	}
-	
-	/**
-	 * replaceDocumentColors
-	 * Given an SVGOMDocument, this method will replace all fill, stroke and gradient
-	 * colors with values that are based in.  Black color will be replaced by the given
-	 * outlineColor and White color will be replaced by the given fillColor.
-	 * 
-	 * @param svgDoc SVGOMDocument to perform the replace on.
-	 * @param fillColor This is the fill color that will replace all occurrences of white
-	 * @param outlineColor This is the outline color that will replace all occurrences of black.
-	 */
-	public void replaceDocumentColors(SVGOMDocument svgDoc, Color fillColor, Color outlineColor) {
-		SVGSVGElement svgRoot = svgDoc.getRootElement();
-		NodeIterator ni = svgDoc.createNodeIterator(svgRoot, NodeFilter.SHOW_ALL, null, true);
-		Node node = ni.nextNode();
-		while (node != null) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element element = (Element)node; 
-				
-				if (fillColor != null) {
-					setColorAttribute(svgDoc, element, SVGConstants.SVG_FILL_ATTRIBUTE, false, fillColor);
-					setColorAttribute(svgDoc, element, SVGConstants.SVG_STOP_COLOR_ATTRIBUTE, false, fillColor);
-				}
-				
-				if (outlineColor != null) {
-					setColorAttribute(svgDoc, element, SVGConstants.SVG_STROKE_ATTRIBUTE, true, outlineColor);
-					setColorAttribute(svgDoc, element, SVGConstants.SVG_STOP_COLOR_ATTRIBUTE, true, outlineColor);
-				}
-			}
-			
-			node = ni.nextNode();
-		}
-	}
-	
-	public static final String SEMICOLON = ";"; //$NON-NLS-1$
-	public static final String COLON = ":"; 	//$NON-NLS-1$		
-
-	private boolean isBlack(String color) {
-		String cleanColorStr = cleanFromSpaces(color);
-		return cleanColorStr.equals("#000000") || cleanColorStr.equalsIgnoreCase("BLACK") || cleanColorStr.equalsIgnoreCase("rgb(0,0,0)");//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-	}
-	
-	private boolean isWhite(String color) {
-		String cleanColorStr = cleanFromSpaces(color);
-		return cleanColorStr.equalsIgnoreCase("#FFFFFF") || cleanColorStr.equalsIgnoreCase("WHITE") || cleanColorStr.equalsIgnoreCase("rgb(255,255,255)");//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-	}	
-	
-	private String cleanFromSpaces(String s) {
-		char [] chars = new char[s.length()];
-		int index = 0;
-		for (int i = 0; i < s.length(); i++) {
-			if (s.charAt(i) != ' ') {
-				chars[index++] = s.charAt(i); 
-			}
-		}
-		return new String(chars, 0, index);
-	}
-	
-	/**
-	 * setColorAttribute
-	 * Utility function that will set the color attribute to the specified color
-	 * 
-	 * @param element Element to set the attribute color of
-	 * @param attributeName String attribute name, usually one of SVGConstants.SVG_FILL_ATTRIBUTE or
-	 * SVGConstants.SVG_STROKE_ATTRIBUTE
-	 * @param boolean black is true if replace with color, false to replace white.
-	 * @param color Color to change the attribute to.
-	 */
-	protected void setColorAttribute(SVGOMDocument svgDoc, Element element, String attributeName, boolean black, Color color) {
-		SVGPaintDescriptor svgPD = SVGColor.toSVG(color, SVGGeneratorContext.createDefault(svgDoc));
-
-		if (element.hasAttribute(attributeName)) {
-			String value = element.getAttribute(attributeName);
-
-			// Only change the Stroke color if the current color is black
-			if( attributeName.equals(SVGConstants.SVG_STROKE_ATTRIBUTE) ||
-				attributeName.equals(SVGConstants.SVG_FILL_ATTRIBUTE)) {
-				
-				if( (black && isBlack(value)) || (!black && isWhite(value)) ) {  
-					element.setAttribute(attributeName, svgPD.getPaintValue());
-				}
-			}
-		}
-		else if (element.hasAttribute(SVGConstants.SVG_STYLE_TAG)) {
-			//TODO There must be a better way to set fill / outline color with the Batik libraries.
-			String style = element.getAttribute(SVGConstants.SVG_STYLE_TAG);
-						
-			String preColor = ""; //$NON-NLS-1$
-			int nStart = style.indexOf(attributeName + COLON);
-			if (nStart != -1) {
-				if (nStart > 0)
-					preColor = style.substring(0, nStart);
-								
-				String postColor = ""; //$NON-NLS-1$
-				int nEnd = style.indexOf(SEMICOLON, nStart);
-				if (nEnd == -1)
-					nEnd = style.length();
-				if (nEnd < style.length() - 1)
-					postColor = style.substring(nEnd + 1, style.length());
-				
-				String currentColor = style.substring(nStart+attributeName.length() + 1, nEnd);
-				if( (black && isBlack(currentColor)) || (!black && isWhite(currentColor))) {
-					if (!currentColor.equals(SVGConstants.SVG_NONE_VALUE)) {				
-						StringBuffer styleBuffer = new StringBuffer(style.length() + 5);
-						styleBuffer.append(preColor);
-						styleBuffer.append(" "); //$NON-NLS-1$
-						styleBuffer.append(attributeName);
-						styleBuffer.append(COLON);
-						styleBuffer.append(svgPD.getPaintValue());
-						if (!postColor.equals("")) {	//$NON-NLS-1$
-							styleBuffer.append(SEMICOLON);
-							styleBuffer.append(postColor);
-						}
-						String styleNew = styleBuffer.toString();
-										
-						element.setAttribute(SVGConstants.SVG_STYLE_TAG, styleNew);
-					}
-			    }
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImage.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImage.java
deleted file mode 100644
index 6df3bcf..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImage.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.util.XMLResourceDescriptor;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.GCUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.image.ImageConverter;
-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.Draw2dRenderStatusCodes;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.w3c.dom.Document;
-
-/**
- * Class that represents a SVG image. This is a useful abstraction so that it
- * can be used similar to an SWT Image object.
- *  
- * @author sshaw
- */
-public final class SVGImage 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 SVGImage(byte[] buff, RenderedImageKey key) { 
-		super(buff, key);
-		
-		if (key.getExtraData() == null)
-			key.setExtraData(getDocument());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.AbstractRenderedImage#renderImage()
-	 */
-	protected Image renderImage() {
-		// otherwise render the image.
-		try {
-			if (GCUtilities.supportsAdvancedGraphics()) {
-				SVGImageConverter converter = new SVGImageConverter();
-				return converter.renderSVGtoSWTImage(getDocument(), getRenderInfo());
-			}
-			else {
-				SVGImageConverter converter = new SVGImageConverter();
-				BufferedImage img = converter.renderSVGToAWTImage(getDocument(), getRenderInfo());
-				return ImageConverter.convert(img);
-			}
-		} catch (Exception e) {
-			try {
-				// try rendering to awt since the SWT renderered may not support the SVG image capabilities
-				SVGImageConverter converter = new SVGImageConverter();
-				BufferedImage img = converter.renderSVGToAWTImage(getDocument(), getRenderInfo());
-				return ImageConverter.convert(img);
-			} catch (Exception e1) {
-				Trace.catching(Draw2dRenderPlugin.getInstance(), Draw2dRenderDebugOptions.EXCEPTIONS_THROWING, getClass(), "getSWTImage()", //$NON-NLS-1$
-					e1);
-
-				// handle failure gracefully - we can't predict all the failures
-				// that
-				// may occur in the 3rd party library.
-				return new Image(Display.getDefault(), 8, 8);
-			}
-		}
-	}
-
-	/**
-	 * getDocument
-	 * Accessor for retrieving the SVG document for this Image
-	 * 
-	 * @return SVG Document that represents the image
-	 */
-	public Document getDocument() {
-
-		Document document = null;
-		
-		// IF the document has already been created...
-		if (getKey().getExtraData() != null) {
-			// Return it
-			return (Document)getKey().getExtraData();
-		}
-
-		// Otherwise Parse the buffer can create the document
-		String parser = XMLResourceDescriptor.getXMLParserClassName();
-		SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
-		InputStream in = new ByteArrayInputStream(getBuffer());
-
-		try {
-			document =
-				f.createDocument(getKey().getURLString(), in);
-
-		} catch (IOException e) {
-			// Log the exception to the Error Log
-			Log.error(
-				Draw2dRenderPlugin.getInstance(),
-				Draw2dRenderStatusCodes.SVG_GENERATION_FAILURE,
-				e.getMessage());
-		}
-
-		return document;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(BufferedImage.class)) {
-			BufferedImage buffImg = null;
-			
-			// otherwise render the image.
-			try {
-				SVGImageConverter converter = new SVGImageConverter();
-				buffImg = converter.renderSVGToAWTImage(getDocument(), getRenderInfo());
-			} catch (Exception e) {
-				Trace.catching(Draw2dRenderPlugin.getInstance(), Draw2dRenderDebugOptions.EXCEPTIONS_THROWING, getClass(), "getSWTImage()", //$NON-NLS-1$
-				e);
-
-				// handle failure gracefully - we can't predict all the failures
-				// that
-				// may occur in the 3rd party library.
-				buffImg = new BufferedImage(8, 8, BufferedImage.TYPE_INT_ARGB);
-			}
-
-			return buffImg;
-		}
-		
-		return super.getAdapter(adapter);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.render.RenderedImage#getBufferedImage()
-	 */
-	public BufferedImage getBufferedImage() {
-		return (BufferedImage)getAdapter(BufferedImage.class);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageConverter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageConverter.java
deleted file mode 100644
index 9a3ca4d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageConverter.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg;
-
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.batik.transcoder.Transcoder;
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.ImageTranscoder;
-import org.apache.fop.svg.PDFTranscoder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderInfo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.w3c.dom.Document;
-
-
-/**
- * @author sshaw
- *
- * Class for conversion of SVG to different Image formats
- */
-public class SVGImageConverter {
-	/**
-	 * Consructor to create a new instance of SVGtoBufferedImageConverter
-	 */
-	public SVGImageConverter() {
-		// empty constructor
-	}
-
-	/**
-	 * renderSVGToAWTImage
-	 * Given a filename, will render the SVG file into an SWT Image
-	 * 
-	 * @param document Document of svg file
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return BufferedImage AWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public BufferedImage renderSVGToAWTImage(Document document, RenderInfo info)
-		throws Exception {
-		ImageTranscoderEx transcoder = new ImageTranscoderEx();
-		setUpTranscoders(document, transcoder, info);
-		
-		return transcoder.getBufferedImage();
-	}
-	
-	/**
-	 * renderSVGtoSWTImage
-	 * Given an InputStream, will render the SVG file into an SWT Image
-	 * 
-	 * @param document Document of svg file
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return Image SWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public Image renderSVGtoSWTImage(Document document, RenderInfo info)
-		throws Exception {
-		SWTImageTranscoder transcoder = new SWTImageTranscoder();
-		try {			
-			setUpTranscoders(document, transcoder, info);
-			return transcoder.getSWTImage();
-		} catch (Exception e) {
-			Image image = transcoder.getSWTImage();
-			if (image != null && !image.isDisposed()) {
-				image.dispose();
-			}
-			throw e;
-		}
-	}
-	
-	/**
-	 * renderSVGToAWTImage
-	 * Given a filename, will render the SVG file into an SWT Image
-	 * 
-	 * @param strFileName String file path of svg file
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return BufferedImage AWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public BufferedImage renderSVGToAWTImage(String strFileName, RenderInfo info)
-		throws Exception {
-		InputStream in = new FileInputStream(strFileName);
-		return renderSVGToAWTImage(in, info);
-	}
-
-	/**
-	 * renderSVGToAWTImage
-	 * Given a buffer, will render the SVG file into an SWT Image
-	 * 
-	 * @param buffer byte[] array containing an cached SVG image file.
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return BufferedImage AWT iimage containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public BufferedImage renderSVGToAWTImage(byte[] buffer, RenderInfo info)
-		throws Exception {
-		InputStream in = new ByteArrayInputStream(buffer);
-		return renderSVGToAWTImage(in, info);
-	}
-	
-	/**
-	 * setUpTranscoders
-	 * sets up the transcoders with the hints based on the RenderInfo structure.
-	 * 
-	 * @param in
-	 * @param transcoder
-	 * @param info
-	 */
-	private void setUpTranscoders(InputStream in, Transcoder transcoder, RenderInfo info)
-		throws Exception {
-		initializeTranscoderFromInfo(transcoder, info);
-		
-		TranscoderInput input = null;
-		TranscoderOutput output = null;
-
-		input = new TranscoderInput(in);
-		output = new ImageTranscoderOutput(); 
-		transcoder.transcode(input, output);
-	}
-	
-	/**
-	 * setUpTranscoders
-	 * sets up the transcoders with the hints based on the RenderInfo structure.
-	 * 
-	 * @param document
-	 * @param transcoder
-	 * @param info
-	 */
-	private void setUpTranscoders(Document document, Transcoder transcoder, RenderInfo info)
-		throws Exception {
-		initializeTranscoderFromInfo(transcoder, info);
-		
-		TranscoderInput input = null;
-		TranscoderOutput output = null;
-
-		input = new TranscoderInput(document);
-		output = new ImageTranscoderOutput(); 
-		transcoder.transcode(input, output);
-	}
-
-	private void initializeTranscoderFromInfo(Transcoder transcoder, RenderInfo info) {
-		if (info.getWidth() > 0)
-			transcoder.addTranscodingHint(
-				ImageTranscoder.KEY_WIDTH,
-				new Float(info.getWidth()));
-		if (info.getHeight() > 0)
-			transcoder.addTranscodingHint(
-				ImageTranscoder.KEY_HEIGHT,
-				new Float(info.getHeight()));
-		
-		transcoder.addTranscodingHint(
-			ImageTranscoderEx.KEY_MAINTAIN_ASPECT_RATIO,
-				Boolean.valueOf(info.shouldMaintainAspectRatio()));
-	
-		transcoder.addTranscodingHint(
-			ImageTranscoderEx.KEY_ANTI_ALIASING,
-				Boolean.valueOf(info.shouldAntiAlias()));
-				
-		if (info.getBackgroundColor() != null) {
-			transcoder.addTranscodingHint(
-				ImageTranscoderEx.KEY_FILL_COLOR,
-				new Color(info.getBackgroundColor().red, 
-						  info.getBackgroundColor().green,
-						  info.getBackgroundColor().blue));
-		}
-		
-		if (info.getForegroundColor() != null) {
-					transcoder.addTranscodingHint(
-						ImageTranscoderEx.KEY_OUTLINE_COLOR,
-						new Color(info.getForegroundColor().red, 
-								  info.getForegroundColor().green,
-								  info.getForegroundColor().blue));
-		}
-
-	}
-	
-	/**
-	 * renderSVG
-	 * Given an InputStream, will render the SVG file into an SWT Image
-	 * 
-	 * @param in InputSteam which contains the SVG file data
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return BufferedImage AWT iimage containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public BufferedImage renderSVGToAWTImage(InputStream in, RenderInfo info)
-		throws Exception {
-		ImageTranscoderEx transcoder = new ImageTranscoderEx();
-		setUpTranscoders(in, transcoder, info);
-
-		return transcoder.getBufferedImage();
-	}
-	
-	/**
-	 * renderSVGtoSWTImage
-	 * Given a filename, will render the SVG file into an SWT Image
-	 * 
-	 * @param strFileName String file path of svg file
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return Image SWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public Image renderSVGtoSWTImage(String strFileName, RenderInfo info)
-		throws Exception {
-		InputStream in = new FileInputStream(strFileName);
-		return renderSVGtoSWTImage(in, info);
-	}
-
-	/**
-	 * renderSVGtoSWTImage
-	 * Given a buffer, will render the SVG file into an SWT Image
-	 * 
-	 * @param buffer byte[] array containing an cached SVG image file.
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return Image SWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public Image renderSVGtoSWTImage(byte[] buffer, RenderInfo info)
-		throws Exception {
-		InputStream in = new ByteArrayInputStream(buffer);
-		return renderSVGtoSWTImage(in, info);
-	}
-
-	/**
-	 * renderSVGtoSWTImage
-	 * Given an InputStream, will render the SVG file into an SWT Image
-	 * 
-	 * @param in InputSteam which contains the SVG file data
-	 * @param RenderInfo object containing information about the size and 
-	 * general data regarding how the image will be rendered.
-	 * @return Image SWT image containing the rendered SVG file.
-	 * @throws Exception
-	 */
-	public Image renderSVGtoSWTImage(InputStream in, RenderInfo info)
-		throws Exception {
-		
-		SWTImageTranscoder transcoder = new SWTImageTranscoder();
-		setUpTranscoders(in, transcoder, info);
-		
-		return transcoder.getSWTImage();
-	}
-	
-	 /**
-	 * Export SVG image to PDF file format.
-	 * 
-	 * @param SVGImage The input SVG image.
-	 * @param fileOutputStream The output stream to write the PDF to.
-	 * @throws CoreException
-	 */
-    public static void exportToPDF(SVGImage svgImage,
-			OutputStream fileOutputStream)
-			throws CoreException {
-    	
-		try {
-			TranscoderOutput transcoderOutput = new TranscoderOutput(fileOutputStream);
-			TranscoderInput transcoderInput = new TranscoderInput(svgImage
-					.getDocument());
-
-			PDFTranscoder pdfTranscoder = new PDFTranscoder();
-			pdfTranscoder.transcode(transcoderInput, transcoderOutput);
-
-		} catch (TranscoderException e) {
-			Log.error(Draw2dRenderPlugin.getInstance(), IStatus.ERROR, e
-					.getMessage(), e);
-			IStatus status = new Status(IStatus.ERROR,
-					"exportToPDF", IStatus.OK, //$NON-NLS-1$
-					e.getMessage(), null);
-			throw new CoreException(status);
-		} 
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageType.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageType.java
deleted file mode 100644
index 09a94e5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SVGImageType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.util.XMLResourceDescriptor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.WMFTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageType;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory.RenderedImageKey;
-
-
-public class SVGImageType
-	implements RenderedImageType {
-
-	public RenderedImage autoDetect(byte[] buffer, RenderedImageKey key) {
-		RenderedImage image = null;
-
-		if (isSVG(buffer))
-			image = new SVGImage(buffer, key);
-		else {
-			// not a recognizable image format so assume it's an EMF file
-			try {
-				WMFTranscoder imageTransformer = new WMFTranscoder();
-				ByteArrayInputStream input = new ByteArrayInputStream(buffer);
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				imageTransformer.transcode(input, output, key.getURLString());
-				image = new SVGImage(output.toByteArray(), key);
-			} catch (Exception e2) {
-				try {
-					EMFTranscoder imageTransformer = new EMFTranscoder();
-					ByteArrayInputStream input = new ByteArrayInputStream(
-						buffer);
-					ByteArrayOutputStream output = new ByteArrayOutputStream();
-					imageTransformer.transcode(input, output, key.getURLString());
-					image = new SVGImage(output.toByteArray(), key);
-				} catch (Exception e3) {
-					return null;
-				}
-			}
-		}
-		
-		return image;
-	}
-	
-	private static boolean isSVG(byte[] buffer) {
-		ByteArrayInputStream bIS = new ByteArrayInputStream(buffer);
-		String parserName = XMLResourceDescriptor.getXMLParserClassName();
-		SAXSVGDocumentFactory svgFactory = new SAXSVGDocumentFactory(parserName);
-		
-		try {
-			svgFactory.createDocument(null,bIS);
-		} catch (Exception e) {
-			return false;
-		}
-        
-		return true;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SWTImageTranscoder.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SWTImageTranscoder.java
deleted file mode 100644
index 9ce4587..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/SWTImageTranscoder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg;
-
-import java.awt.Graphics2D;
-
-import org.apache.batik.ext.awt.RenderingHintsKeyExt;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.Graphics2DToGraphicsAdaptor;
-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.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-
-/**
- * Image transcoder that will allow direct rendering to an swt <code>GC</code> object through
- * a delegating class.
- * 
- * @see Graphics2DToGraphicsAdaptor
- * 
- * @author sshaw
- *
- */
-public class SWTImageTranscoder
-	extends ImageTranscoderEx {
-
-	private Image swtImage = null;
-	
-	public SWTImageTranscoder() {
-		super();
-	}
-
-	/**
-	 * @return Returns the swtImage.
-	 */
-	public Image getSWTImage() {
-		return swtImage;
-	}
-
-	private static final RGB TRANSPARENT_COLOR = new RGB(254, 255, 254);
-	private static final RGB REPLACE_TRANSPARENT_COLOR = new RGB(255, 255, 255);
-	
-	private GC swtGC = null;
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.ImageTranscoderEx#createGraphics(int, int)
-	 */
-	protected Graphics2D createGraphics(int w, int h) {
-		Display display = DisplayUtils.getDisplay();
-
-		ImageData imgData = new ImageData(w, h, 24, new PaletteData(0xFF0000, 0xFF00, 0xFF));
-		imgData.transparentPixel = FigureUtilities.RGBToInteger(TRANSPARENT_COLOR).intValue();
-		
-		swtImage = new Image(display, imgData);
-		swtGC = new GC(swtImage);
-		
-		Color transparentColor = new Color(null, TRANSPARENT_COLOR);
-		swtGC.setBackground(transparentColor);
-		swtGC.fillRectangle(0, 0, w, h);
-		transparentColor.dispose();
-		
-        Graphics2D g2d = new Graphics2DToGraphicsAdaptor(swtGC, TRANSPARENT_COLOR, REPLACE_TRANSPARENT_COLOR);
-        // needed to avoid eroneous error being dumped to console
-        g2d.setRenderingHint(RenderingHintsKeyExt.KEY_TRANSCODING,
-            RenderingHintsKeyExt.VALUE_TRANSCODING_PRINTING);
-        
-        return g2d;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.ImageTranscoderEx#postRenderImage(java.awt.Graphics2D)
-	 */
-	protected void postRenderImage(Graphics2D g2d) {
-		super.postRenderImage(g2d);
-		
-		swtGC.dispose();
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/GraphicsSVG.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/GraphicsSVG.java
deleted file mode 100644
index bb3c728..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/GraphicsSVG.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg.export;
-
-import java.awt.Color;
-import java.awt.Dimension;
-
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.util.DOMUtilities;
-import org.apache.batik.svggen.DOMTreeManager;
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.util.SVGConstants;
-import org.eclipse.draw2d.geometry.Point;
-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.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGColorConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.DrawableRenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * Objects of this class can be used with draw2d to create an SVG DOM.
- * 
- * @author jschofie / sshaw
- */
-public class GraphicsSVG extends GraphicsToGraphics2DAdaptor implements DrawableRenderedImage {
-
-	private Document doc;
-
-	/**
-	 * Static initializer that will return an instance of <code>GraphicsSVG</code>
-	 * 
-	 * @param viewPort the <code>Rectangle</code> area that is to be rendered.
-	 * @return a new <code>GraphicsSVG</code> object.
-	 */
-	public static GraphicsSVG getInstance(Rectangle viewPort) {
-		SVGGraphics2D svgGraphics;
-		
-		// Get the DOM implementation and create the document
-		DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
-		String svgNameSpace = SVGDOMImplementation.SVG_NAMESPACE_URI;
-		Document doc = impl.createDocument(svgNameSpace, "svg", null); //$NON-NLS-1$
-
-		// Create the SVG Graphics Object
-		svgGraphics = new SVGGraphics2D(doc);
-
-		// Set the precision level to avoid NPEs (issue with Batik 1.5)
-		svgGraphics.getGeneratorContext().setPrecision( 3 );
-
-		// Set the Width and Height Attributes on the Root Element
-		svgGraphics.setSVGCanvasSize(
-			new Dimension(viewPort.width, viewPort.height));
-		
-		return new GraphicsSVG(svgGraphics, doc, svgNameSpace, viewPort);
-	}
-	
-	/**
-	 * @return <code>SVGGraphics2D</code> object
-	 */
-	public SVGGraphics2D getSVGGraphics2D() {
-		return (SVGGraphics2D)getGraphics2D();
-	}
-	
-	/**
-	 * @param graphics
-	 * @param doc
-	 * @param svgNameSpace
-	 * @param viewPort
-	 */
-	private GraphicsSVG( SVGGraphics2D graphics, Document doc, String svgNameSpace, Rectangle viewPort ) {
-		
-		this( graphics, doc, svgNameSpace, new org.eclipse.swt.graphics.Rectangle( viewPort.x,
-						viewPort.y,
-						viewPort.width,
-						viewPort.height) );
-	}
-
-	/**
-	 * @param graphics
-	 * @param doc
-	 * @param svgNameSpace
-	 * @param viewPort
-	 */
-	private GraphicsSVG(SVGGraphics2D graphics, Document doc, String svgNameSpace, org.eclipse.swt.graphics.Rectangle viewPort) {
-
-		super(graphics, viewPort );
-		this.doc = doc;
-		paintNotCompatibleStringsAsBitmaps = false;
-	}
-
-	/**
-	 * Method used to get the SVG DOM from the Graphics
-	 * 
-	 * @return SVG document
-	 */
-	public Document getDocument() {
-		return doc;
-	}
-
-	/**
-	 * Method used to get the SVG Root element from the document
-	 * 
-	 * @return DOM Root element
-	 */
-	public Element getRoot() {
-		return getSVGGraphics2D().getRoot();		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.graphics.GraphicsToGraphics2DAdaptor#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) {
-
-		// Check for a change in the state
-		checkState();
-
-	    // Get the Tree Manager
-	    DOMTreeManager treeManager = getSVGGraphics2D().getDOMTreeManager();
-
-	    Point trans = getTranslationOffset();
-	    // Get the Root element of the SVG document to export
-	    if (srcImage instanceof SVGImage) {
-	    	Document document = ((SVGImage)srcImage).getDocument();
-            
-          DOMImplementation impl = SVGDOMImplementation.getDOMImplementation();
-          document = DOMUtilities.deepCloneDocument(document, impl);
-            
-	    	if (document instanceof SVGOMDocument) {
-	    		RenderInfo info = srcImage.getRenderInfo();
-				if (info != null && info.getBackgroundColor() != null
-						&& info.getForegroundColor() != null) {
-					SVGColorConverter.getInstance().replaceDocumentColors(
-							(SVGOMDocument) document,
-							new Color(info.getBackgroundColor().red, info
-									.getBackgroundColor().green, info
-									.getBackgroundColor().blue),
-							new Color(info.getForegroundColor().red, info
-									.getForegroundColor().green, info
-									.getForegroundColor().blue));
-
-				}
-			}
-			Element root = document.getDocumentElement();
-
-			// Create a "deep" copy of the document
-			Element toAppend = (Element)doc.importNode(root, true);
-
-			// Modify the X Attribute
-			toAppend.setAttributeNS(
-					null,
-					SVGConstants.SVG_X_ATTRIBUTE,
-					String.valueOf(rect.x + trans.x));
-
-			// Modify the Y Attribute
-			toAppend.setAttributeNS(
-					null,
-					SVGConstants.SVG_Y_ATTRIBUTE,
-					String.valueOf(rect.y + trans.y));
-
-			// Modify the Width Attribute
-			toAppend.setAttributeNS(
-					null,
-					SVGConstants.SVG_WIDTH_ATTRIBUTE,
-					String.valueOf(rect.width));
-
-			// Modify the Height Attribute
-			toAppend.setAttributeNS(
-					null,
-					SVGConstants.SVG_HEIGHT_ATTRIBUTE,
-					String.valueOf(rect.height));
-
-			treeManager.appendGroup(toAppend, null);
-			return srcImage;
-	    }
-	    else {
-	    	return super.drawRenderedImage(srcImage, rect, listener);
-		}
-	}
-	
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/package.html
deleted file mode 100644
index e3c76c5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/export/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.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbortPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbortPath.java
deleted file mode 100644
index 6652be6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbortPath.java
+++ /dev/null
@@ -1,36 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class AbortPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().abort();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPoly.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPoly.java
deleted file mode 100644
index 997e9c8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPoly.java
+++ /dev/null
@@ -1,124 +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.awt.internal.svg.metafile;
-
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-abstract class AbstractPoly implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath, ITraceMe
-{
-	private static final int	EMF_POINT_COUNT_OFFSET	= 16;
-	private static final int	EMF_POINT_ARRAY_START	= 20;
-	
-	private static final int	WMF_POINT_COUNT_OFFSET	= 0;
-	private static final int	WMF_POINT_ARRAY_START	= 2;
-
-	private int					m_count = 0;
-	private int[]				m_xPoints = null;
-	private int[]				m_yPoints = null;
-	private boolean				m_b16Bits = true;
-
-	protected int[]				m_xPointsConv = null;
-	protected int[]				m_yPointsConv = null;
-
-	public AbstractPoly( boolean b16Bits )
-	{
-		m_b16Bits = b16Bits;
-	}
-	
-	public void readWMFRecord( Record emr ) throws IOException
-	{
-		m_count = emr.getShortAt( WMF_POINT_COUNT_OFFSET );
-		readPoly( emr, WMF_POINT_ARRAY_START );
-	}
-
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_count = emr.getIntAt( EMF_POINT_COUNT_OFFSET );
-		readPoly( emr, EMF_POINT_ARRAY_START );
-	}
-	
-	protected int getCount()
-	{
-		return m_count;
-	}
-	
-	protected int[] getXPoints()
-	{
-		return m_xPoints;
-	}
-	
-	protected int[] getYPoints()
-	{
-		return m_yPoints;
-	}
-
-	private boolean readPoly( Record emr, int pointOffset ) throws IOException
-	{
-		/*
-		 * RECTL  rclBounds;	// Polygon boundary, in device units.
-		 * DWORD  cptl; 		// number of points
-		 * POINTL aptl[1]; 		// array of cptl points (each a pair of integers)
-		 */
-		
-		m_xPoints = new int[ m_count ];
-		m_yPoints = new int[ m_count ];
-		
-		int curPos = pointOffset;
-		
-		for( int i = 0; i < m_count; i++ )
-		{
-			// Read the points
-			if( m_b16Bits )
-			{
-				m_xPoints[ i ] = emr.getShortAt( curPos );
-				m_yPoints[ i ] = emr.getShortAt( curPos + 2 );
-				curPos += 4;
-			}
-			else
-			{	
-				m_xPoints[ i ] = emr.getIntAt( curPos );
-				m_yPoints[ i ] = emr.getIntAt( curPos + 4  );
-				curPos += 8;
-			}
-		}
-		 
-		return true; 
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("cnt=" + m_count); //$NON-NLS-1$
-		dumpPoints(sb, ", Converted:", m_xPointsConv, m_yPointsConv); //$NON-NLS-1$
-		dumpPoints(sb, ", Original:", m_xPoints, m_yPoints); //$NON-NLS-1$
-		return sb.toString();
-	}
-
-	private void dumpPoints(StringBuffer sb, String what, int[] x, int[] y) {
-		sb.append(what);
-		if (x == null || y == null) {
-			sb.append(" (null)"); //$NON-NLS-1$
-		} else {
-			for (int ix = 0; ix < m_count; ++ix) {
-				sb.append(" (" + x[ix] + ',' + y[ix] + ')'); //$NON-NLS-1$
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPolyPoly.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPolyPoly.java
deleted file mode 100644
index ec84de6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractPolyPoly.java
+++ /dev/null
@@ -1,168 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-
-abstract class AbstractPolyPoly implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	private static final int	EMF_N_POLYS_OFFSET		= 16;
-	private static final int	EMF_COUNT_POINTS_OFFSET	= 20;
-	private static final int	EMF_COUNTS_OFFSET		= 24;
-
-	private static final int	WMF_N_POLYS_OFFSET		= 0;
-	private static final int	WMF_COUNTS_OFFSET		= 2;
-
-	/** number of separate polys */
-	private int		m_nPolys		= 0;
-	/** total number of points in the array */
-	private int		m_nPoints		= 0;
-	/** array containing the number of points in each specific poly */
-	private int[]	m_nPointsInPoly	= null; 
-	/** array integers representing the x position of all points on all polys */
-	private int[]	m_xPointList		= null;
-	/** array integers representing the y position of all points on all polys */
-	private int[]	m_yPointList		= null;
-	/** Indicates whether or not the point array is stored as 16 or 32 bit integers. */
-	private boolean m_b16Bit			= true;
-	
-	public AbstractPolyPoly( boolean b16Bit )
-	{
-		m_b16Bit = b16Bit;
-	}
-
-	public void readWMFRecord( Record emr ) throws IOException
-	{
-		m_nPolys = emr.getShortAt( WMF_N_POLYS_OFFSET );
-		m_nPointsInPoly = new int[ m_nPolys ];
-		m_nPoints = 0;
-		
-		
-		// Read the size of each polygon.
-		for( int i = 0; i < m_nPolys; i++ )
-		{
-			m_nPointsInPoly[ i ] = emr.getShortAt( WMF_COUNTS_OFFSET + ( i * 2 ) );
-			m_nPoints += m_nPointsInPoly[ i ];
-		}
-
-		m_xPointList 	= new int[ m_nPoints ];
-		m_yPointList 	= new int[ m_nPoints ];
-
-		int curOffset = WMF_COUNTS_OFFSET + (m_nPolys * 2);
-		
-		for( int i = 0; i < m_nPoints; i++ )
-		{
-			// Short based points.
-			m_xPointList[ i ] = emr.getShortAt( curOffset );
-			m_yPointList[ i ] = emr.getShortAt( curOffset + 2 );
-			curOffset += 4;
-		}
-	}
-
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_nPolys = emr.getIntAt( EMF_N_POLYS_OFFSET );
-		m_nPoints = emr.getIntAt( EMF_COUNT_POINTS_OFFSET );
-		
-		m_nPointsInPoly	= new int[ m_nPolys ];
-		m_xPointList 	= new int[ m_nPoints ];
-		m_yPointList 	= new int[ m_nPoints ];
-		
-		// Read the size of each polygon.
-		for( int i = 0; i < m_nPolys; i++ )
-		{
-			m_nPointsInPoly[ i ] = emr.getIntAt( EMF_COUNTS_OFFSET + ( i * 4 ) );	
-		}
-		
-		int curOffset = EMF_COUNTS_OFFSET + (m_nPolys * 4);
-		
-		for( int i = 0; i < m_nPoints; i++ )
-		{
-			if( m_b16Bit )
-			{
-				// Short based points.
-				m_xPointList[ i ] = emr.getShortAt( curOffset );
-				m_yPointList[ i ] = emr.getShortAt( curOffset + 2 );
-				curOffset += 4;
-			}
-			else
-			{
-				// Int based points.
-				m_xPointList[ i ] = emr.getIntAt( curOffset );
-				m_yPointList[ i ] = emr.getIntAt( curOffset + 4 );
-				curOffset += 8;
-			}
-		}
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		int curOffset = 0;
-		
-		for( int i = 0; i < m_nPolys; i++ )
-		{
-			int 	numPoints 	= m_nPointsInPoly[ i ];
-			int[] 	xPoints 	= new int[ numPoints ];			
-			int[] 	yPoints 	= new int[ numPoints ];
-			
-			for( int j = 0; j < numPoints; j++ )
-			{
-				xPoints[ j ] = context.convertXToSVGLogicalUnits( m_xPointList[ curOffset ] );
-				yPoints[ j ] = context.convertYToSVGLogicalUnits( m_yPointList[ curOffset ] );
-				curOffset++;
-			}
-			
-			renderPoly( g, context, xPoints, yPoints, numPoints );
-		}
-	}
-	
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		int curOffset = 0;
-
-		GeneralPath p = new GeneralPath();
-		
-		for( int i = 0; i < m_nPolys; i++ )
-		{
-			int 	numPoints 	= m_nPointsInPoly[ i ];
-			int[] 	xPoints 	= new int[ numPoints ];			
-			int[] 	yPoints 	= new int[ numPoints ];
-			
-			for( int j = 0; j < numPoints; j++ )
-			{
-				xPoints[ j ] = context.convertXToSVGLogicalUnits( m_xPointList[ curOffset ] );
-				yPoints[ j ] = context.convertYToSVGLogicalUnits( m_yPointList[ curOffset ] );
-				curOffset++;
-			}
-			
-			renderPoly( p, xPoints, yPoints, numPoints );
-		}
-		
-		context.getGdiPath().appendFigure( p );
-	}
-
-	protected abstract boolean renderPoly( Graphics2D g, DeviceContext context, int[] xPoints, int[] yPoints, int nPoints );
-	protected abstract boolean renderPoly( GeneralPath path, int[] xPoints, int[] yPoints, int nPoints );
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractSetExtentViewport.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractSetExtentViewport.java
deleted file mode 100644
index d55cfdd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractSetExtentViewport.java
+++ /dev/null
@@ -1,56 +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.awt.internal.svg.metafile;
-
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-abstract class AbstractSetExtentViewport implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private static final int EMF_X_OFFSET	= 0;
-	private static final int EMF_Y_OFFSET	= 4;
-	
-	private static final int WMF_X_OFFSET	= 2;
-	private static final int WMF_Y_OFFSET	= 0;
-
-	private int m_xExt = 0;
-	private int m_yExt = 0;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_xExt = rec.getShortAt( WMF_X_OFFSET );		
-		m_yExt = rec.getShortAt( WMF_Y_OFFSET );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_xExt = rec.getIntAt( EMF_X_OFFSET );		
-		m_yExt = rec.getIntAt( EMF_Y_OFFSET );		
-	}
-	
-	protected int getX()
-	{
-		return m_xExt;
-	}
-	
-	protected int getY()
-	{
-		return m_yExt;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractTranscoder.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractTranscoder.java
deleted file mode 100644
index 1d4413a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AbstractTranscoder.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.awt.internal.svg.metafile;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.Draw2dRenderPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderableObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.TranscoderException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.svg.SVGDocument;
-
-
-/**
- * Abstract base class for both the WMFTranscoder and the EMFTranscoder.  Implements the common
- * functionality.  May be extended to provide a new type of transcoder.
- * 
- * @author dhabib
- */
-public abstract class AbstractTranscoder 
-{
-	private static boolean 	m_gDebugMode						= false;
-	private Dimension 		m_size								= new Dimension( 100, 100 );
-
-	/**
-	 * Puts the transcoder in 'debug' mode so messages are written out using System.out
-	 * instead of using the Trace/Debug stuff.  This is so we can operate without
-	 * eclipse.
-	 */
-	static void setDebugMode()
-	{
-		m_gDebugMode = true;
-	}
-	
-	/**
-	 * Logs the specified message.  If we are in 'debug' mode it will log the message to
-	 * the output console.  If we are running as a plugin, it will log the
-	 * message using the core 
-	 * @param message
-	 */
-	static void logMessage( String message )
-	{
-		if( m_gDebugMode )
-		{	
-			System.out.println( message );
-		}
-		else
-		{	
-			// We may not handle all types of selections.
-			Trace.trace(	Draw2dRenderPlugin.getInstance(), 
-							Draw2dRenderDebugOptions.DEBUG, 
-							message );
-		}
-	}
-	
-	/**
-	 * Sets the size, in pixels, of the metafile output.  In the case of the WMF/APM and the EMF
-	 * transcoder, this information is contained in the header record, so after initializing that
-	 * record they will call this method.
-	 * @param size
-	 */
-	public void setSize( Dimension size )
-	{
-		m_size = size;
-	}
-	
-	/**
-	 * Retrieves the current size, in pixels, of the metafile output.
-	 * @return
-	 */
-	public Dimension getSize()
-	{
-		return new Dimension( m_size );
-	}
-
-	/**
-	 * Translate an input stream containing a metafile to an output stream containing SVG.
-	 * @param input - Contains Metafile Data
-	 * @param output - After successful transcoding, contains generated SVG output.
-	 * @throws TranscoderException
-	 */
-	public void transcode( InputStream input, OutputStream output) throws TranscoderException
-	{
-		transcode(input, output, SVGDOMImplementation.SVG_NAMESPACE_URI);
-	}
-	
-	/**
-	 * Translate an input stream containing a metafile to an output stream containing SVG.
-	 * @param input - Contains Metafile Data
-	 * @param output - After successful transcoding, contains generated SVG output.
-	 * @param url - document namespace url
-	 * @throws TranscoderException
-	 */
-	public void transcode( InputStream input, OutputStream output, String url ) throws TranscoderException
-	{
-		if( input == null )
-		{
-			throw new IllegalArgumentException( "Parameter 'input' may not be null" );	//$NON-NLS-1$
-		}
-		else if( output == null )
-		{
-			throw new IllegalArgumentException( "Parameter 'output' may not be null" );	//$NON-NLS-1$
-		}
-
-		try
-		{
-			BufferedInputStream stream = new BufferedInputStream( input );
-			
-			// Create the DOM
-			DOMImplementation	impl 	= SVGDOMImplementation.getDOMImplementation();
-			String 				svgNS 	= url;
-			SVGDocument 		doc 	= (SVGDocument)impl.createDocument( svgNS, "svg", null );	//$NON-NLS-1$
-
-			// Create the SVG converter.
-			SVGGraphics2D svg = new SVGGraphics2D( doc );
-			
-			// There seems to be a bug in the batik libraries.  It appears that
-			// there are some variables that are not set properly at initialization
-			// time.  This sets the variable so it works.
-			svg.getGeneratorContext().setPrecision( 3 );
-
-			// Iterate over the input stream and paint into the svg graphics object.
-			iterateRecords( stream, svg );
-	
-			// Get the size from the header.
-			svg.setSVGCanvasSize( m_size );
-	
-			Writer writer = new OutputStreamWriter( output, "UTF-8" );//$NON-NLS-1$
-			svg.stream( writer );
-		}
-		catch( IOException e )
-		{
-				throw new TranscoderException( e );
-		}
-	}
-	
-	/**
-	 * Parses the metafile records in the stream , rendering them into
-	 * the provided Graphics object.
-	 * @param stream
-	 * @param g
-	 * @throws TranscoderException
-	 */
-	private void iterateRecords(	BufferedInputStream stream, 
-									Graphics2D g ) throws TranscoderException, IOException
-	{
-		DeviceContext context = new DeviceContext();
-
-		int 	index = 0;
-		Record 	rec;
-		
-		while( (rec = getNextRecord( stream, index )) != null )
-		{
-			index++;
-			
-			try
-			{
-				String output = null;
-				IRenderableObject svgConverter = getConverter( rec );
-				
-				if( svgConverter != null )
-				{
-					if( context.getGdiPath().isOpen() &&
-						svgConverter instanceof IRenderToPath )
-					{
-						// Rendering to a path and this converter handles paths.
-						IRenderToPath pathRender = (IRenderToPath) svgConverter;
-						pathRender.render( context );
-						if (m_gDebugMode) {
-							output = buildOutput(rec, "IRenderToPath", index); //$NON-NLS-1$
-						}
-					}
-					else
-					{
-						svgConverter.render( g, context );
-						if (m_gDebugMode) {
-							output = buildOutput(rec, "IRenderableObject", index); //$NON-NLS-1$
-						}
-					}
-					if (m_gDebugMode && svgConverter instanceof ITraceMe) {
-						output += ' ' + svgConverter.toString();
-					}
-				}
-				else
-				{
-					// Unconditionally trace this
-					output = buildOutput(rec, "Unhandled", index); //$NON-NLS-1$
-				}
- 				logMessage( output );
- 			}
-			catch (org.apache.batik.transcoder.TranscoderException e)
-			{
-				throw new TranscoderException(e);
-			}
-			catch (TranscoderException e)
-			{
-				throw e;
-			}
- 			catch( Exception e )
- 			{
- 				String output = buildOutput(
-					rec,
-					"Exception while processing",//$NON-NLS-1$
-					index) + ":\n" + e.toString(); //$NON-NLS-1$
-				logMessage( output );
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private String _thisClassName = null;
-	private String buildOutput(Record rec, String msg, int ix) {
-		if (_thisClassName == null) {
-			_thisClassName = getClass().getName();
-			_thisClassName = _thisClassName.substring(_thisClassName.lastIndexOf('.') + 1);
-		}
-		StringBuffer sb = new StringBuffer();
-		sb.append(_thisClassName);
-		sb.append(", record " + ix + ' ');//$NON-NLS-1$
-		sb.append(msg + "  metafile record type "); //$NON-NLS-1$
-		sb.append(rec.getType() + " = "+ getUserFriendlyName( rec.getType() ));//$NON-NLS-1$
-
-		return sb.toString();
-	}
-
-	/**
-	 * Reads the next metafile record from the provided stream.  Returns 'null' 
-	 * if at the end of the set of records.
-	 * @param stream Contains the data to read the record from.
-	 * @param curRecord Contains the current record number.
-	 * @return Next metafile record in the stream, or null if the last record has been read.
-	 * @throws IOException
-	 */
-	protected abstract Record getNextRecord(	BufferedInputStream stream,
-												int curRecord ) throws IOException;
-
-	/**
-	 * This method takes a metafile record and instantiates a class 
-	 * implementing IRenderableObject to handle that type of record.
-	 * This method will initialize the newly created converter
-	 * with the data contained in the record.
-	 * @param stream
-	 * @return A handler for the specified record, or null if no handler exists.
-	 * @throws TranscoderException
-	 */
-	protected abstract IRenderableObject getConverter( Record rec ) throws TranscoderException;
-	
-
-	/**
-	 * Returns the user friendly name for the specified record type.
-	 * @param recordType
-	 * @return The user friendly name for the specified record type.
-	 */
-	protected abstract String getUserFriendlyName( int recordType );
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AngleArc.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AngleArc.java
deleted file mode 100644
index c96697c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/AngleArc.java
+++ /dev/null
@@ -1,107 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.Arc2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- * 
- */
-public class AngleArc implements IEmf2SvgConverter, IRenderToPath
-{
-	private static final int	CENTER_OFFSET		= 0;
-	private static final int	RADIUS_OFFSET		= 8;
-	private static final int	START_ANGLE_OFFSET	= 12;
-	private static final int	END_ANGLE_OFFSET	= 16;
-
-	private Point	m_center		= new Point( 0, 0 );
-	private int		m_radius		= 0;
-	private float	m_startAngle	= 0.0f;
-	private float	m_sweepAngle	= 0.0f;
-	
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_center 		= emr.getPointLAt( CENTER_OFFSET );
-		m_radius 		= emr.getIntAt( RADIUS_OFFSET );
-		m_startAngle	= emr.getFloatAt( START_ANGLE_OFFSET );
-		m_sweepAngle	= emr.getFloatAt( END_ANGLE_OFFSET );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{	
-			curPen.apply( g, context );
-			Shape shape = getShape( context );
-
-			// Draw a line from the current position to the beginning of the arc.
-			Arc2D.Double arc = (Arc2D.Double) shape;
-			Point2D point = arc.getStartPoint();
-			
-			g.drawLine(	context.convertXToSVGLogicalUnits( context.getCurPosX() ), 
-						context.convertYToSVGLogicalUnits( context.getCurPosY() ), 
-						(int) point.getX(), 
-						(int) point.getY() );
-			g.draw( shape );
-
-			// Update the endpoint.
-			point = arc.getEndPoint();
-			context.setCurPosX( context.convertXToWindowsLogicalUnits( (int) point.getX() ) );
-			context.setCurPosY( context.convertYToWindowsLogicalUnits( (int) point.getY() ) );
-		}		
-	}
-	
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape shape = getShape( context );
-		GeneralPath p = context.getGdiPath().getCurrentFigure();
-		p.append( shape, true );
-
-		Arc2D.Double arc = (Arc2D.Double) shape;
-		Point2D point = arc.getEndPoint();
-		context.setCurPosX( context.convertXToWindowsLogicalUnits( (int) point.getX() ) );
-		context.setCurPosY( context.convertYToWindowsLogicalUnits( (int) point.getY() ) );
-	}
-
-	private Shape getShape( DeviceContext context )
-	{
-		int centerX = context.convertXToSVGLogicalUnits( m_center.x );
-		int centerY = context.convertYToSVGLogicalUnits( m_center.y );
-		int radius = context.scaleX( m_radius );
-
-		// find the 'bounding rectangle'.  Since this is a arc on a circle, the rectangle is actually
-		// a square, width and height are radius*2...
-		Rectangle 	rect = new Rectangle( centerX - radius, centerY - radius, radius * 2, radius * 2 );
-
-		Arc2D.Double arc = new Arc2D.Double();
-		arc.setArc( rect, m_startAngle, m_sweepAngle, Arc2D.OPEN );
-
-		return arc;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Arc.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Arc.java
deleted file mode 100644
index 95ad822..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Arc.java
+++ /dev/null
@@ -1,245 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.Arc2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- *
- */
-public class Arc implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	public static final int			ARC		= 1;
-	public static final int			ARCTO	= 2;
-	public static final int			PIE		= 3;
-	public static final int			CHORD	= 4;
-
-	private static final int	EMF_BOX_OFFSET		= 0;
-	private static final int	EMF_START_OFFSET	= 16;
-	private static final int	EMF_END_OFFSET		= 24;
-
-	private static final int	WMF_Y_END_OFFSET	= 0;
-	private static final int	WMF_X_END_OFFSET	= 2;
-	private static final int	WMF_Y_START_OFFSET	= 4;
-	private static final int	WMF_X_START_OFFSET	= 6;
-	private static final int	WMF_BOTTOM_OFFSET	= 8;
-	private static final int	WMF_RIGHT_OFFSET	= 10;
-	private static final int	WMF_TOP_OFFSET		= 12;
-	private static final int	WMF_LEFT_OFFSET		= 14;
-	
-	private int			m_type			= ARC;
-	
-	private Rectangle	m_box 			= new Rectangle();
-	private Point		m_start			= new Point( 0, 0 );
-	private Point		m_end 			= new Point( 0, 0 );
-	
-	
-	public Arc( int type )
-	{
-		m_type = type;
-	}
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int xStart 	= rec.getShortAt( WMF_X_START_OFFSET );
-		int yStart 	= rec.getShortAt( WMF_Y_START_OFFSET );
-		int xEnd	= rec.getShortAt( WMF_X_END_OFFSET );
-		int yEnd	= rec.getShortAt( WMF_Y_END_OFFSET );
-		
-		int xBound	= rec.getShortAt( WMF_LEFT_OFFSET );
-		int yBound	= rec.getShortAt( WMF_TOP_OFFSET );
-		int x1Bound	= rec.getShortAt( WMF_RIGHT_OFFSET );
-		int y1Bound	= rec.getShortAt( WMF_BOTTOM_OFFSET );
-		
-		m_box 	= new Rectangle( xBound, yBound, x1Bound - xBound, y1Bound - yBound );
-		m_start	= new Point( xStart, yStart );
-		m_end	= new Point( xEnd, yEnd );
-	}
-
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_box 	= emr.getRectangleLAt( EMF_BOX_OFFSET );
-		m_start	= emr.getPointLAt( EMF_START_OFFSET );
-		m_end	= emr.getPointLAt( EMF_END_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Shape shape = getShape( context );
-
-		if( m_type == PIE || m_type == CHORD )
-		{
-			GdiBrush brush = context.getCurBrush();
-			
-			if( brush != null )
-			{
-				brush.fill( shape, g, context );
-			}
-		}	
-
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{	
-			curPen.apply( g, context );
-
-			if( m_type == ARCTO )
-			{
-				Arc2D.Double arc = (Arc2D.Double) shape;
-				Point2D point = arc.getStartPoint();
-				
-				g.drawLine(	context.convertXToSVGLogicalUnits( context.getCurPosX() ), 
-							context.convertYToSVGLogicalUnits( context.getCurPosY() ), 
-							(int) point.getX(), 
-							(int) point.getY() );
-			}
-
-			g.draw( shape );
-		}
-		
-		if( m_type == ARCTO )
-		{
-			Arc2D.Double arc = (Arc2D.Double) shape;
-			Point2D point = arc.getEndPoint();
-			context.setCurPosX( context.convertXToWindowsLogicalUnits( (int) point.getX() ) );
-			context.setCurPosY( context.convertYToWindowsLogicalUnits( (int) point.getY() ) );
-		}
-	}
-	
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape shape = getShape( context );
-		
-		if( m_type == ARCTO )
-		{
-			GeneralPath p = context.getGdiPath().getCurrentFigure();
-			p.append( shape, true );
-			Arc2D.Double arc = (Arc2D.Double) shape;
-			Point2D point = arc.getEndPoint();
-			context.setCurPosX( context.convertXToWindowsLogicalUnits( (int) point.getX() ) );
-			context.setCurPosY( context.convertYToWindowsLogicalUnits( (int) point.getY() ) );
-		}
-		else
-		{
-			// Do not update the cursor position on the 'main' path.
-			context.getGdiPath().appendFigure( shape );
-		}
-	}
-	
-	private int getAngle( int triWidth, int triHeight )
-	{
-		double tan = 0.0;
-		if( triWidth != 0 )
-		{	
-			tan = (double) triHeight / (double) triWidth;
-		}
-		
-		// The 'tangent' of this is triHeight/triWidth.  We want the angle so compute the arcTan of
-		// this value.
-		int angle = (int)Math.toDegrees( Math.atan( tan ) );
-		
-		if( triWidth < 0 )
-		{
-			// 2nd or 3rd quadrant. 
-			angle += 180;
-		}
-		else if( triHeight < 0 )
-		{
-			// 4th quadrant.  angle will be negative.  Convert to a positive angle.
-			angle += 360;
-		}
-		
-		return angle;
-	}
-
-	private Shape getShape( DeviceContext context )
-	{
-		int x = context.convertXToSVGLogicalUnits( m_box.x );
-		int y = context.convertYToSVGLogicalUnits( m_box.y );
-		int w = context.scaleX( m_box.width );
-		int h = context.scaleY( m_box.height );
-		
-		int centerArcX = x + ( w / 2 );
-		int centerArcY = y + ( h / 2 );
-		
-		// Get the 'start angle', which is the angle from the center point of the containing rectangle
-		// to the intersection of the arc with the containing rectangle.
-		
-		// Get the two 'legs' of the right triangle formed by the bounding box, the x/y axis and the line
-		// from the centerpoint to the start point.
-		int startPointX = context.convertXToSVGLogicalUnits( m_start.x );
-		int startPointY = context.convertYToSVGLogicalUnits( m_start.y );
-		int triWidth	= startPointX - centerArcX;
-		int triHeight 	= centerArcY - startPointY ;
-		
-		// The 'tangent' of this is triHeight/triWidth.  We want the angle so compute the arcTan of
-		// this value.
-		int startAngle = getAngle( triWidth, triHeight );
-		
-		// Do the same for the 'end point);
-		int endPointX 	= context.convertXToSVGLogicalUnits( m_end.x );
-		int endPointY 	= context.convertYToSVGLogicalUnits( m_end.y );
-		triWidth		= endPointX - centerArcX;
-		triHeight 		= centerArcY - endPointY;
-		
-		int endAngle = getAngle( triWidth, triHeight );
-		int arcAngle;
-		
-		if( context.getArcDirection() == DeviceContext.AD_COUNTERCLOCKWISE )
-		{
-			arcAngle = endAngle - startAngle;
-		}
-		else
-		{
-			arcAngle = startAngle - endAngle;
-		}
-
-		int arcType;
-
-		if( m_type == ARC || m_type == ARCTO )
-		{
-			arcType = Arc2D.OPEN;
-		}
-		else if( m_type == CHORD )
-		{
-			arcType = Arc2D.CHORD;
-		}
-		else
-		{
-			arcType = Arc2D.PIE;
-		}
-
-		Rectangle bounds = new Rectangle( x, y, w, h );
-		Arc2D.Double arc = new Arc2D.Double();
-
-		arc.setArc( bounds, startAngle, arcAngle, arcType );
-
-		return arc;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BeginPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BeginPath.java
deleted file mode 100644
index 6ed7a8c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BeginPath.java
+++ /dev/null
@@ -1,37 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- *
- */
-public class BeginPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().begin();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitBlt.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitBlt.java
deleted file mode 100644
index 6427d60..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitBlt.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFRecord;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class BitBlt implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private static final int	EMF_XDEST_OFFSET		= 16;
-	private static final int	EMF_YDEST_OFFSET		= 20;
-	private static final int	EMF_WDEST_OFFSET		= 24;
-	private static final int	EMF_HDEST_OFFSET		= 28;
-	private static final int	EMF_XSRC_OFFSET			= 36;
-	private static final int	EMF_YSRC_OFFSET			= 40;
-	private static final int	EMF_BMI_OFFSET_OFFSET	= 76;
-	private static final int	EMF_BMI_SIZE_OFFSET		= 80;
-	private static final int	EMF_DATA_OFFSET_OFFSET	= 84;
-	private static final int	EMF_DATA_SIZE_OFFSET	= 88;
-	
-	private static final int	WMF_XDEST_OFFSET		= 14;
-	private static final int	WMF_YDEST_OFFSET		= 12;
-	private static final int	WMF_WDEST_OFFSET		= 10;
-	private static final int	WMF_HDEST_OFFSET		= 8;
-	private static final int	WMF_XSRC_OFFSET			= 6;
-	private static final int	WMF_YSRC_OFFSET			= 4;
-
-	private static final int	WMF_BMI_OFFSET			= 16;
-
-	protected int				m_xDest			= 0;
-	protected int				m_yDest			= 0;
-	protected int				m_wDest			= 0;
-	protected int				m_hDest			= 0;
-	protected int				m_xSrc			= 0;
-	protected int				m_ySrc			= 0;
-	protected BufferedImage		m_image			= null;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		// This only works for WMF_DIBBITBLT, not for WMF_BITBLT since BITBLT
-		// does not contain palette entries.  
-		// Need to consider supporting BITBLT in some way.
-		
-		// There are two formats, one where the source HDC is null and
-		// one where it isn't.  We only support those where the source is non-null
-		// since this is the most common to be used in the metafiles we care about.
-		if( rec.getSize() > 12 )
-		{	
-			m_xDest		= rec.getShortAt( WMF_XDEST_OFFSET );
-			m_yDest		= rec.getShortAt( WMF_YDEST_OFFSET );
-			m_wDest		= rec.getShortAt( WMF_WDEST_OFFSET );
-			m_hDest		= rec.getShortAt( WMF_HDEST_OFFSET );
-			m_xSrc		= rec.getShortAt( WMF_XSRC_OFFSET );
-			m_ySrc		= rec.getShortAt( WMF_YSRC_OFFSET );
-			
-			int bmiSize = BitmapHelper.getHeaderSize( 	rec, 
-														WMF_BMI_OFFSET, 
-														DeviceContext.DIB_RGB_COLORS );
-			int dataOffset = WMF_BMI_OFFSET + bmiSize;
-			int dataSize = rec.getSize() - dataOffset;
-			
-			m_image = BitmapHelper.readBitmap( 	rec, 
-												WMF_BMI_OFFSET, 
-												bmiSize, 
-												dataOffset, 
-												dataSize );
-		}
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_xDest			= rec.getIntAt( EMF_XDEST_OFFSET );
-		m_yDest			= rec.getIntAt( EMF_YDEST_OFFSET );
-		m_wDest			= rec.getIntAt( EMF_WDEST_OFFSET );
-		m_hDest			= rec.getIntAt( EMF_HDEST_OFFSET );
-		m_xSrc			= rec.getIntAt( EMF_XSRC_OFFSET );
-		m_ySrc			= rec.getIntAt( EMF_YSRC_OFFSET );
-		int bmiOffset	= rec.getIntAt( EMF_BMI_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;
-		int bmiSize		= rec.getIntAt( EMF_BMI_SIZE_OFFSET );
-		int dataOffset	= rec.getIntAt( EMF_DATA_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;
-		int dataSize	= rec.getIntAt( EMF_DATA_SIZE_OFFSET );
-
-		if (bmiSize == 0) {
-			return;
-		}
-		m_image = BitmapHelper.readBitmap( rec, bmiOffset, bmiSize, dataOffset, dataSize );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( m_image != null )
-		{	
-			int w = m_image.getWidth();
-			int h = m_image.getHeight();
-			
-			int xSrc = context.convertXToSVGLogicalUnits( m_xSrc );
-			int ySrc = context.convertYToSVGLogicalUnits( m_ySrc );
-			int xDest = context.convertXToSVGLogicalUnits( m_xDest );
-			int yDest = context.convertYToSVGLogicalUnits( m_yDest );
-			int wDest = context.scaleX( m_wDest );
-			int hDest = context.scaleY( m_hDest );
-			
-			if( xSrc >= w || ySrc >= h )
-			{
-				return;
-			}
-	
-			// Clip the image.
-			if( xSrc + wDest > w )
-			{
-				wDest = w - xSrc;
-			}
-	
-			if( ySrc + hDest > h )
-			{
-				hDest = h - ySrc;
-			}
-	
-			BufferedImage image = m_image.getSubimage( xSrc, ySrc, wDest, hDest );
-			g.drawImage( image, new AffineTransform( 1f, 0f, 0f, 1f, xDest, yDest ), null );
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitmapHelper.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitmapHelper.java
deleted file mode 100644
index 0610743..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/BitmapHelper.java
+++ /dev/null
@@ -1,370 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @author dhabib
- */
-class BitmapHelper 
-{
-	private static final int		COMPRESSION_TYPE_OFFSET 	= 16;
-	private static final int		BMI_BITCOUNT_OFFSET			= 14;
-	private static final int		BMI_COLORS_OFFSET 			= 32;
-	private static final int		BCH_BITCOUNT_OFFSET			= 10;
-
-//	private static final int		BI_RGB						= 0;
-//	private static final int		BI_RLE8						= 1;
-//	private static final int		BI_RLE4						= 2;
-	private static final int		BI_BITFIELDS				= 3;
-
-	private static final int		BASE_BMI_SIZE				= 40;
-	private static final int		BASE_BCH_SIZE				= 12;
-	
-	private static final int		BLUE_MASK					= 0x1f;
-	private static final int		GREEN_MASK					= 0x3e0;
-	private static final int		RED_MASK					= 0x7C00;
-
-	static BufferedImage readBitmap(	Record rec, 
-										int bmiOffset, 
-										int bmiSize, 
-										int bitOffset, 
-										int bitSize ) throws IOException
-	{
-		int compressionType = rec.getIntAt( bmiOffset + COMPRESSION_TYPE_OFFSET );
-		int bitCount		= rec.getShortAt( bmiOffset + BMI_BITCOUNT_OFFSET );
-		
-		// Read the data in using SWT's image code.
-
-		// First, create an input stream that looks like a file on the disk (header + bitmapinfo + palette + data)
-		int headerSize = 14;
-		int size = bmiSize + bitSize + headerSize;
-		
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		out.write( (byte) 0x42 );				// signature1
-		out.write( (byte) 0x4D );				// signature2
-		writeInt( out, size );					// File size.
-		writeInt( out, 0 );						// 2 reserved words, always 0
-
-		int dataOffset = headerSize + (bitOffset - bmiOffset);
-
-		// The SWT image loader always assumes that there is a palette if there are <= 8 bits per 
-		// pixel.  In some cases (ie: CreatePatternBrush) there is either no palette (monochrome brush)
-		// or the palette is not as large as it *should* be.  So, we have to pad it.
-		int numEntries = getNumberOfPaletteEntries( rec, bmiOffset );
-		
-		int requiredPaletteSize = numEntries * 4;	// 4 bytes per entry
-		int actualPaletteSize = bitOffset - bmiOffset - BASE_BMI_SIZE;
-		int numFakePaletteEntriesToWrite = 0;
-		
-		if( bitCount <= 8 && requiredPaletteSize > actualPaletteSize )
-		{
-			numFakePaletteEntriesToWrite = ( requiredPaletteSize - actualPaletteSize ) / 4;
-		}
-
-		if( numFakePaletteEntriesToWrite > 0 )
-		{
-			dataOffset += numFakePaletteEntriesToWrite * 4;	
-		}
- 
-		writeInt( out, dataOffset ); 	// offset to the data.		
-		
-		// write the bitmap info.
-		byte[] bmi = rec.getBytesAt( bmiOffset, bmiSize );
-		
-		if( compressionType == BI_BITFIELDS )
-		{
-			// Hack, change compression type to RGB for now since SWT doesn't currently
-			// support BI_BITFIELDS.  Only difference is the order of the color, which
-			// we can correct.
-			bmi[ COMPRESSION_TYPE_OFFSET  ] = 0;
-		}
-		
-		out.write( bmi );
-		
-		// Write the fake palette.
-		for( int index = 0; index < numFakePaletteEntriesToWrite; index++ )
-		{
-			writeInt( out, index );
-		}
-
-		// Write the data.
-		byte[] bits = rec.getBytesAt( bitOffset, bitSize );
-		out.write( bits );
-		
-		// Load the image using SWT's image loading functionality.
-		byte[] bmpData = out.toByteArray();
-		
-		ByteArrayInputStream stream = new ByteArrayInputStream( bmpData );
-		
-		ImageLoader imageLoader = new ImageLoader();
-		ImageData imageData[] = imageLoader.load( stream );
-		
-		// now we should have the image data for the bitmap, decompressed in imageData[0].data.
-		// Convert that to a Buffered Image.
-		BufferedImage image = new BufferedImage( imageData[0].width, imageData[0].height, BufferedImage.TYPE_3BYTE_BGR );
-
-		// loop over the imagedata and set each pixel in the BufferedImage to the appropriate color.
-		for( int y = 0; y < imageData[0].height; y++ )
-		{
-			for( int x = 0; x < imageData[0].width; x++ )
-			{
-				int color = imageData[0].getPixel( x, y );
-				
-				color = translateColor( rec, bmiOffset, bitCount, compressionType, imageData[ 0 ], color );
-			
-				image.setRGB( x, y, color );
-			}
-		}
-
-		return image;
-	}
-	
-	static int getNumberOfPaletteEntries( Record rec, int bmiOffset ) throws IOException
-	{
-		// Fortunately we are always using 'packed' bitmap info structures.  This is supposed
-		// to guarantee that biClrUsed is either the actual number of entries in the palette
-		// or it is 0.  If it is 0, the number of palette entries is either the number of 
-		// 2 ^ bitCount or it is actually 0.  I don't think the palette is ever more than 256
-		// in length, so only 8 bit entries matter.
-		
-		int bmiSize = rec.getIntAt( bmiOffset );
-		int numEntries = 0;
-		
-		if( bmiSize == BASE_BCH_SIZE )
-		{
-			// This is a BITMAPCOREHEADER
-			int bitCount = rec.getShortAt( bmiOffset + BCH_BITCOUNT_OFFSET );
-			
-			if( bitCount <= 8 )
-			{
-				numEntries = 1 << bitCount;
-			}
-		}
-		else
-		{
-			// This is a BITMAPINFOHEADER
-			int bitCount = rec.getShortAt( bmiOffset + BMI_BITCOUNT_OFFSET );
-
-			numEntries = rec.getIntAt( bmiOffset + BMI_COLORS_OFFSET );
-			
-			if( numEntries == 0 && bitCount <= 8 )
-			{	
-				numEntries = 1 << bitCount;
-			}
-		}
-
-		return numEntries;
-	}
-	
-	static int getHeaderSize( Record rec, int bmiOffset, int usage ) throws IOException
-	{
-		int numColorEntries = getNumberOfPaletteEntries( rec, bmiOffset );
-		int bmiSize = rec.getIntAt( bmiOffset );
-		int multiplier = 4; // size of rgb quad
-		int size = 0;
-		
-		if( usage == DeviceContext.DIB_PAL_COLORS )
-		{
-			multiplier = 2; // size of palette entry
-		}
-		
-		if( bmiSize == BASE_BCH_SIZE )
-		{
-			size = BASE_BCH_SIZE;
-		}
-		else
-		{
-			size = BASE_BMI_SIZE;
-		}
-		
-		size += numColorEntries * multiplier;
-		
-		return size;
-	}
-	
-	private static void writeInt( ByteArrayOutputStream out, int val ) throws IOException 
-	{
-		// Little endian write
-		out.write( (byte) ( val & 0xff ) );
-		out.write( (byte) ( ( val >> 8 ) & 0xff ) );
-		out.write( (byte) ( ( val >> 16 ) & 0xff ) );
-		out.write( (byte) ( ( val >> 24 ) & 0xff ) );
-	}
-
-	private static int translateColor( Record rec, 
-									   int bmiOffset, 
-									   int bitCount, 
-									   int compressionType, 
-									   ImageData imageData, 
-									   int color ) throws IOException
-	{
-		RGB[] rgb = imageData.getRGBs();
-				
-		if( bitCount == 1 || bitCount == 4 || bitCount == 8 )
-		{
-			// Look up actual rgb value in the rgb array.
-			if( rgb != null )
-			{
-				Color foo = new Color( rgb[color].red, rgb[color].green, rgb[color].blue );
-				color = foo.getRGB();
-			}
-			else
-			{
-				color = 0;
-			}
-		}
-		else if( bitCount == 16 )
-		{
-			if( compressionType == BI_BITFIELDS )
-			{
-				// Color mask is being used, stored in the first 3 entries in the palette.
-				//Get the color mask
-				int redMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE );
-				int greenMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE + 4 );
-				int blueMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE + 8 );
-				
-				// Bytes are in the wrong order.
-				color = applyRGBMask( color, redMask, greenMask, blueMask );
-			}
-			else
-			{
-				// Each word in the bitmap array represents a single pixels, 5 bits for each
-				// red, green and blue.
-				color = applyRGBMask( color, RED_MASK, GREEN_MASK, BLUE_MASK );
-			}
-		}
-		else if( bitCount == 24 )
-		{
-			// 3 8 bit color values.
-			int blue = (color & 0x00ff0000) >> 16;
-			int green = (color & 0x0000ff00) >> 8;
-			int red = (color & 0x000000ff);
-
-			Color foo = new Color( red, green, blue );
-			color = foo.getRGB();
-		}
-		else if( bitCount == 32 )
-		{	
-			if( compressionType == BI_BITFIELDS )
-			{
-				// Mask the color
-				int redMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE );
-				int greenMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE + 4 );
-				int blueMask 	= (int) rec.getDWORDAt( bmiOffset + BASE_BMI_SIZE + 8 );
-				
-				// Bytes are in the wrong order.
-				color = flipBytes( color );
-				color = applyRGBMask( color, redMask, greenMask, blueMask );
-			}
-			else
-			{
-				int blue = (color & 0xff000000) >>> 24;
-				int green = (color & 0x00ff0000) >> 16;
-				int red = (color & 0x0000ff00) >> 8;
-
-				Color foo = new Color( red, green, blue );
-				color = foo.getRGB();
-			}
-		}
-
-		return color;
-	}
-
-	private static int applyRGBMask( int color, int redMask, int greenMask, int blueMask )
-	{
-		int shiftCount;
-		int maskSize;
-		int red;
-		int green;
-		int blue;
-		
-		shiftCount = getShiftCount( redMask );
-		maskSize = countBits( redMask );
-		red = ( color & redMask ) >>> shiftCount;
-		// Scale the color value to something between 0 and 255.
-		red = red * 255 / ( (int) Math.pow( 2, maskSize ) - 1 );
-		
-		shiftCount = getShiftCount( greenMask );
-		maskSize = countBits( greenMask );
-		green = ( color & greenMask ) >>> shiftCount;
-		// Scale the color value to something between 0 and 255.
-		green = green * 255 / ( (int) Math.pow( 2, maskSize ) - 1 );
-
-		shiftCount = getShiftCount( blueMask );
-		maskSize = countBits( blueMask );
-		blue = ( color & blueMask ) >>> shiftCount;
-		// Scale the color value to something between 0 and 255.
-		blue = blue * 255 / ( (int) Math.pow( 2, maskSize ) - 1 );
-		
-		Color foo = new Color( red, green, blue );
-		color = foo.getRGB();
-
-		return color;
-	}
-	
-	private static int getShiftCount( int mask )
-	{
-		int count = 0;
-		
-		while( mask != 0 && ( ( mask & 0x1 ) == 0 ) )
-		{
-			mask = mask >>> 1;
-			count++;
-		}
-		
-		return count;
-	}
-	
-	private static int countBits( int mask )
-	{
-		int count = 0;
-		for( int index = 0; index < 32; index++ )
-		{
-			if( ( mask & 0x1 ) != 0 )
-			{
-				count++;
-			}
-			mask = mask >>> 1;
-		}
-		
-		return count;
-	}
-
-	private static int flipBytes( int data )
-	{
-		int byte1 = data & 0xff;
-		int byte2 = (data & 0xff00) >>> 8;
-		int byte3 = (data & 0xff0000) >>> 16;
-		int byte4 = (data & 0xff000000) >>> 24;
-		
-		data = byte1 << 24;
-		data += byte2 << 16;
-		data += byte3 << 8;
-		data += byte4;
-		
-		return data;
-	}
-
-}
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CloseFigure.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CloseFigure.java
deleted file mode 100644
index b145af4..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CloseFigure.java
+++ /dev/null
@@ -1,36 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class CloseFigure implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().closeAll();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateBrushIndirect.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateBrushIndirect.java
deleted file mode 100644
index 966ca05..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateBrushIndirect.java
+++ /dev/null
@@ -1,78 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-
-public class CreateBrushIndirect implements IEmf2SvgConverter, IWmf2SvgConverter, ITraceMe
-{
-	private static final int	EMF_ID_OFFSET			= 0;
-	private static final int	EMF_STYLE_OFFSET		= 4;
-	private static final int	EMF_COLOR_OFFSET		= 8;
-	private static final int	EMF_HATCH_OFFSET		= 12;
-
-	private static final int	WMF_STYLE_OFFSET		= 0;
-	private static final int	WMF_COLOR_OFFSET		= 2;
-	private static final int	WMF_HATCH_OFFSET		= 6;
-
-	private int		m_id 	= -1;
-	private int		m_style	= 0;
-	private Color	m_color	= new Color( 0 );
-	private int		m_hatch	= 0;
-	
-	private GdiBrush m_brush;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_style = rec.getShortAt( WMF_STYLE_OFFSET );
-		m_color = rec.getColorAt( WMF_COLOR_OFFSET );
-		m_hatch = rec.getShortAt( WMF_HATCH_OFFSET );
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_id 	= (int) rec.getDWORDAt( EMF_ID_OFFSET );
-		m_style	= rec.getIntAt( EMF_STYLE_OFFSET );
-		m_color	= rec.getColorAt( EMF_COLOR_OFFSET );
-		m_hatch	= rec.getIntAt( EMF_HATCH_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( m_id == -1 )
-		{	
-			m_id 	= context.getNextObjectId();
-		}
-		
-		m_brush = new GdiBrush( m_style, m_color, m_hatch );
-		context.addGDI( m_id, m_brush );
-	}
-
-	public String toString() {
-		return m_brush.toString() + ", id=" + m_id; //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateFontIndirect.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateFontIndirect.java
deleted file mode 100644
index a8d22ed..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreateFontIndirect.java
+++ /dev/null
@@ -1,123 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiFont;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-public class CreateFontIndirect implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private static final int	EMF_ID_OFFSET			= 0;
-	private static final int	EMF_HEIGHT_OFFSET		= 4;
-	private static final int	EMF_ESCAPEMENT_OFFSET	= 12;
-//	private static final int	EMF_ORIENTATION_OFFSET	= 16;
-	private static final int	EMF_WEIGHT_OFFSET		= 20;
-	private static final int	EMF_ITALIC_OFFSET		= 24;
-	private static final int	EMF_UNDERLINE_OFFSET	= 25;
-	private static final int	EMF_STRIKEOUT_OFFSET	= 26;
-	private static final int	EMF_FACE_OFFSET			= 32;
-	private static final int 	EMF_LF_FACESIZE         = 32;
-
-	private static final int	WMF_HEIGHT_OFFSET		= 0;
-//	private static final int	WMF_ESCAPEMENT_OFFSET	= 4;
-//	private static final int	WMF_ORIENTATION_OFFSET	= 6;
-	private static final int	WMF_WEIGHT_OFFSET		= 8;
-	private static final int	WMF_ITALIC_OFFSET		= 10;
-	private static final int	WMF_UNDERLINE_OFFSET	= 11;
-	private static final int	WMF_STRIKEOUT_OFFSET	= 12;
-	private static final int	WMF_FACE_OFFSET			= 18;
-	private static final int 	WMF_LF_FACESIZE         = 32;
-
-	private int		m_id 			= -1;
-	private int		m_height		= 10;
-	private int 	m_escapement	= 0;
-	private boolean	m_bItalic		= false;
-	private boolean	m_bUnderlined	= false;
-	private boolean	m_bStrikeout	= false;
-	private	int		m_weight		= 400;
-	private String	m_faceName		= "SanSerif";  //$NON-NLS-1$
-	
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_height		= Math.abs( rec.getShortAt( WMF_HEIGHT_OFFSET ) );
-		m_bItalic 		= rec.getByteAt( WMF_ITALIC_OFFSET ) != 0;
-		m_bUnderlined	= rec.getByteAt( WMF_UNDERLINE_OFFSET ) != 0;
-		m_bStrikeout	= rec.getByteAt( WMF_STRIKEOUT_OFFSET ) != 0;
-		m_weight		= rec.getShortAt( WMF_WEIGHT_OFFSET );
-		m_escapement	= rec.getShortAt( EMF_ESCAPEMENT_OFFSET );
-
-		// read in the face name.
-		byte[] facename = rec.getBytesAt( WMF_FACE_OFFSET, WMF_LF_FACESIZE );
-		
-		int index = 0;
-		for( index = 0; index < facename.length; index++ )
-		{
-			if( facename[ index ] == 0 )
-			{
-				break;
-			}
-		}
-		m_faceName = new String( facename, 0, index );
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_id 			= (int) rec.getDWORDAt( EMF_ID_OFFSET );
-		m_height		= Math.abs( rec.getIntAt( EMF_HEIGHT_OFFSET ) );
-		m_bItalic 		= rec.getByteAt( EMF_ITALIC_OFFSET ) != 0;
-		m_bUnderlined	= rec.getByteAt( EMF_UNDERLINE_OFFSET ) != 0;
-		m_bStrikeout	= rec.getByteAt( EMF_STRIKEOUT_OFFSET ) != 0;
-		m_weight		= rec.getIntAt( EMF_WEIGHT_OFFSET );
-		m_escapement	= rec.getIntAt( EMF_ESCAPEMENT_OFFSET );
-
-		// read in the face name.
-		char[] facename	= rec.getCharsAt( EMF_FACE_OFFSET, EMF_LF_FACESIZE );
-		int index = 0;
-		for( index = 0; index < facename.length; index++ )
-		{
-			if( facename[ index ] == 0 )
-			{
-				break;
-			}
-		}
-		m_faceName = new String( facename, 0, index );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( m_id == -1 )
-		{	
-			m_id 	= context.getNextObjectId();
-		}
-
-		int height = context.scaleY( m_height );
-		context.addGDI( m_id, new GdiFont( 	height, 
-											m_bItalic, 
-											m_bUnderlined, 
-											m_bStrikeout, 
-											m_weight > 400, 
-											m_faceName, 
-											m_escapement ) );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePatternBrush.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePatternBrush.java
deleted file mode 100644
index 1c70c79..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePatternBrush.java
+++ /dev/null
@@ -1,119 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFRecord;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- *
- */ 
-public class CreatePatternBrush implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private static final int	EMF_ID_OFFSET			= 0;
-//	private static final int	EMF_USAGE_OFFSET		= 4;
-	private static final int	EMF_BMI_OFFSET_OFFSET	= 8;
-	private static final int	EMF_BMI_SIZE_OFFSET		= 12;
-	private static final int	EMF_BITS_OFFSET_OFFSET	= 16;
-	private static final int	EMF_BITS_SIZE_OFFSET	= 20;
-
-	private static final int	WMF_BMI_OFFSET			= 4;
-//	private static final int	WMF_DEPTH_OFFSET		= 18;
-
-	private boolean			m_bDibPattern	= false;
-	private int				m_id 			= -1;
-	private BufferedImage	m_image			= null;
-	private int				m_type 			= GdiBrush.BS_MONOPATTERN;
-	
-	public CreatePatternBrush( boolean bDibPattern )
-	{
-		m_bDibPattern = bDibPattern;
-	}
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		// First 2 bytes are the 'type', which could be BS_PATTERN or BS_DIBPATTERN
-		m_type = rec.getShortAt( 0 );
-		
-		int bmiOffset = 0;
-		int bmiSize = 0;
-		int bitOffset = 0;
-		int bitSize = 0;
-		
-		switch( m_type )
-		{
-			case GdiBrush.BS_MONOPATTERN:
-			case GdiBrush.BS_PATTERN:
-			case GdiBrush.BS_PATTERN8X8:
-			case GdiBrush.BS_DIBPATTERN:
-			case GdiBrush.BS_DIBPATTERN8X8:
-			{
-				bmiOffset = WMF_BMI_OFFSET;
-				
-				int tableSize = BitmapHelper.getNumberOfPaletteEntries( rec, WMF_BMI_OFFSET );
-				tableSize *= 4;	// Each entry is 4 bytes long.
-				bmiSize = (int) rec.getDWORDAt( bmiOffset ) + tableSize;
-				bitOffset = bmiOffset + bmiSize;
-				bitSize = rec.getSize() - bitOffset;
-				break;
-			}
-			default:
-				AbstractTranscoder.logMessage( "Unknown/Unsupported pattern type encountered: " + m_type );//$NON-NLS-1$
-				return;
-		}
-		
-		m_image = BitmapHelper.readBitmap( rec, bmiOffset, bmiSize, bitOffset, bitSize );
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		if( m_bDibPattern )
-		{
-			m_type = GdiBrush.BS_DIBPATTERN;
-		}
-		
-		m_id 	= (int) rec.getDWORDAt( EMF_ID_OFFSET );
-		
-		// Header is not included in record, so subtract off the size of the header.
-		int bmiOffset	= (int) rec.getDWORDAt( EMF_BMI_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;	
-		int bmiSize		= (int) rec.getDWORDAt( EMF_BMI_SIZE_OFFSET );
-		int bitOffset	= (int) rec.getDWORDAt( EMF_BITS_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;		
-		int bitSize		= (int) rec.getDWORDAt( EMF_BITS_SIZE_OFFSET );
-		
-		m_image = BitmapHelper.readBitmap( rec, bmiOffset, bmiSize, bitOffset, bitSize );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( m_id == -1 )
-		{	
-			m_id 	= context.getNextObjectId();
-		}
-
-		context.addGDI( m_id, new GdiBrush( m_type, m_image ) );
-	}
-
-}
-
-
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePen.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePen.java
deleted file mode 100644
index 941f36a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/CreatePen.java
+++ /dev/null
@@ -1,70 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-public class CreatePen implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private static final int	EMF_ID_OFFSET			= 0;
-	private static final int	EMF_STYLE_OFFSET		= 4;
-	private static final int	EMF_WIDTH_OFFSET		= 8;
-	private static final int	EMF_COLOR_OFFSET		= 16;
-
-	private static final int	WMF_STYLE_OFFSET		= 0;
-	private static final int	WMF_WIDTH_OFFSET		= 2;
-	private static final int	WMF_COLOR_OFFSET		= 6;
-
-	private int		m_id 		= -1;
-	private int		m_style		= 0;
-	private int		m_width		= 1;
-	private Color	m_color		= new Color( 0 );
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_style	= rec.getShortAt( WMF_STYLE_OFFSET );
-		m_width	= rec.getShortAt( WMF_WIDTH_OFFSET );
-		m_color	= rec.getColorAt( WMF_COLOR_OFFSET );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_id 	= (int) rec.getDWORDAt( EMF_ID_OFFSET );
-		m_style	= rec.getIntAt( EMF_STYLE_OFFSET );
-		m_width	= rec.getIntAt( EMF_WIDTH_OFFSET );
-		m_color	= rec.getColorAt( EMF_COLOR_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( m_id == -1 )
-		{	
-			m_id 	= context.getNextObjectId();
-		}
-
-		context.addGDI( m_id, new GdiPen( m_style, m_width, m_color ) );
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeleteObject.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeleteObject.java
deleted file mode 100644
index 94ba632..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeleteObject.java
+++ /dev/null
@@ -1,92 +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.awt.internal.svg.metafile;
-
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiFont;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiRegion;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-
-
-/**  
- * @author dhabib
- */
-public class DeleteObject extends ObjectBase implements ITraceMe
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Object obj = context.getGDI( getId() );
-		
-		if( obj != null )
-		{
-			if( obj instanceof GdiFont )
-			{
-				GdiFont gdiFont = (GdiFont) obj;
-
-				if( gdiFont == context.getCurFont() )
-				{
-					context.setCurFont( new GdiFont() );
-				}
-			}
-			else if( obj instanceof GdiBrush )
-			{
-				GdiBrush gdiBrush = (GdiBrush) obj;
-				
-				if( gdiBrush == context.getCurBrush() )
-				{
-					context.setCurBrush( new GdiBrush() );
-				}
-			}
-			else if( obj instanceof GdiPen )
-			{
-				GdiPen pen = (GdiPen) obj;
-				
-				if( pen == context.getCurPen() )
-				{
-					context.setCurPen( new GdiPen() );
-				}
-			}
-			else if( obj instanceof GdiRegion )
-			{
-				GdiRegion rgn = (GdiRegion) obj;
-
-				if( rgn == context.getCurRegion() )
-				{
-					context.setCurRegion( new GdiRegion( (Shape) null ) );
-				}
-			}
-			else
-			{
-				AbstractTranscoder.logMessage( getClass().getName() + "Invalid object type in delete object, object #" + getId() );	//$NON-NLS-1$
-				return;
-			}
-
-			context.deleteGDI( getId() );
-		}
-		else
-		{
-			AbstractTranscoder.logMessage( getClass().getName() + ": DeleteObject failed to delete object #" + getId() );	//$NON-NLS-1$
-		}
-	}
-
-	public String toString() {
-		return Integer.toString(getId());
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeviceContext.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeviceContext.java
deleted file mode 100644
index ed191e7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/DeviceContext.java
+++ /dev/null
@@ -1,1214 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiFont;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiRegion;
-
-/**
- * Represents the current state of the device context.  As metafile records are parsed, the data in this
- * class is updated.  This class also handles all unit conversions.  
- * 
- * @author dhabib
- */
-public final class DeviceContext 
-{
-	/** Static list of device contexts.  Normally there will only be one (the current one, the first
-		one in the vector), but the user can call 'saveDC' and 'restoreDC' to manipulate these. */
-	private Vector					m_deviceContexts 	= new Vector();
-	/** Current device context.  Never changes from the very first device context that was created. */
-	private DeviceContext			m_curDeviceContext	= this;
-
-	/** Specifies the dimensions, in device units, of the smallest rectangle that can be drawn around the picture stored in the metafile. This rectangle is supplied by graphics device interface (GDI). Its dimensions include the right and bottom edges. */
-	private Rectangle	m_bounds		= new Rectangle( 0, 0, 100, 100 );
-	/** Dots per inch in the X direction */
-	private int			m_dpiX			= DPI;
-	/** Dots per inch in the Y direction */
-	private int			m_dpiY			= DPI;
-
-	/** Current cursor position in the X direction */
-	private int			m_curPosX 		= 0;
-	/** Current cursor position in the Y direction */
-	private int			m_curPosY 		= 0;
-
-	/** Viewport origin */
-	private Point		m_vpOrigin		= new Point( 0, 0 );
-	/** Viewport extents */
-	private Point		m_vpExtent		= new Point( 1000, 1000 );
-	/** Window Origin */
-	private Point		m_winOrigin		= new Point( 0, 0 );
-	/** Window Extents */
-	private Point		m_winExtent		= new Point( 1000, 1000 );
-	/** Current mapping mode */
-	private int			m_mapMode		= MM_TEXT;
-
-	/** Alignment for text (ExtTextOut) */
-	private int			m_textAlignment	= DeviceContext.TA_LEFT | DeviceContext.TA_TOP;
-	/** Current fill mode */
-	private int			m_fillMode		= FILL_MODE_ALTERNATE;
-	/** Direction in which to draw arcs */
-	private int			m_arcDirection	= AD_COUNTERCLOCKWISE;
-	/** Current miter limit */
-	private float		m_miterLimit	= 10.0f;
-	/** Current background mode */
-	private int			m_bkMode		= TRANSPARENT;
-	/** Current StretchBltMode.  Possibilities are BLACKONWHITE, WHITEONBLACK, COLORONCOLOR, HALFTONE, MAXSTRETCHBLTMODE
-	 *  Not currently used, just stored.
-	 */
-	private int			m_stretchBltMode = COLORONCOLOR;
-	/** Current ROP mode.  Not currently used */
-	private int			m_ROP2			 = R2_COPYPEN;
-	
-	
-	/** Current background color */
-	private Color 		m_backColor		= new Color( 0xffffff );
-	/** Current text (foreground) color */
-	private Color		m_textColor		= new Color( 0 );
-
-	/** Object representing the currently selected font */
-	private GdiFont		m_curFont		= new GdiFont();
-	/** Object representing the currently selected brush */
-	private GdiBrush	m_curBrush		= new GdiBrush();
-	/** Object representing the currently selected pen */
-	private GdiPen		m_curPen		= new GdiPen();
-	/** Object representing the currently selected clipping region */
-	private GdiRegion	m_curRegion		= new GdiRegion( (Shape) null );
-	/** Set of GDI objects allocated by the user. */
-	private Map			m_gdiObjectMap	= new HashMap();
-	/** Extensibility mechanism so derived classes can store values.  */
-	private Map			m_userProps		= new HashMap();
-	
-	/** Current fill/stroke path */	
-	private GdiPath		m_path			= new GdiPath( this );
-
-	/** Current world transform */
-	private float[]		m_xform			= new float[]{1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f};
-
-
- 	// Constants for indices in a transform
-	private static final int _11 = 0;	// Scale X
-	private static final int _12 = 1;	// Rotation not yet supported
-	private static final int _21 = 2;	// Rotation not yet supported
-	private static final int _22 = 3;	// Scale Y
-	private static final int _31 = 4;	// Translate X
-	private static final int _32 = 5;	// Translate Y
-
-	// ModifyWorldTransform operations
-	public static final int MWT_IDENTITY      = 1;
-	public static final int MWT_LEFTMULTIPLY  = 2;
-	public static final int MWT_RIGHTMULTIPLY = 3;
-
-	// Contants for mapping mode.
-	private static final int MM_TEXT 		= 1;
-	private static final int MM_LOMETRIC 	= 2;
-	private static final int MM_HIMETRIC 	= 3;
-	private static final int MM_LOENGLISH 	= 4;
-	private static final int MM_HIENGLISH 	= 5;
-	private static final int MM_TWIPS 		= 6;
-	private static final int MM_ISOTROPIC 	= 7;
-	private static final int MM_ANISOTROPIC	= 8;
-	
-	// Constants for mapping units.
-	private static final int DPI					= 72;
-	private static final int HI_METRIC_PER_INCH		= 2540; 
-	private static final int LO_METRIC_PER_INCH		= 254;
- 	private static final int HI_ENGLISH_PER_INCH	= 1000; 
- 	private static final int LO_ENGLISH_PER_INCH	= 100; 
- 	private static final int TWIPS_PER_INCH			= 1440; 
-
- 	// Constants for Stretch Blt Mode
-// 	private static final int BLACKONWHITE			= 1;
-//	private static final int WHITEONBLACK			= 2;
- 	private static final int COLORONCOLOR			= 3;
-// 	private static final int HALFTONE				= 4;
-
- 	// Constants for the ROP mode
-//	private static final int R2_BLACK            = 1;
-//	private static final int R2_NOTMERGEPEN      = 2;
-//	private static final int R2_MASKNOTPEN       = 3;
-//	private static final int R2_NOTCOPYPEN       = 4;
-//	private static final int R2_MASKPENNOT       = 5;
-//	private static final int R2_NOT              = 6;
-//	private static final int R2_XORPEN           = 7;
-//	private static final int R2_NOTMASKPEN       = 8;
-//	private static final int R2_MASKPEN          = 9;
-//	private static final int R2_NOTXORPEN        = 10;
-//	private static final int R2_NOP              = 11;
-//	private static final int R2_MERGENOTPEN      = 12;
-	private static final int R2_COPYPEN          = 13;
-//	private static final int R2_MERGEPENNOT      = 14;
-//	private static final int R2_MERGEPEN         = 15;
-//	private static final int R2_WHITE            = 16;
-//	private static final int SRCCOPY             = 0x00CC0020;
-//	private static final int SRCPAINT            = 0x00EE0086;
-//	private static final int SRCAND              = 0x008800C6;
-//	private static final int SRCINVERT           = 0x00660046;
-//	private static final int SRCERASE            = 0x00440328;
-//	private static final int NOTSRCCOPY          = 0x00330008;
-//	private static final int NOTSRCERASE         = 0x001100A6;
-//	private static final int MERGECOPY           = 0x00C000CA;
-//	private static final int MERGEPAINT          = 0x00BB0226;
-//	private static final int PATCOPY             = 0x00F00021;
-//	private static final int PATPAINT            = 0x00FB0A09;
-//	private static final int PATINVERT           = 0x005A0049;
-//	private static final int DSTINVERT           = 0x00550009;
-//	private static final int BLACKNESS           = 0x00000042;
-//	private static final int WHITENESS           = 0x00FF0062;
- 	
- 	/** Palette usage constant */
-	public static final int		DIB_RGB_COLORS		= 0;
- 	/** Palette usage constant */
-	public static final int		DIB_PAL_COLORS		= 1;
-
-	/** Background mode constant */
-	public static final int TRANSPARENT				= 1;
- 	/** Background mode constant */
- 	public static final int OPAQUE					= 2;
- 	
- 	/** Poly fill mode constant */
- 	public static final int FILL_MODE_ALTERNATE		= 1;
- 	/** Poly fill mode constant */
- 	public static final int FILL_MODE_WINDING		= 2;
-
- 	/** Arc Direction constant */
- 	public static final int AD_COUNTERCLOCKWISE		= 1;
- 	/** Arc Direction constant */
- 	public static final int AD_CLOCKWISE			= 2;
-
-	/** Text alignment constant */
-	public static final int TA_TOP	                  	= 0;
-	/** Text alignment constant */
-	public static final int TA_LEFT						= 0;
-	/** Text alignment constant */
-	public static final int TA_UPDATECP                 = 1;
-	/** Text alignment constant */
-	public static final int TA_RIGHT                    = 2;
-	/** Text alignment constant */
-	public static final int TA_CENTER                   = 6;
-	/** Text alignment constant */
-	public static final int TA_BOTTOM                   = 8;
-	/** Text alignment constant */
-	public static final int TA_BASELINE                 = 24;
-	/** Text alignment constant */
-	public static final int TA_RTLREADING               = 256;
-	
-	/**
-	 * Initializes a new instance of the class and sets all the variables to their defaults.
-	 */
-	public DeviceContext()
-	{
-	    // No initialization required
-	}
-	
-	/**
-	 * Copy constructor.
-	 * @param context
-	 */
-	private DeviceContext( DeviceContext context )
-	{
-		copy( context );
-	}
-	
-	/**
-	 * Copies the contents of the specified device context.
-	 * @param context
-	 */
-	private void copy( DeviceContext context )
-	{
-		m_bounds		= new Rectangle( context.m_bounds );
-
-		m_dpiX			= context.m_dpiX;
-		m_dpiY			= context.m_dpiY;
-
-		m_curPosX 		= context.m_curPosX;
-		m_curPosY 		= context.m_curPosY;
-
-		m_vpOrigin		= new Point( context.m_vpOrigin );
-		m_vpExtent		= new Point( context.m_vpExtent );
-		m_winOrigin		= new Point( context.m_winOrigin );
-		m_winExtent		= new Point( context.m_winExtent );
-		m_mapMode		= context.m_mapMode;
-
-		m_textAlignment	= context.m_textAlignment;
-		m_fillMode		= context.m_fillMode;
-		m_arcDirection	= context.m_arcDirection;
-		m_miterLimit	= context.m_miterLimit;
-		m_bkMode		= context.m_bkMode;
-	
-		m_backColor		= new Color( context.m_backColor.getRGB() );
-		m_textColor		= new Color( context.m_textColor.getRGB() );
-
-		m_curFont		= new GdiFont( context.m_curFont );
-		m_curBrush		= new GdiBrush( context.m_curBrush );
-		m_curPen		= new GdiPen( context.m_curPen );
-		m_curRegion		= new GdiRegion( context.m_curRegion );
-		m_path			= new GdiPath( this, context.m_path );
-	}
-	
-	/**
-	 * Saves the current device context settings and pushes them on a stack.
-	 * Can be restored by calling 'RestoreDC'
-	 */
-	public void saveDC()
-	{
-		// put a copy of this DC at the end of the device contexts vector.
-		m_deviceContexts.add( new DeviceContext( this ) );
-	}
-	
-	/**
-	 * Restores a DC that was previously saved with a call to 'saveDC'
-	 */
-	public void restoreDC( int dcIndex )
-	{
-		// Figure out what the index into the vector really is.
-		int realIndex = 0;
-		if( dcIndex < 0 )
-		{
-			realIndex = -dcIndex - 1;
-		}
-		else
-		{
-			realIndex = m_deviceContexts.size() - dcIndex;
-		}
-
-		// Retrieve and restore the specified DeviceContext
-		if( realIndex < m_deviceContexts.size() )
-		{
-			DeviceContext context = (DeviceContext) m_deviceContexts.get( realIndex );
-			m_curDeviceContext.copy( context );
-			
-			// Remove all the device contexts from 0 to realIndex
-			for( int index = 0; index <= realIndex; index++ )
-			{
-				m_deviceContexts.remove( 0 );
-			}
-		}
-	}
-
-	/**
-	 * Sets the current cursor position in the horizontal direction.
-	 * This is always in window units, not converted to device units.
- 	 * @param x
- 	 */
- 	public void setCurPosX( int x )
-	{
-		m_curPosX = x;
-	}
-
- 	/**
-	 * Gets the current cursor position in the horizontal direction.
-	 * This is always in window units, not converted to device units.
- 	 * @return Current cursor position.
- 	 */
-	public int getCurPosX()
-	{
-		return m_curPosX;
-	}
-
- 	/**
-	 * Sets the current cursor position in the vertical direction.
-	 * This is always in window units, not converted to device units.
- 	 * @param x
- 	 */
-	public void setCurPosY( int y )
-	{
-		m_curPosY = y;
-	}
-
- 	/**
-	 * Gets the current cursor position in the vertical direction.
-	 * This is always in window units, not converted to device units.
- 	 * @return Current cursor position.
- 	 */
-	public int getCurPosY()
-	{
-		return m_curPosY;
-	}
-
-	/**
-	 * Sets the viewport origin.
-	 * @param origin
-	 */
-	public void setViewportOrigin( Point origin )
-	{
-		m_vpOrigin = new Point( origin );
-	}
-
-	/**
-	 * Retrieves the viewport origin.
-	 * @return
-	 */
-	public Point getViewportOrigin()
-	{
-		return new Point( m_vpOrigin );
-	}
-
-	/**
-	 * Sets the viewport extents.
-	 * @param ext
-	 */
-	public void setViewportExtent( Point ext )
-	{
-		m_vpExtent = new Point( ext );
-	}
-
-	/**
-	 * @return the viewport extents.
-	 */
-	public Point getViewportExtent()
-	{
-		return new Point( m_vpExtent );
-	}
-
-	/**
-	 * Sets the window origin.
-	 * @param origin
-	 */
-	public void setWindowOrigin( Point origin )
-	{
-		m_winOrigin = new Point( origin );
-	}
-
-	/**
-	 * @return The current window origin.
-	 */
-	public Point getWindowOrigin()
-	{
-		return new Point( m_winOrigin );
-	}
-
-	/**
-	 * Sets the window extent.
-	 * @param extent
-	 */
-	public void setWindowExtent( Point extent )
-	{
-		m_winExtent = new Point( extent );
-	}
-
-	/**
-	 * @return The current window extent.
-	 */
-	public Point getWindowExtent()
-	{
-		return new Point( m_winExtent );
-	}
-	
-	/**
-	 * Sets the current mapping mode (MM_TEXT, MM_ISOTROPIC, etc).
-	 * @param mode
-	 */
-	public void setMapMode( int mode )
-	{
-		m_mapMode = mode;
-	}
-	
-	/**
-	 * @return The current mapping mode.
-	 */
-	public int getMapMode()
-	{
-		return m_mapMode;
-	}
-
-	/**
-	 * Apply changes to the world transform. Note that support for rotation
-	 * isn't actually implemented...
-	 * 
-	 * @param operation
-	 *            One of these:
-	 * <pre>
-	 *   MWT_IDENTITY
-	 *      The transform will be reset to identity. The given transform is ignored.
-	 * </pre>
-	 * <pre>
-	 *   MWT_LEFTMULTIPLY
-	 *      new = given X current
-	 * </pre>
-	 * <pre>
-	 *   MWT_RIGHTMULTIPLY
-	 *      new = current X given
-	 * </pre>
-	 * @param transform
-	 *            Given transform. See parameter operation for reference.
-	 */
-	public void modifyWorldTransform(int operation, float[] transform) {
-		switch (operation) {
-			case MWT_IDENTITY: {
-				m_xform = new float[]{1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f};
-				break;
-			}
-			case MWT_LEFTMULTIPLY: {
-				m_xform = crossMultiply(transform, m_xform);
-				break;
-			}
-			case MWT_RIGHTMULTIPLY: {
-				m_xform = crossMultiply(m_xform, transform);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Each matrix M has this format, expressed as a float array of length 6:
-	 * <pre>
-	 *     M[0]  M[1]  0
-	 *     M[2]  M[3]  0
-	 *     M[4]  M[5]  1
-	 * </pre>
-	 */
-	private float[] crossMultiply(float[] L, float[] R) {
-		float[] P = new float[6];
-		P[_11]  =  L[_11] * R[_11]  +  L[_12] * R[_21]; // + 0*R[3,1]
-		P[_21]  =  L[_21] * R[_11]  +  L[_22] * R[_21]; // + 0*R[3,1]
-		P[_31]  =  L[_31] * R[_11]  +  L[_32] * R[_21]  +  1 * R[_31];
-		P[_12]  =  L[_11] * R[_12]  +  L[_12] * R[_22]; // + 0*R[3,2]
-		P[_22]  =  L[_21] * R[_12]  +  L[_22] * R[_22]; // + 0*R[3,2]
-		P[_32]  =  L[_31] * R[_12]  +  L[_32] * R[_22]  +  1 * R[_32];
-		return P;
-	}
-
-	/**
-	 * Opposite of convertXToSVGLogicalUnits, converts a coordinate in the SVG coordinate system back to the
-	 * windows coordinate system. 
-	 * @param x
-	 * @return The converted coordinate.
-	 */
-	public int convertXToWindowsLogicalUnits( int x )
-	{
-		x += m_bounds.x;
-		x -= m_vpOrigin.x;
-
-		switch( m_mapMode )
-		{
-			case MM_TEXT:
-				// Maps logical units to device units, 1 logical unit = 1 pixel.
-				break;
-				
-			case MM_LOENGLISH:
-				x = (x * LO_ENGLISH_PER_INCH) / m_dpiX;
-				break;
-			
-			case MM_HIENGLISH:
-				x = (x * HI_ENGLISH_PER_INCH) / m_dpiX;
-				break;
-			
-			case MM_LOMETRIC:
-				x = (x * LO_METRIC_PER_INCH) / m_dpiX;
-				break;
-				
-			case MM_HIMETRIC:  
-				x = (x * HI_METRIC_PER_INCH) / m_dpiX;
-				break;
-			
-			case MM_TWIPS:
-				x = (x * TWIPS_PER_INCH) / m_dpiX;
-				break;
-			
-			case MM_ANISOTROPIC:
-				x = (x * m_winExtent.x) / m_vpExtent.x;
-				break;
-				 
-			case MM_ISOTROPIC:
-				x = x * m_winExtent.x / m_vpExtent.x;
-				break;
-		}
-
-		float f = x / m_xform[_11];
-		return (int) f + m_winOrigin.x;
-	}
-
-	/**
-	 * Converts the specified window coordinate to the SVG coordinate system.  Uses the current mapping mode,
-	 * the window origin, and the window and viewport extents.
-	 * @param x
-	 * @return The converted coordinate.
-	 */
-	public int convertXToSVGLogicalUnits( int x )
-	{
-		// SVG's SVGGraphics object uses AWT User Space logical units, which appears to be about 72 dpi according to the documentation.
-		// So, depending upon the current mapping mode, convert the specified coordinate to logical units.
-		
-		// Subtract off the origin.  Only care about the window extents, not the VP extents at this point.
-		x -= m_winOrigin.x;
-
-		x = scaleX( x );
-		x += (int) m_xform[_31];
-		x += m_vpOrigin.x;
-		x -= m_bounds.x;
-		
-		return x;
-	}
-	
-	/**
-	 * Scales the specified cooridinate using the current mapping mode (etc).  Does not use the window origin
-	 * or bounding rectangle (does no translation, just scales the coordinate).
-	 * @param x
-	 * @return  The scaled coordinate.
-	 */
-	public int scaleX( int x )
-	{		
-		switch( m_mapMode )
-		{
-			case MM_TEXT:
-				// Maps logical units to device units, 1 logical unit = 1 pixel.
-				break;
-				
-			case MM_LOENGLISH:
-				// x is in 100 units/inch
-				x = (x * m_dpiX) / LO_ENGLISH_PER_INCH;
-				break;
-			
-			case MM_HIENGLISH:
-				// x is in 1000 units/inch
-				x = (x * m_dpiX) / HI_ENGLISH_PER_INCH;
-				break;
-			
-			case MM_LOMETRIC:
-				// x is in 100 units/mm
-				x = (x * m_dpiX) / LO_METRIC_PER_INCH;
-				break;
-				
-			case MM_HIMETRIC:  
-				// x is in 1000 units/mm
-				x = (x * m_dpiX) / HI_METRIC_PER_INCH;
-				break;
-			
-			case MM_TWIPS:
-				// x is in 1440 units/inch
-				x = (x * m_dpiX) / TWIPS_PER_INCH;
-				break;
-			
-			case MM_ANISOTROPIC:
-				// Logical units are mapped to arbitrary units with arbitrarily scaled axes. Use the SetWindowExtEx and 
-				// SetViewportExtEx functions to specify the units, orientation, and scaling.
-				
-				// Convert to device units.
-				x = (x * m_vpExtent.x) / m_winExtent.x;
-				break;
-				 
-			case MM_ISOTROPIC:
-				// Logical units are mapped to arbitrary units with equally scaled axes; that is, one unit along the 
-				// x-axis is equal to one unit along the y-axis. Use the SetWindowExtEx and SetViewportExtEx functions 
-				// to specify the units and the orientation of the axes. Graphics device interface (GDI) makes adjustments 
-				// as necessary to ensure the x and y units remain the same size (When the window extent is set, the viewport 
-				// will be adjusted to keep the units isotropic).
-
-				// Convert to device units.
-				x = x * m_vpExtent.x / m_winExtent.x;
-
-				break;
-		}
-		float f = x * m_xform[_11];
-		return (int) f;
-	}
-	
-	/**
-	 * Opposite of convertYToSVGLogicalUnits, converts a coordinate in the SVG coordinate system back to the
-	 * windows coordinate system. 
-	 * @param y
-	 * @return
-	 */
-	public int convertYToWindowsLogicalUnits( int y )
-	{
-		y += m_bounds.y;
-		y -= m_vpOrigin.y;
-
-		switch( m_mapMode )
-		{
-			case MM_TEXT:
-				// Maps logical units to device units, 1 logical unit = 1 pixel.
-				break;
-				
-			case MM_LOENGLISH:
-				y = (y * LO_ENGLISH_PER_INCH) / m_dpiY;
-				break;
-			
-			case MM_HIENGLISH:
-				y = (y * HI_ENGLISH_PER_INCH) / m_dpiY;
-				break;
-			
-			case MM_LOMETRIC:
-				y = (y * LO_METRIC_PER_INCH) / m_dpiY;
-				break;
-				
-			case MM_HIMETRIC:  
-				y = (y * HI_METRIC_PER_INCH) / m_dpiY;
-				break;
-			
-			case MM_TWIPS:
-				y = (y * TWIPS_PER_INCH) / m_dpiY;
-				break;
-			
-			case MM_ANISOTROPIC:
-				y = (y * m_winExtent.y) / m_vpExtent.y;
-				break;
-				 
-			case MM_ISOTROPIC:
-				y = y * m_winExtent.x / m_vpExtent.x;
-				break;
-		}
-
-		float f = y / m_xform[_22];
-		return (int) f +  m_winOrigin.y;
-	}
-
-	/**
-	 * Converts the specified window coordinate to the SVG coordinate system.  Uses the current mapping mode,
-	 * the window origin, and the window and viewport extents.
-	 * @param y
-	 * @return The converted coordinate.
-	 */
-	public int convertYToSVGLogicalUnits( int y )
-	{
-		// Subtract off the origin.  Only care about the window extents, not the VP extents at this point.
-		y -= m_winOrigin.y;
-
-		y = scaleY( y );
-		y += (int) m_xform[_32];
-		y += m_vpOrigin.y;
-		y -= m_bounds.y;
-		
-		return y;
-	}
-
-	/**
-	 * Scales the specified cooridinate using the current mapping mode (etc).  Does not use the window origin
-	 * or bounding rectangle (does no translation, just scales the coordinate).
-	 * @param y
-	 * @return  The scaled coordinate.
-	 */
-	public int scaleY( int y )
-	{
-		switch( m_mapMode )
-		{
-			case MM_TEXT:
-				// Maps logical units to device units, 1 logical unit = 1 pixel.
-				break;
-
-			case MM_LOENGLISH:
-				// y is in 100 units/inch
-				y = -(y * m_dpiY) / LO_ENGLISH_PER_INCH;
-				break;
-			
-			case MM_HIENGLISH:
-				// y is in 1000 units/inch
-				y = -(y * m_dpiY) / HI_ENGLISH_PER_INCH;
-				break;
-			
-			case MM_LOMETRIC:
-				// y is in 100 units/mm
-				y = -(y * m_dpiY) / LO_METRIC_PER_INCH;
-				break;
-				
-			case MM_HIMETRIC:  
-				// y is in 1000 units/mm
-				y = -(y * m_dpiY) / HI_METRIC_PER_INCH;
-				break;
-			
-			case MM_TWIPS:
-				// y is in 1440 units/inch
-				y = -(y * m_dpiY) / TWIPS_PER_INCH;
-				break;
-				
-			case MM_ANISOTROPIC:
-				// Logical units are mapped to arbitrary units with arbitrarily scaled axes. Use the SetWindowExtEx and 
-				// SetViewportExtEx functions to specify the units, orientation, and scaling.
-
-				// Convert to device units.
-				y = y * m_vpExtent.y / m_winExtent.y;
-				break;
-				
-			case MM_ISOTROPIC:
-				// Logical units are mapped to arbitrary units with equally scaled axes; that is, one unit along the 
-				// x-axis is equal to one unit along the y-axis. Use the SetWindowExtEx and SetViewportExtEx functions 
-				// to specify the units and the orientation of the axes. Graphics device interface (GDI) makes adjustments 
-				// as necessary to ensure the x and y units remain the same size (When the window extent is set, the viewport 
-				// will be adjusted to keep the units isotropic).
-
-				// Convert to device units.
-				y = y * m_vpExtent.x / m_winExtent.x;
-				break;
-		}
-
-		float f = y * m_xform[_22];
-		return (int) f;
-	}
-
-	/**
-	 * Converts an array of Windows x-coordinates into SVG coordinates. 
-	 * @param array
-	 * @return Array of converted coordinates.
-	 */
-	public int[] convertXArrayToSVGLogicalUnits( int[] array )
-	{
-		int[] out = new int[ array.length ];
-		
-		for( int index = 0; index < array.length; index++ )
-		{
-			out[ index ] = convertXToSVGLogicalUnits( array[ index ] );
-		}
-		
-		return out;
-	}
-	
-	/**
-	 * Converts an array of Windows y-coordinates into SVG coordinates. 
-	 * @param array
-	 * @return Array of converted coordinates.
-	 */
-	public int[] convertYArrayToSVGLogicalUnits( int[] array )
-	{
-		int[] out = new int[ array.length ];
-		
-		for( int index = 0; index < array.length; index++ )
-		{
-			out[ index ] = convertYToSVGLogicalUnits( array[ index ] );
-		}
-		
-		return out;
-	}
-
-	/**
-	 * Converts a rectange from windows coordinates to SVG coordinates.
-	 * @param rect
-	 * @return Converted rectangle.
-	 */
-	public Rectangle convertRectangleToSVGLogicalUnits( Rectangle rect )
-	{
-		Rectangle converted = new Rectangle( rect );
-		
-		converted.x 		= convertXToSVGLogicalUnits( converted.x );
-		converted.width 	= scaleX( converted.width );
-		converted.y			= convertYToSVGLogicalUnits( converted.y );
-		converted.height	= scaleY( converted.height );
-		
-		return converted;		
-	}
-
-	/**
-	 * Converts a dimension from windows coordinates to SVG coordinates.
-	 * @param dim
-	 * @return The converted dimension
-	 */
-	public Dimension convertDimensionToSVGLogicalUnits( Dimension dim )
-	{
-		Dimension converted = new Dimension( dim );
-		
-		converted.width 		= scaleX( converted.width );
-		converted.height		= scaleY( converted.height );
-		
-		return converted;		
-	}
-
-	/**
-	 * Converts a point from windows coordinates to SVG coordinates.
-	 * @param pt
-	 * @return The converted point.
-	 */
-	public Point convertPointToSVGLogicalUnits( Point pt )
-	{
-		Point converted = new Point( pt );
-		
-		converted.x		= convertXToSVGLogicalUnits( converted.x );
-		converted.y		= convertYToSVGLogicalUnits( converted.y );
-		
-		return converted;		
-	}
-
-	/**
-	 * Sets the current background color.
-	 * @param color
-	 */
-	public void setBackColor( Color color ) 
-	{
-		m_backColor = color;
-	}
-
-	/**
-	 * @return The current background color.
-	 */
-	public Color getBackColor() 
-	{
-		return m_backColor;
-	}
-
-	/**
-	 * Sets the current text color.
-	 * @param color
-	 */
-	public void setTextColor( Color color ) 
-	{
-		m_textColor = color;
-	}
-
-	/**
-	 * @return The current text color.
-	 */
-	public Color getTextColor() 
-	{
-		return m_textColor;
-	}
-
-	/**
-	 * @return Retrieves the currently selected font.
-	 */
-	public GdiFont getCurFont() 
-	{
-		return m_curFont;
-	}
-
-	/**
-	 * Sets the currently selected font.
-	 * @param font
-	 */
-	public void setCurFont( GdiFont font ) 
-	{
-		m_curFont = font;
-	}
-
-	/**
-	 * @return The currently selected brush.
-	 */
-	public GdiBrush getCurBrush() 
-	{
-		return m_curBrush;
-	}
-
-	/**
-	 * Sets the currently selected brush.
-	 * @param brush
-	 */
-	public void setCurBrush( GdiBrush brush ) 
-	{
-		m_curBrush = brush;
-	}
-
-	/**
-	 * @return The currently selected pen.
-	 */
-	public GdiPen getCurPen() 
-	{
-		return m_curPen;
-	}
-
-	/**
-	 * Sets the current pen.
-	 * @param pen
-	 */
-	public void setCurPen( GdiPen pen ) 
-	{
-		m_curPen = pen;
-	}
-
-	/**
-	 * Retreives the next object id for use with WMF created objects.
-	 */ 
-	public int getNextObjectId()
-	{
-		// Find the next unique key.  This appears to be what the WMF files expect.
-		int objId = 0;
-
-		while( m_curDeviceContext.m_gdiObjectMap.containsKey( Integer.valueOf( objId ) ) )
-		{
-			objId++;
-		}
-
-		return objId;
-	}
-	
-	/**
-	 * Adds a new Gdi object to the set of objects that the user has allocated.
-	 * @param id - Identifier used to find this object.
-	 * @param gdiObject - object to add.
-	 */
-	public void addGDI( int id, Object gdiObject )
-	{
-		m_gdiObjectMap.put( Integer.valueOf( id ), gdiObject );
-	}
-
-	/**
-	 * Retrieves a GDI object based on it's id.
-	 * @param id  Identifier of the object to retrieve
-	 * @return  Gdi object associated with the specified identifier.
-	 */
-	public Object getGDI( int id )
-	{
-		return m_gdiObjectMap.get( Integer.valueOf( id ) );
-	}
-	
-	/**
-	 * Removes the specified Gdi object.
-	 * @param id ID of the object to remove.
-	 */
-	public void deleteGDI( int id )
-	{
-		m_gdiObjectMap.remove( Integer.valueOf( id ) );
-	}
-
-	/**
-	 * @return the dimensions, in device units, of the smallest rectangle that can be drawn around the picture stored in the metafile.  
-	 */
-	public Rectangle getBounds()
-	{
-		return new Rectangle( m_bounds );
-	}
-	
-	/**
-	 * Sets the bounds of the metafile.  Set when the metafile header is parsed.
-	 * @param rect
-	 */
-	public void setBounds( Rectangle rect )
-	{
-		m_bounds = rect;
-	}
-
-	/**
-	 * @return The number of dots per inch in the horizontal direction.
-	 */
-	public int getDpiX() 
-	{
-		return m_dpiX;
-	}
-
-	/**
-	 * Sets the number of dots per inch of the original display device.  This is set when the header record is parsed
-	 * and is used for unit conversion.
-	 * @param i
-	 */
-	public void setDpiX( int dpi ) 
-	{
-		if( dpi >= 60 )
-		{
-			m_dpiX = dpi;
-		}
-	}
-
-	/**
-	 * @return The number of dots per inch in the vertical direction.
-	 */
-	public int getDpiY() 
-	{
-		return m_dpiY;
-	}
-
-	/**
-	 * Sets the number of dots per inch of the original display device.  This is set when the header record is parsed
-	 * and is used for unit conversion.
-	 * @param i
-	 */
-	public void setDpiY( int dpi ) 
-	{
-		if( dpi >= 60 )
-		{
-			m_dpiY = dpi;
-		}
-	}
-
-	/**
-	 * @return The current text alignment.
-	 */
-	public int getTextAlignment() 
-	{
-		return m_textAlignment;
-	}
-
-	/**
-	 * Sets the current text alignment constant (TA_TOP, etc).
-	 * @param i
-	 */
-	public void setTextAlignment( int i ) 
-	{
-		m_textAlignment = i;
-	}
-
-	/**
-	 * @return Returns the fillMode.
-	 */
-	public int getPolyFillMode()
-	{
-		return m_fillMode;
-	}
-
-	/**
-	 * Sets the current polygon fill mode (FILL_MODE_ALTERNATE, FILL_MODE_WINDING)
-	 * @param fillMode The fillMode to set.
-	 */
-	public void setPolyFillMode( int fillMode )
-	{
-		m_fillMode = fillMode;
-	}
-
-	/**
-	 * @return Returns the arcDirection.
-	 */
-	public int getArcDirection()
-	{
-		return m_arcDirection;
-	}
-
-	/**
-	 * @param arcDirection The arcDirection to set.
-	 */
-	public void setArcDirection( int arcDirection )
-	{
-		m_arcDirection = arcDirection;
-	}
-	
-	/**
-	 * @return The current GdiPath object.
-	 */
-	public GdiPath getGdiPath()
-	{
-		return m_path;
-	}
-
-	/**
-	 * @return Returns the miterLimit.
-	 */
-	public float getMiterLimit()
-	{
-		return m_miterLimit;
-	}
-
-	/**
-	 * @param miterLimit The miterLimit to set.
-	 */
-	public void setMiterLimit( float miterLimit )
-	{
-		if( miterLimit < 1.0f )
-		{
-			miterLimit = 1.0f;
-		}
-		m_miterLimit = miterLimit;
-	}
-
-	/**
-	 * @return Returns the current background mode (OPAQUE, TRANSPARENT).
-	 */
-	public int getBkMode()
-	{
-		return m_bkMode;
-	}
-
-	/**
-	 * Sets the current background mode (OPAQUE, TRANSPARENT)
-	 * @param bkMode The bkMode to set.
-	 */
-	public void setBkMode(int bkMode)
-	{
-		m_bkMode = bkMode;
-	}
-
-	/**
-	 * Returns the currently selected region.
-	 * @return Returns the curClip.
-	 */
-	public GdiRegion getCurRegion() 
-	{
-		return m_curRegion;
-	}
-
-	/**
-	 * Sets the currently selected region.
-	 * @param curClip The curClip to set.
-	 */
-	public void setCurRegion( GdiRegion curRegion ) 
-	{
-		m_curRegion = curRegion;
-	}
-
-	/**
-	 * @return Returns the stretchBltMode.
-	 */
-	public int getStretchBltMode()
-	{
-		return m_stretchBltMode;
-	}
-
-	/**
-	 * @param stretchBltMode The stretchBltMode to set.
-	 */
-	public void setStretchBltMode( int stretchBltMode )
-	{
-		m_stretchBltMode = stretchBltMode;
-	}
-
-	/**
-	 * @return Returns the rOP2.
-	 */
-	public int getROP2()
-	{
-		return m_ROP2;
-	}
-
-	/**
-	 * @param rop2 The rOP2 to set.
-	 */
-	public void setROP2(int rop2)
-	{
-		m_ROP2 = rop2;
-	}
-	
-	/**
-	 * Sets a user defined property.  Not used by the base code, this is for
-	 * extensibility.  3rd parties may create their own transcoders or implement
-	 * support for different records.  When this happens they may use this
-	 * generic property map to dynamically add properties to the 
-	 * DeviceContext.
-	 * @param key
-	 * @param value
-	 */
-	public void setProperty( Object key, Object value )
-	{
-		m_userProps.put( key, value );
-	}
-
-	/**
-	 * Gets a user defined property.  Not used by the base code, this is for
-	 * extensibility.  3rd parties may create their own transcoders or implement
-	 * support for different records.  When this happens they may use this
-	 * generic property map to dynamically add properties to the 
-	 * DeviceContext.
-	 * @param key
-	 * @return The properties associated with the specified key.
-	 */
-	public Object getProperty( Object key )	
-	{
-		return m_userProps.get( key );
-	}
-
-	/**
-	 * Removes a user defined property.  Not used by the base code, this is for
-	 * extensibility.  3rd parties may create their own transcoders or implement
-	 * support for different records.  When this happens they may use this
-	 * generic property map to dynamically add properties to the 
-	 * DeviceContext.
-	 * @param key Property to remove
-	 */
-	public void removeProperty( Object key )
-	{
-		m_userProps.remove( key );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFRecord.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFRecord.java
deleted file mode 100644
index 74f03db..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFRecord.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * The EMFRecord class reads the record header from an EMF record, then reads the
- * record's data into a buffer.  The record header contains the type of the
- * record and the size of the record.
- * 
- * @author dhabib
- */
-public class EMFRecord extends Record 
-{
-	/** Size of the metafile record header, which consists of 4 bytes for the type and 4 bytes for the record size */
-	public static final int	EMR_HEADER_SIZE		= 8;
-
-	/**
-	 * Initializes the record by reading the record header from the specified stream, then reading the
-	 * record data.
-	 * @param stream Stream to read the data from.
-	 * @throws IOException Thrown if there is an error in stream (end of stream encountered before all the data could be read)
-	 */
-	public EMFRecord( BufferedInputStream stream ) throws IOException
-	{
-		setType( (int)readDWORD( stream ) );
-		setSize( (int) readDWORD( stream ) - 8 );	// Subtract 8 bytes for the header
-		readData( stream );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFTranscoder.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFTranscoder.java
deleted file mode 100644
index f1c9b09..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EMFTranscoder.java
+++ /dev/null
@@ -1,1042 +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.awt.internal.svg.metafile;
-
-import java.awt.Dimension;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbortPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AngleArc;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Arc;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.BeginPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.BitBlt;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CloseFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreateBrushIndirect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreateFontIndirect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreatePatternBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreatePen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeleteObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFRecord;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EOF;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Ellipse;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EndPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ExtCreatePen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ExtTextOut;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.FillPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.FlattenPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Header;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderableObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.LineTo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ModifyWorldTransform;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.MoveTo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyBezier;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyDraw;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyPolyLine;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyPolygon;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Polygon;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Polyline;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolylineTo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.RestoreDC;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.RoundRect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SaveDC;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SelectObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetArcDirection;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetBkColor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetBkMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetMiterLimit;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetPolyFillMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetROP2;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetStretchBltMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetTextAlign;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetTextColor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetViewportExtent;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetViewportOrg;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetWindowExtent;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetWindowOrg;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StretchBlt;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StretchDIBits;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StrokeAndFillPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StrokePath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.TranscoderException;
-
-
-/**
- * This class implements a fairly simple transcoder for Windows format Enhanced Metafiles.  It reads the
- * metafile records and turns them into SVG.  It uses the Batik libraries for the SVG generation.
- * 
- * To use this class, create an input stream containing the contents of an EMF file.
- * Create an output stream to hold the generated SVG data.
- * Finally, create an instance of EMFTranscoder and call transcode( input, output ).  If there are no errors
- * the output stream will contain the SVG output.
- * 
- * This implementation covers a subset of the metafile records.  It is possible to extend this class by 
- * overriding the 'getConverter' method, and creating classes that implement IEmf2SvgConverter to handle the 
- * additional record types.  See 'getConverter' and the IEmf2SvgConverter interface for more details.  
- * 
- * This class should not be used externally.  The diagramming engine can support
- * rendering of EMF and WMF files through the RenderedImage infrastructure now,
- * so it is not necessary for clients to convert them to SVG before creating the
- * RenderedImage file.
- * 
- * @author dhabib
- * @author sshaw
- */
-public class EMFTranscoder extends AbstractTranscoder
-{
-	private static final int EMR_HEADER 						= 1;
-	private static final int EMR_POLYBEZIER 					= 2;
-	private static final int EMR_POLYGON						= 3;
-	private static final int EMR_POLYLINE						= 4;
-	private static final int EMR_POLYBEZIERTO					= 5;
-	private static final int EMR_POLYLINETO 					= 6;
-	private static final int EMR_POLYPOLYLINE					= 7;
-	private static final int EMR_POLYPOLYGON					= 8;
-	private static final int EMR_SETWINDOWEXTEX 				= 9;
-	private static final int EMR_SETWINDOWORGEX 				= 10;
-	private static final int EMR_SETVIEWPORTEXTEX				= 11;
-	private static final int EMR_SETVIEWPORTORGEX				= 12;
-	private static final int EMR_SETBRUSHORGEX				= 13;
-	private static final int EMR_EOF							= 14;
-	private static final int EMR_SETPIXELV					= 15;
-	private static final int EMR_SETMAPPERFLAGS 				= 16;
-	private static final int EMR_SETMAPMODE 					= 17;
-	private static final int EMR_SETBKMODE					= 18;
-	private static final int EMR_SETPOLYFILLMODE				= 19;
-	private static final int EMR_SETROP2						= 20;
-	private static final int EMR_SETSTRETCHBLTMODE			= 21;
-	private static final int EMR_SETTEXTALIGN					= 22;
-	private static final int EMR_SETCOLORADJUSTMENT 			= 23;
-	private static final int EMR_SETTEXTCOLOR					= 24;
-	private static final int EMR_SETBKCOLOR 					= 25;
-	private static final int EMR_OFFSETCLIPRGN				= 26;
-	private static final int EMR_MOVETOEX						= 27;
-	private static final int EMR_SETMETARGN 					= 28;
-	private static final int EMR_EXCLUDECLIPRECT				= 29;
-	private static final int EMR_INTERSECTCLIPRECT			= 30;
-	private static final int EMR_SCALEVIEWPORTEXTEX 			= 31;
-	private static final int EMR_SCALEWINDOWEXTEX				= 32;
-	private static final int EMR_SAVEDC 						= 33;
-	private static final int EMR_RESTOREDC					= 34;
-	private static final int EMR_SETWORLDTRANSFORM			= 35;
-	private static final int EMR_MODIFYWORLDTRANSFORM			= 36;
-	private static final int EMR_SELECTOBJECT					= 37;
-	private static final int EMR_CREATEPEN					= 38;
-	private static final int EMR_CREATEBRUSHINDIRECT			= 39;
-	private static final int EMR_DELETEOBJECT					= 40;
-	private static final int EMR_ANGLEARC						= 41;
-	private static final int EMR_ELLIPSE						= 42;
-	private static final int EMR_RECTANGLE					= 43;
-	private static final int EMR_ROUNDRECT					= 44;
-	private static final int EMR_ARC							= 45;
-	private static final int EMR_CHORD						= 46;
-	private static final int EMR_PIE							= 47;
-	private static final int EMR_SELECTPALETTE				= 48;
-	private static final int EMR_CREATEPALETTE				= 49;
-	private static final int EMR_SETPALETTEENTRIES			= 50;
-	private static final int EMR_RESIZEPALETTE				= 51;
-	private static final int EMR_REALIZEPALETTE 				= 52;
-	private static final int EMR_EXTFLOODFILL					= 53;
-	private static final int EMR_LINETO 						= 54;
-	private static final int EMR_ARCTO						= 55;
-	private static final int EMR_POLYDRAW						= 56;
-	private static final int EMR_SETARCDIRECTION				= 57;
-	private static final int EMR_SETMITERLIMIT				= 58;
-	private static final int EMR_BEGINPATH					= 59;
-	private static final int EMR_ENDPATH						= 60;
-	private static final int EMR_CLOSEFIGURE					= 61;
-	private static final int EMR_FILLPATH						= 62;
-	private static final int EMR_STROKEANDFILLPATH			= 63;
-	private static final int EMR_STROKEPATH 					= 64;
-	private static final int EMR_FLATTENPATH					= 65;
-	private static final int EMR_WIDENPATH					= 66;
-	private static final int EMR_SELECTCLIPPATH 				= 67;
-	private static final int EMR_ABORTPATH					= 68;
-
-	private static final int EMR_GDICOMMENT 					= 70;
-	private static final int EMR_FILLRGN						= 71;
-	private static final int EMR_FRAMERGN						= 72;
-	private static final int EMR_INVERTRGN					= 73;
-	private static final int EMR_PAINTRGN						= 74;
-	private static final int EMR_EXTSELECTCLIPRGN				= 75;
-	private static final int EMR_BITBLT 						= 76;
-	private static final int EMR_STRETCHBLT 					= 77;
-	private static final int EMR_MASKBLT						= 78;
-	private static final int EMR_PLGBLT 						= 79;
-	private static final int EMR_SETDIBITSTODEVICE			= 80;
-	private static final int EMR_STRETCHDIBITS				= 81;
-	private static final int EMR_EXTCREATEFONTINDIRECTW 		= 82;
-	private static final int EMR_EXTTEXTOUTA					= 83;
-	private static final int EMR_EXTTEXTOUTW					= 84;
-	private static final int EMR_POLYBEZIER16					= 85;
-	private static final int EMR_POLYGON16					= 86;
-	private static final int EMR_POLYLINE16 					= 87;
-	private static final int EMR_POLYBEZIERTO16 				= 88;
-	private static final int EMR_POLYLINETO16					= 89;
-	private static final int EMR_POLYPOLYLINE16 				= 90;
-	private static final int EMR_POLYPOLYGON16				= 91;
-	private static final int EMR_POLYDRAW16 					= 92;
-	private static final int EMR_CREATEMONOBRUSH				= 93;
-	private static final int EMR_CREATEDIBPATTERNBRUSHPT		= 94;
-	private static final int EMR_EXTCREATEPEN					= 95;
-	private static final int EMR_POLYTEXTOUTA					= 96;
-	private static final int EMR_POLYTEXTOUTW					= 97;
-
-	private static final int EMR_SETICMMODE 					= 98;
-	private static final int EMR_CREATECOLORSPACE				= 99;
-	private static final int EMR_SETCOLORSPACE				= 100;
-	private static final int EMR_DELETECOLORSPACE				= 101;
-	private static final int EMR_GLSRECORD					= 102;
-	private static final int EMR_GLSBOUNDEDRECORD				= 103;
-	private static final int EMR_PIXELFORMAT					= 104;
-
-	private static final int EMR_DRAWESCAPE 					= 105;
-	private static final int EMR_EXTESCAPE					= 106;
-	private static final int EMR_STARTDOC						= 107;
-	private static final int EMR_SMALLTEXTOUT					= 108;
-	private static final int EMR_FORCEUFIMAPPING				= 109;
-	private static final int EMR_NAMEDESCAPE					= 110;
-	private static final int EMR_COLORCORRECTPALETTE			= 111;
-	private static final int EMR_SETICMPROFILEA 				= 112;
-	private static final int EMR_SETICMPROFILEW 				= 113;
-	private static final int EMR_ALPHABLEND 					= 114;
-	private static final int EMR_ALPHADIBBLEND				= 115;
-	private static final int EMR_TRANSPARENTBLT 				= 116;
-	private static final int EMR_TRANSPARENTDIB 				= 117;
-	private static final int EMR_GRADIENTFILL					= 118;
-	private static final int EMR_SETLINKEDUFIS				= 119;
-	private static final int EMR_SETTEXTJUSTIFICATION			= 120;
-	
-	private int m_numRecords	= 0;
-	
-	/**
-	 * Reads the APM/WMF header from the input stream.  These records are
-	 * special since they don't follow the normal WMF record format (no
-	 * type and size).  This method constructs a fake header record
-	 * and returns it to the caller.
-	 * 
-	 * @param stream Contains the data for the WMF/APM file
-	 * @return <code>boolean</code> <code>true</code> if the header portion of the stream is validated
-	 * to be part of an EMF file, <code>false</code> otherwise.
-	 * @throws IOException
-	 */
-	private boolean validateHeader( BufferedInputStream stream ) throws IOException
-	{
-		// Mark the stream so we can reset to the current position.
-		stream.mark( 1000 );
-		
-		// See if it's an APM
-		Record rec = new Record( 0, EMFRecord.EMR_HEADER_SIZE, stream );
-		
-		int type = (int)rec.getDWORDAt( 0 );
-		int size = (int)rec.getDWORDAt( 4 );	// Subtract 8 bytes for the header
-		
-		// verify type and that size is something reasonable...
-		if (type == EMR_HEADER && size < 5000) {
-			stream.reset();
-			return true;
-		}
-		
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getNextRecord(java.io.BufferedInputStream, int)
-	 */
-	protected Record getNextRecord(	BufferedInputStream stream,
-									int curRecord ) throws IOException
-	{
-		EMFRecord rec = null;
-		
-		if( curRecord == 0 )
-		{
-			// Read the metafile header.  Unlike EMF, this is not a standard record type,
-			// so we have to special case it here...
-			if (!validateHeader( stream )) {
-				throw new IOException( "Invalid Enhanced Metafile Format:  Invalid header" );//$NON-NLS-1$
-			}
-		}
-		
-		// if curRecord is 0 then we need to read the header since that
-		// contains the total number of records.
-		if( curRecord == 0 || curRecord < m_numRecords )
-		{
-			rec = new EMFRecord( stream );
-		}
-		
-		return rec;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getConverter(org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.Record)
-	 */
-	protected IRenderableObject getConverter( Record emr ) throws TranscoderException
-	{
-		IRenderableObject svgConverter = null;
-		
-		switch( emr.getType() )
-		{
-			case EMR_HEADER:
-				svgConverter = new Header();
-				break;
-
-			case EMR_MOVETOEX:
-				svgConverter = new MoveTo();
-				break;
-
-			case EMR_LINETO:
-				svgConverter = new LineTo();
-				break;
-
-			case EMR_POLYGON16:
-				svgConverter = new Polygon( true );
-				break;
-
-			case EMR_POLYGON:
-				svgConverter = new Polygon( false );
-				break;
-
-			case EMR_POLYBEZIER:
-				svgConverter = new PolyBezier( false, false );
-				break;
-				
-			case EMR_POLYBEZIER16:
-				svgConverter = new PolyBezier( true, false );
-				break;
-
-			case EMR_POLYBEZIERTO:
-				svgConverter = new PolyBezier( false, true );
-				break;
-
-			case EMR_POLYBEZIERTO16:
-				svgConverter = new PolyBezier( true, true );
-				break;
-
-			case EMR_POLYLINE:
-				svgConverter = new Polyline( false );
-				break;
-
-			case EMR_POLYLINE16:
-				svgConverter = new Polyline( true );
-				break;
-
-			case EMR_POLYLINETO:
-				svgConverter = new PolylineTo( false );
-				break;
-
-			case EMR_POLYLINETO16:
-				svgConverter = new PolylineTo( true );
-				break;
-
-			case EMR_POLYPOLYLINE:
-				svgConverter = new PolyPolyLine( false );
-				break;	
-
-			case EMR_POLYPOLYLINE16:
-				svgConverter = new PolyPolyLine( true );
-				break;	
-
-			case EMR_POLYPOLYGON:
-				svgConverter = new PolyPolygon( false );
-				break;
-				
-			case EMR_POLYPOLYGON16:
-				svgConverter = new PolyPolygon( true );
-				break;
-
-			case EMR_SETWINDOWEXTEX:
-				svgConverter = new SetWindowExtent();
-				break;
-
-			case EMR_SETVIEWPORTEXTEX:
-				svgConverter = new SetViewportExtent();
-				break;
-
-			case EMR_SETWINDOWORGEX:
-				svgConverter = new SetWindowOrg();
-				break;
-				
-			case EMR_SETVIEWPORTORGEX:
-				svgConverter = new SetViewportOrg();
-				break;
-				
-			case EMR_SETMAPMODE:
-				svgConverter = new SetMapMode();
-				break;
-			
-			case EMR_SETTEXTCOLOR:
-				svgConverter = new SetTextColor();
-				break;
-			
-			case EMR_SETBKCOLOR:
-				svgConverter = new SetBkColor();
-				break;
-
-			case EMR_CREATEBRUSHINDIRECT:
-				svgConverter = new CreateBrushIndirect();
-				break;
-				
-			case EMR_CREATEDIBPATTERNBRUSHPT:
-				svgConverter = new CreatePatternBrush( true );
-				break;
-
-			case EMR_CREATEMONOBRUSH:
-				svgConverter = new CreatePatternBrush( false );
-				break;
-
-			case EMR_CREATEPEN:
-				svgConverter = new CreatePen();
-				break;
-				
-			case EMR_EXTCREATEFONTINDIRECTW:
-				svgConverter = new CreateFontIndirect();
-				break;
-			
-			case EMR_SELECTOBJECT:
-				svgConverter = new SelectObject();
-				break;
-				
-			case EMR_DELETEOBJECT:
-				svgConverter = new DeleteObject();
-				break;
-
-			case EMR_SETTEXTALIGN:
-				svgConverter = new SetTextAlign();
-				break;
-
-			case EMR_EXTTEXTOUTA:
-				svgConverter = new ExtTextOut( false );
-				break;
-
-			case EMR_EXTTEXTOUTW:
-				svgConverter = new ExtTextOut( true );
-				break;
-
-			case EMR_ELLIPSE:
-				svgConverter = new Ellipse();
-				break;
-				
-			case EMR_RECTANGLE:
-				svgConverter = new Rectangle();
-				break;
-
-			case EMR_ROUNDRECT:
-				svgConverter = new RoundRect();
-				break;
-
-			case EMR_SETARCDIRECTION:
-				svgConverter = new SetArcDirection();
-				break;
-				
-			case EMR_ARC:
-				svgConverter = new Arc( Arc.ARC );
-				break;
-
-			case EMR_ARCTO:
-				svgConverter = new Arc( Arc.ARCTO );
-				break;
-
-			case EMR_PIE:
-				svgConverter = new Arc( Arc.PIE );
-				break;
-
-			case EMR_CHORD:
-				svgConverter = new Arc( Arc.CHORD );
-				break;
-
-			case EMR_ANGLEARC:
-				svgConverter = new AngleArc();
-				break;
-
-			case EMR_POLYDRAW:
-				svgConverter = new PolyDraw( false );
-				break;
-
-			case EMR_POLYDRAW16:
-				svgConverter = new PolyDraw( true );
-				break;
-				
-			case EMR_SETPOLYFILLMODE:
-				svgConverter = new SetPolyFillMode();
-				break;
-				
-			case EMR_EXTCREATEPEN:
-				svgConverter = new ExtCreatePen();
-				break;
-
-			case EMR_BEGINPATH:
-				svgConverter = new BeginPath();
-				break;
-
-			case EMR_ENDPATH:
-				svgConverter = new EndPath();
-				break;
-
-			case EMR_ABORTPATH:
-				svgConverter = new AbortPath();
-				break;
-
-			case EMR_FILLPATH:
-				svgConverter = new FillPath();
-				break;
-
-			case EMR_STROKEPATH:
-				svgConverter = new StrokePath();
-				break;
-
-			case EMR_STROKEANDFILLPATH:
-				svgConverter = new StrokeAndFillPath();
-				break;
-
-			case EMR_CLOSEFIGURE:
-				svgConverter = new CloseFigure();
-				break;
-
-			case EMR_FLATTENPATH:
-				svgConverter = new FlattenPath();
-				break;
-	
-			case EMR_SETMITERLIMIT:
-				svgConverter = new SetMiterLimit();
-				break;
-
-			case EMR_WIDENPATH:
-				// Probably don't need this.
-				break;
-				
-			case EMR_SETBKMODE:
-				svgConverter = new SetBkMode();
-				break;
-
-			case EMR_EOF:
-				svgConverter = new EOF();
-				break;
-
-			case EMR_BITBLT:
-				svgConverter = new BitBlt();
-				break;
-				
-			case EMR_STRETCHBLT:
-				svgConverter = new StretchBlt();
-				break;
-
-			case EMR_STRETCHDIBITS:
-				svgConverter = new StretchDIBits();
-				break;
-
-			case EMR_SETSTRETCHBLTMODE:
-				svgConverter = new SetStretchBltMode();
-				break;
-
-			case EMR_SETROP2:
-				svgConverter = new SetROP2();
-				break;
-
-			case EMR_SAVEDC:
-				svgConverter = new SaveDC();
-				break;
-
-			case EMR_RESTOREDC:
-				svgConverter = new RestoreDC();
-				break;
-
-			case EMR_MODIFYWORLDTRANSFORM:
-				svgConverter = new ModifyWorldTransform();
-				break;
-				
-				// To be implemented:
-			case EMR_MASKBLT:
-			case EMR_PLGBLT:
-
-			// Not yet implemented:
-
-			case EMR_SELECTPALETTE:
-			case EMR_CREATEPALETTE:
-			case EMR_SETPALETTEENTRIES:
-			case EMR_RESIZEPALETTE:
-			case EMR_REALIZEPALETTE:
-
-			case EMR_SELECTCLIPPATH:
-			case EMR_FRAMERGN:
-			case EMR_INVERTRGN:
-			case EMR_PAINTRGN:
-			case EMR_EXTSELECTCLIPRGN:
-			case EMR_EXCLUDECLIPRECT:
-			case EMR_INTERSECTCLIPRECT:
-			case EMR_FILLRGN:
-			case EMR_OFFSETCLIPRGN:
-			case EMR_SETMETARGN:
-		
-			case EMR_SETPIXELV:
-			case EMR_EXTFLOODFILL:
-				// These are not really scalable since it's pixel by pixel.  Not sure what
-				// SVG will do with these.  Not easy to implement in a reasonable way.
-
-			case EMR_SETCOLORADJUSTMENT:
-			case EMR_GRADIENTFILL:
-			
-
-			case EMR_POLYTEXTOUTA:
-			case EMR_POLYTEXTOUTW:
-
-			case EMR_SETBRUSHORGEX:
-			case EMR_SETMAPPERFLAGS:
-			case EMR_SCALEVIEWPORTEXTEX:
-			case EMR_SCALEWINDOWEXTEX:
-			case EMR_SETWORLDTRANSFORM:
-			case EMR_GDICOMMENT:
-
-			case EMR_SETDIBITSTODEVICE:
-			case EMR_SETICMMODE:
-			case EMR_CREATECOLORSPACE:
-			case EMR_SETCOLORSPACE:
-			case EMR_DELETECOLORSPACE:
-			case EMR_GLSRECORD:
-			case EMR_GLSBOUNDEDRECORD:
-			case EMR_FORCEUFIMAPPING:
-			case EMR_COLORCORRECTPALETTE:
-			case EMR_SETICMPROFILEA:
-			case EMR_SETICMPROFILEW:
-			case EMR_ALPHABLEND:
-			case EMR_ALPHADIBBLEND:
-			case EMR_TRANSPARENTBLT:
-			case EMR_TRANSPARENTDIB:
-			case EMR_SETLINKEDUFIS:
-			case EMR_SETTEXTJUSTIFICATION:
-
-			// Can't find definitions in the docs for these.
-			case EMR_PIXELFORMAT:
-			case EMR_DRAWESCAPE:
-			case EMR_EXTESCAPE:
-			case EMR_STARTDOC:
-			case EMR_NAMEDESCAPE:
-			case EMR_SMALLTEXTOUT:
-			default:
-				break;
-		}
-		
-		if( svgConverter != null )
-		{
-			initializeConverter( svgConverter, emr );
-		}
-
-		return svgConverter;
-	}
-	
-	/**
-	 * Initializes the specified converter with data from the specified record.
-	 * @param svgConverter
-	 * @param rec
-	 * @throws TranscoderException
-	 */
-	private void initializeConverter( IRenderableObject svgConverter, Record rec ) throws TranscoderException
-	{
-		try
-		{
-			IEmf2SvgConverter converter = (IEmf2SvgConverter) svgConverter;
-			converter.readEMFRecord( rec );
-			
-			// Header record is special.  It contains info that the transcoder needs to function
-			// such as the number of records in the metafile.
-			if( converter instanceof Header )
-			{
-				Header header = (Header) converter;
-				m_numRecords = header.getNumRecords();
-				setSize( new Dimension( header.getBounds().width, header.getBounds().height ) );
-			}
-		}
-		catch( IOException e )
-		{
-			throw new TranscoderException( e, false ); // don't log this exception since it will be used for autosense failure
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getUserFriendlyName(int)
-	 */
-	protected String getUserFriendlyName( int emrType )
-	{
-		String name = "";  //$NON-NLS-1$
-		
-		switch( emrType )
-		{
-			case EMR_HEADER:
-				name = "HEADER"; //$NON-NLS-1$
-				break;
-			case EMR_POLYBEZIER:
-				name = "POLYBEZIER"; //$NON-NLS-1$
-				break;
-			case EMR_POLYGON:
-				name = "POLYGON"; //$NON-NLS-1$
-				break;
-			case EMR_POLYLINE:
-				name = "POLYLINE"; //$NON-NLS-1$
-				break;
-			case EMR_POLYBEZIERTO:
-				name = "POLYBEZIERTO"; //$NON-NLS-1$
-				break;
-			case EMR_POLYLINETO:
-				name = "POLYLINETO"; //$NON-NLS-1$
-				break;
-			case EMR_POLYPOLYLINE:
-				name = "POLYPOLYLINE"; //$NON-NLS-1$
-				break;
-			case EMR_POLYPOLYGON:
-				name = "POLYPOLYGON"; //$NON-NLS-1$
-				break;
-			case EMR_SETWINDOWEXTEX:
-				name = "SETWINDOWEXTEX"; //$NON-NLS-1$
-				break;
-			case EMR_SETWINDOWORGEX:
-				name = "SETWINDOWORGEX"; //$NON-NLS-1$
-				break;
-			case EMR_SETVIEWPORTEXTEX:
-				name = "SETVIEWPORTEXTEX"; //$NON-NLS-1$
-				break;
-			case EMR_SETVIEWPORTORGEX:
-				name = "SETVIEWPORTORGEX"; //$NON-NLS-1$
-				break;
-			case EMR_SETBRUSHORGEX:
-				name = "SETBRUSHORGEX"; //$NON-NLS-1$
-				break;
-			case EMR_EOF:
-				name = "EOF"; //$NON-NLS-1$
-				break;
-			case EMR_SETPIXELV:
-				name = "SETPIXELV"; //$NON-NLS-1$
-				break;
-			case EMR_SETMAPPERFLAGS:
-				name = "SETMAPPERFLAGS"; //$NON-NLS-1$
-				break;
-			case EMR_SETMAPMODE:
-				name = "SETMAPMODE"; //$NON-NLS-1$
-				break;
-			case EMR_SETBKMODE:
-				name = "SETBKMODE"; //$NON-NLS-1$
-				break;
-			case EMR_SETPOLYFILLMODE:
-				name = "SETPOLYFILLMODE"; //$NON-NLS-1$
-				break;
-			case EMR_SETROP2:
-				name = "SETROP2"; //$NON-NLS-1$
-				break;
-			case EMR_SETSTRETCHBLTMODE:
-				name = "SETSTRETCHBLTMODE"; //$NON-NLS-1$
-				break;
-			case EMR_SETTEXTALIGN:
-				name = "SETTEXTALIGN"; //$NON-NLS-1$
-				break;
-			case EMR_SETCOLORADJUSTMENT:
-				name = "SETCOLORADJUSTMENT"; //$NON-NLS-1$
-				break;
-			case EMR_SETTEXTCOLOR:
-				name = "SETTEXTCOLOR"; //$NON-NLS-1$
-				break;
-			case EMR_SETBKCOLOR:
-				name = "SETBKCOLOR"; //$NON-NLS-1$
-				break;
-			case EMR_OFFSETCLIPRGN:
-				name = "OFFSETCLIPRGN"; //$NON-NLS-1$
-				break;
-			case EMR_MOVETOEX:
-				name = "MOVETOEX"; //$NON-NLS-1$
-				break;
-			case EMR_SETMETARGN:
-				name = "SETMETARGN"; //$NON-NLS-1$
-				break;
-			case EMR_EXCLUDECLIPRECT:
-				name = "EXCLUDECLIPRECT"; //$NON-NLS-1$
-				break;
-			case EMR_INTERSECTCLIPRECT:
-				name = "INTERSECTCLIPRECT"; //$NON-NLS-1$
-				break;
-			case EMR_SCALEVIEWPORTEXTEX:
-				name = "SCALEVIEWPORTEXTEX"; //$NON-NLS-1$
-				break;
-			case EMR_SCALEWINDOWEXTEX:
-				name = "SCALEWINDOWEXTEX"; //$NON-NLS-1$
-				break;
-			case EMR_SAVEDC:
-				name = "SAVEDC"; //$NON-NLS-1$
-				break;
-			case EMR_RESTOREDC:
-				name = "RESTOREDC"; //$NON-NLS-1$
-				break;
-			case EMR_SETWORLDTRANSFORM:
-				name = "SETWORLDTRANSFORM"; //$NON-NLS-1$
-				break;
-			case EMR_MODIFYWORLDTRANSFORM:
-				name = "MODIFYWORLDTRANSFORM"; //$NON-NLS-1$
-				break;
-			case EMR_SELECTOBJECT:
-				name = "SELECTOBJECT"; //$NON-NLS-1$
-				break;
-			case EMR_CREATEPEN:
-				name = "CREATEPEN"; //$NON-NLS-1$
-				break;
-			case EMR_CREATEBRUSHINDIRECT:
-				name = "CREATEBRUSHINDIRECT"; //$NON-NLS-1$
-				break;
-			case EMR_DELETEOBJECT:
-				name = "DELETEOBJECT"; //$NON-NLS-1$
-				break;
-			case EMR_ANGLEARC:
-				name = "ANGLEARC"; //$NON-NLS-1$
-				break;
-			case EMR_ELLIPSE:
-				name = "ELLIPSE"; //$NON-NLS-1$
-				break;
-			case EMR_RECTANGLE:
-				name = "RECTANGLE"; //$NON-NLS-1$
-				break;
-			case EMR_ROUNDRECT:
-				name = "ROUNDRECT"; //$NON-NLS-1$
-				break;
-			case EMR_ARC:
-				name = "ARC"; //$NON-NLS-1$
-				break;
-			case EMR_CHORD:
-				name = "CHORD"; //$NON-NLS-1$
-				break;
-			case EMR_PIE:
-				name = "PIE"; //$NON-NLS-1$
-				break;
-			case EMR_SELECTPALETTE:
-				name = "SELECTPALETTE"; //$NON-NLS-1$
-				break;
-			case EMR_CREATEPALETTE:
-				name = "CREATEPALETTE"; //$NON-NLS-1$
-				break;
-			case EMR_SETPALETTEENTRIES:
-				name = "SETPALETTEENTRIES"; //$NON-NLS-1$
-				break;
-			case EMR_RESIZEPALETTE:
-				name = "RESIZEPALETTE"; //$NON-NLS-1$
-				break;
-			case EMR_REALIZEPALETTE:
-				name = "REALIZEPALETTE"; //$NON-NLS-1$
-				break;
-			case EMR_EXTFLOODFILL:
-				name = "EXTFLOODFILL"; //$NON-NLS-1$
-				break;
-			case EMR_LINETO:
-				name = "LINETO"; //$NON-NLS-1$
-				break;
-			case EMR_ARCTO:
-				name = "ARCTO"; //$NON-NLS-1$
-				break;
-			case EMR_POLYDRAW:
-				name = "POLYDRAW"; //$NON-NLS-1$
-				break;
-			case EMR_SETARCDIRECTION:
-				name = "SETARCDIRECTION"; //$NON-NLS-1$
-				break;
-			case EMR_SETMITERLIMIT:
-				name = "SETMITERLIMIT"; //$NON-NLS-1$
-				break;
-			case EMR_BEGINPATH:
-				name = "BEGINPATH"; //$NON-NLS-1$
-				break;
-			case EMR_ENDPATH:
-				name = "ENDPATH"; //$NON-NLS-1$
-				break;
-			case EMR_CLOSEFIGURE:
-				name = "CLOSEFIGURE"; //$NON-NLS-1$
-				break;
-			case EMR_FILLPATH:
-				name = "FILLPATH"; //$NON-NLS-1$
-				break;
-			case EMR_STROKEANDFILLPATH:
-				name = "STROKEANDFILLPATH"; //$NON-NLS-1$
-				break;
-			case EMR_STROKEPATH:
-				name = "STROKEPATH"; //$NON-NLS-1$
-				break;
-			case EMR_FLATTENPATH:
-				name = "FLATTENPATH"; //$NON-NLS-1$
-				break;
-			case EMR_WIDENPATH:
-				name = "WIDENPATH"; //$NON-NLS-1$
-				break;
-			case EMR_SELECTCLIPPATH:
-				name = "SELECTCLIPPATH"; //$NON-NLS-1$
-				break;
-			case EMR_ABORTPATH:
-				name = "ABORTPATH"; //$NON-NLS-1$
-				break;
-			case EMR_GDICOMMENT:
-				name = "GDICOMMENT"; //$NON-NLS-1$
-				break;
-			case EMR_FILLRGN:
-				name = "FILLRGN"; //$NON-NLS-1$
-				break;
-			case EMR_FRAMERGN:
-				name = "FRAMERGN"; //$NON-NLS-1$
-				break;
-			case EMR_INVERTRGN:
-				name = "INVERTRGN"; //$NON-NLS-1$
-				break;
-			case EMR_PAINTRGN:
-				name = "PAINTRGN"; //$NON-NLS-1$
-				break;
-			case EMR_EXTSELECTCLIPRGN:
-				name = "EXTSELECTCLIPRGN"; //$NON-NLS-1$
-				break;
-			case EMR_BITBLT:
-				name = "BITBLT"; //$NON-NLS-1$
-				break;
-			case EMR_STRETCHBLT:
-				name = "STRETCHBLT"; //$NON-NLS-1$
-				break;
-			case EMR_MASKBLT:
-				name = "MASKBLT"; //$NON-NLS-1$
-				break;
-			case EMR_PLGBLT:
-				name = "PLGBLT"; //$NON-NLS-1$
-				break;
-			case EMR_SETDIBITSTODEVICE:
-				name = "SETDIBITSTODEVICE"; //$NON-NLS-1$
-				break;
-			case EMR_STRETCHDIBITS:
-				name = "STRETCHDIBITS"; //$NON-NLS-1$
-				break;
-			case EMR_EXTCREATEFONTINDIRECTW:
-				name = "EXTCREATEFONTINDIRECTW"; //$NON-NLS-1$
-				break;
-			case EMR_EXTTEXTOUTA:
-				name = "EXTTEXTOUTA"; //$NON-NLS-1$
-				break;
-			case EMR_EXTTEXTOUTW:
-				name = "EXTTEXTOUTW"; //$NON-NLS-1$
-				break;
-			case EMR_POLYBEZIER16:
-				name = "POLYBEZIER16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYGON16:
-				name = "POLYGON16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYLINE16:
-				name = "POLYLINE16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYBEZIERTO16:
-				name = "POLYBEZIERTO16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYLINETO16:
-				name = "POLYLINETO16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYPOLYLINE16:
-				name = "POLYPOLYLINE16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYPOLYGON16:
-				name = "POLYPOLYGON16"; //$NON-NLS-1$
-				break;
-			case EMR_POLYDRAW16:
-				name = "POLYDRAW16"; //$NON-NLS-1$
-				break;
-			case EMR_CREATEMONOBRUSH:
-				name = "CREATEMONOBRUSH"; //$NON-NLS-1$
-				break;
-			case EMR_CREATEDIBPATTERNBRUSHPT:
-				name = "CREATEDIBPATTERNBRUSHPT"; //$NON-NLS-1$
-				break;
-			case EMR_EXTCREATEPEN:
-				name = "EXTCREATEPEN"; //$NON-NLS-1$
-				break;
-			case EMR_POLYTEXTOUTA:
-				name = "POLYTEXTOUTA"; //$NON-NLS-1$
-				break;
-			case EMR_POLYTEXTOUTW:
-				name = "POLYTEXTOUTW"; //$NON-NLS-1$
-				break;
-			case EMR_SETICMMODE:
-				name = "SETICMMODE"; //$NON-NLS-1$
-				break;
-			case EMR_CREATECOLORSPACE:
-				name = "CREATECOLORSPACE"; //$NON-NLS-1$
-				break;
-			case EMR_SETCOLORSPACE:
-				name = "SETCOLORSPACE"; //$NON-NLS-1$
-				break;
-			case EMR_DELETECOLORSPACE:
-				name = "DELETECOLORSPACE"; //$NON-NLS-1$
-				break;
-			case EMR_GLSRECORD:
-				name = "GLSRECORD"; //$NON-NLS-1$
-				break;
-			case EMR_GLSBOUNDEDRECORD:
-				name = "GLSBOUNDEDRECORD"; //$NON-NLS-1$
-				break;
-			case EMR_PIXELFORMAT:
-				name = "PIXELFORMAT"; //$NON-NLS-1$
-				break;
-			case EMR_DRAWESCAPE:
-				name = "DRAWESCAPE"; //$NON-NLS-1$
-				break;
-			case EMR_EXTESCAPE:
-				name = "EXTESCAPE"; //$NON-NLS-1$
-				break;
-			case EMR_STARTDOC:
-				name = "STARTDOC"; //$NON-NLS-1$
-				break;
-			case EMR_SMALLTEXTOUT:
-				name = "SMALLTEXTOUT"; //$NON-NLS-1$
-				break;
-			case EMR_FORCEUFIMAPPING:
-				name = "FORCEUFIMAPPING"; //$NON-NLS-1$
-				break;
-			case EMR_NAMEDESCAPE:
-				name = "NAMEDESCAPE"; //$NON-NLS-1$
-				break;
-			case EMR_COLORCORRECTPALETTE:
-				name = "COLORCORRECTPALETTE"; //$NON-NLS-1$
-				break;
-			case EMR_SETICMPROFILEA:
-				name = "SETICMPROFILEA"; //$NON-NLS-1$
-				break;
-			case EMR_SETICMPROFILEW:
-				name = "SETICMPROFILEW"; //$NON-NLS-1$
-				break;
-			case EMR_ALPHABLEND:
-				name = "ALPHABLEND"; //$NON-NLS-1$
-				break;
-			case EMR_ALPHADIBBLEND:
-				name = "ALPHADIBBLEND"; //$NON-NLS-1$
-				break;
-			case EMR_TRANSPARENTBLT:
-				name = "TRANSPARENTBLT"; //$NON-NLS-1$
-				break;
-			case EMR_TRANSPARENTDIB:
-				name = "TRANSPARENTDIB"; //$NON-NLS-1$
-				break;
-			case EMR_GRADIENTFILL:
-				name = "GRADIENTFILL"; //$NON-NLS-1$
-				break;
-			case EMR_SETLINKEDUFIS:
-				name = "SETLINKEDUFIS"; //$NON-NLS-1$
-				break;
-			case EMR_SETTEXTJUSTIFICATION:
-				name = "SETTEXTJUSTIFICATION"; //$NON-NLS-1$
-				break;
-			default:
-				name = "<unknown>"; //$NON-NLS-1$
-				break;				
-		}
-		
-		return name;
-	}
-}
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EOF.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EOF.java
deleted file mode 100644
index 0e034ff..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EOF.java
+++ /dev/null
@@ -1,39 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * This is a placeholder.  It handles the EOF metafile record which appears at the end of
- * every Enhanced Metafile, though it does nothing.
- * @author dhabib
- */
-public class EOF implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data to read at the moment.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-	    // Currently we just discard this record.
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Ellipse.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Ellipse.java
deleted file mode 100644
index b790f89..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Ellipse.java
+++ /dev/null
@@ -1,92 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.Ellipse2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class Ellipse implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	private static final int	WMF_BOTTOM_OFFSET	= 0;
-	private static final int	WMF_RIGHT_OFFSET	= 2;
-	private static final int	WMF_TOP_OFFSET		= 4;
-	private static final int	WMF_LEFT_OFFSET		= 6;
-
-	private Rectangle	m_rect; 
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int bottom 	= rec.getShortAt( WMF_BOTTOM_OFFSET );
-		int right 	= rec.getShortAt( WMF_RIGHT_OFFSET );
-		int top 	= rec.getShortAt( WMF_TOP_OFFSET );
-		int left 	= rec.getShortAt( WMF_LEFT_OFFSET );
-		
-		m_rect = new java.awt.Rectangle( left, top, right - left, bottom - top );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_rect = rec.getRectangleLAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Shape shape 	= getShape( context );
-		GdiBrush brush 	= context.getCurBrush();
-		
-		if( brush != null )
-		{
-			brush.fill( shape, g, context );
-		}
-		
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{
-			pen.apply( g, context );
-			g.draw( shape );
-		}
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape shape 	= getShape( context );
-		context.getGdiPath().appendFigure( shape );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		int x = context.convertXToSVGLogicalUnits( m_rect.x );
-		int y = context.convertYToSVGLogicalUnits( m_rect.y );
-		int w = context.scaleX( m_rect.width );
-		int h = context.scaleY( m_rect.height );
-		
-		Ellipse2D.Double shape = new Ellipse2D.Double( x, y, w, h );
-		
-		return shape;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EndPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EndPath.java
deleted file mode 100644
index 92cfe3e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/EndPath.java
+++ /dev/null
@@ -1,37 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- *
- */
-public class EndPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().end();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtCreatePen.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtCreatePen.java
deleted file mode 100644
index cd755d6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtCreatePen.java
+++ /dev/null
@@ -1,66 +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.awt.internal.svg.metafile;
-
-/**  
- * @author dhabib
- */
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-
-public class ExtCreatePen implements IEmf2SvgConverter, ITraceMe
-{
-	private static final int	ID_OFFSET			= 0;
-	private static final int	STYLE_OFFSET		= 20;
-	private static final int	WIDTH_OFFSET		= 24;
-	private static final int	COLOR_OFFSET		= 32;
-
-	private int		m_id 		= 0;
-	private int		m_style		= 0;
-	private int		m_width		= 1;
-	private Color	m_color		= new Color( 0 );
-	
-	private GdiPen m_pen		= null;
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_id 	= (int) rec.getDWORDAt( ID_OFFSET );
-		m_style	= rec.getIntAt( STYLE_OFFSET );
-		m_width	= rec.getIntAt( WIDTH_OFFSET );
-		m_color	= rec.getColorAt( COLOR_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		m_pen = new GdiPen( m_style, m_width, m_color );
-		context.addGDI( m_id, m_pen );
-	}
-
-	public String toString() {
-		return m_pen.toString() + ", id=" + m_id; //$NON-NLS-1$
-	}
-}
-
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtTextOut.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtTextOut.java
deleted file mode 100644
index 47fc373..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ExtTextOut.java
+++ /dev/null
@@ -1,240 +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.awt.internal.svg.metafile;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-public class ExtTextOut implements IEmf2SvgConverter, IWmf2SvgConverter 
-{
-//	private static final int	EMF_BOUNDS_OFFSET				= 0;
-//	private static final int	EMF_GRAPHICS_MODE_OFFSET		= 16;
-//	private static final int	EMF_X_SCALE_OFFSET				= 20;
-//	private static final int	EMF_Y_SCALE_OFFSET				= 24;
-	private static final int	EMF_LOG_REF_POINT_OFFSET		= 28;
-	private static final int	EMF_CHAR_COUNT_OFFSET			= 36;
-	private static final int	EMF_STRING_OFFSET_OFFSET		= 40;
-	private static final int	EMF_OPTIONS_OFFSET				= 44;
-	private static final int	EMF_CLIP_RECT_OFFSET			= 48;
-//	private static final int	EMF_SPACE_ARRAY_OFFSET_OFFSET	= 64;
-	
-	private static final int	WMF_X_OFFSET					= 2;
-	private static final int	WMF_Y_OFFSET					= 0;
-	private static final int	WMF_COUNT_OFFSET				= 4;
-	private static final int	WMF_FLAG_OFFSET					= 6;
-	private static final int	WMF_CLIPRECT_OFFSET				= 8;
-	
-//	private static final int	GM_COMPATIBLE			= 1;
-//	private static final int	GM_ADVANCED				= 2;
-	
-	
-	private static final int	ETO_OPAQUE				= 2;
-	private static final int	ETO_CLIPPED				= 4;
-	
-	private boolean 	m_bWideCharVersion 	= true;
-	private Point		m_refPoint			= null;
-	private	int			m_options			= 0;
-	private Rectangle	m_clipRect			= null;
-	private String		m_text				= null;
-	
-	public ExtTextOut( boolean bWideCharVersion )
-	{
-		m_bWideCharVersion = bWideCharVersion;
-	}
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int x 		= rec.getShortAt( WMF_X_OFFSET );
-		int y 		= rec.getShortAt( WMF_Y_OFFSET );
-		int count	= rec.getShortAt( WMF_COUNT_OFFSET );
-		int flag	= rec.getShortAt( WMF_FLAG_OFFSET );
-		
-		m_options = flag;
-		m_refPoint = new Point( x, y );
-		
-		int offset = WMF_CLIPRECT_OFFSET;
-		if( ( flag & ETO_CLIPPED ) == ETO_CLIPPED )
-		{
-			// Read in the clipping rectangle.  Only exists in the record if ETO_CLIPPED is set.
-			m_clipRect = rec.getRectangeAt( WMF_CLIPRECT_OFFSET );
-			offset += 8; // Add 8 for the size of the cliprect. 
-		}
-		else
-		{
-			m_clipRect = new Rectangle();
-		}
-		
-		m_text = new String( rec.getBytesAt( offset, count ) );			
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_refPoint		= rec.getPointLAt( EMF_LOG_REF_POINT_OFFSET );
-		m_options		= rec.getIntAt( EMF_OPTIONS_OFFSET );
-		m_clipRect		= rec.getRectangleLAt( EMF_CLIP_RECT_OFFSET );
-		
-		int count 		= rec.getIntAt( EMF_CHAR_COUNT_OFFSET );
-		int offset		= rec.getIntAt( EMF_STRING_OFFSET_OFFSET ) - 8;	// Subtract off the length of the header.
-		//int spaceOffset = rec.getIntAt( EMF_SPACE_ARRAY_OFFSET_OFFSET ) - 8;  // Subtract off the length of the header.
-		
-		// Read in the string.
-		if( m_bWideCharVersion )
-		{	
-			m_text = new String( rec.getCharsAt( offset, count ) );
-		}
-		else
-		{
-			m_text = new String( rec.getBytesAt( offset, count ) );			
-		}
-		
-		// currently unused.
-		//m_intercharSpacing = new int[ count ];
-		
-		//for( int index = 0; index < count; index++ )
-		//{
-		//	m_intercharSpacing[ index ] = rec.getIntAt( spaceOffset + ( index * 4 ) );
-		//}
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		// Select the font into the graphics context.
-		Font font = context.getCurFont().getFont();
-		g.setFont( font );
-		
-		// If the drawing mode is opaque, fill the clipRect with the current background color, scaling the rect with the
-		// current mapping mode.
-		Rectangle 	convertedClipRect 	= context.convertRectangleToSVGLogicalUnits( m_clipRect );
-		Point 		convertedPos 		= context.convertPointToSVGLogicalUnits( m_refPoint );
-		
-		// Use the text alignment (GetTextAlign method in windows) to adjust the position.
-		int textAlignment = context.getTextAlignment();
-		
-		if( ( textAlignment & DeviceContext.TA_BASELINE ) == DeviceContext.TA_BASELINE )
-		{
-			// No action taken
-		}
-		else if( ( textAlignment & DeviceContext.TA_BOTTOM ) == DeviceContext.TA_BOTTOM )
-		{
-			// No Action taken.  
-			// This is not the same as the 'baseline' though, probably need to
-			// subtract off the difference between the baseline and the height of the font. 
-		}
-		else
-		{
-			// Add the height of the font since the value specified in the EMF file is to top of the font, not the baseline.
-			convertedPos.y += font.getSize();
-		}
-		
-		if( ( textAlignment & DeviceContext.TA_CENTER ) == DeviceContext.TA_CENTER )
-		{
-			// Get the extent of the text and subtract half of it from the x position.
-            FontRenderContext fontRenderContext = g.getFontRenderContext();
-            Rectangle2D rect = font.getStringBounds( m_text, fontRenderContext );
-
-            convertedPos.x -= (int) rect.getWidth() / 2.0;
-		}
-		else if( ( textAlignment & DeviceContext.TA_RIGHT ) == DeviceContext.TA_RIGHT )
-		{
-			// Get the extent of the text and subtract it from the x position.
-            FontRenderContext fontRenderContext = g.getFontRenderContext();
-            Rectangle2D rect = font.getStringBounds( m_text, fontRenderContext );
-
-            convertedPos.x -= (int) rect.getWidth();
-		}
-		else
-		{
-			// Must be TA_LEFT (0), which is the same as what Java uses so take no action.
-		}
-		
-		// Note: Even if the text is rotated, the clipping and 'opaque' rectangles are NOT rotated.
-		if( (m_options & ETO_OPAQUE) == ETO_OPAQUE )
-		{
-			g.setColor( context.getBackColor() );
-			
-			g.fillRect( convertedClipRect.x, convertedClipRect.y, convertedClipRect.width, convertedClipRect.height );			
-		}
-		
-		// If the drawing mode is clipped, set a clipping rectangle for the text.
-		Shape clip = null;
-		
-		if( (m_options & ETO_CLIPPED) == ETO_CLIPPED )
-		{
-			clip = g.getClip();
-
-			// Append to the current clipping region.
-			g.clip( convertedClipRect );
-		}
-		
-		// Set the color to the current text color;
-		g.setColor( context.getTextColor() );
-		
-		// If the text is angled, set an AffineTransform to rotate the text.
-		//
-		// Escapement is the angle (in 10ths of a degree) between the x axis and the baseline of the text.
-		// Orientation is the the angle (in 10ths of a degree) between the x-axis and the baseline of a character.
-		// If the mode is GM_ADVANCED, these can be different, so each character can be angled differently from the angle at which
-		// the line of text is drawn.  In GM_COMPATIBLE mode only escapement is used.  Currently we only support escapement, not
-		// character orientation.  I doubt that is used much in stereotype images...
-		int escapement = context.getCurFont().getEscapement();
-		
-		if( escapement != 0 )
-		{
-            FontRenderContext fontRenderContext = g.getFontRenderContext();
-
-            TextLayout	layout 	= new TextLayout( m_text, font, fontRenderContext );
-            float 		height	= (float)layout.getBounds().getHeight();
-
-            AffineTransform rotatedText = new AffineTransform();
-            rotatedText.translate( convertedPos.x, convertedPos.y );
-            rotatedText.rotate( Math.toRadians( 360 - (escapement / 10 ) ) );
-            rotatedText.translate( 0, height );
-
-            Shape shape = layout.getOutline( rotatedText );
-
-            GeneralPath generalPath	= new GeneralPath( GeneralPath.WIND_NON_ZERO );
-            AffineTransform transform = new AffineTransform();
-            generalPath.append( transform.createTransformedShape( shape ), false );
-            g.draw( shape );
-		}
-		else
-		{
-			g.drawString( m_text, convertedPos.x, convertedPos.y );
-		}
-		
-		// Remove the transform.		
-
-		// Reset the clip.
-		if( (m_options & ETO_CLIPPED) == ETO_CLIPPED )
-		{
-			g.setClip( clip );
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FillPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FillPath.java
deleted file mode 100644
index eef0cba..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FillPath.java
+++ /dev/null
@@ -1,46 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class FillPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().closeAll();
-		
-		GdiBrush curBrush = context.getCurBrush();
-		
-		if( curBrush != null )
-		{
-			GeneralPath gp = context.getGdiPath().getPath();
-			curBrush.fill( gp, g, context );
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FlattenPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FlattenPath.java
deleted file mode 100644
index 9ef0401..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/FlattenPath.java
+++ /dev/null
@@ -1,36 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class FlattenPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().flatten();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiBrush.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiBrush.java
deleted file mode 100644
index 6655aa5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiBrush.java
+++ /dev/null
@@ -1,336 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.TexturePaint;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**
- * Represents a Brush that is used for filling shapes.  There may be multiple brushes at any one 
- * time, though only one will be used at a time to fill (the current brush is retrieved from 
- * the DeviceContext class).  
- * @author dhabib
- */
-public class GdiBrush 
-{
-	/** A style of brush */
-	public static final int BS_SOLID            = 0;
-	/** A style of brush */
-	public static final int BS_NULL             = 1;
-	/** A style of brush */
-	public static final int BS_HOLLOW           = 1;
-	/** A style of brush */
-	public static final int BS_HATCHED          = 2;
-	/** A style of brush */
-	public static final int BS_PATTERN          = 3;
-	/** A style of brush */
-	public static final int BS_INDEXED          = 4;
-	/** A style of brush */
-	public static final int BS_DIBPATTERN       = 5;
-	/** A style of brush */
-	public static final int BS_DIBPATTERNPT     = 6;
-	/** A style of brush */
-	public static final int BS_PATTERN8X8       = 7;
-	/** A style of brush */
-	public static final int BS_DIBPATTERN8X8    = 8;
-	/** A style of brush */
-	public static final int BS_MONOPATTERN      = 9;
-
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_HORIZONTAL       = 0;       /* ----- */
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_VERTICAL         = 1;       /* ||||| */
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_FDIAGONAL        = 2;       /* \\\\\ */
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_BDIAGONAL        = 3;       /* ///// */
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_CROSS            = 4;       /* +++++ */
-	/** A hatch type.  Only used when they style is BS_HATCHED */
-	public static final int  HS_DIAGCROSS        = 5;       /* xxxxx */
-	
-	private int				m_style		= BS_SOLID;
-	private Color			m_color		= new Color( 0xff, 0xff, 0xff );
-	private int				m_hatch		= 0;
-	private BufferedImage 	m_pattern	= null;
-
-	
-	
-	/**
-	 * Default constructor.  Creates a default brush.
-	 */
-	public GdiBrush()
-	{
-	    // No data associated with this record.
-	}
-
-	/**
-	 * Copy constructor
-	 * @param brush
-	 */
-	GdiBrush( GdiBrush brush )
-	{
-		m_style 	= brush.m_style;
-		
-		if( brush.m_color != null )
-		{	
-			m_color 	= new Color( brush.m_color.getRGB() );
-		}
-		else
-		{
-			m_color = null;
-		}
-		
-		m_hatch 	= brush.m_hatch;
-		
-		if( brush.m_pattern != null )
-		{	
-			m_pattern	= brush.m_pattern.getSubimage( 0, 0, m_pattern.getWidth(), m_pattern.getHeight() );
-		}
-	}
-	
-	/**
-	 * Creates a brush with a specific style.  Should only be used with BS_SOLID, BS_NULL, 
-	 * BS_HOLLOW, or BS_HATCHED. 
-	 * @param style Must be one of BS_SOLID, BS_NULL, BS_HOLLOW, or BS_HATCHED.
-	 * @param color Color of the brush.
-	 * @param hatch Hatch style.  Only used if they style is BS_HATCHED
-	 */
-	public GdiBrush( int style, Color color, int hatch )
-	{
-		m_style = style;
-		m_color = color;
-		m_hatch = hatch;
-	}
-	
-	/**
-	 * Create a pattern brush.  Currently only monochrome pattern brushes are supported, so style must currently
-	 * be set to BS_MONOPATTERN.  The current text color is used as the foreground, the current background color
-	 * is used as the background.
-	 * @param style Must be BS_MONOPATTERN
-	 * @param pattern A buffered image containing the pattern.
-	 */
-	public GdiBrush( int style, BufferedImage pattern )
-	{
-		m_style 	= style;  // must be either BS_MONOPATTERN, BS_PATTERN(8x8), or BS_DIBPATTERN(8x8)
-		m_pattern	= pattern;
-	}
-
-	/**
-	 * Fills the specified shape with this brush.
-	 * @param s Shape to fill.
-	 * @param g Graphics2D object to put the shape on.
-	 * @param context Current DeviceContext
-	 */
-	public void fill( Shape s, Graphics2D g, DeviceContext context )
-	{
-		g.setColor( m_color );
-		
-		Paint oldPaint = null;
-		
-		switch( m_style )
-		{
-			default:
-			case BS_SOLID:
-				// Done, nothing to do.
-				break;
-
-			case BS_NULL:
-				// Same as BS_HOLLOW.  No fill is performed.
-				return;
-			
-			case BS_HATCHED:
-			{
-				BufferedImage image = getHatch( context );
-				Rectangle2D anchor = new Rectangle2D.Double( 0, 0, 8, 8 );
-				TexturePaint tp = new TexturePaint( image, anchor );
-				oldPaint = g.getPaint();
-				g.setPaint( tp );
-				break;
-			}
-				
-			case BS_PATTERN:
-			case BS_PATTERN8X8:
-			case BS_DIBPATTERN:
-			case BS_DIBPATTERN8X8:
-			{
-				Rectangle2D anchor = new Rectangle2D.Double( 0, 0, m_pattern.getWidth(), m_pattern.getHeight() );
-				TexturePaint tp = new TexturePaint( m_pattern, anchor );
-				oldPaint = g.getPaint();
-				g.setPaint( tp );
-				break;
-			}
-			
-			case BS_DIBPATTERNPT:
-				break;
-			
-			case BS_MONOPATTERN:
-			{
-				BufferedImage image = mapPatternToForeColor( context );
-				Rectangle2D anchor = new Rectangle2D.Double( 0, 0, image.getWidth(), image.getHeight() );
-				TexturePaint tp = new TexturePaint( image, anchor );
-				oldPaint = g.getPaint();
-				g.setPaint( tp );
-				break;
-			}
-				
-			case BS_INDEXED:
-				// Can't find documentation on this, default to simply being a solid brush.
-				break;
-		}
-		
-		g.fill( s );
-		
-		if( oldPaint != null )
-		{	
-			g.setPaint( oldPaint );
-		}
-	}
-	
-	private BufferedImage getHatch( DeviceContext context )
-	{
-		// Create a buffered image to contain the texture to apply.
-		BufferedImage image = new BufferedImage( 8, 8, BufferedImage.TYPE_3BYTE_BGR );
-		Graphics2D textureGraphics = image.createGraphics();
-
-		textureGraphics.setColor( m_color );
-		textureGraphics.setBackground( context.getBackColor() );
-		textureGraphics.clearRect( 0, 0, 8, 8 );
-		
-		switch( m_hatch )
-		{
-			case HS_HORIZONTAL:		/* ----- */
-				textureGraphics.drawLine( 0, 4, 7, 4 );
-				break;
-			case HS_VERTICAL:		/* ||||| */
-				textureGraphics.drawLine( 4, 0, 4, 7 );
-				break;
-			case HS_FDIAGONAL:		/* \\\\\ */
-				textureGraphics.drawLine( 0, 0, 7, 7 );
-				break;
-			case HS_BDIAGONAL:		/* ///// */
-				textureGraphics.drawLine( 7, 0, 0, 7 );
-				break;
-			case HS_CROSS:			/* +++++ */
-				textureGraphics.drawLine( 0, 4, 7, 4 );
-				textureGraphics.drawLine( 4, 0, 4, 7 );
-				break;
-			default:
-			case HS_DIAGCROSS:		/* xxxxx */
-				textureGraphics.drawLine( 0, 0, 7, 7 );
-				textureGraphics.drawLine( 7, 0, 0, 7 );
-				break;
-		}
-		
-		return image;
-	}
-
-	private BufferedImage mapPatternToForeColor( DeviceContext context )
-	{
-		// Image is monochrome, should only have one bit per pixel.  According to the docs, a
-		// value of '0' is the foreground color, '1' is the background color.
-		BufferedImage image = m_pattern.getSubimage( 0, 0, m_pattern.getWidth(), m_pattern.getHeight() );
-		
-		int height = image.getHeight();
-		for( int y = 0; y < height; y++ )
-		{
-			int width = image.getWidth();
-			for( int x = 0; x < width; x++ )
-			{
-				int rgb = image.getRGB( x, y ) & 0x00ffffff;
-				if( rgb == 0 )
-				{
-					// Set to the foreground color
-					image.setRGB( x, y, context.getTextColor().getRGB() );
-				}
-				else
-				{
-					// Set to the background color
-					image.setRGB( x, y, context.getBackColor().getRGB() );
-				}
-			}
- 		}
-
-		return image;
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("Brush: color=" + m_color.toString()); //$NON-NLS-1$
-		sb.append(", style="); //$NON-NLS-1$
-		switch( m_style )
-		{
-			default:
-			case BS_SOLID:
-				sb.append("solid"); //$NON-NLS-1$
-				break;
-			case BS_NULL:
-				sb.append("null"); //$NON-NLS-1$
-				break;
-			case BS_HATCHED:
-				sb.append("hatch "); //$NON-NLS-1$
-				switch(m_hatch)
-				{
-					case HS_HORIZONTAL:
-						sb.append("-----"); //$NON-NLS-1$
-						break;
-					case HS_VERTICAL:
-						sb.append("|||||"); //$NON-NLS-1$
-						break;
-					case HS_FDIAGONAL:
-						sb.append("\\\\\\\\\\"); //$NON-NLS-1$
-						break;
-					case HS_BDIAGONAL:
-						sb.append("/////"); //$NON-NLS-1$
-						break;
-					case HS_CROSS:
-						sb.append("+++++"); //$NON-NLS-1$
-						break;
-					default:
-					case HS_DIAGCROSS:
-						sb.append("XXXXX"); //$NON-NLS-1$
-						break;
-				}
-				break;
-			case BS_PATTERN:
-				sb.append("pattern"); //$NON-NLS-1$
-				break;
-			case BS_PATTERN8X8:
-				sb.append("pattern8x8"); //$NON-NLS-1$
-				break;
-			case BS_DIBPATTERN:
-				sb.append("dibPattern"); //$NON-NLS-1$
-				break;
-			case BS_DIBPATTERN8X8:
-				sb.append("dibPattern8x8"); //$NON-NLS-1$
-				break;
-			case BS_DIBPATTERNPT:
-				sb.append("dibPatternPT"); //$NON-NLS-1$
-				break;
-			case BS_MONOPATTERN:
-				sb.append("monoPattern"); //$NON-NLS-1$
-				break;
-			case BS_INDEXED:
-				sb.append("indexed"); //$NON-NLS-1$
-				break;
-		}
-
-		return sb.toString();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiFont.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiFont.java
deleted file mode 100644
index 18ac3ce..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiFont.java
+++ /dev/null
@@ -1,111 +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.awt.internal.svg.metafile;
-
-import java.awt.Font;
-
-/**
- * Represents a font on the system.  There may be multiple fonts created in the system at
- * any one time.  The currently selected font can be retrieved from the DeviceContext.  
- * @author dhabib
- */
-public class GdiFont 
-{
-	private int		m_height		= 12;
-	private boolean	m_bItalic		= false;
-	private boolean	m_bUnderlined	= false;
-	private	boolean	m_bBold			= false;
-	private boolean	m_bStrikeout	= false;
-	private String	m_faceName		= "SanSerif";	//$NON-NLS-1$
-	
-	private int 	m_escapement	= 0;
-
-	/**
-	 * Creates a default font.
-	 */
-	public GdiFont()
-	{
-	    // Nothing to initialize.
-	}
-	
-	/**
-	 * Copy constructor
-	 * @param font
-	 */
-	GdiFont( GdiFont font )
-	{
-		m_height 		= font.m_height;
-		m_bItalic 		= font.m_bItalic;
-		m_bBold 		= font.m_bBold;
-		m_faceName 		= font.m_faceName;
-		m_bUnderlined	= font.m_bUnderlined;
-		m_escapement	= font.m_escapement;
-		m_bStrikeout	= font.m_bStrikeout;
-	}
-
-	/**
-	 * Creates a font with the specified parameters.
-	 * @param height Height of the font
-	 * @param bItalic Whether or not the font is italic
-	 * @param bUnderlined Whether or not the font is underlined
-	 * @param bStrikeout Whether or not the font is a strikout font
-	 * @param bBold Whether or not the font is bold
-	 * @param faceName Name of the font
-	 * @param escapement Font escapement (angle) of the text to be drawn.
-	 */
-	public GdiFont( int 	height, 
-					boolean	bItalic,
-					boolean bUnderlined,
-					boolean bStrikeout, 
-					boolean bBold, 
-					String 	faceName,
-					int 	escapement )
-	{
-		m_height 		= height;
-		m_bItalic 		= bItalic;
-		m_bBold 		= bBold;
-		m_faceName 		= faceName;
-		m_bUnderlined	= bUnderlined;
-		m_escapement	= escapement;
-		m_bStrikeout	= bStrikeout;
-	}
-	
-	/**
-	 * @return The Java font object that represents most of the attributes for drawing the font.
-	 */
-	public Font getFont()
-	{
-		int style = Font.PLAIN;
-		
-		if( m_bItalic ) {
-			style = Font.ITALIC;
-		}
-		
-		if( m_bBold ) {
-			style = Font.BOLD;
-		}
-		
-		if( m_bItalic && m_bBold ) {
-			style = Font.ITALIC + Font.BOLD;
-		}
-
-		return new Font( m_faceName, style, m_height );
-	}
-
-	/**
-	 * @return The angle at which to draw the font.
-	 */
-	public int getEscapement() 
-	{
-		return m_escapement;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPath.java
deleted file mode 100644
index 9de6350..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPath.java
+++ /dev/null
@@ -1,220 +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.awt.internal.svg.metafile;
-
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.FlatteningPathIterator;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.PathIterator;
-import java.util.Vector;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**
- * Represents a 'path'.  A path is a set of lines and curves that represent closed or open shapes.
- * Paths may be filled with a brush or stroked with a pen.  There is only ever one path
- * open on the system, it may be retrieved from the DeviceContext.
- * @author dhabib
- */
-public class GdiPath
-{
-	private Vector			m_figures		= new Vector();
-	private boolean			m_bPathIsOpen	= false;
-	private DeviceContext	m_context		= null;
-	private GeneralPath		m_curFigure		= null;
-
-	/**
-	 * Creates a new path.
-	 * @param context Device context the path is associated with.  This is a 1-to-1 relationship.
-	 */
-	public GdiPath( DeviceContext context )
-	{
-		m_context = context;
-	}
-	
-	/**
-	 * Creates a copy of the specified path, associated with the specified context.
-	 * @param context
-	 * @param path
-	 */
-	GdiPath( DeviceContext context, GdiPath path )
-	{
-		m_bPathIsOpen = path.m_bPathIsOpen;
-		m_context = context;
-		
-		for( int index = 0; index < path.m_figures.size(); index++ )
-		{
-			GeneralPath p = (GeneralPath) path.m_figures.get( index );
-			
-			GeneralPath newP = new GeneralPath( p );
-			m_figures.add( newP );
-			
-			if( p == path.m_curFigure )
-			{
-				m_curFigure = newP;
-			}
-		}
-	}
-	
-	/**
-	 * Starts a new path.  Any existing path information is lost.
-	 */
-	public void begin()
-	{
-		m_figures.clear();
-		newFigure();
-		m_curFigure = null;
-		m_bPathIsOpen = true;
-	}
-	
-	/**
-	 * Ends a path.
-	 */
-	public void end()
-	{
-		m_bPathIsOpen = false;
-	}
-	
-	/**
-	 * Aborts the current path.  All path information is lost.
-	 */
-	public void abort()
-	{
-		m_bPathIsOpen = false;
-		m_curFigure = null;
-		m_figures.clear();
-	}
-	
-	/**
-	 * @return true if a path has been begun, false otherwise.
-	 */
-	public boolean isOpen()
-	{
-		return m_bPathIsOpen;
-	}
-	
-	/**
-	 * Adds a figure to the path.
-	 * @param s Figure to add to the path.
-	 */
-	public void appendFigure( GeneralPath s )
-	{
-		if( m_bPathIsOpen )
-		{
-			m_figures.add( s );
-			m_curFigure = null;
-		}
-	}
-	
-	/**
-	 * Adds a figure to the path.
-	 * @param s Figure to add to the path.
-	 */
-	public void appendFigure( Shape s )
-	{
-		if( m_bPathIsOpen )
-		{
-			GeneralPath p = new GeneralPath();
-			p.append( s, false );
-			m_figures.add( p );
-			m_curFigure = null;
-		}
-	}
-
-	/**
-	 * Closes any open figures. 
-	 */
-	public void closeAll()
-	{
-		// Iterate over all the figures and call 'closePath' on them.
-		for( int index = 0; index < m_figures.size(); index++ )
-		{
-			GeneralPath gp = (GeneralPath) m_figures.get( index );
-			
-			if( gp != null )
-			{	
-				gp.closePath();
-			}
-		}
-	}
-	
-	/**
-	 * @return The current figure.
-	 */
-	public GeneralPath getCurrentFigure()
-	{
-		if( m_curFigure == null )
-		{
-			m_curFigure = newFigure();
-		}
-
-		return m_curFigure;
-	}
-	
-	/**
-	 * @return The 'conglomerate' path.  Appends all figures to a new GeneralPath.
-	 */
-	public GeneralPath getPath()
-	{
-		GeneralPath path = new GeneralPath();
-		
-		for( int index = 0; index < m_figures.size(); index++ )
-		{
-			path.append( (Shape) m_figures.get( index ), false );
-		}
-		
-		return path;
-	}
-	
-	/**
-	 * Flattens the current path (makes rounded shapes squared off).
-	 */
-	public void flatten()
-	{
-		// Iterate over all the figures and flatten them
-		for( int index = 0; index < m_figures.size(); index++ )
-		{
-			GeneralPath gp = (GeneralPath) m_figures.get( index );
-			
-			if( gp != null )
-			{
-				gp = flatten( gp );
-				m_figures.remove( index );
-				m_figures.insertElementAt( gp, index );
-			}
-		}
-	}
-	
-	private GeneralPath newFigure()
-	{
-		GeneralPath gp = new GeneralPath();
-		
-		gp.moveTo( 	m_context.convertXToSVGLogicalUnits( m_context.getCurPosX() ),
-					m_context.convertYToSVGLogicalUnits( m_context.getCurPosY() ) );
-		m_figures.add( gp );
-
-		return gp;
-	}
-
-	private GeneralPath flatten( GeneralPath gp )
-	{
-		PathIterator it = gp.getPathIterator( new AffineTransform() );
-		FlatteningPathIterator flatIterator = new FlatteningPathIterator( it, 20 );
-		
-		GeneralPath retval = new GeneralPath();
-		retval.append( flatIterator, false );
-		
-		return retval;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPen.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPen.java
deleted file mode 100644
index 5cd8bd5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiPen.java
+++ /dev/null
@@ -1,257 +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.awt.internal.svg.metafile;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-
-/**
- * Represents a Pen that is used for drawing lines.  There may be multiple pens at any one 
- * time, though only one of the pens will be used at a time to draw.  The currently selected
- * pen may be retrieved from the DeviceContext.  
- *
- * @author dhabib
- */
-public class GdiPen 
-{
-	/** Pen drawing style */
-	public static final int 	PS_SOLID            = 0;
-	/** Pen drawing style */
-	public static final int 	PS_DASH             = 1;       /* -------  */
-	/** Pen drawing style */
-	public static final int 	PS_DOT              = 2;       /* .......  */
-	/** Pen drawing style */
-	public static final int 	PS_DASHDOT          = 3;       /* _._._._  */
-	/** Pen drawing style */
-	public static final int 	PS_DASHDOTDOT       = 4;       /* _.._.._  */
-	/** Pen drawing style */
-	public static final int 	PS_NULL             = 5;
-	/** Pen drawing style */
-	public static final int 	PS_INSIDEFRAME      = 6;
-	/** Pen drawing style */
-	public static final int 	PS_USERSTYLE        = 7;
-	/** Pen drawing style */
-	public static final int 	PS_ALTERNATE        = 8;
-	/** Pen drawing style */
-	public static final int		PS_STYLE_MASK       = 0x0000000F;
-
-	/** Pen cap style */
-	public static final int		PS_ENDCAP_ROUND     = 0x00000000;
-	/** Pen cap style */
-	public static final int		PS_ENDCAP_SQUARE    = 0x00000100;
-	/** Pen cap style */
-	public static final int		PS_ENDCAP_FLAT      = 0x00000200;
-	/** Pen cap style */
-	public static final int		PS_ENDCAP_MASK      = 0x00000F00;
-
-	/** Pen join style */
-	public static final int		PS_JOIN_ROUND       = 0x00000000;
-	/** Pen join style */
-	public static final int		PS_JOIN_BEVEL       = 0x00001000;
-	/** Pen join style */
-	public static final int		PS_JOIN_MITER       = 0x00002000;
-	/** Pen join style */
-	public static final int		PS_JOIN_MASK        = 0x0000F000;
-
-	private int		m_style		= 0;
-	private int		m_width		= 1;
-	private Color	m_color		= new Color( 0 );
-
-	private static final float[]	DASH			= { (float) 5.0, (float) 3.0};
-	private static final float[]	DOT				= { (float) 1.0, (float) 3.0 };
-	private static final float[]	DASH_DOT		= { (float) 5.0, (float) 3.0, (float) 1.0, (float) 3.0 };
-	private static final float[]	DASH_DOT_DOT	= { (float) 5.0, (float) 3.0, (float) 1.0, (float) 3.0, (float) 1.0, (float) 3.0 };
-
-	/**
-	 * Creates a default pen.
-	 */
-	public GdiPen()
-	{
-	    // NOthing to initialize
-	}
-
-	/**
-	 * Creates a pen with specific attributes.
-	 * @param style - A combination of the PS_* for drawing styles, end caps, and joins.
-	 * @param width - Width of the pen, in pixels.
-	 * @param color - color of the pen.
-	 */
-	public GdiPen( int style, int width, Color color )
-	{
-		m_style 	= style;
-		m_width 	= width;
-		m_color		= color;
-	}
-	
-	/**
-	 * Copy constructor
-	 * @param pen
-	 */
-	GdiPen( GdiPen pen )
-	{
-		m_style 	= pen.m_style;
-		m_width 	= pen.m_width;
-		m_color		= new Color( pen.m_color.getRGB() );
-	}
-
-	/**
-	 * Applies the pen to the specified graphics object.
-	 * @param g Graphics object on which to apply the pen
-	 * @param context Current device context.
-	 */
-	public void apply( Graphics2D g, DeviceContext context )
-	{
-		g.setColor( m_color );
-		
-		int width = context.scaleX( m_width );
-		if( width <= 0 )
-		{
-			width = 1;
-		}
-		
-		boolean bNullStroke = false;
-		float[] dotPattern = null;	
-		switch( m_style & PS_STYLE_MASK )
-		{
-			case PS_NULL:
-				bNullStroke = true;
-				break;
-			case PS_INSIDEFRAME:
-			case PS_SOLID:
-			default:
-				break;
-			case PS_DASH:
-				dotPattern = DASH; 
-				break;
-			case PS_DOT:
-				dotPattern = DOT;
-				break;
-			case PS_DASHDOT:
-				dotPattern = DASH_DOT;
-				break;
-			case PS_DASHDOTDOT:
-				dotPattern = DASH_DOT_DOT;
-				break;
-		}
-
-		int endcap;
-		switch( m_style & PS_ENDCAP_MASK )
-		{
-			default:
-			case PS_ENDCAP_ROUND:
-				endcap = BasicStroke.CAP_ROUND;
-				break;
-			case PS_ENDCAP_SQUARE:
-				endcap = BasicStroke.CAP_SQUARE;
-				break;
-			case PS_ENDCAP_FLAT:
-				endcap = BasicStroke.CAP_BUTT;
-				break;
-		}
-	
-		int miter;
-		switch( m_style & PS_JOIN_MASK )
-		{
-			case PS_JOIN_ROUND:
-				miter = BasicStroke.JOIN_ROUND;
-				break;
-			case PS_JOIN_BEVEL:
-				miter = BasicStroke.JOIN_BEVEL;
-				break;
-			default:
-			case PS_JOIN_MITER:
-				miter = BasicStroke.JOIN_MITER;
-				break;
-		}
-
-		if( !bNullStroke )
-		{
-			BasicStroke	stroke;
-			if( dotPattern != null )
-			{
-				stroke = new BasicStroke( width, endcap, miter, context.getMiterLimit(), dotPattern, (float) 0.0 );
-			}
-			else
-			{
-				stroke = new BasicStroke( width, endcap, miter, context.getMiterLimit() );
-			}
-	
-			g.setStroke( stroke );
-		}
-		else
-		{
-			g.setStroke( new NullStroke() );
-		}
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("Pen: width=" + m_width); //$NON-NLS-1$
-		sb.append(", color=" + m_color.toString()); //$NON-NLS-1$
-		sb.append(", style: "); //$NON-NLS-1$
-		switch( m_style & PS_STYLE_MASK )
-		{
-			case PS_NULL:
-				sb.append("nullStroke"); //$NON-NLS-1$
-				break;
-			case PS_INSIDEFRAME:
-			case PS_SOLID:
-			default:
-				sb.append("solid"); //$NON-NLS-1$
-				break;
-			case PS_DASH:
-				sb.append("dash"); //$NON-NLS-1$
-				break;
-			case PS_DOT:
-				sb.append("dot"); //$NON-NLS-1$
-				break;
-			case PS_DASHDOT:
-				sb.append("dashDot"); //$NON-NLS-1$
-				break;
-			case PS_DASHDOTDOT:
-				sb.append("dashDotDot"); //$NON-NLS-1$
-				break;
-		}
-		switch( m_style & PS_ENDCAP_MASK )
-		{
-			default:
-			case PS_ENDCAP_ROUND:
-				sb.append(" roundCap"); //$NON-NLS-1$
-				break;
-			case PS_ENDCAP_SQUARE:
-				sb.append(" squareCap"); //$NON-NLS-1$
-				break;
-			case PS_ENDCAP_FLAT:
-				sb.append(" buttCap"); //$NON-NLS-1$
-				break;
-		}
-		switch( m_style & PS_JOIN_MASK )
-		{
-			case PS_JOIN_ROUND:
-				sb.append(" roundJoin"); //$NON-NLS-1$
-				break;
-			case PS_JOIN_BEVEL:
-				sb.append(" bevelJoin"); //$NON-NLS-1$
-				break;
-			default:
-			case PS_JOIN_MITER:
-				sb.append(" miterJoin"); //$NON-NLS-1$
-				break;
-		}
-
-		return sb.toString();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiRegion.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiRegion.java
deleted file mode 100644
index 0c5fd72..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/GdiRegion.java
+++ /dev/null
@@ -1,48 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-/**
- * Represents a selectable region.  Not currently implemented or used, this is just a placeholder.
- *  
- * @author dhabib
- */
-public class GdiRegion 
-{
-	private GeneralPath	m_curClipRegion = null;
-
-	public GdiRegion( Shape shape )
-	{
-		if( shape != null )
-		{	
-			m_curClipRegion = new GeneralPath();
-			m_curClipRegion.append( shape, false );
-		}
-	}
-	
-	public GdiRegion( GdiRegion clip )
-	{
-		if( clip.m_curClipRegion != null )
-		{
-			m_curClipRegion = (GeneralPath) clip.m_curClipRegion.clone();
-		}
-	}
-
-	public void apply( Graphics2D g )
-	{
-		g.setClip( m_curClipRegion );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Header.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Header.java
deleted file mode 100644
index aa4b017..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Header.java
+++ /dev/null
@@ -1,249 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.WMFTranscoder;
-
-/**  
- * @author dhabib
- */
-
-public class Header implements IEmf2SvgConverter, IWmf2SvgConverter, ITraceMe
-{
-	/** number of metafile records in the file */
-	private int			m_numRecords	= 0;
-	/** bounds of the metafile. */
-	private Rectangle	m_bounds		= null;
-	/** Dots per inch in the x direction */
-	private int			m_dpiX			= 96;
-	/** Dots per inch in the y direction */
-	private int			m_dpiY			= 96;
-	
-	private static final int	EMF_BOUNDS_OFFSET			= 0;	// Device units, RECTL (4*32b; 16B)
-	private static final int	EMF_FRAME_OFFSET			= 16;	// RECTL, HiMetrics, 4*32b; 16B
-	private static final int	EMF_SIGNATURE_OFFSET		= 32;	// DWORD, must be ENHMETA_SIGNATURE (=0x464D4520)
-//	private static final int	EMF_VERSION_OFFSET			= 36;	// DWORD, version
-//	private static final int	EMF_METAFILE_SIZE_OFFSET	= 40;	// DWORD, file size
-	private static final int	EMF_NUM_RECORDS_OFFSET		= 44;	// DWORD, num records in file
-//	private static final int	EMF_NUM_HANDLES_OFFSET		= 48;	// WORD
-//	private static final int	EMF_RESERVED_OFFSET			= 50;	// WORD
-//	private static final int	EMF_DESCRIPTION_LEN_OFFSET	= 52;	// DWORD, num unicode chars in description
-//	private static final int	EMF_DESCRIPTION_OFF_OFFSET	= 56;	// DWORD, offset in record to description
-//	private static final int	EMF_PAL_ENTRIES_OFFSET		= 60;	// DWORD, num entries in the palette
-	private static final int	EMF_DEVICE_SIZE_OFFSET		= 64;	// SIZEL, "pels", 2x32b; 8B
-	private static final int	EMF_MM_SIZE_OFFSET			= 72;	// SIZEL, mm, 2x32b; 8B
-
-	private static final int	APM_SIGNATURE_OFFSET		= 0;
-	private static final int	APM_LEFT_OFFSET				= 6;
-	private static final int	APM_TOP_OFFSET				= 8;
-	private static final int	APM_RIGHT_OFFSET			= 10;
-	private static final int	APM_BOTTOM_OFFSET			= 12;
-	private static final int	APM_INCH_OFFSET				= 14;
-
-	private static final int	WMF_FILE_TYPE_OFFSET		= 0;
-	private static final int	WMF_HEADER_SIZE_OFFSET		= 2;
-
-	private String _sizes = null;
-	public String toString() {
-		return _sizes;
-	}
-
-	public int getNumRecords()
-	{
-		return m_numRecords;
-	}
-	
-	public Rectangle getBounds()
-	{
-		return m_bounds;
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		/* Structure of the metafile header:
-		 * 
-		 *	type  name				Offset		
-		 *	RECTL rclBounds;		8	x8		
-		 *	RECTL rclFrame;			24  x18		
-		 *	DWORD dSignature;		40  x28		
-		 *	DWORD nVersion;			44  x24		
-		 *	DWORD nBytes;			48  x30		
-		 *	DWORD nRecords;			52  x34		
-		 *	WORD  nHandles;			56  x38		
-		 *	WORD  sReserved;		58  x3a		
-		 *	DWORD nDescription;		60  x3c		
-		 *	DWORD offDescription;	64  x40		
-		 *	DWORD nPalEntries;		68  x44		
-		 *	SIZEL szlDevice;		72  x48		
-		 *	SIZEL szlMillimeters;	80  x50		
-		 *	
-		 *	winver >= 4
-		 *	DWORD cbPixelFormat;	88  x58		91
-		 *	DWORD offPixelFormat;	92  x5a		95
-		 *	DWORD bOpenGL;			96  x60		99
-		 *	
-		 *	winver >= 5
-		 *	SIZEL szlMicrometers;	100	x64		107
-		 *
-		 *  Palette entries
-		 *  GDI Handles???
-		 * 
-		 * dSignature must be the following series of bytes: 0x20, 0x45, 0x4D, 0x46 ( " EMF") 
-		 * 
-		 * Since the first two fields in the record are not included in the byte array returned by EMFRecord.getData, actual offsets are
-		 * eight bytes less.
-		 */
-		 
-		// get the bounding rectangle
-		this.m_bounds = rec.getRectangleLAt( EMF_BOUNDS_OFFSET );
-		
-		// Bounds are inclusive of the bottom row and right column, need to account for this.
-		this.m_bounds.width++;
-		this.m_bounds.height++;
-	 	
-		long signature = rec.getDWORDAt( EMF_SIGNATURE_OFFSET ); 
-		// Read the signature and assert that it is what we expect (should be " EMF", or 0x20, 0x45, 0x4D, 0x46
-		if( signature != 0x464D4520 )
-		{
-			throw new IOException( "Invalid Enhanced Metafile Format:  Wrong signature" );	//$NON-NLS-1$
-		}
-	 	
-		// Read the number of EMF records contained in the file.
-		m_numRecords = (int) rec.getDWORDAt( EMF_NUM_RECORDS_OFFSET );
-		
-		// Read in the size, in pixels.
-		Dimension deviceSize = rec.getDimensionLAt( EMF_DEVICE_SIZE_OFFSET );			
-		
-		// Read in the size, in millimeters.
-		Dimension mmSize = rec.getDimensionLAt( EMF_MM_SIZE_OFFSET );
-
-		m_dpiX = (int) (( deviceSize.width * 25.4 ) / mmSize.width + 0.5);
-		m_dpiY = (int) (( deviceSize.height * 25.4 ) / mmSize.height + 0.5);
-
-
-		Rectangle pictFrame = rec.getRectangeAt(EMF_FRAME_OFFSET);
-
-		StringBuffer sb = new StringBuffer();
-		sb.append("Bounds{device units}=" + m_bounds); //$NON-NLS-1$
-		sb.append(", pictFrame{himetr}=" + pictFrame.toString());//$NON-NLS-1$
-		sb.append(", deviceSize{pels}=" + deviceSize.toString());//$NON-NLS-1$
-		sb.append(", mmSize{mm}=" + mmSize.toString());//$NON-NLS-1$
-		sb.append(", dpiX=" + m_dpiX);//$NON-NLS-1$
-		sb.append(", dpiY=" + m_dpiY);//$NON-NLS-1$
-		_sizes = sb.toString();
-	}
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		// Two kinds of WMF's that we support: Standard and APM.
-		// APM is a standard metafile with an additional header tacked on for good measure.
-		/*
-
-			Standard header:
-			typedef struct _WindowsMetaHeader
-			{
-			  WORD  FileType;       // Type of metafile (0=memory, 1=disk)
-			  WORD  HeaderSize;     // Size of header in WORDS (always 9) 
-			  WORD  Version;        // Version of Microsoft Windows used
-			  DWORD FileSize;       // Total size of the metafile in WORDs
-			  WORD  NumOfObjects;   // Number of objects in the file
-			  DWORD MaxRecordSize;  // The size of largest record in WORDs
-			  WORD  NumOfParams;    // Not Used (always 0)
-			} WMFHEAD;
-
-			// APM header:
-			typedef struct _PlaceableMetaHeader
-			{
-			  DWORD Key;           // Magic number (always 9AC6CDD7h)
-			  WORD  Handle;        // Metafile HANDLE number (always 0)
-			  SHORT Left;          // Left coordinate in metafile units
-			  SHORT Top;           // Top coordinate in metafile units
-			  SHORT Right;         // Right coordinate in metafile units
-			  SHORT Bottom;        // Bottom coordinate in metafile units
-			  WORD  Inch;          // Number of metafile units per inch
-			  DWORD Reserved;      // Reserved (always 0)
-			  WORD  Checksum;      // Checksum value for previous 10 WORDs
-			} PLACEABLEMETAHEADER;
-		 */
-
-		long signature = rec.getDWORDAt( APM_SIGNATURE_OFFSET );
-		int offset = 0;
-		if( signature == WMFTranscoder.APM_HEADER_SIGNATURE )
-		{
-			// Read the APM header.
-			int left 	= rec.getShortAt( APM_LEFT_OFFSET );
-			int top 	= rec.getShortAt( APM_TOP_OFFSET );
-			int right 	= rec.getShortAt( APM_RIGHT_OFFSET );
-			int bottom 	= rec.getShortAt( APM_BOTTOM_OFFSET );
-			int inch	= rec.getShortAt( APM_INCH_OFFSET );
-
-			// Appears that the x,y position is ignored in the boundaries.  This is probably
-			// just used for placement, not for offsetting the x,y positions in the metafile.
-			//m_bounds = new Rectangle( left, top, right - left, bottom - top );
-			m_bounds = new Rectangle( 0, 0, right - left, bottom - top );
-			
-			m_dpiX = inch;
-			m_dpiY = inch;
-			offset = WMFTranscoder.APM_HEADER_SIZE;
-		}
-		else
-		{
-			m_bounds = new Rectangle( 0, 0, 1000, 1000 );
-		}
-
-		// Read and verify the WMF Header.
-		int type 		= rec.getShortAt( offset + WMF_FILE_TYPE_OFFSET );
-		int size 		= rec.getShortAt( offset + WMF_HEADER_SIZE_OFFSET );
-			
-		if( type != 1 || size != 9 )
-		{
-			// Not a supported type.  We only support disk metafiles, the
-			// header size is always 9, and the version must be either 1 or 3.
-			throw new IOException( "Not a valid WMF file" ); 	//$NON-NLS-1$
-		}
-		
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setBounds( m_bounds );
-
-		// Set the DPI, calculated from the size of the reference device in pixels and in mm.
-		// pixels / mm * mm / inch = pixels / inch
-		
-		context.setDpiX( m_dpiX );
-		context.setDpiY( m_dpiY );
-
-		// Set the default viewport extents.  This doesn't seem necessary for EMFs,
-		// but for WMF's there appears to be many cases where they use the MM_ISOTROPIC/MMANISOTROPIC
-		// mapping mode without first setting the viewport extent.  So, calculate and set a default
-		// here.
-		context.setViewportExtent( new Point( m_bounds.width, m_bounds.height ) );
-		
-		// Set the background color to white;
-		g.setColor( new Color( 0xff, 0xff, 0xff ) );
-		g.setBackground( new Color( 0xff, 0xff, 0xff ) );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IEmf2SvgConverter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IEmf2SvgConverter.java
deleted file mode 100644
index 3c43c50..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IEmf2SvgConverter.java
+++ /dev/null
@@ -1,33 +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.awt.internal.svg.metafile;
-
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderableObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * This interface must be implemented by each class that handles an EMF metafile record.  
- * This is the basis for all metafile conversions.  
- * @author dhabib
- */
-public interface IEmf2SvgConverter extends IRenderableObject
-{
-	/**
-	 * Initializes the converter.  This method reads all required data out of the specified 
-	 * metafile record.
-	 * @param rec Record object containing all the data for this metafile record.
-	 * @throws IOException if the data is not properly formed or unsupported.
-	 */
-	public void readEMFRecord( Record rec ) throws IOException;
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderToPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderToPath.java
deleted file mode 100644
index ed98ec5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderToPath.java
+++ /dev/null
@@ -1,33 +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.awt.internal.svg.metafile;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**
- * This interface is implemented by IEmf2SvgConverter's that support rendering to a 'path'.
- * This is used for generating fillable paths (See Windows 'BeginPath'/'EndPath'/etc functions).
- * 
- * @author dhabib
- */
-public interface IRenderToPath
-{
-	/**
-	 * Called to render the Converter's data into a path.
-	 *  
-	 * @param g GeneralPath to render this shape into.
-	 * @param context Current device context.
-	 * @throws TranscoderException Throws this exception if rendering cannot be completed for any reason.
-	 */
-	public void render( DeviceContext context ) throws TranscoderException;
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderableObject.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderableObject.java
deleted file mode 100644
index 91994f0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IRenderableObject.java
+++ /dev/null
@@ -1,37 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**
- * This class must be implemented by all metafile record handlers.  Generally, classes
- * will inherit from IEmf2SvgConverter or IWmf2SvgConverter, which extends this
- * interface.
- *   
- * @author dhabib
- */
-public interface IRenderableObject 
-{
-	/**
-	 * Draws the data from a metafile record into a Graphics2D object.  When converting to SVG, 
-	 * g will actually be a SVGGraphics2D object which translates the drawing into SVG XML.
-	 * @param g Graphics2D object to draw into.
-	 * @param context Device context containing the current device settings.
-	 * @throws TranscoderException if there was an error rendering the data.
-	 */
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException;
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ITraceMe.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ITraceMe.java
deleted file mode 100644
index 6006677..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ITraceMe.java
+++ /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 
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile;
-
-/**
- * If this dummy interface is "implemented" the implementing class is expected
- * to have a meaningful implementation of toString().
-  */
-public interface ITraceMe {
-	//
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IWmf2SvgConverter.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IWmf2SvgConverter.java
deleted file mode 100644
index 480992b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IWmf2SvgConverter.java
+++ /dev/null
@@ -1,34 +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.awt.internal.svg.metafile;
-
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderableObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * This interface must be implemented by each class that handles a WMF metafile record.  
- * This is the basis for all metafile conversions.  
- * @author dhabib
- */
-public interface IWmf2SvgConverter extends IRenderableObject
-{
-	/**
-	 * Initializes the converter.  This method reads all required data out of the 
-	 * specified metafile record.
-	 * @param rec Record object containing all the data for this metafile record.
-	 * @throws IOException if the data is not properly formed or unsupported.
-	 */
-	public void readWMFRecord( Record rec ) throws IOException;
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IntersectClipRect.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IntersectClipRect.java
deleted file mode 100644
index 4b264a1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/IntersectClipRect.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-class IntersectClipRect implements IWmf2SvgConverter 
-{
-	private static final int LEFT_OFFSET	= 6;
-	private static final int TOP_OFFSET		= 4;
-	private static final int RIGHT_OFFSET	= 2;
-	private static final int BOTTOM_OFFSET	= 0;
-	
-	private static Rectangle	m_rect;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int x = rec.getShortAt( LEFT_OFFSET );
-		int y = rec.getShortAt( TOP_OFFSET );
-		int x1 = rec.getShortAt( RIGHT_OFFSET );
-		int y1 = rec.getShortAt( BOTTOM_OFFSET );
-		
-		m_rect = new Rectangle( x, y, x1 - x, y1 - y );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Rectangle rect = context.convertRectangleToSVGLogicalUnits( m_rect );
-		g.clip( rect );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/LineTo.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/LineTo.java
deleted file mode 100644
index c365bff..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/LineTo.java
+++ /dev/null
@@ -1,99 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-public class LineTo implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	private static final int EMF_X_OFFSET	= 0;
-	private static final int EMF_Y_OFFSET	= 4;
-	private static final int WMF_X_OFFSET	= 2;
-	private static final int WMF_Y_OFFSET	= 0;
-
-	private int m_xPos	= 0;
-	private int m_yPos	= 0;
-
-	private int m_xPosConv	= -1;
-	private int m_yPosConv	= -1;
-
-	public void readWMFRecord( Record emr ) throws IOException
-	{
-		m_xPos = emr.getShortAt( WMF_X_OFFSET );
-		m_yPos = emr.getShortAt( WMF_Y_OFFSET );
-	}
-
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		// First members of the structure are the x,y coordinates to move to.
-		m_xPos = emr.getIntAt( EMF_X_OFFSET );
-		m_yPos = emr.getIntAt( EMF_Y_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{
-			curPen.apply( g, context );
-
-			m_xPosConv = context.convertXToSVGLogicalUnits( m_xPos );
-			m_yPosConv = context.convertYToSVGLogicalUnits( m_yPos );
-
-			g.drawLine(	context.convertXToSVGLogicalUnits( context.getCurPosX() ), 
-						context.convertYToSVGLogicalUnits( context.getCurPosY() ), 
-						m_xPosConv, 
-						m_yPosConv );
-		}
-				
-		context.setCurPosX( m_xPos );
-		context.setCurPosY( m_yPos );
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		GeneralPath p 	= context.getGdiPath().getCurrentFigure();
-
-		m_xPosConv = context.convertXToSVGLogicalUnits( m_xPos );
-		m_yPosConv = context.convertYToSVGLogicalUnits( m_yPos );
-
-		p.lineTo( 	m_xPosConv , 
-					m_yPosConv );
-
-		context.setCurPosX( m_xPos );
-		context.setCurPosY( m_yPos );
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append('(');
-		sb.append(m_xPosConv);
-		sb.append(',');
-		sb.append(m_yPosConv);
-		sb.append(')');
-		return sb.toString();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ModifyWorldTransform.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ModifyWorldTransform.java
deleted file mode 100644
index e1e0e20..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ModifyWorldTransform.java
+++ /dev/null
@@ -1,86 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-public class ModifyWorldTransform implements IEmf2SvgConverter, ITraceMe {
-
-	// From MSDN:
-	//
-	// MWT_IDENTITY
-	// Resets the current world transformation by using the identity matrix. If
-	// this mode is specified, the XFORM structure pointed to by lpXform is
-	// ignored.
-
-	// MWT_LEFTMULTIPLY
-	// Multiplies the current transformation by the data in the XFORM structure.
-	// (The data in the XFORM structure becomes the left multiplicand, and the
-	// data for the current transformation becomes the right multiplicand.)
-
-	// MWT_RIGHTMULTIPLY
-	// Multiplies the current transformation by the data in the XFORM structure.
-	// (The data in the XFORM structure becomes the right multiplicand, and the
-	// data for the current transformation becomes the left multiplicand.)
-
-	private static final int	XFORM_OFFSET		= 0;
-	private static final int	MWT_OFFSET			= 24;
-
-	private int _mwt;
-	private float[] _xform = new float[]{1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f};
-
-	public void readEMFRecord(Record rec) throws IOException {
-		_xform = rec.getTransformAt(XFORM_OFFSET);
-		_mwt = rec.getIntAt(MWT_OFFSET);
-	}
-
-	public void render(Graphics2D g, DeviceContext context) throws TranscoderException {
-		context.modifyWorldTransform(_mwt, _xform);
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("XForm=("); //$NON-NLS-1$
-		for (int ix=0; ix < 6; ix++) {
-			addFloat(sb, _xform[ix], ix < 5);
-		}
-		switch (_mwt) {
-		case DeviceContext.MWT_IDENTITY:
-			sb.append(", IDENTITY"); //$NON-NLS-1$
-			break;
-		case DeviceContext.MWT_LEFTMULTIPLY:
-			sb.append(", LEFTMULTIPLY"); //$NON-NLS-1$
-			break;
-		case DeviceContext.MWT_RIGHTMULTIPLY:
-			sb.append(", RIGHTMULTIPLY"); //$NON-NLS-1$
-			break;
-		default:
-			sb.append("(bad transform operation)"); //$NON-NLS-1$
-			break;
-		}
-		return sb.toString();
-	}
-
-	private void addFloat(StringBuffer sb, float f, boolean addComma) {
-		sb.append(f);
-		if (addComma) {
-			sb.append(',');
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/MoveTo.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/MoveTo.java
deleted file mode 100644
index a1ec3f6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/MoveTo.java
+++ /dev/null
@@ -1,85 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-public class MoveTo implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath, ITraceMe
-{
-	private static final int EMF_X_OFFSET	= 0;
-	private static final int EMF_Y_OFFSET	= 4;
-	private static final int WMF_X_OFFSET	= 2;
-	private static final int WMF_Y_OFFSET	= 0;
-	
-	private int m_xPos	= 0;
-	private int m_yPos	= 0;
-
-	private int m_xPosConv	= -1;
-	private int m_yPosConv	= -1;
-
-	public void readWMFRecord( Record emr ) throws IOException
-	{
-		m_xPos = emr.getShortAt( WMF_X_OFFSET );
-		m_yPos = emr.getShortAt( WMF_Y_OFFSET );
-	}
-	
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		// First members of the structure are the x,y coordinates to move to.
-		m_xPos = emr.getIntAt( EMF_X_OFFSET );
-		m_yPos = emr.getIntAt( EMF_Y_OFFSET );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setCurPosX( m_xPos );
-		context.setCurPosY( m_yPos );
-
-		m_xPosConv = m_xPos;
-		m_yPosConv = m_yPos;
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		GeneralPath p 	= context.getGdiPath().getCurrentFigure();
-		m_xPosConv = context.convertXToSVGLogicalUnits( m_xPos );
-		m_yPosConv = context.convertYToSVGLogicalUnits( m_yPos );
-		p.moveTo( m_xPosConv, 
-				  m_yPosConv );
-		context.setCurPosX( m_xPos );
-		context.setCurPosY( m_yPos );
-	}
-
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		sb.append('(');
-		sb.append(m_xPosConv);
-		sb.append(',');
-		sb.append(m_yPosConv);
-		sb.append(')');
-		return sb.toString();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Noop.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Noop.java
deleted file mode 100644
index 5b35360..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Noop.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * No-op class.  This is used for converter records that do not seem to have any
- * visible effect on the output.
- * @author dhabib
- */
-class Noop implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-	    // Nothing to read.
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // Nothing to read.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-	    // Do nothing since this is a no-op.
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/NullStroke.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/NullStroke.java
deleted file mode 100644
index 7eb9f1c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/NullStroke.java
+++ /dev/null
@@ -1,36 +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.awt.internal.svg.metafile;
-
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.GeneralPath;
-
-/**
- * This is used to force the drawing of lines to be suppressed.  When the metafile
- * specifies a pen type of 'PS_NULL', this is used.
- * 
- * @author dhabib
- */
-class NullStroke implements Stroke
-{
-
-	/* (non-Javadoc)
-	 * @see java.awt.Stroke#createStrokedShape(java.awt.Shape)
-	 */
-	public Shape createStrokedShape(Shape p)
-	{
-		// Return an empty shape so nothing gets drawn.
-		return new GeneralPath();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ObjectBase.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ObjectBase.java
deleted file mode 100644
index 1854339..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/ObjectBase.java
+++ /dev/null
@@ -1,60 +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.awt.internal.svg.metafile;
-
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-abstract class ObjectBase implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	protected static final int	ENHMETA_STOCK_OBJECT    = 0x80000000;
-	protected static final int	WHITE_BRUSH         	= 0;
-	protected static final int	LTGRAY_BRUSH        	= 1;
-	protected static final int	GRAY_BRUSH          	= 2;
-	protected static final int	DKGRAY_BRUSH        	= 3;
-	protected static final int	BLACK_BRUSH         	= 4;
-	protected static final int	NULL_BRUSH          	= 5;
-	protected static final int	WHITE_PEN           	= 6;
-	protected static final int	BLACK_PEN           	= 7;
-	protected static final int	NULL_PEN            	= 8;
-	protected static final int	OEM_FIXED_FONT      	= 10;
-	protected static final int	ANSI_FIXED_FONT     	= 11;
-	protected static final int	ANSI_VAR_FONT       	= 12;
-	protected static final int	SYSTEM_FONT         	= 13;
-	protected static final int	DEVICE_DEFAULT_FONT 	= 14;
-	protected static final int	DEFAULT_PALETTE     	= 15;
-	protected static final int	SYSTEM_FIXED_FONT   	= 16;
-	
-	private int m_id;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_id = rec.getShortAt( 0 );		
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_id = (int) rec.getDWORDAt( 0 );		
-	}
-
-	public int getId()
-	{
-		return m_id;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyBezier.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyBezier.java
deleted file mode 100644
index 149c148..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyBezier.java
+++ /dev/null
@@ -1,150 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-
-/**
- * @author dhabib
- *
- */
-public class PolyBezier extends AbstractPoly
-{
-	private boolean m_bTo	= false;
-	
-	/**
-	 * @param b16Bits
-	 */
-	public PolyBezier( boolean b16Bits, boolean bTo )
-	{
-		super( b16Bits );
-		m_bTo = bTo;
-	}
-
-	public void render(Graphics2D g, DeviceContext context)
-		throws TranscoderException
-	{
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{
-			pen.apply( g, context );
-
-			int count = getCount();
-			
-			if( count > 0 )
-			{	
-				Shape shape = getShape( context );
-				g.draw( shape );
-				
-				if( m_bTo )
-				{
-					// Update the current position.
-					context.setCurPosX( getXPoints()[ count - 1 ] );
-					context.setCurPosY( getYPoints()[ count - 1 ] );
-				}
-			}
-		}
-	}
-	
-	public void render( DeviceContext context )
-		throws TranscoderException
-	{
-		int count = getCount();
-		
-		if( count > 0 )
-		{	
-			Shape shape = getShape( context );
-			
-			if( m_bTo )
-			{
-				context.getGdiPath().getCurrentFigure().append( shape, true );
-				// Update the current position.
-				context.setCurPosX( getXPoints()[ count - 1 ] );
-				context.setCurPosY( getYPoints()[ count - 1 ] );
-			}
-			else
-			{
-				context.getGdiPath().appendFigure( shape );
-			}
-		}
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		GeneralPath genPath = new GeneralPath( GeneralPath.WIND_NON_ZERO );
-
-		int count = getCount();
-	
-		if( count > 0 )
-		{	
-			m_xPointsConv = context.convertXArrayToSVGLogicalUnits( getXPoints() );
-			m_yPointsConv = context.convertYArrayToSVGLogicalUnits( getYPoints() );
-
-			// The PolyBezier and PolyBezierTo are similar in that they each use 4 points to define
-			// the curve: first point is the 'start' point, next two are 'control' points, and the fourth
-			// is the 'end' point.  The end point of each curve is used as the start point of the next curve.  
-			// PolyBezier uses the first point from the array as the initial start
-			// point and does not update the current position in the device context.  The 'To' version
-			// uses the current position in the device context as the starting point and updates that position after drawing
-			// the last curve in the array.
-			
-			int startIndex;
-
-			if( m_bTo )
-			{
-				startIndex	= 0;
-				
-				if( context.getGdiPath().isOpen() == false )
-				{
-					// No path is open, use the current position in the context
-					genPath.moveTo( context.convertXToSVGLogicalUnits( context.getCurPosX() ), 
-									context.convertYToSVGLogicalUnits( context.getCurPosY() ) );
-				}
-				else
-				{
-					// Must have the initial 'moveTo'.  Get the current coordinates from the currently open path.
-					Point2D curPos = context.getGdiPath().getCurrentFigure().getCurrentPoint();
-					genPath.moveTo( (float)curPos.getX(), (float)curPos.getY() );
-				}
-			}
-			else
-			{
-				genPath.moveTo( m_xPointsConv[ 0 ], m_yPointsConv[ 0 ] );
-				startIndex = 1;
-			}
-
-			for ( int j = startIndex; j <= count - 3; j = j + 3 ) 
-			{
-				int firstControlPointX 	= m_xPointsConv[ j ];
-				int firstControlPointY 	= m_yPointsConv[ j ];
-				int secondControlPointX	= m_xPointsConv[ j + 1 ];
-				int secondControlPointY	= m_yPointsConv[ j + 1 ];
-				int endPointX			= m_xPointsConv[ j + 2 ];
-				int endPointY			= m_yPointsConv[ j + 2 ];
-
-				genPath.curveTo(	firstControlPointX, firstControlPointY, 
-								 	secondControlPointX, secondControlPointY, 
-									endPointX, endPointY );
-			}
-		}
-		
-		return genPath;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyDraw.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyDraw.java
deleted file mode 100644
index b0a4a2b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyDraw.java
+++ /dev/null
@@ -1,178 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**
- * @author dhabib
- *
- */
-public class PolyDraw implements IEmf2SvgConverter, IRenderToPath
-{
-	private static final int		COUNT_OFFSET	= 16;
-	private static final int		POINT_OFFSET	= 20;
-
-	private static final int		PT_CLOSEFIGURE	= 1;
-	private static final int		PT_LINETO		= 2;
-	private static final int		PT_BEZIERTO		= 4;
-	private static final int		PT_MOVETO		= 6;
-	
-	private int		m_count			= 0;
-	private int[]	m_xPoints		= null;
-	private int[]	m_yPoints		= null;
-	private byte[]	m_flags			= null;
-	
-	private boolean	m_b16Bits		= false;
-
-	public PolyDraw( boolean b16Bits )
-	{
-		m_b16Bits = b16Bits;
-	}
-	
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_count 	= (int) emr.getDWORDAt( COUNT_OFFSET );
-		
-		m_xPoints 	= new int[ m_count ];
-		m_yPoints 	= new int[ m_count ];
-		m_flags 	= new byte[ m_count ];
-		
-		int curOffset = POINT_OFFSET;
-		
-		for( int index = 0; index < m_count; index++ )
-		{
-			if( m_b16Bits )
-			{	
-				m_xPoints[ index ] = emr.getShortAt( curOffset );
-				m_yPoints[ index ] = emr.getShortAt( curOffset + 2 );
-				curOffset += 4;
-			}
-			else
-			{
-				m_xPoints[ index ] = emr.getIntAt( curOffset );
-				m_yPoints[ index ] = emr.getIntAt( curOffset + 4 );
-				curOffset += 8;
-			}
-		}
-
-		m_flags = emr.getBytesAt( curOffset, m_count );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{	
-			curPen.apply( g, context );
-
-			GeneralPath p = new GeneralPath( GeneralPath.WIND_NON_ZERO );
-			p.moveTo( 	context.convertXToSVGLogicalUnits( context.getCurPosX() ),
-						context.convertYToSVGLogicalUnits( context.getCurPosY() ) );
-
-			getShape( context, p );
-			g.draw( p );
-		}		
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		getShape( context, context.getGdiPath().getCurrentFigure() );
-	}
-
-	private void getShape( DeviceContext context, GeneralPath p )
-	{
-		int		lastMoveToX		= context.getCurPosX();
-		int		lastMoveToY		= context.getCurPosY();
-
-		for( int index = 0; index < m_count; index++ )
-		{
-			boolean bCloseFigure 	= (m_flags[ index ] & PT_CLOSEFIGURE) == PT_CLOSEFIGURE;
-			int		type			= m_flags[ index ] & ~PT_CLOSEFIGURE;
-			int		x				= m_xPoints[ index ];
-			int		y				= m_yPoints[ index ];
-			
-			switch( type )
-			{
-				case PT_MOVETO:
-					context.setCurPosX( x );
-					context.setCurPosY( y );
-					p.moveTo( x, y );
-					lastMoveToX = x;
-					lastMoveToY = y;
-					break;
-
-				case PT_LINETO:
-					p.lineTo(	context.convertXToSVGLogicalUnits( x ), 
-								context.convertYToSVGLogicalUnits( y ) );
-					
-					if( bCloseFigure )
-					{
-						p.closePath();
-						
-						context.setCurPosX( lastMoveToX );
-						context.setCurPosY( lastMoveToY );
-					}
-					else
-					{	
-						context.setCurPosX( x );
-						context.setCurPosY( y );
-					}
-					break;
-
-				case PT_BEZIERTO:
-					// Always in groups of 3 points, current position is the first point,
-					// next two points are the control points, last point is the endpoint.
-					
-					int cp1X = context.convertXToSVGLogicalUnits( x );
-					int cp1Y = context.convertYToSVGLogicalUnits( y );
-					int cp2X = context.convertXToSVGLogicalUnits( m_xPoints[ index + 1 ] );
-					int cp2Y = context.convertYToSVGLogicalUnits( m_yPoints[ index + 1 ] );
-					bCloseFigure |= (m_flags[ index + 1 ] & PT_CLOSEFIGURE) == PT_CLOSEFIGURE;
-					int endX = context.convertXToSVGLogicalUnits( m_xPoints[ index + 2 ] );
-					int endY = context.convertYToSVGLogicalUnits( m_yPoints[ index + 2 ] );
-					bCloseFigure |= (m_flags[ index + 2 ] & PT_CLOSEFIGURE) == PT_CLOSEFIGURE;
-					p.curveTo( cp1X, cp1Y, cp2X, cp2Y, endX, endY );
-					
-					if( bCloseFigure )
-					{
-						p.closePath();
-
-						context.setCurPosX( lastMoveToX );
-						context.setCurPosY( lastMoveToY );
-					}
-					else
-					{	
-						context.setCurPosX( m_xPoints[ index + 2 ] );
-						context.setCurPosY( m_yPoints[ index + 2 ] );
-					}
-					index += 2;
-					break;
-
-				default:
-					// Assert
-					break;
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolyLine.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolyLine.java
deleted file mode 100644
index 21fa978..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolyLine.java
+++ /dev/null
@@ -1,59 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-
-/**  
- * @author dhabib
- */
-public class PolyPolyLine extends AbstractPolyPoly
-{
-	public PolyPolyLine( boolean b16Bits )
-	{
-		super( b16Bits );
-	}
-	
-	public boolean renderPoly( Graphics2D g, DeviceContext context, int[] xPoints, int[] yPoints, int nPoints )
-	{
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{
-			curPen.apply( g, context );
-			g.drawPolyline( xPoints, yPoints, nPoints );
-		}
-		
-		return true;
-	}
-	
-	protected boolean renderPoly( 	GeneralPath		p, 
-									int[] 			xPoints, 
-									int[] 			yPoints, 
-									int 			nPoints )
-	{
-		if( nPoints > 0 )
-		{	
-			p.moveTo( xPoints[ 0 ], yPoints[ 0 ] );
-			
-			for( int index = 1; index < nPoints; index++ )
-			{
-				p.lineTo( xPoints[ index ], yPoints[ index ] );
-			}
-		}
-		return true;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolygon.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolygon.java
deleted file mode 100644
index 147b617..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolyPolygon.java
+++ /dev/null
@@ -1,96 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-
-
-/**  
- * @author dhabib
- */
-public class PolyPolygon extends AbstractPolyPoly 
-{
-	public PolyPolygon( boolean b16Bits )
-	{
-		super( b16Bits );
-	}
-
-	protected boolean renderPoly( 	Graphics2D 		g, 
-								  	DeviceContext 	context, 
-									int[] 			xPoints, 
-									int[] 			yPoints, 
-									int 			nPoints )
-	{
-		GdiBrush curBrush = context.getCurBrush();
-		
-		Shape s = getShape( xPoints, yPoints, nPoints );
-		
-		if( curBrush != null )
-		{
-			curBrush.fill( s, g, context );
-		}
-
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{
-			curPen.apply( g, context );
-			g.draw( s );
-		}
-
-		return true;
-	}
-	
-	protected boolean renderPoly( 	GeneralPath 	p, 
-									int[] 			xPoints, 
-									int[] 			yPoints, 
-									int 			nPoints )
-	{
-		if( nPoints > 0 )
-		{	
-			p.moveTo( xPoints[ 0 ], yPoints[ 0 ] );
-			
-			for( int index = 1; index < nPoints; index++ )
-			{
-				p.lineTo( xPoints[ index ], yPoints[ index ] );
-			}
-			
-			p.closePath();
-		}
-		return true;
-	}
-
-	private Shape getShape( int[] xPoints, int [] yPoints, int nPoints )
-	{
-		GeneralPath p = new GeneralPath();
-		
-		if( nPoints > 0 )
-		{	
-			p.moveTo( xPoints[ 0 ], yPoints[ 0 ] );
-			
-			for( int index = 1; index < nPoints; index++ )
-			{
-				p.lineTo( xPoints[ index ], yPoints[ index ] );
-			}
-			
-			p.closePath();
-		}
-		
-		return p;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polygon.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polygon.java
deleted file mode 100644
index 1d9ceaf..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polygon.java
+++ /dev/null
@@ -1,82 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-
-/**  
- * @author dhabib
- */
-public class Polygon extends AbstractPoly implements IRenderToPath 
-{
-	public Polygon( boolean b16Bits )
-	{
-		super( b16Bits );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiBrush brush = context.getCurBrush();
-		Shape s = getShape( context );
-		
-		if( brush != null )
-		{	
-			brush.fill( s, g, context );
-		}
-
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{
-			curPen.apply( g, context );
-			g.draw( s );
-		}
-	}
-	
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		context.getGdiPath().appendFigure( s );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		GeneralPath p = new GeneralPath();
-
-		int count = getCount();
-		
-		if( count > 0 )
-		{
-			m_xPointsConv = context.convertXArrayToSVGLogicalUnits( getXPoints() );
-			m_yPointsConv = context.convertYArrayToSVGLogicalUnits( getYPoints() );
-			
-			p.moveTo( m_xPointsConv[ 0 ], m_yPointsConv[ 0 ] );
-			
-			for( int index = 1; index < count; index++ )
-			{
-				p.lineTo( m_xPointsConv[ index ], m_yPointsConv[ index ] );
-			}
-			
-			p.closePath();
-		}
-		
-		return p;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polyline.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polyline.java
deleted file mode 100644
index bdd41dc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Polyline.java
+++ /dev/null
@@ -1,73 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-
-/**  
- * @author dhabib
- */
-public class Polyline extends AbstractPoly implements IRenderToPath
-{
-	public Polyline( boolean b16Bits )
-	{
-		super( b16Bits );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiPen curPen = context.getCurPen();
-		
-		if( curPen != null )
-		{
-			curPen.apply( g, context );
-
-			Shape s = getShape( context );
-			g.draw( s );
-		}
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		context.getGdiPath().appendFigure( s );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		GeneralPath p = new GeneralPath();
-
-		int count = getCount();
-		
-		if( count > 0 )
-		{
-			m_xPointsConv = context.convertXArrayToSVGLogicalUnits( getXPoints() );
-			m_yPointsConv = context.convertYArrayToSVGLogicalUnits( getYPoints() );
-			
-			p.moveTo( m_xPointsConv[ 0 ], m_yPointsConv[ 0 ] );
-			
-			for( int index = 1; index < count; index++ )
-			{
-				p.lineTo( m_xPointsConv[ index ], m_yPointsConv[ index ] );
-			}
-		}
-		
-		return p;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolylineTo.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolylineTo.java
deleted file mode 100644
index a289df1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/PolylineTo.java
+++ /dev/null
@@ -1,89 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-
-/**  
- * @author dhabib
- */
-public class PolylineTo extends AbstractPoly implements IRenderToPath 
-{
-	public PolylineTo( boolean b16Bits )
-	{
-		super( b16Bits );
-	}
-	
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( getCount() > 0 )
-		{
-			GdiPen curPen = context.getCurPen();
-			
-			if( curPen != null )
-			{
-				curPen.apply( g, context );
-				g.drawLine( context.convertXToSVGLogicalUnits( context.getCurPosX() ), 
-							context.convertYToSVGLogicalUnits( context.getCurPosY() ), 
-							context.convertXToSVGLogicalUnits( getXPoints()[0] ), 
-							context.convertYToSVGLogicalUnits( getYPoints()[0] ) );
-	
-				g.drawPolygon( 	context.convertXArrayToSVGLogicalUnits( getXPoints() ), 
-								context.convertYArrayToSVGLogicalUnits( getYPoints() ), 
-								getCount() );
-			}
-						
-			// Update the current position.
-			context.setCurPosX( getXPoints()[ getCount() - 1 ] );
-			context.setCurPosY( getYPoints()[ getCount() - 1 ] );
-		}
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		context.getGdiPath().getCurrentFigure().append( s, true );
-
-		// Update the current position.
-		context.setCurPosX( getXPoints()[ getCount() - 1 ] );
-		context.setCurPosY( getYPoints()[ getCount() - 1 ] );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		GeneralPath p = new GeneralPath();
-
-		int count = getCount();
-		
-		if( count > 0 )
-		{
-			m_xPointsConv = context.convertXArrayToSVGLogicalUnits( getXPoints() );
-			m_yPointsConv = context.convertYArrayToSVGLogicalUnits( getYPoints() );
-			
-			p.moveTo( m_xPointsConv[ 0 ], m_yPointsConv[ 0 ] );
-			
-			for( int index = 1; index < count; index++ )
-			{
-				p.lineTo( m_xPointsConv[ index ], m_yPointsConv[ index ] );
-			}
-		}
-		
-		return p;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Record.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Record.java
deleted file mode 100644
index 342fcd3..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Record.java
+++ /dev/null
@@ -1,414 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * This class represents one record of a metafile.  It contains the type of the
- * record, the size of the record (in bytes) and all the data contained in the 
- * record excluding the type/size information (each record is prefixed with the 
- * size and type information).  
- * @author dhabib
- */
-public class Record 
-{
-	private int		m_size	= 0;
-	private int	 	m_type	= 0;
-	private byte[]	m_data	= null;
-	
-	/**
-	 * Default constructor.
-	 */
-	protected Record()
-	{
-	    // Nothing to initialize
-	}
-
-	/**
-	 * Initializes a record with a specific type and size.  Reads 'size' bytes from the input
-	 * stream, but does not interpret the results.
-	 * @throws IOException Thrown if there is an error in stream (end of stream encountered before all the data could be read)
-	 */
-	public Record( int type, int size, InputStream stream ) throws IOException
-	{
-		m_type = type;
-		m_size = size;
-		readData( stream );
-	}
-	
-	/**
-	 * @return The type of the record.  See the EMR_ constants in EMFTranscoder.
-	 */
-	public int getType()
-	{
-		return m_type;
-	}
-
-	/**
-	 * Sets the type of the record.  Only derived classes are allowed to do this.
-	 * @param type
-	 */
-	protected void setType( int type )
-	{
-		m_type = type;
-	}
-	
-	/**
-	 * @return The size of the record, excluding the size of the header.
-	 */
-	public int getSize()
-	{
-		return m_size;
-	}
-
-	/**
-	 * Sets the size of the record.  Only derived classes are allowed to do this.
-	 * @param type
-	 */
-	protected void setSize( int size )
-	{
-		m_size = size;
-	}
-	
-	protected void readData( InputStream stream ) throws IOException
-	{
-		m_data = new byte[ m_size ];
-		stream.read( m_data, 0, m_size );
-	}
-	
-	/**
-	 * Retrieves the DWORD at the specified offset.  Returns a 'long' instead of an 'int' since
-	 * DWORD's are not signed, but it only reads 4 bytes.
-	 * @param offset Offset into the data where the DWORD resides.
-	 * @return The DWORD at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the DWORD is greater than the size of the data buffer.
-	 */
-	public long getDWORDAt( int offset ) throws IOException
-	{
-		long retval = 0;
-		if( offset <= m_size - 4 )
-		{
-			int byte1 = m_data[offset] & 0xff;
-			int byte2 = ( m_data[ offset + 1 ] & 0xff ) << 8;
-			int byte3 = ( m_data[ offset + 2 ] & 0xff ) << 16;
-			int byte4 = ( m_data[ offset + 3 ] & 0xff ) << 24;
-
-			retval = ( byte1 + byte2 + byte3 + byte4 ) & 0xffffffff;
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" ); 	//$NON-NLS-1$
-		}
-		
-		return retval;
-	}
-	
-	/**
-	 * Retrieves the integer at the specified offset. 
-	 * @param offset Offset into the data where the integer resides.
-	 * @return The value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the integer is greater than the size of the data buffer.
-	 */
-	public int getIntAt( int offset ) throws IOException
-	{
-		int retval = 0;
-		if( offset <= m_size - 4 )
-		{
-			int byte1 = m_data[offset] & 0xff;
-			int byte2 = ( m_data[ offset + 1 ] & 0xff ) << 8;
-			int byte3 = ( m_data[ offset + 2 ] & 0xff ) << 16;
-			int byte4 = ( m_data[ offset + 3 ] & 0xff ) << 24;
-
-			retval = ( byte1 | byte2 | byte3 | byte4 );
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" );		//$NON-NLS-1$ 
-		}
-		
-		return retval;
-	}
-
-	/**
-	 * Retrieves the short at the specified offset. 
-	 * @param offset Offset into the data where the short resides.
-	 * @return The value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the short is greater than the size of the data buffer.
-	 */
-	public short getShortAt( int offset ) throws IOException
-	{
-		short retval = 0;
-		if( offset <= m_size - 2 )
-		{
-			int byte1 = m_data[offset] & 0xff;
-			int byte2 = ( m_data[ offset + 1 ] & 0xff ) << 8;
-			
-			retval 	= (short)( byte2 & 0xffff );
-			retval |= (short)( byte1 & 0xff );
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" );		//$NON-NLS-1$ 
-		}
-		
-		return retval;
-	}
-	
-	/**
-	 * Retrieves the Color value at the specified offset.  The color is a windows COLORREF, which is
-	 * converted into an appropriate Java Color object. 
-	 * @param offset Offset into the data where the color resides.
-	 * @return The value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the color is greater than the size of the data buffer.
-	 */
-	public Color getColorAt( int offset ) throws IOException
-	{
-		int colorref =  (int) getDWORDAt( offset );
-		int red = colorref & 0xff;
-		int green = ( colorref & 0xff00 ) >> 8;
-		int blue = ( colorref & 0xff0000 ) >> 16;
-		//int flags = ( colorref & 0x3000000 ) >> 24;
-		
-		return new Color( red, green, blue );
-	}
-
-	/**
-	 * Retrieves the byte at the specified offset. 
-	 * @param offset Offset into the data where the byte resides.
-	 * @return The value at the specified location.
-	 * @throws IOException Thrown if the offset is greater than or equal to the size of the data buffer.
-	 */
-	public int getByteAt( int offset ) throws IOException
-	{
-		int retval = 0;
-		if( offset < m_size )
-		{
-			retval = m_data[ offset ] & 0xff; 
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" );		//$NON-NLS-1$ 
-		}
-		
-		return retval;
-	}
-	
-	/**
-	 * Retrieves the set of bytes at the specified offset.
-	 * @param offset Offset into the data where the block of bytes begins
-	 * @param count Number of bytes to retrieve
-	 * @return An array containing the block of bytes.
-	 * @throws IOException Thrown if the offset plus the count is greater thn the size of the data buffer.
-	 */
-	public byte[] getBytesAt( int offset, int count ) throws IOException
-	{
-		byte[] retval = null;
-		if( offset + count <= m_size )
-		{
-			retval = new byte[ count ];
-			for( int i = 0; i < count; i++ )
-			{
-				retval[ i ] = m_data[ offset + i ];
-			}
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" );		//$NON-NLS-1$ 
-		}
-		
-		return retval;
-	}
-
-	/**
-	 * Retrieves a 'long Dimension' at the specified offset.  That is, retrieves a Dimension that is stored
-	 * in the data as two integers.
-	 * @param offset Offset to the dimension in the data.
-	 * @return A Dimension object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the dimension is greater than the size of the data buffer.
-	 */
-	public Dimension getDimensionLAt( int offset ) throws IOException
-	{
-		int w = getIntAt( offset );
-		int h = getIntAt( offset + 4 );
-		
-		return new Dimension( w, h );
-	}
-
-	/**
-	 * Retrieves a 'short Dimension' at the specified offset.  That is, retrieves a Dimension that is stored
-	 * in the data as two shorts.
-	 * @param offset Offset to the dimension in the data.
-	 * @return A Dimension object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the dimension is greater than the size of the data buffer.
-	 */
-	public Dimension getDimensionAt( int offset ) throws IOException
-	{
-		int w = getShortAt( offset );
-		int h = getShortAt( offset + 2 );
-		
-		return new Dimension( w, h );
-	}
-
-	/**
-	 * Retrieves a 'short Point' at the specified offset.  That is, retrieves a Point that is stored
-	 * in the data as two shorts.
-	 * @param offset Offset to the point in the data.
-	 * @return A Point object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the point is greater than the size of the data buffer.
-	 */
-	public Point getPointAt( int offset ) throws IOException
-	{
-		int x = getShortAt( offset );
-		int y = getShortAt( offset + 2 );
-		
-		return new Point( x, y );
-	}
-	
-	/**
-	 * Retrieves a 'long Point' at the specified offset.  That is, retrieves a Point that is stored
-	 * in the data as two integers.
-	 * @param offset Offset to the point in the data.
-	 * @return A Point object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the point is greater than the size of the data buffer.
-	 */
-	public Point getPointLAt( int offset ) throws IOException
-	{
-		int x = getIntAt( offset );
-		int y = getIntAt( offset + 4 );
-		
-		return new Point( x, y );
-	}
-	
-	/**
-	 * Retrieves a 'short Rectangle' at the specified offset.  That is, retrieves a Rectangle that is stored
-	 * in the data as four shorts.
-	 * @param offset Offset to the rectangle in the data.
-	 * @return A Rectangle object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the Rectangle is greater than the size of the data buffer.
-	 */
-	public Rectangle getRectangeAt( int offset ) throws IOException
-	{
-		int x = getShortAt( offset );
-		int y = getShortAt( offset + 2 );
-		int w = getShortAt( offset + 4 );
-		int h = getShortAt( offset + 6 );
-		
-		return new Rectangle( x, y, w, h );
-	}
-	
-	/**
-	 * Retrieves a 'long Rectangle' at the specified offset.  That is, retrieves a Rectangle that is stored
-	 * in the data as four integers.
-	 * @param offset Offset to the rectangle in the data.
-	 * @return A Rectangle object with the value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the Rectangle is greater than the size of the data buffer.
-	 */
-	public Rectangle getRectangleLAt( int offset ) throws IOException
-	{
-		int x 	= getIntAt( offset );
-		int y 	= getIntAt( offset + 4 );
-		int x1	= getIntAt( offset + 8 );
-		int y1	= getIntAt( offset + 12 );
-		
-		int w = x1 - x;
-		int h = y1 - y;
-		
-		return new Rectangle( x, y, w, h );
-	}
-
-	/**
-	 * Retrieves a 2D scale/translate/rotate transform as a float[6] array.
-	 * @param offset Offset to the transform in the data.
-	 * @return A float[] with the value at the specified location.
-	 * @throws IOException
-	 */
-	public float[] getTransformAt( int offset ) throws IOException
-	{
-		float[] xform = new float[6];
-		for (int i = 0; i < 6; ++i) {
-			xform[i] = getFloatAt( offset + i * 4);
-		}
-		return xform;
-	}
-	
-	/**
-	 * Retrieves the floating point value at the specified offset. 
-	 * @param offset Offset into the data where the float resides.
-	 * @return The value at the specified location.
-	 * @throws IOException Thrown if the offset plus the size of the float is greater than the size of the data buffer.
-	 */
-	public float getFloatAt( int offset )  throws IOException
-	{
-		int bits = (int) ( getDWORDAt( offset ) & 0xffffffff );
-		return Float.intBitsToFloat( bits );
-	}
-	
-	/**
-	 * Retrieves the set of characters at the specified offset.
-	 * @param offset Offset into the data where the characters reside.
-	 * @param numChars Number of characters to retrieve
-	 * @return Array of characters at the specified location
-	 * @throws IOException Thrown if the offset plus the (number of characters * 2) is greater than the size of the data buffer. 
-	 */
-	public char[] getCharsAt( int offset, int numChars ) throws IOException
-	{
-		char [] retval = null;
-		
-		if( offset + ( numChars * 2 ) < m_size )
-		{
-			retval = new char[ numChars ];
-			
-			for( int index = 0; index < numChars; index++ )
-			{
-				char lowByte 	= (char) (m_data[ offset + ( index * 2 ) ] & 0xff);
-				char highByte 	= (char) (m_data[ offset + 1 + ( index * 2 ) ] & 0xff);
-				retval[ index ] =  (char) (lowByte + (highByte << 8));
-			}
-		}
-		else
-		{
-			throw new IOException( "Read beyond end of data" );		//$NON-NLS-1$ 
-		}
-		
-		return retval;
-	}
-
-	protected long readDWORD( InputStream stream ) throws IOException
-	{
-		int byte1 = stream.read();
-		int byte2 = stream.read();
-		int byte3 = stream.read();
-		int byte4 = stream.read();
-		
-		int retval = byte1 + 
-					(byte2 << 8) +
-					(byte3 << 16) +
-					(byte4 << 24);
-		return 	retval;
-	}
-
-	protected int readShort( InputStream stream ) throws IOException
-	{
-		int byte1 = stream.read();
-		int byte2 = stream.read();
-		
-		int retval = byte1 + 
-					(byte2 << 8);
-		return 	retval;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Rectangle.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Rectangle.java
deleted file mode 100644
index f064e3a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/Rectangle.java
+++ /dev/null
@@ -1,90 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class Rectangle implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	private static final int	WMF_BOTTOM_OFFSET	= 0;
-	private static final int	WMF_RIGHT_OFFSET	= 2;
-	private static final int	WMF_TOP_OFFSET		= 4;
-	private static final int	WMF_LEFT_OFFSET		= 6;
-	
-	private java.awt.Rectangle	m_rect; 
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int bottom 	= rec.getShortAt( WMF_BOTTOM_OFFSET );
-		int right 	= rec.getShortAt( WMF_RIGHT_OFFSET );
-		int top 	= rec.getShortAt( WMF_TOP_OFFSET );
-		int left 	= rec.getShortAt( WMF_LEFT_OFFSET );
-		
-		m_rect = new java.awt.Rectangle( left, top, right - left, bottom - top );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_rect = rec.getRectangleLAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		
-		GdiBrush brush = context.getCurBrush();
-		
-		if( brush != null )
-		{
-			brush.fill( s, g, context );
-		}
-		
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{
-			pen.apply( g, context );
-			g.draw( s );
-		}
-	}
-	
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		context.getGdiPath().appendFigure( s );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		int x = context.convertXToSVGLogicalUnits( m_rect.x );
-		int y = context.convertYToSVGLogicalUnits( m_rect.y );
-		int w = context.scaleX( m_rect.width );
-		int h = context.scaleY( m_rect.height );
-		
-		return new Rectangle2D.Float( x, y, w, h );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RestoreDC.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RestoreDC.java
deleted file mode 100644
index df4fb69..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RestoreDC.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class RestoreDC implements IEmf2SvgConverter, IWmf2SvgConverter 
-{
-	private static int m_index = 0;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_index = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_index = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.restoreDC( m_index );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RoundRect.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RoundRect.java
deleted file mode 100644
index c71a347..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/RoundRect.java
+++ /dev/null
@@ -1,106 +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.awt.internal.svg.metafile;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.RoundRectangle2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderToPath;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class RoundRect implements IEmf2SvgConverter, IWmf2SvgConverter, IRenderToPath
-{
-	private static final int	EMF_RECT_OFFSET			= 0;
-	private static final int	EMF_CORNER_OFFSET		= 16;
-
-	private static final int	WMF_ELBOW_HEIGHT_OFFSET	= 0;
-	private static final int	WMF_ELBOW_WIDTH_OFFSET	= 2;
-	private static final int	WMF_BOTTOM_OFFSET		= 4;
-	private static final int	WMF_RIGHT_OFFSET		= 6;
-	private static final int	WMF_TOP_OFFSET			= 8;
-	private static final int	WMF_LEFT_OFFSET			= 10;
-	
-	private Rectangle	m_rect			= null;
-	private Dimension	m_corner		= null;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		int elbowHeight	= rec.getShortAt( WMF_ELBOW_HEIGHT_OFFSET );
-		int elbowWidth 	= rec.getShortAt( WMF_ELBOW_WIDTH_OFFSET );
-
-		int bottom 	= rec.getShortAt( WMF_BOTTOM_OFFSET );
-		int right 	= rec.getShortAt( WMF_RIGHT_OFFSET );
-		int top 	= rec.getShortAt( WMF_TOP_OFFSET );
-		int left 	= rec.getShortAt( WMF_LEFT_OFFSET );
-		
-		m_rect = new Rectangle( left, top, right - left, bottom - top );
-		m_corner = new Dimension( elbowWidth, elbowHeight );
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_rect 		= rec.getRectangleLAt( EMF_RECT_OFFSET );
-		m_corner 	= rec.getDimensionLAt( EMF_CORNER_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		
-		GdiBrush brush = context.getCurBrush();
-		
-		if( brush != null )
-		{
-			brush.fill( s, g, context );
-		}
-		
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{
-			pen.apply( g, context );
-			g.draw( s );
-		}
-	}
-
-	public void render( DeviceContext context ) throws TranscoderException
-	{
-		Shape s = getShape( context );
-		context.getGdiPath().appendFigure( s );
-	}
-	
-	private Shape getShape( DeviceContext context )
-	{
-		int x 				= context.convertXToSVGLogicalUnits( m_rect.x );
-		int y 				= context.convertYToSVGLogicalUnits( m_rect.y );
-		int w 				= context.scaleX( m_rect.width );
-		int h 				= context.scaleY( m_rect.height );
-		int cornerWidth		= context.scaleX( m_corner.width );
-		int cornerHeight	= context.scaleY( m_corner.height );
-		
-		return new RoundRectangle2D.Double( x, y, w, h, cornerWidth, cornerHeight );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SaveDC.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SaveDC.java
deleted file mode 100644
index ea5f30d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SaveDC.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.runtime.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class SaveDC implements IEmf2SvgConverter, IWmf2SvgConverter 
-{
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.saveDC();
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectClipRgn.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectClipRgn.java
deleted file mode 100644
index 740a5a0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectClipRgn.java
+++ /dev/null
@@ -1,45 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiRegion;
-
-/**
- * @author dhabib
- */
-class SelectClipRgn extends ObjectBase
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		if( getId() == 0 )
-		{
-			g.setClip( null );
-		}
-		else
-		{
-			GdiRegion clip = (GdiRegion) context.getGDI( getId() );
-			
-			if( clip != null )
-			{	
-				clip.apply( g );
-			}
-			else
-			{
-				g.setClip( null );
-			}
-		}
-	}	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectObject.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectObject.java
deleted file mode 100644
index 70e6afc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SelectObject.java
+++ /dev/null
@@ -1,154 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiFont;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiRegion;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-
-
-/**  
- * @author dhabib
- */
-public class SelectObject extends ObjectBase implements ITraceMe
-{
-	private String m_trace = null;
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		Object obj = context.getGDI( getId() );
-		
-		if( obj != null )
-		{
-			m_trace = Integer.toString(getId());
-
-			if( obj instanceof GdiFont )
-			{
-				GdiFont gdiFont = (GdiFont) obj;
-				
-				context.setCurFont( gdiFont );
-			}
-			else if( obj instanceof GdiBrush )
-			{
-				GdiBrush gdiBrush = (GdiBrush) obj;
-				context.setCurBrush( gdiBrush );
-			}
-			else if( obj instanceof GdiPen )
-			{
-				GdiPen pen = (GdiPen) obj;
-				context.setCurPen( pen );
-			}
-			else if( obj instanceof GdiRegion )
-			{
-				GdiRegion rgn = (GdiRegion) obj;
-				context.setCurRegion( rgn );
-			}
-			else
-			{
-				AbstractTranscoder.logMessage( getClass().getName() + "Invalid object type in select object, object #" + getId() );	//$NON-NLS-1$
-				return;
-			}
-		}
-		else
-		{
-			if( (getId() & ENHMETA_STOCK_OBJECT) == ENHMETA_STOCK_OBJECT )
-			{
-				// Stock object.  Figure out which kind.
-				int objectType = getId() & ~ENHMETA_STOCK_OBJECT;
-				
-				switch( objectType )
-				{
-					case WHITE_BRUSH:
-						m_trace = "WHITE_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( new GdiBrush( GdiBrush.BS_SOLID, Color.white, 0 ) );
-						break;
-					case LTGRAY_BRUSH:
-						m_trace = "LTGRAY_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( new GdiBrush( GdiBrush.BS_SOLID, Color.lightGray, 0 ) );
-						break;
-					case GRAY_BRUSH:
-						m_trace = "GRAY_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( new GdiBrush( GdiBrush.BS_SOLID, Color.gray, 0 ) );
-						break;
-					case DKGRAY_BRUSH:
-						m_trace = "DKGRAY_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( new GdiBrush( GdiBrush.BS_SOLID, Color.darkGray, 0 ) );
-						break;
-					case BLACK_BRUSH:
-						m_trace = "BLACK_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( new GdiBrush( GdiBrush.BS_SOLID, Color.black, 0 ) );
-						break;
-					case NULL_BRUSH:
-						m_trace = "NULL_BRUSH"; //$NON-NLS-1$
-						context.setCurBrush( null );
-						break;
-					case WHITE_PEN:
-						m_trace = "WHITE_PEN"; //$NON-NLS-1$
-						context.setCurPen( new GdiPen( GdiPen.PS_SOLID, 1, Color.white ) );
-						break;
-					case BLACK_PEN:
-						m_trace = "BLACK_PEN"; //$NON-NLS-1$
-						context.setCurPen( new GdiPen( GdiPen.PS_SOLID, 1, Color.black ) );
-						break;
-					case NULL_PEN:
-						m_trace = "NULL_PEN"; //$NON-NLS-1$
-						context.setCurPen( null );
-						break;
-					case OEM_FIXED_FONT:
-						m_trace = "OEM_FIXED_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 10, false, false, false, false, "Monospaced", 0 ) );	//$NON-NLS-1$
-						break;
-					case ANSI_FIXED_FONT:
-						m_trace = "ANSI_FIXED_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 10, false, false, false, false, "Monospaced", 0 ) );	//$NON-NLS-1$
-						break;
-					case ANSI_VAR_FONT:
-						m_trace = "ANSI_VAR_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 10, false, false, false, false, "SanSerif", 0 ) );		//$NON-NLS-1$
-						break;
-					case SYSTEM_FONT:
-						m_trace = "SYSTEM_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 12, false, false, false, true, "System", 0 ) );		//$NON-NLS-1$
-						break;
-					case DEVICE_DEFAULT_FONT:
-						m_trace = "DEVICE_DEFAULT_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 10, false, false, false, false, "Dialog", 0 ) );		//$NON-NLS-1$
-						break;
-					case SYSTEM_FIXED_FONT:
-						m_trace = "SYSTEM_FIXED_FONT"; //$NON-NLS-1$
-						context.setCurFont( new GdiFont( 10, false, false, false, false, "Monospaced", 0 ) );	//$NON-NLS-1$
-						break;
-					case DEFAULT_PALETTE:
-						m_trace = "DEFAULT_PALETTE"; //$NON-NLS-1$
-					default:
-						break;
-				}
-			}
-			else
-			{
-				AbstractTranscoder.logMessage( getClass().getName() + ": SelectObject failed to select object #" + getId() );	//$NON-NLS-1$
-			}
-		}
-	}
-
-	public String toString() {
-		return m_trace;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetArcDirection.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetArcDirection.java
deleted file mode 100644
index 029f794..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetArcDirection.java
+++ /dev/null
@@ -1,39 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class SetArcDirection implements IEmf2SvgConverter
-{
-	private int	m_arcDirection;
-	
-	public void readEMFRecord(Record rec) throws IOException
-	{
-		m_arcDirection = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setArcDirection( m_arcDirection );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkColor.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkColor.java
deleted file mode 100644
index 6e37321..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkColor.java
+++ /dev/null
@@ -1,46 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-public class SetBkColor implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private Color m_color = new Color( 0x00ffffff );	// Default to white.
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_color = rec.getColorAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_color = rec.getColorAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setBackColor( m_color );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkMode.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkMode.java
deleted file mode 100644
index 8f6b3cb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetBkMode.java
+++ /dev/null
@@ -1,44 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-public class SetBkMode implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private int 	m_bkMode = 0;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_bkMode = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_bkMode = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setBkMode( m_bkMode );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMapMode.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMapMode.java
deleted file mode 100644
index 96bfe7d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMapMode.java
+++ /dev/null
@@ -1,44 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-public class SetMapMode implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private int 	m_mapMode = 0;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_mapMode = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_mapMode = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setMapMode( m_mapMode );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMiterLimit.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMiterLimit.java
deleted file mode 100644
index acfc97f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetMiterLimit.java
+++ /dev/null
@@ -1,46 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class SetMiterLimit implements IEmf2SvgConverter, ITraceMe
-{
-	private float m_miterLimit	= 10.0f;
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		// In all Microsoft documentation for SetMiterLimit this is defined as a
-		// "float". However, in the actual file it is persisted as an integer!
-		// So read an integer but then treat it as a float...
-		m_miterLimit = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setMiterLimit( m_miterLimit );
-	}
-
-	public String toString() {
-		return Float.toString(m_miterLimit);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetPolyFillMode.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetPolyFillMode.java
deleted file mode 100644
index a43379a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetPolyFillMode.java
+++ /dev/null
@@ -1,57 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ITraceMe;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- *
- */
-public class SetPolyFillMode implements IEmf2SvgConverter, IWmf2SvgConverter, ITraceMe
-{
-	private int 	m_mode = 0;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_mode = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_mode = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setPolyFillMode( m_mode );
-	}
-
-	public String toString() {
-		switch (m_mode) {
-			case 1:
-				return "Alternate mode"; //$NON-NLS-1$
-			case 2:
-				return "Winding mode"; //$NON-NLS-1$
-			default:
-				return "bad mode..."; //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetROP2.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetROP2.java
deleted file mode 100644
index 22bfa16..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetROP2.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class SetROP2 implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private int 	m_mode = 0;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_mode = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_mode = (int) rec.getDWORDAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setROP2( m_mode );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetStretchBltMode.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetStretchBltMode.java
deleted file mode 100644
index ebaf4bf..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetStretchBltMode.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class SetStretchBltMode implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private int 	m_mode = 0;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_mode = rec.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_mode = rec.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setStretchBltMode( m_mode );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextAlign.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextAlign.java
deleted file mode 100644
index 8c19725..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextAlign.java
+++ /dev/null
@@ -1,45 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**  
- * @author dhabib
- */
-public class SetTextAlign implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private int		m_textAlignment	= DeviceContext.TA_TOP | DeviceContext.TA_LEFT;
-	
-	public void readWMFRecord( Record emr ) throws IOException
-	{
-		m_textAlignment = emr.getShortAt( 0 );
-	}
-
-	public void readEMFRecord( Record emr ) throws IOException
-	{
-		m_textAlignment = emr.getIntAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setTextAlignment( m_textAlignment );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextColor.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextColor.java
deleted file mode 100644
index 7c7bee8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetTextColor.java
+++ /dev/null
@@ -1,46 +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.awt.internal.svg.metafile;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-
-/**  
- * @author dhabib
- */
-public class SetTextColor implements IEmf2SvgConverter, IWmf2SvgConverter
-{
-	private Color m_color = new Color( 0x00ffffff );	// Default to white.
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_color = rec.getColorAt( 0 );
-	}
-
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_color = rec.getColorAt( 0 );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setTextColor( m_color );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportExtent.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportExtent.java
deleted file mode 100644
index b28816f..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportExtent.java
+++ /dev/null
@@ -1,30 +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.awt.internal.svg.metafile;
-
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**  
- * @author dhabib
- */
-public class SetViewportExtent extends AbstractSetExtentViewport 
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setViewportExtent( new Point( getX(), getY() ) );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportOrg.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportOrg.java
deleted file mode 100644
index 049e50c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetViewportOrg.java
+++ /dev/null
@@ -1,30 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**  
- * @author dhabib
- */
-public class SetViewportOrg extends AbstractSetExtentViewport 
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException 
-	{
-		context.setViewportOrigin( new Point( getX(), getY() ) );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowExtent.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowExtent.java
deleted file mode 100644
index 8b648e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowExtent.java
+++ /dev/null
@@ -1,29 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**  
- * @author dhabib
- */
-public class SetWindowExtent extends AbstractSetExtentViewport 
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.setWindowExtent( new Point( getX(), getY() ) );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowOrg.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowOrg.java
deleted file mode 100644
index e03d8a9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/SetWindowOrg.java
+++ /dev/null
@@ -1,30 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-
-/**  
- * @author dhabib
- */
-public class SetWindowOrg extends AbstractSetExtentViewport 
-{
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException 
-	{
-		context.setWindowOrigin( new Point( getX(), getY() ) );
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchBlt.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchBlt.java
deleted file mode 100644
index bc42aa4..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchBlt.java
+++ /dev/null
@@ -1,125 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.BitBlt;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class StretchBlt extends BitBlt
-{
-	private static final int	EMF_WSRC_OFFSET		= 92;
-	private static final int	EMF_HSRC_OFFSET		= 96;
-	
-	private static final int	WMF_XDEST_OFFSET		= 20;
-	private static final int	WMF_YDEST_OFFSET		= 18;
-	private static final int	WMF_WDEST_OFFSET		= 16;
-	private static final int	WMF_HDEST_OFFSET		= 14;
-	private static final int	WMF_XSRC_OFFSET			= 12;
-	private static final int	WMF_YSRC_OFFSET			= 10;
-	private static final int	WMF_WSRC_OFFSET			= 8;
-	private static final int	WMF_HSRC_OFFSET			= 6;
-	private static final int	WMF_USAGE_OFFSET		= 4;
-
-	private static final int	WMF_BMI_OFFSET			= 22;
-
-	protected int		m_wSrc	= 0;
-	protected int		m_hSrc	= 0;
-	
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		// Do not call base class implementation since the WMF offsets
-		// are different for StretchDIB vs DibBitBlt
-
-		// This only works for WMF_STRETCHDIB, not for WMF_STRETCHBLT since STRETCHBLT
-		// does not contain palette entries.  
-		// Need to consider supporting STRETCHBLT in some way.
-		m_xDest		= rec.getShortAt( WMF_XDEST_OFFSET );
-		m_yDest		= rec.getShortAt( WMF_YDEST_OFFSET );
-		m_wDest		= rec.getShortAt( WMF_WDEST_OFFSET );
-		m_hDest		= rec.getShortAt( WMF_HDEST_OFFSET );
-		m_xSrc		= rec.getShortAt( WMF_XSRC_OFFSET );
-		m_ySrc		= rec.getShortAt( WMF_YSRC_OFFSET );
-		m_wSrc		= rec.getShortAt( WMF_WSRC_OFFSET );
-		m_hSrc		= rec.getShortAt( WMF_HSRC_OFFSET );
-		int usage	= rec.getShortAt( WMF_USAGE_OFFSET );
-		
-		int bmiSize = BitmapHelper.getHeaderSize( 	rec, 
-													WMF_BMI_OFFSET, 
-													usage );
-		int dataOffset = WMF_BMI_OFFSET + bmiSize;
-		int dataSize = rec.getSize() - dataOffset;
-		
-		m_image = BitmapHelper.readBitmap( 	rec, 
-											WMF_BMI_OFFSET, 
-											bmiSize, 
-											dataOffset, 
-											dataSize );
-		
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		super.readEMFRecord( rec );
-		
-		// Read in the cx and cy values.
-		m_wSrc			= rec.getIntAt( EMF_WSRC_OFFSET );
-		m_hSrc			= rec.getIntAt( EMF_HSRC_OFFSET );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		int w = m_image.getWidth();
-		int h = m_image.getHeight();
-		
-		int xDest = context.convertXToSVGLogicalUnits( m_xDest );
-		int yDest = context.convertYToSVGLogicalUnits( m_yDest );
-		int wDest = context.scaleX( m_wDest );
-		int hDest = context.scaleY( m_hDest );
-		
-		if( m_xSrc >= w || m_ySrc >= h )
-		{
-			return;
-		}
-		
-		// Clip the image.
-		if( m_xSrc + m_wSrc > w )
-		{
-			m_wSrc = w - m_xSrc;
-		}
-
-		if( m_ySrc + m_hSrc > h )
-		{
-			m_hSrc = h - m_ySrc;
-		}
-
-		BufferedImage image = m_image.getSubimage( m_xSrc, m_ySrc, m_wSrc, m_hSrc );
-		
-		double scaleFactorX = (double) wDest / (double) m_wSrc;
-		double scaleFactorY = (double) hDest / (double) m_hSrc;
-
-		AffineTransform xform = new AffineTransform();
-		xform.translate( xDest, yDest );
-		xform.scale( scaleFactorX, scaleFactorY );
-		
-		g.drawImage( image, xform, null );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchDIBits.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchDIBits.java
deleted file mode 100644
index 67f2710..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StretchDIBits.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.draw2d.ui.render.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFRecord;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * Very similar to StretchBlt, but the offsets are completely different.
- * @author dhabib
- */
-public class StretchDIBits implements IWmf2SvgConverter, IEmf2SvgConverter
-{
-	private static final int	EMF_XDEST_OFFSET		= 16;
-	private static final int	EMF_YDEST_OFFSET		= 20;
-	private static final int	EMF_XSRC_OFFSET			= 24;
-	private static final int	EMF_YSRC_OFFSET			= 28;
-	private static final int	EMF_WSRC_OFFSET			= 32;
-	private static final int	EMF_HSRC_OFFSET			= 36;
-	private static final int	EMF_BMI_OFFSET_OFFSET	= 40;
-	private static final int	EMF_BMI_SIZE_OFFSET		= 44;
-	private static final int	EMF_DATA_OFFSET_OFFSET	= 48;
-	private static final int	EMF_DATA_SIZE_OFFSET	= 52;
-//	private static final int	EMF_USAGE_OFFSET		= 56;
-//	private static final int	EMF_ROP_OFFSET			= 60;
-	private static final int	EMF_WDEST_OFFSET		= 64;
-	private static final int	EMF_HDEST_OFFSET		= 68;
-	
-
-	private static final int	WMF_XDEST_OFFSET		= 18;
-	private static final int	WMF_YDEST_OFFSET		= 16;
-	private static final int	WMF_WDEST_OFFSET		= 14;
-	private static final int	WMF_HDEST_OFFSET		= 12;
-	private static final int	WMF_XSRC_OFFSET			= 10;
-	private static final int	WMF_YSRC_OFFSET			= 8;
-	private static final int	WMF_WSRC_OFFSET			= 6;
-	private static final int	WMF_HSRC_OFFSET			= 4;
-
-	private static final int	WMF_BMI_OFFSET			= 20;
-	
-	protected int				m_xDest			= 0;	// Dest coords are in logical units
-	protected int				m_yDest			= 0;
-	protected int				m_wDest			= 0;
-	protected int				m_hDest			= 0;
-	protected int				m_xSrc			= 0;	// Src coords are in pixels
-	protected int				m_ySrc			= 0;
-	protected int				m_wSrc			= 0;
-	protected int				m_hSrc			= 0;
-	protected BufferedImage		m_image			= null;
-
-	public void readWMFRecord( Record rec ) throws IOException
-	{
-		m_xDest		= rec.getShortAt( WMF_XDEST_OFFSET );
-		m_yDest		= rec.getShortAt( WMF_YDEST_OFFSET );
-		m_wDest		= rec.getShortAt( WMF_WDEST_OFFSET );
-		m_hDest		= rec.getShortAt( WMF_HDEST_OFFSET );
-		m_xSrc		= rec.getShortAt( WMF_XSRC_OFFSET );
-		m_ySrc		= rec.getShortAt( WMF_YSRC_OFFSET );
-		m_wSrc		= rec.getShortAt( WMF_WSRC_OFFSET );
-		m_hSrc		= rec.getShortAt( WMF_HSRC_OFFSET );
-		
-		int bmiSize = BitmapHelper.getHeaderSize( 	rec, 
-													WMF_BMI_OFFSET, 
-													DeviceContext.DIB_RGB_COLORS );
-		
-		int dataOffset = WMF_BMI_OFFSET + bmiSize;
-		int dataSize = rec.getSize() - dataOffset;
-		
-		m_image = BitmapHelper.readBitmap( 	rec, 
-											WMF_BMI_OFFSET, 
-											bmiSize, 
-											dataOffset, 
-											dataSize );
-	}
-	
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-		m_xDest			= rec.getIntAt( EMF_XDEST_OFFSET );
-		m_yDest			= rec.getIntAt( EMF_YDEST_OFFSET );
-		m_wDest			= rec.getIntAt( EMF_WDEST_OFFSET );
-		m_hDest			= rec.getIntAt( EMF_HDEST_OFFSET );
-		m_xSrc			= rec.getIntAt( EMF_XSRC_OFFSET );
-		m_ySrc			= rec.getIntAt( EMF_YSRC_OFFSET );
-		m_wSrc			= rec.getIntAt( EMF_WSRC_OFFSET );
-		m_hSrc			= rec.getIntAt( EMF_HSRC_OFFSET );
-		int bmiOffset	= rec.getIntAt( EMF_BMI_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;
-		int bmiSize		= rec.getIntAt( EMF_BMI_SIZE_OFFSET );
-		int dataOffset	= rec.getIntAt( EMF_DATA_OFFSET_OFFSET ) - EMFRecord.EMR_HEADER_SIZE;
-		int dataSize	= rec.getIntAt( EMF_DATA_SIZE_OFFSET );
-
-		m_image = BitmapHelper.readBitmap( rec, bmiOffset, bmiSize, dataOffset, dataSize );
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		int w = m_image.getWidth();
-		int h = m_image.getHeight();
-		
-		int xDest = context.convertXToSVGLogicalUnits( m_xDest );
-		int yDest = context.convertYToSVGLogicalUnits( m_yDest );
-		int wDest = context.scaleX( m_wDest );
-		int hDest = context.scaleY( m_hDest );
-		
-		if( m_xSrc >= w || m_ySrc >= h )
-		{
-			return;
-		}
-		
-		// Clip the image.
-		if( m_xSrc + m_wSrc > w )
-		{
-			m_wSrc = w - m_xSrc;
-		}
-
-		if( m_ySrc + m_hSrc > h )
-		{
-			m_hSrc = h - m_ySrc;
-		}
-
-		BufferedImage image = m_image.getSubimage( m_xSrc, m_ySrc, m_wSrc, m_hSrc );
-		
-		double scaleFactorX = (double) wDest / (double) m_wSrc;
-		double scaleFactorY = (double) hDest / (double) m_hSrc;
-
-		AffineTransform xform = new AffineTransform();
-		xform.translate( xDest, yDest );
-		xform.scale( scaleFactorX, scaleFactorY );
-		
-		g.drawImage( image, xform, null );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokeAndFillPath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokeAndFillPath.java
deleted file mode 100644
index 93998b2..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokeAndFillPath.java
+++ /dev/null
@@ -1,55 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class StrokeAndFillPath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		context.getGdiPath().closeAll();
-		
-		GeneralPath	gp 			= context.getGdiPath().getPath();
-		GdiBrush 	curBrush 	= context.getCurBrush();
-		
-		if( curBrush != null )
-		{
-			curBrush.fill( gp, g, context );
-		}
-		
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{	
-			pen.apply( g, context );
-			g.draw( gp );
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokePath.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokePath.java
deleted file mode 100644
index 1a52ca5..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/StrokePath.java
+++ /dev/null
@@ -1,45 +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.awt.internal.svg.metafile;
-
-import java.awt.Graphics2D;
-import java.awt.geom.GeneralPath;
-import java.io.IOException;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeviceContext;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.GdiPen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IEmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * @author dhabib
- */
-public class StrokePath implements IEmf2SvgConverter
-{
-	public void readEMFRecord( Record rec ) throws IOException
-	{
-	    // No data associated with this record.
-	}
-
-	public void render( Graphics2D g, DeviceContext context ) throws TranscoderException
-	{
-		GdiPen pen = context.getCurPen();
-		
-		if( pen != null )
-		{	
-			pen.apply( g, context );
-			GeneralPath gp = context.getGdiPath().getPath();
-			g.draw( gp );
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/TranscoderException.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/TranscoderException.java
deleted file mode 100644
index 033d81e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/TranscoderException.java
+++ /dev/null
@@ -1,98 +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.awt.internal.svg.metafile;
-
-/**
- * Represents an thrown by the transcoder.
- * @author dhabib
- */
-public class TranscoderException extends Exception
-{
-	private Exception m_exception	= null;
-	private boolean recoverable = true;
-	static final long serialVersionUID = 1;
-	/**
-	 * Creates a new TranscoderException with the specified message.
-	 * @param detailMessage
-	 */
-	public TranscoderException( String detailMessage )
-	{
-		super( detailMessage );
-	}
-	
-	/**
-	 * Accessor method indicating whether the exception should be logged or not.
-	 * @return true if it is possible to recover from the exception, false otherwise
-	 */
-	public boolean isRecoverable() {
-		return recoverable;
-	}
-	
-	/**
-	 * Creates a new TranscoderException with the specified message.
-	 * @param detailMessage
-	 * @param recoverable boolean indicating whether the exception is recoverable or not.  The exception
-	 * could be during the autosensing phase in which case the client should handle the exception.
-	 */
-	public TranscoderException( Exception e, boolean recoverable )
-	{
-		this( e );
-		this.recoverable = recoverable;
-	}
-
-	/**
-	 * Creates a new TranscoderException wrapping the specified exception.
-	 * @param e
-	 */
-	public TranscoderException( Exception e )
-	{
-		super( e.getMessage() );
-		m_exception = e;
-	}
-	
-	/**
-	 * Creates a new TranscoderException with the specified message and
-	 * wrapping the specified exception
-	 * @param detailMessage
-	 * @param e
-	 */
-	public TranscoderException( String detailMessage, Exception e )
-	{
-		super( detailMessage );
-		m_exception = e;
-	}
-	
-	/**
-	 * @return The wrapped exception.
-	 */
-	public Exception getException()
-	{
-		return m_exception;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Throwable#getMessage()
-	 */
-	public String getMessage()
-	{
-		if( super.getMessage() != null && super.getMessage().length() > 0 )
-		{
-			return super.getMessage();
-		}
-		else if( m_exception != null )
-		{
-			return m_exception.getMessage();
-		}
-		
-		return "";//$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFRecord.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFRecord.java
deleted file mode 100644
index c6a85c1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFRecord.java
+++ /dev/null
@@ -1,47 +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.awt.internal.svg.metafile;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-
-/**
- * The WMFRecord class reads the record header from a WMF record, then reads the
- * record's data into a buffer.  The record header contains the type of the
- * record and the size of the record.
- * 
- * @author dhabib
- */
-public class WMFRecord extends Record
-{
-	/** Size of the metafile record header, which consists of 2 bytes for the type and 4 bytes for the record size */
-	public static final int	WMR_HEADER_SIZE		= 6;
-
-	/**
-	 * Initializes the record by reading the record header from the specified stream, then reading the
-	 * record data.
-	 * @param stream Stream to read the data from.
-	 * @throws IOException Thrown if there is an error in stream (end of stream encountered before all the data could be read)
-	 */
-	public WMFRecord( BufferedInputStream stream ) throws IOException
-	{
-		// Note, last record has a size of 3 words, and a function id of 0.
-		int size = (int) readDWORD( stream ) * 2;  // Size is in words, not bytes, so double it.
-		int type = readShort( stream );
-		
-		setSize( size - 6 );	// Subtract 6 bytes for the header
-		setType( type );
-		readData( stream );
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFTranscoder.java b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFTranscoder.java
deleted file mode 100644
index ad43fee..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/WMFTranscoder.java
+++ /dev/null
@@ -1,719 +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.awt.internal.svg.metafile;
-
-import java.awt.Dimension;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Arc;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.BitBlt;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreateBrushIndirect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreateFontIndirect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreatePatternBrush;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.CreatePen;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.DeleteObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Ellipse;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.ExtTextOut;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Header;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IRenderableObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.IWmf2SvgConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.LineTo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.MoveTo;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyBezier;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.PolyPolygon;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Polygon;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Polyline;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Record;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.RestoreDC;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.RoundRect;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SaveDC;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SelectObject;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetBkColor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetBkMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetPolyFillMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetROP2;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetStretchBltMode;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetTextAlign;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetTextColor;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetViewportExtent;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetViewportOrg;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetWindowExtent;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.SetWindowOrg;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StretchBlt;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.StretchDIBits;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.TranscoderException;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.WMFRecord;
-
-/**
- * This class implements a fairly simple transcoder for Windows format  Metafiles.  It reads the
- * metafile records and turns them into SVG.  It uses the Batik libraries for the SVG generation.
- * 
- * To use this class, create an input stream containing the contents of an Windows Metafile (WMF) or
- * and Aldus Placable Metafile (APM) file.
- * Create an output stream to hold the generated SVG data.
- * Finally, create an instance of WMFTranscoder and call transcode( input, output ).  If there are no errors
- * the output stream will contain the SVG output.
- * 
- * This implementation covers a subset of the metafile records.  It is possible to extend this class by 
- * overriding the 'getConverter' method, and creating classes that implement IWmf2SvgConverter to handle the 
- * additional record types.  See 'getConverter' and the IWmf2SvgConverter interface for more details.  
- * 
- * @author dhabib
- */
-public class WMFTranscoder extends AbstractTranscoder
-{ 
-	/** Signature of an Aldus Placable Metafile */
-	protected static final int APM_HEADER_SIGNATURE			= 0x9ac6cdd7;
-	/** Size of an APM header */
-	protected static final int APM_HEADER_SIZE				= 22;
-	/** Size of a normal windows metafile header */
-	protected static final int WMF_HEADER_SIZE				= 18;
-
-	protected static final int WMF_FAKE_HEADER				= 0xffff;
-	protected static final int WMF_ANIMATEPALETTE			= 0x0436;
-	protected static final int WMF_ARC						= 0x0817;
-	protected static final int WMF_BITBLT					= 0x0922;
-	protected static final int WMF_CHORD					= 0x0830;
-	protected static final int WMF_CREATEBRUSHINDIRECT		= 0x02FC;
-	protected static final int WMF_CREATEFONTINDIRECT		= 0x02FB;
-	protected static final int WMF_CREATEPALETTE			= 0x00f7;
-	protected static final int WMF_CREATEPATTERNBRUSH		= 0x01F9;
-	protected static final int WMF_CREATEPENINDIRECT		= 0x02FA;
-	protected static final int WMF_CREATEREGION				= 0x06FF;
-	protected static final int WMF_DELETEOBJECT 			= 0x01f0;
-	protected static final int WMF_DIBBITBLT				= 0x0940;
-	protected static final int WMF_DIBCREATEPATTERNBRUSH	= 0x0142;
-	protected static final int WMF_DIBSTRETCHBLT			= 0x0b41;
-	protected static final int WMF_DRAWTEXT 				= 0x062F;
-	protected static final int WMF_ELLIPSE					= 0x0418;
-	protected static final int WMF_ESCAPE					= 0x0626;
-	protected static final int WMF_EXCLUDECLIPRECT			= 0x0415;
-	protected static final int WMF_EXTFLOODFILL 			= 0x0548;
-	protected static final int WMF_EXTTEXTOUT				= 0x0a32;
-	protected static final int WMF_FILLREGION				= 0x0228;
-	protected static final int WMF_FLOODFILL				= 0x0419;
-	protected static final int WMF_FRAMEREGION				= 0x0429;
-	protected static final int WMF_INTERSECTCLIPRECT		= 0x0416;
-	protected static final int WMF_INVERTREGION 			= 0x012A;
-	protected static final int WMF_LINETO					= 0x0213;
-	protected static final int WMF_MOVETO					= 0x0214;
-	protected static final int WMF_OFFSETWINDOWORG			= 0x020F;
-	protected static final int WMF_OFFSETVIEWPORTORG		= 0x0211;
-	protected static final int WMF_PAINTREGION				= 0x012B;
-	protected static final int WMF_PATBLT					= 0x061D;
-	protected static final int WMF_PIE						= 0x081A;
-	protected static final int WMF_POLYBEZIER16 			= 0x1000;
-	protected static final int WMF_POLYGON					= 0x0324;
-	protected static final int WMF_POLYLINE 				= 0x0325;
-	protected static final int WMF_POLYPOLYGON				= 0x0538;
-	protected static final int WMF_REALIZEPALETTE			= 0x0035;
-	protected static final int WMF_RESIZEPALETTE			= 0x0139;
-	protected static final int WMF_RECTANGLE				= 0x041B;
-	protected static final int WMF_RESTOREDC				= 0x0127;
-	protected static final int WMF_ROUNDRECT				= 0x061C;
-	protected static final int WMF_SAVEDC					= 0x001E;
-	protected static final int WMF_SCALEWINDOWEXT			= 0x0410;
-	protected static final int WMF_SCALEVIEWPORTEXT 		= 0x0412;
-	protected static final int WMF_SELECTCLIPREGION 		= 0x012C;
-	protected static final int WMF_SELECTPALETTE			= 0x0234;
-	protected static final int WMF_SELECTOBJECT 			= 0x012D;
-	protected static final int WMF_SETBKCOLOR				= 0x0201;
-	protected static final int WMF_SETBKMODE				= 0x0102;
-	protected static final int WMF_SETDIBTODEV				= 0x0d33;
-	protected static final int WMF_SETLAYOUT				= 0x0149;
-	protected static final int WMF_SETMAPPERFLAGS			= 0x0231;
-	protected static final int WMF_SETMAPMODE				= 0x0103;
-	protected static final int WMF_SETRELABS				= 0x0105;
-	protected static final int WMF_SETROP2					= 0x0104;
-	protected static final int WMF_SETPALENTRIES			= 0x0037;
-	protected static final int WMF_SETPIXEL 				= 0x041F;
-	protected static final int WMF_SETPOLYFILLMODE			= 0x0106;
-	protected static final int WMF_SETSTRETCHBLTMODE		= 0x0107;
-	protected static final int WMF_SETTEXTALIGN 			= 0x012E;
-	protected static final int WMF_SETTEXTCHAREXTRA 		= 0x0108;
-	protected static final int WMF_SETTEXTCOLOR 			= 0x0209;
-	protected static final int WMF_SETTEXTJUSTIFICATION		= 0x020A;
-	protected static final int WMF_SETWINDOWEXT 			= 0x020C;
-	protected static final int WMF_SETWINDOWORG 			= 0x020B;
-	protected static final int WMF_SETVIEWPORTEXT			= 0x020E;
-	protected static final int WMF_SETVIEWPORTORG			= 0x020D;
-	protected static final int WMF_STRETCHBLT				= 0x0B23;
-	protected static final int WMF_STRETCHDIB				= 0x0f43;
-	protected static final int WMF_TEXTOUT					= 0x0521;
-
-	/**
-	 * Reads the APM/WMF header from the input stream.  These records are
-	 * special since they don't follow the normal WMF record format (no
-	 * type and size).  This method constructs a fake header record
-	 * and returns it to the caller.
-	 * @param stream Contains the data for the WMF/APM file
-	 * @return
-	 * @throws IOException
-	 */
-	private Record readHeader( BufferedInputStream stream ) throws IOException
-	{
-		// Two kinds of WMF's that we support: Standard and APM.
-		// APM is a standard metafile with an additional header tacked on for good measure.
-	
-		// Mark the stream so we can reset to the current position.
-		stream.mark( 1000 );
-		
-		// See if it's an APM
-		Record rec = new Record( 0, APM_HEADER_SIZE, stream );
-		
-		int signature = (int) rec.getDWORDAt( 0 );
-		if( signature == APM_HEADER_SIGNATURE )
-		{
-			// APM header detected, read both headers into the record.
-			stream.reset();
-			rec = new Record( WMF_FAKE_HEADER, APM_HEADER_SIZE + WMF_HEADER_SIZE, stream );
-		}
-		else
-		{
-			// No APM header, must be a standard WMF file.
-			stream.reset();
-			rec = new Record( WMF_FAKE_HEADER, WMF_HEADER_SIZE, stream );
-		}
-		
-		return rec;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getNextRecord(java.io.BufferedInputStream, int)
-	 */
-	protected Record getNextRecord(	BufferedInputStream stream,
-									int curRecord ) throws IOException
-	{
-		if( curRecord == 0 )
-		{
-			// Read the metafile header.  Unlike EMF, this is not a standard record type,
-			// so we have to special case it here...
-			return readHeader( stream );
-		}
-		else
-		{	
-			WMFRecord rec = new WMFRecord( stream );
-			
-			if( rec.getType() == 0 )
-			{
-				// Record type of 0 means there are no more records.
-				return null;
-			}
-			else
-			{
-				return rec;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getConverter(org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.Record)
-	 */
-	protected IRenderableObject getConverter( Record rec ) throws TranscoderException
-	{
-		IWmf2SvgConverter svgConverter = null;
-		
-		switch( rec.getType() )
-		{
-			case WMF_FAKE_HEADER:
-				svgConverter = new Header();
-				break;
-				
-			case WMF_SETMAPMODE:
-				svgConverter = new SetMapMode();
-				break;
-
-			case WMF_SETWINDOWEXT:
-				svgConverter = new SetWindowExtent();
-				break;
-				
-			case WMF_SETWINDOWORG:
-				svgConverter = new SetWindowOrg();
-				break;
-				
-			case WMF_SETVIEWPORTEXT:
-				svgConverter = new SetViewportExtent();
-				break;
-				
-			case WMF_SETVIEWPORTORG:
-				svgConverter = new SetViewportOrg();
-				break;
-
-			case WMF_SETPOLYFILLMODE:
-				svgConverter = new SetPolyFillMode();
-				break;
-
-			case WMF_SETBKMODE:
-				svgConverter = new SetBkMode();
-				break;
-
-			case WMF_SETBKCOLOR:
-				svgConverter = new SetBkColor();
-				break;
-
-			case WMF_SAVEDC:
-				svgConverter = new SaveDC();
-				break;
-
-			case WMF_RESTOREDC:
-				svgConverter = new RestoreDC();
-				break;
-
-			case WMF_SELECTOBJECT:
-				svgConverter = new SelectObject();
-				break;
-				
-			case WMF_DELETEOBJECT:
-				svgConverter = new DeleteObject();
-				break;
-
-			case WMF_CREATEBRUSHINDIRECT:
-				svgConverter = new CreateBrushIndirect();
-				break;
-
-			case WMF_CREATEPENINDIRECT:
-				svgConverter = new CreatePen();
-				break;
-
-			case WMF_CREATEFONTINDIRECT:
-				svgConverter = new CreateFontIndirect();
-				break;
-				
-			case WMF_SETTEXTCOLOR:
-				svgConverter = new SetTextColor();
-				break;
-
-			case WMF_SETTEXTALIGN:
-				svgConverter = new SetTextAlign();
-				break;
-
-			case WMF_POLYGON:
-				svgConverter = new Polygon( true );
-				break;
-				
-			case WMF_POLYLINE:
-				svgConverter = new Polyline( true );
-				break;
-
-			case WMF_POLYBEZIER16:
-				svgConverter = new PolyBezier( true, false );
-				break;
-
-			case WMF_RECTANGLE:
-				svgConverter = new Rectangle();
-				break;
-				
-			case WMF_ROUNDRECT:
-				svgConverter = new RoundRect();
-				break;
-
-			case WMF_LINETO:
-				svgConverter = new LineTo();
-				break;
-				
-			case WMF_MOVETO:
-				svgConverter = new MoveTo();
-				break;
-
-			case WMF_ELLIPSE:
-				svgConverter = new Ellipse();
-				break;
-				
-			case WMF_EXTTEXTOUT:
-				svgConverter = new ExtTextOut( false );
-				break;
-
-			case WMF_SELECTCLIPREGION:
-				svgConverter = new SelectClipRgn();
-				break;
-
-			case WMF_INTERSECTCLIPRECT:
-				svgConverter = new IntersectClipRect();
-				break;
-
-			case WMF_POLYPOLYGON:
-				svgConverter = new PolyPolygon( true );
-				break;
-				
-			case WMF_ARC:
-				svgConverter = new Arc( Arc.ARC );
-				break;
-				
-			case WMF_CHORD:
-				svgConverter = new Arc( Arc.CHORD );
-				break;
-				
-			case WMF_PIE:
-				svgConverter = new Arc( Arc.PIE );
-				break;
-
-			case WMF_SETSTRETCHBLTMODE:
-				svgConverter = new SetStretchBltMode();
-				break;
-
-			case WMF_SETROP2:
-				svgConverter = new SetROP2();
-				break;
-
-			case WMF_CREATEPATTERNBRUSH:
-				svgConverter = new CreatePatternBrush( false );
-				break;
-
-			case WMF_DIBCREATEPATTERNBRUSH:
-				svgConverter = new CreatePatternBrush( true );
-				break;
-
-			case WMF_STRETCHDIB:
-				svgConverter = new StretchBlt();
-				break;
-
-			case WMF_DIBSTRETCHBLT:
-				svgConverter = new StretchDIBits();
-				break;
-
-			case WMF_DIBBITBLT:
-				svgConverter = new BitBlt();
-				break;
-
-			// Consume but do nothing
-			case WMF_ESCAPE:
-			case WMF_ANIMATEPALETTE:
-			case WMF_CREATEPALETTE:
-			case WMF_SELECTPALETTE:
-			case WMF_REALIZEPALETTE:
-			case WMF_RESIZEPALETTE:
-				// These opcodes don't seem to matter at all, so 'No-op' them for now.
-				// It may be that we will need to at least handle the palette creation
-				// since this will create a new Gdi object in the system and potentially
-				// mess up the object ids.
-				svgConverter = new Noop();
-				break;
-
-
-			case WMF_STRETCHBLT:
-				// Not currently supported.  Not normally seen in metafiles.  This is a device
-				// dependent stretch blt.  I don't think we can support this unless we support
-				// palettes properly since the bitmap does not contain any palette entries.
-				break;
-			case WMF_BITBLT:
-				// Not currently supported.  Not normally seen in metafiles.  This is a device
-				// dependent stretch blt.  I don't think we can support this unless we support
-				// palettes properly since the bitmap does not contain any palette entries.
-				break;
-			
-			case WMF_SETPIXEL:
-			case WMF_TEXTOUT:
-
-
-			// Region stuff.  Haven't seen any of this, which is good since parsing 'createregion'
-			// could be quite difficult.
-			case WMF_CREATEREGION:
-			case WMF_EXCLUDECLIPRECT:
-			case WMF_FILLREGION:
-			case WMF_FRAMEREGION:
-			case WMF_INVERTREGION:
-			case WMF_PAINTREGION:
-
-
-			// Unlikely we will need to implement any of this.
-			case WMF_EXTFLOODFILL:
-			case WMF_FLOODFILL:
-			case WMF_OFFSETWINDOWORG:
-			case WMF_OFFSETVIEWPORTORG:
-			case WMF_PATBLT:
-			case WMF_SCALEWINDOWEXT:
-			case WMF_SCALEVIEWPORTEXT:
-			case WMF_SETDIBTODEV:
-			case WMF_SETLAYOUT:
-			case WMF_SETMAPPERFLAGS:
-				
-			case WMF_SETTEXTCHAREXTRA:
-			case WMF_SETRELABS:
-			case WMF_SETPALENTRIES:
-				
-			case WMF_SETTEXTJUSTIFICATION:
-				break;
-				
-			default:
-				break;
-		}
-		
-		if( svgConverter != null )
-		{
-			initializeConverter( svgConverter, rec );
-		}
-
-		return svgConverter;
-	}
-
-	/**
-	 * Initializes the specified converter with data from the specified record.
-	 * @param svgConverter
-	 * @param rec
-	 * @throws TranscoderException
-	 */
-	private void initializeConverter(	IRenderableObject svgConverter, 
-										Record rec ) throws TranscoderException
-	{
-		try
-		{
-			IWmf2SvgConverter converter = (IWmf2SvgConverter) svgConverter;
-			converter.readWMFRecord( rec );
-	
-			// Header record is special.  It contains info that the transcoder needs to function
-			// such as the number of records in the metafile.
-			if( converter instanceof Header )
-			{
-				Header header = (Header) converter;
-				setSize( new Dimension( header.getBounds().width, header.getBounds().height ) );
-			}
-		}
-		catch( IOException e )
-		{
-			throw new TranscoderException( e, false ); // don't log this exception since it will be used for autosense failure
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.gef.ui.internal.metafile2svg.AbstractTranscoder#getUserFriendlyName(int)
-	 */
-	protected String getUserFriendlyName( int recordType )
-	{
-		String name = "";  //$NON-NLS-1$
-		
-		switch( recordType )
-		{
-			case WMF_FAKE_HEADER:
-				name = "FAKE_HEADER"; //$NON-NLS-1$
-				break;
-			case WMF_ANIMATEPALETTE:
-				name = "ANIMATEPALETTE"; //$NON-NLS-1$
-				break;
-			case WMF_ARC:
-				name = "ARC"; //$NON-NLS-1$
-				break;
-			case WMF_BITBLT:
-				name = "BITBLT"; //$NON-NLS-1$
-				break;
-			case WMF_CHORD:
-				name = "CHORD"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEBRUSHINDIRECT:
-				name = "CREATEBRUSHINDIRECT"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEFONTINDIRECT:
-				name = "CREATEFONTINDIRECT"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEPALETTE:
-				name = "CREATEPALETTE"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEPATTERNBRUSH:
-				name = "CREATEPATTERNBRUSH"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEPENINDIRECT:
-				name = "CREATEPENINDIRECT"; //$NON-NLS-1$
-				break;
-			case WMF_CREATEREGION:
-				name = "CREATEREGION"; //$NON-NLS-1$
-				break;
-			case WMF_DELETEOBJECT:
-				name = "DELETEOBJECT"; //$NON-NLS-1$
-				break;
-			case WMF_DIBBITBLT:
-				name = "DIBBITBLT"; //$NON-NLS-1$
-				break;
-			case WMF_DIBCREATEPATTERNBRUSH:
-				name = "DIBCREATEPATTERNBRUSH"; //$NON-NLS-1$
-				break;
-			case WMF_DIBSTRETCHBLT:
-				name = "DIBSTRETCHBLT"; //$NON-NLS-1$
-				break;
-			case WMF_DRAWTEXT:
-				name = "DRAWTEXT"; //$NON-NLS-1$
-				break;
-			case WMF_ELLIPSE:
-				name = "ELLIPSE"; //$NON-NLS-1$
-				break;
-			case WMF_ESCAPE:
-				name = "ESCAPE"; //$NON-NLS-1$
-				break;
-			case WMF_EXCLUDECLIPRECT:
-				name = "EXCLUDECLIPRECT"; //$NON-NLS-1$
-				break;
-			case WMF_EXTFLOODFILL:
-				name = "EXTFLOODFILL"; //$NON-NLS-1$
-				break;
-			case WMF_EXTTEXTOUT:
-				name = "EXTTEXTOUT"; //$NON-NLS-1$
-				break;
-			case WMF_FILLREGION:
-				name = "FILLREGION"; //$NON-NLS-1$
-				break;
-			case WMF_FLOODFILL:
-				name = "FLOODFILL"; //$NON-NLS-1$
-				break;
-			case WMF_FRAMEREGION:
-				name = "FRAMEREGION"; //$NON-NLS-1$
-				break;
-			case WMF_INTERSECTCLIPRECT:
-				name = "INTERSECTCLIPRECT"; //$NON-NLS-1$
-				break;
-			case WMF_INVERTREGION:
-				name = "INVERTREGION"; //$NON-NLS-1$
-				break;
-			case WMF_LINETO:
-				name = "LINETO"; //$NON-NLS-1$
-				break;
-			case WMF_MOVETO:
-				name = "MOVETO"; //$NON-NLS-1$
-				break;
-			case WMF_OFFSETWINDOWORG:
-				name = "OFFSETWINDOWORG"; //$NON-NLS-1$
-				break;
-			case WMF_OFFSETVIEWPORTORG:
-				name = "OFFSETVIEWPORTORG"; //$NON-NLS-1$
-				break;
-			case WMF_PAINTREGION:
-				name = "PAINTREGION"; //$NON-NLS-1$
-				break;
-			case WMF_PATBLT:
-				name = "PATBLT"; //$NON-NLS-1$
-				break;
-			case WMF_PIE:
-				name = "PIE"; //$NON-NLS-1$
-				break;
-			case WMF_POLYBEZIER16:
-				name = "POLYBEZIER16"; //$NON-NLS-1$
-				break;
-			case WMF_POLYGON:
-				name = "POLYGON"; //$NON-NLS-1$
-				break;
-			case WMF_POLYLINE:
-				name = "POLYLINE"; //$NON-NLS-1$
-				break;
-			case WMF_POLYPOLYGON:
-				name = "POLYPOLYGON"; //$NON-NLS-1$
-				break;
-			case WMF_REALIZEPALETTE:
-				name = "REALIZEPALETTE"; //$NON-NLS-1$
-				break;
-			case WMF_RESIZEPALETTE:
-				name = "RESIZEPALETTE"; //$NON-NLS-1$
-				break;
-			case WMF_RECTANGLE:
-				name = "RECTANGLE"; //$NON-NLS-1$
-				break;
-			case WMF_RESTOREDC:
-				name = "RESTOREDC"; //$NON-NLS-1$
-				break;
-			case WMF_ROUNDRECT:
-				name = "ROUNDRECT"; //$NON-NLS-1$
-				break;
-			case WMF_SAVEDC:
-				name = "SAVEDC"; //$NON-NLS-1$
-				break;
-			case WMF_SCALEWINDOWEXT:
-				name = "SCALEWINDOWEXT"; //$NON-NLS-1$
-				break;
-			case WMF_SCALEVIEWPORTEXT:
-				name = "SCALEVIEWPORTEXT"; //$NON-NLS-1$
-				break;
-			case WMF_SELECTCLIPREGION:
-				name = "SELECTCLIPREGION"; //$NON-NLS-1$
-				break;
-			case WMF_SELECTPALETTE:
-				name = "SELECTPALETTE"; //$NON-NLS-1$
-				break;
-			case WMF_SELECTOBJECT:
-				name = "SELECTOBJECT"; //$NON-NLS-1$
-				break;
-			case WMF_SETBKCOLOR:
-				name = "SETBKCOLOR"; //$NON-NLS-1$
-				break;
-			case WMF_SETBKMODE:
-				name = "SETBKMODE"; //$NON-NLS-1$
-				break;
-			case WMF_SETDIBTODEV:
-				name = "SETDIBTODEV"; //$NON-NLS-1$
-				break;
-			case WMF_SETLAYOUT:
-				name = "SETLAYOUT"; //$NON-NLS-1$
-				break;
-			case WMF_SETMAPPERFLAGS:
-				name = "SETMAPPERFLAGS"; //$NON-NLS-1$
-				break;
-			case WMF_SETMAPMODE:
-				name = "SETMAPMODE"; //$NON-NLS-1$
-				break;
-			case WMF_SETRELABS:
-				name = "SETRELABS"; //$NON-NLS-1$
-				break;
-			case WMF_SETROP2:
-				name = "SETROP2"; //$NON-NLS-1$
-				break;
-			case WMF_SETPALENTRIES:
-				name = "SETPALENTRIES"; //$NON-NLS-1$
-				break;
-			case WMF_SETPIXEL:
-				name = "SETPIXEL"; //$NON-NLS-1$
-				break;
-			case WMF_SETPOLYFILLMODE:
-				name = "SETPOLYFILLMODE"; //$NON-NLS-1$
-				break;
-			case WMF_SETSTRETCHBLTMODE:
-				name = "SETSTRETCHBLTMODE"; //$NON-NLS-1$
-				break;
-			case WMF_SETTEXTALIGN:
-				name = "SETTEXTALIGN"; //$NON-NLS-1$
-				break;
-			case WMF_SETTEXTCHAREXTRA:
-				name = "SETTEXTCHAREXTRA"; //$NON-NLS-1$
-				break;
-			case WMF_SETTEXTCOLOR:
-				name = "SETTEXTCOLOR"; //$NON-NLS-1$
-				break;
-			case WMF_SETTEXTJUSTIFICATION:
-				name = "SETTEXTJUSTIFICATION"; //$NON-NLS-1$
-				break;
-			case WMF_SETWINDOWEXT:
-				name = "SETWINDOWEXT"; //$NON-NLS-1$
-				break;
-			case WMF_SETWINDOWORG:
-				name = "SETWINDOWORG"; //$NON-NLS-1$
-				break;
-			case WMF_SETVIEWPORTEXT:
-				name = "SETVIEWPORTEXT"; //$NON-NLS-1$
-				break;
-			case WMF_SETVIEWPORTORG:
-				name = "SETVIEWPORTORG"; //$NON-NLS-1$
-				break;
-			case WMF_STRETCHBLT:
-				name = "STRETCHBLT"; //$NON-NLS-1$
-				break;
-			case WMF_STRETCHDIB:
-				name = "STRETCHDIB"; //$NON-NLS-1$
-				break;
-			case WMF_TEXTOUT:
-				name = "TEXTOUT"; //$NON-NLS-1$
-				break;
-			default:
-				name = "<unknown>"; //$NON-NLS-1$
-				break;				
-		}
-		
-		return name;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/metafile/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.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/package.html b/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/package.html
deleted file mode 100644
index 17a73e9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render.awt/src/org/eclipse/gmf/runtime/draw2d/ui/render/awt/internal/svg/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/.classpath b/org.eclipse.gmf.runtime.draw2d.ui.render/.classpath
deleted file mode 100644
index 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 ef1107b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.draw2d.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/.api_filters b/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/.api_filters
deleted file mode 100644
index d349ffb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/.api_filters
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.draw2d.ui.render" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageType.java" type="org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageType">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="RenderedImageKey"/>
-                <message_argument value="RenderedImageType"/>
-                <message_argument value="autoDetect(byte[], RenderedImageKey)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 438c62e..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:03:21 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 7903b4c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Fri Oct 17 10:28:03 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 f4a23c8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +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.4.1.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.diagram.ui.printing,
-   org.eclipse.gmf.runtime.diagram.ui",
- 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.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 a980559..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.draw2d.ui.render/pom.xml
deleted file mode 100644
index b977599..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.draw2d.ui.render</groupId>
-  <artifactId>org.eclipse.gmf.runtime.draw2d.ui.render</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 0605e15..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/factory/RenderedImageFactory.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ByteArrayOutputStream;
-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();
-            
-            ByteArrayOutputStream bos = new ByteArrayOutputStream(is.available());
-            byte[] buffer = new byte[8192];
-            int bytesRead;
-            while ((bytesRead = is.read(buffer)) != -1) {
-            	bos.write(buffer, 0, bytesRead);
-            }
-            is.close();
-            
-            return getInstance(bos.toByteArray(), info, theURL.toString());
-
-        } 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 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.
-     * @param url the url of the image (filename url - should be there for SVG, since it may have external references)
-     * @return <code>RenderedImage</code> instance with the size dimensions
-     *         requested.
-     * @since 2.1
-     */
-    public static RenderedImage getInstance(byte [] buffer, RenderInfo info, String url) {
-        Adler32 checksum = new Adler32();
-        checksum.update(buffer);
-        final RenderedImageKey key = new RenderedImageKey(info, checksum.getValue(), null, url);
-        WeakReference ref = (WeakReference) instanceMap.get(key);
-        RenderedImage image = null;
-        if (ref != null)
-            image = (RenderedImage) (((WeakReference) instanceMap.get(key))
-                .get());
-        else
-            image = autodetectImage(buffer, key);
-
-		// Bugzilla 208374
-		if (image == null) {
-			// Remove entry holding null reference.
-			instanceMap.remove(key);
-			// Recreate entry using buffer.
-			image = getInstance(buffer);
-		}
-
-        return image;
-    	
-    }
-
-    /**
-     * 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);
-            
-            ByteArrayOutputStream bos = new ByteArrayOutputStream(fis.available());
-            byte[] buffer = new byte[8192];
-            int bytesRead;
-            while ((bytesRead = fis.read(buffer)) != -1) {
-            	bos.write(buffer, 0, bytesRead);
-            }
-            fis.close();
-
-            return getInstance(bos.toByteArray(), info, szFilePath);
-
-        } 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();
-            
-            Object extraData = oldKey.getExtraData();
-            if (info.getBackgroundColor() != null
-                && !info.getBackgroundColor().equals(
-                    oldKey.getBackgroundColor())) {
-                extraData = null;
-            } else if (info.getForegroundColor() != null
-                && !info.getForegroundColor().equals(
-                    oldKey.getForegroundColor())) {
-                extraData = null;
-            }
-            
-            RenderedImageKey key = new RenderedImageKey(info, oldKey.getChecksum(), extraData);
-            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);
-
-		// Bugzilla 208374
-		if (image == null) {
-			// Remove entry holding null reference.
-			instanceMap.remove(key);
-			// Recreate entry using buffer.
-			image = getInstance(buffer);
-		}
-
-        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 7c97968..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-		
-		if (getRenderedImage() != null) {
-			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()) {
-            RGB backgroundColor = getBackgroundColor().getRGB();
-            RGB foregroundColor = getForegroundColor().getRGB();
-            if ((backgroundColor != null && !backgroundColor.equals(rndInfo.getBackgroundColor())) ||
-                    (foregroundColor != null && !foregroundColor.equals(rndInfo.getForegroundColor()))) {
-                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) {
-		if (this.lastRenderedImage != renderedImage) {
-			this.lastRenderedImage = renderedImage;
-			if (renderedImage == null || renderedImage.isRendered()) {
-				notifyImageChanged();
-			}
-		}
-	}
-}
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 8e3428b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/AbstractRenderedImage.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-*/
-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(), key.getURLString());
-	}
-	
-	/**
-	 * 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()
-	 */
-	 final public Image getSWTImage() {
-		if (img != null)
-			return img;
-
-		Image image = renderImage();
-		if (img != null && !img.isDisposed()) {
-			img.dispose();
-		}
-		img = image;
-
-		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 90a2b0b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderDebugOptions.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 debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-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 7c04657..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/Draw2dRenderStatusCodes.java
+++ /dev/null
@@ -1,38 +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
- *
- */
-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 0adb98a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/DrawableRenderedImage.java
+++ /dev/null
@@ -1,50 +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
- *
- * 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 271d89b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/RenderHelper.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-				} 
-			}
-
-			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 158c84d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderInfoImpl.java
+++ /dev/null
@@ -1,196 +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
- * 
- * 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 5a1f611..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/factory/RenderedImageKey.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- *
- * 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;
-    }
-    
-    public RenderedImageKey(RenderInfo info, long checksum, Object extraData, String url) {
-    	this(info, checksum, extraData);
-    	this.url = url;
-    }
-
-    private long checksum = 0;
-    private Object extraData = null;
-    private String url;
-
-    /**
-     * @return Long value that is the checksum
-     */
-    public long getChecksum() {
-        return checksum;
-    }
-    
-    /**
-     * Returns a String representation of the URL of the image (a path to the image file) 
-     * 
-     * @return the URL string
-     * @since 2.1
-     */
-    public String getURLString() {
-    	return url;
-    }
-
-    /**
-     * @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;
-    }
-
-    public void setValues(int width, int height, boolean maintainAspectRatio, boolean antialias, RGB fill, RGB outline) {
-        
-        // if the colors have changed, the document needs to be recreated
-        if (fill != null && !fill.equals(getBackgroundColor())) {
-            setExtraData(null);
-        }
-        if (outline != null && !outline.equals(getForegroundColor())) {
-            setExtraData(null);
-        }
-        
-        super.setValues(width, height, maintainAspectRatio, antialias, fill, outline);
-
-    }
-    
-    
-}
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 921f102..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedMapModeGraphics.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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(
-			1, false, shouldAllowDelayRender(), getMaximumRenderSize()).drawRenderedImage(getGraphics(),
-			srcImage, zoomRect(rect.x, rect.y, rect.width, rect.height), 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 7454021..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedPrinterGraphics.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-        
-		/*
-		 * Printed rendered image should not be set on the figure. Printing has
-		 * its own scaling independent of the diagram
-		 */
-        return srcImage;
-	}
-	
-    /* (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 307fbb3..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/graphics/RenderedScaledGraphics.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- * 
- * 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;
-	}
-
-	/*
-	 * (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(1, false, shouldAllowDelayRender(), getMaximumRenderSize())
-			.drawRenderedImage(getGraphics(), srcImage, zoomRect(rect.x, rect.y, rect.width, rect.height), 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 f4f6589..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/image/ImageRenderedImage.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-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.jface.resource.CompositeImageDescriptor;
-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.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-/**
-* 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 {
-	
-	private final RGB TRANSPARENT_COLOR = new RGB(0,0,0);
-	
-	/**
-	 * Draws two images, one that represents the background, and another one
-	 * centered within the bounds of the first one.
-	 * 
-	 * @author lgrahek
-	 * 
-	 */
-	private static class TwoImageDescriptor extends CompositeImageDescriptor {
-
-		/** size of the combined image */
-		private Point size;		
-		/** background image (transparent) */
-		private ImageData bgImgData;
-		/** image to be drawn on top of it */
-		private ImageData actualImgData;
-		
-
-		/**
-		 * @param bgImgData
-		 *            Image to drawn first
-		 * @param actualImgData
-		 *            Image to be drawn second
-		 * @param bufferWidth
-		 *            Width of the final image
-		 * @param bufferHeight
-		 *            Height of the final image
-		 */
-		public TwoImageDescriptor(ImageData bgImgData, ImageData actualImgData,
-				int bufferWidth, int bufferHeight) {
-			this.bgImgData = bgImgData;
-			this.actualImgData = actualImgData;
-			this.size = new Point(bufferWidth, bufferHeight);
-		}	
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
-		 */
-		protected void drawCompositeImage(int width, int height) {
-			// draw the base image
-			drawImage(bgImgData, 0, 0);
-			drawImage(actualImgData, 
-					(size.x - actualImgData.width) / 2, (size.y - actualImgData.height) / 2);
-		}
-		
-		/**
-		 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-		 */
-		protected Point getSize() {
-			return size;
-		}
-	}			
-	
-	/**
-	 * 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[] origImgData = loader.load(byteIS);
-			if (origImgData == null)
-				throw new InvalidParameterException();
-				
-			int origWidth = origImgData[0].width;
-			int origHeight = origImgData[0].height;
-			
-			int bufferWidth = getKey().getWidth() == 0 ? origWidth : getKey().getWidth();
-			int bufferHeight = getKey().getHeight() == 0 ? origHeight : getKey().getHeight();
-			
-			int newWidth = bufferWidth;
-            int newHeight = bufferHeight;
-            
-			Display display = DisplayUtils.getDisplay(); 
-
-			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;
-				
-				// Ensure that pixels outside of the actual image are
-				// transparent by creating a background image which is transparent.
-				// TransparentBgImageDescriptor does the job.
-				PaletteData paletteData = new PaletteData(0xFF, 0xFF00, 0xFF0000);
-				ImageData imgData = new ImageData(bufferWidth, bufferHeight, 24, paletteData);		
-				imgData.transparentPixel = paletteData.getPixel(TRANSPARENT_COLOR);				
-				TwoImageDescriptor desc = new TwoImageDescriptor(
-						imgData, origImgData[0].scaledTo(newWidth, newHeight), bufferWidth, bufferHeight);
-				return desc.createImage();
-			}
-			else {
-				ImageData scaledImgData = origImgData[0].scaledTo(newWidth, newHeight);
-				return new Image(display, scaledImgData);
-			}
-		} catch (Exception e) {
-			Trace.throwing(Draw2dRenderPlugin.getInstance(), Draw2dRenderDebugOptions.EXCEPTIONS_THROWING, ImageRenderedImage.class, 
-				"ImageRenderedImage.renderImage() : couldn't load image from buffer", //$NON-NLS-1$
-				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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 9b173d3..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.draw2d.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/.settings/.api_filters b/org.eclipse.gmf.runtime.draw2d.ui/.settings/.api_filters
deleted file mode 100644
index 2cef9b1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/.settings/.api_filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.draw2d.ui" version="2">
-    <resource path="META-INF/MANIFEST.MF">
-        <filter id="924844039">
-            <message_arguments>
-                <message_argument value="1.4.0.qualifier"/>
-                <message_argument value="1.4.0.v20100303-2359"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/draw2d/ui/figures/DropShadowBorder.java" type="org.eclipse.gmf.runtime.draw2d.ui.figures.DropShadowBorder">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="TransparentBorder"/>
-                <message_argument value="DropShadowBorder"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java" type="org.eclipse.gmf.runtime.draw2d.ui.figures.RectangularDropShadowLineBorder">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="LineBorderEx"/>
-                <message_argument value="RectangularDropShadowLineBorder"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
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 521705c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,88 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.gmf.runtime.draw2d.ui
-Bundle-Version: 1.5.0.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.graph,
- 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.parts;x-friends:="org.eclipse.gmf.runtime.diagram.ui",
- 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,
- org.eclipse.gmf.runtime.draw2d.ui.text
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 0548fd7..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 Modeling Project
-
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/pom.xml b/org.eclipse.gmf.runtime.draw2d.ui/pom.xml
deleted file mode 100644
index f41ac49..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.draw2d.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.draw2d.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 2ce9836..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/BaseSlidableAnchor.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-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;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PrecisionPointList;
-
-
-/**
- * Provides the implementation of Slidable anchor
- * 
- * @author oboyko / sshaw
- *
- */
-public class BaseSlidableAnchor
-	extends AbstractConnectionAnchor implements OrthogonalConnectionAnchor {
-	
-	final private static char TERMINAL_START_CHAR = '(';
-	final private static char TERMINAL_DELIMITER_CHAR = ',';
-	final private static char TERMINAL_END_CHAR = ')'; 
-
-	// The connection anchor reference 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(p.preciseX);		// 10 chars
-		s.append(TERMINAL_DELIMITER_CHAR);	// 1 char
-		s.append(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)
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof BaseSlidableAnchor) {
-			BaseSlidableAnchor anchor = (BaseSlidableAnchor) obj;
-			/*
-			 * Owning figures must be identical to satisfy equality of anchors
-			 */
-			if (getOwner() == anchor.getOwner()) {
-				if (isDefaultAnchor()) {
-					return anchor.isDefaultAnchor();
-				}
-				return relativeReference.equals(anchor.relativeReference);
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		int figureHashCode = getOwner() != null ? getOwner().hashCode() : 0; 
-		if (relativeReference == null) {
-			return figureHashCode;
-		}
-		return new Double(relativeReference.preciseX()).hashCode()
-				^ new Double(relativeReference.preciseY()).hashCode()
-				^ figureHashCode;
-	}
-
-	/**
-	 * From relative reference returns the relative coordinates of the anchor
-	 * Method's visibility can be changed as needed
-	 */
-	private Point getAnchorPosition() {
-		PrecisionRectangle rBox = new PrecisionRectangle(getBox());
-		if (isDefaultAnchor())
-			return rBox.getCenter();
-		return new PrecisionPoint(relativeReference.preciseX * rBox.preciseWidth
-				+ rBox.preciseX, relativeReference.preciseY * rBox.preciseHeight
-				+ rBox.preciseY);
-	}
-	
-	/**
-	 * 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 ownReference = normalizeToStraightlineTolerance(reference, getReferencePoint(), STRAIGHT_LINE_TOLERANCE);
-		
-		Point location = getLocation(ownReference, reference);
-		if (location == null) {
-			location = getLocation(new PrecisionPoint(getBox().getCenter()), reference);
-			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) {
-		PrecisionPoint preciseOwnReference = new PrecisionPoint(ownReference);
-		PrecisionPoint normalizedReference = (PrecisionPoint)preciseOwnReference.getCopy();
-		PrecisionPoint preciseForeignReference = new PrecisionPoint(foreignReference);
-		if (Math.abs(preciseForeignReference.preciseX - preciseOwnReference.preciseX) < tolerance) {
-			normalizedReference.preciseX = preciseForeignReference.preciseX;
-			normalizedReference.updateInts();
-			return normalizedReference;
-		}
-		if (Math.abs(preciseForeignReference.preciseY - preciseOwnReference.preciseY) < tolerance) {
-			normalizedReference.preciseY = preciseForeignReference.preciseY;
-			normalizedReference.updateInts();
-		}
-		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) {
-			PrecisionPointList polyList = new PrecisionPointList(((IPolygonAnchorableFigure) getOwner()).getPolygonPoints());
-			getOwner().translateToAbsolute(polyList);
-			return polyList;
-		}
-		PrecisionRectangle r = new PrecisionRectangle(getBox());
-		PrecisionPointList ptList = new PrecisionPointList(5);
-		ptList.addPoint(new PrecisionPoint(r.preciseX, r.preciseY));
-		ptList.addPoint(new PrecisionPoint(r.preciseX + r.preciseWidth, r.preciseY));
-		ptList.addPoint(new PrecisionPoint(r.preciseX + r.preciseWidth, r.preciseY + r.preciseHeight));
-		ptList.addPoint(new PrecisionPoint(r.preciseX, r.preciseY + r.preciseHeight));
-		ptList.addPoint(new PrecisionPoint(r.preciseX, r.preciseY));
-		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) {
-		if (bounds.width == 0 || bounds.height == 0) {
-			/*
-			 * If figure hasn't been laid out yet, we don't want to fail the slidable anchor creation.
-			 * Hence, we'll just return the (0.5, 0.5) meaning that the anchor reference point is the center of the figure.
-			 */
-			return new PrecisionPoint(0.5, 0.5);
-		}
-		PrecisionPoint relLocation;
-		PrecisionPoint temp = new PrecisionPoint(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.preciseX = p.x < bounds.x ? bounds.x
-					: bounds.x + bounds.width;
-			}
-			if (p.y < bounds.y || p.y > bounds.y + bounds.height) {
-				temp.preciseY = p.y < bounds.y ? bounds.y
-					: bounds.y + bounds.height;
-			}
-			relLocation = new PrecisionPoint((temp.preciseX - bounds.x)
-				/ bounds.width, (temp.preciseY - bounds.y)
-				/ bounds.height);
-		} else {
-
-		relLocation = new PrecisionPoint((temp.preciseX - bounds.x)
-				/ bounds.width, (temp.preciseY - 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()
-            : getOwner().getBounds();
-        PrecisionRectangle box = new PrecisionRectangle(rBox);
-        getOwner().translateToAbsolute(box);
-        return box;
-	}
-	
-	/**
-	 * 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(Double.parseDouble(terminal.substring(
-				terminal.indexOf(BaseSlidableAnchor.TERMINAL_START_CHAR) + 1,
-				terminal.indexOf(BaseSlidableAnchor.TERMINAL_DELIMITER_CHAR))),
-				Double.parseDouble(terminal.substring(terminal
-					.indexOf(BaseSlidableAnchor.TERMINAL_DELIMITER_CHAR) + 1,
-					terminal.indexOf(BaseSlidableAnchor.TERMINAL_END_CHAR))));
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	public Point getOrthogonalLocation(Point orthoReference) {
-		PrecisionPoint ownReference = new PrecisionPoint(getReferencePoint());
-//		PrecisionRectangle bounds = new PrecisionRectangle(getBox());
-		PrecisionRectangle bounds = new PrecisionRectangle(FigureUtilities.getAnchorableFigureBounds(getOwner()));
-		getOwner().translateToAbsolute(bounds);
-		bounds.expand(0.000001, 0.000001);
-		PrecisionPoint preciseOrthoReference = new PrecisionPoint(orthoReference);
-		int orientation = PositionConstants.NONE;
-		if (bounds.contains(preciseOrthoReference)) {
-			int side = getClosestSide(ownReference, bounds);
-			switch (side) {
-			case PositionConstants.LEFT:
-			case PositionConstants.RIGHT:
-				ownReference.preciseY = preciseOrthoReference.preciseY();
-				orientation = PositionConstants.HORIZONTAL;
-				break;
-			case PositionConstants.TOP:
-			case PositionConstants.BOTTOM:
-				ownReference.preciseX = preciseOrthoReference.preciseX();
-				orientation = PositionConstants.VERTICAL;
-				break;
-			}
-		} else if (preciseOrthoReference.preciseX >= bounds.preciseX && preciseOrthoReference.preciseX <= bounds.preciseX + bounds.preciseWidth) {
-			ownReference.preciseX = preciseOrthoReference.preciseX;
-			orientation = PositionConstants.VERTICAL;
-		} else if (preciseOrthoReference.preciseY >= bounds.preciseY && preciseOrthoReference.preciseY <= bounds.preciseY + bounds.preciseHeight) {
-			ownReference.preciseY = preciseOrthoReference.preciseY;
-			orientation = PositionConstants.HORIZONTAL;
-		}
-		ownReference.updateInts();
-		
-		Point location = getLocation(ownReference, preciseOrthoReference);
-		if (location == null) {
-			location = getLocation(orthoReference);
-			orientation = PositionConstants.NONE;
-		}
-		
-		if (orientation != PositionConstants.NONE) {
-			PrecisionPoint loc = new PrecisionPoint(location);
-			if (orientation == PositionConstants.VERTICAL) {
-				loc.preciseX = preciseOrthoReference.preciseX;
-			} else {
-				loc.preciseY = preciseOrthoReference.preciseY;
-			}
-			loc.updateInts();
-			location = loc;
-		}
-		
-		return location;
-	}
-	
-	/**
-	 * Returns the position of the closest edge of the rectangle closest to the point
-	 * @param p the point
-	 * @param r the rectangle
-	 * @return position of the closest edge
-	 */
-	private static int getClosestSide(Point p, Rectangle r) {
-		double diff = Math.abs(r.preciseX() + r.preciseWidth() - p.preciseX());
-		int side = PositionConstants.RIGHT;
-		double currentDiff = Math.abs(r.preciseX() - p.preciseX());
-		if (currentDiff < diff) {
-			diff = currentDiff;
-			side = PositionConstants.LEFT;
-		}
-		currentDiff = Math.abs(r.preciseY() + r.preciseHeight() - p.preciseY());
-		if (currentDiff < diff) {
-			diff = currentDiff;
-			side = PositionConstants.BOTTOM;
-		}
-		currentDiff = Math.abs(r.preciseY() - p.preciseY());
-		if (currentDiff < diff) {
-			diff = currentDiff;
-			side = PositionConstants.TOP;
-		}
-		return side;
-	}
-	
-}
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 6d85bf0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ConstrainedToolbarLayout.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 = (int) ((long) (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 22dd2b6..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/FigureUtilities.java
+++ /dev/null
@@ -1,254 +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
- */
-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);
-			}
-		}
-	}
-
-	/**
-	 * Calculates the anchorable figure bounds. There could be cases that a figure
-	 * implements both <code>IOvalAnchorableFigure</code> and <code>IPolygonAnchorableFigure</code>
-	 * interfaces. The latter interface is more popular because any figure can be approximated
-	 * with line segments including ellipse. Therefore, we need to check first if it's an
-	 * ellipse like figure and then if it's some kind of a polygon.
-	 * 
-	 * @param figure the figure
-	 * @return the bounding <code>Rectangle</code> of the anchorable part of the figure
-	 */
-	public static Rectangle getAnchorableFigureBounds(IFigure figure) {
-		if (figure instanceof IOvalAnchorableFigure) {
-			return ((IOvalAnchorableFigure)figure).getOvalBounds().getCopy();
-		} else if (figure instanceof IPolygonAnchorableFigure) {
-			return ((IPolygonAnchorableFigure)figure).getPolygonPoints().getBounds();
-		} else if (figure instanceof IFigure) {
-			return figure.getBounds().getCopy();
-		}
-		return null;
-	}
-	
-}
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/IBorderItemLocator.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IBorderItemLocator.java
deleted file mode 100644
index 56485ee..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/IBorderItemLocator.java
+++ /dev/null
@@ -1,71 +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.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Locator;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Controls the location of border items around another figure.
- * 
- * An <code>IBorderItemLocator</code> is used in conjunction with
- * {@link org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy}
- * for feedback when moving border items and with
- * {@link org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart}
- * when refreshing the bounds of the border item figure.
- * 
- * @author cmahoney
- */
-public interface IBorderItemLocator
-	extends Locator {
-
-	/**
-	 * Sets the constraint for the location of this border item.
-	 * 
-	 * @param constraint
-	 *            the position and optionally size
-	 */
-	public void setConstraint(Rectangle constraint);
-
-	/**
-	 * Returns a suitable location for the border item given a proposed
-	 * location. By implementing this method, the feedback shown when the user
-	 * moves a border item can reflect where the locator will actually place the
-	 * border item.
-	 * <p>
-	 * For example, if the border item is restricted to being on the border of
-	 * its parent shape, when the user attempts to move the border item outside
-	 * the border of the parent shape (the proposed location), the feedback will
-	 * always show the border item on the border. In this case, this method
-	 * would return a location on the border close to the proposed location.
-	 * </p>
-	 * 
-	 * @param proposedLocation
-	 *            a proposed location and optionally size
-	 * @param borderItem
-	 *            the border item in question
-	 * @return a rectangle containing the valid location
-	 */
-	public Rectangle getValidLocation(Rectangle proposedLocation,
-			IFigure borderItem);
-	
-	/**
-	 * Returns the side of the parent figure on which the border item is
-	 * currently on.
-	 * 
-	 * @return the side on which this border item appears as defined in
-	 *         {@link PositionConstants}
-	 */
-	public int getCurrentSideOfParent();
-}
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/LabelEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/LabelEx.java
deleted file mode 100644
index 38dc2a8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/LabelEx.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.TextUtilities;
-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.draw2d.ui.text.TextUtilitiesEx;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * GEF's Label extended for use in GMF with mapping mode support and the
- * following additional features:
- * <li>Provides selection and focus feedback.
- * <li>Provides support for underlined and striked-through text.
- * 
- * @author crevells
- * @since 2.1
- * 
- */
-public class LabelEx
-    extends Label {
-
-    // reserve 1 bit
-    private static int FLAG_SELECTED = Figure.MAX_FLAG << 1;
-
-    private static int FLAG_HASFOCUS = Figure.MAX_FLAG << 2;
-
-    private static int FLAG_UNDERLINED = Figure.MAX_FLAG << 3;
-
-    private static int FLAG_STRIKEDTHROUGH = Figure.MAX_FLAG << 4;
-
-    /**
-     * The largest flag defined in this class. If subclasses define flags, they
-     * should declare them as larger than this value and redefine MAX_FLAG to be
-     * their largest flag value.
-     * 
-     * @see Figure#MAX_FLAG
-     */
-    protected static final int MAX_FLAG = FLAG_STRIKEDTHROUGH;
-
-    /**
-     * cached mapmode used for measurement conversions
-     */
-    private IMapMode mapmode;
-    
-    private TextUtilities textUtilities;
-
-    /**
-     * Construct an empty Label.
-     * 
-     * @since 2.1
-     */
-    public LabelEx() {
-        super();
-    }
-
-    /**
-     * Construct a Label with passed String as its text.
-     * 
-     * @param s
-     *            the label text
-     * @since 2.1
-     */
-    public LabelEx(String s) {
-        super(s);
-    }
-
-    /**
-     * Construct a Label with passed Image as its icon.
-     * 
-     * @param i
-     *            the label image
-     * @since 2.1
-     */
-    public LabelEx(Image i) {
-        super(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.1
-     */
-    public LabelEx(String s, Image i) {
-        super(s, i);
-    }
-
-    /**
-     * Sets whether the label text should be striked-through
-     * 
-     * @param b
-     *            Whether the label text should be striked-through
-     */
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        if (isTextStrikedThrough() == strikeThrough)
-            return;
-        setFlag(FLAG_STRIKEDTHROUGH, strikeThrough);
-        repaint();
-    }
-
-    /**
-     * @return whether the label text is striked-through
-     */
-    public boolean isTextStrikedThrough() {
-        return (flags & FLAG_STRIKEDTHROUGH) != 0;
-    }
-
-    /**
-     * Sets whether the label text should be underlined
-     * 
-     * @param b
-     *            Whether the label text should be underlined
-     */
-    public void setTextUnderline(boolean underline) {
-        if (isTextUnderlined() == underline)
-            return;
-        setFlag(FLAG_UNDERLINED, underline);
-        repaint();
-    }
-
-    /**
-     * @return whether the label text is underlined
-     */
-    public boolean isTextUnderlined() {
-        return (flags & FLAG_UNDERLINED) != 0;
-    }
-
-    /**
-     * 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;
-    }
-
-    protected void paintFigure(Graphics graphics) {
-        paintSelectionRectangle(graphics);
-        paintFocusRectangle(graphics);
-
-        super.paintFigure(graphics);
-
-        Rectangle textBounds = getTextBounds();
-        if (isTextUnderlined()) {
-            int y = textBounds.getBottom().y + getMapMode().DPtoLP(1);
-
-            graphics.drawLine(textBounds.x, y, textBounds.getRight().x, y);
-        }
-        if (isTextStrikedThrough()) {
-            int y = textBounds.getCenter().y;
-            graphics.drawLine(textBounds.x, y, textBounds.getRight().x, y);
-        }
-    }
-
-    private void paintSelectionRectangle(Graphics g) {
-        if (isSelected()) {
-            g.pushState();
-            g.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-            g.fillRectangle(getSelectionRectangle());
-            g.popState();
-            g.setForegroundColor(ColorConstants.white);
-        }
-    }
-
-    private void paintFocusRectangle(Graphics g) {
-        if (hasFocus()) {
-            g.pushState();
-            g.setXORMode(true);
-            g.setForegroundColor(ColorConstants.menuBackgroundSelected);
-            g.setBackgroundColor(ColorConstants.white);
-            g.drawFocus(getSelectionRectangle().resize(-1, -1));
-            g.popState();
-        }
-    }
-
-    private Rectangle getSelectionRectangle() {
-        // TODO
-        Rectangle figBounds = getTextBounds();
-        int expansion = getMapMode().DPtoLP(2);
-        figBounds.resize(expansion, expansion);
-        translateToParent(figBounds);
-        figBounds.intersect(getBounds());
-        return figBounds;
-
-    }
-
-    protected Dimension getIconSize() {
-        Dimension iconSize = super.getIconSize();
-        return new Dimension(getMapMode().DPtoLP(iconSize.width), getMapMode()
-            .DPtoLP(iconSize.height));
-    }
-
-    public int getIconTextGap() {
-        int gap = super.getIconTextGap();
-        return getMapMode().DPtoLP(gap);
-    }
-
-    /**
-     * Gets the mapmode to be used in pixel to logical unit conversions.
-     * 
-     * @return the mapmode
-     */
-    private IMapMode getMapMode() {
-        if (mapmode == null) {
-            mapmode = MapModeUtil.getMapMode(this);
-        }
-        return mapmode;
-    }
-    
-    public TextUtilities getTextUtilities() {
-        if (textUtilities == null) {
-            textUtilities = new TextUtilitiesEx(getMapMode());
-        }
-        return textUtilities;
-    }
-
-}
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 dd6f436..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/ListScrollBar.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.draw2d.ChangeEvent;
-import org.eclipse.draw2d.ChangeListener;
-import org.eclipse.draw2d.Clickable;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.draw2d.ScrollBar;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-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.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-
-/**
- * Customizes the look of GEF's ScrollBar
- * 
- * @author sshaw
- * @author lgrahek
- */
-public class ListScrollBar extends ScrollBar {
-
-	/**
-	 * @since 1.4
-	 */
-	protected ArrowButton downButtonFigure;
-	/**
-	 * @since 1.4
-	 */
-	protected ArrowButton upButtonFigure;
-	ThumbFigure thumb;
-	
-	/**
-	 * @since 1.4
-	 */
-	protected static Color fillLightGrey = new Color(null, new RGB(240, 240, 240));
-	/**
-	 * @since 1.4
-	 */
-	protected static Color outlineLightGrey = new Color(null, new RGB(185, 185, 185));
-	/**
-	 * @since 1.4
-	 */
-	protected static Color fillDarkGrey = new Color(null, new RGB(84, 84, 84));
-	/**
-	 * @since 1.4
-	 */
-	protected static Color outlineDarkGrey = new Color(null, new RGB(109, 109, 109));
-	/**
-	 * @since 1.4
-	 */
-	protected static Color arrowFill = new Color(null, new RGB(187, 187, 187));
-	
-	/**
-	 * @since 1.4
-	 */
-	protected int mm_1;
-	/**
-	 * @since 1.4
-	 */
-	protected int mm_2;
-
-	/**
-	 * 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);
-		if (isHorizontal()) {
-			downButtonFigure.setDirection(EAST);
-			upButtonFigure.setDirection(WEST);
-		} else {
-			downButtonFigure.setDirection(SOUTH);
-			upButtonFigure.setDirection(NORTH);
-		}
-		
-        IMapMode mm= MapModeUtil.getMapMode();
-        mm_1 = mm.DPtoLP(1);
-        mm_2 = mm.DPtoLP(2);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultDownButton()
-	 */
-	protected Clickable createDefaultDownButton() {
-		downButtonFigure = new ArrowButton();
-		downButtonFigure.setBorder(new MarginBorder(new Insets(mm_1)));
-		Clickable button = new Clickable(downButtonFigure) {
-			@Override
-			public boolean hasFocus() {
-				return false;
-			}		
-		};
-		button.getModel().addChangeListener(new ChangeListener() {
-			public void handleStateChanged(ChangeEvent event) {
-				updateDownColors();
-			}
-		});
-
-		button.setFiringMethod(Clickable.REPEAT_FIRING);
-		button.setRolloverEnabled(true);
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultUpButton()
-	 */
-	protected Clickable createDefaultUpButton() {
-		upButtonFigure = new ArrowButton();
-		upButtonFigure.setBorder(new MarginBorder(new Insets(mm_1)));
-		Clickable button = new Clickable(upButtonFigure) {
-			@Override
-			public boolean hasFocus() {
-				return false;
-			}		
-		};
-		button.getModel().addChangeListener(new ChangeListener() {
-			public void handleStateChanged(ChangeEvent event) {
-				updateUpColors();
-			}
-		});
-
-		button.setFiringMethod(Clickable.REPEAT_FIRING);
-		button.setRolloverEnabled(true);
-		return button;		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#initialize()
-	 */
-	protected void initialize() {
-		super.initialize();
-		setPageUp(null);
-		setPageDown(null);
-		setOpaque(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.ScrollBar#createDefaultThumb()
-	 */
-	protected IFigure createDefaultThumb() {
-		thumbDragger = new ThumbDraggerColors();
-		
-		thumb = new ThumbFigure();
-		thumb.setMinimumSize(new Dimension(6, 6));
-		return thumb;
-	}
-
-	/**
-	 * Updates colors of down button depending on its state (highlighted,
-	 * pressed, or neither)
-	 * @since 1.4
-	 */
-	protected void updateDownColors() {
-		boolean pressed = false;
-		boolean highlighted = false;
-		if (getValue() < (getMaximum() - getExtent())) {
-			// Arrow is scrollable
-			if (((Clickable) getButtonDown()).getModel().isPressed()) {
-				pressed = true;
-			} else if (((Clickable) getButtonDown()).getModel().isMouseOver()) {
-				highlighted = true;
-			}
-		}
-		boolean doRepaint = false;
-		if (downButtonFigure.isHighlighted() != highlighted) {
-			downButtonFigure.setHighlighted(highlighted);
-			doRepaint = true;
-		}
-		if (downButtonFigure.isPressed() != pressed) {
-			doRepaint = true;
-			downButtonFigure.setPressed(pressed);
-		}
-		if (doRepaint) {
-			// Just changing color, no recalculation of arrow position needed
-			downButtonFigure.setRecalculate(false);			
-			downButtonFigure.repaint();
-		}
-	}
-
-	/**
-	 * Updates colors of up button depending on its state (highlighted,
-	 * pressed, or neither)
-	 * @since 1.4
-	 */	
-	protected void updateUpColors() {
-		boolean pressed = false;
-		boolean highlighted = false;
-		if (getValue() > getMinimum()) {
-			// Arrow is scrollable			
-			if (((Clickable) getButtonUp()).getModel().isPressed()) {
-				pressed = true;
-			} else if (((Clickable) getButtonUp()).getModel().isMouseOver()) {
-				highlighted = true;
-			}
-		}
-		boolean doRepaint = false;
-		if (upButtonFigure.isHighlighted() != highlighted) {
-			upButtonFigure.setHighlighted(highlighted);
-			doRepaint = true;
-		}
-		if (upButtonFigure.isPressed() != pressed) {
-			doRepaint = true;
-			upButtonFigure.setPressed(pressed);
-		}
-		if (doRepaint) {
-			// Just changing color, no recalculation of arrow position needed
-			upButtonFigure.setRecalculate(false);
-			upButtonFigure.repaint();
-		}
-	}
-
-	/**
-	 * Figure that defines the content for up and down buttons
-	 * 
-	 * @author lgrahek
-	 * 
-	 * @since 1.4
-	 */
-	protected class ArrowButton extends Figure 
-	{
-		private PointList arrow = new PointList();
-		private boolean recalculate;
-		private int direction;
-		private boolean highlighted;
-		private boolean pressed;		
-
-		@Override
-		protected void paintFigure(Graphics g) {
-			Rectangle r = getBounds();
-			// If not pressed, fill with white, so later there will be 1px of
-			// white left around outline.
-			g.setAlpha(130);
-			if (!pressed) {
-				g.setBackgroundColor(ColorConstants.white);
-				g.fillRectangle(r);
-			}						
-			// Draw the outline (none when button is pressed)
-			if (!pressed) {
-				g.setLineWidth(mm_1);
-				if (highlighted) {
-					g.setForegroundColor(outlineDarkGrey);
-				} else {
-					g.setForegroundColor(outlineLightGrey);
-				}
-				g.drawRectangle(r);
-			}
-						
-			// Fill the interior. If not pressed, leave 1px white between outline and filled area.
-			if (pressed) {
-				g.setBackgroundColor(fillDarkGrey);
-			} else {
-				g.setBackgroundColor(fillLightGrey);
-				r = r.getCopy().shrink(mm_2, mm_2);
-			}
-			g.fillRectangle(r);		
-			
-			// Draw the arrow
-			if (pressed) {
-				r = r.getCopy().shrink(mm_2, mm_2);
-			}
-			if (recalculate || arrow.size() == 0) {
-				int size;
-				switch (direction) {
-					case EAST:
-					case WEST:
-						size = Math.min(r.height / 2, r.width);
-						r.x += (r.width - size) / 2;
-						break;
-					default: //North or south
-						size = Math.min(r.height, r.width / 2);
-						r.y += (r.height - size) / 2;
-						break;
-				}
-				size = Math.max(size, 1); //Size cannot be negative		
-				Point head, p2, p3;
-				switch (direction) {
-					case NORTH:
-						head = new Point(r.x + r.width / 2, r.y);
-						p2   = new Point (head.x - size, head.y + size);
-						p3   = new Point (head.x + size, head.y + size);
-						break;
-					case SOUTH:
-						head = new Point (r.x + r.width / 2, r.y + size);
-						p2   = new Point (head.x - size, head.y - size);
-						p3   = new Point (head.x + size, head.y - size);
-						break;
-					case WEST:
-						head = new Point (r.x, r.y + r.height / 2);
-						p2   = new Point (head.x + size, head.y - size);
-						p3   = new Point (head.x + size, head.y + size);
-						break;
-					default:
-						head = new Point(r.x + size, r.y + r.height / 2);
-						p2   = new Point(head.x - size, head.y - size);
-						p3   = new Point(head.x - size, head.y + size);
-		
-				}
-				arrow.removeAllPoints();
-				arrow.addPoint(p2);
-				arrow.addPoint(head);
-				arrow.addPoint(p3);
-			} else {
-				// Recalculating with every paint unless explicitly told not too
-				recalculate = true;
-			}
-			if (highlighted) {
-				g.setForegroundColor(fillDarkGrey);
-			} else if (pressed) {
-				g.setAlpha(255);
-				g.setForegroundColor(ColorConstants.white);
-			} else {
-				g.setForegroundColor(arrowFill);
-			}
-			g.setLineWidth(mm_2);
-			g.drawPolyline(arrow);			
-		}
-
-		/**
-		 * @param value
-		 *            one of PositionConstants: EAST, WEST, NORTH, SOUTH that
-		 *            determine the arrow direction
-		 */
-		public void setDirection(int value) {
-			direction = value;
-		}
-
-		/**
-		 * @param value
-		 *            false if arrow points do no have to be recalculated (e.g.
-		 *            when just changing color)
-		 */
-		public void setRecalculate(boolean value) {
-			recalculate = value;
-		}
-		
-		/**
-		 * @param value true if highlighted, false if not
-		 */
-		public void setHighlighted(boolean value) {
-			highlighted = value;
-		}
-		
-		/**
-		 * @return true if highlighted, false if not
-		 */
-		public boolean isHighlighted() {
-			return highlighted;
-		}		
-		
-		/**
-		 * @param value true if pressed, false if not
-		 */
-		public void setPressed(boolean value) {
-			pressed = value;
-		}
-
-		/**
-		 * @return true if pressed
-		 */
-		public boolean isPressed() {
-			return pressed;
-		}	
-	}
-	
-	/**
-	 * Figure that defines scroll bar thumb.
-	 * 
-	 * @author lgrahek
-	 * 
-	 * @since 1.4
-	 */
-	protected class ThumbFigure extends Panel {		
-		boolean highlighted;
-		boolean pressed;
-
-		@Override
-		protected void paintFigure(Graphics g) {
-			g.setAlpha(130);
-			
-			Rectangle r = getBounds().getCopy();
-			// Fill with white, so later there will be 1px of
-			// white left around outline.
-			g.setBackgroundColor(ColorConstants.white);
-			g.fillRectangle(getBounds());
-			// Draw the outline (none when button is pressed)
-			g.setLineWidth(mm_1);
-			if (highlighted || pressed) {
-				g.setForegroundColor(outlineDarkGrey);
-			} else {
-				g.setForegroundColor(outlineLightGrey);
-			}
-			g.drawRectangle(r);
-									
-			// Fill the interior, while leaving 1px white between outline and filled area.
-			r = r.getCopy().shrink(mm_2, mm_2);
-			if (pressed) {
-				g.setBackgroundColor(fillDarkGrey);
-			} else {
-				g.setBackgroundColor(fillLightGrey);				
-			}
-			g.fillRectangle(r);		
-		}	
-
-		/**
-		 * @param value true if highlighted, false if not
-		 */
-		public void setHighlighted(boolean value) {
-			highlighted = value;
-		}
-		
-		/**
-		 * @return true if highlighted, false if not
-		 */		
-		public boolean isHighlighted() {
-			return highlighted;
-		}		
-		
-		/**
-		 * @param value true if pressed, false if not
-		 */		
-		public void setPressed(boolean value) {
-			pressed = value;
-		}
-
-		/**
-		 * @return true if pressed
-		 */		
-		public boolean isPressed() {
-			return pressed;
-		}			
-	}
-	
-	/**
-	 * Customizes ThumbDragger to set different colors to thumb depending on its
-	 * state.
-	 * 
-	 * @author lgrahek
-	 * 
-	 * @since 1.4
-	 */
-	protected class ThumbDraggerColors extends ThumbDragger {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.draw2d.MouseMotionListener.Stub#mouseEntered(org.eclipse.draw2d.MouseEvent)
-		 */
-		@Override
-		public void mouseEntered(MouseEvent me) {
-			// Set up highlight colors
-			thumb.setHighlighted(true);
-			thumb.setPressed(false);
-			thumb.repaint();
-			super.mouseEntered(me);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.draw2d.MouseMotionListener.Stub#mouseExited(org.eclipse.draw2d.MouseEvent)
-		 */
-		@Override
-		public void mouseExited(MouseEvent me) {
-			// Set up colors: back to no-hover, no-drag colors
-			thumb.setHighlighted(false);
-			thumb.setPressed(false);
-			thumb.repaint();
-			super.mouseExited(me);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.draw2d.ScrollBar.ThumbDragger#mousePressed(org.eclipse.draw2d.MouseEvent)
-		 */
-		@Override
-		public void mousePressed(MouseEvent me) {
-			// Set up pressed colors
-			thumb.setHighlighted(false);
-			thumb.setPressed(true);
-			thumb.repaint();
-			super.mousePressed(me);
-		}
-	
-		/* (non-Javadoc)
-		 * @see org.eclipse.draw2d.ScrollBar.ThumbDragger#mouseReleased(org.eclipse.draw2d.MouseEvent)
-		 */
-		@Override
-		public void mouseReleased(MouseEvent me) {
-			// Set up colors: back to hover
-			thumb.setHighlighted(true);
-			thumb.setPressed(false);
-			thumb.repaint();
-			super.mouseReleased(me);
-		}		
-	}	
-}
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 0e0cf29..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-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
- */
-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.
-	 */
-	@Override
-	public void paint(IFigure figure, Graphics graphics, Insets insets) {
-		tempRect.setBounds(getPaintRectangle(figure, insets));
-
-		int one = MapModeUtil.getMapMode(figure).DPtoLP(1);
-		int widthInDP = getWidth() / one;
-		
-		int halfWidthInLP = MapModeUtil.getMapMode(figure).DPtoLP(widthInDP / 2);
-		
-		graphics.setLineWidth(getWidth());
-		graphics.setLineStyle(getStyle());
-		if (getColor() != null) {
-			graphics.setForegroundColor(getColor());
-		}
-		
-		switch (position) {
-			case PositionConstants.TOP :
-				tempRect.y += halfWidthInLP;
-				tempRect.height -= getWidth();
-				graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());				
-				break;
-			case PositionConstants.BOTTOM :	
-				tempRect.y += halfWidthInLP;
-				tempRect.height -= getWidth();
-				graphics.drawLine(tempRect.getBottomLeft(), tempRect.getBottomRight());
-				break;
-			case PositionConstants.LEFT :
-				tempRect.x += halfWidthInLP;
-				tempRect.width -= getWidth();
-				graphics.drawLine(tempRect.getTopLeft(), tempRect.getBottomLeft());
-				break;
-			case PositionConstants.RIGHT :
-				tempRect.x += halfWidthInLP;
-				tempRect.width -= getWidth();
-				graphics.drawLine(tempRect.getTopRight(), tempRect.getBottomRight());
-				break;
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OrthogonalConnectionAnchor.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OrthogonalConnectionAnchor.java
deleted file mode 100644
index 7785a69..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OrthogonalConnectionAnchor.java
+++ /dev/null
@@ -1,39 +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.draw2d.ui.figures;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * The interface allows to specify connection anchor location for
- * a connection routed with Orthogonal connection routers.
- * 
- * IMPORTANT: this interface is not to be implemented by clients, since
- * this is an API under construction
- * 
- * @author aboyko
- *
- */
-public interface OrthogonalConnectionAnchor extends ConnectionAnchor {
-	
-	/**
-	 * Determines connection anchor point for Orthogonal connection.
-	 * Generally, the anchor point would the intersection of perpendicular
-	 * line drawn from the <code>orthoReference</code> point to the shape and
-	 * shape's edge. 
-	 * 
-	 * @param orthoReference the reference point 
-	 * @return The location of the orthogonal connection anchor.  
-	 */
-	public Point getOrthogonalLocation(Point orthoReference);
-	
-}
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 df8ca63..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
+++ /dev/null
@@ -1,1536 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.internal.routers.OrthogonalRouter;
-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
- */
-public class PolylineConnectionEx extends PolylineConnection implements IPolygonAnchorableFigure {
-	
-	private RotatableDecoration startDecoration, endDecoration;
-
-    private static Rectangle LINEBOUNDS = Rectangle.SINGLETON;
-    private static int TOLERANCE = 3;
-    
-    private static Rectangle EMPTY_BOUNDS = new Rectangle(0,0,0,0);
-    
-    /**
-     * 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
-    // avoid intersection with other nodes
-    private static final int ROUTE_AVOID_OBSTACLE = 0x0100;
-    // always use closest route to the destination
-    private static final int ROUTE_CLOSEST_ROUTE = 0x0200;    
-    // jump other links
-    private static final int ROUTE_JUMP_LINKS = 0x0400; 
-
-    // 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;
-    
-	// round bendpoints radius (applicable only for rectilinear routing with no
-	// smoothness) default value 0 means that bendpoints are not rounded
-	private int roundedBendpointsRadius = 0;
-	// if rounding bendpoints fails (it shouldn't happen), then roundedBendpointsRadius is set to 0 so
-	// connection can be routed without rounded corners, and origRoundedBendpointsRad gets
-	// the original value of roundedBendpointsRadius (so it can be used in future attempts)
-	private int origRoundedBendpointsRad = 0;
-    
-    private long styleBits;
-    private JumpLinkSet jumpLinkSet;
-    private Hashtable connectionAnchors;
-    /**
-     * When rounded bendpoints is turned on, keeping track of arcs that have smaller size than the default 
-     */
-    private Hashtable<Integer, Integer> rForBendpointArc;
-	
-    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, 0);
-		
-    	if (!isFeedbackLayer) {
-    		MapModeUtil.getMapMode(this).DPtoLP(absTol);
-    	}
-
-    	return absTol.width + lineWidth / 2;
-    }
-    
-    /**
-     * 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 getSourceAnchor() != null && getTargetAnchor() != null ? bounds : EMPTY_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));
-    }
-    
-	/**
-	 * Returns points for this connection. If the smooth factor is turned on,
-	 * then calculate the approximated smooth polyline for display or other
-	 * purposes. If bendpoints need to be rounded, calculates points taking that
-	 * into account. In that case, if calculateAprox is true, it will also
-	 * calculate points that approximate corner arcs. If it is false, it will
-	 * replace each bendpoint with two points that represent start and end of an
-	 * arc. In any case, calculated points are not persisted.
-	 * 
-	 * @param calculateAppox
-	 *            If true, and rounding bendpoints is on, then calculate points
-	 *            that approximate bendpoint arc.
-	 * @return Resulting <code>PointList</code>. In case when sooth factor is
-	 *         on, it is a polyline approximation of a bezier curve calculated
-	 *         based on the smoothness factor.
-	 * @since 1.2
-	 */
-    public PointList getSmoothPoints(boolean calculateAppox) {
-        if (getSmoothFactor() > 0) {
-            return PointListUtilities.calcSmoothPolyline(getPoints(), getSmoothFactor(), PointListUtilities.DEFAULT_BEZIERLINES);
-        } else if (isRoundingBendpoints()){
-        	PointList result = getRoundedCornersPoints(calculateAppox);
-        	if (result == null) {
-        		// this shouldn't happen, but if it does happen that rounded corners
-        		// cannot be calculated set radius to 0 and use original bendpoints
-        		// (will produce non-rounded rectangular connection)
-        		origRoundedBendpointsRad = roundedBendpointsRadius;
-        		roundedBendpointsRadius = 0;
-        		result = PointListUtilities.copyPoints(getPoints());
-        	}
-        	return result;
-        } else {
-        	return PointListUtilities.copyPoints(getPoints());
-        }
-    }
-    
-    /**
-     * See {@link #getSmoothPoints(boolean calculateAppoxPoints)}
-     */
-    public PointList getSmoothPoints() {
-    	return getSmoothPoints(true);
-    }    
-
-    /**
-     * 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, draw the polyline smooth, and round the bendpoints
-     * is also done during this method call.
-     */
-    protected void outlineShape(Graphics g) {
-
-        PointList displayPoints = getSmoothPoints(false);        
-        
-        Hashtable<Point, Integer> originalDisplayPoints = null;
-        if (isRoundingBendpoints()) {
-            // If rounded bendpoints feature is turned on, remember the original points, will be 
-            // needed later.        	
-        	originalDisplayPoints = new Hashtable<Point, Integer>();   
-        	for (int i = 0; i < displayPoints.size(); i++) {
-        		originalDisplayPoints.put(displayPoints.getPoint(i), new Integer(i));        
-        	}
-        }
-        
-        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;
-                }
-            }
-        }
-        if (!isRoundingBendpoints()) {
-        	g.drawPolyline(displayPoints);
-        	if (origRoundedBendpointsRad > 0) {
-        		// we unsuccessfully tried to do rounding, allow the next routing to try again.
-        		roundedBendpointsRadius = origRoundedBendpointsRad;
-        		origRoundedBendpointsRad = 0;
-        	}        	
-        } else {
-        	// In originalDisplayPoints, each bendpoint will be replaced with two points: start and end point of the arc.
-        	// If jump links is on, then displayPoints will also contain points identifying jump links, if any.
-        	int i = 1;
-        	int rDefault = getRoundedBendpointsRadius();
-        	while (i < displayPoints.size() - 1) {
-        		// Consider points at indexes i-1, i, i+1.
-        		int x0 = 0, y0 = 0;
-        		boolean firstPointAssigned = false;
-        		if (shouldJumpLinks()) {
-        			boolean containsPoint2;
-        			boolean containsPoint3;
-        			PointList jumpLinkPoints = new PointList();
-        			do {
-        	       		// First, check if point at index i or i+1 is start point of a jump link (if the point is not in original points).
-                		// If so, draw a polyline ending at the last point of the jump link.           				
-        				containsPoint2 = true;
-        				containsPoint3 = true;
-        				if (i < displayPoints.size()) {
-        					containsPoint2 = originalDisplayPoints.containsKey(displayPoints.getPoint(i));
-        					if (i < displayPoints.size() - 1) {
-        						containsPoint3 = originalDisplayPoints.containsKey(displayPoints.getPoint(i+1));
-        					}
-        				}
-        				if (!containsPoint2 || !containsPoint3) {
-        					// start adding jump link points
-        					jumpLinkPoints.addPoint(displayPoints.getPoint(i-1));
-        					Point p; // next point to be added to jump link points
-        					int j; // index of the next point in jump link
-        					if (!containsPoint2) {
-        						// jump link starts somewhere on the segment before the arc begins
-        						j = i;
-        						p = displayPoints.getPoint(i);        			
-        					} else {
-        						// jump link starts within an arc; it means that one part of the arc will be replaced with 
-        						// a segment between points at i and i-1, and another part is replaced with the jump link,
-        						j = i + 1; 
-        						p = displayPoints.getPoint(i+1);        			
-        						jumpLinkPoints.addPoint(displayPoints.getPoint(i));
-        					}
-        					do {
-        						jumpLinkPoints.addPoint(p);
-        						j++;
-        						p = displayPoints.getPoint(j);
-        					} while (!originalDisplayPoints.containsKey(p) && j < displayPoints.size() - 1);
-        					// Now, check if p is start point of a line segment or an arc. In first case, index of p in 
-        					// the original list is even, in second it's odd.
-        					int origIndex = ((Integer)originalDisplayPoints.get(p)).intValue();
-        					firstPointAssigned = false;
-        					if (origIndex % 2 == 0) {
-        						// p is start point of a segment, it means that the jump link finished somewhere within the arc,
-        						// so one part of the arc is replaced with the jump link, and another will be replaced with a segment.
-        						jumpLinkPoints.addPoint(p);
-        						i = j + 1; 
-        					} else {
-        						// p is start point of an arc, the last point in jump link polyline becomes the first point for 
-        						// the drawing that follows (p could be the last point too)
-        						x0 = jumpLinkPoints.getLastPoint().x;
-        						y0 = jumpLinkPoints.getLastPoint().y;
-        						i = j;             			
-        						firstPointAssigned = true;        				
-        					}
-        					// Reason for the loop: we cannot be sure that points at newly founded i=j+1, or i+1 (when i == j) are
-        					// not starting points of a new jump link;
-        					// in most of the cases, though, the loop will execute just one step 
-        					// Jump link algorithm sometimes inserts duplicate points, we need to get rid of those.
-        					while (i < displayPoints.size() - 1 && 
-        							displayPoints.getPoint(i).equals(displayPoints.getPoint(i+1))) {
-        						i++;
-        					}
-        				}
-        			} while (!containsPoint2 || !containsPoint3);
-        			if (jumpLinkPoints != null) {
-        				// draw jump link
-        				g.drawPolyline(jumpLinkPoints);
-        			}
-        		}
-        		if (i < displayPoints.size() - 1) { // if we still didn't reach the end after drawing jump link polyline
-        			// Draw a segment starting at index i-1 and ending at index i, 
-        			// and arc with starting point at index i and ending point at index i+1.
-        			// But first, find points at i-1, i and i+1.
-        			if (!firstPointAssigned) {
-        				x0 = displayPoints.getPoint(i-1).x; 
-        				y0 = displayPoints.getPoint(i-1).y;
-        			}
-        			int x1;; 
-        			int y1;
-        			// If points at i-1 and i are equal (could happen if jump link algorithm 
-        			// inserts a point that already exists), just skip the point i        		
-        			while (i < displayPoints.size() - 1 && 
-        					x0 == displayPoints.getPoint(i).x && y0 == displayPoints.getPoint(i).y) {
-        				i++;
-        			}
-        			if (i < displayPoints.size() - 1) {
-        				x1 = displayPoints.getPoint(i).x; 
-        				y1 = displayPoints.getPoint(i).y;
-        			} else {
-        				break;
-        			}
-        			// The same goes for point at i and i+1         		
-        			int x2;
-        			int y2;        		
-        			while (i + 1 < displayPoints.size() - 1 && 
-        					x1 == displayPoints.getPoint(i+1).x && y1 == displayPoints.getPoint(i+1).y) {
-        				i++;
-        			}
-        			if (i < displayPoints.size() - 1) {
-        				x2 = displayPoints.getPoint(i+1).x; 
-        				y2 = displayPoints.getPoint(i+1).y;
-        			} else {
-        				break;
-        			}
-        			// Draw the segment
-        			g.drawLine(x0, y0, x1, y1);
-
-        			// Find out if arc size is default, or if it had to be decreased because of lack of space
-        			int r = rDefault;         			
-        			Point p = displayPoints.getPoint(i);
-        			int origIndex = ((Integer)originalDisplayPoints.get(p)).intValue();       	
-        			Object o = rForBendpointArc.get(new Integer((origIndex+1)/2));
-        			if (o != null) {
-        				r = ((Integer)o).intValue();
-        			}
-
-        			// Find out the location of enclosing rectangle (x, y), as well as staring angle of the arc.
-        			int x, y;
-        			int startAngle;        		
-        			if (x0 == x1 && x1 < x2) {
-        				x = x1;
-        				y = y1 - r;
-        				if (y1 > y2) {
-        					startAngle = 90;
-        				} else {
-        					startAngle = 180;
-        				}
-        			} else if (x0 > x1 && x1 > x2) {
-        				x = x2; 
-        				y = y2 - r;
-        				if (y1 > y2) {
-        					startAngle = 180;
-        				} else {
-        					startAngle = 90;
-        				}        		
-        			} else  if (x0 == x1  && x1 > x2) {
-        				if (y1 > y2) {
-        					x = x2 - r;
-        					y = y2;
-        					startAngle = 0;
-        				} else {
-        					x = x1 - 2*r;
-        					y = y1 - r;
-        					startAngle = 270;
-        				}        		        		
-        			} else { // x0 < x1 && x1 < x2
-        				if (y1 > y2) {
-        					x = x2 - 2*r;
-        					y = y2 - r;
-        					startAngle = 270;
-        				} else {
-        					x = x1 - r;
-        					y = y1;
-        					startAngle = 0;
-        				}        		        		         		
-        			}
-        			// Draw the arc.
-        			g.drawArc(x, y, 2*r, 2*r, startAngle, 90);
-        			i+=2;
-        		}
-        	}
-        	// Draw the last segment.
-        	g.drawLine(displayPoints.getPoint(displayPoints.size()-2), displayPoints.getLastPoint());
-        }
-    }
-    
-    /**
-     * 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 the bendpoints should be rounded.
-     * This option is available only when orthogonal router is used, and 
-     * when smoothness is not selected.
-     * 
-     * @return true if the option is selected and the current router is orthogonal
-     * @since 1.2
-     */
-    public boolean isRoundingBendpoints() {
-    	if (roundedBendpointsRadius > 0 && getSmoothFactor() == 0) {
-    		return getConnectionRouter() instanceof OrthogonalRouter;
-    	}
-    	return false;
-    }
-    
-    /**
-     * Sets the parameter indicating the arc radius for rounded bendpoints.
-     * 
-     * @param radius
-     * @since 1.2
-     */
-    public void setRoundedBendpointsRadius(int radius) {
-    	roundedBendpointsRadius = radius;
-    	if (origRoundedBendpointsRad > 0) {
-    		origRoundedBendpointsRad = radius;
-    	}
-    }
-    
-    /**
-     * Returns the parameter indicating the arc radius for rounded bendpoints.
-     * 
-     * @return the parameter indicating the arc radius for rounded bendpoints
-     * @since 1.2
-     */
-    public int getRoundedBendpointsRadius() {
-    	return MapModeUtil.getMapMode(this).DPtoLP(roundedBendpointsRadius);
-    }
-
-    /**
-     * 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));
-    	}
-	}
-
-
-	/**
-	 * Sets the line dash style.
-	 * @see org.eclipse.swt.graphics.LineAttributes#dash
-	 * @param dashes The dashes attribute.
-	 */
-	public void setLineDash(int[] dashes) {
-		float [] floatDashes = new float[dashes.length];
-		for (int i = 0; i < dashes.length; i++) {
-			floatDashes[i] = dashes[i];
-		}
-		setLineDash(floatDashes);
-	}
-
-	/**
-	* 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();
-	}
-	
-	/**
-	 * Returns the list of points for this connection when rounded bendpoints
-	 * option is selected. Each bendpoint in the result list is replaced by
-	 * start and end points of the arc, and if calculateApproxPoints is true, it
-	 * will also have arc approximation points in between.
-	 * 
-	 * @param calculateAppoxPoints
-	 *            Indicates if arcs replacing bendpoints should be approximated
-	 * @return List of connection points when rounded bendpoints option is on
-	 * @since 1.2
-	 */
-	public PointList getRoundedCornersPoints(boolean calculateAppoxPoints) {
-		if (rForBendpointArc != null) {
-			rForBendpointArc.clear();
-		} else {
-			rForBendpointArc = new Hashtable<Integer, Integer>();
-		}
-		
-		return PointListUtilities.calcRoundedCornersPolyline(getPoints(), getRoundedBendpointsRadius(), 
-				rForBendpointArc, calculateAppoxPoints);
-	}
-
-	
-}
-
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 b95fd47..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-/**
- * @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 in logic points
-	 * 
-	 */
-	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) {
-		// take into account line width
-		Insets insetsNew = new Insets(getWidth());		
-		IMapMode mm = MapModeUtil.getMapMode(figure);
-		insetsNew.bottom += mm.DPtoLP(getShadowHeight());
-		insetsNew.right += mm.DPtoLP(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));
-			tempRect.shrink(getWidth()/2, getWidth()/2);
-			g.setLineWidth(getWidth());
-			g.setLineStyle(getStyle());
-			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());
-			tempRect.shrink(getWidth() / 2, getWidth() / 2);
-			g.setLineWidth(getWidth());	
-			g.setLineStyle(getStyle());
-
-			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 constrains 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 drop shadow image.
-	 */
-	protected RectangularDropShadow getDropShadow() {
-		return dropShadow;
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RoundedRectangleBorder.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RoundedRectangleBorder.java
deleted file mode 100644
index 2238781..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RoundedRectangleBorder.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.geometry.Insets;
-
-/**
- * Extends {@link org.eclipse.draw2d.LineBorder} to replace rectangular border with
- * rounded rectangle.
- * 
- * @author lgrahek
- * @since 1.2
- *
- */
-public class RoundedRectangleBorder extends LineBorder {
-	
-	/**
-	 * Width of the corner arc in logic points
-	 */
-	int arcWidth;
-
-	/**
-	 * Height of the corner arc in logic points
-	 */	
-	int arcHeight;	
-
-	/**
-	 * Creates an instance of this class with the given arc width and arc height in pixels
-	 * @param arcWidth The width of the corner arc
-	 * @param arcHeight The height of the corner arc
-	 */
-	public RoundedRectangleBorder(int arcWidth, int arcHeight) {
-		super();
-		this.arcWidth = arcWidth;
-		this.arcHeight = arcHeight;		
-	}	
-	
-	/**
-	 * Insets are defined by the line width.
-	 * @see org.eclipse.draw2d.LineBorder#getInsets(org.eclipse.draw2d.IFigure)
-	 */
-	public Insets getInsets(IFigure figure) {
-		return new Insets(getWidth());
-	}	
-
-	/**
-	 * Gets the arc width.
-	 * @return arc width
-	 */
-	public int getArcWidth() {
-		return arcWidth;
-	}
-
-	/**
-	 * Sets the arc width
-	 * @param arcWidth 
-	 */
-	public void setArcWidth(int arcWidth) {
-		this.arcWidth = arcWidth;
-	}
-
-	/**
-	 * Gets the arc height.
-	 * @return arc height
-	 */	
-	public int getArcHeight() {
-		return arcHeight;
-	}
-
-	/**
-	 * Sets the arc height
-	 * @param arcHeight 
-	 */
-	public void setArcHeight(int arcHeight) {
-		this.arcHeight = arcHeight;
-	}
-
-	/**
-	 * Paints rounded rectangular border taking into account arcWidth, arcHeight, line width and line style
-	 * 
-	 * @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) {
-		getPaintRectangle(figure, insets);
-		// Shrink to accommodate for the line width
-		tempRect.x = tempRect.x + getWidth() / 2;
-		tempRect.y = tempRect.y + getWidth() / 2;
-		tempRect.width = tempRect.width - getWidth();
-		tempRect.height = tempRect.height - getWidth();
-
-		graphics.setLineWidth(getWidth());
-		graphics.setLineStyle(getStyle());
-		// If the color for this border is specified, then use it. 
-		// Otherwise, use the figure's foreground color
-		if (getColor() != null) {
-			graphics.setForegroundColor(getColor());
-		} else {
-			graphics.setForegroundColor(figure.getForegroundColor());
-		}
-
-		graphics.drawRoundRectangle(tempRect, arcWidth, arcHeight);
-	}	
-}
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 1ef9136..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrapLabel.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 272658
- ****************************************************************************/
-
-package org.eclipse.gmf.runtime.draw2d.ui.figures;
-
-import org.eclipse.draw2d.FigureUtilities;
-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.mapmode.IMapMode;
-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, crevells
- * @deprecated This class has been deprecated and may be removed in the future.
- *             Use <code>WrappingLabel</code> instead. This class now extends
- *             from <code>WrappingLabel</code> so the behavior should be the
- *             same. If client code is calling one of the methods on
- *             <code>WrapLabel</code> that no longer exists, evaluate whether
- *             this is necessary or not.
- */
-public class WrapLabel
-    extends WrappingLabel {
-
-    /** the label's text used in painting after applying required styles */
-    private String subStringText;
-
-    /**
-     * Construct an empty Label.
-     * 
-     * @since 2.0
-     */
-    public WrapLabel() {
-        super();
-    }
-
-    /**
-     * Construct a Label with passed String as its text.
-     * 
-     * @param s
-     *            the label text
-     * @since 2.0
-     */
-    public WrapLabel(String s) {
-        super(s);
- 
-        // Compensate for the fact that the original wraplabel never called the
-        // default constructor to set the default layout values.
-        setTextWrapAlignment(CENTER);
-    }
-
-    /**
-     * Construct a Label with passed Image as its icon.
-     * 
-     * @param i
-     *            the label image
-     * @since 2.0
-     */
-    public WrapLabel(Image i) {
-        super(i);
-        
-        // Compensate for the fact that the original wraplabel never called the
-        // default constructor to set the default layout values.
-        setTextWrapAlignment(CENTER);
-    }
-
-    /**
-     * 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) {
-        super(s, i);
-        
-        // Compensate for the fact that the original wraplabel never called the
-        // default constructor to set the default layout values.
-        setTextWrapAlignment(CENTER);
-    }
-
-    /**
-     * 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
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    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
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    protected Dimension calculateTextSize(int wHint, int hHint) {
-        return getTextFlow().getPreferredSize(wHint, hHint);
-    }
-
-    /**
-     * Returns the bounds of the Label's icon.
-     * 
-     * @return the icon's bounds
-     * @since 2.0
-     * @deprecated The icon location can be retrieved with
-     *             {@link #getIconLocation()} and the icon(s) size can be
-     *             retrieved with {@link #getTotalIconSize()}.
-     */
-    public Rectangle getIconBounds() {
-        if (hasIcons()) {
-        	final Point safeIconLocation = getIconLocation() != null ? getIconLocation() : new Point(0,0);
-            return new Rectangle(getBounds().getLocation().translate(
-                safeIconLocation), getTotalIconSize());
-        }
-        return new Rectangle(0, 0, 0, 0);
-    }
-
-    /**
-     * 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
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    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
-            - getTruncationStringSize().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();
-    }
-
-    /**
-     * 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 
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    protected Dimension getSubStringTextSize() {
-        return calculateSubStringTextSize();
-    }
-
-    /**
-     * Returns the location of the label's text relative to the label.
-     * 
-     * @return the text location
-     * @since 2.0
-     * @deprecated Use <code>getTextBounds().getLocation()</code> instead.
-     */
-    protected Point getTextLocation() {
-        return getTextBounds().getLocation();
-    }
-
-    /**
-     * 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
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    protected Dimension getTextSize(int wHint, int hHint) {
-        return getTextFlow().getPreferredSize(wHint, hHint);
-    }
-
-    /**
-     * 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() {
-        subStringText = null;
-        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
-     * @deprecated If this behavior is required then a request can be made (with
-     *             justification) for the WrappingLabel.
-     */
-    public boolean isTextTruncated() {
-        return !getSubStringTextSize().equals(getTextSize());
-    }
-
-    /**
-     * 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 "...".
-     *         @deprecated Renamed to {@link #getTruncationString()}
-     */
-    protected String getEllipse() {
-        return ELLIPSIS;
-    }
-    
-    protected String getTruncationString() {
-        if (getEllipse() != null) {
-            return getEllipse();
-        }
-        return ELLIPSIS;
-    }
-
-    /**
-     * @return whether the label text wrap is on
-     * @deprecated Use {@link #isTextWrapOn()} instead. This method was renamed
-     *             because it never indicated if the text was actually wrapped,
-     *             but whether text wrapping was turned on in the label.
-     */
-    public boolean isTextWrapped() {
-        return isTextWrapOn();
-    }
-
-    /**
-     * 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
-     * @deprecated this method was empty and never called
-     */
-    public void setTextWrapWidth(int i) {
-        // do nothing
-    }
-
-    /**
-     * 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
-     * @deprecated Call {@link #setTextJustification(int)} and
-     *             {@link #setAlignment(int)} instead. This method was somewhat
-     *             controlling text justification and label alignment, but they
-     *             are really two independent settings. Previously,
-     *             setTextWrapAlignment(CENTER) would not only center-justifies
-     *             the text, but also put the label in the center. Now, you need
-     *             to call {@link #setTextJustification(int)} to justify the
-     *             text (this only affects text when it is wrapped) and
-     *             {@link #setAlignment(int)} to position the text correctly in
-     *             the label. If you want the text in the center of the label
-     *             than call <code>setAlignment(PositionConstants.CENTER)</code>.
-     *             Look at the implementation of this method to see how your
-     *             code needs to be migrated.
-     */
-    public void setTextWrapAlignment(int i) {
-        setTextJustification(i);
-
-        // The old WrapLabel's Text Wrap Alignment (i.e. justification) and
-        // Label Alignment did not work properly. They worked together
-        // previously so we need to compensate for this here.
-        switch (i) {
-            case LEFT:
-                 setAlignment(TOP | LEFT);
-                break;
-            case CENTER:
-                setAlignment(TOP);
-                break;
-            case RIGHT:
-                setAlignment(TOP | RIGHT);
-                break;
-            default:
-                break;
-        }
-    }
-
-    /**
-     * @deprecated This never worked properly anyways. Call
-     *             {@link #setAlignment(int)} instead to position the icon and
-     *             text within the label.
-     */
-    public void setLabelAlignment(int alignment) {
-        // setLabelAlignment() never worked properly instead the label alignment
-        // seemed to be based on the text justification. Therefore, if it was
-        // set it will be ignored.
-    }
-
-    /**
-     * @return the label text wrapping width
-     * @deprecated Renamed to {@link #getTextJustification()}
-     */
-    public int getTextWrapAlignment() {
-        return getTextJustification();
-    }
-
-    /**
-     * 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/WrappingLabel.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrappingLabel.java
deleted file mode 100644
index a32bc55..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/WrappingLabel.java
+++ /dev/null
@@ -1,1672 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *     Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 245238
- ****************************************************************************/
-
-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.Graphics;
-import org.eclipse.draw2d.IFigure;
-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.draw2d.text.FlowContext;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.ParagraphTextLayout;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.draw2d.text.TextLayout;
-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.gmf.runtime.draw2d.ui.text.TextFlowEx;
-import org.eclipse.gmf.runtime.draw2d.ui.text.TextUtilitiesEx;
-import org.eclipse.gmf.runtime.draw2d.ui.text.TruncatedSingleLineTextLayout;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * An extended label that has the following extra features: <br>
- * 1. Allows selection, focus feedback, underlined and striked-through text.<br>
- * 2. Enhanced layout functionality for placing icon and text.<br>
- * 3. Text will be word-wrapped to fit the text in the width available.<br>
- * 4. Text will be truncated with an ellipsis if the entire text does not fit in
- * the space available.<br>
- * <p>
- * <b>EXPLANATION OF LAYOUTS</b><br>
- * 
- * This WrappingLabel contains functionality to display an icon alongside text.
- * The following will describe how the layout of the icon and text are done.
- * <p>
- * <br>
- * 
- * 
- * <u>Using {@link #setTextPlacement(int)}:</u>
- * <p>
- * 
- * The position of the text <i>relative</i> to the icon depends on
- * {@link #setTextPlacement(int)}. If the text placement is set to
- * {@link PositionConstants#EAST}, then the text would be placed on the right
- * of the icon. Similarly, if text placement is set to
- * {@link PositionConstants#WEST}, the text will be placed on the left of the
- * icon; {@link PositionConstants#NORTH} would put the text above the icon; and
- * {@link PositionConstants#SOUTH} would place the text below the icon.
- * <p>
- * <br>
- * 
- * <u>Using {@link #setTextAlignment(int)} and {@link #setIconAlignment(int)}:</u>
- * <p>
- * 
- * Use {@link #setTextAlignment(int)} and {@link #setIconAlignment(int)} to
- * align the text and icons <i>relative</i> to each other for more dynamic
- * control. If the text placement is on the east or west of the icon(s) (i.e.
- * the text on the right or left of the icon respectively), then only
- * {@link PositionConstants#TOP}, {@link PositionConstants#CENTER}, and
- * {@link PositionConstants#BOTTOM} can be used when calling
- * {@link #setTextAlignment(int)} and {@link #setIconAlignment(int)}. In this
- * case, setting the text alignment to {@link PositionConstants#TOP} will make
- * sure that the top of the text is aligned horizontally with the top of the
- * icon <i>if</i> the height of the icon is greater than the height of the
- * text. Similarly, setting the text alignment to
- * {@link PositionConstants#CENTER} will make sure that the top of the text is
- * aligned horizontally with the vertical center of the size of icon <i>if</i>
- * the height of the icon is greater than the height of the text. Also, setting
- * the text alignment to {@link PositionConstants#BOTTOM} will make sure that
- * the bottom of the text is aligned horizontally with the bottom of the icon
- * <i>if</i> the height of the icon is greater than the height of the text.
- * <p>
- * 
- * The other scenario is when the text placement is on the south or north of the
- * icon (i.e. the text is below or above the icon respectively). If this is
- * true, only {@link PositionConstants#LEFT}, {@link PositionConstants#CENTER},
- * and {@link PositionConstants#RIGHT} can be used when calling
- * {@link #setTextAlignment(int)} and {@link #setIconAlignment(int)}. In this
- * case, setting the text alignment to {@link PositionConstants#LEFT} will make
- * sure that the left of the text is aligned vertically with the left of the
- * icon <i>if</i> the width of the icon is greater than the width of the text.
- * Similarly, setting the text alignment to {@link PositionConstants#CENTER}
- * will make sure that the left of the text is aligned vertically with the
- * horizontal center of the icon <i>if</i> the width of the icon is greater
- * than the width of the text. Also, setting the text alignment to
- * {@link PositionConstants#RIGHT} will make sure that the right of the text is
- * aligned vertically with the right of the icon <i>if</i> the width of the
- * icon is greater than the width of the text.
- * <p>
- * 
- * {@link #setIconAlignment(int)} works identically as
- * {@link #setTextAlignment(int)}, except the roles of text and icon are
- * switched in the above descriptions.
- * <p>
- * <br>
- * 
- * 
- * <u>Using {@link #setAlignment(int)}:</u>
- * <p>
- * 
- * The entire label, text and icon, can be moved into different positions with
- * the label figure, if the figure is bigger than the icon and text. The
- * alignment of the label places the text and icon (no matter how they are
- * arranged relatively to each other) in the top-left, top, top-right, left,
- * center, right, bottom-left, bottom, or bottom-right of the bounds of this
- * <code>WrappingLabel</code> figure.
- * <p>
- * <br>
- * 
- * 
- * <u>Using {@link #setTextHorizontalAlignment(int)}:</u>
- * <p>
- * 
- * Use {@link #setTextJustification(int)} with {@link PositionConstants#LEFT},
- * {@link PositionConstants#CENTER}, or {@link PositionConstants#RIGHT} to
- * justify the text when wordwrap is turned on. The effect will be noticed in
- * multi-lined text only.
- * <p>
- * <br>
- * 
- * WARNING: User-nested figures are not expected within this figure.
- * <p>
- * 
- * Some code taken from the original <code>WrapLabel</code> in GMF by
- * melaasar.
- * <p>
- * 
- * @since 2.1
- * @author satif, crevells
- */
-public class WrappingLabel
-    extends Figure
-    implements PositionConstants {
-
-    static final String ELLIPSIS = "..."; //$NON-NLS-1$
-
-    private static final Dimension EMPTY_DIMENSION = new Dimension(0, 0);
-
-    private static final Map<IMapMode, MapModeConstants> mapModeConstantsMap = new WeakHashMap<IMapMode, MapModeConstants>();
-
-    static class MapModeConstants {
-
-        private static final int MAX_IMAGE_INFO = 12;
-
-        public final WeakReference<IMapMode> 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<Font, Dimension> fontToEllipseTextSize = new WeakHashMap<Font, Dimension>();
-
-        public final SingleIconInfo[] singleIconInfos = new SingleIconInfo[MAX_IMAGE_INFO];
-
-        public MapModeConstants(IMapMode mapMode) {
-            this.mapModeRef = new WeakReference<IMapMode>(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 = fontToEllipseTextSize.get(f);
-            if (d == null) {
-                IMapMode mapMode = mapModeRef.get();
-                d = FigureUtilities.getTextExtents(ELLIPSIS, 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 for these boolean flags
-    private static int FLAG_SELECTED = Figure.MAX_FLAG << 1;
-
-    private static int FLAG_HASFOCUS = Figure.MAX_FLAG << 2;
-
-    // reserve 4 bits for these alignment variables
-    /**
-     * @see #setTextAlignment(int)
-     */
-    private static int FLAG_TEXT_ALIGN = Figure.MAX_FLAG << 3;
-
-    /**
-     * @see #setIconAlignment(int)
-     */
-    private static int FLAG_ICON_ALIGN = Figure.MAX_FLAG << 7;
-
-    /**
-     * @see #setAlignment(int)
-     */
-    private static int FLAG_LABEL_ALIGN = Figure.MAX_FLAG << 11;
-
-    /**
-     * @see #setTextPlacement(int)
-     */
-    private static int FLAG_TEXT_PLACEMENT = Figure.MAX_FLAG << 15;
-
-    /**
-     * The largest flag defined in this class. If subclasses define flags, they
-     * should declare them as larger than this value and redefine MAX_FLAG to be
-     * their largest flag value.
-     * 
-     * @see Figure#MAX_FLAG
-     */
-    protected static final int MAX_FLAG = FLAG_TEXT_PLACEMENT;
-
-    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<Image> icons = new ArrayList<Image>(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 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 MapModeConstants mapModeConstants;
-
-    /**
-     * the top-level flow figure
-     */
-    private FlowPage flowPage;
-
-    /**
-     * The cached preferred text size that can be used after
-     * {@link #getPreferredSize(int, int)} is called.
-     */
-    protected Dimension preferredTextSize;
-
-    /**
-     * The cached truncation string size.
-     */
-    private Dimension truncationStringSize;
-
-    private IconInfo iconInfo;
-
-    /** the cached hint used to calculate text size */
-    private int cachedPrefSizeHint_width;
-
-    private int cachedPrefSizeHint_height;
-
-    /** the icon location */
-    private Point iconLocation;
-
-    /**
-     * Construct an empty wrapping label.
-     */
-    public WrappingLabel() {
-        createTextFigures();
-
-        setText("");//$NON-NLS-1$
-
-        // default flags...
-        setAlignmentFlags(CENTER, FLAG_TEXT_ALIGN);
-        setAlignmentFlags(CENTER, FLAG_ICON_ALIGN);
-        setAlignmentFlags(TOP | LEFT, FLAG_LABEL_ALIGN);
-        setPlacementFlags(EAST, FLAG_TEXT_PLACEMENT);
-        setTextJustification(LEFT);
-
-        revalidate();
-    }
-
-    /**
-     * Construct a wrapping label with the passed String as its text.
-     * 
-     * @param text
-     *            the label text
-     */
-    public WrappingLabel(String text) {
-        this();
-        if (text != null) {
-            setText(text);
-        } else {
-            setText("");//$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Construct a wrapping label with thepassed Image as its icon.
-     * 
-     * @param image
-     *            the label image
-     */
-    public WrappingLabel(Image image) {
-        this();
-        iconInfo = new SingleIconInfo(image);
-    }
-
-    /**
-     * Construct a wrapping label with passed the String as its text and the
-     * passed Image as its icon.
-     * 
-     * @param text
-     *            the label text
-     * @param image
-     *            the label image
-     */
-    public WrappingLabel(String text, Image image) {
-        this(text);
-        iconInfo = new SingleIconInfo(image);
-    }
-
-    /**
-     * Creates the top-level flow figure that will contain and draw the text.
-     * <p>
-     * 
-     * @return the new top-level flow figure
-     */
-    private void createTextFigures() {
-        TextFlowEx textFlow = new TextFlowEx();
-        flowPage = new FlowPage();
-        flowPage.add(textFlow);
-        setLayoutManager(textFlow, false);
-        add(flowPage);
-    }
-
-    /**
-     * Returns the top-level text figure. This is public to accommodate a bug in
-     * the TextDirectEditManager (see WrappingLabelDirectEditManager). It may
-     * not always remain public.
-     * 
-     * @return the top-level text figure.
-     */
-    public IFigure getTextFigure() {
-        return flowPage;
-    }
-
-    /**
-     * Casts the text figure to a flowpage.
-     * 
-     * @return
-     */
-    private FlowPage getFlowPage() {
-        return (FlowPage) getTextFigure();
-    }
-
-    /**
-     * Returns the text flow.
-     * 
-     * @return the text flow
-     */
-    TextFlow getTextFlow() {
-        return (TextFlow) flowPage.getChildren().get(0);
-    }
-
-    /**
-     * @return <code>IMapMode</code> used by this figure.
-     *         <code>IMapMode</code> that allows for the coordinate mapping
-     *         from device to logical units.
-     */
-    IMapMode getFigureMapMode() {
-        return getMapModeConstants().mapModeRef.get();
-    }
-
-    MapModeConstants getMapModeConstants() {
-        if (mapModeConstants == null) {
-            IMapMode mapMode = MapModeUtil.getMapMode(this);
-            while (mapMode instanceof IMapModeHolder) {
-                mapMode = ((IMapModeHolder) mapMode).getMapMode();
-            }
-            mapModeConstants = mapModeConstantsMap.get(mapMode);
-            if (mapModeConstants == null) {
-                mapModeConstants = new MapModeConstants(mapMode);
-                mapModeConstantsMap.put(mapMode, mapModeConstants);
-            }
-        }
-        return mapModeConstants;
-    }
-
-    private void alignOnHeight(Rectangle area, Rectangle childBounds,
-            int alignment) {
-
-        switch (alignment) {
-            case TOP:
-                childBounds.y = area.y;
-                childBounds.y = area.y;
-                break;
-            case BOTTOM:
-                childBounds.y = area.getBottom().y - childBounds.height;
-                break;
-            default:
-                childBounds.y = area.y + (area.height - childBounds.height) / 2;
-        }
-    }
-
-    private void alignOnWidth(Rectangle area, Rectangle childBounds,
-            int alignment) {
-
-        switch (alignment) {
-            case LEFT:
-                childBounds.x = area.x;
-                break;
-            case RIGHT:
-                childBounds.x = area.getRight().x - childBounds.width;
-                break;
-            default:
-                childBounds.x = area.x + (area.width - childBounds.width) / 2;
-        }
-    }
-
-    private void calculateAlignment(Rectangle textBounds, Rectangle iconBounds) {
-
-        Rectangle areaUsed = textBounds.getUnion(iconBounds);
-        areaUsed.x = getInsets().left;
-        areaUsed.y = getInsets().top;
-
-        switch (getTextPlacement()) {
-            case EAST:
-            case WEST:
-                alignOnHeight(areaUsed, textBounds, getTextAlignment());
-                alignOnHeight(areaUsed, iconBounds, getIconAlignment());
-                break;
-            case NORTH:
-            case SOUTH:
-                alignOnWidth(areaUsed, textBounds, getTextAlignment());
-                alignOnWidth(areaUsed, iconBounds, 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);
-        }
-    }
-
-    public void layout() {
-        Rectangle textBounds = new Rectangle();
-        Rectangle iconBounds = new Rectangle();
-
-        calculateSizes(textBounds, iconBounds);
-        calculatePlacement(textBounds, iconBounds);
-        calculateAlignment(textBounds, iconBounds);
-        calculateLabelAlignment(textBounds, iconBounds);
-
-        if (hasIcons()) {
-            setIconLocation(iconBounds.getLocation());
-        }
-
-        getTextFigure().setBounds(
-            textBounds.getTranslated(getBounds().getLocation()));
-    }
-
-    /**
-     * @param container
-     * @param textBounds
-     * @param iconBounds
-     */
-    private void calculateSizes(Rectangle textBounds, Rectangle iconBounds) {
-        Rectangle area = getClientArea();
-
-        Dimension preferredSize = getPreferredSize(area.width, area.height);
-
-        Dimension minimumSize = getMinimumSize(area.width, area.height);
-
-        Dimension shrinkAmount = preferredSize.getDifference(getBounds().getSize()
-            .getUnioned(minimumSize));
-
-        Dimension textSize = preferredTextSize.getCopy();
-        if (shrinkAmount.width > 0) {
-            textSize.shrink(shrinkAmount.width, 0);
-        }
-        if (shrinkAmount.height > 0) {
-            textSize.shrink(0, shrinkAmount.height);
-        }
-
-        if (getTextFlow().isTextTruncated()) {
-            textBounds.setSize(textSize);
-        } else {
-            // This is needed for label alignment to work. The preferred text
-            // size will extend the entire width, so use the actual text size
-            // instead.
-            textBounds.setSize(getTextFlow().getSize().intersect(textSize));
-        }
-
-        iconBounds.setSize(getTotalIconSize());
-    }
-
-    private void calculateLabelAlignment(Rectangle textBounds,
-            Rectangle iconBounds) {
-
-        Dimension offset = getClientArea().getSize().getDifference(
-            textBounds.getUnion(iconBounds).getSize());
-        switch (getAlignment()) {
-            case TOP | LEFT:
-                offset.height = 0;
-                offset.width = 0;
-                break;
-            case TOP:
-                offset.height = 0;
-                offset.scale(0.5f);
-                break;
-            case TOP | RIGHT:
-                offset.height = 0;
-            case RIGHT:
-                offset.width = offset.width * 2;
-                offset.scale(0.5f);
-                break;
-            case BOTTOM | RIGHT:
-                break;
-            case BOTTOM:
-                offset.height = offset.height * 2;
-                offset.scale(0.5f);
-                break;
-            case BOTTOM | LEFT:
-                offset.width = 0;
-                break;
-            case LEFT:
-                offset.width = 0;
-                offset.scale(0.5f);
-                break;
-            case CENTER:
-                offset.scale(0.5f);
-                break;
-            default:
-                offset.scale(0.5f);
-                break;
-        }
-        textBounds.translate(offset.width, offset.height);
-        iconBounds.translate(offset.width, offset.height);
-    }
-
-    private void calculatePlacement(Rectangle textBounds, Rectangle iconBounds) {
-        int gap = (textBounds.isEmpty() || iconBounds.isEmpty()) ? 0
-            : getIconTextGap();
-        Insets insets = getInsets();
-        switch (getTextPlacement()) {
-            case EAST:
-                iconBounds.x = insets.left;
-                textBounds.x = iconBounds.width + gap + insets.left;
-                break;
-            case WEST:
-                textBounds.x = insets.left;
-                iconBounds.x = textBounds.width + gap + insets.left;
-                break;
-            case NORTH:
-                textBounds.y = insets.top;
-                iconBounds.y = textBounds.height + gap + insets.top;
-                break;
-            case SOUTH:
-                textBounds.y = iconBounds.height + gap + insets.top;
-                iconBounds.y = insets.top;
-        }
-    }
-
-    /**
-     * Returns the label's icon.
-     * 
-     * @return the label's icon.
-     */
-    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 alignment of the label's icon relative to the label's text
-     * bounds. This is only relevant if the icon's width or height (depending on
-     * the location of the icon relative to the text) is smaller than the text's
-     * width or height. The default is {@link PositionConstants#CENTER}.
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @return the icon alignment relative to the text bounds
-     */
-    public int getIconAlignment() {
-        return getAlignment(FLAG_ICON_ALIGN);
-    }
-
-    /**
-     * Returns the location of the Label's icon relative to the Label.
-     * 
-     * @return the icon's location
-     * @since 2.0
-     */
-    protected Point getIconLocation() {
-        return iconLocation;
-    }
-
-    protected void setIconLocation(Point location) {
-        iconLocation = location;
-    }
-
-    /**
-     * 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;
-    }
-
-    public Dimension getMinimumSize(int w, int h) {
-        if (minSize != null)
-            return minSize;
-        minSize = new Dimension();
-
-        Font currentFont = getFont();
-        Dimension ellipsisSize = getTruncationStringSize();
-        Dimension textSize = new TextUtilitiesEx(getFigureMapMode())
-            .getTextExtents(getText(), currentFont);
-        if (textSize.width == 0) {
-			textSize.height = 0;
-		}       
-        textSize.intersect(ellipsisSize);
-
-        Dimension labelSize = calculateLabelSize(textSize);
-        Insets insets = getInsets();
-        labelSize.expand(insets.getWidth(), insets.getHeight());
-        minSize.union(labelSize);
-        return minSize;
-    }
-
-    public Dimension getPreferredSize(int wHint, int hHint) {
-        if (prefSize == null || wHint != cachedPrefSizeHint_width
-            || hHint != cachedPrefSizeHint_height) {
-
-            cachedPrefSizeHint_width = wHint;
-            cachedPrefSizeHint_height = hHint;
-
-            int minWHint = 0, minHHint = 0;
-            if (wHint < 0)
-                minWHint = -1;
-
-            if (hHint < 0)
-                minHHint = -1;
-
-            if (hasIcons()) {
-                // start with the icon size and then add the text size
-                prefSize = getTotalIconSize().getCopy();
-
-                switch (getTextPlacement()) {
-                    case EAST:
-                    case WEST:
-                        wHint = Math.max(minWHint, wHint
-                            - (prefSize.width + getIconTextGap()));
-                        preferredTextSize = getTextFigure().getPreferredSize(
-                            wHint, hHint).getCopy();
-                        prefSize.width += preferredTextSize.width
-                            + getIconTextGap();
-                        prefSize.height = Math.max(prefSize.height,
-                            preferredTextSize.height);
-                        break;
-                    case NORTH:
-                    case SOUTH:
-                        hHint = Math.max(minHHint, hHint
-                            - (prefSize.height + getIconTextGap()));
-                        preferredTextSize = getTextFigure().getPreferredSize(
-                            wHint, hHint).getCopy();
-                        prefSize.width = Math.max(prefSize.width,
-                            preferredTextSize.width);
-                        prefSize.height += preferredTextSize.height
-                            + getIconTextGap();
-                        break;
-                }
-
-            } else {
-                preferredTextSize = getTextFigure().getPreferredSize(wHint,
-                    hHint).getCopy();
-                if(preferredTextSize.width == 0){
-                	preferredTextSize.height = 0;
-                }
-                prefSize = preferredTextSize.getCopy();
-            }
-
-            Insets insets = getInsets();
-            prefSize.expand(insets.getWidth(), insets.getHeight());
-
-        }
-        return prefSize;
-    }
-
-    /**
-     * Returns the size of the truncation string based on the currently used Map
-     * mode size.
-     * 
-     * @return the size of the truncation string
-     * 
-     */
-    Dimension getTruncationStringSize() {
-        if (truncationStringSize == null) {
-            if (getTruncationString().equals(ELLIPSIS)) {
-                truncationStringSize = getMapModeConstants()
-                    .getEllipseTextSize(getFont());
-            } else {
-                Font f = getFont();
-                IMapMode mapMode = getFigureMapMode();
-                truncationStringSize = FigureUtilities.getTextExtents(
-                    getTruncationString(), f);
-                truncationStringSize.height = FigureUtilities.getFontMetrics(f)
-                    .getHeight();
-                truncationStringSize = new Dimension(mapMode
-                    .DPtoLP(truncationStringSize.width), mapMode
-                    .DPtoLP(truncationStringSize.height));
-            }
-        }
-        return truncationStringSize;
-    }
-
-    /**
-     * Returns the text of the label. Note that this is the complete text of the
-     * label, regardless of whether it is currently being truncated.
-     * 
-     * @return the complete text of this label
-     */
-    public String getText() {
-        return getTextFlow().getText();
-    }
-
-    /**
-     * Gets the alignment of the label's text relative to the label's icon
-     * bounds. This is only relevant if the text's width or height (depending on
-     * the location of the text relative to the icon) is smaller than the icon's
-     * width or height. The default text alignment is
-     * {@link PositionConstants#CENTER}.
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @return the text alignment relative to the icon bounds
-     */
-    public int getTextAlignment() {
-        return getAlignment(FLAG_TEXT_ALIGN);
-    }
-
-    /**
-     * Returns the alignment of the label (icon and text) within the figure.
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @return the label alignment
-     */
-    public int getAlignment() {
-        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 relative to this
-     *         figure's bounds
-     */
-    public Rectangle getTextBounds() {
-        return new Rectangle(getFlowPage().getBounds().getLocation(),
-            getTextFlow().getBounds().getSize());
-    }
-
-    /**
-     * Returns the current placement of the label's text relative to its icon.
-     * The default text placement is {@link PositionConstants#EAST}.
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @return the text placement
-     */
-    public int getTextPlacement() {
-        return getPlacement(FLAG_TEXT_PLACEMENT);
-    }
-
-    public void invalidate() {
-        prefSize = null;
-        minSize = null;
-        iconLocation = null;
-        truncationStringSize = null;
-
-        if (iconInfo != null) {
-            iconInfo.invalidate();
-        }
-        super.invalidate();
-    }
-
-    public void paintFigure(Graphics graphics) {
-        super.paintFigure(graphics);
-
-        if (hasIcons()) {
-            paintIcons(graphics);
-        }
-    }
-
-    protected void paintClientArea(Graphics graphics) {
-        paintSelectionRectangle(graphics);
-        paintFocusRectangle(graphics);
-        super.paintClientArea(graphics);
-    }
-
-    private void paintSelectionRectangle(Graphics g) {
-        if (isSelected()) {
-            g.pushState();
-            g.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-            g.fillRectangle(getVisibleTextBounds());
-            g.popState();
-            g.setForegroundColor(ColorConstants.menuForegroundSelected);
-        }
-    }
-
-    private void paintFocusRectangle(Graphics g) {
-        if (hasFocus()) {
-            g.pushState();
-            g.setXORMode(true);
-            g.setForegroundColor(ColorConstants.menuBackgroundSelected);
-            g.setBackgroundColor(ColorConstants.menuForegroundSelected);
-            g.drawFocus(getVisibleTextBounds());
-            g.popState();
-        }
-    }
-
-    private Rectangle getVisibleTextBounds() {
-        return getTextBounds().getIntersection(getClientArea());
-    }
-
-    /**
-     * Paints the icon(s)
-     * 
-     * @param graphics
-     *            The graphics context
-     */
-    private void paintIcons(Graphics graphics) {
-        Point p = Point.SINGLETON;
-
-        if (getIconLocation() != null) {
-            p.setLocation(getIconLocation());
-
-            Rectangle figBounds = getBounds();
-            graphics.translate(figBounds.x, figBounds.y);
-
-            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;
-                }
-            }
-            graphics.translate(-figBounds.x, -figBounds.y);
-        }
-    }
-
-    /**
-     * 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 not
-            // 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 not 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 not
-            // the same.
-        }
-    }
-
-    /**
-     * Sets the alignment of the label's icon relative to the label's text
-     * bounds. This is only relevant if the icon's width or height (depending on
-     * the location of the icon relative to the text) is smaller than the text's
-     * width or height. The default value is {@link PositionConstants#CENTER}.
-     * <p>
-     * If the text placement is NORTH/SOUTH, valid values are:
-     * <UL>
-     * <LI><EM>{@link PositionConstants#CENTER}</EM>
-     * <LI>{@link PositionConstants#LEFT}
-     * <LI>{@link PositionConstants#RIGHT}
-     * </UL>
-     * <p>
-     * If the text placement is EAST/WEST, valid values are:
-     * <UL>
-     * <LI><EM>{@link PositionConstants#CENTER}</EM>
-     * <LI>{@link PositionConstants#TOP}
-     * <LI>{@link PositionConstants#BOTTOM}
-     * </UL>
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @param alignment
-     *            the icon alignment relative to the text bounds
-     */
-    public void setIconAlignment(int alignment) {
-        if (getIconAlignment() == alignment)
-            return;
-        setAlignmentFlags(alignment, FLAG_ICON_ALIGN);
-        revalidate();
-        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 alignment of the label (icon and text) within the figure. If
-     * this figure's bounds are larger than the size needed to display the
-     * label, the label will be aligned accordingly. The default is
-     * {@link PositionConstants#LEFT}. Valid values are:
-     * <UL>
-     * <LI>{@link PositionConstants#TOP} | {@link PositionConstants#LEFT}
-     * <LI>{@link PositionConstants#TOP}
-     * <LI>{@link PositionConstants#TOP} | {@link PositionConstants#RIGHT}
-     * <LI><EM>{@link PositionConstants#LEFT}</EM>
-     * <LI>{@link PositionConstants#CENTER}
-     * <LI>{@link PositionConstants#RIGHT}
-     * <LI>{@link PositionConstants#BOTTOM} | {@link PositionConstants#LEFT}
-     * <LI>{@link PositionConstants#BOTTOM}
-     * <LI>{@link PositionConstants#BOTTOM} | {@link PositionConstants#RIGHT}
-     * </UL>
-     * 
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @param alignment
-     *            label alignment
-     */
-    public void setAlignment(int alignment) {
-        if (getAlignment() == alignment)
-            return;
-        setAlignmentFlags(alignment, FLAG_LABEL_ALIGN);
-        revalidate();
-        repaint();
-    }
-
-    /**
-     * Gets the truncation string. The default is an ellipsis "...". Clients may
-     * override, but if the truncation string changes throughout the lifecycle
-     * of this figure, then revalidate() should be called to ensure the cached
-     * <code>truncationStringSize</code> is cleared.
-     * 
-     * @return the truncation string
-     */
-    protected String getTruncationString() {
-        return ELLIPSIS;
-    }
-
-    /**
-     * Sets the text in this label.
-     * 
-     * @param text
-     *            the new text to be set
-     */
-    public void setText(String text) {
-        getTextFlow().setText(text);
-    }
-
-    /**
-     * Sets the alignment of the label's text relative to the label's icon
-     * bounds. This is only relevant if the text's width or height (depending on
-     * the location of the text relative to the icon) is smaller than the icon's
-     * width or height. The default value is {@link PositionConstants#CENTER}.
-     * <p>
-     * If the text placement is EAST/WEST, valid values are:
-     * <UL>
-     * <LI><EM>{@link PositionConstants#CENTER}</EM>
-     * <LI>{@link PositionConstants#TOP}
-     * <LI>{@link PositionConstants#BOTTOM}
-     * </UL>
-     * <p>
-     * If the text placement is NORTH/SOUTH, and the icon is bigger than the
-     * text, then the location of the text can be controlled by how the text is
-     * justified {@link #setTextJustification(int)}.
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @param alignment
-     *            the text alignment relative to the icon bounds
-     */
-    public void setTextAlignment(int alignment) {
-        if (getTextAlignment() == alignment)
-            return;
-        setAlignmentFlags(alignment, FLAG_TEXT_ALIGN);
-
-        revalidate();
-        repaint();
-    }
-
-    /**
-     * Sets the text placement of the label relative to its icon. The default is
-     * {@link PositionConstants#EAST}. Valid values are
-     * <UL>
-     * <LI><EM>{@link PositionConstants#EAST}</EM>
-     * <LI>{@link PositionConstants#NORTH}
-     * <LI>{@link PositionConstants#SOUTH}
-     * <LI>{@link PositionConstants#WEST}
-     * </UL>
-     * 
-     * e.g. PositionConstants#EAST indicates the text is on the east of the
-     * icon.
-     * <p>
-     * <p>
-     * See the documentation describing the layout of the label in the class
-     * header {@link WrappingLabel} for more detailed information.
-     * </p>
-     * 
-     * @param where
-     *            the text placement
-     */
-    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 underline
-     *            Whether the label text should be underlined
-     */
-    public void setTextUnderline(boolean underline) {
-        ((TextFlowEx) getTextFlow()).setTextUnderline(underline);
-    }
-
-    /**
-     * @return whether the label text is underlined
-     */
-    public boolean isTextUnderlined() {
-        return ((TextFlowEx) getTextFlow()).isTextUnderlined();
-    }
-
-    /**
-     * Sets whether the label text should be striked-through
-     * 
-     * @param strikeThrough
-     *            whether the label text should be striked-through
-     */
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        ((TextFlowEx) getTextFlow()).setTextStrikeThrough(strikeThrough);
-    }
-
-    /**
-     * @return whether the label text is striked-through
-     */
-    public boolean isTextStrikedThrough() {
-        return ((TextFlowEx) getTextFlow()).isTextStrikedThrough();
-    }
-
-    /**
-     * Sets whether the label text should wrap
-     * 
-     * @param b
-     *            whether the label text should wrap
-     */
-    public void setTextWrap(boolean textWrapOn) {
-        if (textWrapOn != isTextWrapOn()) {
-            setLayoutManager(getTextFlow(), textWrapOn);
-            revalidate();
-            repaint();
-        }
-    }
-
-    /**
-     * @return whether the label text wrap is on
-     */
-    public boolean isTextWrapOn() {
-        return getTextFlow().getLayoutManager() instanceof ParagraphTextLayout;
-    }
-
-    /**
-     * Sets the text justification of the label text. The default is
-     * {@link PositionConstants#LEFT}. Valid values are
-     * <UL>
-     * <LI><EM>{@link PositionConstants#LEFT}</EM>
-     * <LI>{@link PositionConstants#CENTER}
-     * <LI>{@link PositionConstants#RIGHT}
-     * </UL>
-     * 
-     * @param alignment
-     *            the text justification.
-     */
-    public void setTextJustification(int justification) {
-        getFlowPage().setHorizontalAligment(justification);
-    }
-
-    /**
-     * Gets the text justification of the label text.
-     * 
-     * @return the text justification -- {@link PositionConstants#LEFT},
-     *         {@link PositionConstants#CENTER}, or
-     *         {@link PositionConstants#RIGHT}
-     */
-    public int getTextJustification() {
-        return getFlowPage().getHorizontalAligment();
-    }
-
-    /**
-     * 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 alignment
-     * @param flagOffset
-     */
-    private void setAlignmentFlags(int alignment, int flagOffset) {
-        flags &= ~(0xF * flagOffset);
-        switch (alignment) {
-            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;
-            case TOP | LEFT:
-                flags |= 0x6 * flagOffset;
-                break;
-            case TOP | RIGHT:
-                flags |= 0x7 * flagOffset;
-                break;
-            case BOTTOM | LEFT:
-                flags |= 0x8 * flagOffset;
-                break;
-            case BOTTOM | RIGHT:
-                flags |= 0x9 * 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 & (0xF * 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;
-        else if (wrapValue == 0x6 * flagOffset)
-            return TOP | LEFT;
-        else if (wrapValue == 0x7 * flagOffset)
-            return TOP | RIGHT;
-        else if (wrapValue == 0x8 * flagOffset)
-            return BOTTOM | LEFT;
-        else if (wrapValue == 0x9 * flagOffset)
-            return BOTTOM | RIGHT;
-
-        return CENTER;
-    }
-
-    /**
-     * @return the focus state of this label
-     */
-    public boolean hasFocus() {
-        return (flags & FLAG_HASFOCUS) != 0;
-    }
-
-    /**
-     * Sets the focus state of this label
-     * 
-     * @param focus
-     *            true will cause a focus rectangle to be drawn around the text
-     *            of the Label
-     */
-    public void setFocus(boolean focus) {
-        if (hasFocus() == focus)
-            return;
-        setFlag(FLAG_HASFOCUS, focus);
-        repaint();
-    }
-
-    /**
-     * @return the selection state of this label
-     */
-    public boolean isSelected() {
-        return (flags & FLAG_SELECTED) != 0;
-    }
-
-    /**
-     * Sets the selection state of this label
-     * 
-     * @param selected
-     *            true will cause the label to appear selected
-     */
-    public void setSelected(boolean selected) {
-        if (isSelected() == selected)
-            return;
-        setFlag(FLAG_SELECTED, selected);
-        repaint();
-    }
-
-    public void setFont(Font f) {
-        super.setFont(f);
-
-        // need to trigger a repaint of the textflow
-        getTextFlow().setFont(f);
-    }
-
-    private void setLayoutManager(TextFlow textFlow, boolean wrappingOn) {
-        TextLayout layout;
-        if (wrappingOn) {
-            layout = new ParagraphTextLayout(textFlow,
-                ParagraphTextLayout.WORD_WRAP_SOFT);
-        } else {
-            layout = new TruncatedSingleLineTextLayout((TextFlowEx) textFlow,
-                getTruncationString());
-        }
-        layout.setFlowContext((FlowContext) ((FlowPage) textFlow.getParent())
-            .getLayoutManager());
-        textFlow.setLayoutManager(layout);
-    }
-
-    public String toString() {
-        // for debugging purposes
-        return getText();
-    }
-
-	/**
-	 * Returns <code>true</code> if the label's text is currently truncated and
-	 * is displaying an ellipsis, <code>false</code> otherwise. <br>
-	 * Note that this code only reports horizontal truncation by delegating to
-	 * the GEF TextFlow and ignores that fact that GMF TextFlowEx may be
-	 * vertically truncated.
-	 * 
-	 * @return <code>true</code> if the label's text is truncated
-	 */
-	public boolean isTextTruncated() {
-		return getTextFlow().isTextTruncated();
-	}
-}
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 b50f6c7..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
+++ /dev/null
@@ -1,986 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-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
- */
-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 = ptStart.getCopy();
-		terminus = ptEnd.getCopy();
-	}
-
-	/**
-	 * 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 origin.getCopy();
-	}
-
-	/**
-	 * 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 terminus.getCopy();
-	}
-
-	/**
-	 * Sets the origin point of the line segment
-	 * 
-	 * @param origin Point to set as origin
-	 */
-	public void setOrigin(Point origin) {
-		this.origin = origin.getCopy();
-	}
-
-	/**
-	 * Sets the terminating point of the line segment.
-	 * 
-	 * @param terminus Point to set as terminus
-	 */
-	public void setTerminus(Point terminus) {
-		this.terminus = terminus.getCopy();
-	}
-
-	/**
-	 * 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) {
-		/*
-		 * We need perform the calculations in double numbers to avoid possible integer
-		 * overflows in Point#getDistance2() method
-		 */
-		double lengthOfSegment = origin.getDistance(terminus);
-		double lengthFromOriginToPoint = origin.getDistance(aPoint);
-		double lengthFromTerminusToPoint = terminus.getDistance(aPoint);
-		
-		return lengthFromTerminusToPoint + lengthFromOriginToPoint - lengthOfSegment <= 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);
-		if (val != null) {
-			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() {
-		PrecisionPoint preciseOrigin = new PrecisionPoint(origin);
-		PrecisionPoint preciseTerminus = new PrecisionPoint(terminus);
-		return getLineEquation(preciseOrigin.preciseX, preciseOrigin.preciseY,
-				preciseTerminus.preciseX, preciseTerminus.preciseY);
-	}
-	
-	/**
-	 * 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) {
-		PrecisionPointList intersections = new PrecisionPointList();
-		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) {
-				List<Point> points = new ArrayList<Point>(4);
-				points.add(getOrigin());
-				points.add(getTerminus());
-				points.add(line.getOrigin());
-				points.add(line.getTerminus());
-				Collections.sort(points, new Comparator<Point>() {
-					public int compare(Point arg0, Point arg1) {
-						if (arg0.equals(arg1)) {
-							return 0;
-						} else if (arg0.preciseX() < arg1.preciseX()
-								|| (arg0.preciseX() == arg1.preciseX() && arg0
-										.preciseY() < arg1.preciseY())) {
-							return -1;
-						} else {
-							return 1;
-						}
-					}					
-				});
-				// if lines are the same, then instead of infinite number of intersections
-				// we will put the 2 points out of 4 points - ends of 2 segments. Look above.
-				intersections.addPoint(points.get(1));
-				intersections.addPoint(points.get(2));
-			}
-		}
-		else {
-			intersections.addPoint(new PrecisionPoint((c1*b2-b1*c2)/det, (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 PrecisionPointList();
-		PrecisionPoint preciseOrigin = new PrecisionPoint(origin);
-		PrecisionPoint preciseTerminus = new PrecisionPoint(terminus);
-		PrecisionRectangle preciseEllipseBounds = new PrecisionRectangle(ellipseBounds);
-		if (preciseEllipseBounds.preciseWidth == 0 || preciseEllipseBounds.preciseHeight == 0)
-			return intersections;
-		PrecisionPoint ellipsePreciseCenter = new PrecisionPoint(
-				preciseEllipseBounds.getCenter());
-		double xl1 = preciseOrigin.preciseX - ellipsePreciseCenter.preciseX;
-		double xl2 = preciseTerminus.preciseX - ellipsePreciseCenter.preciseX;
-		double yl1 = preciseOrigin.preciseY - ellipsePreciseCenter.preciseY;
-		double yl2 = preciseTerminus.preciseY - ellipsePreciseCenter.preciseY;
-		double [] equation = LineSeg.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 = preciseEllipseBounds.preciseWidth;
-		double h = preciseEllipseBounds.preciseHeight;
-		
-		// Ellipse with a center 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 PrecisionPoint(x+ellipsePreciseCenter.preciseX, Math.sqrt(y)+ellipsePreciseCenter.preciseY));
-			intersections.addPoint(new PrecisionPoint(x+ellipsePreciseCenter.preciseX, -Math.sqrt(y)+ellipsePreciseCenter.preciseY));
-		}
-		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 PrecisionPoint(x1+ellipsePreciseCenter.preciseX, (c-a*x1)/b+ellipsePreciseCenter.preciseY));
-			intersections.addPoint(new PrecisionPoint(x2+ellipsePreciseCenter.preciseX, (c-a*x2)/b+ellipsePreciseCenter.preciseY));
-		}
-		
-		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) {
-		PointList intersections = new PrecisionPointList();
-		if (points.size()<2) {
-			if (containsPoint(points.getFirstPoint(), DEFAULT_INTERSECTION_TOLERANCE)) {
-				intersections.addPoint(points.getFirstPoint());
-			}
-		} else {	
-			for (int i=0; i<points.size()-1; i++) {
-				LineSeg seg = new LineSeg(points.getPoint(i), points.getPoint(i+1));
-				PointList currentIntersections = getLinesIntersections(seg);
-				for (int j=0; j<currentIntersections.size(); j++) {
-					Point intersection = currentIntersections.getPoint(j);
-					if (seg.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 b0dad12..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
+++ /dev/null
@@ -1,2055 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Hashtable;
-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 (Math.abs(seg.y) < straightLineTolerance) {
-					points.setPoint(new Point(ptNext.x, ptStart.y), i + 1);
-				} else if (Math.abs(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++) {
-			Point pt1 = points.getPoint(i);
-			Point pt2 = points.getPoint(i - 1);
-			double diffX = pt1.preciseX() - pt2.preciseX();
-			double diffY = pt1.preciseY() - pt2.preciseY();
-			double nextLength = Math.sqrt(diffX * diffX + diffY * diffY);
-
-			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<LineSeg>(0);
-
-		ArrayList<LineSeg> lines = new ArrayList<LineSeg>(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;
-	
-	/**
-	 * @since 1.2
-	 */
-	public final static int DEFAULT_CORNER_APPROXIMATION_PTS = 15;
-
-	/**
-	 * 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 != null) {
-			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 = null;
-		if (points.size() != 0) {
-			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 = null;
-		if (points.size() != 0) {
-			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;
-	}
-    
-    /**
-     * Utility method used to check if a point is contained inside a polygon
-     * @param points    the polygon
-     * @param point     point to check
-     * @return          true is the pointis inside the polygon, otherwise false
-     */
-    public static boolean containsPoint(PointList points, Point point){
-        boolean isOdd = false;
-        int[] pointsxy = points.toIntArray();
-        int n = pointsxy.length;
-        if (n > 3) { //If there are at least 2 Points (4 ints)
-            int x1, y1;
-            int x0 = pointsxy[n - 2];
-            int y0 = pointsxy[n - 1];
-
-            for (int i = 0; i < n; x0 = x1, y0 = y1) {
-                x1 = pointsxy[i++];
-                y1 = pointsxy[i++];
-                
-                if (y0 <= point.y && point.y < y1
-                  && crossProduct(x1, y1, x0, y0, point.x, point.y) > 0)
-                    isOdd = !isOdd;
-                if (y1 <= point.y && point.y < y0
-                  && crossProduct(x0, y0, x1, y1, point.x, point.y) > 0)
-                    isOdd = !isOdd;
-            }
-            if (isOdd)
-                return true;
-        }
-        return false;
-    }
-    
-    static private int crossProduct(int ax, int ay, int bx, int by, int cx, int cy) {
-        return (ax - cx) * (by - cy) - (ay - cy) * (bx - cx);
-    }
-    
-    /**
-     * Replaces bendpoints (all points except the first and last) in points list by points defining 
-     * corresponding arcs. That is, each bendpoint is replaced with the start and end point of the arc,
-     * and if calculateApproxPoints is true, there will also be points in between that approximate the arc. 
-     * Arc size is r. Sometimes, segment between two bendpoints is shorter than r. In that case, arc size for 
-     * both bendpoints has to be reduced to be half of the segment length, so that both arcs can fit. 
-     * These reduced arc sizes (if any) are kept in rForBendpoint hashtable.  
-     * 
-     * @param points Initial list of connection points
-     * @param r Size (radius) of the arc that should replace bendpoint
-     * @param rForBendpoint Hashtable keeping track of bendpoints whose arcs have to be smaller than r
-     * @param calculateAppoxPoints Indicates if arcs replacing bendpoints should be approximated
-     * @return
-     * @since 1.2
-     */
-    public static PointList calcRoundedCornersPolyline(PointList points, int r, 
-    		Hashtable<Integer, Integer> rForBendpoint, boolean calculateAppoxPoints) {
-    	PointList newPoints = new PointList();
-    	// First, clean up the points list if needed. Each segment is defined by two end points,
-    	// so if it happens that the segment has points in between, remove them since there is no
-    	// use for them, they can just create problems.
-    	int k = 1;
-    	while (k < points.size() - 1) {
-       		int x0 = points.getPoint(k-1).x;
-    		int y0 = points.getPoint(k-1).y;
-    		int x1 = points.getPoint(k).x;
-    		int y1 = points.getPoint(k).y;
-    		int x2 = points.getPoint(k+1).x;
-    		int y2 = points.getPoint(k+1).y;
-    		if ((x0 == x1 && x1 == x2) || (y0 == y1 && y1 == y2)) {
-    			// (x1, y1) is not needed, remove it
-    			points.removePoint(k);
-    		} else {
-    			k++;
-    		}
-    	}
-    	newPoints.addPoint(points.getFirstPoint()); 
-    	int rDefault = r;
-    	for (int i = 1; i < points.size() - 1; i++) {
-    		int x0 = points.getPoint(i-1).x;
-    		int y0 = points.getPoint(i-1).y;
-    		int x1 = points.getPoint(i).x; // x of bendpoint to be replaced
-    		int y1 = points.getPoint(i).y; // y of bendpoint to be replaced
-    		int x2 = points.getPoint(i+1).x;
-    		int y2 = points.getPoint(i+1).y;
-    		// there are 8 possibilities: four types of corners, each can be traversed in two directions
-    		int cornerCase;
-    		if (x0 == x1 && x2 > x1 && y0 < y1 && y2 == y1) {
-    			cornerCase = 1;
-    		} else if (x0 > x1 && x2 == x1 && y0 == y1 && y2 < y1) {
-    			cornerCase = 2;    			
-    		} else if (x0 < x1 && x2 == x1 && y0 == y1 && y2 < y1) {
-    			cornerCase = 3;
-    		} else if (x0 == x1 && x2 < x1 && y0 < y1 && y2 == y1) {
-    			cornerCase = 4;    			
-    		} else if (x0 > x1 && x2 == x1 && y0 == y1 && y2 > y1) {
-    			cornerCase = 5;
-    		} else if (x0 == x1 && x2 > x1 && y0 > y1 && y2 == y1) {
-    			cornerCase = 6;
-    		} else if (x0 == x1 && x2 < x1 && y0 > y1 && y2 == y1) {
-    			cornerCase = 7;
-    		} else if (x0 < x1 && x2 == x1 && y0 == y1 && y2 > y1) {
-    			cornerCase = 8;
-    		} else {
-    			return null; // not rectilinear routing - shouldn't happen
-    		}
-    		// It is possible that the distance between (x0, y0) and (x1, y1), or (x1, y1) and (x2, y2) 
-    		// is smaller than the desired arc width and heighr r. In that case, we have to shrink the arc
-    		// to fit whatever space we have. Add changed r in rForBendpoint so it can be used later.
-    		r = rDefault;
-    		int distance = Math.min(points.getPoint(i-1).getDistanceOrthogonal(points.getPoint(i)),
-    				points.getPoint(i).getDistanceOrthogonal(points.getPoint(i+1)));
-    		if (r > distance / 2) {
-    			r = distance / 2 - 1;
-    			rForBendpoint.put(new Integer(i), new Integer(r));
-    		}
-    			
-    		// Find the coordinates of the arc center, as well as the sign (+ or -) for the circle equasion    		
-    		int sign = 1;
-    		int p, q; // coordinates of the arc center    		
-    		switch (cornerCase) {
-    		case 1:
-    		case 2:
-    			p = x1 + r;
-    			q = y1 - r; 
-    			break;
-    		case 3:
-    		case 4:
-    			p = x1 - r;
-    			q = y1 - r;    			
-    			break;
-    		case 5:
-    		case 6:
-    			p = x1 + r;
-    			q = y1 + r;  
-    			sign = -1;
-    			break;
-    		default: // 7 and 8
-    			p = x1 - r;
-    			q = y1 + r;
-    			sign = -1;
-    			break;
-    		}
-    		// Find the first and last point of the arc, and add the first point to the result list
-    		Point lastPoint = null; // last point in bendpoint approximation    		
-    		switch (cornerCase) {
-    		case 1:
-    		case 4:
-    		case 6:
-    		case 7:
-    			newPoints.addPoint(new Point(x1, q));
-    			lastPoint = new Point(p, y1);
-    			break;
-    		default:
-    			newPoints.addPoint(new Point(p, y1));
-    			lastPoint = new Point(x1, q);
-    			break;    			
-    		}
-    		// Find out if x will be decreasing or increasing while calculating approximation points.
-    		int incrementSign = 1;
-    		switch (cornerCase) {
-    		case 2:
-    		case 4:
-    		case 5:
-    		case 7:
-    			incrementSign = -1;
-    			break;
-    		}
-    		// If arcs need to be approximated: for given x find y so that (x, y)
-    		// is on the arc
-    		if (calculateAppoxPoints) {    	
-    			int x = newPoints.getLastPoint().x;
-    			int rSq = r*r; 
-    			int increment = incrementSign * r / DEFAULT_CORNER_APPROXIMATION_PTS;
-    			int nrOfIncrement = DEFAULT_CORNER_APPROXIMATION_PTS;
-    			if (increment == 0) {
-    				increment = incrementSign * 1;
-    				nrOfIncrement = r;
-    			}
-    			for (int j = 1; j < nrOfIncrement; j++) {
-    				x += increment;
-    				// calculate y with given x so that (x, y) is on the arc    			
-    				int y = (int) (q + sign*Math.sqrt(rSq - (x - p)*(x - p)));
-    				newPoints.addPoint(new Point(x, y));
-    			}
-    		}
-    		// Add the last point to the result list
-    		newPoints.addPoint(lastPoint);
-    	}
-    	newPoints.addPoint(points.getLastPoint());
-    	return newPoints;
-    }
-    
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PrecisionPointList.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PrecisionPointList.java
deleted file mode 100644
index b885f54..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PrecisionPointList.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Class implementing a list of <code>PrecisionPoint</code> similarly to
- * <code>PointList</code> class.
- * 
- * @author aboyko
- *
- */
-public class PrecisionPointList extends PointList {
-
-	private double[] points = new double[0];
-	private PrecisionRectangle bounds;
-	private int size = 0;
-
-	static final long serialVersionUID = 1;
-
-	/** 
-	 * Constructs an empty PrecisionPointList.
-	 */
-	public PrecisionPointList() { }
-
-	/**
-	 * Constructs a PointList with the given points.
-	 * @param points double array where two consecutive double form the coordinates of a point
-	 */
-	public PrecisionPointList(double points[]) {
-		this.points = points;
-		this.size = points.length / 2;
-	}
-
-	/** 
-	 * Constructs a PrecisionPointList with initial capacity <i>size</i>, but no points.
-	 * 
-	 * @param size  Number of points to hold.
-	 */
-	public PrecisionPointList(int size) {
-		points = new double[size * 2];
-	}
-	
-	public PrecisionPointList(PointList pointList) {
-		this();
-		addAll(pointList);
-	}
-
-	/**
-	 * Appends all of the given points to this PrecisionPointList.
-	 * @param source the source PrecisionPointlist
-	 */
-	public void addAll(PrecisionPointList source) {
-		ensureCapacity(size + source.size);
-		System.arraycopy(source.points, 0, points, size * 2, source.size * 2);
-		size += source.size;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#addAll(org.eclipse.draw2d.geometry.PointList)
-	 */
-	public void addAll(PointList source) {
-		if (source instanceof PrecisionPointList) {
-			addAll((PrecisionPointList)source);
-		}
-		ensureCapacity(size + source.size());
-		for (int i = 0; i < source.size(); i++) {
-			addPoint(source.getPoint(i));
-		}
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#addPoint(org.eclipse.draw2d.geometry.Point)
-	 */
-	public void addPoint(Point p) {
-		if (p instanceof PrecisionPoint) {
-			PrecisionPoint precisionPt = (PrecisionPoint)p;
-			addPrecisionPoint(precisionPt.preciseX, precisionPt.preciseY);
-		} else {
-			addPrecisionPoint(p.preciseX(), p.preciseY());
-		}
-	}
-	
-	/** 
-	 * Adds the input point values to this PointList.
-	 * @param x  X value of a point to add
-	 * @param y  Y value of a point to add
-	 */
-	public void addPrecisionPoint(double x, double y) {
-		bounds = null;
-		int index = size * 2;
-		ensureCapacity(size + 1);
-		points[index] = x;
-		points[index + 1] = y;
-		size++;
-	}
-
-	private void ensureCapacity(int newSize) {
-		newSize *= 2;
-		if (points.length < newSize) {
-			double old[] = points;
-			points = new double[Math.max(newSize, size * 4)];
-			System.arraycopy(old, 0, points, 0, size * 2);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getBounds()
-	 */
-	public Rectangle getBounds() {
-		if (bounds != null)
-			return bounds;
-		bounds = new PrecisionRectangle();
-		if (size > 0) {
-			bounds.setLocation(getPoint(0));
-			for (int i = 0; i < size; i++) {
-				PrecisionPoint p = (PrecisionPoint)getPoint(i);
-				bounds.union(p);
-			}
-		}
-		return bounds;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getCopy()
-	 */
-	public PrecisionPointList getCopy() {
-		PrecisionPointList result = new PrecisionPointList(size);
-		System.arraycopy(points, 0, result.points, 0, size * 2);
-		result.size = size;
-		result.bounds = null;
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getLastPoint()
-	 */
-	public Point getLastPoint() {
-		return getPoint(size - 1);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getMidpoint()
-	 */
-	public Point getMidpoint() {
-		if (size() % 2 == 0)
-			return getPoint(size() / 2 - 1).
-				getTranslated(getPoint(size() / 2)).
-				scale(0.5f);
-		return getPoint(size() / 2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getPoint(int)
-	 */
-	public Point getPoint(int index) {
-		if (index < 0 || index >= size)
-		    throw new IndexOutOfBoundsException(
-		    	"Index: " + index + //$NON-NLS-1$
-		    	", Size: " + size); //$NON-NLS-1$
-		index *= 2;
-		return new PrecisionPoint(points[index], points[index + 1]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#getPoint(org.eclipse.draw2d.geometry.Point, int)
-	 */
-	public Point getPoint(Point p, int index) {
-		if (index < 0 || index >= size)
-		    throw new IndexOutOfBoundsException(
-		    	"Index: " + index + //$NON-NLS-1$
-		    	", Size: " + size); //$NON-NLS-1$
-		index *= 2;
-		if (p instanceof PrecisionPoint) {
-			PrecisionPoint preciseP = (PrecisionPoint) p;
-			preciseP.preciseX = points[index];
-			preciseP.preciseY = points[index + 1];
-			preciseP.updateInts();
-		} else {
-			p.x = (int)Math.floor(points[index] + 0.000000001);
-			p.y = (int)Math.floor(points[index + 1] + 0.000000001);
-		}
-		return p;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#insertPoint(org.eclipse.draw2d.geometry.Point, int)
-	 */
-	public void insertPoint(Point p, int index) {
-		if (bounds != null && !bounds.contains(p))
-			bounds = null;
-		if (index > size || index < 0)
-		    throw new IndexOutOfBoundsException(
-		    	"Index: " + index + //$NON-NLS-1$
-		    	", Size: " + size); //$NON-NLS-1$
-		index *= 2;
-
-		int length = points.length;
-		double old[] = points;
-		points = new double[length + 2];
-		System.arraycopy(old, 0, points, 0, index);
-		System.arraycopy(old, index, points, index + 2, length - index);
-		
-		if (p instanceof PrecisionPoint) {
-			PrecisionPoint precisionPt = (PrecisionPoint)p;
-			points[index] = precisionPt.preciseX;
-			points[index + 1] = precisionPt.preciseY;
-		} else {
-			points[index] = p.x;
-			points[index + 1] = p.y;
-		}
-		size++;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#performScale(double)
-	 */
-	public void performScale(double factor) {
-		for (int i = 0; i < points.length; i++)
-			points[i] = points[i] * factor;
-		bounds = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#performTranslate(int, int)
-	 */
-	public void performTranslate(int dx, int dy) {
-		for (int i = 0; i < size * 2; i += 2) {
-			points[i] += dx;
-			points[i + 1] += dy;
-		}
-		if (bounds != null)
-			bounds.translate(dx, dy);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#removeAllPoints()
-	 */
-	public void removeAllPoints() {
-		bounds = null;
-		size = 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#removePoint(int)
-	 */
-	public Point removePoint(int index) {
-		bounds = null;
-		if (index < 0 || index >= size)
-		    throw new IndexOutOfBoundsException(
-		    	"Index: " + index + //$NON-NLS-1$
-		    	", Size: " + size); //$NON-NLS-1$
-			
-		index *= 2;
-		PrecisionPoint pt = new PrecisionPoint(points[index], points[index + 1]);
-		if (index != size * 2 - 2)
-			System.arraycopy(points, index + 2, points, index, size * 2 - index - 2);
-		size--;
-		return pt;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#reverse()
-	 */
-	public void reverse() {
-		double temp;
-		for (int i = 0, j = size * 2 - 2; i < size; i += 2 , j -= 2) {
-			temp = points[i];
-			points[i] = points[j];
-			points[j] = temp;
-			temp = points[i + 1];
-			points[i + 1] = points[j + 1];
-			points[j + 1] = temp;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#setPoint(org.eclipse.draw2d.geometry.Point, int)
-	 */
-	public void setPoint(Point pt, int index) {
-		if (index < 0 || index >= size)
-		    throw new IndexOutOfBoundsException(
-		    	"Index: " + index + //$NON-NLS-1$
-		    	", Size: " + size); //$NON-NLS-1$
-		if (bounds != null && !bounds.contains(pt))
-			bounds = null;
-		if (pt instanceof PrecisionPoint) {
-			PrecisionPoint precisionPt = (PrecisionPoint)pt;
-			points[index * 2] = precisionPt.preciseX;
-			points[index * 2 + 1] = precisionPt.preciseY;
-		} else {
-			points[index * 2] = pt.x;
-			points[index * 2 + 1] = pt.y;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#setSize(int)
-	 */
-	public void setSize(int newSize) {
-		if (points.length > newSize * 2) {
-			size = newSize;
-			return;
-		}
-		double[] newArray = new double[newSize * 2];
-		System.arraycopy(points, 0, newArray, 0, points.length);
-		points = newArray;
-		size = newSize;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#size()
-	 */
-	public int size() {
-		return size;
-	}
-
-	/** 
-	 * Returns the contents of this PrecisionPointList as a double array.  The returned array is by
-	 * reference.  Any changes made to the array will also be changing the original PrecisionPointList.
-	 * 
-	 * @return the integer array of points by reference
-	 */
-	public double[] toDoubleArray() {
-		if (points.length != size * 2) {
-			double[] old = points;
-			points = new double[size * 2];
-			System.arraycopy(old, 0, points, 0, size * 2);
-		}
-		return points;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#toIntArray()
-	 */
-	public int[] toIntArray() {
-		int [] intArray = new int[size * 2];
-		for (int i = 0; i < size(); i++) {
-			Point p = getPoint(i);
-			int idx = 2*i;
-			intArray[idx] = p.x;
-			intArray[idx + 1] = p.y;
-		}
-		return intArray;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#translate(int, int)
-	 */
-	public void translate(int x, int y) {
-		if (x == 0 && y == 0)
-			return;
-		if (bounds != null)
-			bounds.translate(x, y);
-		for (int i = 0; i < size * 2; i += 2) {
-			points[i] += x;
-			points[i + 1] += y;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.geometry.PointList#transpose()
-	 */
-	public void transpose() {
-		double temp;
-		if (bounds != null)
-			bounds.transpose();
-		for (int i = 0; i < size * 2; i += 2) {
-			temp = points[i];
-			points[i] = points[i + 1];
-			points[i + 1] = temp;
-		}
-	}
-	
-}
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/graph/BorderNode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/BorderNode.java
deleted file mode 100644
index cd28aea..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/BorderNode.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-
-/**
- * Implementation of node that will be laid out by <code>GMFDirectedGraphLayout</code> as a node
- * attached to the border of it's parent node.
- * 
- * @author aboyko
- * @since 2.1
- */
-public class BorderNode extends ConstantSizeNode {
-	
-	/**
-	 * Describes how the border node is attached to the parent node. The outside
-	 * ratio is a value between 0 and 1 representing the percentage of the
-	 * border item that appears outside of the parent node.
-	 */
-	private float outsideRatio = 0.5f;
-	
-	JointIncomingEdges incomingJointEdges = new JointIncomingEdges(this);
-	JointOutgoingEdges outgoingJointEdges = new JointOutgoingEdges(this);
-	
-	ConstantSizeNode borderNodeParent;
-	
-	int position = PositionConstants.NONE;
-	
-	/**
-	 * Creates an instance of a border node given its data and parent
-	 * @param data data
-	 * @param parentNode the parent node of the border node
-	 */
-	public BorderNode(Object data, ConstantSizeNode parentNode) {
-		super(data);
-		this.borderNodeParent = parentNode;
-		borderNodeParent.borderNodes.add(this);
-		incomingJointEdges.target = borderNodeParent;
-		outgoingJointEdges.source = borderNodeParent;
-		width = 10;
-		height = 10;
-	}
-	
-	void setPoint(Point p) {
-		if (p.x == borderNodeParent.x) {
-			position = PositionConstants.WEST;
-			x =  p.x - (int) (width * outsideRatio);
-			y = p.y - height / 2;
-		} else if (p.y == borderNodeParent.y) {
-			position = PositionConstants.NORTH;
-			x = p.x - width  / 2;
-			y = p.y - (int) (height * outsideRatio);
-		} else if (p.x == borderNodeParent.x + borderNodeParent.width) {
-			position = PositionConstants.EAST;
-			x =  p.x - (int) (width * (1 - outsideRatio));
-			y = p.y - height / 2;
-		} else {
-			position = PositionConstants.SOUTH;
-			x = p.x - width  / 2;
-			y = p.y - (int) (height *  (1 - outsideRatio));
-		}
-	}
-
-	void addIncomingEdge(ConstrainedEdge e) {
-		incomingJointEdges.edges.add(e);
-		e.target = borderNodeParent; 
-	}
-	
-	void addOutgoingEdge(ConstrainedEdge e) {
-		outgoingJointEdges.edges.add(e);
-		e.source = borderNodeParent;
-	}
-	
-	Point getEdgesDefaultEndPoint() {
-		if (position == PositionConstants.WEST) {
-			return new Point(x, y + height / 2);
-		} else if (position == PositionConstants.NORTH) {
-			return new Point(x + width / 2, y);
-		} else if (position == PositionConstants.EAST) {
-			return new Point(x + width, y + height / 2);
-		} else {
-			return new Point(x + width / 2, y + height);
-		}
-	}
-
-	/**
-	 * Gets the outside of parent ratio value. The outside ratio is a value
-	 * between 0 and 1 representing the percentage of the border item that
-	 * appears outside of the parent node.
-	 * 
-	 * @return the value
-	 * @since 2.1
-	 */
-	public float getOutsideRatio() {
-		return outsideRatio;
-	}
-
-	/**
-	 * Sets the outside parent ratio value. The outside ratio is a value between
-	 * 0 and 1 representing the percentage of the border item that appears
-	 * outside of the parent node.
-	 * 
-	 * @param outsideRatio
-	 * @since 2.1
-	 */
-	public void setOutsideRatio(float outsideRatio) {
-		if (outsideRatio < 0f || outsideRatio > 1f) {
-			throw new IllegalArgumentException("Ratio must be between 0 and 1 inclusively"); //$NON-NLS-1$
-		}
-		this.outsideRatio = outsideRatio;
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/CleanupBorderNodeEdges.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/CleanupBorderNodeEdges.java
deleted file mode 100644
index 026a42a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/CleanupBorderNodeEdges.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-
-/**
- * Cleans up data associated with border nodes. Edges, at least one of the ends of which is a border node
- * have border nodes replaced by their parents during the layout. This graph modification procedure assigns
- * border node(s) back to edges source and/or targets where appropriate.
- * 
- * @author aboyko
- * @since 2.1
- */
-class CleanupBorderNodeEdges {
-	
-	private DirectedGraph g;
-	
-	public CleanupBorderNodeEdges(DirectedGraph g) {
-		this.g = g;
-	}
-	
-	void cleanup() {
-		for (int i = 0; i < g.edges.size(); i++) {
-			Edge e = g.edges.getEdge(i);
-			if (e instanceof ConstrainedEdge) {
-				ConstrainedEdge ce = (ConstrainedEdge) e;
-				if (ce.sourceConstraint != null) {
-					ce.source = ce.sourceConstraint;
-				}
-				if (ce.targetConstraint != null) {
-					ce.target = ce.targetConstraint;
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstantSizeNode.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstantSizeNode.java
deleted file mode 100644
index 21e3594..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstantSizeNode.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.Subgraph;
-
-/**
- * The node the size of which will not be modified by the layout algorithm. The node also has the support for:
- * <li> Border nodes
- * <li> Padding of incomimg and outgoing edges end points
- * 
- * @author aboyko
- * @since 2.1
- */
-public class ConstantSizeNode extends Node {
-	
-	int minIncomingPadding = 0;
-	int minOutgoingPadding = 0;
-	
-	int constantWidth;
-	int constantHeight;
-	
-	/**
-	 * List of border nodes owned by this node. The list should be modified manually.
-	 * Use the border node constructor instead - it will updates parent's list of border nodes automatically.
-	 * @since 2.1
-	 */
-	public List<BorderNode> borderNodes = new ArrayList<BorderNode>();
-
-	/**
-	 * Constructs the instance of the class
-	 * @since 2.1
-	 */
-	public ConstantSizeNode() {
-		super();
-	}
-
-	/**
-	 * Constructs a node with the given data object
-	 * @param data an arbitrary data object
-	 * @since 2.1
-	 */
-	public ConstantSizeNode(Object data) {
-		super(data);
-	}
-	
-	/**
-	 * Constructs a node attached to the parent subgraph  
-	 * @param data data
-	 * @param parent subgraph parent
-	 * @since 2.1
-	 */
-	public ConstantSizeNode(Object data, Subgraph parent) {
-		super(data, parent);
-	}
-
-	/**
-	 * Gets the minimal padding between the end points of incoming edges
-	 * @return the padding value
-	 * @since 2.1
-	 */
-	public int getMinIncomingPadding() {
-		return minIncomingPadding;
-	}
-
-	/**
-	 * Sets the minimal padding between the end points of incoming edges.
-	 * @param minIncomingPadding
-	 * @since 2.1
-	 */
-	public void setMinIncomingPadding(int minIncomingPadding) {
-		this.minIncomingPadding = minIncomingPadding;
-	}
-
-	/**
-	 * Gets the minimal padding between the start points of outgoing edges
-	 * @return the padding
-	 * @since 2.1
-	 */
-	public int getMinOutgoingPadding() {
-		return minOutgoingPadding;
-	}
-
-	/**
-	 * Sets the minimal padding between the start points of outgoing edges
-	 * @param minOutgoingPadding
-	 * @since 2.1
-	 */
-	public void setMinOutgoingPadding(int minOutgoingPadding) {
-		this.minOutgoingPadding = minOutgoingPadding;
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstrainedEdge.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstrainedEdge.java
deleted file mode 100644
index f89d435..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/ConstrainedEdge.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * Implementation of Edge that:
- * <li> Can connect border node(s)
- * <li> Can be routed obliquely or orthogonally
- * 
- * @author aboyko
- * @since 2.1
- */
-public class ConstrainedEdge extends Edge {
-	
-	public static String DEFAULT_ROUTING_STYLE = "Default"; //$NON-NLS-1$
-	public static String ORTHOGONAL_ROUTING_STYLE = "Orthogonal"; //$NON-NLS-1$
-	
-	private String style = DEFAULT_ROUTING_STYLE;
-	
-	BorderNode sourceConstraint = null;
-	BorderNode targetConstraint = null;
-	
-	PointList startingRoutedPoints = new PointList();
-	PointList endingRoutedPoints = new PointList();
-
-	/**
-	 * Constructs a new edge with the given source and target nodes.  All other fields will
-	 * have their default values.
-	 * @param source the source Node
-	 * @param target the target Node
-	 * @since 2.1
-	 */
-	public ConstrainedEdge(Node source, Node target) {
-		this(null, source, target);
-	}
-	
-	/**
-	 * Constructs a new edge with the given source, target, delta, and weight.
-	 * @param source the source Node
-	 * @param target the target Node
-	 * @param delta the minimum edge span
-	 * @param weight the weight hint
-	 * @since 2.1
-	 */
-	public ConstrainedEdge(Node source, Node target, int delta, int weight) {
-		this(source, target);
-		this.delta = delta;
-		this.weight = weight;
-	}
-
-	/**
-	 * Constructs a new edge with the given data object, source, and target node.
-	 * @param data an arbitrary data object
-	 * @param source the source node
-	 * @param target the target node
-	 * @since 2.1
-	 */
-	public ConstrainedEdge(Object data, Node source, Node target) {
-		super(data, source, target);
-		if (source instanceof BorderNode) {
-			sourceConstraint = (BorderNode)source;
-			this.source = sourceConstraint.borderNodeParent;
-			this.source.outgoing.add(this);
-			sourceConstraint.addOutgoingEdge(this);
-		}
-		if (target instanceof BorderNode) {
-			targetConstraint = (BorderNode)target;
-			this.target = targetConstraint.borderNodeParent;
-			this.target.incoming.add(this);
-			targetConstraint.addIncomingEdge(this);
-		}
-		if (this.source.equals(this.target)) {
-			throw new RuntimeException("Edges between border nodes on the same parent or border node and its parent are disallowed."); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Gets the routing style for the edge 
-	 * @return the style constant
-	 * @since 2.1
-	 */
-	public String getStyle() {
-		return style;
-	}
-
-	/**
-	 * Sets the routing style for the edge (orthogonal or default)
-	 * @param style the style constant
-	 * @since 2.1
-	 */
-	public void setStyle(String style) {
-		this.style = style;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.graph.Edge#invert()
-	 */
-	public void invert() {
-		super.invert();
-		
-		if (sourceConstraint != null) {
-			sourceConstraint.outgoingJointEdges.edges.remove(this);
-		}
-		if (targetConstraint != null) {
-			targetConstraint.incomingJointEdges.edges.remove(this);
-		}
-		
-		BorderNode temp = sourceConstraint;
-		sourceConstraint = targetConstraint;
-		targetConstraint = temp;
-		
-		if (sourceConstraint != null) {
-			sourceConstraint.outgoingJointEdges.edges.add(this);
-		}
-		if (targetConstraint != null) {
-			targetConstraint.incomingJointEdges.edges.add(this);
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgeEndPointsAssignment.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgeEndPointsAssignment.java
deleted file mode 100644
index 913a8fb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgeEndPointsAssignment.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * Assigns the locations to edges end points as well as lays out border nodes
- * 
- * @author aboyko
- * @since 2.1
- */
-class EdgeEndPointsAssignment {
-	
-	private DirectedGraph graph;
-	
-	public EdgeEndPointsAssignment(DirectedGraph g) {
-		this.graph = g;
-	}	
-	
-	void assignEdgesEndPoints() {
-		for (int i = 0; i < graph.edges.size(); i++) {
-			Edge e = graph.edges.getEdge(i);
-			e.start = null;
-			e.end = null;
-		}
-		
-		Collections.sort(graph.nodes, new Comparator<Node>() {
-			public int compare(Node arg0, Node arg1) {
-				return arg0.width - arg1.width;
-			}
-		});
-		
-		for (int i = 0; i < graph.nodes.size(); i++) {
-			Node node = graph.nodes.getNode(i);
-			assignEndPointsForEdgesFromNode(node);
-		}
-	}
-	
-	private void assignEndPointsForEdgesFromNode(Node node) {
-		EdgeList incoming = new EdgeList(), outgoing = new EdgeList();
-		List<BorderNode> specialBorderNodes = new ArrayList<BorderNode>();
-		if (node instanceof ConstantSizeNode) {
-			initEdgesSets((ConstantSizeNode)node, incoming, outgoing, specialBorderNodes);
-		} else {
-			incoming = node.incoming;
-			outgoing = node.outgoing;
-		}
-		
-		if (node instanceof ConstantSizeNode && ((ConstantSizeNode)node).minIncomingPadding > 0) {
-			assignEdgesEndPoints(incoming, (ConstantSizeNode) node, true);
-		} else {
-			for (int i = 0; i < incoming.size(); i++) {
-				setEndPoint(incoming.getEdge(i), new Point(node.x + node.getOffsetIncoming(), node.y));
-			}
-		}
-		
-		if (node instanceof ConstantSizeNode && ((ConstantSizeNode)node).minOutgoingPadding > 0) {
-			assignEdgesEndPoints(outgoing, (ConstantSizeNode) node, false);
-		} else {
-			for (int i = 0; i < outgoing.size(); i++) {
-				setStartPoint(outgoing.getEdge(i), new Point(node.x + node.getOffsetOutgoing(), node.y + node.height));
-			}
-		}
-		
-		if (node instanceof ConstantSizeNode) {
-			assignEndPointsForJointEdgeWithIncomingAndOutgoingEdges((ConstantSizeNode)node, specialBorderNodes);
-		}
-	}
-	
-	private void initEdgesSets(ConstantSizeNode n, EdgeList incoming, EdgeList outgoing, List<BorderNode> specialBorderNodes) {
-		for (int i = 0; i < n.outgoing.size(); i++) {
-			Edge e = n.outgoing.getEdge(i);
-			if (e instanceof ConstrainedEdge) {
-				ConstrainedEdge ce = (ConstrainedEdge) e;
-				if (ce.sourceConstraint != null) {
-					continue;
-				}
-			}
-			outgoing.add(e);
-		}
-		
-		for (int i = 0;  i < n.incoming.size(); i++) {
-			Edge e = n.incoming.getEdge(i);
-			if (e instanceof ConstrainedEdge) {
-				ConstrainedEdge ce = (ConstrainedEdge) e;
-				if (ce.targetConstraint != null) {
-					continue;
-				}
-			}
-			incoming.add(e);
-		}
-		
-		for (Iterator<BorderNode> itr = n.borderNodes.iterator(); itr.hasNext();) {
-			BorderNode borderNode = itr.next();
-			if (!(borderNode.incomingJointEdges.edges.isEmpty() ^ borderNode.outgoingJointEdges.edges.isEmpty())) {
-				specialBorderNodes.add(borderNode);
-			} else if (borderNode.incomingJointEdges.edges.isEmpty()) {
-				outgoing.add(borderNode.outgoingJointEdges);
-			} else {
-				incoming.add(borderNode.incomingJointEdges);
-			}
-		}
-		
-		Collections.sort(incoming, new Comparator<Edge>() {
-			public int compare(Edge e1, Edge e2) {
-				return GraphUtilities.getIncomingEdgeBendpointX(e1, graph) - GraphUtilities.getIncomingEdgeBendpointX(e2, graph);
-			}
-		});
-		
-		Collections.sort(outgoing, new Comparator<Edge>() {
-			public int compare(Edge e1, Edge e2) {
-				return GraphUtilities.getOutogingEdgeBendpointX(e1, graph) - GraphUtilities.getOutogingEdgeBendpointX(e2, graph);
-			}
-		});
-	}
-
-	private void assignEdgesEndPoints(EdgeList edges, ConstantSizeNode n, boolean end) {
-		int leftIndex;
-		int rightIndex;
-		int padding = end ? n.minIncomingPadding : n.minOutgoingPadding;
-		int leftX = n.x;
-		int rightX = n.x + n.width;
-		int leftBendpointX = 0;
-		int rightBendpointX = 0;
-		for (leftIndex = 0; leftIndex < edges.size(); leftIndex++) {
-			Edge e = edges.getEdge(leftIndex);
-			leftBendpointX = end ? GraphUtilities.getIncomingEdgeBendpointX(e, graph) : GraphUtilities.getOutogingEdgeBendpointX(e, graph);			
-			if (leftX < leftBendpointX && leftBendpointX < rightX && (float)(leftBendpointX - leftX)/(leftIndex + 1) >= padding) {
-				break;
-			}
-		}
-		for (rightIndex = edges.size() - 1; rightIndex >= leftIndex; rightIndex--) {
-			Edge e = edges.getEdge(rightIndex);
-			rightBendpointX = end ? GraphUtilities.getIncomingEdgeBendpointX(e, graph) : GraphUtilities.getOutogingEdgeBendpointX(e, graph);			
-			if (leftX < rightBendpointX && rightBendpointX < rightX && (float)(rightX - rightBendpointX)/(edges.size() - rightIndex) >= padding) {
-				break;
-			}
-		}
-		
-		int y = end ? n.y : n.y + n.height;
-		if (rightIndex >= leftIndex) {
-			uniformlyPadEdges(edges, 0, leftIndex, new Point(leftX, y), new Point(leftBendpointX, y), end);
-			uniformlyPadEdges(edges, rightIndex + 1, edges.size(), new Point(rightBendpointX, y), new Point(rightX, y), end);
-			makeStraight(edges, leftIndex, rightIndex + 1, end);
-		} else {
-			uniformlyPadEdges(edges, 0, edges.size(), new Point(leftX, y), new Point(rightX, y), end);
-		}
-	}
-	
-	private void uniformlyPadEdges(List edges, int startIndex, int endIndex, Point startPoint, Point endPoint, boolean end) {
-		Dimension diff = endPoint.getDifference(startPoint);
-		int numPieces = endIndex - startIndex + 1;
-		for (int i = startIndex; i < endIndex; i++) {
-			Edge e = (Edge) edges.get(i);
-			float coefficient = (float) (i - startIndex + 1) / numPieces;
-			Point p = startPoint.getCopy().translate(diff.getCopy().scale(coefficient));
-			if (end) {
-				setEndPoint(e, p);
-			} else {
-				setStartPoint(e, p);
-			}
-		}
-	}
-	
-	private void makeStraight(EdgeList edges, int startIndex, int endIndex, boolean end) {
-		for (int i = startIndex; i < endIndex; i++) {
-			Edge e = edges.getEdge(i);
-			int y = end ? e.target.y : e.source.y + e.source.height;
-			if (e instanceof ConstrainedEdge) {
-				ConstrainedEdge ce = (ConstrainedEdge) e;
-				if (end && ce.targetConstraint != null) {
-					y = ce.targetConstraint.y;
-				} else if (!end && ce.sourceConstraint != null) {
-					y = ce.sourceConstraint.y + ce.sourceConstraint.height;
-				}
-			}
-			if (end) {
-				setEndPoint(e, new Point(GraphUtilities.getIncomingEdgeBendpointX(e, graph), y));
-			} else {
-				setStartPoint(e, new Point(GraphUtilities.getOutogingEdgeBendpointX(e, graph), y));
-			}
-		}
-	}
-	
-	private void setStartPoint(Edge e, Point p) {
-		if (e instanceof JointEdges) {
-			JointEdges je = (JointEdges) e;
-			je.getJoint().setPoint(p);
-			assignEndPointsForEdgesFromBorderNode(je.getJoint());
-		} else {
-			if (p == null) {
-				if (e instanceof ConstrainedEdge && ((ConstrainedEdge) e).sourceConstraint != null) {
-					p = ((ConstrainedEdge) e).sourceConstraint.getEdgesDefaultEndPoint();
-				} else {
-					p = new Point(e.source.x + e.source.getOffsetOutgoing(), e.source.y + e.source.height);
-				}
-			}
-			e.start = p;
-		}
-	}
-	
-	private void setEndPoint(Edge e, Point p) {
-		if (e instanceof JointEdges) {
-			JointEdges je = (JointEdges) e;
-			je.getJoint().setPoint(p);
-			assignEndPointsForEdgesFromBorderNode(je.getJoint());
-		} else {
-			if (p == null) {
-				if (e instanceof ConstrainedEdge && ((ConstrainedEdge) e).targetConstraint != null) {
-					p = ((ConstrainedEdge) e).targetConstraint.getEdgesDefaultEndPoint();
-				} else {
-					p = new Point(e.target.x + e.target.getOffsetIncoming(), e.target.y);
-				}
-			}
-			e.end = p;
-		}
-	}
-	
-	private void assignEndPointsForJointEdgeWithIncomingAndOutgoingEdges(ConstantSizeNode node, List<BorderNode> specialBorderNodes) {
-		Collections.sort(specialBorderNodes, new Comparator<BorderNode>() {
-			public int compare(BorderNode bn1, BorderNode bn2) {
-				return bn1.incomingJointEdges.edges.size() + bn1.outgoingJointEdges.edges.size() - bn2.incomingJointEdges.edges.size() - bn2.outgoingJointEdges.edges.size(); 
-			}
-		});
-		
-		List<BorderNode> leftSideBorderNodes = new ArrayList<BorderNode>(specialBorderNodes.size() / 2 + 1);
-		List<BorderNode> rightSideBorderNodes = new ArrayList<BorderNode>(specialBorderNodes.size() / 2 + 1);
-		
-		for (Iterator<BorderNode> itr = specialBorderNodes.iterator(); itr.hasNext();) {
-			leftSideBorderNodes.add(itr.next());
-			itr.remove();
-			if (itr.hasNext()) {
-				rightSideBorderNodes.add(itr.next());
-				itr.remove();
-			}
-		}
-		
-		Collections.sort(leftSideBorderNodes, new Comparator<BorderNode>() {
-			public int compare(BorderNode bn1, BorderNode bn2) {
-				return bn1.outgoingJointEdges.edges.size() - bn1.incomingJointEdges.edges.size() - (bn2.outgoingJointEdges.edges.size() - bn2.incomingJointEdges.edges.size());
-			}		
-		});
-		Collections.sort(rightSideBorderNodes, new Comparator<BorderNode>() {
-			public int compare(BorderNode bn1, BorderNode bn2) {
-				return bn1.outgoingJointEdges.edges.size() - bn1.incomingJointEdges.edges.size() - (bn2.outgoingJointEdges.edges.size() - bn2.incomingJointEdges.edges.size());
-			}		
-		});
-		
-		uniformlyPadBorderNodes(leftSideBorderNodes, 0, leftSideBorderNodes.size(), new Point(node.x, node.y), new Point(node.x, node.y + node.height));
-		uniformlyPadBorderNodes(rightSideBorderNodes, 0, rightSideBorderNodes.size(), new Point(node.x + node.width, node.y), new Point(node.x + node.width, node.y + node.height));
-		
-		for (Iterator<BorderNode> itr = leftSideBorderNodes.iterator(); itr.hasNext();) {
-			BorderNode bn = itr.next();
-			if (!bn.incomingJointEdges.edges.isEmpty() || !bn.outgoingJointEdges.edges.isEmpty()) {
-				assignEndPointsForEdgesFromBorderNode(bn);
-			}
-		}
-		for (Iterator<BorderNode> itr = rightSideBorderNodes.iterator(); itr.hasNext();) {
-			BorderNode bn = itr.next();
-			if (!bn.incomingJointEdges.edges.isEmpty() || !bn.outgoingJointEdges.edges.isEmpty()) {
-				assignEndPointsForEdgesFromBorderNode(bn);
-			}
-		}		
-	}
-	
-	private void uniformlyPadBorderNodes(List<BorderNode> borderNodes, int startIndex, int endIndex, Point startPoint, Point endPoint) {
-		Dimension diff = endPoint.getDifference(startPoint);
-		int numPieces = endIndex - startIndex + 1;
-		for (int i = startIndex; i < endIndex; i++) {
-			float coefficient = (float) (i - startIndex + 1) / numPieces;
-			Point p = startPoint.getCopy().translate(diff.getCopy().scale(coefficient));
-			borderNodes.get(i).setPoint(p);
-		}
-		
-	}
-	
-	private void assignEndPointsForEdgesFromBorderNode(BorderNode node) {
-		Collections.sort(node.incomingJointEdges.edges, new Comparator<Edge>() {
-			public int compare(Edge e1, Edge e2) {
-				return GraphUtilities.getIncomingEdgeBendpointX(e1, graph) - GraphUtilities.getIncomingEdgeBendpointX(e2, graph);				}
-		});
-		Collections.sort(node.outgoingJointEdges.edges, new Comparator<Edge>() {
-			public int compare(Edge e1, Edge e2) {
-				return GraphUtilities.getOutogingEdgeBendpointX(e1, graph) - GraphUtilities.getOutogingEdgeBendpointX(e2, graph);				}
-		});
-		if (node.minIncomingPadding > 0 || node.minOutgoingPadding > 0) {
-			if (node.position == PositionConstants.NORTH) {
-				assignEdgesEndPoints(node.incomingJointEdges.edges, node, true);
-			} else if (node.position == PositionConstants.SOUTH) {
-				assignEdgesEndPoints(node.outgoingJointEdges.edges, node, false);
-			} else {
-				Point incomingStartPt, incomingEndPt, outgoingStartPt, outgoingEndPt;
-				if (node.position == PositionConstants.WEST) {
-					incomingStartPt = new Point(node.x, node.y + (node.incomingJointEdges.edges.size() + 1) * node.height / (node.incomingJointEdges.edges.size() + node.outgoingJointEdges.edges.size() + 1));
-					incomingEndPt = new Point(node.x, node.y);
-					outgoingStartPt = new Point(node.x, node.y + node.incomingJointEdges.edges.size() * node.height / (node.incomingJointEdges.edges.size() + node.outgoingJointEdges.edges.size() + 1));
-					outgoingEndPt = new Point(node.x, node.y + node.height);
-				} else {
-					incomingStartPt = new Point(node.x + node.width, node.y);
-					incomingEndPt = new Point(node.x + node.width, node.y + (node.incomingJointEdges.edges.size() + 1) * node.height / (node.incomingJointEdges.edges.size() + node.outgoingJointEdges.edges.size() + 1));
-					outgoingStartPt = new Point(node.x + node.width, node.y + node.height);
-					outgoingEndPt = new Point(node.x + node.width, node.y + node.incomingJointEdges.edges.size() * node.height / (node.incomingJointEdges.edges.size() + node.outgoingJointEdges.edges.size() + 1));
-				}
-				uniformlyPadEdges(node.incomingJointEdges.edges, 0, node.incomingJointEdges.edges.size(), incomingStartPt, incomingEndPt, true);
-				uniformlyPadEdges(node.outgoingJointEdges.edges, 0, node.outgoingJointEdges.edges.size(), outgoingStartPt, outgoingEndPt, false);	
-			}
-		} else {
-			Point defaultPt = node.getEdgesDefaultEndPoint();
-			for (int i = 0; i < node.incomingJointEdges.edges.size(); i++) {
-				setEndPoint(node.incomingJointEdges.edges.getEdge(i), defaultPt);
-			}
-			for (int i = 0; i < node.outgoingJointEdges.edges.size(); i++) {
-				setStartPoint(node.outgoingJointEdges.edges.getEdge(i), defaultPt);
-			}
-		}
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgesRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgesRouter.java
deleted file mode 100644
index 9ac1f6b..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/EdgesRouter.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.Path;
-import org.eclipse.draw2d.graph.ShortestPathRouter;
-
-/**
- * Routes the edges. Assumes edges have their end points preassigned.
- * Also, edges may have starting/ending routed points preassigned as well.
- * Edges are routed obliquely or orthogonally around the nodes.
- * 
- * @author aboyko
- * @since 2.1
- */
-class EdgesRouter {
-	
-	private DirectedGraph g;
-	private static int OBSTACLE_WIDTH = 10000;
-	
-	public EdgesRouter(DirectedGraph g) {
-		this.g = g;
-	}
-	
-	void routeEdges() {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			routeEdgesFromNode(g.nodes.getNode(i));
-		}
-	}
-	
-	private void routeEdgesFromNode(Node n) {		
-		/*
-		 * Gather default routed edges going right and left
-		 */
-		List<Edge> leftEdges = new ArrayList<Edge>();
-		List<Edge> rightEdges = new ArrayList<Edge>();
-		
-		int rankHeight = GraphUtilities.getRankHeightFromNode(n, g);
-		for (int i = 0; i < n.outgoing.size(); i++) {
-			Edge e = n.outgoing.getEdge(i);
-			if (shouldAccountForObstaclesInSourceRank(e, rankHeight)) {
-				Node guideNode = e.vNodes == null ? e.target : e.vNodes.getNode(0);
-				int diff = guideNode.x + guideNode.getOffsetIncoming() - e.source.x - e.source.getOffsetOutgoing(); 
-				if (n.getLeft() != null && diff < 0) {
-					leftEdges.add(e);
-				} else if (n.getRight() != null && diff > 0) {
-					rightEdges.add(e);
-				} else {
-					routeEdge(e, null);
-				}
-			} else {
-				routeEdge(e, null);
-			}
-		}
-		
-		/*
-		 * Sort left and right edges
-		 */
-		Collections.sort(leftEdges, new EdgeComparator(false));
-		Collections.sort(rightEdges, new EdgeComparator(true));
-		
-		routeLeftEdges(leftEdges, n);
-		routeRightEdges(rightEdges, n);
-	}
-	
-	private boolean shouldAccountForObstaclesInSourceRank(Edge e, int rankHeight) {
-		if (rankHeight == e.source.height) {
-			return false;
-		}
-		if (e instanceof ConstrainedEdge) {
-			ConstrainedEdge ce = (ConstrainedEdge) e;
-			if (ce.startingRoutedPoints.size() > 0) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private void routeEdge(Edge e, Rectangle extraObstacle) {
-		if (e instanceof ConstrainedEdge && ((ConstrainedEdge)e).getStyle().equals(ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE)) {
-			routeOrthogonalEdge((ConstrainedEdge) e);
-		} else {
-			routeDefaultEdge(e, extraObstacle);
-		}
-	}
-	
-	private void routeOrthogonalEdge(ConstrainedEdge edge) {
-		PointList points = new PointList();
-		if (edge.startingRoutedPoints.size() == 0) {
-			points.addPoint(edge.start);
-		} else {
-			points.addAll(edge.startingRoutedPoints);
-		}
-	    Node previousNode = edge.source;
-	    if (edge.vNodes != null) {
-	    	for (int i = 0; i < edge.vNodes.size(); i++) {
-	    		Node vNode = edge.vNodes.getNode(i);
-	    		int nextPtX = vNode.x + vNode.width / 2;
-	    		int prevPtX = points.getLastPoint().x;
-	    		if (prevPtX != nextPtX) {
-	        		int rankBottomY = previousNode.y + GraphUtilities.getRankHeightFromNode(previousNode, g);      		
-	    			int midY = rankBottomY + (vNode.y - rankBottomY) / 2;
-	    			points.addPoint(prevPtX, midY);
-	    			points.addPoint(nextPtX, midY);
-	    		}
-	    		previousNode = vNode;
-	    	}
-	    }
-	    Point prevPt = points.getLastPoint();
-	    Point lastPt = edge.endingRoutedPoints.size() == 0 ? edge.end : edge.endingRoutedPoints.getFirstPoint();
-	    if (prevPt.x != lastPt.x) {
-			int rankBottomY = previousNode.y + GraphUtilities.getRankHeightFromNode(previousNode, g);      		
-	    	int midY = rankBottomY + (lastPt.y - rankBottomY) / 2;
-	    	points.addPoint(prevPt.x, midY);
-	    	points.addPoint(lastPt.x, midY);
-	    }
-	    if (edge.endingRoutedPoints.size() > 0) {
-	    	points.addAll(edge.endingRoutedPoints);
-	    } else {
-	    	points.addPoint(edge.end);
-	    }
-	    edge.getPoints().removeAllPoints();
-	    edge.getPoints().addAll(points);
-	}
-	
-	private Point getPathStartPoint(Edge e) {
-		if (e instanceof ConstrainedEdge) {
-			ConstrainedEdge ce = (ConstrainedEdge) e;
-			if (ce.startingRoutedPoints.size() != 0) {
-				return ce.startingRoutedPoints.getLastPoint();
-			}
-		}
-		if (e.start == null) {
-			e.start = new Point(e.source.x + e.source.getOffsetOutgoing(), e.source.y + e.source.height);
-		}
-		return e.start;
-	}
-	
-	private Point getPathEndPoint(Edge e) {
-		if (e instanceof ConstrainedEdge) {
-			ConstrainedEdge ce = (ConstrainedEdge) e;
-			if (ce.endingRoutedPoints.size() != 0) {
-				return ce.endingRoutedPoints.getFirstPoint();
-			}
-		}
-		if (e.end == null) {
-			e.end = new Point(e.target.x + e.target.getOffsetIncoming(), e.target.y);
-		}
-		return e.end;
-	}
-	
-	private void routeDefaultEdge(Edge edge, Rectangle extraObstacle) {
-		ShortestPathRouter router = new ShortestPathRouter();
-		Path path = new Path(getPathStartPoint(edge), getPathEndPoint(edge));
-		router.addPath(path);
-		if (extraObstacle != null) {
-			router.addObstacle(extraObstacle);
-		}
-		if (edge.vNodes != null) {
-			for (int i = 0; i < edge.vNodes.size(); i++) {
-				Node node = edge.vNodes.getNode(i);
-				int rankHeight = GraphUtilities.getRankHeightFromNode(node, g);
-				if (node.getLeft() != null) {
-					int right = node.getLeft().x + node.getLeft().width + g.getPadding(node.getLeft()).right + edge.getPadding();
-					int width = Math.max(right, OBSTACLE_WIDTH);
-					int height = Math.max(rankHeight, 2);
-					router.addObstacle(new Rectangle(right - width, node.getLeft().y, width, height));
-				}
-				if (node.getRight() != null) { 
-					int left = node.getRight().x - g.getPadding(node.getRight()).left - edge.getPadding();
-					int width = Math.max(g.getLayoutSize().width - left, OBSTACLE_WIDTH);
-					int height = Math.max(rankHeight, 2);
-					router.addObstacle(new Rectangle(left, node.getRight().y, width, height));
-				}
-			}
-		}
-		router.setSpacing(0);
-		router.solve();
-		edge.getPoints().removeAllPoints();
-		
-		ConstrainedEdge ce = edge instanceof ConstrainedEdge ? (ConstrainedEdge) edge : null;
-		if (ce != null) {
-			for (int i = 0; i < ce.startingRoutedPoints.size() - 1; i++) {
-				edge.getPoints().addPoint(ce.startingRoutedPoints.getPoint(i));
-			}
-		}
-		edge.getPoints().addAll(path.getPoints());
-		if (ce != null) {
-			for (int i = 1; i < ce.endingRoutedPoints.size(); i++) {
-				edge.getPoints().addPoint(ce.endingRoutedPoints.getPoint(i));
-			}
-		}
-	}
-	
-	private void routeLeftEdges(List<Edge> edges, Node n) {
-		if (edges.isEmpty()) {
-			return;
-		}
-		int rankHeight = GraphUtilities.getRankHeightFromNode(n, g);
-		int obstacleX = n.getLeft().x + n.getLeft().width + g.getPadding(n.getLeft()).right;
-		int median = n.x + n.getOffsetOutgoing();
-		for (int i = 0; i < edges.size(); i++) {
-			Edge e = edges.get(i);
-			if (e instanceof ConstrainedEdge && ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE.equals(((ConstrainedEdge)e).getStyle())) {
-				routeEdge(e, null);
-				obstacleX = e.start.x;
-			} else {
-				int offset = Math.min(e.getPadding(), Math.abs(obstacleX - median) / (edges.size() + 1 - i));
-				obstacleX = Math.min(obstacleX + offset, e.start.x - 1);				
-				int width = Math.max(obstacleX, OBSTACLE_WIDTH);
-				int height = Math.max(rankHeight, 2);
-				routeEdge(e, new Rectangle(obstacleX - width, e.source.getLeft().y, width, height));
-			}
-		}
-	}
-	
-	private void routeRightEdges(List<Edge> edges, Node n) {
-		if (edges.isEmpty()) {
-			return;
-		}
-		int rankHeight = GraphUtilities.getRankHeightFromNode(n, g);
-		int obstacleX = n.getRight().x - g.getPadding(n.getRight()).left;
-		int median = n.x + n.getOffsetOutgoing();
-		for (int i = 0; i < edges.size(); i++) {
-			Edge e = edges.get(i);
-			if (e instanceof ConstrainedEdge && ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE.equals(((ConstrainedEdge)e).getStyle())) {
-				routeEdge(e, null);
-				obstacleX = e.start.x;
-			} else {
-				int offset = Math.min(e.getPadding(), Math.abs(obstacleX - median) / (edges.size() + 1 - i));
-				obstacleX = Math.max(obstacleX - offset, e.start.x + 1);				
-				int width = Math.max(g.getLayoutSize().width - obstacleX, OBSTACLE_WIDTH);
-				int height = Math.max(rankHeight, 2);
-				routeEdge(e, new Rectangle(obstacleX, e.source.getRight().y, width, height));
-			}
-		}
-	}
-
-	private class EdgeComparator implements Comparator<Edge> {
-		
-		private boolean reverse;
-		
-		public EdgeComparator(boolean reverse) {
-			this.reverse = reverse;
-		}
-		
-		public int compare(Edge e1, Edge e2) {
-			Node guideNode1 = e1.vNodes == null ? e1.target : e1.vNodes.getNode(0);
-			Node guideNode2 = e2.vNodes == null ? e2.target : e2.vNodes.getNode(0);
-			int diff = guideNode1.x + guideNode1.getOffsetIncoming() - guideNode2.x - guideNode2.getOffsetIncoming();
-			return reverse ? -diff : diff;
-		}			
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GMFDirectedGraphLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GMFDirectedGraphLayout.java
deleted file mode 100644
index fa73718..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GMFDirectedGraphLayout.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-
-/**
- * Implementation of the lLayout algorithm that:
- * <li> Preserves the node sizes
- * <li> Routes edges around the nodes
- * <li> Accounts for the edge routing style
- * <li> Lays out border nodes
- * <li> Pads edges end points
- * 
- * @author aboyko
- *
- */
-public class GMFDirectedGraphLayout extends DirectedGraphLayout {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.draw2d.graph.DirectedGraphLayout#visit(org.eclipse.draw2d.graph.DirectedGraph)
-	 */
-	public void visit(DirectedGraph graph) {
-		GraphUtilities.storeNodesSizes(graph);
-		super.visit(graph);
-		GraphUtilities.recallNodesSizes(graph);
-		if (graph.getDirection() != PositionConstants.SOUTH) {
-			GraphUtilities.transpose(graph);
-		}
-		postProcessGraph(graph);
-		if (graph.getDirection() != PositionConstants.SOUTH) {
-			GraphUtilities.transpose(graph);
-		}
-	}
-	
-	/**
-	 * Performs layout work  after Draw2D DGL completes
-	 * @param graph the directed graph
-	 */
-	public void postProcessGraph(DirectedGraph graph) {
-		GraphUtilities.invertEdges(graph);
-		new EdgeEndPointsAssignment(graph).assignEdgesEndPoints();
-		new PreRouteEdges(graph).preRouteEdges();
-		new EdgesRouter(graph).routeEdges();
-		GraphUtilities.invertEdges(graph);
-		
-		new CleanupBorderNodeEdges(graph).cleanup();
-	}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GraphUtilities.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GraphUtilities.java
deleted file mode 100644
index 33cdfe1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/GraphUtilities.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.graph.CompoundDirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.Rank;
-
-/**
- * Class containing graph utility methods used internally
- * 
- * @author aboyko
- * @since 2.1
- */
-class GraphUtilities {
-	
-	static void transpose(DirectedGraph g) {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			transpose(g.nodes.getNode(i));
-		}
-		for (int i = 0; i < g.edges.size(); i++) {
-			transpose(g.edges.getEdge(i));
-		}
-		g.getLayoutSize().transpose();
-		g.getDefaultPadding().transpose();
-		if (g instanceof CompoundDirectedGraph) {
-			CompoundDirectedGraph cg = (CompoundDirectedGraph) g;
-			for (int i = 0; i < cg.subgraphs.size(); i++) {
-				transpose(cg.subgraphs.getNode(i));
-			}
-		}
-	}
-	
-	private static void transpose(Node n) {
-		int temp = n.x;
-		n.x = n.y;
-		n.y = temp;
-		temp = n.width;
-		n.width = n.height;
-		n.height = temp;
-		if (n.getPadding() != null) {
-			n.getPadding().transpose();
-		}
-		if (n instanceof ConstantSizeNode) {
-			for (Iterator<BorderNode> itr = ((ConstantSizeNode)n).borderNodes.iterator(); itr.hasNext();) {
-				transpose(itr.next());
-			}
-		}
-	}
-	
-	private static void transpose(Edge e) {
-		e.start.transpose();
-		e.end.transpose();
-		e.getPoints().transpose();
-		if (e.vNodes != null) {
-			for (int i = 0; i < e.vNodes.size(); i++) {
-				transpose(e.vNodes.getNode(i));
-			}
-		}
-	}
-	
-	static void storeNodesSizes(DirectedGraph g) {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			Node n = g.nodes.getNode(i);
-			if (n instanceof ConstantSizeNode) {
-				ConstantSizeNode cn = (ConstantSizeNode) n;
-				cn.constantWidth = cn.width;
-				cn.constantHeight = cn.height;
-			}
-		}
-	}
-	
-	static void recallNodesSizes(DirectedGraph g) {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			Node n = g.nodes.getNode(i);
-			if (n instanceof ConstantSizeNode) {
-				ConstantSizeNode cn = (ConstantSizeNode) n;
-				cn.width = cn.constantWidth;
-				cn.height = cn.constantHeight;
-			}
-		}
-	}
-	
-	static int getRankHeightFromNode(Node n, DirectedGraph g) {
-		int rankHeight = -1;
-		Rank rank = getNodeRank(n, g);
-		if (rank != null) {
-			for (int i = 0; i < rank.size(); i++) {
-				rankHeight = Math.max(rankHeight, rank.getNode(i).height);
-			}
-		}
-		return rankHeight;
-	}
-	
-	static Rank getNodeRank(Node n, DirectedGraph g) {
-		for (int i = 0; i < g.ranks.size(); i++) {
-			Rank rank = g.ranks.getRank(i);
-			if (!rank.isEmpty()) {
-				if (n.y == rank.getNode(0).y) {
-					return rank;
-				}
-			}
-		}
-		return null;
-	}
-
-	static int getOutogingEdgeBendpointX(Edge e, DirectedGraph g) {
-		if ( e instanceof JointEdges) {
-			return getOutogingEdgeBendpointX(((JointEdges)e).getLeadingEdge(), g);
-		} else {
-			if (e.vNodes == null) {
-				if (e.end != null) {
-					return e.end.x;
-				} else {
-					int sourceX = e.source.x + e.source.getOffsetOutgoing();
-					if (e.target instanceof ConstantSizeNode && ((ConstantSizeNode)e.target).getMinIncomingPadding() > 0 && e.target.x < sourceX && sourceX < e.target.x + e.target.width) {
-						return sourceX;
-					} else {
-						return e.target.x + e.target.getOffsetIncoming(); 
-					}
-				}
-			} else {
-				Node vn = e.vNodes.getNode(0);
-				if (e instanceof ConstrainedEdge && ((ConstrainedEdge)e).getStyle().equals(ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE)) {
-					return vn.x + vn.getOffsetIncoming();
-				}
-				int leftX = Integer.MIN_VALUE;
-				int rightX = Integer.MAX_VALUE;
-				for (int i = e.vNodes.size() - 1; i >= 0; i--) {
-					vn = e.vNodes.getNode(i);
-					int currentLeftX = getLeftX(vn, e, g);
-					int currentRightX = getRightX(vn, e, g);
-					if (currentLeftX > rightX) {
-						return rightX;
-					} else if (currentRightX < leftX) {
-						return leftX;
-					} else {
-						if (currentLeftX > leftX) {
-							leftX = currentLeftX;
-						}
-						if (currentRightX < rightX) {
-							rightX = currentRightX;
-						}
-					}
-				}
-				int targetX = e.end != null ? e.end.x : e.target.x + e.target.getOffsetIncoming();
-				if (targetX > rightX) {
-					return rightX;
-				} else if (targetX < leftX) {
-					return leftX;
-				}
-				return targetX;
-			}
-		}
-	}
-	
-	static int getIncomingEdgeBendpointX(Edge e, DirectedGraph g) {
-		if (e instanceof JointEdges) {
-			return getIncomingEdgeBendpointX(((JointEdges)e).getLeadingEdge(), g);
-		} else {
-			if (e.vNodes == null) {
-				if (e.start != null) {
-					return e.start.x;
-				} else {
-					int targetX = e.target.x + e.target.getOffsetIncoming();
-					if (e.source instanceof ConstantSizeNode && ((ConstantSizeNode)e.source).getMinOutgoingPadding() > 0 && e.source.x < targetX && targetX < e.source.x + e.source.width) {
-						return targetX;
-					} else {
-						return e.source.x + e.source.getOffsetOutgoing();
-					}
-				}
-			} else {
-				Node vn = e.vNodes.getNode(e.vNodes.size() - 1);
-				if (e instanceof ConstrainedEdge && ((ConstrainedEdge)e).getStyle().equals(ConstrainedEdge.ORTHOGONAL_ROUTING_STYLE)) {
-					return vn.x + vn.getOffsetOutgoing();
-				}
-				int leftX = Integer.MIN_VALUE;
-				int rightX = Integer.MAX_VALUE;
-				for (int i = e.vNodes.size() - 1; i >= 0; i--) {
-					vn = e.vNodes.getNode(i);
-					int currentLeftX = getLeftX(vn, e, g);
-					int currentRightX = getRightX(vn, e, g);
-					if (currentLeftX > rightX) {
-						return rightX;
-					} else if (currentRightX < leftX) {
-						return leftX;
-					} else {
-						if (currentLeftX > leftX) {
-							leftX = currentLeftX;
-						}
-						if (currentRightX < rightX) {
-							rightX = currentRightX;
-						}
-					}
-				}
-				int sourceX = e.start != null ? e.start.x : e.source.x + e.source.getOffsetOutgoing();
-				if (sourceX > rightX) {
-					return rightX;
-				} else if (sourceX < leftX) {
-					return leftX;
-				}
-				return sourceX;
-			}
-		}
-	}
-	
-	private static int getLeftX(Node vn, Edge e, DirectedGraph g) {
-		return vn.getLeft() != null ? vn.getLeft().x + vn.getLeft().width + g.getPadding(vn.getLeft()).right + e.getPadding() - 1 : 0;
-	}
-	
-	private static int getRightX(Node vn, Edge e, DirectedGraph g) {
-		return vn.getRight() != null ? vn.getRight().x - g.getPadding(vn.getRight()).left - e.getPadding() + 1 : g.getLayoutSize().width;
-	}
-	
-	static void translateGraph(DirectedGraph g, int x, int y) {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			translateNode(g.nodes.getNode(i), x, y);
-		}
-		for (int i = 0; i < g.edges.size(); i++) {
-			translateEdge(g.edges.getEdge(i), x, y);
-		}
-	}
-	
-	static void translateNode(Node n, int x, int y) {
-		n.x += x;
-		n.y += y;
-		if (n instanceof ConstantSizeNode) {
-			ConstantSizeNode cn = (ConstantSizeNode) n;
-			for (Iterator<BorderNode> itr = cn.borderNodes.iterator(); itr.hasNext();) {
-				translateNode(itr.next(), x, y);
-			}
-		}
-	}
-	
-	static void translateEdge(Edge e, int x, int y) {
-		e.start.translate(x, y);
-		e.end.translate(x, y);
-		e.getPoints().translate(x, y);
-	}
-	
-	static void invertEdges(DirectedGraph g) {
-		for (int i = 0; i < g.edges.size(); i++) {
-			Edge e = g.edges.getEdge(i);
-			if (e.isFeedback()) {
-				e.invert();
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointEdges.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointEdges.java
deleted file mode 100644
index 13ddfbb..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointEdges.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.graph.Edge;
-
-/**
- * Interface for joint edges. Joint edges  is a set of edges that acts like one edge
- * 
- * @author aboyko
- * @since 2.1
- */
-interface JointEdges {
-	
-	public Edge getLeadingEdge();
-	
-	public BorderNode getJoint();
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointIncomingEdges.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointIncomingEdges.java
deleted file mode 100644
index ff34a78..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointIncomingEdges.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * A set of incoming edges that acts like one edge.
- * Used internally for laying out connected border nodes.
- * 
- * @author aboyko
- * @since 2.1
- */
-class JointIncomingEdges extends Edge implements JointEdges {
-	
-	private BorderNode joint;
-	
-	EdgeList edges = new EdgeList();
-	
-	private Edge leadingEdge = null;
-	private int leadingCost = Integer.MAX_VALUE;
-	
-	public JointIncomingEdges(BorderNode joint) {
-		super(new Node(), new Node());
-		this.joint = joint;
-		source = target = joint.borderNodeParent;
-	}
-	
-	public Edge getLeadingEdge() {
-		if (leadingEdge == null) {
-			for (int i = 0; i < edges.size(); i++) {
-				Edge e = edges.getEdge(i);
-				int cost = getBendpointX(e) - e.target.x - e.target.getOffsetIncoming(); 
-				if (Math.abs(cost) < leadingCost) {
-					leadingCost = Math.abs(cost);
-					leadingEdge = e;
-				}
-			}
-		}
-		return leadingEdge;
-	}
-		
-	public BorderNode getJoint() {
-		return joint;
-	}
-	
-	private int getBendpointX(Edge e) {
-		Node node = e.vNodes == null ? e.source : e.vNodes.getNode(e.vNodes.size() - 1);
-		return node.x + node.getOffsetOutgoing();
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointOutgoingEdges.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointOutgoingEdges.java
deleted file mode 100644
index 4023640..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/JointOutgoingEdges.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * A set of outgoing edges that is treated as one outgoing edge.
- * Used internally for laying out connected border nodes.
- * 
- * @author aboyko
- * @since 2.1
- */
-public class JointOutgoingEdges extends Edge implements JointEdges {
-	
-	private BorderNode joint;
-
-	EdgeList edges = new EdgeList();
-	
-	private Edge leadingEdge = null;
-	private int leadingCost = Integer.MAX_VALUE;;
-	
-	public JointOutgoingEdges(BorderNode joint) {
-		super(new Node(), new Node());
-		this.joint = joint;
-		source = target = joint.borderNodeParent;
-	}
-	
-	public Edge getLeadingEdge() {
-		if (leadingEdge == null) {
-			for (int i = 0; i < edges.size(); i++) {
-				Edge e = edges.getEdge(i);
-				int cost = getBendpointX(e) - e.source.x - e.source.getOffsetOutgoing(); 
-				if (Math.abs(cost) < Math.abs(leadingCost)) {
-					leadingCost = cost;
-					leadingEdge = e;
-				}
-			}
-		}
-		return leadingEdge;
-	}
-		
-	public BorderNode getJoint() {
-		return joint;
-	}
-	
-	private int getBendpointX(Edge e) {
-		Node node = e.vNodes == null ? e.target : e.vNodes.getNode(0);
-		return node.x + node.getOffsetIncoming();
-	}
-	
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/PreRouteEdges.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/PreRouteEdges.java
deleted file mode 100644
index ebdb6ee..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graph/PreRouteEdges.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.graph;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * Performs the pre-routing work such as to route edges from border nodes located on left or right sides of a parent node.
- * Those edges are assigned <code>startingRoutedPoints</code> and/or <endingRoutedPoints</code> to route edges to the top or
- * bottom of the parent node rank.
- * This class can be used to do some pre-routing work for orthogonal edges in the future.
- * 
- * @author aboyko
- * @since 2.1
- */
-class PreRouteEdges {
-	
-	private DirectedGraph g;
-	
-	public PreRouteEdges(DirectedGraph g) {
-		this.g = g;
-	}
-	
-	void preRouteEdges() {
-		for (int i = 0; i < g.nodes.size(); i++) {
-			Node n = g.nodes.getNode(i);
-			if (n instanceof ConstantSizeNode) {
-				preRouteEdgesFromNode((ConstantSizeNode)n);
-			}
-		}
-	}
-	
-	private void preRouteEdgesFromNode(ConstantSizeNode n) {
-		List<BorderNode> leftBorderNodes = new ArrayList<BorderNode>();
-		List<BorderNode> rightBorderNodes = new ArrayList<BorderNode>();
-		for (Iterator<BorderNode> itr = n.borderNodes.iterator(); itr.hasNext();) {
-			BorderNode bn = itr.next();
-			if (bn.position == PositionConstants.EAST) {
-				rightBorderNodes.add(bn);
-			} else if (bn.position == PositionConstants.WEST) {
-				leftBorderNodes.add(bn);
-			}
-		}
-		createRoutingPointsForSideBorderNodes(leftBorderNodes, n, PositionConstants.WEST);
-		createRoutingPointsForSideBorderNodes(rightBorderNodes, n, PositionConstants.EAST);
-	}
-	
-	private void createRoutingPointsForSideBorderNodes(List<BorderNode> nodes, ConstantSizeNode parentNode, int position) {
-		List<ConstrainedEdge> incomingEdges = new ArrayList<ConstrainedEdge>();
-		List<ConstrainedEdge> outgoingEdges = new ArrayList<ConstrainedEdge>();
-		int maxBorderItemOutsideWidth = initBorderNodeEdgesLists(nodes, incomingEdges, outgoingEdges, position);
-		
-		int nodePadding = position == PositionConstants.WEST ? g.getPadding(parentNode).left : g.getPadding(parentNode).right;
-		
-		if (nodePadding <= maxBorderItemOutsideWidth) {
-			throw new RuntimeException("Node padding must be greater than the the width of the widest border node"); //$NON-NLS-1$
-		}
-		
-		if (incomingEdges.isEmpty() || outgoingEdges.isEmpty()) {
-			/*
-			 *  Border nodes sitting on the side should either have both the incoming
-			 *  and outgoing edges or no edges at all
-			 */
-			return;
-		}
-		
-		int incomingPadding = (nodePadding - maxBorderItemOutsideWidth) / (incomingEdges.size() + 1);
-		int outgoingPadding = (nodePadding - maxBorderItemOutsideWidth) / (outgoingEdges.size() + 1);
-//		if (incomingEdges.size() >= outgoingEdges.size()) {
-//			incomingPadding = (nodePadding - maxBorderItemOutsideWidth) / (incomingEdges.size() + 1);
-//			outgoingPadding = incomingEdges.size() % outgoingEdges.size() == 0 ? (nodePadding - maxBorderItemOutsideWidth) / (outgoingEdges.size() + 2)
-//					: (nodePadding - maxBorderItemOutsideWidth) / (outgoingEdges.size() + 1);
-//		} else {
-//			outgoingPadding = (nodePadding - maxBorderItemOutsideWidth) / (outgoingEdges.size() + 1);
-//			incomingPadding = outgoingEdges.size() % incomingEdges.size() == 0 ? (nodePadding - maxBorderItemOutsideWidth) / (incomingEdges.size() + 2)
-//					: (nodePadding - maxBorderItemOutsideWidth) / (incomingEdges.size() + 1);
-//		}
-
-		Collections.sort(incomingEdges, new Comparator<ConstrainedEdge>() {
-			public int compare(ConstrainedEdge e1, ConstrainedEdge e2) {
-				int diff = GraphUtilities.getIncomingEdgeBendpointX(e2, g) - GraphUtilities.getIncomingEdgeBendpointX(e1, g);
-				if (e1.targetConstraint.position == PositionConstants.WEST) {
-					return diff;
-				} else {
-					return -diff; 
-				}
-			}
-		});
-		
-		Collections.sort(outgoingEdges, new Comparator<ConstrainedEdge>() {
-			public int compare(ConstrainedEdge e1, ConstrainedEdge e2) {
-				int diff = GraphUtilities.getOutogingEdgeBendpointX(e2, g) - GraphUtilities.getOutogingEdgeBendpointX(e1, g);
-				if (e1.sourceConstraint.position == PositionConstants.WEST) {
-					return diff;
-				} else {
-					return -diff; 
-				}
-			}
-		});
-		
-		int rankHeight = GraphUtilities.getRankHeightFromNode(parentNode, g);
-		Point incomingStartPt = position == PositionConstants.WEST ? new Point(parentNode.x - maxBorderItemOutsideWidth, parentNode.y)
-			: new Point(parentNode.x + parentNode.width + maxBorderItemOutsideWidth, parentNode.y);
-		Point outgoingStartPt = position == PositionConstants.WEST ? new Point(parentNode.x - maxBorderItemOutsideWidth, parentNode.y + rankHeight)
-			: new Point(parentNode.x + parentNode.width + maxBorderItemOutsideWidth, parentNode.y + parentNode.height);
-		Dimension incomingOffset = position == PositionConstants.WEST ? new Dimension(-incomingPadding, 0)
-			: new Dimension(incomingPadding, 0);
-		Dimension outgoingOffset = position == PositionConstants.WEST ? new Dimension(-outgoingPadding, 0)
-			: new Dimension(outgoingPadding, 0);
-		
-		padBendpointsForEdges(incomingEdges, incomingStartPt, incomingOffset, true);
-		padBendpointsForEdges(outgoingEdges, outgoingStartPt, outgoingOffset, false);
-		
-	}
-	
-	private void padBendpointsForEdges(List<ConstrainedEdge> edges, Point startPoint, Dimension offset, boolean incoming) {
-		Point current = startPoint.getCopy().translate(offset);
-		for (Iterator<ConstrainedEdge> itr = edges.iterator(); itr.hasNext(); current.translate(offset)) {
-			ConstrainedEdge e = itr.next();
-			if (incoming) {
-				e.endingRoutedPoints.addPoint(current);
-				if (e.targetConstraint.minIncomingPadding > 0 || e.targetConstraint.minOutgoingPadding > 0) {
-					e.endingRoutedPoints.addPoint(current.x, e.end.y);
-				}
-				e.endingRoutedPoints.addPoint(e.end);
-			} else {
-				e.startingRoutedPoints.addPoint(e.start);
-				if (e.sourceConstraint.minIncomingPadding > 0 || e.sourceConstraint.minOutgoingPadding > 0) {
-					e.startingRoutedPoints.addPoint(current.x, e.start.y);
-				}
-				e.startingRoutedPoints.addPoint(current);
-			}
-		}
-	}
-	
-	private int initBorderNodeEdgesLists(List<BorderNode> nodes, List<ConstrainedEdge> incomingEdges, List<ConstrainedEdge> outgoingEdges, int position) {
-		int maxBorderNodeOutsideWidth = 0;
-		for (Iterator<BorderNode> itr = nodes.iterator(); itr.hasNext();) {
-			BorderNode bn = itr.next();
-			if (bn.position == position) {
-				incomingEdges.addAll(bn.incomingJointEdges.edges);
-				outgoingEdges.addAll(bn.outgoingJointEdges.edges);
-				maxBorderNodeOutsideWidth = Math.max(maxBorderNodeOutsideWidth, (int)(bn.width * bn.getOutsideRatio()));
-			}
-		}
-		return maxBorderNodeOutsideWidth;
-	}
-	
-	
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/ColorRegistry.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/ColorRegistry.java
deleted file mode 100644
index 1435196..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/ColorRegistry.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * Manages color resources.
- * 
- * @author cmahoney, ldamus
- * @since 1.4
- */
-public class ColorRegistry {
-
-	/**
-	 * Singleton instance for the color registry.
-	 */
-	private static ColorRegistry singletonInstance = new ColorRegistry();
-
-	/**
-	 * Return singleton instance of the color registry.
-	 * 
-	 * @return the color registry
-	 */
-	public static ColorRegistry getInstance() {
-		return singletonInstance;
-	}
-
-	// HashMap that holds onto Color instances
-	private final static Map colorRegistry = new HashMap();
-
-	/**
-	 * Private constructor.
-	 */
-	private ColorRegistry() {
-		super();
-	}
-
-	/**
-	 * Returns the Color based on the id. If the color does not exist in the
-	 * cache, creates a new one and caches.
-	 * 
-	 * @param id -
-	 *            the integer representation of a color
-	 * @return Color
-	 */
-	public Color getColor(Integer id) {
-		Object value = colorRegistry.get(id);
-		if (value != null) {
-			return (Color) value;
-		}
-		Color newColor = FigureUtilities.integerToColor(id);
-		colorRegistry.put(id, newColor);
-		return newColor;
-	}
-
-	/**
-	 * Returns the Color based on the RGB. If the color does not exist in the
-	 * cache, creates a new one and caches.
-	 * 
-	 * @param RGB
-	 * @return Color
-	 */
-	public Color getColor(RGB rgb) {
-		Integer colorID = FigureUtilities.RGBToInteger(rgb);
-		return getColor(colorID);
-	}
-
-}
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 b2283bd..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/graphics/GCUtilities.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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();
-        }
-
-        return platformSupportsAdvancedGraphics;
-    }
-}
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 24370af..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimatableScrollPane.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2009  IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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_0 = mm.DPtoLP(0);
-        Insets insets = new Insets(mm_0, mm.DPtoLP(2),
-        		mm_0, mm_0);
-        int mm_14 = mm.DPtoLP(14);
-        Dimension size = new Dimension(mm_14, mm_14);
-        setVerticalScrollBar( new ListScrollBar(Orientable.VERTICAL, insets, size, 
-            mm.DPtoLP(10), mm.DPtoLP(50)));
-    }
-    
-    
-    protected void createHorizontalScrollBar() {
-        IMapMode mm= MapModeUtil.getMapMode(this);
-        int mm_0 = mm.DPtoLP(0);
-        int mm_1 = mm.DPtoLP(1);
-        Insets insets = new Insets(mm_0, mm_0,
-        		mm_0, mm_1);
-        int mm_13 = mm.DPtoLP(12);
-        Dimension size = new Dimension(mm_13, mm_13);
-        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 d55e28c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/AnimationModel.java
+++ /dev/null
@@ -1,67 +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
- *
- */
-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 393cbe8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ConnectionLayerEx.java
+++ /dev/null
@@ -1,184 +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
- */
-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 fac20b3..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DelegatingLayout.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.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;
-
-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 bb50591..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/DropShadowButtonBorder.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.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;
-
-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 54187ad..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/FeedbackConnection.java
+++ /dev/null
@@ -1,86 +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.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.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-
-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 newConstraint.size() >= 2;
-        assert 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 4aa6e50..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/ImageFigureEx.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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 917a825..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- */
-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);
-	}
-
-	@Override
-	public Insets getInsets(IFigure figure) {
-		int widthInLP = MapModeUtil.getMapMode(figure).DPtoLP(getWidth());
-		return new Insets(widthInLP);
-	}
-
-	@Override
-	public void paint(IFigure figure, Graphics graphics, Insets insets) {
-		tempRect.setBounds(getPaintRectangle(figure, insets));
-
-		int widthInLP = MapModeUtil.getMapMode(figure).DPtoLP(getWidth());
-		int halfWidthInLP = MapModeUtil.getMapMode(figure).DPtoLP(
-				getWidth() / 2);
-		tempRect.x += halfWidthInLP;
-		tempRect.y += halfWidthInLP;
-		tempRect.width -= widthInLP;
-		tempRect.height -= widthInLP;
-
-		graphics.setLineWidth(getWidth());
-		graphics.setLineStyle(getStyle());
-		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 adc5ef0..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/OverlayScrollPaneLayout.java
+++ /dev/null
@@ -1,139 +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;
-
-/*
- * 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 71dc57a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/TransparentBorder.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.draw2d.ui.internal.figures;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-
-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 e3f3630..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/AdvancedSubGraph.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PositionConstants;
-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;
-    private int direction = PositionConstants.SOUTH;
-    
-    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;
-    }
-
-	/**
-	 * Gets the subgraph layout direction
-	 * 
-	 * @return layout direction
-	 */
-	public int getDirection() {
-		return direction;
-	}
-
-	/**
-	 * Sets the direction for the subgraph's layout
-	 * 
-	 * @param direction
-	 */
-	public void setDirection(int direction) {
-		this.direction = direction;
-	}
-
-}
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 02ad658..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graph/CompositeDirectedGraphLayout.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PositionConstants;
-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;
-import org.eclipse.gmf.runtime.draw2d.ui.graph.GMFDirectedGraphLayout;
-
-
-
-/**
- * @author mmostafa
- * 
- * Composite layout that layout the passed graph in a recursive fashion 
- *
- */
-public class CompositeDirectedGraphLayout
-    extends DirectedGraphLayout {
-	
-	private int graphDirection = PositionConstants.SOUTH;
-
-    /* (non-Javadoc)
-     * @see org.eclipse.draw2d.graph.DirectedGraphLayout#visit(org.eclipse.draw2d.graph.DirectedGraph)
-     */
-    public void visit(DirectedGraph graph) {
-		graphDirection = graph.getDirection();
-		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);
-            }
-        }
-        Map nodeToOutGoing = new HashMap();
-        Map nodeToIncomingGoing = new HashMap();
-        removeDisconnectedEdges(nodes, nodeToOutGoing, nodeToIncomingGoing);
-        if (nodes.size() > 0){
-            Node parent  = getParent(nodes.getNode(0));
-            DirectedGraph g = new DirectedGraph();
-            g.nodes = nodes;
-            g.edges = edges;
-            AdvancedSubGraph advancedSubgraphParent = parent instanceof AdvancedSubGraph ? (AdvancedSubGraph)parent : null;
-            if (advancedSubgraphParent != null) {
-           		g.setDirection(advancedSubgraphParent.getDirection());
-            } else {
-            	g.setDirection(graphDirection);            	
-            }
-            DirectedGraphLayout layout = new GMFDirectedGraphLayout();
-            layout.visit(g);
-            if (advancedSubgraphParent != null && advancedSubgraphParent.isAutoSize()) {
-                advancedSubgraphParent.width = g.getLayoutSize().width;
-                advancedSubgraphParent.height = g.getLayoutSize().height;
-            }
-        }
-        
-        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;
-     }
-    
-    /**
-     * If the node passed in is in autosize mode, then this method will set the
-     * width and height of this node based on how its children/members were
-     * arranged.
-     * 
-     * @param subGraph
-     *            the node whose size will be adjusted
-     */
-//    private void adjustAutoSizeNodeWidthAndHeight(AdvancedSubGraph subGraph) {
-//    	if (!subGraph.isAutoSize()) {
-//    	    return;
-//    	}
-//        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.height = bottom - top + 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 eedefc8..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/FontRegistry.java
+++ /dev/null
@@ -1,99 +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<String, Font> 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) {
-		Font font = null;
-		String fontSignature = fd.toString();
-
-		if(fonts == null) {
-			fonts = new HashMap<String, Font>();
-		} else {
-			font = fonts.get(fontSignature);
-		}
-		
-		if (font == null) {
-			font = new Font(device, fd);
-			fonts.put(fontSignature, font);
-		}
-		
-		return font;
-	}
-
-	/**
-	 * Removes all fonts currently in the cache and dispose of them
-	 */
-	public void clearFontCache() {
-		if (fonts != null) {
-			List<String> keys = new ArrayList<String>(fonts.keySet());
-			Iterator<String> keyiter = keys.iterator();
-			while (keyiter.hasNext()) {
-				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 a4e3d41..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/PrinterGraphics.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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<Image> it = collapseImageCache.values().iterator(); it.hasNext();)
-		{
-	        Image img = it.next();
-	        img.dispose();
-		}
-
-		collapseImageCache.clear();
-
-		super.dispose();
-	}
-	
-	Map<Image, Image> collapseImageCache = new HashMap<Image, Image>();
-
-    /**
-     * 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.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 = srcImage.getImageData().transparentPixel == -1 ? collapseImage(srcImage)
-				: 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 = srcImage.getImageData().transparentPixel == -1 ? collapseImage(srcImage)
-				: 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 f8b5eae..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScalableFreeformLayeredPane.java
+++ /dev/null
@@ -1,176 +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
- *
- * 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 6e7c17c..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/graphics/ScaledGraphics.java
+++ /dev/null
@@ -1,1074 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - patch 244297
- ****************************************************************************/
-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.LineAttributes;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.PathData;
-import org.eclipse.swt.graphics.Pattern;
-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
- * See also bugzilla #230056 setLineWidth in ScaledGraphics does not support the 
- * zoom factor.
- */
-/**
- * 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() { }
-		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 float lineWidth;
-		private double zoom; 
-	
-		/**
-		 * Constructs a new, uninitialized State object.
-		 */
-		protected State() {	}
-		
-		/**
-		 * 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, x, y, font, (float)lineWidth);
-		}
-	
-		/**
-		 * 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
-		 * 
-		 * @since 3.5
-		 */
-		protected State(double zoom, double x, double y, Font font, float 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) {
-			setValues(zoom, x, y, font, (float)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
-		 * 
-		 * @since 3.5
-		 */
-		protected void setValues(double zoom, double x, double y, 
-				Font font, float 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<Font, FontData> fontDataCache = new HashMap<Font, FontData>();
-	private FontKey fontKey = new FontKey();
-	private double fractionalX;
-	private double fractionalY;
-	private Graphics graphics;
-	private FontHeightCache localCache = new FontHeightCache();
-	private Font localFont;
-	private float localLineWidth;
-	private List<State> stack = new ArrayList<State>();
-	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.getLineWidthFloat();
-	}
-	
-	/** @see Graphics#clipRect(Rectangle) */
-	public void clipRect(Rectangle r) {
-		graphics.clipRect(zoomClipRect(r));
-	}
-	
-	Font createFont(FontData data) {
-		return new Font(Display.getCurrent(), data);
-	}
-	
-	/**
-	 * Scales given path by zoom factor
-	 * 
-	 * @param path
-	 *            Path to be scaled
-	 * @return Scaled path
-	 * @since 1.2	 
-	 */
-	private Path createScaledPath(Path path) {
-		PathData p = path.getPathData();
-		for (int i = 0; i < p.points.length; i += 2) {
-			p.points[i] = (float) (p.points[i] * zoom + fractionalX);
-			p.points[i + 1] = (float) (p.points[i + 1] * zoom + fractionalY);
-		}
-		Path scaledPath = new Path(path.getDevice());
-		int index = 0;
-		for (int i = 0; i < p.types.length; i++) {
-			byte type = p.types[i];
-			switch (type) {
-				case SWT.PATH_MOVE_TO:
-					scaledPath.moveTo(p.points[index], p.points[index + 1]);
-					index += 2;
-					break;
-				case SWT.PATH_LINE_TO:
-					scaledPath.lineTo(p.points[index], p.points[index + 1]);
-					index += 2;
-					break;
-				case SWT.PATH_CUBIC_TO:
-					scaledPath.cubicTo(p.points[index], p.points[index + 1],
-							p.points[index + 2], p.points[index + 3],
-							p.points[index + 4], p.points[index + 5]);
-					index += 6;
-					break;
-				case SWT.PATH_QUAD_TO:
-					scaledPath.quadTo(p.points[index], p.points[index + 1],
-							p.points[index + 2], p.points[index + 3]);
-					index += 4;
-					break;
-				case SWT.PATH_CLOSE:
-					scaledPath.close();
-					break;
-			}
-		}
-		return scaledPath;
-	}
-	
-	/** @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#drawPath(Path) */
-	public void drawPath(Path path) {
-		Path scaledPath = createScaledPath(path);
-		try {
-			graphics.drawPath(scaledPath);
-		} finally {
-			scaledPath.dispose();
-		}
-	}
-	
-	/** @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#fillPath(Path) */
-	public void fillPath(Path path) {
-		Path scaledPath = createScaledPath(path);
-		try {
-			graphics.fillPath(scaledPath);
-		} finally {
-			scaledPath.dispose();
-		}
-	}	
-		
-	/**
-	 * @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 = fontDataCache.get(f);
-		if (data == null) {
-			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#getAdvanced()
-	 */
-	public boolean getAdvanced() {
-		return graphics.getAdvanced();
-	}
-
-	/**
-	 * @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#getLineMiterLimit() */
-	public float getLineMiterLimit() {
-		return graphics.getLineMiterLimit();
-	}
-	
-	/** @see Graphics#getLineWidth() */
-	public int getLineWidth() {
-		return (int)getLineWidthFloat();
-	}
-	
-	/** @see Graphics#getLineWidthFloat() */
-	public float getLineWidthFloat() {
-		return getLocalLineWidth();
-	}
-	
-	/** @see Graphics#getLineAttributes() */
-	public LineAttributes getLineAttributes() {
-		LineAttributes a = graphics.getLineAttributes();
-		a.width = getLocalLineWidth();
-		return a;
-	}
-
-	private Font getLocalFont() {
-		return localFont;
-	}
-	
-	private float 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(stack.get(stackPointer));
-	}
-	
-	/** @see Graphics#pushState() */
-	public void pushState() {
-		State s;
-		if (stack.size() > stackPointer) {
-			s = 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(stack.get(stackPointer - 1));
-	}
-	
-	/** @see Graphics#scale(double) */
-	public void scale(double amount) {
-		setScale(zoom * amount);
-	}
-	
-	/** @see Graphics#setAdvanced(boolean) */
-	public void setAdvanced(boolean advanced) {
-		graphics.setAdvanced(advanced);
-	}
-
-	/**
-	 * 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(Path) */
-	public void setClip(Path path) {
-		Path scaledPath = createScaledPath(path);
-		try {
-			graphics.setClip(scaledPath);
-		} finally {
-			scaledPath.dispose();
-		}
-	}
-	
-	public void clipPath(Path path) {
-		Path scaledPath = createScaledPath(path);
-		try {
-			graphics.clipPath(scaledPath);
-		} finally {
-			scaledPath.dispose();
-		}
-	}
-		
-	/** @see Graphics#setBackgroundPattern(Pattern) */
-	public void setBackgroundPattern(Pattern pattern) {
-		graphics.setBackgroundPattern(pattern);  
-	}
-	
-	/** @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);
-	}
-	
-	/** @see Graphics#setForegroundPattern(Pattern) */
-	public void setForegroundPattern(Pattern pattern) {
-		graphics.setForegroundPattern(pattern);
-	}
-	
-	/**
-	 * 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#setLineMiterLimit(float) */
-	public void setLineMiterLimit(float value) {
-		graphics.setLineMiterLimit(value);
-	}
-
-	/** @see Graphics#setLineWidth(int) */
-	public void setLineWidth(int width) {
-		setLineWidthFloat(width);
-	}
-	
-	/** @see Graphics#setLineWidthFloat(float) */
-	public void setLineWidthFloat(float width) {
-		setLocalLineWidth(width);
-	}
-	
-	/** @see Graphics#setLineAttributes(LineAttributes) */
-	public void setLineAttributes(LineAttributes attributes) {
-		graphics.setLineAttributes(attributes);
-		setLocalLineWidth(attributes.width);
-	}
-	
-	private void setLocalFont(Font f) {
-		localFont = f;
-		graphics.setFont(zoomFont(f));
-	}
-	
-	private void setLocalLineWidth(float width) {
-		localLineWidth = width;
-		graphics.setLineWidthFloat(zoomLineWidth(width));
-	}
-	
-	void setScale(double value) {
-		if (zoom != value) {
-			this.zoom = value;
-			graphics.setFont(zoomFont(getLocalFont()));
-			graphics.setLineWidthFloat(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));
-	}
-	
-	/** @see Graphics#translate(float, float) */
-	public void translate(float dx, float dy) {
-		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);
-	}
-	
-	float zoomLineWidth(float w) {
-		/*
-		 * We introduced line width zoom in GMF 2.1.
-		 * Unfortunately GMF 2.0 clients used HiMetric map mode and called
-		 * setLineWidth(1) rather than setLineWidth(getMapMode().LPtoDP(1)).
-		 * This small piece of code detects this case and simply returns the
-		 * line width.
-		 */
-		if (zoom < 0.04 && w <= 5) {
-			return w;
-		}
-		/*
-		 * We interestingly add 0.1 to eliminate rounding errors with HiMetric
-		 * map mode. This has no effect with identity/pixel map mode.
-		 */
-		return (float)((zoom * w) + 0.1);
-	}
-	
-	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 right-to-left 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 347e6c9..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/mapmode/HiMetricMapMode.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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() {
-		/* This constructor is fragile and purposely does not 
-		 * use DisplayUtils.getDisplay() */ 
-		Display display = Display.getCurrent();
-		if (display == null) {
-			Display.getDefault().syncExec(new Runnable() {
-
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					dpi = Display.getCurrent().getDPI().x;
-				}
-			});
-		} else {
-			dpi = display.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/parts/ScrollableThumbnailEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/parts/ScrollableThumbnailEx.java
deleted file mode 100644
index 1f2841a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/parts/ScrollableThumbnailEx.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-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.RGB;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.KeyEvent;
-import org.eclipse.draw2d.KeyListener;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * A scaled image representation of a Figure.  If the source Figure is not completely 
- * visible, a SelectorFigure is placed over the thumbnail representing the viewable area 
- * and can be dragged around to scroll the source figure.
- * Code modified to resolve {@link https://bugs.eclipse.org/bugs/show_bug.cgi?id=230056}
- */
-public final class ScrollableThumbnailEx 
-	extends ThumbnailEx
-{
-
-private class ClickScrollerAndDragTransferrer
-	extends MouseMotionListener.Stub
-	implements MouseListener
-{
-	private boolean dragTransfer;
-	public void mouseDoubleClicked(MouseEvent me) { }
-	public void mouseDragged(MouseEvent me) {
-		if (dragTransfer)
-			syncher.mouseDragged(me);
-	}
-	public void mousePressed(MouseEvent me) {
-		if (!(ScrollableThumbnailEx.this.getClientArea().contains(me.getLocation())))
-			return;
-		Dimension selectorCenter = selector.getBounds().getSize().scale(0.5f);
-		Point scrollPoint = me.getLocation()
-							.getTranslated(getLocation().getNegated())
-							.translate(selectorCenter.negate())
-							.scale(1.0f / getViewportScaleX(), 1.0f / getViewportScaleY())
-							.translate(
-									viewport.getHorizontalRangeModel().getMinimum(), 
-									viewport.getVerticalRangeModel().getMinimum());
-		viewport.setViewLocation(scrollPoint);
-		syncher.mousePressed(me);
-		dragTransfer = true;
-	}
-	public void mouseReleased(MouseEvent me) {
-		syncher.mouseReleased(me);
-		dragTransfer = false;
-	}
-}
-
-private class ScrollSynchronizer
-	extends MouseMotionListener.Stub
-	implements MouseListener
-{
-	private Point startLocation;
-	private Point viewLocation;
-	
-	public void mouseDoubleClicked(MouseEvent me) { }
-
-	public void mouseDragged(MouseEvent me) {
-		Dimension d = me.getLocation().getDifference(startLocation);
-		d.scale(1.0f / getViewportScaleX(), 1.0f / getViewportScaleY());
-		viewport.setViewLocation(viewLocation.getTranslated(d));
-		me.consume();
-	}
-
-	public void mousePressed(MouseEvent me) {
-		startLocation = me.getLocation();
-		viewLocation = viewport.getViewLocation();
-		me.consume();
-	}
-
-	public void mouseReleased(MouseEvent me) { }
-}
-
-private class SelectorFigure
-	extends Figure
-{
-	{
-		Display display = Display.getCurrent();
-		PaletteData pData = new PaletteData(0xFF, 0xFF00, 0xFF0000);
-		RGB rgb = ColorConstants.menuBackgroundSelected.getRGB();
-		int fillColor = pData.getPixel(rgb);
-		ImageData iData = new ImageData(1, 1, 24, pData);
-		iData.setPixel(0, 0, fillColor);
-		iData.setAlpha(0, 0, 55);
-		image = new Image(display, iData);
-	}
-	private Rectangle iBounds = new Rectangle(0, 0, 1, 1);
-
-	private Image image;
-	
-	protected void dispose() {
-		image.dispose();
-	}
-
-	public void paintFigure(Graphics g) {
-		Rectangle bounds = getBounds().getCopy();		
-
-		// Avoid drawing images that are 0 in dimension
-		if (bounds.width < 5 || bounds.height < 5)
-			return;
-			
-		// Don't paint the selector figure if the entire source is visible.
-		Dimension thumbnailSize = new Dimension(getThumbnailImage());
-		// expand to compensate for rounding errors in calculating bounds
-		Dimension size = getSize().getExpanded(1, 1); 
-		if (size.contains(thumbnailSize))
-			return;
-
-		bounds.height--;
-		bounds.width--;
-		g.drawImage(image, iBounds, bounds);
-		
-		g.setForegroundColor(ColorConstants.menuBackgroundSelected);
-		g.drawRectangle(bounds);
-	}
-
-}
-private FigureListener figureListener = new FigureListener() {
-	public void figureMoved(IFigure source) {
-		reconfigureSelectorBounds();
-	}
-};
-private KeyListener keyListener = new KeyListener.Stub() {
-	public void keyPressed(KeyEvent ke) {
-		int moveX = viewport.getClientArea().width / 4; 
-		int moveY = viewport.getClientArea().height / 4;
-		if (ke.keycode == SWT.HOME || (isMirrored() ? ke.keycode == SWT.ARROW_RIGHT
-				: ke.keycode == SWT.ARROW_LEFT))
-			viewport.setViewLocation(viewport.getViewLocation().translate(-moveX, 0));
-		else if (ke.keycode == SWT.END || (isMirrored() ? ke.keycode == SWT.ARROW_LEFT
-				: ke.keycode == SWT.ARROW_RIGHT))
-			viewport.setViewLocation(viewport.getViewLocation().translate(moveX, 0));
-		else if (ke.keycode == SWT.ARROW_UP || ke.keycode == SWT.PAGE_UP)
-			viewport.setViewLocation(viewport.getViewLocation().translate(0, -moveY));
-		else if (ke.keycode == SWT.ARROW_DOWN  || ke.keycode == SWT.PAGE_DOWN)
-			viewport.setViewLocation(viewport.getViewLocation().translate(0, moveY));
-		}
-	};
-
-private PropertyChangeListener propListener = new PropertyChangeListener() {
-	public void propertyChange(PropertyChangeEvent evt) {
-		reconfigureSelectorBounds();
-	}
-};
-
-private SelectorFigure selector;
-
-private ScrollSynchronizer syncher;
-private Viewport viewport;
-
-/**
- * Creates a new ScrollableThumbnailEx.
- */
-public ScrollableThumbnailEx() {
-	super();
-	initialize();
-}
-
-/**
- * Creates a new ScrollableThumbnailEx that synchs with the given Viewport.
- * @param port The Viewport
- */
-public ScrollableThumbnailEx(Viewport port) {
-	super();
-	setViewport(port);
-	initialize();
-}
-
-/**
- * @see ThumbnailEx#deactivate()
- */
-public void deactivate() {
-	viewport.removePropertyChangeListener(Viewport.PROPERTY_VIEW_LOCATION, propListener);
-	viewport.removeFigureListener(figureListener);
-	remove(selector);
-	selector.dispose();
-	super.deactivate();
-}
-
-private double getViewportScaleX() {
-	return (double)targetSize.width / viewport.getContents().getBounds().width;
-}
-
-private double getViewportScaleY() {
-	return (double)targetSize.height / viewport.getContents().getBounds().height;
-}
-
-private void initialize() {
-	selector = new SelectorFigure();
-	selector.addMouseListener(syncher = new ScrollSynchronizer());
-	selector.addMouseMotionListener(syncher);
-	selector.setFocusTraversable(true);
-	selector.addKeyListener(keyListener);
-	add(selector);
-	ClickScrollerAndDragTransferrer transferrer = 
-				new ClickScrollerAndDragTransferrer();
-	addMouseListener(transferrer);
-	addMouseMotionListener(transferrer);
-}
-
-private void reconfigureSelectorBounds() {
-	Rectangle rect = new Rectangle();
-	Point offset = viewport.getViewLocation();
-	offset.x -= viewport.getHorizontalRangeModel().getMinimum();
-	offset.y -= viewport.getVerticalRangeModel().getMinimum();
-	rect.setLocation(offset);
-	rect.setSize(viewport.getClientArea().getSize());
-	rect.scale(getViewportScaleX(), getViewportScaleY());
-	rect.translate(getClientArea().getLocation());
-	selector.setBounds(rect);
-}
-
-/**
- * Reconfigures the SelectorFigure's bounds if the scales have changed.
- * @param scaleX The X scale
- * @param scaleY The Y scale
- * @see org.eclipse.draw2d.parts.Thumbnail#setScales(float, float)
- */
-protected void setScales(float scaleX, float scaleY) {
-	if (scaleX == getScaleX() && scaleY == getScaleY())
-		return;
-		
-	super.setScales(scaleX, scaleY);
-	reconfigureSelectorBounds();
-}
-
-/**
- * Sets the Viewport that this ScrollableThumbnailEx will synch with.
- * @param port The Viewport
- */
-public void setViewport(Viewport port) {
-	port.addPropertyChangeListener(Viewport.PROPERTY_VIEW_LOCATION, propListener);
-	port.addFigureListener(figureListener);
-	viewport = port;
-}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/parts/ThumbnailEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/parts/ThumbnailEx.java
deleted file mode 100644
index 8927cab..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/parts/ThumbnailEx.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.parts;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.UpdateListener;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.ui.util.DisplayUtils;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.graphics.ScaledGraphics;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A ThumbnailEx is a Figure that displays an image of its source Figure at a 
- * smaller size. The ThumbnailEx will maintain the aspect ratio of the source 
- * Figure.<br>
- * Code modified to resolve {@link https://bugs.eclipse.org/bugs/show_bug.cgi?id=230056}
- * 
- * @author Eric Bordeau
- */
-public class ThumbnailEx 
-	extends Figure 
-	implements UpdateListener
-{
-
-/**
- * This updates the ThumbnailEx by breaking the thumbnail {@link Image} into
- * several tiles and updating each tile individually.  
- */
-class ThumbnailUpdater implements Runnable {
-	private static final int NUMBER_OF_TILES = 16;
-	int maxHBufferSize = 256, maxVBufferSize = 256;
-	private int currentHTile, currentVTile;
-	private int hTiles, vTiles;
-	private boolean isActive = true;
-
-	private boolean isRunning = false;
-	private GC thumbnailGC;
-	private ScaledGraphics thumbnailGraphics;
-	private Dimension tileSize;
-	
-	/**
-	 * Stops the updater and disposes of any resources.
-	 */
-	public void deactivate() {
-		setActive(false);
-		stop();
-		if (thumbnailImage != null) {
-			thumbnailImage.dispose();
-			thumbnailImage = null;
-			thumbnailImageSize = null;
-		}
-	}
-	
-	/**
-	 * Returns the current horizontal tile index.
-	 * @return current horizontal tile index.
-	 */
-	protected int getCurrentHTile() {
-		return currentHTile;
-	}
-
-	/**
-	 * Returns the current vertical tile index.
-	 * @return current vertical tile index.
-	 */
-	protected int getCurrentVTile() {
-		return currentVTile;
-	}
-	
-	/**
-	 * Returns <code>true</code> if this ThumbnailUpdater is active.  An inactive
-	 * updater has disposed of its {@link Image}.  The updater may be active and 
-	 * not currently running.  
-	 * @return <code>true</code> if this ThumbnailUpdater is active
-	 */
-	public boolean isActive() {
-		return isActive;
-	}
-	
-	/**
-	 * Returns <code>true</code> if this is currently running and updating at
-	 * least one tile on the thumbnail {@link Image}.  
-	 * @return <code>true</code> if this is currently running
-	 */
-	public boolean isRunning() {
-		return isRunning;
-	}
-	
-	/**
-	 * Resets the number of vertical and horizontal tiles, as well as the tile
-	 * size and current tile index.
-	 */
-	public void resetTileValues() {
-		maxHBufferSize = Math.max(1, getSourceRectangle().width / NUMBER_OF_TILES); 
-		maxVBufferSize = Math.max(1, getSourceRectangle().width / NUMBER_OF_TILES); 
-		
-		hTiles = (int)Math.ceil((float)getSourceRectangle().width 
-									/ (float)maxHBufferSize);
-		vTiles = (int)Math.ceil((float)getSourceRectangle().height 
-									/ (float)maxVBufferSize);
-		
-		tileSize = new Dimension((int)Math.ceil((float)getSourceRectangle().width 
-									/ (float)hTiles),
-								(int)Math.ceil((float)getSourceRectangle().height 
-									/ (float)vTiles));
-		
-		currentHTile = 0;
-		currentVTile = 0;
-	}
-	
-	/**
-	 * Restarts the updater.
-	 */
-	public void restart() {
-		stop();
-		start();
-	}
-	
-	/**
-	 * Updates the current tile on the ThumbnailEx.  An area of the source Figure
-	 * is painted to an {@link Image}.  That Image is then drawn on the 
-	 * ThumbnailEx.  Scaling of the source Image is done inside
-	 * {@link GC#drawImage(Image, int, int, int, int, int, int, int, int)} since
-	 * the source and target sizes are different.  The current tile indexes are
-	 * incremented and if more updating is necesary, this {@link Runnable} is 
-	 * called again in a {@link Display#timerExec(int, Runnable)}.  If no more
-	 * updating is required, {@link #stop()} is called.
-	 */
-	public void run() {
-		if (!isActive() || !isRunning())
-			return;
-		int v = getCurrentVTile();
-		int sy1 = v * tileSize.height;
-		int sy2 = Math.min((v + 1) * tileSize.height, getSourceRectangle().height);
-		
-		int h = getCurrentHTile();
-		int sx1 = h * tileSize.width;
-		int sx2 = Math.min((h + 1) * tileSize.width, getSourceRectangle().width);
-		org.eclipse.draw2d.geometry.Point p = getSourceRectangle().getLocation();
-
-		Rectangle rect = new Rectangle(sx1 + p.x, sy1 + p.y, sx2 - sx1, sy2 - sy1);
-		thumbnailGraphics.pushState();
-		thumbnailGraphics.setClip(rect);
-		thumbnailGraphics.fillRectangle(rect);
-		sourceFigure.paint(thumbnailGraphics);
-		thumbnailGraphics.popState();
-		
-		if (getCurrentHTile() < (hTiles - 1))
-			setCurrentHTile(getCurrentHTile() + 1);
-		else {
-			setCurrentHTile(0);
-			if (getCurrentVTile() < (vTiles - 1))
-				setCurrentVTile(getCurrentVTile() + 1);
-			else
-				setCurrentVTile(0);
-		}
-		
-		if (getCurrentHTile() != 0 || getCurrentVTile() != 0)
-			Display.getCurrent().asyncExec(this);
-		else if (isDirty()) {
-			setDirty(false);
-			Display.getCurrent().asyncExec(this);
-			repaint();
-		} else {
-			stop();
-			repaint();
-		}
-	}
-	
-	/**
-	 * Sets the active flag.
-	 * @param value The active value
-	 */
-	public void setActive(boolean value) {
-		isActive = value;
-	}
-	
-	/**
-	 * Sets the current horizontal tile index.
-	 * @param count current horizontal tile index
-	 */
-	protected void setCurrentHTile(int count) {
-		currentHTile = count;
-	}
-	
-	/**
-	 * Sets the current vertical tile index.
-	 * @param count current vertical tile index
-	 */
-	protected void setCurrentVTile(int count) {
-		currentVTile = count;
-	}
-	
-	/**
-	 * Starts this updater.  This method initializes all the necessary resources
-	 * and puts this {@link Runnable} on the asynch queue.  If this updater is
-	 * not active or is already running, this method just returns.
-	 */
-	public void start() {
-		if (!isActive() || isRunning())
-			return;
-		
-		isRunning = true;
-		setDirty(false);		
-		resetTileValues();
-		
-		if (!targetSize.equals(thumbnailImageSize)) {
-			resetThumbnailImage();
-		}
-		
-		if (targetSize.isEmpty())
-			return;
-		
-		thumbnailGC = new GC(thumbnailImage, 
-				sourceFigure.isMirrored() ? SWT.RIGHT_TO_LEFT : SWT.NONE);
-		thumbnailGraphics = new ScaledGraphics(new SWTGraphics(thumbnailGC));
-		thumbnailGraphics.scale(getScaleX());
-		thumbnailGraphics.translate(getSourceRectangle().getLocation().negate());
-		
-		Color color = sourceFigure.getForegroundColor();
-		if (color != null)
-			thumbnailGraphics.setForegroundColor(color);
-		color = sourceFigure.getBackgroundColor();
-		if (color != null)
-			thumbnailGraphics.setBackgroundColor(color);
-		thumbnailGraphics.setFont(sourceFigure.getFont());
-	
-		setScales(targetSize.width / (float)getSourceRectangle().width,
-			     targetSize.height / (float)getSourceRectangle().height);
-
-		Display.getCurrent().asyncExec(this);
-	}
-
-	/**
-	 * 
-	 * @since 3.2
-	 */
-	private void resetThumbnailImage() {
-		if (thumbnailImage != null)
-			thumbnailImage.dispose();
-		
-		if (!targetSize.isEmpty()) {
-			thumbnailImage = new Image(DisplayUtils.getDisplay(), 
-					targetSize.width, 
-					targetSize.height);
-			thumbnailImageSize = new Dimension(targetSize);
-		}
-		else {
-			thumbnailImage = null;
-			thumbnailImageSize = new Dimension(0, 0);
-		}
-	}
-	
-	/**
-	 * Stops this updater.  Also disposes of resources (except the thumbnail
-	 * image which is still needed for painting).
-	 */
-	public void stop() {
-		isRunning = false;
-		if (thumbnailGC != null) {
-			thumbnailGC.dispose();
-			thumbnailGC = null;
-		}
-		if (thumbnailGraphics != null) {
-			thumbnailGraphics.dispose();
-			thumbnailGraphics = null;
-		}
-		// Don't dispose of the thumbnail image since it is needed to paint the 
-		// figure when the source is not dirty (i.e. showing/hiding the dock).
-	}
-}
-private boolean isDirty;
-private float scaleX;
-private float scaleY;
-
-private IFigure sourceFigure;
-Dimension targetSize = new Dimension(0, 0);
-private Image thumbnailImage;
-private Dimension thumbnailImageSize;
-private ThumbnailUpdater updater = new ThumbnailUpdater();
-
-/**
- * Creates a new ThumbnailEx.  The source Figure must be set separately if you
- * use this constructor.
- */
-public ThumbnailEx() {
-	super();	
-}
-
-/**
- * Creates a new ThumbnailEx with the given IFigure as its source figure.
- * @param fig The source figure
- */
-public ThumbnailEx(IFigure fig) {
-	this();
-	setSource(fig);
-}
-
-private Dimension adjustToAspectRatio(Dimension size, boolean adjustToMaxDimension) {
-	Dimension sourceSize = getSourceRectangle().getSize();
-	Dimension borderSize = new Dimension(getInsets().getWidth(), getInsets().getHeight());
-	size.expand(borderSize.getNegated());
-	int width, height;
-	if (adjustToMaxDimension) {
-		width  = Math.max(size.width, (int)(size.height * sourceSize.width 
-											/ (float)sourceSize.height + 0.5));
-		height = Math.max(size.height, (int)(size.width * sourceSize.height 
-											/ (float)sourceSize.width + 0.5));
-	} else {
-		width  = Math.min(size.width,  (int)(size.height * sourceSize.width 
-											/ (float)sourceSize.height + 0.5));
-		height = Math.min(size.height, (int)(size.width * sourceSize.height 
-											/ (float)sourceSize.width + 0.5));
-	}
-	size.width  = width;
-	size.height = height;
-	return size.expand(borderSize);
-}
-
-/**
- * Deactivates this ThumbnailEx.
- */
-public void deactivate() {
-	sourceFigure.getUpdateManager().removeUpdateListener(this);
-	updater.deactivate();
-}
-
-/**
- * Returns the preferred size of this ThumbnailEx.  The preferred size will be 
- * calculated in a way that maintains the source Figure's aspect ratio.
- * 
- * @param wHint The width hint
- * @param hHint The height hint
- * @return The preferred size
- */
-public Dimension getPreferredSize(int wHint, int hHint) {
-	if (prefSize == null)
-		return adjustToAspectRatio(getBounds().getSize(), false);
-		
-	Dimension preferredSize = adjustToAspectRatio(prefSize.getCopy(), true);
-	
-	if (maxSize == null)
-		return preferredSize;
-	
-	Dimension maximumSize = adjustToAspectRatio(maxSize.getCopy(), true);
-	if (preferredSize.contains(maximumSize))
-		return maximumSize;
-	else
-		return preferredSize;
-}
-
-/**
- * Returns the scale factor on the X-axis.
- * @return X scale
- */
-protected float getScaleX() {
-	return scaleX;
-}
-
-/**
- * Returns the scale factor on the Y-axis.
- * @return Y scale
- */
-protected float getScaleY() {
-	return scaleY;
-}
-
-/**
- * Returns the source figure being used to generate a thumbnail.
- * @return the source figure
- */
-protected IFigure getSource() {
-	return sourceFigure;
-}
-
-/**
- * Returns the rectangular region relative to the source figure which will be the basis of
- * the thumbnail.  The value may be returned by reference and should not be modified by
- * the caller.
- * @since 3.1
- * @return the region of the source figure being used for the thumbnail
- */
-protected Rectangle getSourceRectangle() {
-	return sourceFigure.getBounds();
-}
-
-/**
- * Returns the scaled Image of the source Figure.  If the Image needs to be 
- * updated, the ThumbnailUpdater will notified.
- * 
- * @return The thumbnail image
- */
-protected Image getThumbnailImage() {
-	Dimension oldSize = targetSize;
-	targetSize = getPreferredSize();
-	targetSize.expand(new Dimension(getInsets().getWidth(), 
-									getInsets().getHeight()).negate());
-	setScales(targetSize.width / (float)getSourceRectangle().width,
-		     targetSize.height / (float)getSourceRectangle().height);
-	if ((isDirty()) && !updater.isRunning())
-		updater.start();
-	else if (oldSize != null && !targetSize.equals(oldSize)) {
-		revalidate();
-		updater.restart();
-	}
-	
-	return thumbnailImage;
-}
-
-/**
- * Returns <code>true</code> if the source figure has changed.
- * @return <code>true</code> if the source figure has changed
- */
-protected boolean isDirty() {
-	return isDirty;
-}
-
-/**
- * @see org.eclipse.draw2d.UpdateListener#notifyPainting(Rectangle, Map)
- */
-public void notifyPainting(Rectangle damage, Map dirtyRegions) {
-	Iterator dirtyFigures = dirtyRegions.keySet().iterator();
-	while (dirtyFigures.hasNext()) {
-		IFigure current = (IFigure)dirtyFigures.next();
-		while (current != null) {
-			if (current == getSource()) {
-				setDirty(true);
-				repaint();
-				return;
-			}
-			current = current.getParent();
-		}
-	}
-}
-
-/**
- * @see org.eclipse.draw2d.UpdateListener#notifyValidating()
- */
-public void notifyValidating() {
-//	setDirty(true);
-//	revalidate();
-}
-
-/**
- * @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
- */
-protected void paintFigure(Graphics graphics) {
-	Image thumbnail = getThumbnailImage();
-	if (thumbnail == null)
-		return;
-	graphics.drawImage(thumbnail, getClientArea().getLocation());
-}
-
-/**
- * Sets the dirty flag.
- * @param value The dirty value
- */
-public void setDirty(boolean value) {
-	isDirty = value;
-}
-
-/**
- * Sets the X and Y scales for the ThumbnailEx.  These scales represent the ratio
- * between the source figure and the ThumbnailEx.
- * @param x The X scale
- * @param y The Y scale
- */
-protected void setScales(float x, float y) {
-	scaleX = x;
-	scaleY = y;
-}
-
-/**
- * Sets the source Figure.  Also sets the scales and creates the necessary
- * update manager.
- * @param fig The source figure
- */
-public void setSource(IFigure fig) {
-	if (sourceFigure == fig)
-		return;
-	if (sourceFigure != null)
-		sourceFigure.getUpdateManager().removeUpdateListener(this);
-	sourceFigure = fig;
-	if (sourceFigure != null) {
-		setScales((float)getSize().width / (float)getSourceRectangle().width,
-				(float)getSize().height / (float)getSourceRectangle().height);
-		sourceFigure.getUpdateManager().addUpdateListener(this);
-		repaint();
-	}
-}
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemObliqueRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemObliqueRouter.java
deleted file mode 100644
index dd77571..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemObliqueRouter.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.Path;
-import org.eclipse.draw2d.graph.ShortestPathRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * Implementation of the router that is routing connections, where at least one
- * end is a border item. This router is most suitable to work for small
- * port-like border items sitting on the border of larger shapes.
- * 
- * @author aboyko
- * 
- */
-public class BorderItemObliqueRouter extends ObliqueRouter {
-
-	private static int OFFSET = 15;
-
-	/**
-	 * utility method to reverses the position
-	 * 
-	 * @param position
-	 *            the position to reverse
-	 * @return the reversed position
-	 */
-	private int reversePosition(int position) {
-		int newPosition = position;
-		if (position == PositionConstants.SOUTH)
-			newPosition = PositionConstants.NORTH;
-		else if (position == PositionConstants.NORTH)
-			newPosition = PositionConstants.SOUTH;
-		else if (position == PositionConstants.WEST)
-			newPosition = PositionConstants.EAST;
-		else if (position == PositionConstants.EAST)
-			newPosition = PositionConstants.WEST;
-		return newPosition;
-	}
-
-	/**
-	 * Returns the position of the border item with respect to its parent
-	 * Clients can override this method to change the way postions is calculated
-	 * for border items
-	 * 
-	 * @param borderFigure
-	 *            Figure to use to get the position
-	 * @return the border item position, see <code>PositionConstants</code>
-	 */
-	protected int getBorderFigurePosition(IFigure borderFigure) {
-		IFigure child = borderFigure;
-		IFigure parent = borderFigure.getParent();
-		if (parent != null && parent.getLayoutManager() != null) {
-			LayoutManager layoutManager = parent.getLayoutManager();
-			Object layoutConstraint = layoutManager.getConstraint(child);
-			if (layoutConstraint instanceof IBorderItemLocator) {
-				return ((IBorderItemLocator) layoutConstraint)
-						.getCurrentSideOfParent();
-			}
-		}
-		return PositionConstants.NONE;
-	}
-
-	/**
-	 * Returns the obstacle that the route should try to avoid, for example if
-	 * the isBordereItem flag is ON, it will return the rectangle of the border
-	 * item parent. This method can be overriden by clients to provide a client
-	 * specific way to find the obstacle
-	 * 
-	 * @param figure,
-	 *            figure to get the obstacle for
-	 * @param conn,
-	 *            the connection the router is routing
-	 * @param isBorderItem,
-	 *            indicates if the passed figure is a border item figrue or not
-	 * @return obstacle
-	 */
-	protected Rectangle getObstacle(IFigure figure, Connection conn,
-			boolean isBorderItem) {
-		IFigure parent = null;
-		if (isBorderItem)
-			parent = getBorderItemParent(figure);
-		else
-			parent = figure;
-		Rectangle rect = parent.getBounds().getCopy();
-		parent.translateToAbsolute(rect);
-		conn.translateToRelative(rect);
-		return rect;
-	}
-
-	/**
-	 * return the parent of a border item figure clients can override this
-	 * method to find the
-	 * 
-	 * @param figure,
-	 *            the border item figure
-	 * @return the parent of the border item
-	 */
-	protected IFigure getBorderItemParent(IFigure figure) {
-		return figure.getParent().getParent();
-	}
-
-	private Point getPointOffsetFromRectangle(Rectangle rectangle,
-			int position, int offset) {
-		Point p = getMiddlePointFromPosition(rectangle, position);
-		offsetPointBasedOnPosition(p, position, offset);
-		return p;
-	}
-
-	/**
-	 * Returns the center of the rectangle edge specified by its geographic
-	 * position
-	 * 
-	 * @param rectangle
-	 *            rectangle
-	 * @param position
-	 *            geographic position
-	 * @return the center-point
-	 */
-	private Point getMiddlePointFromPosition(Rectangle rectangle, int position) {
-		if (position == PositionConstants.SOUTH)
-			return rectangle.getBottom();
-		else if (position == PositionConstants.NORTH)
-			return rectangle.getTop();
-		else if (position == PositionConstants.WEST)
-			return rectangle.getLeft();
-		else if (position == PositionConstants.EAST)
-			return rectangle.getRight();
-		return rectangle.getCenter();
-	}
-
-	/**
-	 * Offsets a point by an offset value based on the geographic direction
-	 * 
-	 * @param point
-	 *            point
-	 * @param direction
-	 *            geographic direction
-	 * @param offset
-	 *            offset value
-	 */
-	private void offsetPointBasedOnPosition(Point point, int direction,
-			int offset) {
-		if (direction == PositionConstants.SOUTH)
-			point.y += offset;
-		else if (direction == PositionConstants.NORTH)
-			point.y -= offset;
-		else if (direction == PositionConstants.WEST)
-			point.x -= offset;
-		else if (direction == PositionConstants.EAST)
-			point.x += offset;
-	}
-
-	/**
-	 * Based on the start and end points creates a list of points that will
-	 * avoid overlapping with border item(s) owner figure(s). Writes the
-	 * resultant points in <code>line</code>
-	 * 
-	 * @param startPoint
-	 *            start point
-	 * @param endPoint
-	 *            end point
-	 * @param sourceParentRect
-	 *            source border item figure owner bounds
-	 * @param targetParentRect
-	 *            target border item figure owner bounds
-	 * @param line
-	 *            list of resultant points
-	 * @param conn
-	 *            connection
-	 * @param offset
-	 *            offset value
-	 */
-	private void avoidOverlappingWithParent(Point startPoint, Point endPoint,
-			Rectangle sourceParentRect, Rectangle targetParentRect,
-			PointList line, Connection conn, int offset) {
-		// use GEF's shortest path router to get reference bend points
-		ShortestPathRouter router = new ShortestPathRouter();
-		Path path = new Path(startPoint, endPoint);
-		router.addPath(path);
-		if (sourceParentRect.contains(targetParentRect)) {
-			router.addObstacle(targetParentRect);
-		} else if (targetParentRect.contains(sourceParentRect)) {
-			router.addObstacle(sourceParentRect);
-		} else {
-			router.addObstacle(sourceParentRect);
-			router.addObstacle(targetParentRect);
-		}
-		router.setSpacing(offset);
-		router.solve();
-		line.removeAllPoints();
-		line.addAll(path.getPoints());
-	}
-
-	/**
-	 * Calculates and writes the list of bendpoints to <code>newLine</code>
-	 * 
-	 * Note: All geometric figures are in the same coordinate system (relative
-	 * to connection figure usually)
-	 * 
-	 * @param sourceRect
-	 *            source shape rectangle
-	 * @param targetRect
-	 *            target shape rectangle
-	 * @param sourcePosition
-	 *            geographic position of the source relative to its owner (if
-	 *            source is a border item)
-	 * @param targetPosition
-	 *            geographic position of the target relative to its owner (if
-	 *            target is a border item)
-	 * @param sourceParentRect
-	 *            owner of the source figure (if source is a border item)
-	 * @param targetParentRect
-	 *            owner of the target figure (if target is a border item)
-	 * @param conn
-	 *            connection
-	 * @param newLine
-	 *            the list for bendpoints
-	 * @param offset
-	 *            offset value
-	 */
-	private void getVerticesForBorderItemConnection(Rectangle sourceRect,
-			Rectangle targetRect, int sourcePosition, int targetPosition,
-			Rectangle sourceParentRect, Rectangle targetParentRect,
-			Connection conn, PointList newLine, int offset) {
-		if (sourcePosition != PositionConstants.NONE) {
-			newLine.setPoint(getPointOffsetFromRectangle(sourceRect,
-					sourcePosition, offset), 0);
-		}
-
-		if (targetPosition != PositionConstants.NONE) {
-			newLine.setPoint(getPointOffsetFromRectangle(targetRect,
-					targetPosition, offset), newLine.size() - 1);
-		}
-
-		/*
-		 * For now will just avoid overlapping with owner figures. This is to be
-		 * modified to support "Avoid Obstructions"
-		 */
-		avoidOverlappingWithParent(newLine.getFirstPoint(), newLine
-				.getLastPoint(), sourceParentRect, targetParentRect, newLine,
-				conn, offset);
-		if (sourcePosition != PositionConstants.NONE) {
-			newLine.insertPoint(getMiddlePointFromPosition(sourceRect,
-					sourcePosition), 0);
-		}
-
-		if (targetPosition != PositionConstants.NONE) {
-			newLine.addPoint(getMiddlePointFromPosition(targetRect,
-					targetPosition));
-		}
-	}
-
-	/**
-	 * Checks whether the connection needs to routed by this class. The check is
-	 * made base on the following criterias:
-	 * <li>1. Source and/or target of the
-	 * connection is a border item
-	 * <li>2. If source and target intersect then the
-	 * routing is done by {@link #checkShapesIntersect(Connection, PointList)}
-	 * <li>3. There are no extra (introduced by user) bendpoints (i.e just source
-	 * and target anchor points)
-	 * <li>4. If a line connecting border item(s) intersect bounds of border item owner figure(s)
-	 * 
-	 * <p>If 1-4 are satisfied then connection bendpoints are calculated and
-	 * <code>newLine</code> will containt the list of new bendpoints
-	 * 
-	 * <p>Note: the router currently does not support "Avoid Obstruction" and
-	 * "Shortest Path" routings
-	 * 
-	 * @param conn
-	 *            connection
-	 * @param newLine
-	 *            connection's list of points - modified by the method as needed
-	 *            to return bendpoints for routed connection
-	 * @return true if connection bendpoints got calculated (i.e. 1-4 are
-	 *         satisfied)
-	 */
-	private boolean checkBorderItemConnection(Connection conn, PointList newLine) {
-		IFigure source = conn.getSourceAnchor().getOwner();
-		IFigure target = conn.getTargetAnchor().getOwner();
-
-		int sourcePosition = getBorderFigurePosition(source);
-		int targetPosition = getBorderFigurePosition(target);
-
-		/*
-		 * Criteria 1. Source and/or target of the connection is a border item
-		 */
-		if (sourcePosition == PositionConstants.NONE
-				&& targetPosition == PositionConstants.NONE) {
-			return false;
-		}
-
-		Rectangle sourceParentRect = getObstacle(source, conn,
-				(sourcePosition != PositionConstants.NONE));
-		Rectangle targetParentRect = getObstacle(target, conn,
-				(targetPosition != PositionConstants.NONE));
-		if (!sourceParentRect.equals(targetParentRect)) {
-			if (sourceParentRect.contains(targetParentRect)) {
-				sourcePosition = reversePosition(sourcePosition);
-			} else if (targetParentRect.contains(sourceParentRect)) {
-				targetPosition = reversePosition(targetPosition);
-			}
-		}
-
-		// protection code to prevent NPE while creating the connection
-		if (newLine == null) {
-			return false;
-		}
-
-		PrecisionRectangle sourceRect = new PrecisionRectangle(source
-				.getBounds());
-		source.translateToAbsolute(sourceRect);
-		conn.translateToRelative(sourceRect);
-		PrecisionRectangle targetRect = new PrecisionRectangle(target
-				.getBounds());
-		target.translateToAbsolute(targetRect);
-		conn.translateToRelative(targetRect);
-
-		/*
-		 * Criteria 2. Check if connection is between border item and the owner
-		 * of the border item, which are intersecting
-		 */
-		if (sourceRect.intersects(targetRect)
-				&& !sourceRect.contains(targetRect)
-				&& !targetRect.contains(sourceRect)) {
-			return false;
-		}
-
-		/*
-		 * Criteria 3. There are no extra (introduced by user) bendpoints (i.e
-		 * just source and target anchor points)
-		 */
-		if (newLine.size() < 3) {
-			/*
-			 * Criteria 4. If a line connecting border item(s) intersect bounds
-			 * of border item owner figure(s)
-			 */
-			PrecisionPoint sourceAnchorPoint = new PrecisionPoint(conn
-					.getSourceAnchor().getLocation(
-							conn.getTargetAnchor().getReferencePoint()));
-			PrecisionPoint targetAnchorPoint = new PrecisionPoint(conn
-					.getTargetAnchor().getLocation(
-							conn.getSourceAnchor().getReferencePoint()));
-			conn.translateToRelative(sourceAnchorPoint);
-			conn.translateToRelative(targetAnchorPoint);
-			PointList connLine = new PointList();
-			connLine.addPoint(sourceAnchorPoint);
-			connLine.addPoint(targetAnchorPoint);
-			boolean sourceOk = false, targetOk = false;
-			sourceOk = targetOk = !sourceParentRect.equals(targetParentRect);
-			sourceOk &= sourcePosition == PositionConstants.NONE
-					|| sourceParentRect.contains(targetParentRect)
-					|| (!sourceParentRect.contains(connLine.getFirstPoint()) && !PointListUtilities
-							.findIntersections(connLine, PointListUtilities
-									.createPointsFromRect(sourceParentRect),
-									new PointList(), new PointList()));
-			targetOk &= !sourceOk
-					|| targetPosition == PositionConstants.NONE
-					|| targetParentRect.contains(sourceParentRect)
-					|| (!targetParentRect.contains(connLine.getLastPoint()) && !PointListUtilities
-							.findIntersections(connLine, PointListUtilities
-									.createPointsFromRect(targetParentRect),
-									new PointList(), new PointList()));
-
-			if (!sourceOk || !targetOk) {
-				PrecisionPoint offsetPt = new PrecisionPoint();
-				offsetPt.preciseX = OFFSET;
-				offsetPt.updateInts();
-				if (!RouterHelper.getInstance().isFeedback(conn)) {
-					offsetPt = (PrecisionPoint) MapModeUtil.getMapMode(conn)
-							.DPtoLP(offsetPt);
-				}
-				int offset = offsetPt.x;
-
-				getVerticesForBorderItemConnection(sourceRect, targetRect,
-						sourcePosition, targetPosition, sourceParentRect,
-						targetParentRect, conn, newLine, offset);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter#calculateBendPoints(org.eclipse.draw2d.Connection)
-	 */
-	protected PointList calculateBendPoints(Connection conn) {
-		/*
-		 * Do not support "Avoid Obstruction" and "Shortest Path" routings
-		 */
-		IFigure source = conn.getSourceAnchor().getOwner();
-		IFigure target = conn.getTargetAnchor().getOwner();		
-		if (source == null || target == null || isAvoidingObstructions(conn)
-				|| isClosestDistance(conn)) {
-			return super.calculateBendPoints(conn);
-		}	
-		
-		/*
-		 * Get bendpoints stored in the model first and based on the number of
-		 * them and presence of border items either on the end or on the target
-		 * of the connection decide whether the connection needs to be routed by
-		 * this class
-		 */
-		PointList newLine = RouterHelper.getInstance()
-				.routeFromConstraint(conn);
-		if (checkBorderItemConnection(conn, newLine)) {
-			return newLine;
-		}
-		return super.calculateBendPoints(conn);
-	}
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemRectilinearRouter.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemRectilinearRouter.java
deleted file mode 100644
index a270194..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BorderItemRectilinearRouter.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.AnchorListener;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Geometry;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.Path;
-import org.eclipse.draw2d.graph.ShortestPathRouter;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-/**
- * @author mmostafa
- *
- * RectilinearRouter which is aware of border items
- * This router, will make sure that it connects to teh correct side of teh border item
- * Also, it willmake sure that it never overlape the border item container
- * 
- */
-
-public class BorderItemRectilinearRouter
-    extends RectilinearRouter {
-
-    private static int OFFSET = 15;
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.draw2d.ui.internal.routers.ObliqueRouter#calculateBendPoints(org.eclipse.draw2d.Connection)
-     */
-    protected PointList calculateBendPoints(Connection conn) {
-        IFigure source = conn.getSourceAnchor().getOwner();
-        IFigure target = conn.getTargetAnchor().getOwner();
-        PointList bends = super.calculateBendPoints(conn);
-        if (source == null || target == null || isAvoidingObstructions(conn) || isClosestDistance(conn)
-        		|| bends.size() > 2) {
-            // reorient
-            return bends;
-        }
-
-        int sourcePosition = getBorderFigurePosition(source);
-        int targetPosition = getBorderFigurePosition(target);
-        
-        if (sourcePosition == PositionConstants.NONE && targetPosition == PositionConstants.NONE) {
-        	return bends;
-        }
-        
-        PolylineConnectionEx fakeConnection = new PolylineConnectionEx() {
-
-            public void validate() {
-                // no need to validate
-            }
-
-            public void paintFigure(Graphics graphics) {
-                // nothing to paint
-            }
-        };
-        Rectangle sourceParentRect = getObstacle(source, conn, (sourcePosition != PositionConstants.NONE));
-        Rectangle targetParentRect = getObstacle(target, conn, (targetPosition != PositionConstants.NONE));
-        if (bends.size() == 2
-        		&& (sourcePosition == PositionConstants.NONE || (sourcePosition != PositionConstants.NONE && !lineIntersectRectangle(bends.getFirstPoint(), bends.getLastPoint(), sourceParentRect)))
-        		&& (targetPosition == PositionConstants.NONE || (targetPosition != PositionConstants.NONE && !lineIntersectRectangle(bends.getFirstPoint(), bends.getLastPoint(), targetParentRect)))) {
-           	return bends;
-        }
-        if (sourceParentRect.contains(targetParentRect)) {
-            sourcePosition = reversePosition(sourcePosition);
-        } else if (targetParentRect.contains(sourceParentRect)) {
-            targetPosition = reversePosition(targetPosition);
-        }
-
-        fakeConnection.setSourceAnchor(new BorderItemConnectionAnchor(conn
-            .getSourceAnchor(), sourcePosition, OFFSET));
-        fakeConnection.setTargetAnchor(new BorderItemConnectionAnchor(conn
-            .getTargetAnchor(), targetPosition, OFFSET));
-
-        fakeConnection.setConnectionRouter(conn.getConnectionRouter());
-        List originalbendpoints = (ArrayList) conn.getConnectionRouter()
-            .getConstraint(conn);
-        // protection code to prevent NPE while creating the connection
-        if (originalbendpoints == null || originalbendpoints.size() == 0) {
-            // reorient
-            return bends;
-        }
-
-        fakeConnection.setParent(conn.getParent());
-        if (conn instanceof PolylineConnectionEx) {
-            PolylineConnectionEx connection = (PolylineConnectionEx) conn;
-            fakeConnection.setRoutingStyles(connection
-                .isClosestDistanceRouting(), connection
-                .isAvoidObstacleRouting());
-        }
-        List constraint = new ArrayList();
-        for (Iterator itr = originalbendpoints.iterator(); itr.hasNext();) {
-            Bendpoint bp = (Bendpoint) itr.next();
-            constraint.add(new AbsoluteBendpoint(bp.getLocation()));
-        }
-        AbsoluteBendpoint startPoint = (AbsoluteBendpoint) constraint.get(0);
-        if (sourcePosition != PositionConstants.NONE) {
-            BorderItemConnectionAnchor anchor = (BorderItemConnectionAnchor) fakeConnection
-                .getSourceAnchor();
-            Point startBendpoint = anchor.getReferencePoint();
-            conn.translateToRelative(startBendpoint);
-            constraint.remove(0);
-            startPoint = new AbsoluteBendpoint(startBendpoint);
-            constraint.add(0, startPoint);
-        }
-        AbsoluteBendpoint endPoint = (AbsoluteBendpoint) constraint
-            .get(constraint.size() - 1);
-        if (targetPosition != PositionConstants.NONE) {
-            BorderItemConnectionAnchor anchor = (BorderItemConnectionAnchor) fakeConnection
-                .getTargetAnchor();
-            Point endBendpoint = anchor.getReferencePoint();
-            conn.translateToRelative(endBendpoint);
-            constraint.remove(constraint.size() - 1);
-            endPoint = new AbsoluteBendpoint(endBendpoint);
-            constraint.add(endPoint);
-        }
-        avoidOverlappingWithParent(startPoint, endPoint, sourceParentRect,
-            targetParentRect, constraint, conn);
-        fakeConnection.setRoutingConstraint(constraint);
-        PointList points = super.calculateBendPoints(fakeConnection);
-        if (sourcePosition != PositionConstants.NONE) {
-            BorderItemConnectionAnchor anchor = (BorderItemConnectionAnchor) fakeConnection
-                .getSourceAnchor();
-            Point startPoint1 = anchor.getAnchorPoint();
-            conn.translateToRelative(startPoint1);
-            points.insertPoint(startPoint1, 0);
-        }
-
-        if (targetPosition != PositionConstants.NONE) {
-            BorderItemConnectionAnchor anchor = (BorderItemConnectionAnchor) fakeConnection
-                .getTargetAnchor();
-            Point endPoint1 = anchor.getAnchorPoint();
-            conn.translateToRelative(endPoint1);
-            points.addPoint(endPoint1);
-        }
-        fakeConnection.setParent(null);
-        return points;
-    }
-
-    /**
-     * utility method to revers the position
-     * @param position the position to reverse
-     * @return  teh reversed position
-     */
-    private int reversePosition(int position) {
-        int newPosition = position;
-        if (position == PositionConstants.SOUTH)
-            newPosition = PositionConstants.NORTH;
-        else if (position == PositionConstants.NORTH)
-            newPosition = PositionConstants.SOUTH;
-        else if (position == PositionConstants.WEST)
-            newPosition = PositionConstants.EAST;
-        else if (position == PositionConstants.EAST)
-            newPosition = PositionConstants.WEST;
-        return newPosition;
-    }
-
-    /**
-     * @author MMostafa
-     *  Border Item aware Anchor, this anchor will make sure that the anchor point
-     *  and the reference point are on the correct side
-     */
-    private class BorderItemConnectionAnchor
-        implements ConnectionAnchor {
-
-        private ConnectionAnchor anchor;
-
-        private int position;
-
-        private int offset;
-
-        public BorderItemConnectionAnchor(ConnectionAnchor anchor,
-                int position, int offset) {
-            this.anchor = anchor;
-            this.position = position;
-            this.offset = offset;
-        }
-
-        public Point getReferencePoint() {
-            Point referencePoint = getAnchorPoint();
-            if (position == PositionConstants.SOUTH)
-                referencePoint.y += offset;
-            else if (position == PositionConstants.NORTH)
-                referencePoint.y -= offset;
-            else if (position == PositionConstants.WEST)
-                referencePoint.x -= offset;
-            else if (position == PositionConstants.EAST)
-                referencePoint.x += offset;
-            return referencePoint;
-        }
-
-        public Point getAnchorPoint() {
-            Rectangle ownerBounds = getOwner().getBounds().getCopy();
-            getOwner().translateToAbsolute(ownerBounds);
-            if (position == PositionConstants.SOUTH)
-                return ownerBounds.getBottom();
-            else if (position == PositionConstants.NORTH)
-                return ownerBounds.getTop();
-            else if (position == PositionConstants.WEST)
-                return ownerBounds.getLeft();
-            else if (position == PositionConstants.EAST)
-                return ownerBounds.getRight();
-            return ownerBounds.getCenter();
-        }
-
-        public void addAnchorListener(AnchorListener listener) {
-            // nothing to do
-        }
-
-        public Point getLocation(Point reference) {
-            return reference;
-        }
-
-        public IFigure getOwner() {
-            return anchor.getOwner();
-        }
-
-        public void removeAnchorListener(AnchorListener listener) {
-            // nothing to do
-        }
-
-    }
-
-    /**
-     * Returns the position of the border item with respect to its parent
-     * Clients can override this method to change the way postions is
-     * calculated for border items
-     * @param borderFigure  Figure to use to get the position
-     * @return  the border item position, see <code>PositionConstants</code>
-     */
-    protected int getBorderFigurePosition(IFigure borderFigure) {
-        IFigure child = borderFigure;
-        IFigure parent = borderFigure.getParent();
-        if (parent != null && parent.getLayoutManager() != null) {
-            LayoutManager layoutManager = parent.getLayoutManager();
-            Object layoutConstraint = layoutManager.getConstraint(child);
-            if (layoutConstraint instanceof IBorderItemLocator) {
-                return ((IBorderItemLocator) layoutConstraint)
-                    .getCurrentSideOfParent();
-            }
-        }
-        return PositionConstants.NONE;
-    }
-    
-    
-
-    /**
-     * Utility method that adjust the constrinat to avoid overlapping with 
-     * Source or target parents, this method should be called only in case
-     * of routing connections connecting to border items 
-     * @param startPoint        start point or the route
-     * @param endPoint          end point of the route
-     * @param sourceParentRect  the rectangle of the source element parent
-     * @param targetParentRect  the rectangle of the target element parent
-     * @param constraint        the constraint to modify
-     * @param conn              the connection to route
-     */
-    private void avoidOverlappingWithParent(AbsoluteBendpoint startPoint,
-            AbsoluteBendpoint endPoint, Rectangle sourceParentRect,
-            Rectangle targetParentRect, List constraint, Connection conn) {
-        if (sourceParentRect.intersects(targetParentRect)) {
-            return;
-        }
-        IMapMode mapMode = MapModeUtil.getMapMode(conn);
-        int logicalOffset = mapMode.DPtoLP(OFFSET);
-        // use GEF's shortest path router to get reference bend points
-        ShortestPathRouter router = new ShortestPathRouter();
-        Path path = new Path(startPoint, endPoint);
-        router.addPath(path);
-        router.addObstacle(sourceParentRect);
-        router.addObstacle(targetParentRect);
-        router.setSpacing(logicalOffset);
-        router.solve();
-        PointList points = path.getPoints();
-        // remove the start and end points
-        points.removePoint(0);
-        points.removePoint(points.size() - 1);
-        // deal with the remaining points
-        if (points.size() > 0) {
-            Point refrencePoint = points.getFirstPoint();
-            AbsoluteBendpoint startPointGuidePoint = new AbsoluteBendpoint(startPoint);
-            adjustPointUsingReferencePointAndObstacle(startPointGuidePoint,refrencePoint,sourceParentRect,  logicalOffset);
-            constraint.add(1, startPointGuidePoint);
-            points.removePoint(0);
-            // this means we had only one reference point, we will use this point
-            // to adjust poth source and target
-            if (points.size() == 0) {
-                AbsoluteBendpoint endPointGuidePoint = new AbsoluteBendpoint(endPoint);
-                adjustPointUsingReferencePointAndObstacle(endPointGuidePoint,refrencePoint,targetParentRect,  logicalOffset);
-                if (endPointGuidePoint.y == endPoint.y)
-                    endPointGuidePoint.x = startPointGuidePoint.x;
-                else
-                    endPointGuidePoint.y = startPointGuidePoint.y;
-                constraint.add(2, endPointGuidePoint);
-            }
-        }
-        if (points.size() > 0) {
-            Point referencePoint = points.getLastPoint();
-            AbsoluteBendpoint endPointGuidePoint = new AbsoluteBendpoint(endPoint);
-            adjustPointUsingReferencePointAndObstacle(endPointGuidePoint,referencePoint,targetParentRect , logicalOffset);
-            constraint.add(constraint.size() - 1, endPointGuidePoint);
-        }
-    }
-
-    /**
-     * Modify a guide point based on a reference point to avoid collision with the
-     * passed obstacle, the offset had to be in logical coordinates
-     * @param guidePoint, the point to adjust
-     * @param referencePoint, reference point to use during the adjust process
-     * @param obstacle, obstable to consider
-     * @param offSet, the offset had to be in logical coordinate
-     */
-    private void adjustPointUsingReferencePointAndObstacle(AbsoluteBendpoint guidePoint, Point referencePoint,
-            Rectangle obstacle, int offSet ) {
-        // check if the y of the starting point is in the rectangle range (point
-        // will be west or east or the rectangle)
-        boolean changeY = (guidePoint.y >= obstacle.y && guidePoint.y <= (obstacle.y + obstacle.height));
-
-        if (changeY) {
-            if (referencePoint.y < guidePoint.y)
-                guidePoint.y = obstacle.y - offSet;
-            else
-                guidePoint.y = obstacle.y + obstacle.height
-                    + offSet;
-        } else {
-            if (referencePoint.x < guidePoint.x)
-                guidePoint.x = obstacle.x - offSet;
-            else
-                guidePoint.x = obstacle.x + obstacle.width
-                    + offSet;
-        }
-    }
-
-    /**
-     * Returns the obstacle that the route should try to avoid, for example if the isBordereItem 
-     * flag is ON, it will return the rectangle of the border item parent.
-     * This method can be overriden by clients to provide a client specific way to find the obstacle
-     * @param figure, figure to get the obstacle for
-     * @param conn, the connection the router is routing
-     * @param isBorderItem, indicates if the passed figure is a border item figrue or not
-     * @return obstacle
-     */
-    protected Rectangle getObstacle(IFigure figure, Connection conn,
-            boolean isBorderItem) {
-        IFigure parent = null;
-        if (isBorderItem)
-            parent = getBorderItemParent(figure);
-        else
-            parent = figure;
-        Rectangle rect = new PrecisionRectangle(parent.getBounds());
-        parent.translateToAbsolute(rect);
-        conn.translateToRelative(rect);
-        return rect;
-    }
-
-    /**
-     * return the parent of a border item figure
-     * clients can override this method to find the 
-     * @param figure, the border item figure
-     * @return teh parent of the border item
-     */
-    protected IFigure getBorderItemParent(IFigure figure) {
-        return figure.getParent().getParent();
-    }
-    
-    private boolean lineIntersectRectangle(Point start, Point end, Rectangle rect) {
-    	return Geometry.linesIntersect(start.x, start.y, end.x, end.y, rect.x, rect.y, rect.x + rect.width, rect.y)
-    		|| Geometry.linesIntersect(start.x, start.y, end.x, end.y, rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height)
-    		|| Geometry.linesIntersect(start.x, start.y, end.x, end.y, rect.x + rect.width, rect.y + rect.height, rect.x, rect.y + rect.height)
-    		|| Geometry.linesIntersect(start.x, start.y, end.x, end.y, rect.x, rect.y + rect.height, rect.x, rect.y);
-    }
-}
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 ca5c6dc..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/BranchRouter.java
+++ /dev/null
@@ -1,196 +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
- *
- * 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 2bf28b1..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/FanRouter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ConnectionRouter;
-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
- */
-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);
-	}
-
-
-	/**
-	 * @return Returns the connection router to which the routing is delegated. 
-	 */
-	public ConnectionRouter getRouter() {
-		return next();
-	}
-}
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 da0e072..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ITreeConnection.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.runtime.draw2d.ui.internal.routers;
-
-import org.eclipse.draw2d.Connection;
-
-/**
- * @author sshaw
- *
- * 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 d222c14..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/ObliqueRouter.java
+++ /dev/null
@@ -1,1332 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.ShortestPathConnectionRouter;
-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.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.Path;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
-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.Draw2dDebugOptions;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.Draw2dPlugin;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-public class ObliqueRouter extends BendpointConnectionRouter {
-
-	static public class ArrayListMap {
-		private HashMap<Object, Object> map = new HashMap<Object, Object>();
-
-		public ArrayListMap() {
-			super();
-		}
-
-		public ArrayList<Object> get(Object key) {
-			Object value = map.get(key);
-			if (value == null)
-				return null;
-
-			if (value instanceof ArrayList)
-				return (ArrayList<Object>) value;
-			ArrayList<Object> v = new ArrayList<Object>(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<Object> arrayList = (ArrayList<Object>) arrayListObject;
-				if (!arrayList.contains(value))
-					arrayList.add(value);
-				return;
-			}
-			if (arrayListObject != value) {
-				ArrayList<Object> arrayList = new ArrayList<Object>(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 ArrayListMap intersectingShapesConnections = 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 = calculateBendPoints(conn);
-             
-   		// points could be null if routing is already finished in calculateBendPoints
-    	if (points != null) {
-    		routeLine(conn, 0, points);
-    		conn.setPoints(points);
-    	}
-	}
-	
-	/**
-     * Return a point list that contains the bend points on the connections.
-     * Clients can override this method to introduce calculated bend points 
-     * on the connection 
-	 * @param conn the connection to get the bend points for
-	 * @return bend points as a Point List
-	 */
-	protected PointList calculateBendPoints(Connection conn) {
-		RouterHelper helper = RouterHelper.getInstance();
-        PointList points = null;    
-    	boolean routed = false;    
-    	if (isAvoidingObstructions(conn) && helper.getUseGEFRouter()) {
-    		routed = routeAroundObstructions_GEF(conn);
-    	}
-    	if (!routed) {       
-    		points = new PointList();
-    		if (isAvoidingObstructions(conn)) {
-    			points = helper.routeAroundObstructions(conn);
-    		} else if (isClosestDistance(conn)) {
-    			points = helper.routeClosestDistance(conn);
-    		} else {
-    			points = helper.routeFromConstraint(conn);
-    		}
-    	}
-		return points;
-	}
-	
-	/**
-	 * Incorporating use of GEF's ShortestPathConnectionRouter into GMF's
-	 * ObliqueRouter in order to enable instant re-routing when an obstacle is
-	 * placed on or removed from a connection which has Avoid Obstacles property
-	 * set. The rules for routing: 
-	 * 
-	 * <li>If the connection is completely within
-	 * one container (doesn't matter if the container is nested), then GEF's
-	 * router is used, meaning that the connection will be appropriately
-	 * re-routed in case when an obstacle is being placed on the way. 
-	 * 
-	 * <li>If the connection spans between two containers, then this method returns null
-	 * and the old GMF algorithm for avoiding obstructions is used (meaning that
-	 * re-routing will not happen right away when an object is placed on the
-	 * connection).
-	 * 
-	 * <p>
-	 * Note that connection container may change by either attaching a
-	 * connection anchor to a shape from a different container, or by moving
-	 * source or target shape to a different container.
-	 * 
-	 * <p>
-	 * Self connections and connections whose source and target intersect are dealt
-	 * with in <code>routeLine</code> and avoid obstructions is irrelevant
-	 * (just like when non-GEF avoid obstructions router is used). 
-	 * 
-	 * <p>
-	 * Known issue: if an obstacle contains a connection start or
-	 * end point, that obstacle is ignored, meaning that the connection can be
-	 * routed through it.
-	 * 
-	 * @param conn
-	 * @return true if routing was done by GEF algorithm, false otherwise
-	 */
-    public boolean routeAroundObstructions_GEF(Connection conn) {
-    	RouterHelper helper = RouterHelper.getInstance();
-		boolean routed = false;
-		if (helper.getUseGEFRouter()) {
-			ShortestPathConnectionRouter spcr = helper.getConnRouter(conn, true);
-			if (spcr != null) {
-				// Do routing only if spcr says there is something to route, or if
-				// this is the first time conn is routed by spcr
-				if (spcr.isDirty() || !spcr.containsConnection(conn)) {
-					// add conn to spcr if needed
-					// (in our case, spcr takes into account only end points, manual bendpoints
-					// in constraint will be ignored)
-					if (!spcr.containsConnection(conn)) {
-						helper.setConstraint(spcr, conn, null);
-					}									
-					// spcr has to ignore invalidation of connections that are rooted as a
-					// result of this call (otherwise, invalidation of those connections would dirty spcr
-					// therefore causing routing to be done again)
-					spcr.setIgnoreInvalidate(true);
-					
-					List<Path> allPaths = spcr.getPathsAfterRouting();
-					if (allPaths != null && allPaths.size() > 0) {
-						routed = true;
-						IFigure container = helper.getSourceContainer(conn);
-						// Source and target containers are the same (we know since GEF router is used)
-						// Exception: user is moving a connection anchor and it is currently not inside any figure.						
-						if (container == null) {
-							container = helper.getTargetContainer(conn);
-						}						
-						if (container != null) { // should never be null at this point
-							PointList points;
-							for (int i = 0; i < allPaths.size(); i++) {
-								Path path = allPaths.get(i);								
-								Connection currentConn = (Connection) path.data;
-								points = new PointList();
-								// spcr needed path coordinates to be relative to the container.
-								// Now translate them back to be relative to the connection.  
-								for (int j = 0; j < path.getPoints().size(); j++) {
-									PrecisionPoint pt = new PrecisionPoint(path.getPoints().getPoint(j));
-									container.translateToAbsolute(pt);
-									currentConn.translateToRelative(pt);
-									points.addPoint(pt);
-								}
-								// Adjust start and end points, check for self connection, and source and target intersecting
-								// Problem: framework is designed for connections to be routed one at the time, but GEF's 
-								// algorithm routes several connections at once. Now we have to check if currentConn is routed 
-								// by the same router as conn, it could be routed by child (e.g. rectilinear router), or conn could be 
-								// routed by child and currentConn by this router. 
-								ConnectionRouter currentConnRouter = currentConn.getConnectionRouter();
-								if (!currentConnRouter.equals(conn.getConnectionRouter())) {
-									if (currentConnRouter instanceof ObliqueRouter) { 
-										((ObliqueRouter)currentConnRouter).routeLine(currentConn, 0, points);
-									} else if ((currentConnRouter instanceof FanRouter) && 
-											(((FanRouter)currentConnRouter).getRouter() instanceof ObliqueRouter)) {
-										 // this handles the case when ObliqueRouter is delegate of FanRouter
-										((ObliqueRouter)((FanRouter)currentConnRouter).getRouter()).routeLine(currentConn, 0, points);
-									} else {		
-										routeLine(currentConn, 0, points);
-									}
-
-									// (another way would be to revalidate currentConn so it would be routed by its own router
-									// through the process of validation, but would have to prevent endless loop)									
-								} else {		
-									routeLine(currentConn, 0, points);
-								}
-								
-								// Check if this path really changed or not. This check will reduce the number of 
-								// revalidation calls, but it is not necessary (even if revalidation is called on a 
-								// connection that didn't change, spcr.getIsDirty() will return false and routing will not happen)
-								PointList oldPoints = currentConn.getPoints();
-								boolean route = false;
-								if (oldPoints == null || oldPoints.size() != points.size()
-										|| (currentConn == conn )) {
-									route = true;
-								} else {
-									for (int j = 0; j <= oldPoints.size() - 1; j++) {
-										if (oldPoints.getPoint(j).x != points.getPoint(j).x
-												|| oldPoints.getPoint(j).y != points.getPoint(j).y) {
-											route = true;
-											break;
-										}
-									}
-								}
-								if (route) {
-									currentConn.setPoints(points);
-									// don't revalidate conn since it already went through the whole process of layout
-									if (conn != currentConn) {
-										// Revalidate to ensure that currentConn goes through the complete layout.
-										currentConn.revalidate();
-									}
-								}
-							}
-						}
-					}
-					spcr.setIgnoreInvalidate(false);
-				} else {
-					// There is nothing to route
-					// Still, call setPoints since it ensures calculating bounds that may be needed later on
-					conn.setPoints(conn.getPoints());
-					routed = true;
-				}
-			}
-		}
-		return routed;
-    }	
-
-	/**
-	 * 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;
-	
-		PointList startPolygon = null;
-        if (!(sourceOwner instanceof Connection)) {
-            startPolygon = getFigurePolygon(sourceOwner,conn);
-        }
-
-        PointList endPolygon = null;
-        if (!(targetOwner instanceof Connection)) {
-            endPolygon = getFigurePolygon(targetOwner,conn);
-        }
-
-		// 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 ((startPolygon == null || !PointListUtilities.containsPoint(startPolygon,pt))
-                && (endPolygon == null || !PointListUtilities.containsPoint(endPolygon,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;
-	}
-    
-     protected PointList getFigurePolygon(IFigure owner, Connection conn) {
-        PointList polygon = new PointList();
-        if (owner instanceof IOvalAnchorableFigure) {
-        	Rectangle rect = new PrecisionRectangle(((IOvalAnchorableFigure)owner).getOvalBounds());
-        	owner.translateToAbsolute(rect);
-        	conn.translateToRelative(rect);
-            polygon.addPoint(rect.getTopLeft());
-            polygon.addPoint(rect.getTopRight());
-            polygon.addPoint(rect.getBottomRight());
-            polygon.addPoint(rect.getBottomLeft());
-            polygon.addPoint(rect.getTopLeft());
-        } else if (owner instanceof IPolygonAnchorableFigure){
-            PointList points =  ((IPolygonAnchorableFigure)owner).getPolygonPoints();
-            for(int index = 0 ; index < points.size(); index++){
-                Point point  = points.getPoint(index).getCopy();
-                owner.translateToAbsolute(point);
-                conn.translateToRelative(point);
-                polygon.addPoint(point);
-            }
-        } else {
-           Rectangle rect =  new PrecisionRectangle(owner.getBounds());
-           owner.translateToAbsolute(rect);
-           conn.translateToRelative(rect);
-           polygon.addPoint(rect.getTopLeft());
-           polygon.addPoint(rect.getTopRight());
-           polygon.addPoint(rect.getBottomRight());
-           polygon.addPoint(rect.getBottomLeft());
-           polygon.addPoint(rect.getTopLeft());
-        }
-        return polygon;
-    }
-	
-	/**
-	 * 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) && !checkShapesIntersect(conn, newLine)) {
-			removePointsInViews(conn, newLine);
-		}
-		resetEndPointsToEdge(conn, newLine);
-	}
-	
-	/**
-	 * Checks if source shape and target shape of the connection intersect (only intersect - not one contained in another)
-	 * and if they are calculates the bendpoints for the connection. Calculated bendpoints are stored in <code>newLine</code>.
-	 * Initially <code>newLine</code> contains the list of bendpoints calculated by the router, however
-	 * if for intersecting shapes we have a default connection (i.e. no extra bendpoints), bendpoints will
-	 * be calculated and <code>newLine</code> will be cleared and calculated bendpoints will be stored there.
-	 * 
-	 * Criterias for calculation of bendpoints for connection between 2 intersecting shapes:
-	 * 1. No extra bendpoints introduced by user (only source and target anchor points present)
-	 * 2. Source and target shapes intersect (one contained in another = do not intersect) 
-	 * 
-	 * @param conn connection
-	 * @param newLine list to store calculated bendpoints (contains bendpoints read from the model initially
-	 * @return <code>true</code> if bendpoints were calculated here for intersecting shapes
-	 */
-	protected boolean checkShapesIntersect(Connection conn, PointList newLine) {
-		if (conn.getSourceAnchor().getOwner() == null 
-				|| conn.getSourceAnchor().getOwner() instanceof Connection
-				|| conn.getTargetAnchor().getOwner() == null
-				|| conn.getTargetAnchor().getOwner() instanceof Connection)
-			return false;
-		
-		if (newLine.size() < 3) {
-			PrecisionRectangle sourceBounds = getShapeBounds(conn.getSourceAnchor().getOwner()); 
-			PrecisionRectangle targetBounds = getShapeBounds(conn.getTargetAnchor().getOwner());
-			conn.getSourceAnchor().getOwner().translateToAbsolute(sourceBounds);
-			conn.getTargetAnchor().getOwner().translateToAbsolute(targetBounds);
-			if (sourceBounds.intersects(targetBounds) && !sourceBounds.contains(targetBounds) && !targetBounds.contains(sourceBounds)
-					|| sourceBounds.equals(targetBounds)) {
-				getVerticesForIntersectingShapes(conn, newLine);
-				return true;
-			}
-		} else {
-			removeIntersectingShapesConnection(conn);
-		}
-		return false;
-	}
-	
-	private PrecisionRectangle getShapeBounds(IFigure figure) {
-		if (figure instanceof IOvalAnchorableFigure) {
-			return new PrecisionRectangle(((IOvalAnchorableFigure) figure)
-					.getOvalBounds());
-		} else if (figure instanceof IPolygonAnchorableFigure) {
-			return new PrecisionRectangle(((IPolygonAnchorableFigure) figure)
-					.getPolygonPoints().getBounds());
-		}
-		return new PrecisionRectangle(figure.getBounds());
-
-	}
-	
-	/**
-	 * Determines geographic position of the source figure relative to the
-	 * connection area
-	 * 
-	 * @param connRectangle
-	 *            connection area
-	 * @param sourceRect
-	 *            bounds of the source figure
-	 * @param position
-	 *            geographic position of the connection area relative to the
-	 *            union of intersecting source and target figures
-	 * @return geographic position of the source figure relative to the
-	 *         connection area
-	 */
-	private int getSourcePositionFromConnectionRectangle(
-			Rectangle connRectangle, Rectangle sourceRect, int position) {
-		Dimension diff = null;
-		switch (position) {
-		case PositionConstants.NORTH_WEST:
-			diff = connRectangle.getBottomRight().getDifference(
-					sourceRect.getTopLeft());
-			if (diff.width == 0) {
-				return PositionConstants.EAST;
-			} else {
-				return PositionConstants.SOUTH;
-			}
-		case PositionConstants.NORTH_EAST:
-			diff = connRectangle.getBottomLeft().getDifference(
-					sourceRect.getTopRight());
-			if (diff.width == 0) {
-				return PositionConstants.WEST;
-			} else {
-				return PositionConstants.SOUTH;
-			}
-		case PositionConstants.SOUTH_EAST:
-			diff = connRectangle.getTopLeft().getDifference(
-					sourceRect.getBottomRight());
-			if (diff.width == 0) {
-				return PositionConstants.WEST;
-			} else {
-				return PositionConstants.NORTH;
-			}
-		case PositionConstants.SOUTH_WEST:
-			diff = connRectangle.getTopRight().getDifference(
-					sourceRect.getBottomLeft());
-			if (diff.width == 0) {
-				return PositionConstants.EAST;
-			} else {
-				return PositionConstants.NORTH;
-			}
-		case PositionConstants.NONE:
-			diff = connRectangle.getCenter().getDifference(sourceRect.getCenter());
-			if (diff.width == 0) {
-				return diff.height < 0 ? PositionConstants.SOUTH : PositionConstants.NORTH;  
-			} else {
-				return diff.width < 0 ? PositionConstants.EAST : PositionConstants.WEST;
-			}
-		}
-		return PositionConstants.NONE;
-	}
-	
-	/**
-	 * Stores bendpoints for the connection in <code>line</code> based on the
-	 * precise connection area, geographic position of the source figure
-	 * relative to the connection area and geographic position of the connection
-	 * area relative to the union of intersecting shapes
-	 * 
-	 * @param connRect
-	 *            precise connection area
-	 * @param position
-	 *            geographic position of the connection area relative to the
-	 *            union of intersecting shapes
-	 * @param sourcePosition
-	 *            geographic position of the source figure relative to the
-	 *            connection area
-	 * @param line
-	 *            list for storing bendpoints (cleared at the start)
-	 */
-	private void getConnectionPoints(Rectangle connRect, int position,
-			int sourcePosition, PointList line) {
-		line.removeAllPoints();
-		switch (position) {
-		case PositionConstants.NORTH_WEST:
-			if (sourcePosition == PositionConstants.EAST) {
-				line.addPoint(connRect.getTopRight());
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getBottomLeft());
-			} else {
-				line.addPoint(connRect.getBottomLeft());
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getTopRight());
-			}
-			break;
-		case PositionConstants.NORTH_EAST:
-			if (sourcePosition == PositionConstants.WEST) {
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getTopRight());
-				line.addPoint(connRect.getBottomRight());
-			} else {
-				line.addPoint(connRect.getBottomRight());
-				line.addPoint(connRect.getTopRight());
-				line.addPoint(connRect.getTopLeft());
-			}
-			break;
-		case PositionConstants.SOUTH_EAST:
-			if (sourcePosition == PositionConstants.WEST) {
-				line.addPoint(connRect.getBottomLeft());
-				line.addPoint(connRect.getBottomRight());
-				line.addPoint(connRect.getTopRight());
-			} else {
-				line.addPoint(connRect.getTopRight());
-				line.addPoint(connRect.getBottomRight());
-				line.addPoint(connRect.getBottomLeft());
-			}
-			break;
-		case PositionConstants.SOUTH_WEST:
-			if (sourcePosition == PositionConstants.EAST) {
-				line.addPoint(connRect.getBottomRight());
-				line.addPoint(connRect.getBottomLeft());
-				line.addPoint(connRect.getTopLeft());
-			} else {
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getBottomLeft());
-				line.addPoint(connRect.getBottomRight());
-			}
-			break;
-		case PositionConstants.NONE:
-			if (sourcePosition == PositionConstants.NORTH) {
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getBottomLeft());
-			} else if (sourcePosition == PositionConstants.SOUTH) {
-				line.addPoint(connRect.getBottomLeft());
-				line.addPoint(connRect.getTopLeft());
-			} else if (sourcePosition == PositionConstants.WEST) {
-				line.addPoint(connRect.getTopLeft());
-				line.addPoint(connRect.getTopRight());
-			} else {
-				line.addPoint(connRect.getTopRight());
-				line.addPoint(connRect.getTopLeft());
-			}
-		}
-	}
-	
-	/**
-	 * Transforms width and height of the dimension into absolute values
-	 * 
-	 * @param d
-	 *            dimension
-	 */
-	private void absDimension(Dimension d) {
-		d.width = Math.abs(d.width);
-		d.height = Math.abs(d.height);
-	}
-	
-	/**
-	 * Calculates and stores bendpoints (or vertices) for the connection between
-	 * 2 intersecting shapes and stores them in <code>newLine</code>
-	 * 
-	 * @param conn
-	 *            connection
-	 * @param newLine
-	 *            list to store calculated bendpoints (oe vertices)
-	 */
-	private void getVerticesForIntersectingShapes(Connection conn,
-			PointList newLine) {
-		Object key = getIntersectingShapesConnectionKey(conn);
-		int nSelfIncr = 0;
-		int nIndex = 0;
-		/*
-		 * Check if this connection is 2nd, 3rd, ..., or n-th connection between
-		 * the same 2 intersecting shapes. If yes, determine what's the index.
-		 * (i.e the n>1)
-		 */
-		ArrayList<Object> connectionList = intersectingShapesConnections.get(key);
-		if (connectionList != null) {
-			if (!connectionList.contains(conn)) {
-				intersectingShapesConnections.put(key, conn);
-				connectionList = intersectingShapesConnections.get(key);
-			}
-
-			nIndex = connectionList.indexOf(conn);
-			assert nIndex >= 0;
-		} else {
-			intersectingShapesConnections.put(key, conn);
-		}
-
-		/*
-		 * Translate properly the default offset value between multiple
-		 * connections connecting the same 2 intersecting shapes. The default
-		 * value is in pixels, hence for feedback connection it must stay the
-		 * same and translated to logical units otherwise.
-		 */
-		PrecisionPoint selfrelsizeincr = new PrecisionPoint(SELFRELSIZEINCR, 0);
-		boolean isFeedbackConn = RouterHelper.getInstance().isFeedback(conn);
-		if (!isFeedbackConn)
-			selfrelsizeincr = (PrecisionPoint) MapModeUtil.getMapMode(conn)
-					.DPtoLP(selfrelsizeincr);
-
-		/*
-		 * Translate bounds of the source and target figures into coordinates
-		 * relative to the connection figure. (PrecisionRectangle is used to
-		 * avoid precision losses during non-integer scaling) Also calculate the
-		 * union of the source and target figures bounds and their intersection
-		 * rectangle for further calculations. All geometric figures are
-		 * translated to the coordinates relative to the connection figure!
-		 */
-		IFigure sourceFig = conn.getSourceAnchor().getOwner();
-		PrecisionRectangle sourceRect = getShapeBounds(sourceFig);
-		sourceFig.translateToAbsolute(sourceRect);
-		conn.translateToRelative(sourceRect);
-
-		IFigure targetFig = conn.getTargetAnchor().getOwner();
-		PrecisionRectangle targetRect = getShapeBounds(targetFig);
-		targetFig.translateToAbsolute(targetRect);
-		conn.translateToRelative(targetRect);
-		PrecisionRectangle union = sourceRect.getPreciseCopy()
-				.union(targetRect);
-
-		/*
-		 * Calculate the final offset value to space out multiple connections
-		 * between 2 intersecting shapes
-		 */
-		nSelfIncr = selfrelsizeincr.x * (nIndex);
-
-		Rectangle intersection = sourceRect.getCopy().intersect(targetRect);
-
-		/*
-		 * Determine the rough connection area and its geographic position
-		 * relative to the union of the intersecting shapes. This is the area
-		 * around which the connection will be routed. It's rough because it
-		 * will be expanded and spaced out from other connections connecting the
-		 * same shapes. The rough connection area is the smallest blank
-		 * rectangle located within the union rectangle but not intersecting
-		 * both source and traget figures bounds. The possible geographic
-		 * locations for connection area are: NW, NE, SW, SE.
-		 */
-		Rectangle connArea = new Rectangle();
-		int position = PositionConstants.NONE;
-		int minArea = 0;
-		Point unionTopLeft = union.getTopLeft();
-		Point unionTopRight = union.getTopRight();
-		Point unionBottomRight = union.getBottomRight();
-		Point unionBottomLeft = union.getBottomLeft();
-
-		if (!unionTopLeft.equals(sourceRect.getTopLeft())
-				&& !unionTopLeft.equals(targetRect.getTopLeft())) {
-			Dimension diffVector = unionTopLeft.getDifference(intersection
-					.getTopLeft());
-			absDimension(diffVector);
-			int areaTopLeft = diffVector.getArea();
-			if (minArea == 0 || minArea > areaTopLeft) {
-				position = PositionConstants.NORTH_WEST;
-				connArea.setSize(diffVector);
-				connArea.setLocation(unionTopLeft.x, unionTopLeft.y);
-				minArea = areaTopLeft;
-			}
-		}
-
-		if (!unionTopRight.equals(sourceRect.getTopRight())
-				&& !unionTopRight.equals(targetRect.getTopRight())) {
-			Dimension diffVector = unionTopRight.getDifference(intersection
-					.getTopRight());
-			absDimension(diffVector);
-			int areaTopRight = diffVector.getArea();
-			if (minArea == 0 || minArea > areaTopRight) {
-				position = PositionConstants.NORTH_EAST;
-				connArea.setSize(diffVector);
-				connArea.setLocation(unionTopRight.x - connArea.width,
-						unionTopRight.y);
-				minArea = areaTopRight;
-			}
-		}
-
-		if (!unionBottomRight.equals(sourceRect.getBottomRight())
-				&& !unionBottomRight.equals(targetRect.getBottomRight())) {
-			Dimension diffVector = unionBottomRight.getDifference(intersection
-					.getBottomRight());
-			absDimension(diffVector);
-			int areaBottomRight = diffVector.getArea();
-			if (minArea == 0 || minArea > areaBottomRight) {
-				position = PositionConstants.SOUTH_EAST;
-				connArea.setSize(diffVector);
-				connArea.setLocation(unionBottomRight.x - connArea.width,
-						unionBottomRight.y - connArea.height);
-				minArea = areaBottomRight;
-			}
-		}
-
-		if (!unionBottomLeft.equals(sourceRect.getBottomLeft())
-				&& !unionBottomLeft.equals(targetRect.getBottomLeft())) {
-			Dimension diffVector = unionBottomLeft.getDifference(intersection
-					.getBottomLeft());
-			absDimension(diffVector);
-			int areaBottomLeft = diffVector.getArea();
-			if (minArea == 0 || minArea > areaBottomLeft) {
-				position = PositionConstants.SOUTH_WEST;
-				connArea.setSize(diffVector);
-				connArea.setLocation(unionBottomLeft.x, unionBottomLeft.y
-						- connArea.height);
-				minArea = areaBottomLeft;
-			}
-		}
-		
-		if (position == PositionConstants.NONE) {
-			connArea = intersection;
-		}
-
-		/*
-		 * Determine the geographic position of the source figure relative to
-		 * the rough connection area. This will help determining the order for
-		 * bendpoints list from the precise connection area
-		 */
-		int sourcePosition = getSourcePositionFromConnectionRectangle(connArea,
-				sourceRect, position);
-
-		if (position != PositionConstants.NONE) {
-			/*
-			 * Determine the value by which the connection area has to become
-			 * primary precise connection area. The value is chosen to be such that
-			 * connections made from shapes intersecting on the same edge don't
-			 * overlap
-			 */
-			PrecisionPoint translateExpansion = new PrecisionPoint(Math.max(connArea.width,
-					connArea.height), 0);
-			if (!isFeedbackConn) {
-				IMapMode mm = MapModeUtil.getMapMode(conn);
-				translateExpansion = (PrecisionPoint) mm.LPtoDP(translateExpansion);
-				translateExpansion.preciseX = Math.pow(translateExpansion.preciseX,
-						0.8);
-				translateExpansion = (PrecisionPoint) mm.DPtoLP(translateExpansion);
-			} else {
-				translateExpansion.preciseX = Math.pow(translateExpansion.preciseX,
-						0.8);
-			}
-			translateExpansion.updateInts();
-	
-			/*
-			 * Transform rough connection area to primary precise connection area
-			 */
-			getPrimaryPreciseConnectionArea(connArea, translateExpansion.x, position);
-		} else {
-			connArea.expand(selfrelsizeincr.x<<1, selfrelsizeincr.x<<1);
-		}
-
-		/*
-		 * Transform the primary precise connection area to precise connection
-		 * area by accounting for multiple connection between the same 2
-		 * intersecting shapes
-		 */
-		connArea.expand(nSelfIncr, nSelfIncr);
-
-		/*
-		 * Calculates the bendpoints for the connection from the precise
-		 * connection area
-		 */
-		getConnectionPoints(connArea, position, sourcePosition, newLine);
-
-		PrecisionPoint ptS2 = new PrecisionPoint(newLine.getPoint(0));
-		PrecisionPoint ptS1 = new PrecisionPoint(conn.getSourceAnchor().getReferencePoint());
-		conn.translateToRelative(ptS1);
-		Point ptAbsS2 = new Point(ptS2);
-		conn.translateToAbsolute(ptAbsS2);
-		PrecisionPoint ptEdge = new PrecisionPoint(conn.getSourceAnchor().getLocation(ptAbsS2));
-		conn.translateToRelative(ptEdge);
-		ptS1 = new PrecisionPoint(getStraightEdgePoint(ptEdge, ptS1, ptS2));
-
-		PrecisionPoint ptE2 = new PrecisionPoint(newLine.getPoint(newLine.size() - 1));
-		PrecisionPoint ptE1 = new PrecisionPoint(conn.getTargetAnchor().getReferencePoint());
-		conn.translateToRelative(ptE1);
-		PrecisionPoint ptAbsE2 = (PrecisionPoint)ptE2.getCopy();
-		conn.translateToAbsolute(ptAbsE2);
-		ptEdge = new PrecisionPoint(conn.getTargetAnchor().getLocation(ptAbsE2));
-		conn.translateToRelative(ptEdge);
-		ptE1 = new PrecisionPoint(getStraightEdgePoint(ptEdge, ptE1, ptE2));
-
-		newLine.insertPoint(new Point(Math.round(ptS1.preciseX), Math.round(ptS1.preciseY)), 0);
-		newLine.insertPoint(new Point(Math.round(ptE1.preciseX), Math.round(ptE1.preciseY)), newLine.size());
-
-	}
-	
-	/**
-	 * Transforms rough connection area into primary precise connection area.
-	 * Primary precise connection area is the one that doesn't account for
-	 * multiple connections between same intersecting shapes
-	 * 
-	 * @param r
-	 *            rough connection area rectangle
-	 * @param size
-	 *            size used for expansion
-	 * @param positionOfConnArea
-	 *            geographic position of the connection area relative to the
-	 *            union of intersecting shapes
-	 */
-	private void getPrimaryPreciseConnectionArea(Rectangle r, int size, int positionOfConnArea) {
-		r.expand(size, size);
-		if (r.width < r.height) {
-			r.height -= size;
-			if ((positionOfConnArea & PositionConstants.SOUTH) != 0) {
-				r.y += size;
-			}
-		} else {
-			r.width -= size;
-			if ((positionOfConnArea & PositionConstants.EAST) != 0) {
-				r.x += size;
-			}
-		}
-	}
-	
-	/**
-	 * 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<Object> connectionList = selfRelConnections.get(connectionKey);
-		if (connectionList != null) {
-			int index = connectionList.indexOf(conn);
-			if (index == -1)
-				return;
-			selfRelConnections.remove(connectionKey, conn);
-		}
-	}
-	
-	/**
-	 * Method removeIntersectingShapesConnection.
-	 * Removes the given connection from the intersecting shapes connections hash map
-	 * @param conn Connection to remove from the map
-	 */
-	private void removeIntersectingShapesConnection(Connection conn) {
-		if (conn.getSourceAnchor() == null || conn.getTargetAnchor() == null
-				|| conn.getSourceAnchor().getOwner() == null
-				|| conn.getTargetAnchor().getOwner() == null)
-				return;
-		Object key = getIntersectingShapesConnectionKey(conn);
-		ArrayList<Object> connectionList = intersectingShapesConnections.get(key);
-		if (connectionList != null) {
-			int index = connectionList.indexOf(conn);
-			if (index == -1)
-				return;
-			intersectingShapesConnections.remove(key, conn);
-		}
-	}
-	
-	/**
-	 * Calculates the key for a connection made between 2 intersecting shapes.
-	 * Key is determined from the key of the source and target figures hash
-	 * codes, since we want connections made between the same 2 intersected
-	 * shapes to be mapped to one value
-	 * 
-	 * @param conn
-	 *            connection
-	 * @return hash code
-	 */
-	private Object getIntersectingShapesConnectionKey(Connection conn) {
-		return new Integer(conn.getSourceAnchor().getOwner().hashCode()
-				^ conn.getTargetAnchor().getOwner().hashCode());
-	}
-
-	/**
-	 * 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<Object> connectionList = selfRelConnections.get(connectionKey);
-		if (connectionList != null) {
-			if (!connectionList.contains(conn)) {
-				selfRelConnections.put(connectionKey, conn);
-				connectionList = selfRelConnections.get(connectionKey);
-			}
-
-			nIndex = connectionList.indexOf(conn);
-            assert 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);
-		removeIntersectingShapesConnection(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 f37bc11..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/OrthogonalRouterUtilities.java
+++ /dev/null
@@ -1,312 +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.PositionConstants;
-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.OrthogonalConnectionAnchor;
-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;
-			
-			if (anchor instanceof OrthogonalConnectionAnchor) {
-				PrecisionPoint refAbs = new PrecisionPoint(ref);
-				conn.translateToAbsolute(refAbs);
-				PrecisionPoint anchorPoint = new PrecisionPoint(((OrthogonalConnectionAnchor)anchor).getOrthogonalLocation(refAbs));
-				conn.translateToRelative(anchorPoint);
-				return new LineSeg(anchorPoint, ref);
-			}
-			
-			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();
-    }
-
-	/**
-	 * Returns true if the points form a rectilinear line.
-	 * 
-	 * @param points polyline's points
-	 * @return
-	 */
-	public static boolean isRectilinear(PointList points) {
-		for (int i = 1; i < points.size(); i++) {
-			Point currentPt = points.getPoint(i);
-			Point previousPt = points.getPoint(i - 1);
-			if (currentPt.x != previousPt.x && currentPt.y != previousPt.y) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Polylines points are modified to form a rectilinear polyline (or connection in perspective).
-	 * Essentially extra points are added and list of points will form a rectilinear polyline.
-	 * The method has options for specifying orientation of start and end segments of a rectilinear
-	 * polyline  
-	 * 
-	 * @param points points list to be made rectilinear
-	 * @param offStartDirection orientation of the start segment
-	 * @param offEndDirection orientation of the end segment
-	 */
-	public static void transformToOrthogonalPointList(PointList points, int offStartDirection, int offEndDirection) {
-		if (points.size() > 1) {
-			PointList startPoints = new PointList(points.size());
-			PointList endPoints = new PointList(points.size());
-			boolean isOffSourceDirectionSet = offStartDirection == PositionConstants.HORIZONTAL || offStartDirection == PositionConstants.VERTICAL;
-			boolean isOffTargetDirectionSet = offEndDirection == PositionConstants.VERTICAL || offEndDirection == PositionConstants.HORIZONTAL;
-			if (!isOffSourceDirectionSet && !isOffTargetDirectionSet) {
-				/*
-				 * If there is no off start and off end direction passed in, determine
-				 * the off start direction.
-				 */
-				Point first = points.getPoint(0);
-				Point second = points.getPoint(1);
-				offStartDirection = Math.abs(first.x - second.x) < Math
-						.abs(first.y - second.y) ? PositionConstants.HORIZONTAL
-						: PositionConstants.VERTICAL;
-				isOffSourceDirectionSet = true;
-			}
-			startPoints.addPoint(points.removePoint(0));
-			endPoints.addPoint(points.removePoint(points.size() - 1));
-			while (points.size() != 0) {
-				if (isOffSourceDirectionSet) {
-					Point nextPt = points.removePoint(0);
-					Point lastStartPt = startPoints.getLastPoint();
-					if (nextPt.x != lastStartPt.x && nextPt.y != lastStartPt.y) {
-						/*
-						 * If segment is not rectilinear insert a point to make it
-						 * rectilinear
-						 */
-						if (offStartDirection == PositionConstants.VERTICAL) {
-							startPoints.addPoint(new Point(lastStartPt.x, nextPt.y));
-							offStartDirection = PositionConstants.HORIZONTAL;
-						} else {
-							startPoints.addPoint(new Point(nextPt.x, lastStartPt.y));
-							offStartDirection = PositionConstants.VERTICAL;
-						}
-					} else {
-						offStartDirection = nextPt.x == lastStartPt.x ? PositionConstants.VERTICAL
-								: PositionConstants.HORIZONTAL;
-					}
-					startPoints.addPoint(nextPt);
-				}
-				if (isOffTargetDirectionSet && points.size() != 0) {
-					Point nextPt = points.removePoint(points.size() - 1);
-					Point firstEndPt = endPoints.getFirstPoint();
-					if (nextPt.x != firstEndPt.x && nextPt.y != firstEndPt.y) {
-						/*
-						 * If segment is not rectilinear insert a point to make it
-						 * rectilinear
-						 */
-						if (offEndDirection == PositionConstants.VERTICAL) {
-							endPoints.insertPoint(new Point(firstEndPt.x, nextPt.y), 0);
-							offEndDirection = PositionConstants.HORIZONTAL;
-						} else {
-							endPoints.insertPoint(new Point(nextPt.x, firstEndPt.y), 0);
-							offEndDirection = PositionConstants.VERTICAL;
-						}
-					} else {
-						offEndDirection = nextPt.x == firstEndPt.x ? PositionConstants.VERTICAL
-								: PositionConstants.HORIZONTAL;
-					}
-					endPoints.insertPoint(nextPt, 0);
-				}
-			}
-			/*
-			 * Now we need to merge the two point lists such that the polyline formed by the
-			 * points is still rectilinear. Hence there is a chance that one more point needs
-			 * to be added.
-			 */
-			Point lastStartPt = startPoints.getLastPoint();
-			Point firstEndPt = endPoints.getFirstPoint();
-			if (lastStartPt.x != firstEndPt.x && lastStartPt.y != firstEndPt.y) {
-				/*
-				 * We need to add extra point. Now there is a dilemma: Should we
-				 * use off source orientation or off target? We'll use off
-				 * target orientation in 2 cases: 
-				 * 1. Off source direction has not been set and off target direction was 
-				 * 2. Off target direction is set, but the start points list has more points
-				 * than the end points list.
-				 * Otherwise off start direction will be used.
-				 */
-				if ((!isOffSourceDirectionSet && isOffTargetDirectionSet) || (isOffTargetDirectionSet && endPoints.size() < startPoints.size())) {
-					if (offEndDirection == PositionConstants.VERTICAL) {
-						startPoints.addPoint(new Point(firstEndPt.x, lastStartPt.y));
-					} else {
-						startPoints.addPoint(new Point(lastStartPt.x, firstEndPt.y));
-					}
-				}
-				else if (offStartDirection == PositionConstants.VERTICAL) {
-					startPoints.addPoint(new Point(lastStartPt.x, firstEndPt.y));
-				} else {
-					startPoints.addPoint(new Point(firstEndPt.x, lastStartPt.y));
-				}
-			}
-			points.addAll(startPoints);
-			points.addAll(endPoints);
-		}
-	}
-	
-}
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 28b9d2a..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RectilinearRouter.java
+++ /dev/null
@@ -1,654 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.BaseSlidableAnchor;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.OrthogonalConnectionAnchor;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-
-
-/**
- * @author sshaw/aboyko
- *
- * RectilinearRouter which routes the Connection so that the lines
- * are always vertical or horizontal.
- */
-public class RectilinearRouter extends ObliqueRouter implements OrthogonalRouter {
-
-	private static int maxNestedRoutingDepth = 1;
-	
-	@Override
-	protected boolean checkSelfRelConnection(Connection conn, PointList newLine) {
-		boolean selfConn =  super.checkSelfRelConnection(conn, newLine);
-		if (selfConn) {
-			newLine.removePoint(0);
-			newLine.removePoint(newLine.size() - 1);
-		}
-		return selfConn;
-	}
-
-	/**
-     * 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;
-			
-		// 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);
-			return;
-		}
-
-		// Handle special routing: self connections and intersecting shapes connections
-		if (checkSelfRelConnection(conn, newLine)
-				|| checkShapesIntersect(conn, newLine)) {
-			resetEndPointsToEdge(conn, newLine);
-			OrthogonalRouterUtilities
-					.transformToOrthogonalPointList(newLine,
-							getOffShapeDirection(getAnchorOffRectangleDirection(
-									newLine.getFirstPoint(),
-									sourceBoundsRelativeToConnection(conn))),
-							getOffShapeDirection(getAnchorOffRectangleDirection(
-									newLine.getLastPoint(),
-									targetBoundsRelativeToConnection(conn))));
-			removeRedundantPoints(newLine);
-			return;
-		}
-		
-		if (conn.getSourceAnchor().getOwner() == conn.getTargetAnchor().getOwner()) {
-			nestedRoutingDepth = maxNestedRoutingDepth;
-		}
-		
-		/*
-		 * Remove and store former anchor points. Anchor points will be re-calculated anyway.
-		 * However, the old anchor points may be useful if connection didn't have any bend points
-		 * except the anchor points.
-		 */
-		Point lastStartAnchor = newLine.removePoint(0);
-		Point lastEndAnchor = newLine.removePoint(newLine.size() - 1);
-		    	
-		/*
-		 * Check if connection is rectilinear and if not make it rectilinear
-		 */
-		if (!OrthogonalRouterUtilities.isRectilinear(newLine)) {
-	    	OrthogonalRouterUtilities.transformToOrthogonalPointList(newLine, PositionConstants.NONE, PositionConstants.NONE);
-		}
-		
-		removeRedundantPoints(newLine);
-		
-		/*
-		 * Remove unnecessary points that are contained within source and/or target shapes
-		 * as well as insert extra points if all points are within source and/or target shapes
-		 */
-    	removePointsInViews(conn, newLine, lastStartAnchor, lastEndAnchor);
-    	
-		Dimension tolerance = new Dimension(3, 0);
-		if (!RouterHelper.getInstance().isFeedback(conn))
-			tolerance = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(tolerance);
-		
-		/*
-		 * Normalize polyline to eliminate extra segments. (This makes 3 segments collapsing into
-		 * one, while line segments are moved)
-		 */
-		if (!skipNormalization) {			
-            if (PointListUtilities.normalizeSegments(newLine, tolerance.width)) {
-            	/*
-            	 * Normalization can make our polyline not rectilinear. Hence, we need to normalize
-            	 * segments of polyline to straight line tolerance.
-            	 */
-            	normalizeToStraightLineTolerance(newLine, tolerance.width);
-            }
-		}
-				
-		/*
-		 * Normalization is not touching the end points, hence we'd like to handle this here.
-		 * If distance between start and end (which are the only points in a polyline) points
-		 * is too short we'll remove one of the points  
-		 */
-		if (newLine.size() == 2) {
-			Ray middleSeg = new Ray(newLine.getFirstPoint(), newLine.getLastPoint());
-			if (middleSeg.length() <= tolerance.width) {
-				newLine.removePoint(0);
-			}
-		}
-    	
-		/*
-		 * Calculate connection anchor points and possibly some extra routing work to keep
-		 * the connection rectilinear if anchor points make it not rectilinear.  
-		 */
-		resetEndPointsToEdge(conn, newLine);
-		
-		if (nestedRoutingDepth < maxNestedRoutingDepth && !isValidRectilinearLine(conn, newLine)) {
-			routeLine(conn, ++nestedRoutingDepth, newLine);
-		}
-	}
-	
-	/**
-	 * Rectilinear polyline is invalid if:
-	 * 1. First bend point is within the source
-	 * 2. Last bend point is within the target
-	 * 3. First bend point and source anchor are on different sides of the source shape
-	 * 4. Last bend point and target anchor are on different sides of the target shape
-	 * 
-	 * @param conn connection
-	 * @param line rectilinear polyline
-	 * @return <code>true</code> if the line is valid
-	 */
-	private boolean isValidRectilinearLine(Connection conn, PointList line) {
-		if (!(conn.getSourceAnchor().getOwner() instanceof Connection)) {
-			Rectangle source = new PrecisionRectangle(FigureUtilities.getAnchorableFigureBounds(conn.getSourceAnchor().getOwner()));
-			conn.getSourceAnchor().getOwner().translateToAbsolute(source);
-			conn.translateToRelative(source);
-			if (source.contains(line.getPoint(1))) {
-				return false;
-			}
-			int firstSegmentOrientation = line.getFirstPoint().x == line.getPoint(1).x ? PositionConstants.VERTICAL : PositionConstants.HORIZONTAL;
-			if (getOutisePointOffRectanglePosition(line.getPoint(1), source) != getAnchorLocationBasedOnSegmentOrientation(line.getFirstPoint(), source, firstSegmentOrientation)) {
-				return false;
-			}			
-		}
-		if (!(conn.getTargetAnchor().getOwner() instanceof Connection)) {
-			Rectangle target = new PrecisionRectangle(FigureUtilities.getAnchorableFigureBounds(conn.getTargetAnchor().getOwner()));
-			conn.getTargetAnchor().getOwner().translateToAbsolute(target);
-			conn.translateToRelative(target);
-			if (target.contains(line.getPoint(line.size() - 2))) {
-				return false;
-			}
-			int lastSegmentOrientation = line.getLastPoint().x == line.getPoint(line.size() - 2).x ? PositionConstants.VERTICAL : PositionConstants.HORIZONTAL;
-			if (getOutisePointOffRectanglePosition(line.getPoint(line.size() - 2), target) != getAnchorLocationBasedOnSegmentOrientation(line.getLastPoint(), target, lastSegmentOrientation)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Removes consecutive points contained within the source shape and removes consecutive
-	 * points contained within the target shape. If all points have been removed an extra point
-	 * outside source and target shapes will be added.
-	 * 
-	 * @param conn connection
-	 * @param newLine polyline of the connection (routed connection)
-	 * @param start old start anchor point
-	 * @param end old end anchor point
-	 */
-	private void removePointsInViews(Connection conn, PointList newLine,
-			Point start, Point end) {
-		
-		if (conn.getSourceAnchor().getOwner() == conn.getTargetAnchor().getOwner()) {
-			return;
-		}
-		
-		/*
-		 * Get the bounds of anchorable figure of the source and target and translate it to
-		 * connection relative coordinates.
-		 */
-		PrecisionRectangle source = conn.getSourceAnchor().getOwner() != null ? new PrecisionRectangle(
-				FigureUtilities.getAnchorableFigureBounds(conn
-						.getSourceAnchor().getOwner()))
-				: null;
-		PrecisionRectangle target = conn.getTargetAnchor().getOwner() != null ? new PrecisionRectangle(
-				FigureUtilities.getAnchorableFigureBounds(conn
-						.getTargetAnchor().getOwner()))
-				: null;
-		if (source != null) {
-			conn.getSourceAnchor().getOwner().translateToAbsolute(source);
-			conn.translateToRelative(source);
-		}
-		if (target != null) {
-			conn.getTargetAnchor().getOwner().translateToAbsolute(target);
-			conn.translateToRelative(target);
-		}
-		
-		Point lastRemovedFromSource = null;
-		Point lastRemovedFromTarget = null;
-		
-		/*
-		 * Starting from the first point of polyline remove points that are contained
-		 * within the source shape until the first point outside is found.
-		 * Remember the point that was removed from the source shape last for a possible
-		 * case of all points removed from polyline.
-		 */
-		if (!(conn.getSourceAnchor().getOwner() instanceof Connection)
-				&& newLine.size() != 0
-				&& source.contains(new PrecisionPoint(newLine.getFirstPoint()))) {
-			lastRemovedFromSource = newLine.removePoint(0);
-			for (int i = 0; i < newLine.size()
-					&& source.contains(new PrecisionPoint(newLine.getPoint(i))); i++) {
-				lastRemovedFromSource = newLine.removePoint(i--);
-			}
-		}
-		
-		/*
-		 * Starting from the end point of polyline remove points that are contained
-		 * within the target shape until the first point outside is found.
-		 * Remember the point that was removed from the target shape last for a possible
-		 * case of all points removed from polyline.
-		 */
-		if (!(conn.getTargetAnchor().getOwner() instanceof Connection)
-				&& newLine.size() != 0
-				&& target.contains(new PrecisionPoint(newLine.getLastPoint()))) {
-			lastRemovedFromTarget = newLine.removePoint(newLine.size() - 1);
-			for (int i = newLine.size(); i > 0
-					&& target.contains(new PrecisionPoint(newLine
-							.getPoint(i - 1))); i--) {
-				lastRemovedFromTarget = newLine.removePoint(i - 1);
-			}
-		}
-		
-		/*
-		 * Handle the special case of all points removed from polyline.
-		 */
-		if (newLine.size() == 0) {
-			Dimension tolerance = new Dimension(1, 0);
-			if (!RouterHelper.getInstance().isFeedback(conn))
-				tolerance = (Dimension)MapModeUtil.getMapMode(conn).DPtoLP(tolerance);
-			int toleranceValue = tolerance.width;
-			if (lastRemovedFromSource == null) {
-				lastRemovedFromSource = start;
-			}
-			if (lastRemovedFromTarget == null) {
-				lastRemovedFromTarget = end;
-			}
-			/*
-			 * If last point removed from source and the points removed from target form
-			 * a vertical or horizontal line we'll find a point located on this line and is
-			 * outside of source and target shape and insert it in the polyline.
-			 * The check for vertical and horizontal segment is using tolerance value, because
-			 * bend point location extracted from RelativeBendpoint can have precision errors due
-			 * to non-integer weight factors.  
-			 */
-			if (Math.abs(lastRemovedFromSource.x - lastRemovedFromTarget.x) < toleranceValue) {
-				// Vertical
-				if (source.preciseY < target.preciseY) {
-					newLine.addPoint(lastRemovedFromSource.x, (source
-							.getBottom().y + target.getTop().y) / 2);
-				} else {
-					newLine.addPoint(lastRemovedFromSource.x,
-							(source.getTop().y + target.getBottom().y) / 2);
-				}
-			} else if (Math.abs(lastRemovedFromSource.y - lastRemovedFromTarget.y) < toleranceValue) {
-				// Horizontal
-				if (source.preciseX < target.preciseX) {
-					newLine.addPoint(
-							(source.getRight().x + target.getLeft().x) / 2,
-							lastRemovedFromSource.y);
-				} else {
-					newLine.addPoint(
-							(source.getLeft().x + target.getRight().x) / 2,
-							lastRemovedFromSource.y);
-				}
-			} else if ((conn.getSourceAnchor() instanceof BaseSlidableAnchor
-					&& StringStatics.BLANK.equals(((BaseSlidableAnchor) conn
-							.getSourceAnchor()).getTerminal()) && (conn
-					.getTargetAnchor() instanceof BaseSlidableAnchor && StringStatics.BLANK
-					.equals(((BaseSlidableAnchor) conn.getTargetAnchor())
-							.getTerminal())))) {
-				/*
-				 * This a special case for old diagrams with rectilinear connections routed by
-				 * the old router to look good with the new router
-				 */
-				if (lastRemovedFromSource != null && lastRemovedFromTarget != null) {
-					newLine.addPoint((lastRemovedFromSource.x + lastRemovedFromTarget.x) / 2, (lastRemovedFromSource.y + lastRemovedFromTarget.y) / 2); 
-				} else {
-					double startX = Math.max(source.preciseX, target.preciseX);
-					double endX = Math.min(source.preciseX
-							+ source.preciseWidth, target.preciseX
-							+ target.preciseWidth);
-					double startY = Math.max(source.preciseY, target.preciseY);
-					double endY = Math.min(source.preciseY
-							+ source.preciseHeight, target.preciseY
-							+ target.preciseHeight);
-					if (startX < endX) {
-						if (source.preciseY < target.preciseY) {
-							newLine.addPoint((int) Math
-									.round((startX + endX) / 2.0), (source
-									.getBottom().y + target.getTop().y) / 2);
-						} else {
-							newLine.addPoint((int) Math
-									.round((startX + endX) / 2.0), (source
-									.getTop().y + target.getBottom().y) / 2);
-						}
-					} else if (startY < endY) {
-						if (source.preciseX < target.preciseX) {
-							newLine.addPoint((source.getRight().x + target
-									.getLeft().x) / 2, (int) Math
-									.round((startY + endY) / 2.0));
-						} else {
-							newLine.addPoint((source.getLeft().x + target
-									.getRight().x) / 2, (int) Math
-									.round((startY + endY) / 2.0));
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Determines the relative to rectangle geographic location of a point.
-	 * Example: If shape is closer to the the top edge of the rectangle location
-	 * would be north.
-	 * Method used to determine which side of shape's bounding rectangle is closer
-	 * to connection's anchor point.
-	 * All geometric quantities must be in the same coordinate system. 
-	 * 
-	 * @param anchorPoint location of the anchor point
-	 * @param rect bounding rectangle of the shape
-	 * @return
-	 */
-	private int getAnchorOffRectangleDirection(Point anchorPoint, Rectangle rect) {
-		int position = PositionConstants.NORTH;
-		int criteriaValue = Math.abs(anchorPoint.y - rect.y);
-		int tempCriteria = Math.abs(anchorPoint.y - rect.y - rect.height);
-		if (tempCriteria < criteriaValue) {
-			criteriaValue = tempCriteria;
-			position = PositionConstants.SOUTH;
-		}
-		
-		tempCriteria = Math.abs(anchorPoint.x - rect.x);
-		if (tempCriteria < criteriaValue) {
-			criteriaValue = tempCriteria;
-			position = PositionConstants.WEST;
-		}
-		
-		tempCriteria = Math.abs(anchorPoint.x - rect.x - rect.width);
-		if (tempCriteria < criteriaValue) {
-			criteriaValue = tempCriteria;
-			position = PositionConstants.EAST;
-		}
-		
-		return position; 		
-	}
-	
-	/**
-	 * Returns a translation dimension for the anchor point. Translation dimension
-	 * translates the anchor point off the shape. The off shape direction
-	 * is specified by the relative to the shape geographic position of the anchor  
-	 * 
-	 * @param position relative to the shape geographic position of the anchor
-	 * @param xFactorValue translation value along x-axis
-	 * @param yFactorValue translation value along y-axis
-	 * @return
-	 */
-	private Dimension getTranslationValue(int position, int xFactorValue, int yFactorValue) {
-		Dimension translationDimension = new Dimension();
-		if (position == PositionConstants.EAST) {
-			translationDimension.width = xFactorValue;
-		} else if (position == PositionConstants.SOUTH) {
-			translationDimension.height = yFactorValue;
-		} else if (position == PositionConstants.WEST) {
-			translationDimension.width = -xFactorValue;
-		} else if (position == PositionConstants.NORTH) {
-			translationDimension.height = -yFactorValue;
-		}
-		return translationDimension;
-	}
-	
-	/**
-	 * Determines whether the rectilinear line segment coming out of the shape should be
-	 * horizontal or vertical based on the anchor geographic position relative to the shape 
-	 * 
-	 * @param anchorRelativeLocation
-	 * @return
-	 */
-	private int getOffShapeDirection(int anchorRelativeLocation) {
-		if (anchorRelativeLocation == PositionConstants.EAST || anchorRelativeLocation == PositionConstants.WEST) {
-			return PositionConstants.HORIZONTAL;
-		} else if (anchorRelativeLocation == PositionConstants.NORTH || anchorRelativeLocation == PositionConstants.SOUTH) {
-			return PositionConstants.VERTICAL;
-		}
-		return PositionConstants.NONE;
-	}
-	
-	/* (non-Javadoc)
-	 * @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 line) {
-		if (isReorienting(conn)) {
-			/*
-			 * If the connection doesn't have a shape as a source or target we'll
-			 * let the oblique router to do the work. The connection doesn't need to
-			 * be rectilinear at this point. There is no support for making a rectilinear
-			 * connection for which one of the ends is not connected to anything. 
-			 */
-			super.resetEndPointsToEdge(conn, line);
-			return;
-		}
-    	PrecisionRectangle source = sourceBoundsRelativeToConnection(conn);
-    	PrecisionRectangle target = targetBoundsRelativeToConnection(conn);
-    	int offSourceDirection = PositionConstants.NONE;
-    	int offTargetDirection = PositionConstants.NONE;
-		int sourceAnchorRelativeLocation = PositionConstants.NONE;
-		int targetAnchorRelativeLocation = PositionConstants.NONE;
-    	if (line.size() == 0) {
-    		/*
-    		 * If there are no valid bend points, we'll use the oblique connection anchor points
-    		 * and just convert the polyline from oblique to rectilinear. 
-    		 */
-    		// Need to add 2 dumb points to ensure that RouterHelper#resetEndPointsToEdge works
-    		line.addPoint(new Point());
-    		line.addPoint(new Point());
-    		super.resetEndPointsToEdge(conn, line);
-    		sourceAnchorRelativeLocation = getAnchorOffRectangleDirection(line.getFirstPoint(), source);
-    		targetAnchorRelativeLocation = getAnchorOffRectangleDirection(line.getLastPoint(), target);
-    		/*
-    		 * We need to find two points offset from the source and target anchors outside the shapes
-    		 * such that when the polyline is converted to rectilinear from oblique we won't have
-    		 * rectilinear line segments alligned with source or target shapes edges.
-    		 */
-    		Point offStart = line.getFirstPoint();
-    		Point offEnd = line.getLastPoint();
-    		Dimension offsetDim = offStart.getDifference(offEnd).scale(0.5);
-    		offStart.translate(getTranslationValue(sourceAnchorRelativeLocation, Math.abs(offsetDim.width), Math.abs(offsetDim.height)));
-    		offEnd.translate(getTranslationValue(targetAnchorRelativeLocation, Math.abs(offsetDim.width), Math.abs(offsetDim.height)));
-    		line.insertPoint(offStart, 1);
-    		line.insertPoint(offEnd, 2);
-    		offSourceDirection = getOffShapeDirection(sourceAnchorRelativeLocation);
-    		offTargetDirection = getOffShapeDirection(targetAnchorRelativeLocation);
-    	} else {
-	        Point start = line.getFirstPoint();
-	        Point end = line.getLastPoint();
-	    	if (conn.getSourceAnchor() instanceof OrthogonalConnectionAnchor) {
-	            line.insertPoint(OrthogonalRouterUtilities.getOrthogonalLineSegToAnchorLoc(conn, conn.getSourceAnchor(), start).getOrigin(), 0);
-	    	} else {
-	    		/*
-	    		 * If anchor is not supporting orthogonal connections we'll use the oblique connection
-	    		 * anchors and then convert it to rectilinear.
-	    		 */
-	    		PrecisionPoint reference = new PrecisionPoint(start);
-	    		conn.getSourceAnchor().getOwner().translateToAbsolute(reference);
-	    		PrecisionPoint anchorLocation = new PrecisionPoint(conn.getSourceAnchor().getLocation(reference));
-				conn.translateToRelative(anchorLocation);
-				line.insertPoint(anchorLocation, 0);
-	    	}
-	    	if (conn.getTargetAnchor() instanceof OrthogonalConnectionAnchor) {
-	            line.addPoint(OrthogonalRouterUtilities.getOrthogonalLineSegToAnchorLoc(conn, conn.getTargetAnchor(), end).getOrigin());
-	    	} else {
-	    		/*
-	    		 * If anchor is not supporting orthogonal connections we'll use the oblique connection
-	    		 * anchors and then convert it to rectilinear.
-	    		 */
-	    		PrecisionPoint reference = new PrecisionPoint(end);
-	    		conn.getSourceAnchor().getOwner().translateToAbsolute(reference);
-	    		PrecisionPoint anchorLocation = new PrecisionPoint(conn.getTargetAnchor().getLocation(reference));
-				conn.translateToRelative(anchorLocation);
-				line.addPoint(anchorLocation);
-	    	}
-	    	sourceAnchorRelativeLocation = getAnchorOffRectangleDirection(line.getFirstPoint(), source);
-            offSourceDirection = getOffShapeDirection(sourceAnchorRelativeLocation);
-	    	targetAnchorRelativeLocation = getAnchorOffRectangleDirection(line.getLastPoint(), target);
-            offTargetDirection = getOffShapeDirection(targetAnchorRelativeLocation);
-    	}
-
-    	/*
-    	 * Convert the polyline to rectilinear. If the connection is rectilinear already then the
-    	 * connection will remain as it is.
-    	 */
-		OrthogonalRouterUtilities.transformToOrthogonalPointList(line, offSourceDirection, offTargetDirection);
-		removeRedundantPoints(line);
-	}
-	
-    /**
-     * Goes through line segments of a polyline and makes strict straight segments
-     * from nearly straight segments.
-     * 
-     * @param line polyline
-     * @param tolerance tolerance value specifying nearly straight lines.
-     */
-    private void normalizeToStraightLineTolerance(PointList line, int tolerance) {
-    	for (int i = 0; i < line.size() - 1; i++) {
-    		Point pt1 = line.getPoint(i);
-    		Point pt2 = line.getPoint(i + 1);
-    		if (Math.abs(pt1.x - pt2.x) < tolerance) {
-    			line.setPoint(new Point(pt1.x, pt2.y), i + 1);
-    		} else if (Math.abs(pt1.y - pt2.y) < tolerance) {
-    			line.setPoint(new Point(pt2.x, pt1.y), i + 1);
-    		}
-    	}
-    }
-        
-    /**
-     * Source bounding rectangle relative to connection figure coordinates
-     * 
-     * @param conn connection
-     * @return <code>PrecisionRectangle</code> source bounds relative to connection's coordinate
-     * system
-     */
-    private PrecisionRectangle sourceBoundsRelativeToConnection(Connection conn) {
-    	PrecisionRectangle source = new PrecisionRectangle(conn.getSourceAnchor().getOwner().getBounds());
-    	conn.getSourceAnchor().getOwner().translateToAbsolute(source);
-    	conn.translateToRelative(source);
-    	return source;
-    }
-    
-    /**
-     * Target bounding rectangle relative to connection figure coordinates
-     * 
-     * @param conn connection
-     * @return <code>PrecisionRectangle</code> target bounds relative to connection's coordinate
-     * system
-     */
-    private PrecisionRectangle targetBoundsRelativeToConnection(Connection conn) {
-    	PrecisionRectangle target = new PrecisionRectangle(conn.getTargetAnchor().getOwner().getBounds());
-    	conn.getTargetAnchor().getOwner().translateToAbsolute(target);
-    	conn.translateToRelative(target);
-    	return target;
-    }
-    
-    /**
-     * Calculates geographic position of a point located outside the given rectangle relative
-     * to the rectangle 
-     * 
-     * @param p point outside of rectangle
-     * @param r the rectangle
-     * @return geographic position of the point relative to the recatangle
-     */
-    private int getOutisePointOffRectanglePosition(Point p, Rectangle r) {
-    	int position = PositionConstants.NONE;
-    	if (r.x > p.x) {
-    		position |= PositionConstants.WEST;
-    	} else if (r.x + r.width < p.x) {
-    		position |= PositionConstants.EAST;
-    	}
-    	if (r.y > p.y) {
-    		position |= PositionConstants.NORTH;
-    	} else if (r.y + r.height < p.y) {
-    		position |= PositionConstants.SOUTH;
-    	}
-    	return position;
-    }
-    
-    /**
-     * Given the coordinates of the connection anchor point the shape's rectangle and the
-     * orientation of the first rectilinear connection segment that comes out from the anchor
-     * point the method detemines on which geographic side of the rectangle the anchor point
-     * is located on. 
-     * 
-     * @param anchorPoint coordinates of the anchor point
-     * @param rectangle the shape's bounding rectangle
-     * @param segmentOrientation orinetation of the segment coming out from the anchor point
-     * @return geographic position of the anchor point relative to the rectangle
-     */
-    private int getAnchorLocationBasedOnSegmentOrientation(Point anchorPoint, Rectangle rectangle, int segmentOrientation) {
-    	if (segmentOrientation == PositionConstants.VERTICAL) {
-    		if (Math.abs(anchorPoint.y - rectangle.y) < Math.abs(anchorPoint.y - rectangle.y - rectangle.height)) {
-    			return PositionConstants.NORTH;
-    		} else {
-    			return PositionConstants.SOUTH;
-    		}
-    	} else if (segmentOrientation == PositionConstants.HORIZONTAL) {
-    		if (Math.abs(anchorPoint.x - rectangle.x) < Math.abs(anchorPoint.x - rectangle.x - rectangle.width)) {
-    			return PositionConstants.WEST;
-    		} else {
-    			return PositionConstants.EAST;
-    		}
-    	}
-    	return PositionConstants.NONE;
-    }
-    
-	/**
-	 * Iterates through points of a polyline and does the following:
-	 * if 3 points lie on the same line the middle point is removed
-	 * 
-	 * @param line polyline's points
-	 */
-	private boolean removeRedundantPoints(PointList line) {
-		int initialNumberOfPoints = line.size();
-		if (line.size() > 2) {
-			PointList newLine = new PointList(line.size()); 
-			newLine.addPoint(line.removePoint(0));
-			while (line.size() >= 2) {
-				Point p0 = newLine.getLastPoint();
-				Point p1 = line.getPoint(0);
-				Point p2 = line.getPoint(1);
-				if (p0.x == p1.x && p0.x == p2.x) {
-					// Have two vertical segments in a row
-					// get rid of the point between
-					line.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
-					line.removePoint(0);
-				} else {
-					newLine.addPoint(line.removePoint(0));
-				}
-			}
-			while (line.size() > 0) {
-				newLine.addPoint(line.removePoint(0));
-			}
-			line.removeAllPoints();
-			line.addAll(newLine);
-		}
-		return line.size() != initialNumberOfPoints;
-	}
-    
-}
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 7765223..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/RouterHelper.java
+++ /dev/null
@@ -1,720 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-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.PrecisionPoint;
-import org.eclipse.draw2d.geometry.Ray;
-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.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(true);
-
-    /**
-     * @return the <code>RouterHelper</code> singleton instance
-     */
-    static public RouterHelper getInstance() {
-        return sprm;
-    }
-    
-   private boolean useGEFRouter = true;
-    
-    private RouterHelper(boolean useGEFRouter) {
-        super();
-        this.useGEFRouter = useGEFRouter;
-    }
-    
-    protected boolean getUseGEFRouter() {
-    	return useGEFRouter;
-    }
-    /***************************************************************************
-     * Following section is supporting useGEFRouter = true option
-     ***************************************************************************/
-    
-    // if useGEFRouter = true, holds one router for each container that has at least
-    // one connection with avoid obstacles on
-    private Map<IFigure, ShortestPathConnectionRouter> routers = new WeakHashMap<IFigure, ShortestPathConnectionRouter>();
-
-    // if useGEFRouter = true, keeps track of the last GEF router used
-    // for routing each connection with avoid obstacles on
-    private Map<Connection, ShortestPathConnectionRouter> lastUsedRouter = new WeakHashMap<Connection, ShortestPathConnectionRouter>();
-
-    /**
-     * Added to support GEF's router.
-     */
-    public void setConstraint(Connection conn, Object constraint) {
-        if (useGEFRouter && isAvoidingObstructions(conn)) {
-            ShortestPathConnectionRouter spcr = getConnRouter(conn, false);
-            if (spcr != null) {
-                setConstraint(spcr, conn, constraint);
-            }
-        }
-    }
-    
-	/**
-	 * Sets constraint for GEF router.
-	 * 
-	 * @param spcr
-	 *            GEF router
-	 * @param conn
-	 *            <code>Connection</code> whose constraint is being set
-	 * @param constraint
-	 *            New constraint
-	 */
-	public void setConstraint(ShortestPathConnectionRouter spcr,
-			Connection conn, Object constraint) {
-		spcr.setConstraint(conn, null);
-	}
-
-	/**
-	 * Added to support GEF's router.
-	 * 
-	 * @param conn
-	 *            the <code>Connection</code> to be removed from GEF's router,
-	 *            if applicable.
-	 */
-	public void remove(Connection conn) {
-		if (useGEFRouter && isAvoidingObstructions(conn)) {
-			ShortestPathConnectionRouter spcr = getConnRouter(conn, false);
-			if (spcr != null) {
-				cleanUpAvoidObstaclesRouter(spcr, conn);
-			}
-		}
-	}
-	
-    /**
-     * Removes conn from router and cleans up routers and lastUSedRouter appropriately
-     */
-    private void cleanUpAvoidObstaclesRouter(ShortestPathConnectionRouter router, Connection conn) {    	 
-		if (router != null) {
-			router.remove(conn);
-			if (!router.hasMoreConnections()) {
-				routers.remove(router.getContainer());
-			}
-			lastUsedRouter.remove(conn);
-		}
-    } 	
-
-    /**
-	 * Added to support GEF's router.
-	 * 
-	 * @param conn
-	 *            the <code>Connection</code> to be potentially invalidated. 
-	 */
-    public void invalidate(Connection conn) {
-        if (useGEFRouter && isAvoidingObstructions(conn)) {
-            ShortestPathConnectionRouter spcr = getConnRouter(conn, false);
-            if (spcr != null) {
-                spcr.invalidate(conn);
-            }
-        }
-    }
-    
-    /**
-     * Retrieves GEF's router for given figContainer
-     * @param figContainer
-     * @param createNew If true, new router will be created if one doesn't already exist
-     * @return
-     */
-    private ShortestPathConnectionRouter getRouter(IFigure figContainer, boolean createNew) {
-        ShortestPathConnectionRouter shortestPathRouter = routers.get(figContainer);
-        if (shortestPathRouter == null && createNew) {
-            shortestPathRouter = new ShortestPathConnectionRouter(figContainer);
-            shortestPathRouter.setSpacing(MapModeUtil.getMapMode(figContainer)
-                .DPtoLP(10));
-            routers.put(figContainer, shortestPathRouter);
-        }
-
-        return shortestPathRouter;
-    }    
-    
-    /**
-     * Retrieves GEF's router for routing conn, if both source and target of the connection
-     * belong to the same container.
-     * @param conn the <code>Connection</code> whose router is to be retrieved.
-     * @param forRouting Indicates if this call is made in order to route the connection.
-     * is no router for conn. If yes, and there is no apporpriate router for this connection, then new 
-     * router will be created. 
-     * @return the router to use for routing conn
-     */
-    protected ShortestPathConnectionRouter getConnRouter(Connection conn, boolean forRouting) {
-        ShortestPathConnectionRouter lur = lastUsedRouter.get(conn);    	
-    	// First, get the container for this connection
-    	// Rule: both source and target figures have to belong to the same container. 
-    	IFigure container = null;
-        IFigure sourcefigContainer = getSourceContainer(conn);
-        IFigure targetfigContainer = getTargetContainer(conn);        
-        if (sourcefigContainer == null || targetfigContainer == null ) {
-        	// this may happen when source or target anchors are being moved outside of all figures,
-        	// or if source or target of conn is another connection        	        	
-        	if (lur != null) {
-        		// Route using the last router, if any, otherwise don't route using GEF
-        		return lur;
-        	} else {
-        		container = null;
-        	}
-        } else if (sourcefigContainer != targetfigContainer) {
-        	container = null;
-        } else {
-        	container = sourcefigContainer;
-        }
-        
-        if (container == null) {
-        	// conn spans between two different containers in which case we don't support
-        	// avoid obstacles. If there was a router for this connection (conn used to belong
-        	// to one container), remove it from previous router.
-        	if (lur != null) {
-        		cleanUpAvoidObstaclesRouter(lur, conn);
-        	}
-            return null;
-        }
-        ShortestPathConnectionRouter spcr = getRouter(container, forRouting);
- 
-        if (spcr != null && forRouting) {
-			if (lur != spcr) {
-				if (lur != null) {
-					// conn changed container. Remove it from previous router.
-					cleanUpAvoidObstaclesRouter(lur, conn);
-				}
-				lastUsedRouter.put(conn, spcr);				
-			}			
-		}
-        return spcr;
-    }   
-    
-    
-    /***************************************************************************
-     * end of section supporting useGEFRouter = true option
-     ***************************************************************************/
-    
-    
-    
-    /**
-     * @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) {
-    	if (useGEFRouter && lastUsedRouter.get(conn) != null) {
-    		// User just unselected Avoid obstacles options for this connection, clean up.
-    		cleanUpAvoidObstaclesRouter(lastUsedRouter.get(conn), 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) {
-    	if (useGEFRouter && lastUsedRouter.get(conn) != null) {
-    		// User just unselected Avoid obstacles options for this connection, clean up.
-    		cleanUpAvoidObstaclesRouter(lastUsedRouter.get(conn), 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;
-		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);
-		}
-
-		collectObstructions(conn, rPoly, collectObstructs);
-
-		// 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;
-    }
-    
-    /**
-     * Finds all the children shapes of the parent figure passed in that are in
-     * the way of the connection. This method will dig into children of
-     * container shapes if one of the connection ends is also in that container.
-     * 
-     * @param connection
-     *            the connection being routed
-     * @param connectionRect
-     *            the rectangle representing the connection bounds that is used
-     *            to determine if a shape intersects with the connection
-     * @param obstructionsToReturn
-     *            the list of figures that the connection should be routed
-     *            around
-     */
-    protected void collectObstructions(Connection connection,
-            Rectangle connectionRect, List obstructionsToReturn) {
-
-        Set containerFiguresToSearch = new HashSet();
-        Set figuresToExclude = new HashSet();
-
-        IFigure figure = connection.getSourceAnchor().getOwner();
-        figuresToExclude.add(figure);
-        figure = figure.getParent();
-        while (figure != null) {
-            if (figure.getLayoutManager() instanceof XYLayout) {
-                containerFiguresToSearch.add(figure);
-            }
-            figuresToExclude.add(figure);
-            figure = figure.getParent();
-        }
-
-        figure = connection.getTargetAnchor().getOwner();
-        figuresToExclude.add(figure);
-        figure = figure.getParent();
-        while (figure != null) {
-            if (figure.getLayoutManager() instanceof XYLayout) {
-                containerFiguresToSearch.add(figure);
-            }
-            figuresToExclude.add(figure);
-            figure = figure.getParent();
-        }
-
-        for (Iterator iter = containerFiguresToSearch.iterator(); iter
-            .hasNext();) {
-            IFigure containerFigure = (IFigure) iter.next();
-
-            for (Iterator iterator = containerFigure.getChildren().iterator(); iterator
-                .hasNext();) {
-                IFigure childFigure = (IFigure) iterator.next();
-
-                if (!figuresToExclude.contains(childFigure)) {
-
-                    Rectangle rObstruct = new Rectangle(childFigure.getBounds());
-                    childFigure.translateToAbsolute(rObstruct);
-                    connection.translateToRelative(rObstruct);
-
-                    // inflate slightly
-                    rObstruct.expand(1, 1);
-
-                    if (connectionRect.intersects(rObstruct)) {
-                        obstructionsToReturn.add(rObstruct);
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * @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() < 2) {
-    		/*
-			 * Connection must have at least 2 points in the list: the source
-			 * and target anchor points. Otherwise it's invalid connection.
-			 * Invalid connection case: add a dumb point at the start of the
-			 * list and at the end of the list. The first and the last point in
-			 * the list are replaced by the new source and target anchor points
-			 * in this method
-			 */
-    		newLine.addPoint(0, 0);
-    		newLine.insertPoint(new Point(), 0);
-    	}
-    	
-        PrecisionPoint sourceAnchorPoint, targetAnchorPoint;
-        if (newLine.size() > 2) {
-        	/*
-        	 * First bend point is the outside reference point for the source anchor.
-        	 * Last bend point is the outside reference point for the target anchor.
-        	 */
-	        PrecisionPoint sourceReference = new PrecisionPoint(newLine.getPoint(1));
-	        PrecisionPoint targetReference = new PrecisionPoint(newLine.getPoint(newLine.size() - 2));
-	        conn.translateToAbsolute(sourceReference);
-	        conn.translateToAbsolute(targetReference);
-	        sourceAnchorPoint = getAnchorLocation(conn.getSourceAnchor(), sourceReference);
-	        targetAnchorPoint = getAnchorLocation(conn.getTargetAnchor(), targetReference);
-        } else {
-        	/*
-        	 * We need to take target anchor reference point as an outside reference point
-        	 * for the source anchor location. The outside reference point for the target
-        	 * anchor would the source anchor location. 
-        	 */
-        	PrecisionPoint sourceReference = getAnchorReference(conn.getTargetAnchor());
-	        sourceAnchorPoint = getAnchorLocation(conn.getSourceAnchor(), sourceReference);
-	        targetAnchorPoint = getAnchorLocation(conn.getTargetAnchor(), sourceAnchorPoint);
-        }
-        
-        
-        conn.translateToRelative(sourceAnchorPoint);
-        conn.translateToRelative(targetAnchorPoint);
-        
-        newLine.setPoint(sourceAnchorPoint,0);
-        newLine.setPoint(targetAnchorPoint,newLine.size() - 1);
-    }
-
-    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;
-    }
-
-
-    protected IFigure getSourceContainer(Connection conn) {
-        if (conn.getSourceAnchor() != null)
-            return findContainerFigure(conn.getSourceAnchor().getOwner());
-        
-        return null;
-    }
-
-    protected 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;
-}
-   
-    
-    /**
-     * Returns anchor location as <code>PrecisionPoint</code>
-     * 
-     * @param anchor connection anchor object
-     * @param reference outside reference point
-     * @return <code>PrecisionPoint</code> for anchor location
-     */
-    private PrecisionPoint getAnchorLocation(ConnectionAnchor anchor, Point reference) {
-    	return new PrecisionPoint(anchor.getLocation(reference));
-    }
-       
-    /**
-     * Returns anchor reference point as <code>PrecisionPoint</code>
-     * 
-     * @param anchor connection anchor object
-     * @return <code>PrecisionPoint</code> for anchor reference
-     */
-    private PrecisionPoint getAnchorReference(ConnectionAnchor anchor) {
-   		return new PrecisionPoint(anchor.getReferencePoint());
-    }
-    
-	/**
-	 * 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;
-	}
-
-	
-}
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 f2a2978..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/routers/TreeRouter.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - bug 233344 
- ****************************************************************************/
-
-
-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.ConnectionAnchor;
-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;
-
-/**
- * This class is a top level router for managing the individual branches in a set of
- * tree routed connections.
- *
- * @author sshaw
- */
-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)) {
-				final ConnectionAnchor connExtSourceAnchor = connNext.getSourceAnchor();
-				final ConnectionAnchor connExtTargetAnchor = connNext.getTargetAnchor();
-				if (connExtSourceAnchor != null && connExtSourceAnchor.getOwner() != null &&
-						connExtTargetAnchor != null && connExtTargetAnchor.getOwner() != null){
-					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;
-	}
-    
-	private Rectangle getTargetAnchorRelativeBounds(final Connection conn) {
-		final Rectangle bounds = conn.getTargetAnchor().getOwner().getBounds().getCopy();
-		conn.getTargetAnchor().getOwner().translateToAbsolute(bounds);
-		conn.translateToRelative(bounds);
-		return bounds;
-	}
-
-	private Rectangle getSourceAnchorRelativeBounds(final Connection conn) {
-		final Rectangle bounds = conn.getSourceAnchor().getOwner().getBounds().getCopy();
-		conn.getSourceAnchor().getOwner().translateToAbsolute(bounds);
-		conn.translateToRelative(bounds);
-		return bounds;
-	}
-
-	
-	/**
-	 * 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(getTargetAnchorRelativeBounds(conn));
-
-		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);
-		
-		final Rectangle targetAnchorBounds = getTargetAnchorRelativeBounds(conn); 
-		
-		// update orientation
-		if (isTopDown(conn)) {
-			if (ptTrunkLoc.y < targetAnchorBounds.getCenter().y)
-				setTrunkOrientation(Orientation.TOP);
-			else
-				setTrunkOrientation(Orientation.BOTTOM);
-		}
-		else {
-			if (ptTrunkLoc.x < targetAnchorBounds.getCenter().x)
-				setTrunkOrientation(Orientation.LEFT);
-			else
-				setTrunkOrientation(Orientation.RIGHT);
-		}
-
-		Point target = getTrunkOrientation().getEdge(targetAnchorBounds);
-		
-		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 = getTargetAnchorRelativeBounds(conn);
-			Rectangle sourceBounds = getSourceAnchorRelativeBounds(conn);
-			
-			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 10b91ad..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/mapmode/IMapMode.java
+++ /dev/null
@@ -1,58 +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
- */
-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.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/FlowUtilitiesEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/FlowUtilitiesEx.java
deleted file mode 100644
index dfbeb3d..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/FlowUtilitiesEx.java
+++ /dev/null
@@ -1,75 +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.draw2d.ui.text;
-
-import org.eclipse.draw2d.TextUtilities;
-import org.eclipse.draw2d.text.FlowUtilities;
-import org.eclipse.draw2d.text.TextFragmentBox;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Rectangle;
-
-/**
- * This class extends GEF's <code>FlowUtilities</code> class to provide
- * mapmode support.
- * 
- * @since 2.1
- * @author satif, crevells
- */
-public class FlowUtilitiesEx
-    extends FlowUtilities {
-
-    /**
-     * The mapmode to be used for translating measurement units.
-     */
-    private IMapMode mapmode;
-
-    private TextUtilities textUtilities;
-
-    /**
-     * Creates a new instance.
-     * 
-     * @param mapmode
-     *            mapmode to be used for translating measurement units
-     */
-    public FlowUtilitiesEx(IMapMode mapmode) {
-        super();
-        this.mapmode = mapmode;
-    }
-
-    public float getAverageCharWidth(TextFragmentBox fragment, Font font) {
-        return mapmode.DPtoLP((int) super.getAverageCharWidth(fragment, font));
-    }
-
-    protected Rectangle getTextLayoutBounds(String s, Font f, int start, int end) {
-        Rectangle rect = super.getTextLayoutBounds(s, f, start, end);
-        return new Rectangle(mapmode.DPtoLP(rect.x), mapmode.DPtoLP(rect.y),
-            mapmode.DPtoLP(rect.width), mapmode.DPtoLP(rect.height));
-    }
-
-    protected TextUtilities getTextUtilities() {
-        if (textUtilities == null) {
-            textUtilities = new TextUtilitiesEx(mapmode);
-        }
-        return textUtilities;
-    }
-
-    /**
-     * Make public.
-     * 
-     * @see #setupFragment(TextFragmentBox, Font, String)
-     */
-    public void setupFragmentEx(TextFragmentBox fragment, Font font,
-            String string) {
-        super.setupFragment(fragment, font, string);
-    }
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextFlowEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextFlowEx.java
deleted file mode 100644
index d08c354..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextFlowEx.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.text;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.draw2d.text.TextFragmentBox;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * A <code>TextFlow</code> with the following additional capabilities: <br>
- * <UL>
- * <LI>text can be underlined or have a strike-through
- * <LI>truncated with ... when the full text doesn't fit vertically
- * </UL>
- * 
- * @since 2.1
- * @author satif, crevells
- * 
- */
-public class TextFlowEx
-    extends TextFlow {
-
-    // reserve 1 bit
-    private static int FLAG_UNDERLINED = Figure.MAX_FLAG << 1;
-
-    private static int FLAG_STRIKEDTHROUGH = Figure.MAX_FLAG << 2;
-
-    /**
-     * The highest reserved flag used by this class.
-     * 
-     * @see Figure#MAX_FLAG
-     */
-    protected static final int MAX_FLAG = FLAG_STRIKEDTHROUGH;
-
-    private String truncationString = "..."; //$NON-NLS-1$
-
-    /** the FlowUtilities instance that is dependent on the mapmode */
-    private FlowUtilitiesEx flowUtilities;
-
-    /** the TextUtilities instance that is dependent on the mapmode */
-    private TextUtilitiesEx textUtilities;
-
-    private int nDPtoLP_1 = -1;
-
-    /**
-     * Constructs a new TextFlow with the empty String.
-     */
-    public TextFlowEx() {
-        super();
-    }
-
-    /**
-     * Constructs a new TextFlow with the specified String.
-     * 
-     * @param text
-     *            the string
-     */
-    public TextFlowEx(String text) {
-        super(text);
-    }
-
-    /**
-     * Gets the truncation string. The default is an ellipsis "...".
-     * 
-     * @return the truncation string
-     */
-    protected String getTruncationString() {
-        return truncationString;
-    }
-
-    /**
-     * Sets the truncation string. The default is an ellipsis "...".
-     * 
-     * @param truncationString
-     *            the new truncation string
-     */
-    public void setTruncationString(String truncationString) {
-        this.truncationString = truncationString;
-    }
-
-    /**
-     * @return whether the label text is striked-through
-     */
-    public boolean isTextStrikedThrough() {
-        return (flags & FLAG_STRIKEDTHROUGH) != 0;
-    }
-
-    /**
-     * Sets whether the label text should be striked-through
-     * 
-     * @param strikeThrough
-     *            Whether the label text should be striked-through
-     */
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        if (isTextStrikedThrough() == strikeThrough)
-            return;
-        setFlag(FLAG_STRIKEDTHROUGH, strikeThrough);
-        repaint();
-    }
-
-    /**
-     * @return whether the label text is underlined
-     */
-    public boolean isTextUnderlined() {
-        return (flags & FLAG_UNDERLINED) != 0;
-    }
-
-    /**
-     * Sets whether the label text should be underlined
-     * 
-     * @param underline
-     *            Whether the label text should be underlined
-     */
-    public void setTextUnderline(boolean underline) {
-        if (isTextUnderlined() == underline)
-            return;
-        setFlag(FLAG_UNDERLINED, underline);
-        repaint();
-    }
-
-    protected void paintFigure(Graphics g) {
-        TextFragmentBox frag;
-        g.getClip(Rectangle.SINGLETON);
-        int yStart = Rectangle.SINGLETON.y;
-        int yEnd = Rectangle.SINGLETON.bottom();
-        Rectangle maxBounds = getVisibleBounds();
-
-        for (int i = 0; i < getFragments().size(); i++) {
-            frag = (TextFragmentBox) getFragments().get(i);
-            if (frag.offset == -1)
-                continue;
-            // Loop until first visible fragment
-            if (yStart > getVisibleBottom(frag) + 1)// The + 1
-                // is for
-                // disabled
-                // text
-                continue;
-            // Break loop at first non-visible fragment
-            if (yEnd < getVisibleTop(frag))
-                break;
-
-            String draw = getBidiSubstring(frag, i);
-
-            // ///////////////////////////////////////////
-            // If the next fragment will not be completely visible, then
-            // truncate this fragment.
-            boolean truncate = frag.isTruncated();
-            if (i + 1 < getFragments().size()
-                && maxBounds.bottom() < getVisibleBottom((TextFragmentBox) getFragments()
-                    .get(i + 1))) {
-
-                draw = truncateText(draw);
-                truncate = true;
-
-                // increment the counter so no further fragments will be
-                // processed
-                i = getFragments().size();
-            }
-
-            if (truncate)
-                draw += getTruncationString();
-            // ///////////////////////////////////////////
-
-            if (!isEnabled()) {
-                Color cachedfgColor = g.getForegroundColor();
-                g.setForegroundColor(ColorConstants.buttonLightest);
-                paintText(g, draw, frag.getX() + getDPtoLP1(), frag
-                    .getBaseline()
-                    - frag.getAscent() + getDPtoLP1(), frag.getBidiLevel());
-                g.setForegroundColor(ColorConstants.buttonDarker);
-                paintText(g, draw, frag.getX(), frag.getBaseline()
-                    - frag.getAscent(), frag.getBidiLevel());
-                g.setForegroundColor(cachedfgColor);
-            } else {
-                paintText(g, draw, frag.getX(), frag.getBaseline()
-                    - frag.getAscent(), frag.getBidiLevel());
-            }
-
-            drawTextAdornments(g, frag);
-        }
-    }
-
-    private int getDPtoLP1() {
-        if (nDPtoLP_1 == -1) {
-            nDPtoLP_1 = MapModeUtil.getMapMode(this).DPtoLP(1);
-        }
-        return nDPtoLP_1;
-    }
-
-    private void drawTextAdornments(Graphics g, TextFragmentBox fragment) {
-        int baseline = fragment.getBaseline();
-        if (isTextUnderlined()) {
-            baseline += getDPtoLP1();
-
-            g.drawLine(fragment.getX(), baseline, fragment.getWidth()
-                + fragment.getX(), baseline);
-        }
-        if (isTextStrikedThrough()) {
-            int y = fragment.getBaseline()
-                - fragment.getAscent()
-                + ((fragment.getAscent() + fragment.getDescent() + getDPtoLP1()) / 2);
-            g.drawLine(fragment.getX(), y, fragment.getWidth()
-                + fragment.getX(), y);
-        }
-    }
-
-    /**
-     * Gets the y-value representing the top of the visible text.
-     * 
-     * @param fragment
-     *            the text fragment
-     * @return the top value
-     */
-    private int getVisibleTop(TextFragmentBox fragment) {
-        return fragment.getBaseline() - fragment.getAscent();
-    }
-
-    /**
-     * Gets the y-value representing the bottom of the visible text.
-     * 
-     * @param fragment
-     *            the text fragment
-     * @return the bottom value
-     */
-    private int getVisibleBottom(TextFragmentBox fragment) {
-        return fragment.getBaseline() + fragment.getDescent();
-    }
-
-    /**
-     * Adds an ellipsis to the text passed in if this will fit in the width of
-     * this figure, otherwise first truncates the text as required and then adds
-     * the ellipsis.
-     * 
-     * @param text
-     *            the full text
-     * @return a new string with the text ending in an ellipsis
-     */
-    protected String truncateText(String text) {
-        int maxWidth = getVisibleBounds().width;
-        Font currentFont = getFont();
-
-        int ellipsisWidth = getTextUtilities().getTextExtents(
-            getTruncationString(), currentFont).width;
-
-        if (maxWidth < ellipsisWidth) {
-            maxWidth = ellipsisWidth;
-        }
-
-        int subStringLength = getTextUtilities().getLargestSubstringConfinedTo(
-            text, currentFont, maxWidth - ellipsisWidth);
-
-        return new String(text.substring(0, subStringLength));
-    }
-
-    public FlowUtilitiesEx getFlowUtilities() {
-        if (flowUtilities == null) {
-            flowUtilities = new FlowUtilitiesEx(MapModeUtil.getMapMode(this));
-        }
-        return flowUtilities;
-    }
-
-    public TextUtilitiesEx getTextUtilities() {
-        if (textUtilities == null) {
-            textUtilities = new TextUtilitiesEx(MapModeUtil.getMapMode(this));
-        }
-        return textUtilities;
-    }
-
-    /**
-     * Gets the area that will be visible to know where to truncate.
-     * 
-     * @return the visible bounds
-     */
-    private Rectangle getVisibleBounds() {
-        // Not the best idea to depend on the parent, but it will have to do for
-        // now.
-        return getParent().getClientArea();
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextUtilitiesEx.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextUtilitiesEx.java
deleted file mode 100644
index b66d3fa..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TextUtilitiesEx.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.text;
-
-import org.eclipse.draw2d.TextUtilities;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author satif, crevells
- * @since 2.1
- */
-public class TextUtilitiesEx
-    extends TextUtilities {
-
-    /**
-     * The mapmode to be used for translating measurement units.
-     */
-    private IMapMode mapmode;
-
-    /**
-     * Private graphics context used to measure rendered text metrics    
-     */
-    private static GC gc;
-    
-    /**
-     * Creates a new instance.
-     * @param mapmode mapmode to be used for translating measurement units
-     */
-    public TextUtilitiesEx(IMapMode mapmode) {
-        super();
-        this.mapmode = mapmode;
-    }
-
-    /**
-     *  Gets the ascent, converted by the mapmode
-     */
-    public int getAscent(Font font) {
-        return mapmode.DPtoLP(super.getAscent(font));
-    }
-
-    /**
-     *  Gets the descent, converted by the mapmode
-     */
-    public int getDescent(Font font) {
-        return mapmode.DPtoLP(super.getDescent(font));
-    }
-
-    /**
-     *  Gets a string's extents, converted by the mapmode
-     */
-    public Dimension getStringExtents(String s, Font f) {
-    	Dimension extents = new Dimension(getStringDimension(s, f, true));
-        applyItalicBugHack(s, f, extents);
-        applyMapModeConversion(extents);
-        return extents;
-    }
-
-    /**
-     *  Gets text's extents, converted by the mapmode
-     */
-    public Dimension getTextExtents(String s, Font f) {
-        Dimension extents = new Dimension(getTextDimension(s, f, true));
-        applyItalicBugHack(s, f, extents);
-        applyMapModeConversion(extents);
-        return extents;
-    }
-
-    /**
-     * Uses an offscreen GC to obtain text's rendered dimensions in pixels
-     * 
-     * @param s
-     * @param f
-     * @param advancedGraphics
-     * @return
-     */
-    private static org.eclipse.swt.graphics.Point getTextDimension(String s, Font f, boolean advancedGraphics) {
-    	return getGC(f, advancedGraphics).textExtent(s);
-    }
-
-    /**
-     * Uses an offscreen GC to obtain a string's rendered dimensions in pixels
-     * 
-     * @param s
-     * @param f
-     * @param advancedGraphics
-     * @return
-     */
-    private static org.eclipse.swt.graphics.Point getStringDimension(String s, Font f, boolean advancedGraphics) {
-    	return getGC(f, advancedGraphics).stringExtent(s);
-    }
-    
-    /**
-     * Converts a dimension using mapmode.DPtoLP()
-     * 
-     * @param extents
-     */
-    private void applyMapModeConversion(Dimension extents)
-    {
-    	extents.width = mapmode.DPtoLP(extents.width);
-    	extents.height = mapmode.DPtoLP(extents.height);
-    }
-    
-    /**
-     * If the font is in italics, this does not always return the correct
-     * size and the text can get clipped. See
-     * https://bugs.eclipse.org/bugs/show_bug.cgi?id=5190. Compensate for
-     * this here until the bugzilla is fixed in SWT by adding an extra half
-     * a character space here.
-     * 
-     * @deprecated
-     * @param s the string
-     * @param f the font
-     * @param dimension the extents to be corrected
-     */
-    private static void applyItalicBugHack(String s, Font f, Dimension extents)
-    {
-        if ((f.getFontData()[0].getStyle() & SWT.ITALIC) != 0 &&
-        		s.length() > 0) {
-        	extents.width += (extents.width / s.length()) / 2;
-        }
-    }
-    
-    /**
-     * Gets a singleton instance of a private off-screen graphics
-     * context for measuring attributes of rendered text 
-     * 
-     * @param f font setting desired
-     * @param advancedGraphics mode desired
-     * @return
-     */
-    private static GC getGC(Font f, boolean advancedGraphics)
-    {
-    	if(gc == null) {
-    		gc = new GC(new Shell());
-    	}
-    	gc.setFont(f);
-    	gc.setAdvanced(advancedGraphics);
-    	return gc;
-    }
-    
-}
diff --git a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TruncatedSingleLineTextLayout.java b/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TruncatedSingleLineTextLayout.java
deleted file mode 100644
index 9694204..0000000
--- a/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/text/TruncatedSingleLineTextLayout.java
+++ /dev/null
@@ -1,110 +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.draw2d.ui.text;
-
-import java.util.List;
-
-import org.eclipse.draw2d.text.TextFlow;
-import org.eclipse.draw2d.text.TextFragmentBox;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * A single-line text layout (i.e. no word wrapping), that truncates the text if
- * it does not all fit in the width available.
- * 
- * @author satif, crevells
- * @since 2.1
- * 
- */
-public class TruncatedSingleLineTextLayout
-    extends org.eclipse.draw2d.text.TextLayout {
-
-    private String truncationString;
-
-    /**
-     * Creates a new SimpleTextLayout with the given TextFlow
-     * 
-     * @param flow
-     *            the TextFlow
-     * @param truncationString
-     *            the string to be used to show truncation (normally "...")
-     */
-    public TruncatedSingleLineTextLayout(TextFlowEx flow,
-            String truncationString) {
-        super(flow);
-        this.truncationString = truncationString;
-    }
-
-    /**
-     * Gets the string to be used to show truncation (normally "...").
-     * 
-     * @return the truncation string
-     */
-    protected String getTruncationString() {
-        return truncationString;
-    }
-
-    private FlowUtilitiesEx getFlowUtilities() {
-        return ((TextFlowEx) getFlowFigure()).getFlowUtilities();
-    }
-
-    private TextUtilitiesEx getTextUtilities() {
-        return ((TextFlowEx) getFlowFigure()).getTextUtilities();
-    }
-
-    protected void layout() {
-        TextFlow textFlow = (TextFlow) getFlowFigure();
-        String text = textFlow.getText();
-        List fragments = textFlow.getFragments();
-        Font font = textFlow.getFont();
-
-        int ellipsisWidth = getTextUtilities().getTextExtents(truncationString,
-            font).width;
-
-        TextFragmentBox fragment = getFragment(0, fragments);
-        fragment.length = text.length();
-        fragment.offset = 0;
-        fragment.setWidth(-1);
-        fragment.setTruncated(false);
-        getFlowUtilities().setupFragmentEx(fragment, font, text);
-
-        int remainingLineWidth = getContext().getRemainingLineWidth();
-
-        // if the text should be truncated...
-        if (remainingLineWidth > 0 && remainingLineWidth < fragment.getWidth()) {
-
-            remainingLineWidth -= ellipsisWidth;
-            if (remainingLineWidth > 0) {
-                int subStringLength = getTextUtilities()
-                    .getLargestSubstringConfinedTo(text, font,
-                        remainingLineWidth);
-                fragment.length = subStringLength;
-            } else {
-                fragment.length = 0;
-            }
-            fragment.setTruncated(true);
-            fragment.setWidth(-1);
-            getFlowUtilities().setupFragmentEx(fragment, font, text);
-        } else {
-            fragment.setTruncated(false);
-        }
-
-        getContext().addToCurrentLine(fragment);
-        getContext().endLine();
-
-        // Remove the remaining unused fragments.
-        int i = 1;
-        while (i < fragments.size())
-            fragments.remove(i++);
-    }
-
-}
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 5cf49bb..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/.api_filters b/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/.api_filters
deleted file mode 100644
index 3a63182..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/.api_filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.emf.clipboard.core" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/emf/clipboard/core/BasePasteOperation.java" type="org.eclipse.gmf.runtime.emf.clipboard.core.BasePasteOperation">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ResourceInfo"/>
-                <message_argument value="BasePasteOperation"/>
-                <message_argument value="getResourceInfo()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="MergedEObjectInfo"/>
-                <message_argument value="BasePasteOperation"/>
-                <message_argument value="addMergedElementEntry(EObject, MergedEObjectInfo)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="ResourceInfo"/>
-                <message_argument value="BasePasteOperation"/>
-                <message_argument value="BasePasteOperation(IProgressMonitor, Map, ResourceInfo, IClipboardSupport)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteChildOperation.java" type="org.eclipse.gmf.runtime.emf.clipboard.core.PasteChildOperation">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="PasteIntoParentOperation"/>
-                <message_argument value="PasteChildOperation"/>
-                <message_argument value="getParentPasteProcess()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="PasteIntoParentOperation"/>
-                <message_argument value="PasteChildOperation"/>
-                <message_argument value="PasteChildOperation(PasteIntoParentOperation, ObjectInfo)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8240ca2..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:04:56 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 b0a27a8..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.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.emf.clipboard.core;singleton:=true
-Bundle-Version: 1.5.0.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.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 bf83bf1..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 Modeling Project
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/pom.xml b/org.eclipse.gmf.runtime.emf.clipboard.core/pom.xml
deleted file mode 100644
index faa2e48..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.clipboard.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.clipboard.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 97e9e75..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/schema/clipboardSupport.exsd
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.gmf.runtime.emf.clipboard.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<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">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <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">
-            <annotation>
-               <documentation>
-                  Either the nsURI or the policy attribute needs to be used.  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.
-WARNING: DO NOT USE.  Providing an nsURI does not support the full extensibility capabilities of the ClipboardSupport extension point. Providing a policy class is the recommended approach.
-               </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>
-         <attribute name="policy" type="string">
-            <annotation>
-               <documentation>
-                  Either the nsURI or the policy attribute needs to be used.  Providing a policy class supports the full extensibility capabilities of the ClipboardSupport extension point and is the recommended approach.  The policy class is used to answer whether or not the provider provides for an object, without causing plug-ins to be activated (the policy class needs to be placed in a package that will not cause the plugin to load to support this).
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportPolicy"/>
-               </appInfo>
-            </annotation>
-         </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="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2005, 2009  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>
-
-   <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>
-
-</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 d1a22a7..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-	}
-	
-	/**
-	 * 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 179cee5..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/ClipboardUtil.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.HashMap;
-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 = new HashMap();
-				}
-				CopyOperation copyOperation = new CopyOperation(
-					monitor,
-					createClipboardSupport(first),
-					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()));
-			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.
-	 * <p>
-	 * <b>WARNING: DO NOT USE.</b> Calling this method does not support the full
-	 * extensibility capabilities of the ClipboardSupport extension point. Use
-	 * the method {@link #createClipboardSupport(EObject)} instead.
-	 * 
-	 * @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;
-	}
-
-	/**
-	 * Obtains the clipboard copy/paste support utility, if any, for the
-	 * specified <code>eObject</code>. If there is not clipboard support
-	 * implementation provided for this EObject, then a default implementation
-	 * is provided that implements semantics similar to the
-	 * {@link org.eclipse.emf.ecore.util.EcoreUtil.Copier} class.
-	 * 
-	 * @param eObject
-	 *            an EObject
-	 * @return the <code>eObject</code>'s clipboard support utility, or a null
-	 *         implementation if none is registered for it (not actually
-	 *         <code>null</code>)
-	 * @since 1.3
-	 */
-	public static IClipboardSupport createClipboardSupport(EObject eObject) {
-		IClipboardSupport result = DefaultClipboardSupport.getInstance();
-		IClipboardSupportFactory factory = ClipboardSupportManager.lookup(eObject);
-		
-		if (factory != null) {
-			result = factory.newClipboardSupport(eObject.eClass().getEPackage());
-		}
-		
-		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 e53561b..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyObjects.java
+++ /dev/null
@@ -1,60 +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.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 boolean sortTotalCopyObjects = true;
-
-	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 5eb22cc..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/CopyOperation.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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$
-	}
-
-	/**
-	 * @since 1.3
-	 */
-	protected CopyParentsCopier getCopyParentsCopier() {
-		if (copyParentsCopierCopier == null) {
-			copyParentsCopierCopier = new CopyParentsCopier();
-		}
-		return copyParentsCopierCopier;
-
-	}
-
-	/**
-	 * @since 1.3
-	 */
-	protected 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;
-		}
-
-		public 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/IClipboardSupportPolicy.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupportPolicy.java
deleted file mode 100644
index e7f2917..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/IClipboardSupportPolicy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.IAdaptable;
-
-/**
- * Interface for policies for a clipboard support providers. Used to answer
- * whether or not the provider provides for an operation, without causing
- * plug-ins to be activated.
- * 
- * @author crevells
- * @since 1.3
- */
-public interface IClipboardSupportPolicy {
-
-	/**
-	 * Determines if this policy provides for the given adaptable.
-	 * 
-	 * @param adaptable
-	 *            the adaptable in question
-	 * @return true if this policy provides for the given adaptable
-	 */
-	public boolean provides(IAdaptable adaptable);
-}
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 2c1d205..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/PasteTarget.java
+++ /dev/null
@@ -1,75 +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.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 c47cd12..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 =
-    						Boolean.valueOf(
-    							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 5d127fb..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ClipboardSupportManager.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-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.common.core.util.Proxy;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportFactory;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupportPolicy;
-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), crevells
- */
-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$
-	static final String E_POLICY = "policy"; //$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$
-	
-	/** An array of lists of descriptors for each priority, index by priority. */
-	private static ArrayList[] descriptors; 
-	
-	/**
-	 * 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.
-	 */
-	private static class EObjectAdapter extends Proxy implements IAdaptable {
-
-		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;
-		}
-	}
-
-	/** 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) {
-		
-		// initialize the arrays
-		descriptors = new ArrayList[PRIORITIES.size()];
-		for (int i = 0; i < PRIORITIES.size(); i++) {
-			descriptors[i] = new ArrayList(0);
-		}
-		
-		// create each descriptor and add to appropriate list
-		for (int i = 0; i < configs.length; i++) {
-			try {
-				Descriptor desc = new Descriptor(configs[i]);
-				descriptors[desc.getPriority()].add(desc);
-			} catch (CoreException e) {
-				ClipboardPlugin.getPlugin().log(e.getStatus());
-			}
-		}
-	}
-	
-	/**
-	 * Retrieves the clipboard support factory (if any) that handles the
-	 * specified <code>EPackage</code>.
-	 * <p>
-	 * <b>WARNING: DO NOT USE.</b> Calling this method does not support the full
-	 * extensibility capabilities of the ClipboardSupport extension point. Use
-	 * the method {@link #lookup(EObject)} instead.
-	 * 
-	 * @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) {
-		for (int i = PRIORITIES.size() - 1; i >= 0; i--) {
-
-			List descriptorsAtPriorityN = descriptors[i];
-			int size = descriptorsAtPriorityN.size();
-
-			for (int j = 0; j < size; j++) {
-				Descriptor descriptor = (Descriptor) descriptorsAtPriorityN
-						.get(j);
-				if (descriptor.provides(ePackage)) {
-					return descriptor.getFactory();
-				}
-			}
-		}
-
-		return null;
-	}
-	
-	/**
-	 * Retrieves the clipboard support factory (if any) that handles the
-	 * specified <code>EClass</code>.
-	 * <p>
-	 * <b>WARNING: DO NOT USE.</b> Calling this method does not support the full
-	 * extensibility capabilities of the ClipboardSupport extension point. Use
-	 * the method {@link #lookup(EObject)} instead.
-	 * 
-	 * @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) {
-		for (int i = PRIORITIES.size() - 1; i >= 0; i--) {
-
-			List descriptorsAtPriorityN = descriptors[i];
-			int size = descriptorsAtPriorityN.size();
-
-			for (int j = 0; j < size; j++) {
-				Descriptor descriptor = (Descriptor) descriptorsAtPriorityN
-						.get(j);
-				if (descriptor.provides(eObject)) {
-					return descriptor.getFactory();
-				}
-			}
-		}
-
-		return null;
-	}
-	
-	/**
-	 * 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 EPackage ePackage = null;
-		private IClipboardSupportFactory factory;
-		private IClipboardSupportPolicy policy;
-		private IConfigurationElement config;
-		private int priority = 2;
-		
-		private boolean factoryClassInitialized = false;
-		private boolean policyClassInitialized = false;
-		
-		Descriptor(IConfigurationElement config) throws CoreException {
-			this.config = config;
-			
-			String nsUri = config.getAttribute(E_NSURI);
-			if (nsUri != null && nsUri.length() > 0) {
-				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()})));
-				}
-			} else {
-				// there needs to be either an nsURI specified or a policy class
-				String policy = config.getAttribute(E_POLICY);
-				if ((policy == null) || (policy.length() == 0)) {
-					throw new CoreException(createErrorStatus(
-							ClipboardStatusCodes.CLIPBOARDSUPPORT_MISSING_CLASS,
-							NLS.bind(EMFClipboardCoreMessages.missing_nsUri_ERROR_,
-								new Object[] {
-									ClipboardPlugin.EXTPT_CLIPBOARDSUPPORT,
-									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);
-				}
-			}
-		}
-
-		/**
-		 * Determines if this descriptor provides for the given EPackage by
-		 * comparing its nsURI with the nsURI attribute field. In this case, the
-		 * policy class is not consulted at all.
-		 * 
-		 * @param ePackage the ePackage in question
-		 * @return true if this descriptor provides for the given ePackage
-		 */
-		private boolean provides(EPackage ePackage) {
-			return (ePackage != null && ePackage.equals(getEPackage()));
-		}
-		
-		/**
-		 * Determines if this descriptor provides for the given EObject by
-		 * consulting the policy class if there is one provided. If there is no
-		 * policy class provided, then the {@link #provides(EPackage)} method is
-		 * called with the EPackage of the given EObject.
-		 * 
-		 * @param eObject
-		 *            the eObject in question
-		 * @return true if this descriptor provides for the given eObject
-		 */
-		private boolean provides(EObject eObject) {
-			policy = getPolicy();
-
-			if (policy != null) {
-				try {
-					return policy.provides(new EObjectAdapter(eObject));
-				} catch (Throwable e) {
-					ClipboardPlugin.getPlugin().log(createErrorStatus(
-							ClipboardStatusCodes.CLIPBOARDSUPPORT_MISSING_CLASS,
-							NLS.bind(EMFClipboardCoreMessages.missing_class_ERROR_,
-								new Object[] {
-									IClipboardSupportFactory.class.getName(),
-									config.getAttribute(E_POLICY)}),
-							e));
-					
-					// re-throw fatal errors
-					if (e instanceof ThreadDeath) {
-						throw (ThreadDeath) e;
-					}
-
-					if (e instanceof VirtualMachineError) {
-						throw (VirtualMachineError) e;
-					}
-
-					return false;
-				}
-			}
-			return provides(eObject.eClass().getEPackage());
-		}
-		
-		EPackage getEPackage() {
-			return ePackage;
-		}
-		
-		/** @deprecated need a context-based solution */
-		int getPriority() {
-			return priority;
-		}
-		
-		IClipboardSupportFactory getFactory() {
-			if (factory == null && !factoryClassInitialized) {
-				factoryClassInitialized = true;
-				factory = createFactory();
-			}
-			
-			return factory;
-		}
-		
-		IClipboardSupportPolicy getPolicy() {
-			if (policy == null && !policyClassInitialized) {
-				policyClassInitialized = true;
-				policy = createPolicy();
-			}
-			return policy;
-		}
-		
-		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));
-			} 
-			
-			return result;
-		}
-		
-		private IClipboardSupportPolicy createPolicy() {
-			IClipboardSupportPolicy result = null;
-			
-			String policyClassName = config.getAttribute(E_POLICY);
-			if (policyClassName != null && policyClassName.length() > 0) {
-				try {
-					result = (IClipboardSupportPolicy) config.createExecutableExtension(E_POLICY);
-				} 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_MISSING_CLASS,
-						NLS.bind(EMFClipboardCoreMessages.missing_class_ERROR_,
-							new Object[] {
-								IClipboardSupportFactory.class.getName(),
-								config.getAttribute(E_POLICY)}),
-						e));
-				} 
-			}
-			
-			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/IClipboardSupport2.java b/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/IClipboardSupport2.java
deleted file mode 100644
index 88d7f4b..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/IClipboardSupport2.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Map;
-
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-import org.eclipse.gmf.runtime.emf.clipboard.core.PasteTarget;
-
-/**
- * An additional interface that can be implemented by clients to inject
- * additional specific behavior into copy/paste operations. See
- * {@link IClipboardSupport} for an explanation of its use.
- * 
- * @author crevells
- */
-public interface IClipboardSupport2 {
-
-	/**
-	 * Queries whether it is necessary to completely override the default paste
-	 * into parent behaviour.
-	 * 
-	 * @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
-	 */
-	/**
-	 * @param pasteTarget
-	 * @param hintsMap
-	 * @return boolean <code>true</code> if we want to completely override the
-	 *         paste into parent operation for this child; <code>false</code>,
-	 *         otherwise
-	 */
-	boolean shouldOverridePasteIntoParentOperation(PasteTarget pasteTarget,
-			Map hintsMap);
-
-	/**
-	 * Obtains an override for the specified paste into parent operation. This
-	 * method is called immediately after (@link
-	 * #shouldOverridePasteIntoParentOperation}, and then only if the latter
-	 * returned <code>true</code>.
-	 * 
-	 * @param pasteOperation
-	 *            the paste operation in progress
-	 * @param pasteTarget
-	 *            the target object into which the copied elements are to be
-	 *            pasted
-	 * @param hintsMap
-	 *            the map of copy hints, possibly empty. Hints are defined by
-	 *            the
-	 *            {@link org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil}
-	 *            class
-	 * @return the overriding paste into parent operation
-	 * @throws Exception
-	 *             if anything goes wrong in initializing the paste operation
-	 */
-	PasteIntoParentOperation getPasteIntoParentOperation(
-			PasteOperation pasteOperation, PasteTarget pasteTarget, Map hintsMap)
-			throws Exception;
-}
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 2817e2f..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, 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.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;
-
-	public 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 = Integer.valueOf(list.indexOf(obj_1));
-			map.put(obj_1, int_1);
-		}
-		if (int_2 == null) {
-			int_2 = Integer.valueOf(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 514ab49..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- */
-public class LoadingEMFResource
-	extends SerializationEMFResource {
-
-	private final ResourceSet rset;
-	
-	private Map idToEObjectMapCopy;
-
-	private Map eObjectToIDMapCopy;
-
-	public 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 d02577b..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteIntoParentOperation.java
+++ /dev/null
@@ -1,804 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.eIsSet(ref) ? eObject.eGet(ref, true) : null;
-				if (value != null) {
-					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 {
-						EObject eObj = (EObject) value;
-						if (eObj.eIsProxy()) {
-							EObject resolved = ClipboardSupportUtil.resolve(eObj,
-								getLoadedResource().getIDToEObjectMapCopy());
-							if (resolved.eIsProxy() == false) {
-								EcoreUtil.replace(eObject, ref, eObj, resolved);
-							} else if ( ref.getEOpposite() != null){
-								//if it can not resolve to loaded paste resource, then
-								//it is an external reference. If it is also a bidirectional
-								//reference, clear its value. 
-								eObject.eUnset(ref);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	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);
-		}
-	}
-
-	protected 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 5b6745c..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/PasteOperation.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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) {
-			
-			IClipboardSupport helper = getClipboardOperationHelper();
-			if (helper instanceof IClipboardSupport2
-					&& ((IClipboardSupport2) helper)
-							.shouldOverridePasteIntoParentOperation(
-									parentElement, getHintsMap())) {
-				parentPasteProcess = ((IClipboardSupport2) helper)
-						.getPasteIntoParentOperation(this, parentElement,
-								getHintsMap());
-			} 
-			
-			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 ebeec70..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/ResourceInfo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.LinkedHashMap;
-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();
-	}
-
-	public String data;
-
-	String info;
-
-	String version;
-
-	String type;
-
-	public String encoding;
-
-	public Map objects = new LinkedHashMap();
-
-	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 5524c8a..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, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Iterator;
-import java.util.LinkedHashSet;
-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 LinkedHashSet(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 eca1e13..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SavingEMFResource.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.resource.impl.ResourceImpl;
-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 LinkedHashSet(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);
-		if (copyObjects.sortTotalCopyObjects) {
-			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) {
-			if (res instanceof XMLResource) {
-				return ((XMLResource) res).getID(eObject);
-			} else if (res instanceof ResourceImpl) {
-				Map<String, EObject> map = ((ResourceImpl)res).getIntrinsicIDToEObjectMap();
-				if (map != null) {
-					for (Map.Entry<String, EObject> mapEntry : map.entrySet()) {
-						if (eObject.equals(mapEntry.getValue())) {
-							return mapEntry.getKey();
-						}
-					}
-				}
-			}
-		}
-		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 80d20a4..0000000
--- a/org.eclipse.gmf.runtime.emf.clipboard.core/src/org/eclipse/gmf/runtime/emf/clipboard/core/internal/SerializationEMFResource.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-		SAVE_OPTIONS.put(XMIResource.OPTION_SKIP_ESCAPE_URI, Boolean.FALSE);
-	}
-
-	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 528f3ed..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 either the "nsURI" attribute or the "policy" 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 or policy class 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 584b932..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.settings/.api_filters b/org.eclipse.gmf.runtime.emf.commands.core/.settings/.api_filters
deleted file mode 100644
index 527c10e..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.emf.commands.core" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/emf/commands/core/command/AbstractTransactionalCommand.java" type="org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ICommandWithSettableResult"/>
-                <message_argument value="AbstractTransactionalCommand"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/emf/commands/core/command/CompositeTransactionalCommand.java" type="org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ICommandWithSettableResult"/>
-                <message_argument value="CompositeTransactionalCommand"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e1a52e0..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:05 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 c4a562a..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.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.commands.core

-Bundle-Version: 1.4.0.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.5.0,4.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.workspace;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 9194468..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.emf.commands.core/pom.xml b/org.eclipse.gmf.runtime.emf.commands.core/pom.xml
deleted file mode 100644
index b135536..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.commands.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.commands.core</artifactId>
-  <version>1.4.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 4331de0..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/AbstractTransactionalCommand.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * 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, should never be <code>null</code>.
-     * @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, should never be <code>null</code>.
-     * @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 == null) ? StringStatics.BLANK : 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 69be548..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/CompositeTransactionalCommand.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-
-/**
- * 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, should never be <code>null</code>.
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label) {
-        super(domain, (label == null) ? StringStatics.BLANK : label);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, and transaction options.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label, should never be <code>null</code>.
-     * @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 == null) ? StringStatics.BLANK : label, options);
-    }
-
-    /**
-     * Initializes me with the editing domain, a label, and child operations.
-     * 
-     * @param domain
-     *            my editing domain
-     * @param label
-     *            my user-readable label, should never be <code>null</code>.
-     * @param children
-     *            a list of operations to compose
-     */
-    public CompositeTransactionalCommand(TransactionalEditingDomain domain,
-            String label, List children) {
-        super(domain, (label == null) ? StringStatics.BLANK : 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, should never be <code>null</code>.
-     * @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 == null) ? StringStatics.BLANK : 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);
-    }
-
-	public CommandResult getCommandResult() {
-		
-		if (commandResult == null) {
-			
-			List<IStatus> statusList = new ArrayList<IStatus>(size());
-
-			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) {
-						statusList.add(result.getStatus());
-					}
-				}
-			}
-			
-			// Don't set the command explicitly since the intermediate command could
-			// have children added later.
-			return new CommandResult(super.aggregateStatuses(statusList),
-				getReturnValues());
-		}
-		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 0:
-            return this;
-        case 1:
-            IUndoableOperation child = (IUndoableOperation) iterator()
-                    .next();
-
-            if (child instanceof ICommand &&
-                    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();
-            }
-        default:
-            if (!isTransactionNestingEnabled()) {
-                List children = getChildren();
-                IUndoableOperation[] opChildren = (IUndoableOperation[]) children
-                        .toArray(new IUndoableOperation[children.size()]);
-                children.clear();
-                for (int i = 0; i < opChildren.length; ++i) {
-                    doReduce(opChildren[i], children);
-                }
-            }
-        }
-        return this;
-    }
-
-    private void doReduce(IUndoableOperation operation, List children) {
-        if (operation instanceof CompositeEMFOperation) {
-            for (Iterator i = ((CompositeEMFOperation) operation).iterator(); i.hasNext();) {
-                doReduce((IUndoableOperation) i.next(), children);
-            }
-        } else {
-            children.add(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 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 48d8b51..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/command/EditingDomainUndoContext.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-    private String label;
-    
-    /**
-     * Initializes me with the editing domain that I represent.
-     * 
-     * @param domain
-     *            the editing domain
-     */
-    public EditingDomainUndoContext(EditingDomain domain) {
-    	this(domain, null);
-    }
-
-    /**
-     * Initializes me with the editing domain that I represent.
-     * 
-     * @param domain
-     *            the editing domain
-     * @param label
-     *            the label for the context
-     * @since 1.4
-     */
-    public EditingDomainUndoContext(EditingDomain domain, String label) {
-        this.editingDomain = domain;
-        this.label = label;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.core.commands.operations.IUndoContext#getLabel()
-     */
-    public String getLabel() {
-    	if (label != null) {
-			return label;
-    	}
-        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;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode() {
-        return editingDomain == null ? 0
-            : editingDomain.hashCode();
-    }
-
-    /**
-     * Obtains the editing domain.
-     * 
-     * @return my editing domain
-     */
-    public final EditingDomain getEditingDomain() {
-        return editingDomain;
-    }
-    
-    /**
-     * The string representation of this operation.  Used for debugging purposes only.
-     * This string should not be shown to an end user.
-     * 
-     * @return The string representation.
-     */
-    public String toString() {
-    	return getLabel();
-    }
-}
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 e9675ef..0000000
--- a/org.eclipse.gmf.runtime.emf.commands.core/src/org/eclipse/gmf/runtime/emf/commands/core/commands/DuplicateEObjectsCommand.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-	}
-	
-	/**
-	 * Constructs a new duplicate EObjects command with the specified label and
-	 * list of EObjects. Also sets the list of affected files to be the files,
-	 * where the targetContainer is stored. Target container specifies the
-	 * eObject into which the duplicated eObjects will be added.
-	 * 
-	 * @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, EObject targetContainer) {
-		super(editingDomain, label, getWorkspaceFiles(targetContainer));
-		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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 7f54f38..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-doc
-org
-org
-target
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 3bcf201..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.emf.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 393acaa..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:15 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 75101fd..0000000
--- a/org.eclipse.gmf.runtime.emf.core/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.emf.core; singleton:=true

-Bundle-Version: 1.4.1.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.5.0,3.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.workspace;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,

- org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)",

- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,

- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"

-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",

- com.ibm.icu.util;version="[4.0.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 292ec3a..0000000
--- a/org.eclipse.gmf.runtime.emf.core/plugin.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2010  IBM Corporation and others.                  |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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 Modeling Project
-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}'' has a reference to ''{2}'' which cannot be found.
-eObjectFixupVlidation.message = The feature ''{0}'' of ''{1}'' has a reference to ''{2}'' which cannot be found.
-
-#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 0f0c76e..0000000
--- a/org.eclipse.gmf.runtime.emf.core/plugin.xml
+++ /dev/null
@@ -1,109 +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">
-               <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">
-               <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/pom.xml b/org.eclipse.gmf.runtime.emf.core/pom.xml
deleted file mode 100644
index dddcc41..0000000
--- a/org.eclipse.gmf.runtime.emf.core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.core</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 dee817f..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/GMFEditingDomainFactory.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.notify.Notification;
-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.Resource.Factory;
-import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractResourceUndoContextPolicy;
-import org.eclipse.emf.workspace.IResourceUndoContextPolicy;
-import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
-import org.eclipse.emf.workspace.util.WorkspaceValidateEditSupport;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator.ISyncExecHelper;
-import org.eclipse.gmf.runtime.common.core.command.FileModificationValidator.SyncExecHelper;
-import org.eclipse.gmf.runtime.emf.core.internal.resources.PathmapManager;
-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.GMFResourceModificationManager;
-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 {
-
-	static public TransactionalSyncExecHelper transactionalSyncExecHelper = new TransactionalSyncExecHelper();
-	static {
-		SyncExecHelper.setInstance(transactionalSyncExecHelper);
-	}
-			
-    /**
-     * 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(final TransactionalEditingDomain domain) {
-		final 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) {
-			// Set up a delegating resource factory registry that ensures that
-			//  the pathmap URI is normalized before finding a resource factory.
-			final Registry existingRegistry = rset.getResourceFactoryRegistry();
-			
-			rset.setResourceFactoryRegistry(new Registry() {
-				private Registry delegateRegistry = existingRegistry;
-
-				public Map<String, Object> getContentTypeToFactoryMap() {
-					return delegateRegistry.getContentTypeToFactoryMap();
-				}
-
-				public Map<String, Object> getExtensionToFactoryMap() {
-					return delegateRegistry.getExtensionToFactoryMap();
-				}
-
-				public Factory getFactory(URI uri, String contentType) {
-					if (uri != null && uri.scheme() != null && uri.scheme().equals(EMFCoreConstants.PATH_MAP_SCHEME)) {
-						uri = rset.getURIConverter().normalize(uri);
-					}
-					return delegateRegistry.getFactory(uri, contentType);
-				}
-
-				public Factory getFactory(URI uri) {
-					if (uri != null && uri.scheme() != null && uri.scheme().equals(EMFCoreConstants.PATH_MAP_SCHEME)) {
-						uri = rset.getURIConverter().normalize(uri);
-					}
-					return delegateRegistry.getFactory(uri);
-				}
-
-				public Map<String, Object> getProtocolToFactoryMap() {
-					return delegateRegistry.getProtocolToFactoryMap();
-				}
-			});
-			
-			rset.eAdapters().add(new PathmapManager());
-		}
-			
-		TransactionalEditingDomain.DefaultOptions options = (TransactionalEditingDomain.DefaultOptions) (TransactionUtil
-				.getAdapter(domain,
-						TransactionalEditingDomain.DefaultOptions.class));
-
-		Map<Object, Object> aMap = new HashMap<Object, Object>();
-		aMap.put(Transaction.OPTION_VALIDATE_EDIT,
-				new WorkspaceValidateEditSupport() {
-
-					@SuppressWarnings("unchecked")
-					protected IStatus doValidateEdit(Transaction transaction,
-							Collection resources, Object context) {
-						return GMFEditingDomainFactory.transactionalSyncExecHelper
-								.approveFileModification(getFiles(resources),
-										domain);
-					}
-				});
-
-		options.setDefaultTransactionOptions(aMap);
-		
-		configureResourceModificationManagement(domain);
-
-	}
-	
-	/**
-	 * Configures <code>domain</code> so that the modified state
-	 * of resources in the <code>domain</code> is managed as operations are
-	 * executed, undone and redone on the operation history.
-	 * 
-	 * @param domain
-	 *            the editing domain to be configured
-	 * @since 1.2
-	 */
-	protected void configureResourceModificationManagement(
-			TransactionalEditingDomain domain) {
-
-		GMFResourceModificationManager.manage(domain);
-	}
-	
-	@Override
-	protected IResourceUndoContextPolicy getResourceUndoContextPolicy() {
-		return new AbstractResourceUndoContextPolicy() {
-			@Override
-			protected boolean isAbstractChange(Notification notification) {
-				return super.isAbstractChange(notification)
-						&& GMFResource.isModifyingChange(notification);
-			}
-			
-			@Override
-			protected void resourceChange(Set<Resource> resources, Resource resource,
-					Notification notification) {
-
-				if ((notification.getFeatureID(Resource.class) == Resource.RESOURCE__IS_MODIFIED)) {
-					// consider changes to isModified as affecting the resource
-					resources.add(resource);
-					
-				} else {
-					super.resourceChange(resources, resource, notification);
-				}
-			}
-		};
-	}
-	
-	/**
-	 * A helper that knows about the specific editing domain.
-	 * During the approval process, calls to validateEdit() will require the
-	 * domain in order to execute in a thread safe manner.
-	 * 
-	 * @author James Bruck (jbruck)
-	 *
-	 */
-	public static class TransactionalSyncExecHelper implements ISyncExecHelper {
-
-		private final ThreadLocal<TransactionalEditingDomain> domain = new ThreadLocal<TransactionalEditingDomain>();
-
-		private void setDomain(TransactionalEditingDomain domain) {
-			this.domain.set(domain);
-		}
-
-		/**
-		 * Sets the thread specific transactional domain before the approval
-		 * process since subsequent calls to validateEdit() requires it and
-		 * clears it afterward.
-		 * 
-		 * @param files
-		 *            The files to be validated.
-		 * 
-		 * @param transactionalDomain
-		 *            The current editing domain.
-		 * 
-		 * @return The resulting status.
-		 */
-		public IStatus approveFileModification(IFile[] files,
-				TransactionalEditingDomain transactionalDomain) {
-
-			setDomain(transactionalDomain);
-			IStatus status = Status.OK_STATUS;
-			try {
-				status = FileModificationValidator
-						.approveFileModification(files);
-			} finally {
-				setDomain(null);
-			}
-			return status;
-		}
-		
-		/**
-		 * Delegates to the specified domain to obtain a thread safe wrapper
-		 * for the specified <code>runnable</code> 
-		 * 
-		 * @param runnable a runnable to execute in the context of the active
-		 *     transaction, on any thread
-		 *     
-		 *  @return the privileged runnable if the transaction is on the current
-		 *  	thread, otherwise just return itself.
-		 */
-		public Runnable safeRunnable(Runnable runnable) {
-			if( isTransactionOnCurrentThread()) {
-				return domain.get().createPrivilegedRunnable(runnable);
-			}
-			return null;
-		}
-
-		/**
-		 * Checks if the active transaction is on the current thread.
-		 * 
-		 * @return true if the active transaction is on the current thread.
-		 */
-		private boolean isTransactionOnCurrentThread() {
-			if (domain.get() != null) {
-				
-				Transaction tx = ((InternalTransactionalEditingDomain) domain
-						.get()).getActiveTransaction();
-				
-				return ((tx != null) && (tx.getOwner() == Thread
-						.currentThread()));
-			}
-			return false;
-		}
-	}
-		
-}
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 23c7560..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/clipboard/CopyingResource.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-/**
- * @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 c8dd608..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.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.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;
-	public static String saveContextLabel;
-
-	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 fb5ea2b..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/l10n/EMFCoreMessages.properties
+++ /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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-# ==============================================================================
-# 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.
-
-# Pattern for the label on the undo context marking the save point in a GMF editing domain
-#   args:
-#     0 - the ID of the editing domain (if any)
-saveContextLabel = Savepoint undo context for resource "{0}"
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 cadbd2c..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/PathmapManager.java
+++ /dev/null
@@ -1,905 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.resources.IPathmapManager2;
-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, IPathmapManager2 {
-	// 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 Set FILE_VARIABLES = Collections.synchronizedSet(new HashSet());
-	
-	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. Dirties any resources
-	 *  that have HREF's that need to be changed.
-	 * 
-	 * @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) {
-		setPathVariable(var, val, true);
-	}
-	
-	/**
-	 * Sets the value of a pathmap variable (a folder). The provided flag
-	 *  determines if resources should be dirtied if they have HREF's that
-	 *  should be changed.
-	 *  
-	 * @param var the path map variable name
-	 * @param val the path map variable value (must be an encoded URI)
-	 * @param dirtyResources true, if resources should be dirtied so that
-	 *  their modified HREF's are saved. false, otherwise.
-	 */
-	public static void setPathVariable(String var, String val, boolean dirtyResources) {
-		internalSetPathVariable(var, val);
-
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true, dirtyResources);
-		}
-	}
-
-	private static void internalSetPathVariable(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);
-	}
-	
-	/**
-	 * Set the value of a pathmap variable to point to a specific file (not a folder). The
-	 *  provided flag determines whether resource should be dirtied if their HREF's need to
-	 *  be changed.
-	 * 
-	 * @param var the path map variable name
-	 * @param val the path map variable value (must be an encoded URI pointing to a file, not a folder)
-	 * @param dirtyResources true, if resources should be dirtied so that their HREF's can be
-	 * changed. false, otherwise.
-	 */
-	public static void setFilePathVariable(String var, String val, boolean dirtyResources) {
-		FILE_VARIABLES.add(var);
-		internalSetPathVariable(var, val);
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true, dirtyResources);
-		}
-	}
-	
-	/**
-	 * Sets the value of a map of pathmap variables to point to specific files (not folders)
-	 * The provided flag determines whether resource should be dirtied if their HREF's need to
-	 * be changed.
-	 *
-	 * @param settings A map of new variables(Strings) to their values(Strings).
-	 * @param dirtyResource true, if resources should be dirtied so that their HREF's can
-	 *  be changed. false, otherwise.
-	 */
-	public static void setFilePathVariables(Map settings, boolean dirtyResources) {
-		FILE_VARIABLES.addAll(settings.keySet());
-		
-		for (Iterator i = settings.entrySet().iterator(); i.hasNext();) {
-			Map.Entry entry = (Map.Entry)i.next();
-			internalSetPathVariable((String)entry.getKey(), (String)entry.getValue());
-		}
-		
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true, dirtyResources);
-		}
-	}
-	
-	/**
-	 * Sets the value of a map of pathmap variables to point specific folders (not files).
-	 * The provided flag determines whether resource should be dirtied if their HREF's need
-	 * to be changed.
-	 * 
-	 * @param settings A map of new variables(Strings) to their values(Strings).
-	 * @param dirtyResource ture, if resources should be dirtied so that their HREF's can
-	 *  be changed. false, otherwise.
-	 */
-	public static void setPathVariables(Map settings, boolean dirtyResources) {
-		for (Iterator i = settings.entrySet().iterator(); i.hasNext();) {
-			Map.Entry entry = (Map.Entry)i.next();
-			internalSetPathVariable((String)entry.getKey(), (String)entry.getValue());
-		}
-		
-		for (Iterator i = allInstances().iterator(); i.hasNext();) {
-			((PathmapManager) i.next()).resyncEntries(true, dirtyResources);
-		}
-	}
-
-	public IStatus addPathVariable(String name, String value) {
-		setPathVariable(name, value);
-		
-		return Status.OK_STATUS; // TODO: report accurate status
-	}
-	
-	public IStatus addFilePathVariable(String name, String value, boolean dirtyResources) {
-		setFilePathVariable(name, value, dirtyResources);
-		
-		return Status.OK_STATUS; // TODO: report accurate status
-	}
-	
-	public IStatus addFilePathVariables(Map settings, boolean dirtyResources) {
-		setFilePathVariables(settings, dirtyResources);
-		
-		return Status.OK_STATUS; // TODO: report accurate status
-	}
-	
-	public IStatus addFolderPathVariable(String name, String value, boolean dirtyResources) {
-		setPathVariable(name, value, dirtyResources);
-		
-		return Status.OK_STATUS;
-	}
-	
-	public IStatus addFolderPathVariables(Map settings, boolean dirtyResources) {
-		setPathVariables(settings, dirtyResources);
-		
-		return Status.OK_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, 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, true);
-		}
-		
-		super.setTarget(newTarget);
-		
-		// get the new resource set
-		rset = getResourceSet();
-		
-		if (rset != null) {
-			// denormalize all resources using the path mappings
-			resyncEntries(true, true);
-		}
-	}
-	
-	/**
-	 * Add all entries.
-	 */
-	private void resyncEntries(boolean resync, boolean dirtyResources) {
-
-		// 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();
-		
-		Set<Entry<?,?>> uriMapEntrySet = uriMap.entrySet();
-		for (Entry<?, ?> uriMapEntry : uriMapEntrySet) {
-			URI key = (URI) uriMapEntry.getKey();
-
-			if ((key != null)
-				&& (!EMFCoreConstants.PATH_MAP_SCHEME.equals(key.scheme())))
-				savedURIMap.put(key, uriMapEntry.getValue());
-		}
-		
-		// 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.
-		Set<Entry<?, ?>> savedURIEntrySet = savedURIMap.entrySet();
-		for (Entry<?, ?> savedURIEntry : savedURIEntrySet) {
-			URI key = (URI) savedURIEntry.getKey();
-			if(key != null){
-				uriMap.put(key, savedURIEntry.getValue());
-			}
-		}
-
-		if (resync) {
-			// denormalize all.
-			denormalizeAll();
-		}
-		
-		// if some resources have changed their URI, ensure their exports are
-		// dirtied.
-		if (dirtyResources) {
-			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);
-
-			// TODO
-			if (!FILE_VARIABLES.contains(var) && 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);
-
-		//TODO
-		if (!FILE_VARIABLES.contains(var) && 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) &&
-					(valueString.length() == uriAsString.length() || 
-				     uriAsString.charAt(valueString.length()) == EMFCoreConstants.PATH_SEPARATOR))
-				    && (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 b2ddf14..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/util/Util.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.core.resources.IResourceHelper;
-
-
-/**
- * Internal utilities, for private use of the EMF Core plug-in.
- * This class was made public, but a request was made to maintain internals.
- * See Bugzilla 300540
- *
- * @author Christian W. Damus (cdamus)
- */
-public class Util {
-
-	/** 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) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.getHelper(resource);
-	}
-
-	/**
-	 * 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 org.eclipse.gmf.runtime.emf.core.util.Util.encodeQualifiedName(qName);
-	}
-
-	/**
-	 * 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) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.appendQualifiedName(buffer, qName);
-	}
-	
-	/**
-	 * 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) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.decodeQName(qName);
-	}
-
-	/**
-	 * 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) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.denormalizeURI(uri, rset);
-	}
-
-	/**
-	 * Gets the proxy ID by parsing the proxy URI.
-	 * 
-	 * @param proxy
-	 *            The proxy object.
-	 * @return The ID.
-	 */
-	public static String getProxyID(EObject proxy) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.getProxyID(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
-	 *            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) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.resolve(domain, proxy);
-	}
-
-	/**
-	 * Can an instance of class1 contain an instance of class2.
-	 */
-	public static boolean canContain(EClass class1, EClass class2, Set visited) {
-		return org.eclipse.gmf.runtime.emf.core.util.Util.canContain(class1, class2, visited);
-	}
-}
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 e686507..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/validation/UUIDConstraint.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);
-
-		// Only validate EObjects which have a UUID
-		if (null != id) {
-		   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 38defe5..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFHandler.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.UnresolvedReferenceException;
-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) {
-			/*
-			 * Ignore UnresolvedReferenceException, since unresolved references
-			 * are not a fatal error. We will continue to attempt to load the
-			 * model and log UnresolvedReferenceException.
-			 */
-			if (!(e instanceof UnresolvedReferenceException)) {
-				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 f368a69..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResource.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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() && isModifyingChange(notification)) {
-					super.notifyChanged(notification);
-				}
-			}
-		};
-	}
-
-	/**
-	 * Determines whether or not <code>notification</code> indicates a modifying change to a GMF resource
-	 * 
-	 * @param notification
-	 *            a notification of some concrete change in the resource set
-	 * @return whether this change is an abstract change to some resource, for
-	 *         the purpose of tracking undo context
-	 * @since 1.2
-	 */
-	public static boolean isModifyingChange(Notification notification) {
-		return !notification.isTouch() && !isTransient(notification.getNotifier(), notification
-						.getFeature());
-	}
-
-	/**
-	 * 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 static 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 static 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/GMFResourceModificationManager.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResourceModificationManager.java
deleted file mode 100644
index a86dad5..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/GMFResourceModificationManager.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-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.UndoContext;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-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.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.TransactionalEditingDomainEvent;
-import org.eclipse.emf.transaction.TransactionalEditingDomainListenerImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain.Lifecycle;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.IWorkspaceCommandStack;
-import org.eclipse.emf.workspace.ResourceUndoContext;
-import org.eclipse.gmf.runtime.emf.core.internal.l10n.EMFCoreMessages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Manages the <code>isModified</code> state of resources in a given editing
- * domain as operations are executed, undone and redone on the operation
- * history.
- * <P>
- * This allows clients to use the <code>isModified</code> state of a resource to
- * determine whether or not the resource is dirty and can be saved.
- * 
- * @author ldamus
- * @since 1.2
- */
-public class GMFResourceModificationManager {
-
-	/**
-	 * Keeps track of the modification manager for each editing domain. Only one
-	 * modification manager can ever be created for a given editing domain. Keys
-	 * are WeakReferences because the modification manager has a reference back
-	 * to its editing domain key.
-	 */
-	private static Map<TransactionalEditingDomain, WeakReference<GMFResourceModificationManager>> managerRegistry = new WeakHashMap<TransactionalEditingDomain, WeakReference<GMFResourceModificationManager>>();
-
-	/**
-	 * Creates a new resource modification manager for <code>domain</code>, if
-	 * the <code>domain</code>'s command stack is integrated with an
-	 * <code>IOperationHistory</code>. The <code>isModified</code> state of a
-	 * resource in <code>domain</code> will be set to <code>false</code> when
-	 * the last operation affecting that resource is undone on the history.
-	 * 
-	 * @param domain
-	 *            the editing domain
-	 * @return the resource modification manager, or <code>null</code> if
-	 *         <code>domain</code> is not integrated with an operation history
-	 */
-	public static synchronized GMFResourceModificationManager manage(
-			TransactionalEditingDomain domain) {
-
-		// make sure we only instantiate one manager per editing domain
-		WeakReference<GMFResourceModificationManager> reference = managerRegistry
-				.get(domain);
-		GMFResourceModificationManager result = reference != null ? reference
-				.get() : null;
-
-		if (result == null) {
-			CommandStack stack = domain.getCommandStack();
-
-			if (stack instanceof IWorkspaceCommandStack) {
-				IOperationHistory history = ((IWorkspaceCommandStack) stack)
-						.getOperationHistory();
-
-				if (history != null) {
-					final GMFResourceModificationManager manager = new GMFResourceModificationManager(
-							domain, history);
-					managerRegistry.put(domain,
-							new WeakReference<GMFResourceModificationManager>(
-									manager));
-					result = manager;
-
-					// dispose the modification manager when the domain is
-					// disposed
-					Lifecycle lifecycle = TransactionUtil.getAdapter(domain,
-							Lifecycle.class);
-
-					if (lifecycle != null) {
-						lifecycle
-								.addTransactionalEditingDomainListener(new TransactionalEditingDomainListenerImpl() {
-									@Override
-									public void editingDomainDisposing(
-											TransactionalEditingDomainEvent event) {
-										manager.dispose();
-									}
-								});
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * A filter matching "resource is no longer modified" events.
-	 */
-	private static final NotificationFilter RESOURCE_UNMODIFIED = new NotificationFilter.Custom() {
-
-		public boolean matches(Notification notification) {
-			return (notification.getNotifier() instanceof Resource)
-					&& (notification.getFeatureID(Resource.class) == Resource.RESOURCE__IS_MODIFIED)
-					&& notification.getOldBooleanValue()
-					&& !notification.getNewBooleanValue();
-		}
-	};
-
-	private TransactionalEditingDomain domain;
-	private IOperationHistory history;
-	private ResourceSetListener domainListener;
-	private IOperationHistoryListener historyListener;
-	private Map<Resource, IUndoContext> saveContexts;
-	private IUndoableOperation currentOperation;
-
-	/**
-	 * Private constructor to prevent instantiation by clients. Clients must use
-	 * {@link #manage(TransactionalEditingDomain)} to construct a new instance.
-	 * 
-	 * @param domain
-	 *            the editing domain
-	 * @param history
-	 *            the operation history
-	 */
-	private GMFResourceModificationManager(TransactionalEditingDomain domain,
-			IOperationHistory history) {
-
-		this.domain = domain;
-		this.history = history;
-
-		domain.addResourceSetListener(getDomainListener());
-		history.addOperationHistoryListener(getHistoryListener());
-	}
-
-	/**
-	 * Gets the resource set listener listener, which manages the save-point
-	 * context for operations executed on the history when the resource is saved
-	 * or unloaded.
-	 * 
-	 * @return the resource set listener
-	 */
-	private ResourceSetListener getDomainListener() {
-
-		if (domainListener == null) {
-			domainListener = new ResourceSetListenerImpl(RESOURCE_UNMODIFIED
-					.or(NotificationFilter.RESOURCE_UNLOADED)) {
-
-				@Override
-				public void resourceSetChanged(ResourceSetChangeEvent event) {
-
-					for (Notification n : event.getNotifications()) {
-						Resource resource = (Resource) n.getNotifier();
-
-						switch (n.getFeatureID(Resource.class)) {
-
-						case Resource.RESOURCE__IS_MODIFIED:
-							applySaveContext(resource);
-							break;
-
-						case Resource.RESOURCE__IS_LOADED:
-							disposeSaveContext(resource);
-							break;
-						}
-					}
-				}
-
-				@Override
-				public boolean isPostcommitOnly() {
-					return true;
-				}
-			};
-		}
-		return domainListener;
-	}
-
-	/**
-	 * Gets the operation history listener, which manages the
-	 * <code>isModified</code> state of the resources.
-	 * 
-	 * @return the operation history listener
-	 */
-	private IOperationHistoryListener getHistoryListener() {
-
-		if (historyListener == null) {
-			historyListener = new IOperationHistoryListener() {
-
-				public void historyNotification(OperationHistoryEvent event) {
-					int type = event.getEventType();
-
-					switch (type) {
-
-					case OperationHistoryEvent.ABOUT_TO_EXECUTE:
-					case OperationHistoryEvent.ABOUT_TO_UNDO:
-					case OperationHistoryEvent.ABOUT_TO_REDO:
-						// Remember the operation in order to apply the
-						// save context to it if the isModified is set to false
-						// during execute, undo or redo. For undo, the save
-						// context goes on next undoable operation on the
-						// history.
-						currentOperation = event.getOperation();
-						break;
-
-					case OperationHistoryEvent.OPERATION_NOT_OK:
-						currentOperation = null;
-						break;
-
-					case OperationHistoryEvent.DONE: {
-						currentOperation = null;
-
-						IUndoableOperation operation = event.getOperation();
-						Set<Resource> affectedResources = getAffectedResourcesInDomain(operation);
-
-						for (Resource r : affectedResources) {
-							ResourceUndoContext context = new ResourceUndoContext(
-									domain, r);
-							IUndoableOperation[] undoHistory = history
-									.getUndoHistory(context);
-
-							if (undoHistory.length >= history.getLimit(context)) {
-								// We've reached the limit for this context;
-								// initialize the save context to indicate that
-								// we can't undo to the last saved state
-								getSaveContext(r);
-							}
-						}
-						break;
-					}
-
-					case OperationHistoryEvent.UNDONE:
-					case OperationHistoryEvent.REDONE: {
-						currentOperation = null;
-
-						IUndoableOperation operation = event.getOperation();
-						Set<Resource> affectedResources = getAffectedResourcesInDomain(operation);
-
-						for (Resource r : affectedResources) {
-							IUndoContext saveContext = getSaveContexts().get(r);
-							IUndoableOperation nextUndoableOperation = getNextUndoableOperation(r);
-
-							boolean atStart = saveContext == null
-									&& nextUndoableOperation == null;
-							
-							boolean atSaveContext = saveContext != null
-									&& nextUndoableOperation != null
-									&& nextUndoableOperation
-											.hasContext(saveContext);
-
-							if (atStart || atSaveContext) {
-								r.setModified(false);
-							}
-						}
-					}
-					}
-				}
-			};
-		}
-		return historyListener;
-	}
-
-	private Map<Resource, IUndoContext> getSaveContexts() {
-		if (saveContexts == null) {
-			saveContexts = new HashMap<Resource, IUndoContext>();
-		}
-		return saveContexts;
-	}
-
-	private IUndoableOperation getNextUndoableOperation(Resource resource) {
-		return history.getUndoOperation(new ResourceUndoContext(domain,
-				resource));
-	}
-
-	private IUndoContext getSaveContext(final Resource resource) {
-		IUndoContext saveContext = getSaveContexts().get(resource);
-
-		if (saveContext == null) {
-			saveContext = new UndoContext() {
-				@Override
-				public String getLabel() {
-					return NLS.bind(EMFCoreMessages.saveContextLabel, resource
-							.getURI());
-				}
-
-				@Override
-				public String toString() {
-					return getLabel();
-				}
-			};
-
-			getSaveContexts().put(resource, saveContext);
-		}
-		return saveContext;
-	}
-
-	private Set<Resource> getAffectedResourcesInDomain(
-			IUndoableOperation operation) {
-
-		Set<Resource> result = new HashSet<Resource>();
-		Set<Resource> affectedResources = ResourceUndoContext
-				.getAffectedResources(operation);
-
-		for (Resource resource : affectedResources) {
-			ResourceSet resourceSet = resource.getResourceSet();
-
-			if (domain.getResourceSet().equals(resourceSet)) {
-				result.add(resource);
-			}
-		}
-		return result;
-	}
-
-	private void applySaveContext(Resource resource) {
-		IUndoContext saveContext = getSaveContexts().get(resource);
-
-		if (saveContext != null) {
-			// Remove the save context from existing operations
-			IUndoableOperation[] undoableOperations = history
-					.getUndoHistory(saveContext);
-			for (IUndoableOperation op : undoableOperations) {
-				op.removeContext(saveContext);
-			}
-
-			IUndoableOperation[] redoableOperations = history
-					.getRedoHistory(saveContext);
-			for (IUndoableOperation op : redoableOperations) {
-				op.removeContext(saveContext);
-			}
-		}
-
-		IUndoableOperation operation = null;
-		IUndoableOperation nextUndoable = getNextUndoableOperation(resource);
-
-		if (currentOperation != null) {
-
-			if (currentOperation == nextUndoable) {
-				// we're undoing; get the previous operation on the history
-				IUndoableOperation[] undoableOperations = history
-						.getUndoHistory(new ResourceUndoContext(domain,
-								resource));
-
-				for (int i = undoableOperations.length - 1; i >= 0; i--) {
-					if (currentOperation != undoableOperations[i]) {
-						operation = undoableOperations[i];
-						break;
-					}
-				}
-			} else {
-				operation = currentOperation;
-			}
-		} else {
-			operation = nextUndoable;
-		}
-
-		if (operation != null) {
-			// apply the save context
-			operation.addContext(getSaveContext(resource));
-
-		} else {
-			// clear the save context; required if we save after undoing the
-			// last thing on the stack
-			getSaveContexts().remove(resource);
-		}
-	}
-
-	private void disposeSaveContext(Resource resource) {
-		IUndoContext saveContext = getSaveContexts().get(resource);
-
-		if (saveContext != null) {
-			history.dispose(saveContext, true, true, true);
-			getSaveContexts().remove(resource);
-		}
-	}
-
-	private void dispose() {
-
-		managerRegistry.remove(domain);
-
-		if (saveContexts != null) {
-			for (Resource r : saveContexts.keySet()) {
-				disposeSaveContext(r);
-			}
-		}
-		if (domainListener != null) {
-			domain.removeResourceSetListener(domainListener);
-		}
-		if (historyListener != null) {
-			history.removeOperationHistoryListener(historyListener);
-		}
-
-		currentOperation = null;
-		domain = null;
-		domainListener = null;
-		history = null;
-		historyListener = null;
-		saveContexts = null;
-	}
-
-}
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/IPathmapManager2.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IPathmapManager2.java
deleted file mode 100644
index df8a315..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/resources/IPathmapManager2.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Map;
-
-import org.eclipse.core.runtime.IStatus;
-
-public interface IPathmapManager2 extends IPathmapManager {
-	/**
-	 * Adds a map of file path variables (not folders).
-	 * 
-	 * @param settings A map from variables(String) to values(String).
-	 * 
-	 * @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
-	 */
-	public IStatus addFilePathVariables(Map settings, boolean dirtyResources);
-	
-	/**
-	 * Sets the value of a path variable to a file (not a folder).
-	 * 
-	 * @param name the path variable name
-	 * @param value the path variable value pointing to a specific file (not a folder)
-	 * 
-	 * @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
-	 */
-	public IStatus addFilePathVariable(String name, String value, boolean dirtyResources);
-	
-	/**
-	 * Adds a map of folder path variables (not files).
-	 * 
-	 * @param settings A map from variables(String) to values(String).
-	 * 
-	 * @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
-	 */
-	public IStatus addFolderPathVariables(Map settings, boolean dirtyResources);
-	
-	/**
-	 * Sets the value of a path variable to a folder (not a file).
-	 * 
-	 * @param name the path variable name
-	 * @param value the path variable value pointing to a specific folder (not a file)
-	 * 
-	 * @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
-	 */
-	public IStatus addFolderPathVariable(String name, String value, boolean dirtyResources);
-}
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 317a6ee..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/CrossReferenceAdapter.java
+++ /dev/null
@@ -1,1105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 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: {
-			if (!reference.isMany() || notification.getPosition() != Notification.NO_INDEX) {
-				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();
-		}
-
-		/**
-		 * 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 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 0ef51ce..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/EMFCoreUtil.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
-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.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 == null) {
-			return EMFCoreConstants.EMPTY_STRING;
-		}
-
-		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 = null;
-        
-        ResourceSet rs = null;
-        Resource r = proxy.eResource();
-        if (r != null)
-            rs = r.getResourceSet();
-        if (rs != null)
-            factory = rs.getResourceFactoryRegistry().getFactory(uri);
-        if (factory == null)
-            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);
-                }
-            }
-		}
-		
-		Resource.Factory factory = null;
-		
-		URI uri = EcoreUtil.getURI(proxy);
-
-		if (uri != null) {
-			Resource resource = proxy.eResource();
-			
-			if (resource != null) {
-				ResourceSet resourceSet = resource.getResourceSet();
-				
-				if (resourceSet != null) {
-					Registry registry = resourceSet.getResourceFactoryRegistry();
-					
-					if (registry != null) {
-						factory = registry.getFactory(uri);
-					}
-				}
-			}
-			
-			if (factory == null) {
-				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 360ad11..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/PackageUtil.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-/**
- * 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/Util.java b/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/Util.java
deleted file mode 100644
index 32f4a17..0000000
--- a/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/util/Util.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.util.EMFCoreConstants;
-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)
- * @since 1.2
- */
-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/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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 572a179..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.type.core/.settings/.api_filters b/org.eclipse.gmf.runtime.emf.type.core/.settings/.api_filters
deleted file mode 100644
index d4118c0..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.settings/.api_filters
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.emf.type.core" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/emf/type/core/ClientContext.java" type="org.eclipse.gmf.runtime.emf.type.core.ClientContext">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="IEditHelperAdviceDescriptor"/>
-                <message_argument value="ClientContext"/>
-                <message_argument value="includes(IEditHelperAdviceDescriptor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/emf/type/core/ClientContextManager.java" type="org.eclipse.gmf.runtime.emf.type.core.ClientContextManager">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="IEditHelperAdviceDescriptor"/>
-                <message_argument value="ClientContextManager"/>
-                <message_argument value="getBinding(IEditHelperAdviceDescriptor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/emf/type/core/IClientContext.java" type="org.eclipse.gmf.runtime.emf.type.core.IClientContext">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="IEditHelperAdviceDescriptor"/>
-                <message_argument value="IClientContext"/>
-                <message_argument value="includes(IEditHelperAdviceDescriptor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/emf/type/core/MultiClientContext.java" type="org.eclipse.gmf.runtime.emf.type.core.MultiClientContext">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="IEditHelperAdviceDescriptor"/>
-                <message_argument value="MultiClientContext"/>
-                <message_argument value="includes(IEditHelperAdviceDescriptor)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 821a195..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:23 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 35b3273..0000000
--- a/org.eclipse.gmf.runtime.emf.type.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.type.core;singleton:=true

-Bundle-Version: 1.4.0.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.5.0,4.0.0)",

- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport

-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",

- com.ibm.icu.util;version="[4.0.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 d41f327..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.emf.type.core/pom.xml
deleted file mode 100644
index b199652..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.type.core</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.type.core</artifactId>
-  <version>1.4.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 7547128..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/schema/elementTypes.exsd
+++ /dev/null
@@ -1,520 +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>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </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 minOccurs="0" maxOccurs="1">
-               <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>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </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 minOccurs="0" maxOccurs="1">
-               <element ref="matcher"/>
-               <element ref="enablement"/>
-            </choice>
-            <element ref="eContainer" minOccurs="0" maxOccurs="1"/>
-         </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 minOccurs="0" maxOccurs="1">
-               <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 207e4a8..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/ElementTypeRegistry.java
+++ /dev/null
@@ -1,1366 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.emf.ecore.EcorePackage;
-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.EClassUtil;
-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();
-
-			// Bugzilla 298661: assume all models implicitly extend EObject
-			if (nextClassifier instanceof EClass
-					&& ((eType == EcorePackage.Literals.EOBJECT) || ((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.
-		// Bugzilla 298661: assume all models implicitly extend EObject
-		List supertypes = EClassUtil.getEAllSuperTypes(eClass);
-		
-		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 12d8881..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/MetamodelType.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.internal.impl.EClassUtil;
-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) {
-				// Bugzilla 298661: assume all models implicitly extend EObject
-				List supertypes = EClassUtil.getEAllSuperTypes(getEClass());
-				
-				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 03c03db..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/commands/CreateElementCommand.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.core.runtime.Status;
-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.internal.EMFTypePlugin;
-import org.eclipse.gmf.runtime.emf.type.core.internal.l10n.EMFTypeCoreMessages;
-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;
-	
-	/**
-	 * Status of the default element creation.
-	 */
-	private IStatus defaultElementCreationStatus;
-
-	/**
-	 * 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();
-        
-        if (!getDefaultElementCreationStatus().isOK()) {
-        	return new CommandResult(getDefaultElementCreationStatus());
-        }
-
-        // 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() {
-		EObject result = null;
-		EReference containment = getContainmentFeature();
-		EClass eClass = getElementType().getEClass();
-
-		if (containment != null) {
-			EObject element = getElementToEdit();
-
-			if (element != null) {
-				result = EMFCoreUtil.create(element, containment, eClass);
-			}
-		}
-
-		IStatus status = (result != null) ? Status.OK_STATUS
-				: new Status(
-						Status.ERROR,
-						EMFTypePlugin.getPluginId(),
-						EMFTypeCoreMessages
-								.bind(
-										EMFTypeCoreMessages.createElementCommand_noElementCreated,
-										getElementType().getDisplayName()));
-		
-		setDefaultElementCreationStatus(status);
-		
-		return result;
-	}
-	
-	/**
-	 * Gets the status of the default element creation.
-	 * 
-	 * @return the status
-	 * @since 1.2
-	 */
-	protected IStatus getDefaultElementCreationStatus() {
-		if (defaultElementCreationStatus == null) {
-			return Status.OK_STATUS;
-		}
-		return defaultElementCreationStatus;
-	}
-	
-	/**
-	 * Sets the status of the default element creation.
-	 * 
-	 * @param status
-	 *            the new status
-	 * @since 1.2
-	 */
-	protected void setDefaultElementCreationStatus(IStatus status) {
-		this.defaultElementCreationStatus = status;
-	}
-
-	/**
-	 * 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 9a5e9f7..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/edithelper/AbstractEditHelper.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.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.impl.EClassUtil;
-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;
-        }
-        
-        ICommand result = getEditCommand(req, advice);
-        if (result != null) {
-            return result.reduce();
-        }
-        return result;
-	}
-    
-    /**
-     * 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()) {
-                    	  command.compose(beforeAdvice);
-                       
-                    } else {
-                    	return 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()) {
-					command.compose(insteadCommand);
-				} else {
-					return 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()) {
-						command.compose(afterAdvice);
-					} else {
-						return 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) {
-			// Bugzilla 298661: assume all models implicitly extend EObject
-			List superTypes = EClassUtil.getEAllSuperTypes(eClass);
-			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;	
-		
-		EObject parent = req.getElementToDestroy();
-		
-		if (req.getParameter(DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER) == null) {
-			req.setParameter(DestroyElementRequest.INITIAL_ELEMENT_TO_DESTROY_PARAMETER, parent);
-		}
-		
-		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);
-			if (parentMap != null) {
-    			parentType = (IElementType) parentMap
-    				.get(RequestCacheEntries.Element_Type);
-			} else {
-			    parentType = ElementTypeRegistry.getInstance().getElementType(
-		                parent); 
-			}
-		} 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);
-						}
-						
-// Under normal circumstances the command is executable.
-// Checking canExecute here slows down large scenarios and it is therefore
-// better to skip this check.
-//						if (!command.canExecute()) {
-//							// no point in continuing if we're abandoning the works
-//							break;
-//						}
-					}
-				}
-			}
-		}
-
-		// restore the elementToDestroy in the original request
-        req.setElementToDestroy(parent);
-        
-		ICommand destroyParent = getDestroyElementWithDependentsCommand(req);
-		
-		//bottom-up destruction:  destroy children before parent
-		if (result == null) {
-			result = destroyParent;
-		} else {
-			result = result.compose(destroyParent);
-		}
-		
-		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/EClassUtil.java b/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/EClassUtil.java
deleted file mode 100644
index 70f3a47..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/impl/EClassUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * Defines utility methods for <code>EClass</code>es.
- * 
- * @author ldamus
- */
-public class EClassUtil {
-
-	/**
-	 * Gets the list of super types for <code>eClass</code>. Unlike
-	 * {@link EClass#getEAllSuperTypes()}, this method assumes that all models
-	 * implicitly extend <code>EObject</code>.
-	 * 
-	 * @param eClass
-	 *            the EClass
-	 * @return the list of super types for the <code>eClass</code>, including
-	 *         <code>EObject</code>
-	 */
-	public static List<EClass> getEAllSuperTypes(EClass eClass) {
-		List<EClass> superTypes = new ArrayList<EClass>(eClass
-				.getEAllSuperTypes());
-
-		// Bugzilla 298661: assume all models implicitly extend EObject
-		if (!superTypes.contains(EcorePackage.Literals.EOBJECT)) {
-			superTypes.add(0, EcorePackage.Literals.EOBJECT);
-		}
-		return superTypes;
-	}
-}
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 06b1a19..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 createElementCommand_noElementCreated;
-	
-	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 ffe1e9a..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/internal/l10n/EMFTypeCoreMessages.properties
+++ /dev/null
@@ -1,392 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2005, 2008  IBM Corporation and others.                  |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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
-
-# Indicates that a command to create a new element failed:
-#    0 - the localized name of the element type could not be created
-createElementCommand_noElementCreated= Could not create the new element of type "{0}"
-
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 8a72432..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 6896656..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/CreateElementRequest.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 which can be either the context object or type of
-     *          context object or a command which is not executable that could contain 
-     * 	        status information.
-	 */
-	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 contextCommand;
-	}
-
-	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 c97209e..0000000
--- a/org.eclipse.gmf.runtime.emf.type.core/src/org/eclipse/gmf/runtime/emf/type/core/requests/DestroyDependentsRequest.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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);				
-			}
-
-			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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 6936537..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f38abb9..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:33 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 fd7a7b3..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/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.type.ui; singleton:=true
-Bundle-Version: 1.2.0.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.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 e03b2c1..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 Modeling Project
\ 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/pom.xml b/org.eclipse.gmf.runtime.emf.type.ui/pom.xml
deleted file mode 100644
index 867b570..0000000
--- a/org.eclipse.gmf.runtime.emf.type.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.type.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.type.ui</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 962b031..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3ce9d13..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:51 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 27f316e..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/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.emf.ui.properties; singleton:=true
-Bundle-Version: 1.5.0.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.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services.properties;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)",
- com.ibm.icu.util;version="[4.0.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 bca2106..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.emf.ui.properties/pom.xml
deleted file mode 100644
index 3fd9d55..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.ui.properties</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.ui.properties</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 1fc2ef0..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/descriptors/EMFCompositeSourcePropertyDescriptor.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2004, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, 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()) {

-        	if (getCategory() == null && descriptor.getCategory() == null) {

-        		return true;

-        	} else if (getCategory() != null) {

-                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, false, false, choiceOfValues != null);

-				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 9d284ba..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, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-     */
-    public 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 52e0d03..0000000
--- a/org.eclipse.gmf.runtime.emf.ui.properties/src/org/eclipse/gmf/runtime/emf/ui/properties/sections/UndoableModelPropertySheetEntry.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-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
-        IStatus status = getParentEntry().executeValueChangedCommand(
-                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.
-        if (status.isOK())
-        	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 change command
-     * @see executeValueChanged
-     */
-    @Deprecated
-    protected void valueChanged(UndoableModelPropertySheetEntry child,
-            ICommand command) {
-    	executeValueChangedCommand(child, command);
-    }
-    
-    
-    /**
-     * 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 change command
-     * @return the the IStatus indicating whether the execution succeeded.
-     * @since 1.4
-     */
-    protected IStatus executeValueChangedCommand(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) {
-            return getParentEntry().executeValueChangedCommand(this, command);
-        } else {
-            //I am the root entry
-            try {
-                TriggeredOperations triggerOperation = 
-                    new TriggeredOperations(command, getOperationHistory());
-                return 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);
-            }
-            return Status.CANCEL_STATUS;
-        }
-    }
-    
-    
-    /**
-     * 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 482a171..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 = Integer.valueOf(0);
-
-	/**
-	 * Integer constant representing the boolean 'true'
-	 */
-	private final static Integer INT_TRUE = Integer.valueOf(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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 3f3cba8..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-doc
-org
-target
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 e34276d..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9110463..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:41 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 f67afef..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/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.emf.ui; singleton:=true
-Bundle-Version: 1.2.0.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.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 2ad0b49..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 Modeling Project
-
-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/pom.xml b/org.eclipse.gmf.runtime.emf.ui/pom.xml
deleted file mode 100644
index 7917680..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.emf.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.emf.ui</artifactId>
-  <version>1.2.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 002c965..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/schema/modelingAssistantProviders.exsd
+++ /dev/null
@@ -1,351 +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"/>
-         	<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 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="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="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 b882a6c..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, 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;
-
-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 3d0d5d0..0000000
--- a/org.eclipse.gmf.runtime.emf.ui/src/org/eclipse/gmf/runtime/emf/ui/preferences/PathmapsPreferencePage.java
+++ /dev/null
@@ -1,1119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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 Composite pathVariablesComposite;
-    
-    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);
-
-        pathVariablesComposite = new Composite(composite, SWT.BORDER);
-        gridData = new GridData(GridData.FILL_HORIZONTAL
-            | GridData.FILL_VERTICAL);
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = true;
-        gridData.horizontalSpan = 1;
-        pathVariablesComposite.setLayoutData(gridData);
-        GridLayout gridLayout = new GridLayout(1, true);
-        gridLayout.marginHeight = 0;
-        gridLayout.marginWidth = 0;
-        gridLayout.horizontalSpacing = 0;
-        gridLayout.verticalSpacing = 0;
-        pathVariablesComposite.setLayout(gridLayout);
-
-        pathVariables = CheckboxTableViewer.newCheckList(pathVariablesComposite,
-            SWT.MULTI);
-
-        pathVariablesContent = new PathVariableContentProvider();
-        pathVariables.setContentProvider(pathVariablesContent);
-        pathVariables.setLabelProvider(new PathVariableLabelProvider());
-        pathVariables.setComparator(new PathVariableViewerComparator());
-        gridData = new GridData(GridData.FILL_BOTH);
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = true;
-        // These two hard coded values were borrowed from similar code in
-        // org.eclipse.ui.internal.ide.dialogs.PathVariablesGroup
-        gridData.heightHint = pathVariables.getTable().getItemHeight() * 7;
-        gridData.widthHint = 332;
-        pathVariables.getTable().setLayoutData(gridData);
-
-        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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 7b0d407..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.gef.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.gef.ui/.settings/.api_filters b/org.eclipse.gmf.runtime.gef.ui/.settings/.api_filters
deleted file mode 100644
index 1bfa00b..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.settings/.api_filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.gmf.runtime.gef.ui" version="2">
-    <resource path="src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java" type="org.eclipse.gmf.runtime.gef.ui.figures.SlidableImageAnchor">
-        <filter id="338722907">
-            <message_arguments>
-                <message_argument value="org.eclipse.gmf.runtime.gef.ui.figures.SlidableImageAnchor"/>
-                <message_argument value="SlidableImageAnchor(IFigure, ImageFigure)"/>
-            </message_arguments>
-        </filter>
-        <filter id="338722907">
-            <message_arguments>
-                <message_argument value="org.eclipse.gmf.runtime.gef.ui.figures.SlidableImageAnchor"/>
-                <message_argument value="SlidableImageAnchor(IFigure, ImageFigure, PrecisionPoint)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1143996420">
-            <message_arguments>
-                <message_argument value="SlidableImageAnchor(IFigure, IImageFigure)"/>
-            </message_arguments>
-        </filter>
-        <filter id="1143996420">
-            <message_arguments>
-                <message_argument value="SlidableImageAnchor(IFigure, IImageFigure, PrecisionPoint)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/gmf/runtime/gef/ui/internal/actions/MenuManagerEx.java" type="org.eclipse.gmf.runtime.gef.ui.internal.actions.MenuManagerEx">
-        <filter id="574619656">
-            <message_arguments>
-                <message_argument value="IMenuManager"/>
-                <message_argument value="MenuManagerEx"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e86c999..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:05:59 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index 88b3972..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:25:08 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 f0e385e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/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.gef.ui
-Bundle-Version: 1.4.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",
- org.eclipse.gmf.runtime.gef.ui.palette.customize
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 9367f52..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 Modeling Project
-
diff --git a/org.eclipse.gmf.runtime.gef.ui/pom.xml b/org.eclipse.gmf.runtime.gef.ui/pom.xml
deleted file mode 100644
index eb06f36..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.gef.ui</groupId>
-  <artifactId>org.eclipse.gmf.runtime.gef.ui</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 c7dc69b..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/NodeFigure.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PointList;
-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.figures.IPolygonAnchorableFigure;
-import org.eclipse.gmf.runtime.draw2d.ui.graphics.ColorRegistry;
-import org.eclipse.gmf.runtime.draw2d.ui.internal.figures.TransparentBorder;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 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, IPolygonAnchorableFigure {
-
-	private Hashtable connectionAnchors;
-	
-	/** 
-	 * The width of this shape's outline. (a field from GEF Shape). Must be
-	 * greater than zero. 
-	 * TODO: NodeFigure should have extended org.eclipse.draw2d.Shape
-	 */
-	private int lineWidth = 1;
-	
-	/**
-	 * The line style to be used for this shape's outline. 
-	 * TODO: NodeFigure should have extended org.eclipse.draw2d.Shape
-	 */
-	private int lineStyle = Graphics.LINE_SOLID;
-	
-	private boolean isUsingGradient = false;
-	
-	private int gradientColor1 = -1;
-	
-	private int gradientColor2 = -1;
-	
-	private int gradientStyle = 0;
-		
-	/**
-	 * The transparency of this shape in percent.
-	 * Must be in [0, 100] range.
-	 */
-	private int transparency = 0;
-	
-	/**
-	 * <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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure#getPolygonPoints()
-	 */
-	public PointList getPolygonPoints() {
-		PointList points = new PointList(5);
-		Rectangle anchorableRectangle = getHandleBounds();
-		points.addPoint(anchorableRectangle.x, anchorableRectangle.y);
-		points.addPoint(anchorableRectangle.x + anchorableRectangle.width,
-				anchorableRectangle.y);
-		points.addPoint(anchorableRectangle.x + anchorableRectangle.width,
-				anchorableRectangle.y + anchorableRectangle.height);
-		points.addPoint(anchorableRectangle.x, anchorableRectangle.y
-				+ anchorableRectangle.height);
-		points.addPoint(anchorableRectangle.x, anchorableRectangle.y);
-		return points;
-	}
-
-	/**
-	 * Returns the line style used to outline this shape.
-	 * @return the line style
-	 * @since 2.1
-	 */
-	public int getLineStyle() {
-		return lineStyle;
-	}
-
-	/**
-	 * Returns the line width of this shape's outline.
-	 * @return the line width
-	 * @since 2.1
-	 */
-	public int getLineWidth() {
-		return lineWidth;
-	}
-
-	/**
-	 * Sets the line width to be used to outline the shape.
-	 *
-	 * @param w the new width
-	 * @since 2.1
-	 */
-	public void setLineWidth(int w) {
-		if ((lineWidth == w) || (w < 0))
-			return;
-		lineWidth = w;
-		repaint();
-	}
-
-	/**
-	 * Sets the style of line to be used by this shape.
-	 *
-	 * @param s the new line style
-	 * @since 2.1
-	 */
-	public void setLineStyle(int s) {
-		if (lineStyle == s) 
-			return;
-		lineStyle = s;
-		repaint();
-	}
-	
-	/**
-	 * @return the gradientColor1
-	 * @since 1.2
-	 */
-	public int getGradientColor1() {
-		return gradientColor1;
-	}
-	
-	/**
-	 * @return the gradientColor2
-	 * @since 1.2
-	 */
-	public int getGradientColor2() {
-		return gradientColor2;	
-	}
-
-	/**
-	 * @return the gradientStyle 
-	 * @since 1.2
-	 */
-	public int getGradientStyle() {
-		return gradientStyle;
-	}	
-
-	/**
-	 * Sets values defining gradient data.
-	 * 
-	 * @param gradientColor1
-	 * @param gradientColor2
-	 * @param gradientStyle
-	 * @since 1.2
-	 */
-	public void setGradientData(int gradientColor1, int gradientColor2, int gradientStyle) {
-		boolean doRepaint = false;
-		// When in high contrast mode, there is no gradient, so set bg color to null to allow inheriting
-		// the system color.
-		Display display = Display.getCurrent();
-		if (display == null && PlatformUI.isWorkbenchRunning()) {
-			display = PlatformUI.getWorkbench().getDisplay();
-		}
-		if (display != null && display.getHighContrast()) {
-			setBackgroundColor(null);
-			return;
-		}		
-		if (gradientColor1 != this.gradientColor1 && gradientColor1 > -1) {
-			this.gradientColor1 = gradientColor1;
-			doRepaint = true;
-		}
-		if (gradientColor2 != this.gradientColor2 && gradientColor2 > -1) {
-			this.gradientColor2 = gradientColor2;
-			doRepaint = true;
-		}
-		if (gradientStyle != this.gradientStyle) {
-			this.gradientStyle = gradientStyle;
-			doRepaint = true;
-		}
-		if (doRepaint) {
-			repaint();
-		}
-	}
-	
-	/**
-	 * Utility method that indicates if gradient should be used as a fill style or not.
-	 * 
-	 * @return true if gradient should be used, false otherwise (fill color should be used)
-	 * @since 1.2
-	 */
-	public boolean isUsingGradient() {
-		// When in high contrast mode, there is no gradient, so return false.
-		Display display = Display.getCurrent();
-		if (display == null && PlatformUI.isWorkbenchRunning()) {
-			display = PlatformUI.getWorkbench().getDisplay();
-		}
-		if (display != null && display.getHighContrast()) {		
-			return false;
-		}
-		return isUsingGradient && gradientColor1 > -1 && gradientColor2 > -1;
-	}
-		
-	/**
-	 * Sets the value of isUsingGradient
-	 * 
-	 * @param b value for isUsingGradient
-	 * @since 1.2
-	 */
-	public void setIsUsingGradient(boolean b) {
-		if (b != isUsingGradient) {
-			isUsingGradient = b;
-			// this is needed, e.g. when undoing gradient clearing from Advanced tab;
-			// in cases when repaint() is already called, it doesn't matter since
-			// the actual paint happens only once
-			repaint();
-		}
-	}	
-	
-	/**
-	 * Fills given path by gradient using given fillMode
-	 * 
-	 * @param g The Graphics used to paint
-	 * @param path Path of shape to be filled with gradient
-	 * @param fillMode One of SWT.FILL_EVEN_ODD and SWT.FILL_WINDING
-	 * @since 1.2
-	 */
-	protected void fillGradient(Graphics g, Path path, int fillMode) {
-		if (path != null) {
-			g.pushState();
-			g.setForegroundColor(ColorRegistry.getInstance().getColor(Integer.valueOf(getGradientColor1())));
-			g.setBackgroundColor(ColorRegistry.getInstance().getColor(Integer.valueOf(getGradientColor2())));
-			if (fillMode == SWT.FILL_EVEN_ODD || fillMode == SWT.FILL_WINDING) {
-				g.setFillRule(fillMode);
-			}
-			g.clipPath(path);
-			g.fillGradient(getBounds(), getGradientStyle() == 0);	
-			path.dispose();
-			g.popState();
-		}
-	}
-	
-	/**
-	 * Fills gradient using default mode SWT.FILL_EVEN_ODD and getPath() to
-	 * obtain path to fill.
-	 * 
-	 * @param g The Graphics used to paint
-	 * @since 1.2
-	 */
-	protected void fillGradient(Graphics g) {
-		// use the default mode if one is not provided
-		fillGradient(g, getPath(), SWT.FILL_EVEN_ODD);
-	}
-
-	/**
-	 * Fills gradient using default mode SWT.FILL_EVEN_ODD. Use this method when
-	 * getPath() doesn't return desired path.
-	 * 
-	 * @param g The Graphics used to paint
-	 * @param path Path of shape to be filled with gradient
-	 * @since 1.2
-	 */
-	protected void fillGradient(Graphics g, Path path) {
-		// use the default mode if one is not provided
-		fillGradient(g, path, SWT.FILL_EVEN_ODD);
-	}
-
-	/**
-	 * Fills gradient using getPath() to obtain path to fill. Use this method
-	 * when default fill mode SWT.FILL_EVEN_ODD is not appropriate.
-	 * 
-	 * @param g The Graphics used to paint
-	 * @param fillMode One of SWT.FILL_EVEN_ODD and SWT.FILL_WINDING
-	 * @since 1.2
-	 */
-	protected void fillGradient(Graphics g, int fillMode) {
-		fillGradient(g, getPath(), fillMode);
-	}
-	
-	/**
-	 * This method creates and returns figure's path. Default implementation defines path
-	 * based on figure's bounds and insets. Subclasses should override if
-	 * needed.
-	 * 
-	 * @return Created path
-	 * @since 1.2
-	 */
-	protected Path getPath() {
-		if (!isOpaque()) {
-			return null;
-		}
-		Path path = new Path(null);
-		Rectangle tempRect = getClientArea();
-		path.addRectangle(tempRect.x, tempRect.y, tempRect.width, tempRect.height);
-		return path;
-	}
-
-	
-	/**
-	 * Returns transparency value (belongs to [0, 100] interval)
-	 * 
-	 * @return transparency
-	 * @since 1.2
-	 */
-	public int getTransparency() {
-		return transparency;
-	}
-
-	/**
-	 * Sets the transparency if the given parameter is in [0, 100] range
-	 * 
-	 * @param transparency The transparency to set
-	 * @since 1.2
-	 */
-	public void setTransparency(int transparency) {
-		if (transparency != this.transparency &&
-				transparency >= 0 && transparency <= 100) {
-			this.transparency = transparency;
-			repaint();
-		}
-	}
-			
-	/**
-	 * Converts transparency value from percent range [0, 100] to alpha range
-	 * [0, 255] and applies converted value. 0% corresponds to alpha 255 and
-	 * 100% corresponds to alpha 0.
-	 * 
-	 * @param g The Graphics used to paint
-	 * @since 1.2
-	 */
-	protected void applyTransparency(Graphics g) {
-		g.setAlpha(255 - transparency * 255 / 100);
-	}
-
-}
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 6290e7d..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableAnchor.java
+++ /dev/null
@@ -1,72 +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.PrecisionRectangle;
-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 relative coordinates
-	 */
-	protected Rectangle getBox() {
-		Rectangle rBox = getOwner() instanceof HandleBounds ? new PrecisionRectangle(
-				((HandleBounds) getOwner()).getHandleBounds())
-				: new PrecisionRectangle(getOwner().getBounds());
-		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 79c6d4c..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.AnchorListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.IImageFigure;
-import org.eclipse.draw2d.IImageFigure.ImageChangedListener;
-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.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * Implements sliding connection anchor functionality for Image figures
- * 
- * @author aboyko
- *
- */
-public class SlidableImageAnchor
-	extends SlidableAnchor implements ImageChangedListener {
-
-	static private class ImageAnchorLocation {
-
-		static private Map<Image, ImageAnchorLocation> imageAnchorLocationMap = new WeakHashMap<Image, ImageAnchorLocation>();
-
-		/**
-		 * 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 = imageAnchorLocationMap
-				.get(image);
-			if (imgAnchorLoc == null) {
-				imgAnchorLoc = new ImageAnchorLocation(image);
-				imageAnchorLocationMap.put(image, imgAnchorLoc);
-			}
-
-			return imgAnchorLoc;
-		}
-
-		private Map<Integer, Point> locationMap = new HashMap<Integer, Point>();
-
-		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 = 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(Integer.valueOf(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 IImageFigure 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);
-		if (f instanceof IImageFigure) {
-			this.imageFig = (IImageFigure) 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, IImageFigure imageFig) {
-		super(container);
-		this.imageFig = imageFig;
-	}
-
-	@Override
-	public void addAnchorListener(AnchorListener listener) {
-		if (listener == null)
-			return;
-		if (listeners.isEmpty() && imageFig != null) {
-			imageFig.addImageChangedListener(this);
-		}
-		super.addAnchorListener(listener);
-	}
-
-	@Override
-	public void removeAnchorListener(AnchorListener listener) {
-		super.removeAnchorListener(listener);
-		if (listeners.isEmpty() && imageFig != null) {
-			imageFig.removeImageChangedListener(this);
-		}
-	}
-
-	/**
-	 * 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, IImageFigure 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.draw2d.ui.figures.BaseSlidableAnchor#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 = 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 location = ImageAnchorLocation.getInstance(getImage())
-					.getLocation(ptRef, ptEdge, ownerRect,
-							getReferencePoint().equals(ownReference) && isDefaultAnchor());
-			if (location != null) {
-				location = normalizeToStraightlineTolerance(foreignReference,
-						location, 3);
-			}
-			return location;
-		}
-		return null;
-	}
-
-	/**
-	 * @since 1.4
-	 */
-	public void imageChanged() {
-		fireAnchorMoved();
-	}
-
-}
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 d21b776..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableOvalAnchor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PrecisionRectangle;
-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#getIntersectionPoints(org.eclipse.draw2d.geometry.Point, org.eclipse.draw2d.geometry.Point)
-	 */
-	protected PointList getIntersectionPoints(Point ownReference, Point foreignReference) {
-		Rectangle ellipseBox = new PrecisionRectangle(((IOvalAnchorableFigure)getOwner()).getOvalBounds());
-		getOwner().translateToAbsolute(ellipseBox);
-		return (new LineSeg(ownReference, foreignReference)).getLineIntersectionsWithEllipse(ellipseBox);
-	}
-}
-
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 612482e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefDebugOptions.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.gef.ui.internal;
-
-
-/**
- * A list of debug options for this plug-in.
- * 
- * @author khussey
- *
- */
-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 b81804a..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/GefStatusCodes.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.gef.ui.internal;
-
-/**
- * A list of status codes for this plug-in.
- * 
- * @author khussey
- *
- */
-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;
-    
-    /**
-     * 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.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 d5c5e6f..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/actions/MenuManagerEx.java
+++ /dev/null
@@ -1,582 +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.
- */
-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 0ad330e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/editpolicies/ConnectionBendpointEditPolicy.java
+++ /dev/null
@@ -1,936 +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.gef.ui.internal.editpolicies;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.AutomaticRouter;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.BendpointLocator;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-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.PrecisionRectangle;
-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.BendpointCreationHandle;
-import org.eclipse.gef.handles.BendpointMoveHandle;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-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.mapmode.MapModeUtil;
-import org.eclipse.gmf.runtime.gef.ui.internal.handles.BendpointCreationInvisibleHandle;
-import org.eclipse.gmf.runtime.gef.ui.internal.handles.BendpointMoveHandleEx;
-import org.eclipse.gmf.runtime.gef.ui.internal.handles.LineSegMoveInvisibleHandle;
-
-/**
- * This EditPolicy defines the behavior of Bendpoints on a Connection.
- */
-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 BendpointMoveHandleEx(
-					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() {
-		return createManualHandles();
-	}
-
-	/**
-	 * 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())) {
-				showMoveLineSegFeedback((BendpointRequest) request);
-			} else if (REQ_MOVE_BENDPOINT.equals(request.getType())) {
-				showMoveOrthogonalBenspointFeedback((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
-		PrecisionRectangle startRect =
-			new PrecisionRectangle(FigureUtilities.getAnchorableFigureBounds(getConnection().getSourceAnchor().getOwner()));
-		getConnection().getSourceAnchor().getOwner().translateToAbsolute(
-			startRect);
-		if (getLineSegMode().equals(LineMode.ORTHOGONAL_CONSTRAINED)) {
-			if (line.isHorizontal()) {
-				startRect.shrink(0, 2);
-			} else {
-				startRect.shrink(2, 0);
-			}
-		}
-		
-		getConnection().translateToRelative(startRect);
-		/*
-		 * Rectangle needs to be expanded by the "odd" number below because the number after
-		 * translations could be N.999999999... 
-		 */
-		if (!startRect.expand(0.000001, 0.000001).contains(new PrecisionPoint(line.getOrigin()))) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Method lineOutsideTarget.
-	* Utility method to determine if the constraint needs to be adjusted because 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
-		PrecisionRectangle endRect =
-			new PrecisionRectangle(FigureUtilities.getAnchorableFigureBounds(getConnection().getTargetAnchor().getOwner()));
-		getConnection().getTargetAnchor().getOwner().translateToAbsolute(
-			endRect);
-		if (getLineSegMode().equals(LineMode.ORTHOGONAL_CONSTRAINED)) {
-			if (line.isHorizontal()) {
-				endRect.shrink(0, 2);
-			} else {
-				endRect.shrink(2, 0);
-			}
-		}
-		
-		/*
-		 * Rectangle needs to be expanded by the "odd" number below because the number after
-		 * translations could be N.999999999... 
-		 */
-		getConnection().translateToRelative(endRect);
-		if (!endRect.expand(0.00001, 0.00001).contains(new PrecisionPoint(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);
-	}
-	
-	/**
-	 * Draws feedback for moving a bend point of a rectilinear connection
-	 * 
-	 * @param request Benndpoint request
-	 */
-	private void showMoveOrthogonalBenspointFeedback(BendpointRequest request) {
-		if (getFeedbackState().originalConstraint == null) {
-			saveOriginalConstraint();
-		}
-		
-		Point ptLoc = new Point(request.getLocation());
-		List constraint = (List)
-			getConnection().getRoutingConstraint();
-		
-		getConnection().translateToRelative(ptLoc);
-		
-		int index =
-		getFeedbackState().isOutsideSource ? request.getIndex() + 1 : request.getIndex();
-		
-		Point previous = ((Bendpoint)constraint.get(index - 1)).getLocation();
-		Point moving = ((Bendpoint)constraint.get(index)).getLocation();
-		Point next = ((Bendpoint)constraint.get(index + 1)).getLocation();
-		
-		LineSeg originalFirst = new LineSeg(previous.getCopy(), moving.getCopy());
-		LineSeg originalSecond = new LineSeg(moving.getCopy(), next.getCopy());
-		
-		Dimension diff = ptLoc.getDifference(moving);
-		
-		if (originalFirst.isHorizontal()) {
-			previous.y += diff.height;
-			next.x += diff.width;
-		} else {
-			previous.x += diff.width;
-			next.y += diff.height;
-		}
-		
-		LineSeg movedFirst = new LineSeg(previous, ptLoc.getCopy());
-		LineSeg movedSecond = new LineSeg(ptLoc.getCopy(), next);
-		
-		index = adjustOutsideBoundsLineFeedback(movedFirst, index - 1, constraint, originalFirst);
-		constraint.set(index, new AbsoluteBendpoint(movedFirst.getOrigin()));
-		constraint.set(index + 1, new AbsoluteBendpoint(movedFirst.getTerminus()));
-		
-		index = adjustOutsideBoundsLineFeedback(movedSecond, index + 1, constraint, originalSecond);
-		constraint.set(index + 1, new AbsoluteBendpoint(movedSecond.getTerminus()));
-		
-		getConnection().setRoutingConstraint(constraint);	}
-
-	/**
-	* 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);
-				
-		index = adjustOutsideBoundsLineFeedback(newLine, index, constraint, moveLine);
-		
-		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 newLine LineSeg representing the line currently being manipulated.
-	 * @param index the index
-	 * @param constraint List of Bendpoint objects that is the constraint to the gesture.
-	 * @param moveLine original segment that is being manipulated
-	 * @return int new index value after the constraint and feedback have been adjusted.
-	 */
-	private int adjustOutsideBoundsLineFeedback(LineSeg newLine, int index, List constraint, LineSeg moveLine) {
-		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))) {
-				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 (index == 0 && lineOutsideSource(newLine)) {
-			if (!getFeedbackState().isOutsideSource) {
-				getFeedbackState().isOutsideSource = true;
-				bSetNewSource = true;
-			}
-		} else if (index == 1 && getFeedbackState().isOutsideSource && !lineOutsideSource(newLine)) {
-			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 (checkTargetIndex == constraint.size() - 2 && getFeedbackState().isOutsideTarget
-				&& !lineOutsideTarget(newLine)) {
-			getFeedbackState().isOutsideTarget = false;
-			bRemoveTarget = true;
-		}
-		if (bRemoveSource) {
-			removeOutsideSourceFeedback(constraint);
-			index--;
-		}
-		
-		if (bRemoveTarget) {
-			removeOutsideTargetFeedback(constraint);
-		}
-
-		if (bSetNewSource) {
-			showOutsideSourceFeedback(newLine, moveLine, constraint);
-			index++;
-		}
-
-		if (bSetNewTarget) {
-			showOutsideTargetFeedback(newLine, moveLine, constraint);
-		}
-		return index;
-	}
-	
-	/**
-	* Method showOutsideSourceFeedback.
-	* Adds a bendpoint to the beginning of the constraint.
-	* Also adjusts the new segment with respect to added constraint
-	* 
-	* @param constraint List of bendpoints that the source point will be added too.
-	*/
-	private void showOutsideSourceFeedback(LineSeg newLine, LineSeg moveLine, List constraint) {
-		Connection conn = (Connection)getHostFigure();
-		ConnectionAnchor anchor = conn.getSourceAnchor();
-		PrecisionPoint startPoint = new PrecisionPoint(anchor.getOwner().getBounds().getCenter());
-		anchor.getOwner().translateToAbsolute(startPoint);
-		conn.translateToRelative(startPoint);
-		PrecisionRectangle bounds = new PrecisionRectangle(anchor.getOwner().getBounds());
-		anchor.getOwner().translateToAbsolute(bounds);
-		conn.translateToRelative(bounds);
-		Point origin = new Point(newLine.getOrigin());
-		if (moveLine.isHorizontal()) {
-			origin.x = startPoint.x;
-		} else {
-			origin.y = startPoint.y;
-		}
-		newLine.setOrigin(origin);
-		constraint.add(0, new AbsoluteBendpoint(startPoint));
-		
-	}
-
-	/**
-	* Method showOutsideTargetFeedback.
-	* Adds a bendpoint to the end of the constraint.
-	* Also adjusts the new segment with respect to added constraint
-	* 
-	* @param constraint List of bendpoints that the target point will be added too.
-	*/
-	private void showOutsideTargetFeedback(LineSeg newLine, LineSeg moveLine, List constraint) {
-		Connection conn = (Connection)getHostFigure();
-		ConnectionAnchor anchor = conn.getTargetAnchor();
-		PrecisionPoint endPoint = new PrecisionPoint(anchor.getOwner().getBounds().getCenter());
-		anchor.getOwner().translateToAbsolute(endPoint);
-		conn.translateToRelative(endPoint);
-		PrecisionRectangle bounds = new PrecisionRectangle(anchor.getOwner().getBounds());
-		anchor.getOwner().translateToAbsolute(bounds);
-		conn.translateToRelative(bounds);
-		Point terminus = new Point(newLine.getTerminus()); 
-		if (moveLine.isHorizontal()) {
-			terminus.x = endPoint.x;
-		} else {
-			terminus.y = endPoint.y;
-		}
-		newLine.setTerminus(terminus);
-		constraint.add(new AbsoluteBendpoint(endPoint));
-	}
-
-	/**
-	 * 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, selection…etc).
-<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 27a2435..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/CircleFigure.java
+++ /dev/null
@@ -1,94 +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
- */
-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 c735739..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/ConvexPentagonNodeFigure.java
+++ /dev/null
@@ -1,74 +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
- */
-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 5f47f07..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DiamondFigure.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.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
- */
-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 5bd9ff9..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/DynamicNodeFigure.java
+++ /dev/null
@@ -1,43 +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;
-
-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 da8666d..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/OvalFigure.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.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
- *
- * 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 24d5339..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/figures/RelativeToBorderLocator.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PrecisionRectangle;
-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
-				? new PrecisionRectangle(((HandleBounds) reference).getHandleBounds())
-				: new PrecisionRectangle(reference.getBounds());	
-
-		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 b282316..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointCreationInvisibleHandle.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.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
- */
-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/BendpointMoveHandleEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointMoveHandleEx.java
deleted file mode 100644
index 5af26bf..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/BendpointMoveHandleEx.java
+++ /dev/null
@@ -1,92 +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.gef.ui.internal.handles;
-
-import org.eclipse.draw2d.BendpointLocator;
-import org.eclipse.draw2d.Locator;
-
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.handles.BendpointMoveHandle;
-import org.eclipse.gmf.runtime.gef.ui.internal.tools.ConnectionBendpointTrackerEx;
-
-/**
- * A BendpointHandle that is used to move an existing bendpoint.
- * 
- * @author carson_li
- */
-public class BendpointMoveHandleEx extends BendpointMoveHandle {
-
-	/**
-	 * Creates a new BendpointMoveHandle, sets its owner to <code>owner</code>
-	 * and its index to <code>index</code>, and sets its locator to a new
-	 * {@link BendpointLocator}.
-	 * 
-	 * @param owner
-	 *            the ConnectionEditPart owner
-	 * @param index
-	 *            the index
-	 */
-	public BendpointMoveHandleEx(ConnectionEditPart owner, int index) {
-		super(owner, index);
-	}
-
-	/**
-	 * Creates a new BendpointMoveHandle, sets its owner to <code>owner</code>
-	 * and its index to <code>index</code>, and sets its locator to a new
-	 * {@link BendpointLocator} with the given <code>locatorIndex</code>.
-	 * 
-	 * @param owner
-	 *            the ConnectionEditPart owner
-	 * @param index
-	 *            the index
-	 * @param locatorIndex
-	 *            the index to use for the locator
-	 */
-	public BendpointMoveHandleEx(ConnectionEditPart owner, int index,
-			int locatorIndex) {
-		super(owner, index, locatorIndex);
-	}
-
-	/**
-	 * Creates a new BendpointMoveHandle and sets its owner to
-	 * <code>owner</code>, sets its index to <code>index</code>, and sets
-	 * its locator to <code>locator</code>.
-	 * 
-	 * @param owner
-	 *            the ConnectionEditPart owner
-	 * @param index
-	 *            the index
-	 * @param locator
-	 *            the Locator
-	 */
-	public BendpointMoveHandleEx(ConnectionEditPart owner, int index,
-			Locator locator) {
-		super(owner, index, locator);
-	}
-
-	/**
-	 * Creates and returns a new {@link ConnectionBendpointTrackerEx}.
-	 * 
-	 * @return the new ConnectionBendpointTrackerEx
-	 */
-	protected DragTracker createDragTracker() {
-		ConnectionBendpointTrackerEx tracker;
-		tracker = new ConnectionBendpointTrackerEx(
-				(ConnectionEditPart) getOwner(), getIndex());
-		tracker.setType(RequestConstants.REQ_MOVE_BENDPOINT);
-		tracker.setDefaultCursor(getCursor());
-		return tracker;
-	}
-
-}
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 406b95f..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/handles/LineSegMoveInvisibleHandle.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Connection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.tools.ConnectionBendpointTracker;
-
-import org.eclipse.gmf.runtime.gef.ui.internal.tools.ConnectionBendpointTrackerEx;
-
-/**
- * @author sshaw
- */
-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);
-		
-		PointList points = ((Connection)owner.getFigure()).getPoints();
-		Point pt1 = points.getPoint(index);
-		Point pt2 = points.getPoint(index + 1);
-		if (Math.abs(pt1.x - pt2.x) < Math.abs(pt1.y - pt2.y)) {
-			setCursor(SharedCursors.SIZEWE);
-		} else {
-			setCursor(SharedCursors.SIZENS);
-		}
-	}
-
-	/**
-	 * Creates and returns a new {@link ConnectionBendpointTracker}.
-	 * @return the new ConnectionBendpointTracker
-	 */
-	protected DragTracker createDragTracker() {		
-		ConnectionBendpointTrackerEx tracker;
-		tracker = new ConnectionBendpointTrackerEx(
-			(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 05eec07..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/l10n/Cursors.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.l10n;
-
-import org.eclipse.swt.graphics.Cursor;
-
-
-/**
- * This is class that stores a series of globally accessible cursors.
- * 
- * @author sshaw
- *
- */
-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 a59fae1..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteIdentity.java
+++ /dev/null
@@ -1,28 +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
- */
-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 f602bc9..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteSeparator.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.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/PaletteToolbar.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteToolbar.java
deleted file mode 100644
index e5a60c7..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/palette/PaletteToolbar.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 toolbar with identity.
- * 
- * @author crevells
- */
-public class PaletteToolbar
-	extends org.eclipse.gef.palette.PaletteToolbar {
-
-	/**
-	 * @param id
-	 * @param label
-	 */
-	public PaletteToolbar(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/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 03bcd0a..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/TextCellEditorEx.java
+++ /dev/null
@@ -1,125 +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.
- */
-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 4eef859..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/parts/WrapTextCellEditor.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.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>
- */
-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/ConnectionBendpointTrackerEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/ConnectionBendpointTrackerEx.java
deleted file mode 100644
index b4f3e8e..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/ConnectionBendpointTrackerEx.java
+++ /dev/null
@@ -1,126 +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.gef.ui.internal.tools;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PrecisionPoint;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.gef.tools.ConnectionBendpointTracker;
-import org.eclipse.swt.SWT;
-
-/**
- * A derived ConnectionBendpointTracker that overrides the updateSourceRequest
- * method allowing bendpoints to snap to grid
- * 
- * @author carson_li
- */
-public class ConnectionBendpointTrackerEx extends ConnectionBendpointTracker {
-
-	private PrecisionRectangle sourceRectangle;
-	private Point originalLocation = null;
-	private final int MODIFIER_NO_SNAPPING;
-
-	/**
-	 * Constructs a tracker for the given connection and index.
-	 * 
-	 * @param editpart:
-	 *            the connection
-	 * @param i:
-	 *            the index of the bendpoint
-	 */
-	public ConnectionBendpointTrackerEx(ConnectionEditPart editpart, int i) {
-		super(editpart, i);
-		if (SWT.getPlatform().equals("carbon"))//$NON-NLS-1$
-			MODIFIER_NO_SNAPPING = SWT.CTRL;
-		else
-			MODIFIER_NO_SNAPPING = SWT.ALT;
-	}
-
-	/*
-	 * @see org.eclipse.gef.tools.SimpleDragTracker#updateSourceRequest()
-	 */
-	protected void updateSourceRequest() {
-		BendpointRequest request = (BendpointRequest) getSourceRequest();
-
-		if (originalLocation == null) {
-			originalLocation = getStartLocation().getCopy();
-		}
-
-		Dimension delta = getDragMoveDelta();
-
-		if (getCurrentInput().isShiftKeyDown()) {
-			float ratio = 0;
-			if (delta.width != 0)
-				ratio = (float) delta.height / (float) delta.width;
-
-			ratio = Math.abs(ratio);
-			if (ratio > 0.5 && ratio < 1.5) {
-				if (Math.abs(delta.height) > Math.abs(delta.width)) {
-					if (delta.height > 0)
-						delta.height = Math.abs(delta.width);
-					else
-						delta.height = -Math.abs(delta.width);
-				} else {
-					if (delta.width > 0)
-						delta.width = Math.abs(delta.height);
-					else
-						delta.width = -Math.abs(delta.height);
-				}
-			} else {
-				if (Math.abs(delta.width) > Math.abs(delta.height))
-					delta.height = 0;
-				else
-					delta.width = 0;
-			}
-		}
-		Point moveDelta = new Point(delta.width, delta.height);
-		SnapToHelper snapToHelper = (SnapToHelper) getConnectionEditPart()
-				.getAdapter(SnapToHelper.class);
-
-		Rectangle rect = new Rectangle(originalLocation.x, originalLocation.y,
-				1, 1);
-		if (sourceRectangle == null) {
-			sourceRectangle = new PrecisionRectangle(rect);
-		}
-
-		if (snapToHelper != null
-				&& !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)) {
-			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();
-			baseRect.translate(moveDelta);
-			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);
-			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL
-					| PositionConstants.VERTICAL,
-					new PrecisionRectangle[] { baseRect }, preciseDelta);
-			Point newLocation = originalLocation.getCopy().translate(
-					preciseDelta);
-			request.setLocation(newLocation);
-		} else {
-			request.setLocation(getLocation());
-		}
-	}
-
-	/*
-	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()
-	 */
-	protected boolean handleDragStarted() {
-		originalLocation = null;
-		sourceRectangle = null;
-		return super.handleDragStarted();
-	}
-
-}
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 a7fd443..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/internal/tools/SelectConnectionEditPartTracker.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.PositionConstants;
-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.PrecisionRectangle;
-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.SnapToHelper;
-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.SWT;
-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
- */
-public class SelectConnectionEditPartTracker extends SelectEditPartTracker {
-
-	/**
-	 * Key modifier for ignoring snap while dragging.  It's CTRL on Mac, and ALT on all
-	 * other platforms.
-	 */
-	private final int MODIFIER_NO_SNAPPING;
-	private Request sourceRequest;
-	private int index = -1;
-	private String type;
-	private boolean bSourceFeedback = false;
-	
-	private PrecisionRectangle sourceRectangle;	
-	private Point originalLocation = null;	
-	
-	
-	/**
-	 * Method SelectConnectionEditPartTracker.
-	 * @param owner ConnectionNodeEditPart that creates and owns the tracker object
-	 */
-	public SelectConnectionEditPartTracker(ConnectionEditPart owner) {
-		super(owner);
-		if (SWT.getPlatform().equals("carbon"))//$NON-NLS-1$
-			MODIFIER_NO_SNAPPING = SWT.CTRL;
-		else
-			MODIFIER_NO_SNAPPING = SWT.ALT;
-	}
-
-	/* 
-	 * (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);
-		getConnection().translateToRelative(size);
-		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() {
-		originalLocation = null;
-		sourceRectangle = null;		
-		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;
-	}
-	
-	/**
-	 * @see org.eclipse.gef.tools.SimpleDragTracker#updateSourceRequest()
-	 */
-	protected void updateSourceRequest() {
-		BendpointRequest request = (BendpointRequest) getSourceRequest();	
-			
-		if (originalLocation == null){						
-			originalLocation = getStartLocation().getCopy();
-		}
-			
-		Dimension delta = getDragMoveDelta();
-		
-		if (getCurrentInput().isShiftKeyDown()) {			
-			float ratio = 0;			
-			if (delta.width != 0)
-				ratio = (float)delta.height / (float)delta.width;
-			
-			ratio = Math.abs(ratio);
-			if (ratio > 0.5 && ratio < 1.5) {
-				if (Math.abs(delta.height) > Math.abs(delta.width)) {
-					if (delta.height > 0)
-						delta.height = Math.abs(delta.width);
-					else
-						delta.height = -Math.abs(delta.width);
-				} else {
-					if (delta.width > 0)
-						delta.width = Math.abs(delta.height); 
-					else
-						delta.width = -Math.abs(delta.height);
-				}
-			} else {
-				if (Math.abs(delta.width) > Math.abs(delta.height))
-					delta.height = 0;
-				else
-					delta.width = 0;
-			}
-		}
-		Point moveDelta = new Point(delta.width, delta.height);
-		SnapToHelper snapToHelper = (SnapToHelper)getConnectionEditPart().getAdapter(SnapToHelper.class);
-
-		Rectangle rect = new Rectangle(originalLocation.x, originalLocation.y, 1, 1);		
-		if (sourceRectangle == null) {
-			sourceRectangle = new PrecisionRectangle(rect);	
-		}
-		
-		if (snapToHelper != null && !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)){
-			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();
-			baseRect.translate(moveDelta);	
-			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);
-			snapToHelper.snapPoint(request,
-					PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, 
-					new PrecisionRectangle[] {baseRect}, preciseDelta);		
-			Point newLocation = originalLocation.getCopy().translate(preciseDelta);								
-			request.setLocation(newLocation);
-		}
-		else{			
-			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.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/IPaletteState.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/IPaletteState.java
deleted file mode 100644
index d4b585b..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/IPaletteState.java
+++ /dev/null
@@ -1,54 +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.gef.ui.palette.customize;
-
-import org.eclipse.ui.IMemento;
-
-/**
- * An interface that defines the protocol that will allow the
- * <code>PaletteCustomizer</code> store, rollback, and apply customizations to a
- * palette entry.
- * 
- * @since 2.1
- * @author crevells
- */
-public interface IPaletteState {
-
-    /**
-     * Stores the current state of the palette entry.
-     */
-    void storeState();
-
-    /**
-     * Applies the changes from the stored state to the palette entry.
-     */
-    void rollback();
-
-    /**
-     * Stores changes from the existing palette entry from the stored state into
-     * the memento.
-     * 
-     * @param memento
-     *            the memento in which to store the palette entry's
-     *            customizations
-     */
-    void storeChangesInMemento(IMemento memento);
-
-    /**
-     * Applies the changes from the memento to the palette entry.
-     * 
-     * @param memento
-     *            the memento from which to retrieve the palette entry's
-     *            customizations
-     */
-    void applyChangesFromMemento(IMemento memento);
-}
diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerDialogEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerDialogEx.java
deleted file mode 100644
index d6e9c3d..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerDialogEx.java
+++ /dev/null
@@ -1,52 +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.gef.ui.palette.customize;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteCustomizer;
-import org.eclipse.gef.ui.palette.customize.PaletteCustomizerDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * GMF's version of the <code>PaletteCustomizerDialog</code> overridden to:
- * <li>Remove the toolbar items. We do not support creating new entries for the
- * palette, deleting entries (because there is no way the user can get them
- * back), and reordering entries (because how would we determine the order after
- * the entries changed based on capability enablement?).</li>
- * 
- * @author crevells
- */
-public class PaletteCustomizerDialogEx
-    extends PaletteCustomizerDialog {
-
-    public PaletteCustomizerDialogEx(Shell shell, PaletteCustomizer customizer,
-            PaletteRoot root) {
-        super(shell, customizer, root);
-    }
-
-    protected List createOutlineActions() {
-        return Collections.EMPTY_LIST;
-    }
-
-    protected Control createOutlineToolBar(Composite parent) {
-        if (createOutlineActions().isEmpty()) {
-            return null;
-        }
-        return super.createOutlineToolBar(parent);
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerEx.java
deleted file mode 100644
index d9a54eb..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteCustomizerEx.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.palette.customize;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteCustomizer;
-import org.eclipse.gef.ui.palette.customize.DefaultEntryPage;
-import org.eclipse.gef.ui.palette.customize.DrawerEntryPage;
-import org.eclipse.gef.ui.palette.customize.EntryPage;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.core.util.Trace;
-import org.eclipse.gmf.runtime.gef.ui.internal.GefDebugOptions;
-import org.eclipse.gmf.runtime.gef.ui.internal.GefPlugin;
-import org.eclipse.gmf.runtime.gef.ui.internal.GefStatusCodes;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-
-/**
- * Extends GEF's <code>PaletteCustomizer</code> to support:
- * <li>Saving the customizations to the a preference store.</li>
- * <li>Rolling back the changes made to the palette model if the cancel button
- * is pressed. See bugzilla#211065.</li>
- * 
- * @since 2.1
- * @author crevells
- */
-public class PaletteCustomizerEx
-    extends PaletteCustomizer {
-
-    /**
-     * Customized so that the palette state can be saved before the change is
-     * made to the palette model so that:
-     * <li>when the cancel button is pressed, the stored state can be restored</li>
-     * <li>when the save button is pressed, the customizations made since the
-     * state was stored can be written to the workspace preferences</li>
-     */
-    private class DefaultEntryPageEx
-        extends DefaultEntryPage {
-
-        protected void handleDescriptionChanged(String text) {
-            storePaletteState(getEntry());
-            super.handleDescriptionChanged(text);
-        }
-
-        protected void handleHiddenSelected(boolean isChecked) {
-            storePaletteState(getEntry());
-            super.handleHiddenSelected(isChecked);
-        }
-
-        protected void handleNameChanged(String text) {
-            storePaletteState(getEntry());
-            super.handleNameChanged(text);
-        }
-
-    }
-
-    /**
-     * Customized so that the palette state can be saved before the change is
-     * made to the palette model so that:
-     * <li>when the cancel button is pressed, the stored state can be restored</li>
-     * <li>when the save button is pressed, the customizations made since the
-     * state was stored can be written to the workspace preferences</li>
-     */
-    private class DrawerEntryPageEx
-        extends DrawerEntryPage {
-
-        protected void handleOpenSelected(boolean selection) {
-            storePaletteState(getEntry());
-            super.handleOpenSelected(selection);
-        }
-
-        protected void handlePinSelected(boolean selection) {
-            storePaletteState(getEntry());
-            super.handlePinSelected(selection);
-        }
-
-        protected void handleDescriptionChanged(String text) {
-            storePaletteState(getEntry());
-            super.handleDescriptionChanged(text);
-        }
-
-        protected void handleHiddenSelected(boolean isChecked) {
-            storePaletteState(getEntry());
-            super.handleHiddenSelected(isChecked);
-        }
-
-        protected void handleNameChanged(String text) {
-            storePaletteState(getEntry());
-            super.handleNameChanged(text);
-        }
-    }
-
-    /**
-     * id used in the workspace preference store for palette customizations
-     */
-    private static final String PALETTE_CUSTOMIZATIONS_ID = "org.eclipse.gmf.runtime.diagram.ui.paletteCustomizations"; //$NON-NLS-1$
-
-    /**
-     * Matches each palette entry with a palette state.
-     */
-    private HashMap<PaletteEntry, IPaletteState> paletteStates = new HashMap<PaletteEntry, IPaletteState>();
-
-    /**
-     * the preference store in which the palette customizations are to be saved and retrieved from
-     */
-    private IPreferenceStore preferences;
-    
-    /**
-     * Creates a new instance.
-     * 
-     * @param preferenceStore
-     *            the preference store in which the palette customizations are
-     *            to be saved and retrieved from
-     */
-    public PaletteCustomizerEx(IPreferenceStore preferenceStore) {
-        super();
-        this.preferences = preferenceStore;
-    }
-
-    public EntryPage getPropertiesPage(PaletteEntry entry) {
-        if (entry.getType().equals(PaletteDrawer.PALETTE_TYPE_DRAWER)) {
-            return new DrawerEntryPageEx();
-        }
-        return new DefaultEntryPageEx();
-    }
-
-    /**
-     * Creation factory method for the <code>IPaletteState</code>. Clients
-     * may override to provide custom <code>IPaletteStates</code>.
-     * 
-     * @param entry
-     *            the palette entry
-     * @return a new <code>IPaletteState</code> instance.
-     */
-    protected IPaletteState createPaletteState(PaletteEntry entry) {
-        if (entry instanceof PaletteDrawer) {
-            return new PaletteDrawerState((PaletteDrawer) entry);
-        } else {
-            return new PaletteEntryState(entry);
-        }
-    }
-
-    /**
-     * Stores the palette state for a given palette entry if the state has not
-     * yet been stored.
-     * 
-     * @param entry
-     *            the palette entry
-     */
-    private void storePaletteState(PaletteEntry entry) {
-        if (paletteStates.get(entry) != null) {
-            // the palette state has already been stored
-            return;
-        }
-
-        IPaletteState paletteState = createPaletteState(entry);
-        paletteState.storeState();
-
-        paletteStates.put(entry, paletteState);
-    }
-
-    public void revertToSaved() {
-        for (Iterator<Entry<PaletteEntry, IPaletteState>> iterator = paletteStates
-            .entrySet().iterator(); iterator.hasNext();) {
-            Entry<PaletteEntry, IPaletteState> entry = iterator.next();
-            entry.getValue().rollback();
-        }
-        paletteStates.clear();
-    }
-
-    public void save() {
-        if (paletteStates.isEmpty()) {
-            return;
-        }
-
-        // If there are already existing palette customizations we will add to
-        // them, otherwise, create a new XML memento which makes it easy to save
-        // the customizations in a tree format.
-        XMLMemento rootMemento = getExistingCustomizations();
-        if (rootMemento == null) {
-            rootMemento = XMLMemento.createWriteRoot(PALETTE_CUSTOMIZATIONS_ID);
-        }
-        for (Iterator<Entry<PaletteEntry, IPaletteState>> iterator = paletteStates
-            .entrySet().iterator(); iterator.hasNext();) {
-            Entry<PaletteEntry, IPaletteState> entry = iterator.next();
-
-            IMemento memento = getMementoForEntry(rootMemento, entry.getKey());
-            if (memento != null) {
-                entry.getValue().storeChangesInMemento(memento);
-            }
-        }
-
-        StringWriter writer = new StringWriter();
-        try {
-            rootMemento.save(writer);
-
-            if (preferences != null) {
-                preferences.setValue(PALETTE_CUSTOMIZATIONS_ID, writer
-                    .toString());
-            }
-        } catch (IOException e) {
-            Trace
-                .catching(
-                    GefPlugin.getInstance(),
-                    GefDebugOptions.EXCEPTIONS_CATCHING,
-                    getClass(),
-                    "Problem saving the XML memento when saving the palette customizations.", //$NON-NLS-1$
-                    e);
-            Log
-                .warning(
-                    GefPlugin.getInstance(),
-                    GefStatusCodes.IGNORED_EXCEPTION_WARNING,
-                    "Problem saving the XML memento when saving the palette customizations.", //$NON-NLS-1$
-                    e);
-        }
-
-        paletteStates.clear();
-    }
-
-    /**
-     * Given the rootMemento, gets the memento that already exists for the
-     * palette entry or creates a new one in the rootMemento (and the necessary
-     * palette container mementos) if one does not exist yet. The root memento's
-     * tree structure matches that of the palette root. If a palette entry in
-     * stack A, in drawer B is customized, the root memento will have a child
-     * memento for drawer B which has a child memento for stack A which has a
-     * child memento for the entry. The memento's use the palette entry's id.
-     * 
-     * @param rootMemento
-     *            the root memento representing the palette root
-     * @param paletteEntry
-     *            the palette entry for which a memento should be retrieved or
-     *            created
-     * @return returns the memento that already exists for the palette entry or
-     *         creates a new one in the rootMemento if one does not exist yet or
-     *         null if the memento could not be created (most likely because the
-     *         palete id is not acceptable).
-     */
-    private IMemento getMementoForEntry(IMemento rootMemento,
-            PaletteEntry paletteEntry) {
-
-        ArrayList<String> idList = new ArrayList<String>();
-        idList.add(paletteEntry.getId());
-
-        PaletteContainer parent = paletteEntry.getParent();
-        while (parent != null
-            && !PaletteRoot.PALETTE_TYPE_ROOT.equals(parent.getType())) {
-            idList.add(parent.getId());
-            parent = parent.getParent();
-        }
-
-        // go through ids in reverse order and create the mementos as necessary
-        IMemento containerMemento = rootMemento;
-        for (int i = idList.size() - 1; i >= 0; i--) {
-            String id = idList.get(i);
-            IMemento memento = containerMemento.getChild(id);
-            if (memento == null) {
-                try {
-                    memento = containerMemento.createChild(id);
-                } catch (Exception e) {
-                    Trace
-                        .catching(
-                            GefPlugin.getInstance(),
-                            GefDebugOptions.EXCEPTIONS_CATCHING,
-                            getClass(),
-                            "Invalid palette id encountered when saving the palette customizations.", //$NON-NLS-1$
-                            e);
-                    Log
-                        .warning(
-                            GefPlugin.getInstance(),
-                            GefStatusCodes.IGNORED_EXCEPTION_WARNING,
-                            "Invalid palette id encountered when saving the palette customizations.", //$NON-NLS-1$
-                            e);
-                    return null;
-                }
-            }
-            containerMemento = memento;
-        }
-
-        return containerMemento;
-    }
-
-    /**
-     * Retrieves the palette customizations from the workspace preferences and
-     * applies these customizations to the palette root.
-     * 
-     * @param paletteRoot
-     *            the palette root on which to apply the customizations
-     */
-    public void applyCustomizationsToPalette(PaletteRoot paletteRoot) {
-        XMLMemento rootMemento = getExistingCustomizations();
-        if (rootMemento != null) {
-            applyCustomizations(rootMemento, paletteRoot);
-        }
-    }
-
-    /**
-     * Recursive helper method to apply the palette customizations in a memento
-     * to a palette container.
-     * 
-     * @param containerMemento
-     *            the mememto where the container's customizations are stored
-     * @param paletteContainer
-     *            the palette container on which to apply the customizations
-     */
-    private void applyCustomizations(IMemento containerMemento,
-            PaletteContainer paletteContainer) {
-
-        for (Iterator iterator = paletteContainer.getChildren().iterator(); iterator
-            .hasNext();) {
-            PaletteEntry entry = (PaletteEntry) iterator.next();
-            IMemento childMemento = containerMemento.getChild(entry.getId());
-            if (childMemento != null) {
-                IPaletteState state = createPaletteState(entry);
-                state.applyChangesFromMemento(childMemento);
-                if (entry instanceof PaletteContainer) {
-                    applyCustomizations(childMemento, (PaletteContainer) entry);
-                }
-            }
-
-        }
-    }
-
-    /**
-     * Retrieves the root memento from the workspace preferences if there were
-     * existing palette customizations.
-     * 
-     * @return the root memento if there were existing customizations; null
-     *         otherwise
-     */
-    private XMLMemento getExistingCustomizations() {
-        if (preferences != null) {
-            String sValue = preferences.getString(PALETTE_CUSTOMIZATIONS_ID);
-            if (sValue != null && !sValue.equals("")) { //$NON-NLS-1$
-                try {
-                    XMLMemento rootMemento = XMLMemento
-                        .createReadRoot(new StringReader(sValue));
-                    return rootMemento;
-                } catch (WorkbenchException e) {
-                    Trace
-                        .catching(
-                            GefPlugin.getInstance(),
-                            GefDebugOptions.EXCEPTIONS_CATCHING,
-                            getClass(),
-                            "Problem creating the XML memento when saving the palette customizations.", //$NON-NLS-1$
-                            e);
-                    Log
-                        .warning(
-                            GefPlugin.getInstance(),
-                            GefStatusCodes.IGNORED_EXCEPTION_WARNING,
-                            "Problem creating the XML memento when saving the palette customizations.", //$NON-NLS-1$
-                            e);
-                }
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteDrawerState.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteDrawerState.java
deleted file mode 100644
index e7d85cd..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteDrawerState.java
+++ /dev/null
@@ -1,62 +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.gef.ui.palette.customize;
-
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.ui.IMemento;
-
-/**
- * Used to store, rollback, and apply palette customizations of a palette
- * drawer.
- * 
- * @since 2.1
- * @author crevells
- */
-public class PaletteDrawerState
-    extends PaletteEntryState {
-
-    private static final String INITIAL_STATE_KEY = "initialState"; //$NON-NLS-1$
-
-    int initialState;
-
-    public PaletteDrawerState(PaletteDrawer drawer) {
-        super(drawer);
-    }
-
-    public void storeState() {
-        super.storeState();
-        initialState = ((PaletteDrawer) getPaletteEntry()).getInitialState();
-    }
-
-    public void rollback() {
-        super.rollback();
-        ((PaletteDrawer) getPaletteEntry()).setInitialState(initialState);
-    }
-
-    public void storeChangesInMemento(IMemento memento) {
-        super.storeChangesInMemento(memento);
-
-        PaletteDrawer drawer = ((PaletteDrawer) getPaletteEntry());
-        if (initialState != drawer.getInitialState()) {
-            memento.putInteger(INITIAL_STATE_KEY, drawer.getInitialState());
-        }
-    }
-
-    public void applyChangesFromMemento(IMemento entryMemento) {
-        super.applyChangesFromMemento(entryMemento);
-
-        Integer iValue = entryMemento.getInteger(INITIAL_STATE_KEY);
-        if (iValue != null) {
-            ((PaletteDrawer) getPaletteEntry()).setInitialState(iValue);
-        }
-    }
-}
diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteEntryState.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteEntryState.java
deleted file mode 100644
index 46ee24b..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteEntryState.java
+++ /dev/null
@@ -1,100 +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.gef.ui.palette.customize;
-
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.ui.IMemento;
-
-/**
- * Used to store, rollback, and apply palette customizations of a palette entry.
- * 
- * @since 2.1
- * @author crevells
- */
-public class PaletteEntryState
-    implements IPaletteState {
-
-    private PaletteEntry paletteEntry;
-
-    private static final String LABEL_KEY = "label"; //$NON-NLS-1$
-
-    private static final String DESCRIPTION_KEY = "description"; //$NON-NLS-1$
-
-    private static final String ISVISIBLE_KEY = "isVisible"; //$NON-NLS-1$
-
-    private String label;
-
-    private String description;
-
-    private boolean isVisible;
-
-    public PaletteEntryState(PaletteEntry entry) {
-        paletteEntry = entry;
-    }
-
-    /**
-     * Gets the palette entry being acted on.
-     * 
-     * @return
-     */
-    protected PaletteEntry getPaletteEntry() {
-        return paletteEntry;
-    }
-
-    public void storeState() {
-        PaletteEntry entry = getPaletteEntry();
-        label = entry.getLabel();
-        description = entry.getDescription();
-        isVisible = entry.isVisible();
-    }
-
-    public void rollback() {
-        PaletteEntry entry = getPaletteEntry();
-        entry.setLabel(label);
-        entry.setDescription(description);
-        entry.setVisible(isVisible);
-    }
-
-    public void storeChangesInMemento(IMemento memento) {
-        PaletteEntry entry = getPaletteEntry();
-
-        if (label != null && !label.equals(entry.getLabel())
-            || (label == null && entry.getLabel() != null)) {
-            memento.putString(LABEL_KEY, entry.getLabel());
-        }
-        if (description != null && !description.equals(entry.getDescription())
-            || (description == null && entry.getDescription() != null)) {
-            memento.putString(DESCRIPTION_KEY, entry.getDescription());
-        }
-        if (isVisible != entry.isVisible()) {
-            memento.putBoolean(ISVISIBLE_KEY, entry.isVisible());
-        }
-    }
-
-    public void applyChangesFromMemento(IMemento entryMemento) {
-        PaletteEntry entry = getPaletteEntry();
-
-        String sValue = entryMemento.getString(LABEL_KEY);
-        if (sValue != null) {
-            entry.setLabel(sValue);
-        }
-        sValue = entryMemento.getString(DESCRIPTION_KEY);
-        if (sValue != null) {
-            entry.setDescription(sValue);
-        }
-        Boolean bValue = entryMemento.getBoolean(ISVISIBLE_KEY);
-        if (bValue != null) {
-            entry.setVisible(bValue);
-        }
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteViewerEx.java b/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteViewerEx.java
deleted file mode 100644
index cb4b404..0000000
--- a/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/palette/customize/PaletteViewerEx.java
+++ /dev/null
@@ -1,41 +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.gef.ui.palette.customize;
-
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.customize.PaletteCustomizerDialog;
-
-/**
- * GMF's version of the <code>PaletteViewer</code> extended to:
- * <li>override the <code>PaletteCustomizerDialog</code></li>
- * 
- * @since 2.1
- * @author crevells
- */
-public class PaletteViewerEx
-    extends PaletteViewer {
-
-    private PaletteCustomizerDialog customizerDialog = null;
-
-    public PaletteViewerEx() {
-        super();
-    }
-
-    public PaletteCustomizerDialog getCustomizerDialog() {
-        if (customizerDialog == null) {
-            customizerDialog = new PaletteCustomizerDialogEx(getControl()
-                .getShell(), getCustomizer(), getPaletteRoot());
-        }
-        return customizerDialog;
-    }
-
-}
diff --git a/org.eclipse.gmf.runtime.notation.providers/.classpath b/org.eclipse.gmf.runtime.notation.providers/.classpath
deleted file mode 100644
index 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 e09165c..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-org
-org
-target
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 0af23aa..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.notation.providers</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.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 80f7912..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Fri Mar 27 04:07:15 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index c79368a..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,86 +0,0 @@
-#Thu Oct 16 17:21:17 EDT 2008
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Error
-ILLEGAL_IMPLEMENT=Error
-ILLEGAL_INSTANTIATE=Error
-ILLEGAL_OVERRIDE=Error
-ILLEGAL_REFERENCE=Error
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Error
-LEAK_EXTEND=Error
-LEAK_FIELD_DECL=Error
-LEAK_IMPLEMENT=Error
-LEAK_METHOD_PARAM=Error
-LEAK_METHOD_RETURN_TYPE=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
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 9eb4bea..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/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.notation.providers; singleton:=true

-Bundle-Version: 1.3.0.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.5.0,3.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 1836911..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 Modeling Project
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 f287072..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
-            class="org.eclipse.gmf.runtime.notation.providers.internal.copypaste.ClipboardSupportFactory"
-            nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation"
-            priority="lowest">
-      </factory>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.gmf.runtime.notation.providers/pom.xml b/org.eclipse.gmf.runtime.notation.providers/pom.xml
deleted file mode 100644
index 4104a97..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.notation.providers</groupId>
-  <artifactId>org.eclipse.gmf.runtime.notation.providers</artifactId>
-  <version>1.3.0.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
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 a1dd374..0000000
--- a/org.eclipse.gmf.runtime.notation.providers/src/org/eclipse/gmf/runtime/notation/providers/internal/copypaste/NotationClipboardOperationHelper.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-	}
-
-	protected boolean shouldAllowPaste(
-			PasteChildOperation overriddenChildPasteOperation) {
-		EObject eObject = overriddenChildPasteOperation.getEObject();
-		EObject parentEObject = overriddenChildPasteOperation
-			.getParentEObject();
-		// RATLC01137919 removed the condition that parentEObject is a diagram to allow paste into diagram elements
-		if ((parentEObject instanceof View) && (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 parentRootContainerEpackage = EcoreUtil.getRootContainer(
-				parentEObject).eClass().getEPackage();
-			EPackage sematicParentRootContainerEpackage = null;
-			EObject sematicParentElement = ((View) parentEObject).getElement();
-			if (sematicParentElement != null) {
-				sematicParentRootContainerEpackage = EcoreUtil
-					.getRootContainer(sematicParentElement).eClass()
-					.getEPackage();
-			}
-
-			if (parentRootContainerEpackage != NotationPackage.eINSTANCE) {
-				if (semanticChildEpackage != parentRootContainerEpackage) {
-					return false;
-				}
-			}
-
-			if ((sematicParentRootContainerEpackage != null)
-				&& (sematicParentRootContainerEpackage != NotationPackage.eINSTANCE)) {
-				if (semanticChildEpackage != sematicParentRootContainerEpackage) {
-					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.runtime.rcp-feature/pom.xml b/org.eclipse.gmf.runtime.rcp-feature/pom.xml
deleted file mode 100644
index cf7ecb6..0000000
--- a/org.eclipse.gmf.runtime.rcp-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.runtime.rcp</artifactId>
-  <version>2.0.0</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.releng/pom.xml b/org.eclipse.gmf.runtime.releng/pom.xml
deleted file mode 100644
index 0f3a6da..0000000
--- a/org.eclipse.gmf.runtime.releng/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>parent</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Parent project for GMF Runtime build</name>
-	<description>Parent project for GMF Runtime build</description>
-
-	<properties>
-		<tycho-version>0.13.0</tycho-version>
-	</properties>
-	
-	<modules>
-		<module>plugins</module>
-		<module>examples</module>
-		<!--module>doc</module-->
-		<module>features</module>
-		<module>tests</module>
-		<!--module>repository</module-->
-	</modules>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<resolver>p2</resolver>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<mailingLists>
-		<mailingList>
-			<name>GMF-dev Mailing List</name>
-			<post>gmf-dev@eclipse.org</post>
-			<subscribe>https://dev.eclipse.org/mailman/listinfo/gmf-dev</subscribe>
-			<unsubscribe>https://dev.eclipse.org/mailman/listinfo/gmf-dev</unsubscribe>
-			<archive>http://dev.eclipse.org/mhonarc/lists/gmf-dev</archive>
-		</mailingList>
-	</mailingLists>
-
-	<issueManagement>
-		<url>https://bugs.eclipse.org/bugs/buglist.cgi?classification=Modeling;query_format=advanced;component=GMF-runtime;product=GMP</url>
-		<system>Bugzilla</system>
-	</issueManagement>
-
-	<licenses>
-		<license>
-			<name>Eclipse Public License v1.0</name>
-			<comments>
-       All rights reserved.
-
-       This program and the accompanying materials are made
-       available under the terms of the Eclipse Public License v1.0
-       which accompanies this distribution, and is available at
-       http://www.eclipse.org/legal/epl-v10.htm
-      </comments>
-		</license>
-	</licenses>
-	
-	<profiles>
-		<profile>
-			<id>helios</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>Helios</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/helios</url>
-				</repository>				
-			</repositories>
-		</profile>
-		<profile>
-			<id>indigo</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>Indigo</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/indigo</url>
-				</repository>
-				<repository>
-					<id>Orbit-Indigo</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20111018035124/repository/</url>
-				</repository>		
-			</repositories>
-		</profile>
-		<profile>
-			<id>juno-staging</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<repositories>
-				<repository>
-					<id>staging</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/staging/</url>
-				</repository>
-			</repositories>
-		</profile>
-	</profiles>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.sdk-feature/.project b/org.eclipse.gmf.runtime.sdk-feature/.project
deleted file mode 100755
index bc88bd2..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.sdk-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.sdk-feature/build.properties b/org.eclipse.gmf.runtime.sdk-feature/build.properties
deleted file mode 100755
index 6b825a3..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: build.properties,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-generate.feature@org.eclipse.gmf.source=org.eclipse.gmf
-bin.includes = feature.xml,\
-               feature.properties,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               epl-v10.html
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html
diff --git a/org.eclipse.gmf.runtime.sdk-feature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime.sdk-feature/eclipse_update_120.jpg
deleted file mode 100755
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.sdk-feature/epl-v10.html b/org.eclipse.gmf.runtime.sdk-feature/epl-v10.html
deleted file mode 100755
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.sdk-feature/feature.properties b/org.eclipse.gmf.runtime.sdk-feature/feature.properties
deleted file mode 100755
index b92328e..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/feature.properties
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: feature.properties,v 1.3 2011/04/26 19:51:18 ahunter Exp $
-
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework (GMF) Runtime SDK
-runtimeFeatureName=GMF Runtime
-runtimeSourceFeatureName=GMF Runtime Sources
-toolingFeatureName=GMF Tooling
-toolingSourceFeatureName=GMF Tooling Sources
-notationSourceFeatureName=GMF Notation Sources
-thirdPartySourceFeatureName=GMF Third Party Sources
-docFeatureName=GMF Documentation
-examplesFeatureName=GMF Examples
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework SDK
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime.sdk-feature/feature.xml b/org.eclipse.gmf.runtime.sdk-feature/feature.xml
deleted file mode 100755
index d936a3a..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/feature.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.runtime.sdk"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://www.eclipse.org/gmf">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2005, 2008 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
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.gmf"
-         version="0.0.0"
-         name="%runtimeFeatureName"/>
-
-   <includes
-         id="org.eclipse.gmf.source"
-         version="0.0.0"
-         name="%runtimeSourceFeatureName"/>
-
-   <includes
-         id="org.eclipse.gmf.examples.runtime.ui.pde"
-         version="0.0.0"
-         name="%examplesFeatureName"/>
-
-   <includes
-         id="org.eclipse.gmf.runtime.thirdparty.source"
-         version="0.0.0"
-         name="%thirdPartySourceFeatureName"/>
-
-   <requires>
-      <import feature="org.eclipse.emf" version="2.6.0" match="compatible"/>
-      <import feature="org.eclipse.gef" version="3.6.0" match="compatible"/>
-      <import feature="org.eclipse.ocl" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.emf.validation" version="1.1.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.gmf.runtime.sdk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.gmf.runtime.sdk-feature/license.html b/org.eclipse.gmf.runtime.sdk-feature/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.sdk-feature/pom.xml b/org.eclipse.gmf.runtime.sdk-feature/pom.xml
deleted file mode 100644
index f8a0b03..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.runtime.sdk</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.sdk-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.runtime.sdk-feature/rootfiles/epl-v10.html
deleted file mode 100755
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.sdk-feature/rootfiles/notice.html b/org.eclipse.gmf.runtime.sdk-feature/rootfiles/notice.html
deleted file mode 100755
index c184ca3..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/build.properties b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/build.properties
deleted file mode 100755
index 608a2be..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: build.properties,v 1.1 2010/05/03 02:05:34 ahunter Exp $
-
-bin.includes =\
-epl-v10.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100755
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100755
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/feature.properties b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/feature.properties
deleted file mode 100755
index 45d0a91..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,157 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: feature.properties,v 1.2 2011/04/26 19:51:18 ahunter Exp $
-
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Runtime SDK Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Graphical Modeling Framework SDK component.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/license.html b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.html b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.html
deleted file mode 100755
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/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, 2007</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.sdk-feature/sourceTemplatePlugin/about.ini b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.ini
deleted file mode 100755
index a4a2287..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.ini,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-# 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.runtime.sdk-feature/sourceTemplatePlugin/about.mappings b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100755
index 5823936..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.mappings,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-# 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.runtime.sdk-feature/sourceTemplatePlugin/about.properties b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.properties
deleted file mode 100755
index 2210387..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.properties,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-
-# 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) Developer Resources
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Developer Resources \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.runtime.sdk-feature/sourceTemplatePlugin/build.properties b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/build.properties
deleted file mode 100755
index 945d83c..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: build.properties,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-bin.includes = modeling32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/modeling32.png b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100755
index 6b08de2..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100755
index e49183c..0000000
--- a/org.eclipse.gmf.runtime.sdk-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: plugin.properties,v 1.1 2010/05/03 02:05:33 ahunter Exp $
-pluginName=Graphical Modeling Framework Runtime SDK Developer Resources
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.runtime.sdk/.classpath b/org.eclipse.gmf.runtime.sdk/.classpath
deleted file mode 100755
index acad1c2..0000000
--- a/org.eclipse.gmf.runtime.sdk/.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.runtime.sdk/.cvsignore b/org.eclipse.gmf.runtime.sdk/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/org.eclipse.gmf.runtime.sdk/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/org.eclipse.gmf.runtime.sdk/.project b/org.eclipse.gmf.runtime.sdk/.project
deleted file mode 100755
index e8eabb0..0000000
--- a/org.eclipse.gmf.runtime.sdk/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.sdk</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf.runtime.sdk/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.sdk/META-INF/MANIFEST.MF
deleted file mode 100755
index 42b09f1..0000000
--- a/org.eclipse.gmf.runtime.sdk/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.runtime.sdk
-Bundle-Version: 1.4.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmf.runtime.sdk/about.html b/org.eclipse.gmf.runtime.sdk/about.html
deleted file mode 100755
index 1b8f940..0000000
--- a/org.eclipse.gmf.runtime.sdk/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, 2007</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.sdk/about.ini b/org.eclipse.gmf.runtime.sdk/about.ini
deleted file mode 100755
index c4eb06c..0000000
--- a/org.eclipse.gmf.runtime.sdk/about.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.ini,v 1.1 2010/05/03 02:04:07 ahunter Exp $
-# 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.runtime.sdk/about.mappings b/org.eclipse.gmf.runtime.sdk/about.mappings
deleted file mode 100755
index 443d986..0000000
--- a/org.eclipse.gmf.runtime.sdk/about.mappings
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.mappings,v 1.1 2010/05/03 02:04:06 ahunter Exp $
-# 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.runtime.sdk/about.properties b/org.eclipse.gmf.runtime.sdk/about.properties
deleted file mode 100755
index 296a5ff..0000000
--- a/org.eclipse.gmf.runtime.sdk/about.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: about.properties,v 1.1 2010/05/03 02:04:06 ahunter Exp $
-
-# 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) Runtime SDK
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Runtime SDK \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.runtime.sdk/build.properties b/org.eclipse.gmf.runtime.sdk/build.properties
deleted file mode 100755
index 6762e82..0000000
--- a/org.eclipse.gmf.runtime.sdk/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: build.properties,v 1.1 2010/05/03 02:04:05 ahunter Exp $
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
diff --git a/org.eclipse.gmf.runtime.sdk/modeling32.png b/org.eclipse.gmf.runtime.sdk/modeling32.png
deleted file mode 100755
index 6b08de2..0000000
--- a/org.eclipse.gmf.runtime.sdk/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.sdk/plugin.properties b/org.eclipse.gmf.runtime.sdk/plugin.properties
deleted file mode 100755
index fdaca6d..0000000
--- a/org.eclipse.gmf.runtime.sdk/plugin.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Software Corporation - initial API and implementation
-###############################################################################
-# $Id: plugin.properties,v 1.1 2010/05/03 02:04:03 ahunter 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 = Graphical Modeling Framework Runtime SDK
-providerName = Eclipse Modeling Project
-
diff --git a/org.eclipse.gmf.runtime.sdk/pom.xml b/org.eclipse.gmf.runtime.sdk/pom.xml
deleted file mode 100644
index c50c398..0000000
--- a/org.eclipse.gmf.runtime.sdk/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.runtime.sdk</groupId>
-  <artifactId>org.eclipse.gmf.runtime.sdk</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/.project b/org.eclipse.gmf.runtime.thirdparty-feature/.project
deleted file mode 100644
index 8371827..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.thirdparty-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.thirdparty-feature/about_files/LICENSE-2.0.txt b/org.eclipse.gmf.runtime.thirdparty-feature/about_files/LICENSE-2.0.txt
deleted file mode 100644
index d645695..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/about_files/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/about_files/NOTICE b/org.eclipse.gmf.runtime.thirdparty-feature/about_files/NOTICE
deleted file mode 100644
index 6feaada..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/about_files/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This software contains code from the World Wide Web Consortium (W3C) for the 
-Document Object Model API (DOM API) and SVG Document Type Definition (DTD).
-
-This software contains code from the International Organisation for Standardization
-for the definition of character entities used in the software's documentation.
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/build.properties b/org.eclipse.gmf.runtime.thirdparty-feature/build.properties
deleted file mode 100644
index 3b5d421..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = feature.xml,\
-               about_files/,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime.thirdparty-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/epl-v10.html b/org.eclipse.gmf.runtime.thirdparty-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/feature.properties b/org.eclipse.gmf.runtime.thirdparty-feature/feature.properties
deleted file mode 100644
index fc56a28..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Third-Party Components for GMF Runtime 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Third-Party Components for GMF Runtime
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/feature.xml b/org.eclipse.gmf.runtime.thirdparty-feature/feature.xml
deleted file mode 100644
index ade43b6..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/feature.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature

-      id="org.eclipse.gmf.runtime.thirdparty"

-      label="%featureName"

-      version="1.5.0.qualifier"

-      provider-name="%providerName"

-      image="eclipse_update_120.jpg">

-

-   <description url="http://www.eclipse.org/gmf">

-      %description

-   </description>

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2006-2011 IBM Corporation and others.

-All rights reserved.   This program and the accompanying materials

-are made available under the terms of the Eclipse Public License v1.0

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <url>

-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>

-   </url>

-

-   <requires>

-      <import plugin="org.apache.batik.css"/>

-      <import plugin="org.apache.batik.dom"/>

-      <import plugin="org.apache.batik.parser"/>

-      <import plugin="org.apache.batik.util"/>

-      <import plugin="org.w3c.css.sac"/>

-      <import plugin="org.eclipse.osgi"/>

-      <import plugin="org.apache.batik.dom.svg"/>

-      <import plugin="org.apache.batik.ext.awt"/>

-      <import plugin="org.apache.batik.util.gui"/>

-      <import plugin="org.apache.batik.xml"/>

-      <import plugin="org.apache.batik.bridge"/>

-      <import plugin="org.apache.batik.svggen"/>

-      <import plugin="javax.xml" version="1.3.4" match="compatible"/>

-      <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>

-      <import plugin="org.apache.batik.transcoder"/>

-   </requires>

-

-   <plugin

-         id="org.apache.batik.dom.svg"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.bridge"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.dom"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.ext.awt"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.transcoder"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.svggen"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.util"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.w3c.dom.svg"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.xerces"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.xml.resolver"

-         download-size="0"

-         install-size="0"

-         version="1.2.0.v201005080400"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.css"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.util.gui"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.parser"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.xml"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201011041432"

-         unpack="false"/>

-

-   <plugin

-         id="org.w3c.css.sac"

-         download-size="0"

-         install-size="0"

-         version="1.3.1.v200903091627"

-         unpack="false"/>

-

-   <plugin

-         id="org.w3c.dom.smil"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="javax.xml"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.xml.serializer"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-   <plugin

-         id="org.apache.batik.pdf"

-         download-size="0"

-         install-size="0"

-         version="1.6.0.v201105071520"

-         unpack="false"/>

-

-   <plugin

-         id="org.w3c.dom.events"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"

-         unpack="false"/>

-

-</feature>

diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/license.html b/org.eclipse.gmf.runtime.thirdparty-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/pom.xml b/org.eclipse.gmf.runtime.thirdparty-feature/pom.xml
deleted file mode 100644
index 394b337..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.runtime.thirdparty</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/notice.html b/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/notice.html
deleted file mode 100644
index c184ca3..0000000
--- a/org.eclipse.gmf.runtime.thirdparty-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/.project b/org.eclipse.gmf.runtime.thirdparty.source-feature/.project
deleted file mode 100644
index b36ba87..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.runtime.thirdparty.source-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.thirdparty.source-feature/about_files/LICENSE-2.0.txt b/org.eclipse.gmf.runtime.thirdparty.source-feature/about_files/LICENSE-2.0.txt
deleted file mode 100644
index d645695..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/about_files/LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/about_files/NOTICE b/org.eclipse.gmf.runtime.thirdparty.source-feature/about_files/NOTICE
deleted file mode 100644
index 6feaada..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/about_files/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This software contains code from the World Wide Web Consortium (W3C) for the 
-Document Object Model API (DOM API) and SVG Document Type Definition (DTD).
-
-This software contains code from the International Organisation for Standardization
-for the definition of character entities used in the software's documentation.
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/build.properties b/org.eclipse.gmf.runtime.thirdparty.source-feature/build.properties
deleted file mode 100644
index 22737c4..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               about_files/,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/eclipse_update_120.jpg b/org.eclipse.gmf.runtime.thirdparty.source-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/epl-v10.html b/org.eclipse.gmf.runtime.thirdparty.source-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.properties b/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.properties
deleted file mode 100644
index dcac915..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Third-Party Components for GMF Runtime Developer Resources 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Source code zips for Third-Party Components for GMF Runtime
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.xml b/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.xml
deleted file mode 100644
index 93cdd03..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/feature.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.runtime.thirdparty.source"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://www.eclipse.org/gmf">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2006 Borland Software Corporation
-
- All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <plugin
-         id="org.apache.batik.dom.svg.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.bridge.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.dom.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.ext.awt.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.transcoder.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.svggen.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.util.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.svg.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.css.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.util.gui.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.parser.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.batik.xml.source"
-         download-size="0"
-         install-size="0"
-         version="1.6.0.v201011041432"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.css.sac.source"
-         download-size="0"
-         install-size="0"
-         version="1.3.1.v200903091627"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.smil.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.w3c.dom.events.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/license.html b/org.eclipse.gmf.runtime.thirdparty.source-feature/license.html
deleted file mode 100644
index f19c483..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.runtime.thirdparty.source-feature/pom.xml b/org.eclipse.gmf.runtime.thirdparty.source-feature/pom.xml
deleted file mode 100644
index 9d19b36..0000000
--- a/org.eclipse.gmf.runtime.thirdparty.source-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.runtime.thirdparty.source</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime-feature/.project b/org.eclipse.gmf.tests.runtime-feature/.project
deleted file mode 100755
index 87bf882..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime-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.tests.runtime-feature/build.properties b/org.eclipse.gmf.tests.runtime-feature/build.properties
deleted file mode 100755
index d734e57..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-generate.feature@org.eclipse.gmf.tests.runtime.source=org.eclipse.gmf.tests.runtime
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-root=file:rootfiles/epl-v10.html,file:rootfiles/notice.html
diff --git a/org.eclipse.gmf.tests.runtime-feature/eclipse_update_120.jpg b/org.eclipse.gmf.tests.runtime-feature/eclipse_update_120.jpg
deleted file mode 100755
index 68e3e02..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime-feature/epl-v10.html b/org.eclipse.gmf.tests.runtime-feature/epl-v10.html
deleted file mode 100755
index 90f2d5e..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List

-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Revision>2</o:Revision>

-  <o:TotalTime>3</o:TotalTime>

-  <o:Created>2004-03-05T23:03:00Z</o:Created>

-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>

-  <o:Pages>4</o:Pages>

-  <o:Words>1626</o:Words>

-  <o:Characters>9270</o:Characters>

-   <o:Lines>77</o:Lines>

-  <o:Paragraphs>18</o:Paragraphs>

-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]--><!--[if gte mso 9]><xml>

- <w:WordDocument>

-  <w:TrackRevisions/>

- </w:WordDocument>

-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear=left>

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-changes to the Program, and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-additions to the Program;</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span

-style='color:red'> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-its license agreement:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>

-

-<p><span style='font-size:10.0pt'>When the Program is made available in source

-code form:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it must be made available under this Agreement; and </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style='font-size:10.0pt'>Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor (&quot;Commercial

-Contributor&quot;) hereby agrees to defend and indemnify every other

-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and

-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style='font-size:10.0pt'>For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>

-

-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-

-</div>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime-feature/feature.properties b/org.eclipse.gmf.tests.runtime-feature/feature.properties
deleted file mode 100755
index a9f6fa7..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Runtime Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework unit tests.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.tests.runtime-feature/feature.xml b/org.eclipse.gmf.tests.runtime-feature/feature.xml
deleted file mode 100755
index 979e982..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/feature.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.gmf.tests.runtime"
-      label="%featureName"
-      version="1.5.0.qualifier"
-      provider-name="%providerName">
-
-   <description url="http://www.example.com/description">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2002-2010 IBM Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/modeling/gmf/updates/releases/"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.gmf" version="1.4.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.macosx"
-         os="macosx"
-         ws="cocoa"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86_64"
-         os="linux"
-         ws="gtk"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-</feature>
diff --git a/org.eclipse.gmf.tests.runtime-feature/license.html b/org.eclipse.gmf.tests.runtime-feature/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.tests.runtime-feature/pom.xml b/org.eclipse.gmf.tests.runtime-feature/pom.xml
deleted file mode 100644
index a8197cc..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-  
-  <parent>
-  	<groupId>org.eclipse.gmf-runtime</groupId>
-	<artifactId>features</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
-	<relativePath>../</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime-feature/rootfiles/epl-v10.html b/org.eclipse.gmf.tests.runtime-feature/rootfiles/epl-v10.html
deleted file mode 100755
index 90f2d5e..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List

-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Revision>2</o:Revision>

-  <o:TotalTime>3</o:TotalTime>

-  <o:Created>2004-03-05T23:03:00Z</o:Created>

-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>

-  <o:Pages>4</o:Pages>

-  <o:Words>1626</o:Words>

-  <o:Characters>9270</o:Characters>

-   <o:Lines>77</o:Lines>

-  <o:Paragraphs>18</o:Paragraphs>

-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]--><!--[if gte mso 9]><xml>

- <w:WordDocument>

-  <w:TrackRevisions/>

- </w:WordDocument>

-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear=left>

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-changes to the Program, and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-additions to the Program;</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span

-style='color:red'> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-its license agreement:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>

-

-<p><span style='font-size:10.0pt'>When the Program is made available in source

-code form:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it must be made available under this Agreement; and </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style='font-size:10.0pt'>Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor (&quot;Commercial

-Contributor&quot;) hereby agrees to defend and indemnify every other

-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and

-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style='font-size:10.0pt'>For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>

-

-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-

-</div>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime-feature/rootfiles/notice.html b/org.eclipse.gmf.tests.runtime-feature/rootfiles/notice.html
deleted file mode 100755
index c184ca3..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateBundle/about.html b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateBundle/about.html
deleted file mode 100755
index 968a06f..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateBundle/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, 2007</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-feature/sourceTemplateBundle/plugin.properties b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateBundle/plugin.properties
deleted file mode 100755
index 887c6d9..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Tests Sources Bundle
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/JUNIT.XSL b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/JUNIT.XSL
deleted file mode 100755
index 20c5dc8..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/JUNIT.XSL
+++ /dev/null
@@ -1,459 +0,0 @@
-<xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

-<xsl:output method="html" indent="yes"/>

-<xsl:decimal-format decimal-separator="." grouping-separator="," />

-

-<xsl:template match="testsuites">

-	<HTML>

-		<META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

-		<HEAD>

-    <style type="text/css">

-      body {

-      	font:normal 11px verdana,arial,helvetica;

-      	color:#000000;

-      }

-      table tr td, table tr th {

-          font-size: 11px;

-      }

-      table.details tr th{

-      	font-weight: bold;

-      	text-align:left;

-      	background:#a6caf0;

-      }

-      table.details tr td{

-      	background:#eeeee0;

-      }

-      

-      p {

-      	line-height:1.5em;

-      	margin-top:0.5em; margin-bottom:1.0em;

-      }

-      h1 {

-      	margin: 0px 0px 5px; font: 165% verdana,arial,helvetica

-      }

-      h2 {

-      	margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica

-      }

-      h3 {

-      	margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica

-      }

-      h4 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      h5 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      h6 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      .Error {

-      	font-weight:bold; color:red;

-      }

-      .Failure {

-      	font-weight:bold; color:purple;

-      }

-      .Properties {

-      	text-align:right;

-      }

-      </style>

-      <script language="JavaScript">

-        var TestCases = new Array();

-        var cur;

-        <xsl:for-each select="./testsuite">      

-            <xsl:apply-templates select="properties"/>

-        </xsl:for-each>

-

-       </script>

-       <script language="JavaScript"><![CDATA[

-        function displayProperties (name) {

-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');

-          var doc = win.document.open();

-          doc.write("<html><head><title>Properties of " + name + "</title>");

-          doc.write("<style>")

-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");

-          doc.write("table tr td, table tr th { font-size: 68%; }");

-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");

-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");

-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");

-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");

-          doc.write("</style>");

-          doc.write("</head><body>");

-          doc.write("<h3>Properties of " + name + "</h3>");

-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");

-          doc.write("<table class='properties'>");

-          doc.write("<tr><th>Name</th><th>Value</th></tr>");

-          for (prop in TestCases[name]) {

-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");

-          }

-          doc.write("</table>");

-          doc.write("</body></html>");

-          doc.close();

-          win.focus();

-        }

-      ]]>  

-      </script>

-		</HEAD>

-		<body>

-			<a name="top"></a>

-			<xsl:call-template name="pageHeader"/>	

-			

-			<!-- Summary part -->

-			<xsl:call-template name="summary"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- Package List part -->

-			<xsl:call-template name="packagelist"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- For each package create its part -->

-			<xsl:call-template name="packages"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- For each class create the  part -->

-			<xsl:call-template name="classes"/>

-			

-		</body>

-	</HTML>

-</xsl:template>

-	

-	

-	

-	<!-- ================================================================== -->

-	<!-- Write a list of all packages with an hyperlink to the anchor of    -->

-	<!-- of the package name.                                               -->

-	<!-- ================================================================== -->

-	<xsl:template name="packagelist">	

-		<h2>Packages</h2>

-		Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.

-		<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-			<xsl:call-template name="testsuite.test.header"/>

-			<!-- list all packages recursively -->

-			<xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">

-				<xsl:sort select="@package"/>

-				<xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>

-				<xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>

-				<xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>

-				<xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>

-				<xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>

-				

-				<!-- write a summary for the package -->

-				<tr valign="top">

-					<!-- set a nice color depending if there is an error/failure -->

-					<xsl:attribute name="class">

-						<xsl:choose>

-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>

-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>

-						</xsl:choose>

-					</xsl:attribute>

-					<td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>

-					<td><xsl:value-of select="$testCount"/></td>

-					<td><xsl:value-of select="$errorCount"/></td>

-					<td><xsl:value-of select="$failureCount"/></td>

-					<td>

-					<xsl:call-template name="display-time">

-						<xsl:with-param name="value" select="$timeCount"/>

-					</xsl:call-template>

-					</td>

-				</tr>

-			</xsl:for-each>

-		</table>		

-	</xsl:template>

-	

-	

-	<!-- ================================================================== -->

-	<!-- Write a package level report                                       -->

-	<!-- It creates a table with values from the document:                  -->

-	<!-- Name | Tests | Errors | Failures | Time                            -->

-	<!-- ================================================================== -->

-	<xsl:template name="packages">

-		<!-- create an anchor to this package name -->

-		<xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">

-			<xsl:sort select="@package"/>

-				<a name="{@package}"></a>

-				<h3>Package <xsl:value-of select="@package"/></h3>

-				

-				<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-					<xsl:call-template name="testsuite.test.header"/>

-			

-					<!-- match the testsuites of this package -->

-					<xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>

-				</table>

-				<a href="#top">Back to top</a>

-				<p/>

-				<p/>

-		</xsl:for-each>

-	</xsl:template>

-	

-	<xsl:template name="classes">

-		<xsl:for-each select="testsuite">

-			<xsl:sort select="@classname" data-type="text" order="ascending" />

-			<xsl:sort select="@name" data-type="text" order="ascending" />

-			<!-- create an anchor to this class name -->

-			<a name="{@name}"></a>

-			<h3>TestCase <xsl:value-of select="@name"/></h3>

-			

-			<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-			  <xsl:call-template name="testcase.test.header"/>

-			  <!--

-			  test can even not be started at all (failure to load the class)

-			  so report the error directly

-			  -->

-				<xsl:if test="./error">

-					<tr class="Error">

-						<td colspan="4"><xsl:apply-templates select="./error"/></td>

-					</tr>

-				</xsl:if>

-				<xsl:apply-templates select="./testcase" mode="print.test"/>

-			</table>

-            <div class="Properties">

-                <a>

-			        <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>

-			        Properties &gt;&gt;

-			    </a>

-            </div>

-			<p/>

-			

-			<a href="#top">Back to top</a>

-		</xsl:for-each>

-	</xsl:template>

-	

-	<xsl:template name="summary">

-		<h2>Summary</h2>

-		<xsl:variable name="testCount" select="sum(testsuite/@tests)"/>

-		<xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>

-		<xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>

-		<xsl:variable name="timeCount" select="sum(testsuite/@time)"/>

-		<xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>

-		<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-		<tr valign="top">

-			<th>Tests</th>

-			<th>Failures</th>

-			<th>Errors</th>

-			<th>Success rate</th>

-			<th>Time</th>

-		</tr>

-		<tr valign="top">

-			<xsl:attribute name="class">

-				<xsl:choose>

-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>

-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>

-				</xsl:choose>

-			</xsl:attribute>

-			<td><xsl:value-of select="$testCount"/></td>

-			<td><xsl:value-of select="$failureCount"/></td>

-			<td><xsl:value-of select="$errorCount"/></td>

-			<td>

-				<xsl:call-template name="display-percent">

-					<xsl:with-param name="value" select="$successRate"/>

-				</xsl:call-template>

-			</td>

-			<td>

-				<xsl:call-template name="display-time">

-					<xsl:with-param name="value" select="$timeCount"/>

-				</xsl:call-template>

-			</td>

-

-		</tr>

-		</table>

-		<table border="0" width="95%">

-		<tr>

-		<td	style="text-align: justify;">

-		Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.

-		</td>

-		</tr>

-		</table>

-	</xsl:template>

-	

-  <!--

-   Write properties into a JavaScript data structure.

-   This is based on the original idea by Erik Hatcher (erik@hatcher.net)

-   -->

-  <xsl:template match="properties">

-    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();

-  	<xsl:for-each select="property">

-    <xsl:sort select="@name"/>

-        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';

-  	</xsl:for-each>

-  </xsl:template>

-	

-<!-- Page HEADER -->

-<xsl:template name="pageHeader">

-	<h1>Unit Test Results</h1>

-	<table width="100%">

-	<tr>

-		<td align="left"></td>

-		<td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org'>Ant</a>.</td>

-	</tr>

-	</table>

-	<hr size="1"/>

-</xsl:template>

-

-<xsl:template match="testsuite" mode="header">

-	<tr valign="top">

-		<th width="80%">Name</th>

-		<th>Tests</th>

-		<th>Errors</th>

-		<th>Failures</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-<!-- class header -->

-<xsl:template name="testsuite.test.header">

-	<tr valign="top">

-		<th width="80%">Name</th>

-		<th>Tests</th>

-		<th>Errors</th>

-		<th>Failures</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-<!-- method header -->

-<xsl:template name="testcase.test.header">

-	<tr valign="top">

-		<th>Class Name</th>

-		<th>Test Name</th>

-		<th>Status</th>

-		<th width="80%">Type</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-

-<!-- class information -->

-<xsl:template match="testsuite" mode="print.test">

-	<tr valign="top">

-		<!-- set a nice color depending if there is an error/failure -->

-		<xsl:attribute name="class">

-			<xsl:choose>

-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>

-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>

-			</xsl:choose>

-		</xsl:attribute>

-	

-		<!-- print testsuite information -->

-		<td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>

-		<td><xsl:value-of select="@tests"/></td>

-		<td><xsl:value-of select="@errors"/></td>

-		<td><xsl:value-of select="@failures"/></td>

-		<td>

-			<xsl:call-template name="display-time">

-				<xsl:with-param name="value" select="@time"/>

-			</xsl:call-template>

-		</td>

-	</tr>

-</xsl:template>

-

-<xsl:template match="testcase" mode="print.test">

-	<tr valign="top">

-		<xsl:attribute name="class">

-			<xsl:choose>

-				<xsl:when test="failure | error">Error</xsl:when>

-			</xsl:choose>

-		</xsl:attribute>

-		<td><xsl:value-of select="@classname"/></td>

-		<td><xsl:value-of select="@name"/></td>

-		<xsl:choose>

-			<xsl:when test="failure">

-				<td>Failure</td>

-				<td><xsl:apply-templates select="failure"/></td>

-			</xsl:when>

-			<xsl:when test="error">

-				<td>Error</td>

-				<td><xsl:apply-templates select="error"/></td>

-			</xsl:when>

-			<xsl:otherwise>

-				<td>Success</td>

-				<td></td>

-			</xsl:otherwise>

-		</xsl:choose>

-		<td>

-			<xsl:call-template name="display-time">

-				<xsl:with-param name="value" select="@time"/>

-			</xsl:call-template>

-		</td>

-	</tr>

-</xsl:template>

-

-

-<xsl:template match="failure">

-	<xsl:call-template name="display-failures"/>

-</xsl:template>

-

-<xsl:template match="error">

-	<xsl:call-template name="display-failures"/>

-</xsl:template>

-

-<!-- Style for the error and failure in the tescase template -->

-<xsl:template name="display-failures">

-	<xsl:choose>

-		<xsl:when test="not(@message)">N/A</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="@message"/>

-		</xsl:otherwise>

-	</xsl:choose>

-	<!-- display the stacktrace -->

-	<code>

-		<p/>

-		<xsl:call-template name="br-replace">

-			<xsl:with-param name="word" select="."/>

-		</xsl:call-template>

-	</code>

-	<!-- the later is better but might be problematic for non-21" monitors... -->

-	<!--pre><xsl:value-of select="."/></pre-->

-</xsl:template>

-

-<xsl:template name="JS-escape">

-	<xsl:param name="string"/>

-	<xsl:choose><!-- something isn't right here, basically all single quotes need to be replaced with backslash-single-quote

-		<xsl:when test="contains($string,'&apos;')">

-			<xsl:value-of select="substring-before($string,'&apos;')"/>

-			\&apos;

-			<xsl:call-template name="JS-escape">

-				<xsl:with-param name="string" select="substring-after($string,'&apos;')"/>

-			</xsl:call-template>

-		</xsl:when> -->

-		<xsl:when test="contains($string,'\')">

-			<xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">

-				<xsl:with-param name="string" select="substring-after($string,'\')"/>

-			</xsl:call-template>

-		</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="$string"/>

-		</xsl:otherwise>

-	</xsl:choose>

-</xsl:template>

-

-

-<!--

-	template that will convert a carriage return into a br tag

-	@param word the text from which to convert CR to BR tag

--->

-<xsl:template name="br-replace">

-	<xsl:param name="word"/>

-	<xsl:choose>

-		<xsl:when test="contains($word,'&#xA;')">

-			<xsl:value-of select="substring-before($word,'&#xA;')"/>

-			<br/>

-			<xsl:call-template name="br-replace">

-				<xsl:with-param name="word" select="substring-after($word,'&#xA;')"/>

-			</xsl:call-template>

-		</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="$word"/>

-		</xsl:otherwise>

-	</xsl:choose>

-</xsl:template>

-

-<xsl:template name="display-time">

-	<xsl:param name="value"/>

-	<xsl:value-of select="format-number($value,'0.000')"/>

-</xsl:template>

-

-<xsl:template name="display-percent">

-	<xsl:param name="value"/>

-	<xsl:value-of select="format-number($value,'0.00%')"/>

-</xsl:template>

-

-</xsl:stylesheet>

-

diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/build.properties b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/build.properties
deleted file mode 100755
index 4f8e026..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 =\
-epl-v10.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html,\
-test.xml,\
-JUNIT.XSL
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100755
index 68e3e02..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/epl-v10.html b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100755
index 90f2d5e..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List

-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Revision>2</o:Revision>

-  <o:TotalTime>3</o:TotalTime>

-  <o:Created>2004-03-05T23:03:00Z</o:Created>

-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>

-  <o:Pages>4</o:Pages>

-  <o:Words>1626</o:Words>

-  <o:Characters>9270</o:Characters>

-   <o:Lines>77</o:Lines>

-  <o:Paragraphs>18</o:Paragraphs>

-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]--><!--[if gte mso 9]><xml>

- <w:WordDocument>

-  <w:TrackRevisions/>

- </w:WordDocument>

-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear=left>

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-changes to the Program, and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-additions to the Program;</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span

-style='color:red'> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-its license agreement:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>

-

-<p><span style='font-size:10.0pt'>When the Program is made available in source

-code form:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it must be made available under this Agreement; and </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style='font-size:10.0pt'>Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor (&quot;Commercial

-Contributor&quot;) hereby agrees to defend and indemnify every other

-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and

-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style='font-size:10.0pt'>For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>

-

-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-

-</div>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/feature.properties b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/feature.properties
deleted file mode 100755
index 5eb370e..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Tests Runtime Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Graphical Modeling Framework SDK component.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/license.html b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/license.html
deleted file mode 100755
index f19c483..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!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>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/test.xml b/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/test.xml
deleted file mode 100755
index 840c1a6..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplateFeature/test.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<project name="Automated Testing for GMF" default="all" basedir=".">
-	<!-- Adjust these properties as appropriate before executing tests. During the automated build,
-	     these are set based on the build configuration settings. -->
-	<property name="baseLocation" value="${basedir}/../.."/>
-
-	<!-- Load the pluginVersions.property file generated by the build -->
-	<property file="${buildRoot}/tests/finalPluginsVersions.properties"/>
-	
-	<property name="eclipse-home" value="${baseLocation}" />
-
-	<target name="cleanup.config">
-		<echo message="Cleaning up eclipse config..."/>
-		<delete includeemptydirs="true">
-			<fileset dir="${baseLocation}/configuration">
-				<include name="**/*"/>
-				<exclude name="config.ini"/>
-				<exclude name="*.log"/>
-			</fileset>	
-		</delete>
-	</target>
-	
-	<target name="runtests" description="Executes the junit tests for a specified plug-in.">
-		<!-- Pull the test.xml out of the test bundle -->
-		<unzip src="${baseLocation}/plugins/${testPlugin}_${version}.jar" dest="${baseLocation}/plugins/${testPlugin}_${version}">
-		    <patternset>
-		        <include name="test.xml"/>
-		    </patternset>
-		</unzip>
-		<!-- Invoke the tests -->
-		<ant antfile="${baseLocation}/plugins/${testPlugin}_${version}/test.xml" dir="${eclipse-home}" />
-		<!--- Remove extracted test.xml -->
-		<delete dir="${baseLocation}/plugins/${testPlugin}_${version}"/>
-		<move file="${baseLocation}/${testPlugin}.xml" tofile="${basedir}/testresults/xml/${testPlugin}.xml" />
-	</target>
-
-	<!-- For each, the version value is what's found in generated finalPluginVersions.properties file. Typically, 
-	     it is the build id (e.g. I20060131-0200) -->
-	<target name="all" depends="cleanup.config" description="Runs the test.xml of the test plugins">
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.clipboard.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.clipboard.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.commands.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.commands.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.type.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.type.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.type.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.type.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.gef.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.gef.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui.services" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui.services}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui.services.action" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui.services.action}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.diagram.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.diagram.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.draw2d.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.draw2d.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.draw2d.ui.render" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.draw2d.ui.render}" />
-		</antcall>
-		<antcall target="genHtml"/>
-	</target>
-
-	<target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided">
-		<style style="${basedir}/JUNIT.XSL" basedir="${basedir}/testresults/xml" destdir="${basedir}/testresults/html/" />
-	</target>
-</project>
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/JUNIT.XSL b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/JUNIT.XSL
deleted file mode 100755
index 20c5dc8..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/JUNIT.XSL
+++ /dev/null
@@ -1,459 +0,0 @@
-<xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

-<xsl:output method="html" indent="yes"/>

-<xsl:decimal-format decimal-separator="." grouping-separator="," />

-

-<xsl:template match="testsuites">

-	<HTML>

-		<META http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

-		<HEAD>

-    <style type="text/css">

-      body {

-      	font:normal 11px verdana,arial,helvetica;

-      	color:#000000;

-      }

-      table tr td, table tr th {

-          font-size: 11px;

-      }

-      table.details tr th{

-      	font-weight: bold;

-      	text-align:left;

-      	background:#a6caf0;

-      }

-      table.details tr td{

-      	background:#eeeee0;

-      }

-      

-      p {

-      	line-height:1.5em;

-      	margin-top:0.5em; margin-bottom:1.0em;

-      }

-      h1 {

-      	margin: 0px 0px 5px; font: 165% verdana,arial,helvetica

-      }

-      h2 {

-      	margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica

-      }

-      h3 {

-      	margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica

-      }

-      h4 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      h5 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      h6 {

-      	margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica

-      }

-      .Error {

-      	font-weight:bold; color:red;

-      }

-      .Failure {

-      	font-weight:bold; color:purple;

-      }

-      .Properties {

-      	text-align:right;

-      }

-      </style>

-      <script language="JavaScript">

-        var TestCases = new Array();

-        var cur;

-        <xsl:for-each select="./testsuite">      

-            <xsl:apply-templates select="properties"/>

-        </xsl:for-each>

-

-       </script>

-       <script language="JavaScript"><![CDATA[

-        function displayProperties (name) {

-          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');

-          var doc = win.document.open();

-          doc.write("<html><head><title>Properties of " + name + "</title>");

-          doc.write("<style>")

-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");

-          doc.write("table tr td, table tr th { font-size: 68%; }");

-          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");

-          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");

-          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");

-          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");

-          doc.write("</style>");

-          doc.write("</head><body>");

-          doc.write("<h3>Properties of " + name + "</h3>");

-          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");

-          doc.write("<table class='properties'>");

-          doc.write("<tr><th>Name</th><th>Value</th></tr>");

-          for (prop in TestCases[name]) {

-            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");

-          }

-          doc.write("</table>");

-          doc.write("</body></html>");

-          doc.close();

-          win.focus();

-        }

-      ]]>  

-      </script>

-		</HEAD>

-		<body>

-			<a name="top"></a>

-			<xsl:call-template name="pageHeader"/>	

-			

-			<!-- Summary part -->

-			<xsl:call-template name="summary"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- Package List part -->

-			<xsl:call-template name="packagelist"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- For each package create its part -->

-			<xsl:call-template name="packages"/>

-			<hr size="1" width="95%" align="left"/>

-			

-			<!-- For each class create the  part -->

-			<xsl:call-template name="classes"/>

-			

-		</body>

-	</HTML>

-</xsl:template>

-	

-	

-	

-	<!-- ================================================================== -->

-	<!-- Write a list of all packages with an hyperlink to the anchor of    -->

-	<!-- of the package name.                                               -->

-	<!-- ================================================================== -->

-	<xsl:template name="packagelist">	

-		<h2>Packages</h2>

-		Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.

-		<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-			<xsl:call-template name="testsuite.test.header"/>

-			<!-- list all packages recursively -->

-			<xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">

-				<xsl:sort select="@package"/>

-				<xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>

-				<xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>

-				<xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>

-				<xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>

-				<xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>

-				

-				<!-- write a summary for the package -->

-				<tr valign="top">

-					<!-- set a nice color depending if there is an error/failure -->

-					<xsl:attribute name="class">

-						<xsl:choose>

-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>

-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>

-						</xsl:choose>

-					</xsl:attribute>

-					<td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>

-					<td><xsl:value-of select="$testCount"/></td>

-					<td><xsl:value-of select="$errorCount"/></td>

-					<td><xsl:value-of select="$failureCount"/></td>

-					<td>

-					<xsl:call-template name="display-time">

-						<xsl:with-param name="value" select="$timeCount"/>

-					</xsl:call-template>

-					</td>

-				</tr>

-			</xsl:for-each>

-		</table>		

-	</xsl:template>

-	

-	

-	<!-- ================================================================== -->

-	<!-- Write a package level report                                       -->

-	<!-- It creates a table with values from the document:                  -->

-	<!-- Name | Tests | Errors | Failures | Time                            -->

-	<!-- ================================================================== -->

-	<xsl:template name="packages">

-		<!-- create an anchor to this package name -->

-		<xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">

-			<xsl:sort select="@package"/>

-				<a name="{@package}"></a>

-				<h3>Package <xsl:value-of select="@package"/></h3>

-				

-				<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-					<xsl:call-template name="testsuite.test.header"/>

-			

-					<!-- match the testsuites of this package -->

-					<xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>

-				</table>

-				<a href="#top">Back to top</a>

-				<p/>

-				<p/>

-		</xsl:for-each>

-	</xsl:template>

-	

-	<xsl:template name="classes">

-		<xsl:for-each select="testsuite">

-			<xsl:sort select="@classname" data-type="text" order="ascending" />

-			<xsl:sort select="@name" data-type="text" order="ascending" />

-			<!-- create an anchor to this class name -->

-			<a name="{@name}"></a>

-			<h3>TestCase <xsl:value-of select="@name"/></h3>

-			

-			<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-			  <xsl:call-template name="testcase.test.header"/>

-			  <!--

-			  test can even not be started at all (failure to load the class)

-			  so report the error directly

-			  -->

-				<xsl:if test="./error">

-					<tr class="Error">

-						<td colspan="4"><xsl:apply-templates select="./error"/></td>

-					</tr>

-				</xsl:if>

-				<xsl:apply-templates select="./testcase" mode="print.test"/>

-			</table>

-            <div class="Properties">

-                <a>

-			        <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>

-			        Properties &gt;&gt;

-			    </a>

-            </div>

-			<p/>

-			

-			<a href="#top">Back to top</a>

-		</xsl:for-each>

-	</xsl:template>

-	

-	<xsl:template name="summary">

-		<h2>Summary</h2>

-		<xsl:variable name="testCount" select="sum(testsuite/@tests)"/>

-		<xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>

-		<xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>

-		<xsl:variable name="timeCount" select="sum(testsuite/@time)"/>

-		<xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>

-		<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">

-		<tr valign="top">

-			<th>Tests</th>

-			<th>Failures</th>

-			<th>Errors</th>

-			<th>Success rate</th>

-			<th>Time</th>

-		</tr>

-		<tr valign="top">

-			<xsl:attribute name="class">

-				<xsl:choose>

-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>

-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>

-				</xsl:choose>

-			</xsl:attribute>

-			<td><xsl:value-of select="$testCount"/></td>

-			<td><xsl:value-of select="$failureCount"/></td>

-			<td><xsl:value-of select="$errorCount"/></td>

-			<td>

-				<xsl:call-template name="display-percent">

-					<xsl:with-param name="value" select="$successRate"/>

-				</xsl:call-template>

-			</td>

-			<td>

-				<xsl:call-template name="display-time">

-					<xsl:with-param name="value" select="$timeCount"/>

-				</xsl:call-template>

-			</td>

-

-		</tr>

-		</table>

-		<table border="0" width="95%">

-		<tr>

-		<td	style="text-align: justify;">

-		Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.

-		</td>

-		</tr>

-		</table>

-	</xsl:template>

-	

-  <!--

-   Write properties into a JavaScript data structure.

-   This is based on the original idea by Erik Hatcher (erik@hatcher.net)

-   -->

-  <xsl:template match="properties">

-    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();

-  	<xsl:for-each select="property">

-    <xsl:sort select="@name"/>

-        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';

-  	</xsl:for-each>

-  </xsl:template>

-	

-<!-- Page HEADER -->

-<xsl:template name="pageHeader">

-	<h1>Unit Test Results</h1>

-	<table width="100%">

-	<tr>

-		<td align="left"></td>

-		<td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org'>Ant</a>.</td>

-	</tr>

-	</table>

-	<hr size="1"/>

-</xsl:template>

-

-<xsl:template match="testsuite" mode="header">

-	<tr valign="top">

-		<th width="80%">Name</th>

-		<th>Tests</th>

-		<th>Errors</th>

-		<th>Failures</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-<!-- class header -->

-<xsl:template name="testsuite.test.header">

-	<tr valign="top">

-		<th width="80%">Name</th>

-		<th>Tests</th>

-		<th>Errors</th>

-		<th>Failures</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-<!-- method header -->

-<xsl:template name="testcase.test.header">

-	<tr valign="top">

-		<th>Class Name</th>

-		<th>Test Name</th>

-		<th>Status</th>

-		<th width="80%">Type</th>

-		<th nowrap="nowrap">Time(s)</th>

-	</tr>

-</xsl:template>

-

-

-<!-- class information -->

-<xsl:template match="testsuite" mode="print.test">

-	<tr valign="top">

-		<!-- set a nice color depending if there is an error/failure -->

-		<xsl:attribute name="class">

-			<xsl:choose>

-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>

-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>

-			</xsl:choose>

-		</xsl:attribute>

-	

-		<!-- print testsuite information -->

-		<td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>

-		<td><xsl:value-of select="@tests"/></td>

-		<td><xsl:value-of select="@errors"/></td>

-		<td><xsl:value-of select="@failures"/></td>

-		<td>

-			<xsl:call-template name="display-time">

-				<xsl:with-param name="value" select="@time"/>

-			</xsl:call-template>

-		</td>

-	</tr>

-</xsl:template>

-

-<xsl:template match="testcase" mode="print.test">

-	<tr valign="top">

-		<xsl:attribute name="class">

-			<xsl:choose>

-				<xsl:when test="failure | error">Error</xsl:when>

-			</xsl:choose>

-		</xsl:attribute>

-		<td><xsl:value-of select="@classname"/></td>

-		<td><xsl:value-of select="@name"/></td>

-		<xsl:choose>

-			<xsl:when test="failure">

-				<td>Failure</td>

-				<td><xsl:apply-templates select="failure"/></td>

-			</xsl:when>

-			<xsl:when test="error">

-				<td>Error</td>

-				<td><xsl:apply-templates select="error"/></td>

-			</xsl:when>

-			<xsl:otherwise>

-				<td>Success</td>

-				<td></td>

-			</xsl:otherwise>

-		</xsl:choose>

-		<td>

-			<xsl:call-template name="display-time">

-				<xsl:with-param name="value" select="@time"/>

-			</xsl:call-template>

-		</td>

-	</tr>

-</xsl:template>

-

-

-<xsl:template match="failure">

-	<xsl:call-template name="display-failures"/>

-</xsl:template>

-

-<xsl:template match="error">

-	<xsl:call-template name="display-failures"/>

-</xsl:template>

-

-<!-- Style for the error and failure in the tescase template -->

-<xsl:template name="display-failures">

-	<xsl:choose>

-		<xsl:when test="not(@message)">N/A</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="@message"/>

-		</xsl:otherwise>

-	</xsl:choose>

-	<!-- display the stacktrace -->

-	<code>

-		<p/>

-		<xsl:call-template name="br-replace">

-			<xsl:with-param name="word" select="."/>

-		</xsl:call-template>

-	</code>

-	<!-- the later is better but might be problematic for non-21" monitors... -->

-	<!--pre><xsl:value-of select="."/></pre-->

-</xsl:template>

-

-<xsl:template name="JS-escape">

-	<xsl:param name="string"/>

-	<xsl:choose><!-- something isn't right here, basically all single quotes need to be replaced with backslash-single-quote

-		<xsl:when test="contains($string,'&apos;')">

-			<xsl:value-of select="substring-before($string,'&apos;')"/>

-			\&apos;

-			<xsl:call-template name="JS-escape">

-				<xsl:with-param name="string" select="substring-after($string,'&apos;')"/>

-			</xsl:call-template>

-		</xsl:when> -->

-		<xsl:when test="contains($string,'\')">

-			<xsl:value-of select="substring-before($string,'\')"/>\\<xsl:call-template name="JS-escape">

-				<xsl:with-param name="string" select="substring-after($string,'\')"/>

-			</xsl:call-template>

-		</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="$string"/>

-		</xsl:otherwise>

-	</xsl:choose>

-</xsl:template>

-

-

-<!--

-	template that will convert a carriage return into a br tag

-	@param word the text from which to convert CR to BR tag

--->

-<xsl:template name="br-replace">

-	<xsl:param name="word"/>

-	<xsl:choose>

-		<xsl:when test="contains($word,'&#xA;')">

-			<xsl:value-of select="substring-before($word,'&#xA;')"/>

-			<br/>

-			<xsl:call-template name="br-replace">

-				<xsl:with-param name="word" select="substring-after($word,'&#xA;')"/>

-			</xsl:call-template>

-		</xsl:when>

-		<xsl:otherwise>

-			<xsl:value-of select="$word"/>

-		</xsl:otherwise>

-	</xsl:choose>

-</xsl:template>

-

-<xsl:template name="display-time">

-	<xsl:param name="value"/>

-	<xsl:value-of select="format-number($value,'0.000')"/>

-</xsl:template>

-

-<xsl:template name="display-percent">

-	<xsl:param name="value"/>

-	<xsl:value-of select="format-number($value,'0.00%')"/>

-</xsl:template>

-

-</xsl:stylesheet>

-

diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/about.html b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/about.html
deleted file mode 100755
index 968a06f..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/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, 2007</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-feature/sourceTemplatePlugin/about.ini b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/about.ini
deleted file mode 100755
index c816474..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/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.tests.runtime-feature/sourceTemplatePlugin/build.properties b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/build.properties
deleted file mode 100755
index 92d7762..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               test.xml,\
-               JUNIT.XSL,\
-               src/**,\
-               META-INF/,\
-               about.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-               plugin.xml,\
-               plugin.properties,\
-               test.xml,\
-               JUNIT.XSL,\
-               src/**,\
-               META-INF/
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/modeling32.png b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100755
index 6b08de2..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/plugin.properties b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100755
index a2b549d..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Runtime Tests Sources
-providerName=Eclipse Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/test.xml b/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/test.xml
deleted file mode 100755
index 840c1a6..0000000
--- a/org.eclipse.gmf.tests.runtime-feature/sourceTemplatePlugin/test.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<project name="Automated Testing for GMF" default="all" basedir=".">
-	<!-- Adjust these properties as appropriate before executing tests. During the automated build,
-	     these are set based on the build configuration settings. -->
-	<property name="baseLocation" value="${basedir}/../.."/>
-
-	<!-- Load the pluginVersions.property file generated by the build -->
-	<property file="${buildRoot}/tests/finalPluginsVersions.properties"/>
-	
-	<property name="eclipse-home" value="${baseLocation}" />
-
-	<target name="cleanup.config">
-		<echo message="Cleaning up eclipse config..."/>
-		<delete includeemptydirs="true">
-			<fileset dir="${baseLocation}/configuration">
-				<include name="**/*"/>
-				<exclude name="config.ini"/>
-				<exclude name="*.log"/>
-			</fileset>	
-		</delete>
-	</target>
-	
-	<target name="runtests" description="Executes the junit tests for a specified plug-in.">
-		<!-- Pull the test.xml out of the test bundle -->
-		<unzip src="${baseLocation}/plugins/${testPlugin}_${version}.jar" dest="${baseLocation}/plugins/${testPlugin}_${version}">
-		    <patternset>
-		        <include name="test.xml"/>
-		    </patternset>
-		</unzip>
-		<!-- Invoke the tests -->
-		<ant antfile="${baseLocation}/plugins/${testPlugin}_${version}/test.xml" dir="${eclipse-home}" />
-		<!--- Remove extracted test.xml -->
-		<delete dir="${baseLocation}/plugins/${testPlugin}_${version}"/>
-		<move file="${baseLocation}/${testPlugin}.xml" tofile="${basedir}/testresults/xml/${testPlugin}.xml" />
-	</target>
-
-	<!-- For each, the version value is what's found in generated finalPluginVersions.properties file. Typically, 
-	     it is the build id (e.g. I20060131-0200) -->
-	<target name="all" depends="cleanup.config" description="Runs the test.xml of the test plugins">
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.clipboard.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.clipboard.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.commands.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.commands.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.type.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.type.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.type.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.type.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.emf.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.emf.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.gef.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.gef.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.core" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.core}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui.services" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui.services}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.common.ui.services.action" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.common.ui.services.action}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.diagram.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.diagram.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.draw2d.ui" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.draw2d.ui}" />
-		</antcall>
-		<antcall target="runtests">
-			<param name="testPlugin" value="org.eclipse.gmf.tests.runtime.draw2d.ui.render" />
-			<param name="version" value="${org.eclipse.gmf.tests.runtime.draw2d.ui.render}" />
-		</antcall>
-		<antcall target="genHtml"/>
-	</target>
-
-	<target name="genHtml" description="Generates HTML results with provided JUNIT.XSL provided">
-		<style style="${basedir}/JUNIT.XSL" basedir="${basedir}/testresults/xml" destdir="${basedir}/testresults/html/" />
-	</target>
-</project>
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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 8af488e..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/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.core

-Bundle-Version: 1.5.0.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.2.0,2.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 39c0133..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/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/,\
-               .,\
-               about.html,\
-               test.xml
-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 03f1b9b..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 Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.common.core/pom.xml b/org.eclipse.gmf.tests.runtime.common.core/pom.xml
deleted file mode 100644
index 1c1d741..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011, BonitaSoft S.A. All rights reserved. This program 
-	and the accompanying materials are made available under the terms of the 
-	Eclipse Public License v1.0 which accompanies this distribution, and is available 
-	at http://www.eclipse.org/legal/epl-v10.html
-	author: Aurelien Pupier, BonitaSoft S.A. -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.common.core</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.common.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.common.core</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.common.core.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <dependencies>
-   	      <!-- Need to add this dependency to have platform-specific fragment -->
-            <dependency>
-              <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.gmf.tests.runtime.feature.group</artifactId><!-- maybe best to use org.eclipse.gmf.runtime.rcp-feature -->
-              <version>0.0.0</version>
-            </dependency>
-    	</dependencies>
-    </configuration>
-   	      
-    </plugin>
-    </plugins>      
-  </build>
-  
-  
-</project>
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 2080b22..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/src/org/eclipse/gmf/tests/runtime/common/core/internal/util/TestingConfigurationElement.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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() {
-    	setAttributeMap(new HashMap());
-        setChildrenMap(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;
-    }
-
-
-	public String getAttribute(String attrName, String locale)
-			throws InvalidRegistryObjectException {
-		return null;
-	}
-
-	
-	public String getValue(String locale) 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 dbe0a70..0000000
--- a/org.eclipse.gmf.tests.runtime.common.core/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 890b347..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/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.action; singleton:=true

-Bundle-Version: 1.5.0.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,5.0.0)",

- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.services.action.Activator

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 5e0b126..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/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 = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html,\
-               test.xml
-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 a535477..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 Modeling Project
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/pom.xml b/org.eclipse.gmf.tests.runtime.common.ui.services.action/pom.xml
deleted file mode 100644
index 59fff9f..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.common.ui.services.action</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.common.ui.services.action</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.common.ui.services.action</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.common.ui.services.action.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 5ab3574..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.action/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 6920475..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/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.common.ui.services.provider; singleton:=true

-Bundle-Version: 1.5.0.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.2.0,2.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 8474639..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 Modeling Project
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/pom.xml b/org.eclipse.gmf.tests.runtime.common.ui.services.provider/pom.xml
deleted file mode 100644
index ed310c7..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services.provider/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.common.ui.services.provider</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.common.ui.services.provider</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.common.ui.services.provider</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.common.ui.services.provider.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 304e861..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 612ea26..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/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.common.ui.services;singleton:=true

-Bundle-Version: 1.5.0.qualifier

-Bundle-Activator: org.eclipse.gmf.tests.runtime.common.ui.services.Activator

-Bundle-Localization: plugin

-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 955455d..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/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,\
-               META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               test.xml
-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 6a41309..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 Modeling Project
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/pom.xml b/org.eclipse.gmf.tests.runtime.common.ui.services/pom.xml
deleted file mode 100644
index 123cbbe..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.common.ui.services</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.common.ui.services</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.common.ui.services</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.common.ui.services.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 25a25ad..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui.services/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 3a5af42..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/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.tests.runtime.common.ui

-Bundle-Version: 1.5.0.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.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui.action;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui.services.action;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.tests.runtime.common.ui.services.provider;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 39c0133..0000000
--- a/org.eclipse.gmf.tests.runtime.common.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,\
-               META-INF/,\
-               .,\
-               about.html,\
-               test.xml
-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 6a41309..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 Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.common.ui/pom.xml b/org.eclipse.gmf.tests.runtime.common.ui/pom.xml
deleted file mode 100644
index 748c090..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.common.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.common.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.common.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.common.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 f0d1219..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, 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.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 e0c46a0..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,143 +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.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.PartInitException;
-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 {
-    	if(part == null){
-            part = (IViewPart) PlatformUI.getWorkbench()
-                .getActiveWorkbenchWindow().getActivePage().getActivePart();
-        	} else {
-        		part.setFocus();
-        	}
-
-        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()  throws PartInitException{
-        
-        // 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);
-        
-        // Close the view
-        PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-            .showView(part.getViewSite().getId());
-    }
-
-    /**
-     * 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 d24603f..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileChangeEventTest.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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 java.util.Map;

-

-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.IPathVariableManager;

-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;

-

-/**

- * Tests for FileChangeEvent.

- * 

- * @author Anthony Hunter 

- */

-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;

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IFile#getEncoding()

-		 * @deprecated

-		 */

-		public int getEncoding() throws CoreException {

-			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;

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#isLocal(int)

-		 * @deprecated

-		 */

-		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*/

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#setLocal(boolean, int, org.eclipse.core.runtime.IProgressMonitor)

-		 * @deprecated

-		 */

-		public void setLocal(boolean flag, int depth, IProgressMonitor monitor)

-			throws CoreException {/*Empty block*/

-		}

-

-		public void setPersistentProperty(QualifiedName key, String value)

-			throws CoreException {/*Empty block*/

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#setReadOnly(boolean)

-		 * @deprecated

-		 */

-		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)

-		 * @deprecated

-		 */

-		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;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden()

-         */

-        public boolean isHidden() {

-			return false;

-		}

-

-        /*

-         * @see org.eclipse.core.resources.IResource#setHidden(boolean)

-         */

-		public void setHidden(boolean isHidden) throws CoreException {

-			/* not implemented */

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isDerived(int)

-		 */

-		public boolean isDerived(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPersistentProperties()

-		 */

-        public Map getPersistentProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#getSessionProperties()

-         */

-        public Map getSessionProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden(int)

-         */

-		public boolean isHidden(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isTeamPrivateMember(int)

-		 */

-		public boolean isTeamPrivateMember(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#hasFilters()

-		 */

-		public boolean hasFilters() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isGroup()

-		 */

-		public boolean isGroup() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setDerived(boolean, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setDerived(boolean isDerived, IProgressMonitor monitor)

-				throws CoreException {

-			//

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setLinkLocation(java.net.URI, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setLinkLocation(URI location, int updateFlags,

-				IProgressMonitor monitor) throws CoreException {

-			// 

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setLinkLocation(org.eclipse.core.runtime.IPath, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setLinkLocation(IPath location, int updateFlags,

-				IProgressMonitor monitor) throws CoreException {

-			//

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isVirtual()

-		 */

-		public boolean isVirtual() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPathVariableManager()

-		 */

-		public IPathVariableManager getPathVariableManager() {

-			return null;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isFiltered()

-		 */

-		public boolean isFiltered() {

-			return false;

-		}

-	}

-	

-	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 aee9751..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/src/org/eclipse/gmf/tests/runtime/common/ui/internal/resources/FileObserverFilterTest.java
+++ /dev/null
@@ -1,1476 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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 java.util.Map;

-

-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.FileInfoMatcherDescription;

-import org.eclipse.core.resources.IFileState;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IPathVariableManager;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IProjectDescription;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceFilterDescription;

-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;

-

-/**

- * Tests for FileObserverFilter.

- * 

- * @author Anthony Hunter

- */

-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;

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#isLocal(int)

-		 * @deprecated

-		 */

-		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 */

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#setLocal(boolean, int, org.eclipse.core.runtime.IProgressMonitor)

-		 * @deprecated

-		 */

-		public void setLocal(boolean flag, int depth, IProgressMonitor monitor)

-			throws CoreException {/* Empty block */

-		}

-

-		public void setPersistentProperty(QualifiedName key, String value)

-			throws CoreException {/* Empty block */

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IResource#setReadOnly(boolean)

-		 * @deprecated

-		 */

-		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)

-		 * @deprecated

-		 */

-		public void setCharset(String newCharset)

-			throws CoreException {

-			/* Empty block */}

-

-		/**

-		 * @see org.eclipse.core.resources.IFile#getEncoding()

-		 * @deprecated

-		 */

-		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;

-        }

-        

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden()

-         */

-        public boolean isHidden() {

-			return false;

-		}

-

-        /*

-         * @see org.eclipse.core.resources.IResource#setHidden(boolean)

-         */

-		public void setHidden(boolean isHidden) throws CoreException {

-			/* not implemented */

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isDerived(int)

-		 */

-		public boolean isDerived(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPersistentProperties()

-		 */

-        public Map getPersistentProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#getSessionProperties()

-         */

-        public Map getSessionProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden(int)

-         */

-		public boolean isHidden(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isTeamPrivateMember(int)

-		 */

-		public boolean isTeamPrivateMember(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#hasFilters()

-		 */

-		public boolean hasFilters() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isGroup()

-		 */

-		public boolean isGroup() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setDerived(boolean, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setDerived(boolean isDerived, IProgressMonitor monitor)

-				throws CoreException {

-			//

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setLinkLocation(java.net.URI, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setLinkLocation(URI location, int updateFlags,

-				IProgressMonitor monitor) throws CoreException {

-			// 

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setLinkLocation(org.eclipse.core.runtime.IPath, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setLinkLocation(IPath location, int updateFlags,

-				IProgressMonitor monitor) throws CoreException {

-			//

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isVirtual()

-		 */

-		public boolean isVirtual() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPathVariableManager()

-		 */

-		public IPathVariableManager getPathVariableManager() {

-			return null;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isFiltered()

-		 */

-		public boolean isFiltered() {

-			return false;

-		}

-	}

-

-	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)

-		 * @deprecated

-		 */

-		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()

-		 * @deprecated

-		 */

-		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)

-		 * @deprecated

-		 */

-		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)

-		 * @deprecated

-		 */

-		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;

-		}

-

-		/**

-		 * @see org.eclipse.core.resources.IContainer#setDefaultCharset(java.lang.String)

-		 * @deprecated

-		 */

-		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;

-        }

-        

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden()

-         */

-        public boolean isHidden() {

-			return false;

-		}

-

-        /*

-         * @see org.eclipse.core.resources.IResource#setHidden(boolean)

-         */

-		public void setHidden(boolean isHidden) throws CoreException {

-			/* not implemented */

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isDerived(int)

-		 */

-		public boolean isDerived(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPersistentProperties()

-		 */

-        public Map getPersistentProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#getSessionProperties()

-         */

-        public Map getSessionProperties()

-            throws CoreException {

-            return null;

-        }

-

-        /*

-         * @see org.eclipse.core.resources.IResource#isHidden(int)

-         */

-		public boolean isHidden(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isTeamPrivateMember(int)

-		 */

-		public boolean isTeamPrivateMember(int arg0) {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IFolder#createGroup(int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void createGroup(int updateFlags, IProgressMonitor monitor)

-				throws CoreException {

-			// 

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IContainer#getFilters()

-		 */

-		public IResourceFilterDescription[] getFilters() throws CoreException {

-			return null;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#hasFilters()

-		 */

-		public boolean hasFilters() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isGroup()

-		 */

-		public boolean isGroup() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#setDerived(boolean, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void setDerived(boolean isDerived, IProgressMonitor monitor)

-				throws CoreException {

-			//

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IContainer#createFilter(int, org.eclipse.core.resources.IFileInfoMatcherDescription, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public IResourceFilterDescription createFilter(int type,

-				FileInfoMatcherDescription matcherDescription,

-				int updateFlags, IProgressMonitor monitor) throws CoreException {

-			return null;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IContainer#removeFilter(org.eclipse.core.resources.IResourceFilterDescription, int, org.eclipse.core.runtime.IProgressMonitor)

-		 */

-		public void removeFilter(IResourceFilterDescription filterDescription,

-				int updateFlags, IProgressMonitor monitor) throws CoreException {

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isVirtual()

-		 */

-		public boolean isVirtual() {

-			return false;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#getPathVariableManager()

-		 */

-		public IPathVariableManager getPathVariableManager() {

-			return null;

-		}

-

-		/*

-		 * @see org.eclipse.core.resources.IResource#isFiltered()

-		 */

-		public boolean isFiltered() {

-			return false;

-		}

-	}

-

-	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 6dd0b69..0000000
--- a/org.eclipse.gmf.tests.runtime.common.ui/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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.diagram.ui/.classpath b/org.eclipse.gmf.tests.runtime.diagram.ui/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/.cvsignore b/org.eclipse.gmf.tests.runtime.diagram.ui/.cvsignore
deleted file mode 100644
index d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/.project b/org.eclipse.gmf.tests.runtime.diagram.ui/.project
deleted file mode 100644
index 65d72a1..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.diagram.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.diagram.ui/.template b/org.eclipse.gmf.tests.runtime.diagram.ui/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/.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.tests.runtime.diagram.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.diagram.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a5799bb..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/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.tests.runtime.diagram.ui; singleton:=true

-Bundle-Version: 1.5.0.qualifier

-Bundle-Activator: org.eclipse.gmf.tests.runtime.diagram.ui.util.TestsPlugin

-Bundle-Vendor: %Plugin.providerName

-Bundle-Localization: plugin

-Export-Package: org.eclipse.gmf.runtime.diagram.ui.render.editparts;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.action;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.commands;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.framework;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.label,

- org.eclipse.gmf.tests.runtime.diagram.ui.logic;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.parts;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.render.util;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.requests;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.services;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.tools;x-internal:=true,

- org.eclipse.gmf.tests.runtime.diagram.ui.util;x-internal:=true

-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.geoshapes;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.tests.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.examples.runtime.diagram.logic;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/about.html b/org.eclipse.gmf.tests.runtime.diagram.ui/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.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, 2007</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.diagram.ui/build.properties b/org.eclipse.gmf.tests.runtime.diagram.ui/build.properties
deleted file mode 100644
index 85b3a4a..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/build.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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               *.jar,\
-               images/,\
-               META-INF/,\
-               .,\
-               about.html,\
-               test.xml
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.doc b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.doc
deleted file mode 100644
index 3938bf8..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.doc
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.txt b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.txt
deleted file mode 100644
index 3bc7232..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is not an image file; it is used for testing 
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.xls b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.xls
deleted file mode 100644
index 372e6fc..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test.xls
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test1.WMF b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test1.WMF
deleted file mode 100644
index cf7a5d9..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test1.WMF
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test11.xsd b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test11.xsd
deleted file mode 100644
index 64fa83f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test11.xsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.omg.org/XMI">
-  <xsd:attribute name="id" type="xsd:ID"/>
-  <xsd:attributeGroup name="IdentityAttribs">
-    <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional"/>
-    <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="LinkAttribs">
-    <xsd:attribute name="href" type="xsd:string" use="optional"/>
-    <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:attributeGroup name="ObjectAttribs">
-    <xsd:attributeGroup ref="xmi:IdentityAttribs"/>
-    <xsd:attributeGroup ref="xmi:LinkAttribs"/>
-    <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional"/>
-    <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional"/>
-  </xsd:attributeGroup>
-  <xsd:complexType name="XMI">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:any processContents="strict"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="xmi:IdentityAttribs"/>
-    <xsd:attributeGroup ref="xmi:LinkAttribs"/>
-    <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional"/>
-    <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="required"/>
-  </xsd:complexType>
-  <xsd:element name="XMI" type="xmi:XMI"/>
-  <xsd:complexType name="PackageReference">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="version" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-    <xsd:attribute name="name" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="PackageReference" type="xmi:PackageReference"/>
-  <xsd:complexType name="Model">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:PackageReference"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="Model" type="xmi:Model"/>
-  <xsd:complexType name="Import">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:PackageReference"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="Import" type="xmi:Import"/>
-  <xsd:complexType name="MetaModel">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:PackageReference"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="MetaModel" type="xmi:MetaModel"/>
-  <xsd:complexType name="Documentation">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="contact" type="xsd:string"/>
-      <xsd:element name="exporter" type="xsd:string"/>
-      <xsd:element name="exporterVersion" type="xsd:string"/>
-      <xsd:element name="longDescription" type="xsd:string"/>
-      <xsd:element name="shortDescription" type="xsd:string"/>
-      <xsd:element name="notice" type="xsd:string"/>
-      <xsd:element name="owner" type="xsd:string"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-    <xsd:attribute name="contact" type="xsd:string" use="optional"/>
-    <xsd:attribute name="exporter" type="xsd:string" use="optional"/>
-    <xsd:attribute name="exporterVersion" type="xsd:string" use="optional"/>
-    <xsd:attribute name="longDescription" type="xsd:string" use="optional"/>
-    <xsd:attribute name="shortDescription" type="xsd:string" use="optional"/>
-    <xsd:attribute name="notice" type="xsd:string" use="optional"/>
-    <xsd:attribute name="owner" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="Documentation" type="xmi:Documentation"/>
-  <xsd:complexType name="Extension">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:any processContents="lax"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-    <xsd:attribute name="extender" type="xsd:string" use="optional"/>
-    <xsd:attribute name="extenderID" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="Extension" type="xmi:Extension"/>
-  <xsd:complexType name="Difference">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:element name="target">
-        <xsd:complexType>
-          <xsd:choice maxOccurs="unbounded" minOccurs="0">
-            <xsd:any processContents="skip"/>
-          </xsd:choice>
-          <xsd:anyAttribute processContents="skip"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="difference" type="xmi:Difference"/>
-      <xsd:element name="container" type="xmi:Difference"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="xmi:ObjectAttribs"/>
-    <xsd:attribute name="target" type="xsd:IDREFS" use="optional"/>
-    <xsd:attribute name="container" type="xsd:IDREFS" use="optional"/>
-  </xsd:complexType>
-  <xsd:element name="Difference" type="xmi:Difference"/>
-  <xsd:complexType name="Add">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:Difference">
-        <xsd:attribute name="position" type="xsd:string" use="optional"/>
-        <xsd:attribute name="addition" type="xsd:IDREFS" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="Add" type="xmi:Add"/>
-  <xsd:complexType name="Replace">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:Difference">
-        <xsd:attribute name="position" type="xsd:string" use="optional"/>
-        <xsd:attribute name="replacement" type="xsd:IDREFS" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="Replace" type="xmi:Replace"/>
-  <xsd:complexType name="Delete">
-    <xsd:complexContent>
-      <xsd:extension base="xmi:Difference"/>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:element name="Delete" type="xmi:Delete"/>
-  <xsd:complexType name="Any">
-    <xsd:choice maxOccurs="unbounded" minOccurs="0">
-      <xsd:any processContents="skip"/>
-    </xsd:choice>
-    <xsd:anyAttribute processContents="skip"/>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test2.emf b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test2.emf
deleted file mode 100644
index 8e24c5d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test2.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test3.jpg b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test3.jpg
deleted file mode 100644
index 4948f11..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test3.jpg
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test4.gif b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test4.gif
deleted file mode 100644
index 7477c7e..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test4.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test5.bmp b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test5.bmp
deleted file mode 100644
index 2338d25..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test5.bmp
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test6.svg b/org.eclipse.gmf.tests.runtime.diagram.ui/images/test6.svg
deleted file mode 100644
index ca5468c..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/test6.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" standalone="no"?>

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"

-	"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">

-

-<svg width="600" height="600" style="fill:none">

-

-  <defs>

-    <marker id="Triangle"

-		viewBox="0 0 10 10" refX="5" refY="5"

-		markerWidth="4" markerHeight="4"

-		orient="auto">

-	<path id = "mypath" d="M 0 0 L 10 5 L 0 10 z" style="fill:black; stroke:red; stroke-width:2; 

-                 stroke-dasharray:none; marker:url(#Circle);"/>

-    </marker>

-

-    <marker id="Circle"

-            viewBox="0 0 10 10" refX="5" refY="5"

-            markerWidth="5" markerHeight="5"

-            orient="auto">

-      <circle cx="5" cy="5" r="5" style="fill:none; stroke-width:2; stroke:blue; stroke-dasharray:none"/>

-    </marker>

-

-    <marker id="Square" viewBox="0 0 20 20" refX="10" refY="10"

-            markerWidth="3" markerHeight="3"

-            orient="auto">

-      <rect x ="0" y="0" width="20" height="20" style="fill:teal; stroke:none"/>

-    </marker>

-      

-    <linearGradient id="mygradient">

-	<stop offset="0" stop-color="red"/>

-	<stop offset="0.8" stop-color="blue"/>

-    </linearGradient>

-

-  </defs>

-

-  <title> Simple shapes </title>

-  

-  <rect x = "120" y="120" width="100" height="150" style="fill:blue; stroke:black; stroke-width:4; stroke-linejoin:round" />

-

-  <circle cx="300" cy="400" r="50" style="fill : url(#mygradient); stroke:navy; stroke-width:2; stroke-dasharray: 5 2 10; stroke-dashoffset:15"/>

-

-  <ellipse cx="450" cy="200" rx="50" ry="100" style="fill:#bc1203; stroke:none"/>

-

-  <polyline points="100 100 150 100 150 150 200 150 200 200 250 200 250 250 300 250 300 300 350 300 350 350 

-                    400 350 400 400 450 400 450 450 500 450 500 500" 

-            style="stroke:lime; stroke-width: 3; stroke-linejoin: round; stroke-linecap:round; stroke-opacity:0.5;

-                   marker-start:url(#Circle);marker-mid:url(#Square);marker-end:url(#Triangle)" />

-

-  <polygon points="50 100 100 50 500 50 550 100 550 500 500 550 100 550 50 500" 

-            style="stroke:aqua; stroke-width: 15; stroke-linejoin:round" />

-

-  <line x1="100" x2="500" y1="500" y2="100" 

-            style="stroke:rgb(255,255,0); stroke-width:8; stroke-dasharray: 5 5 10 5 15 5 10 5;

-                     marker-start:url(#Circle);marker-end:url(#Triangle)"   />

-

-</svg>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/images/viewer.gif b/org.eclipse.gmf.tests.runtime.diagram.ui/images/viewer.gif
deleted file mode 100644
index 1cc5cd3..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/images/viewer.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/plugin.properties b/org.eclipse.gmf.tests.runtime.diagram.ui/plugin.properties
deleted file mode 100644
index 45ea8ec..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.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 Diagram UI Tests
-Plugin.providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/plugin.xml b/org.eclipse.gmf.tests.runtime.diagram.ui/plugin.xml
deleted file mode 100644
index 8d2d2a6..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/plugin.xml
+++ /dev/null
@@ -1,549 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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                   -->
-<plugin>
-
-     <extension
-         point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider
-            class="org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestsViewProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <context
-               viewClass="org.eclipse.gmf.runtime.notation.Diagram"
-               semanticHints="PresentationTestsDiagramKind">
-         </context>
-       </viewProvider>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <editor name="Test Diagram Editor"
-         default="false"
-         icon="images/viewer.gif"
-         class="org.eclipse.gmf.tests.runtime.diagram.ui.util.DiagramTestEditor"
-         id="org.eclipse.gmf.tests.runtime.diagram.ui.DiagramTestEditor">
-      </editor>
-   </extension>
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestsEditPartProvider">
-      <Priority
-               name="Lowest">
-      </Priority>
-      <object class="org.eclipse.gmf.runtime.notation.Diagram" id="TestDiagram">
-        	 <method name="getType()" value="PresentationTestsDiagramKind"/>
-	  </object>
-	  <context views="TestDiagram">
-      </context>
-      </editpartProvider>
-   </extension>
-
-   <extension id="org.eclipse.gmf.tests.runtime.diagram.ui.MyDecoratorProvider" name="Diagram UI Tests Decorator" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-      <decoratorProvider class="org.eclipse.gmf.tests.runtime.diagram.ui.services.DecoratorServiceTests$TestDecoratorProvider">
-         <Priority name="Lowest">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="NOTE">
-         </object>
-         <context decoratorTargets="NOTE">
-         </context>
-      </decoratorProvider>
-   </extension>
-   
-   <!-- Palette providers for predefining palette entries -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <contribution
-               factoryClass="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapePaletteFactory">
-            <entry
-            	  defineOnly="true"
-                  id="ovalDrawer"
-                  kind="drawer"
-                  label="ovalDrawer">
-            </entry>
-            <entry
-                  label="oval"
-                  kind="tool"
-                  path="ovalDrawer/"
-                  id="oval">
-            </entry>
-            <entry
-                  label="circle"
-                  kind="tool"
-                  path="ovalDrawer/"
-                  id="circle">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <contribution
-               factoryClass="org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapePaletteFactory">
-            <entry
-            	  defineOnly="true"
-                  id="cylinder"
-                  kind="tool"
-                  label="cylinder">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <!-- Verify that this does not remove the predefined entry -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Low">
-         </Priority>
-         <contribution>
-            <predefinedEntry
-                  id="/ovalDrawer"
-                  remove="true"/>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <!-- testPredefineAndContributeEntries -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Medium">
-         </Priority>
-         <editor
-               class="org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor">
-         </editor>
-         <contribution>
-            <predefinedEntry
-                  id="ovalDrawer"
-                  path="/"/>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="High">
-         </Priority>
-         <editor
-               class="org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor">
-         </editor>
-         <contribution>
-            <entry
-                  id="ovalAndCylinderDrawer"
-                  kind="drawer"
-                  label="ovalAndCylinderDrawer"
-                  path="/"/>
-            <predefinedEntry
-                  id="/ovalDrawer/oval"
-                  path="/ovalAndCylinderDrawer"/>
-            <predefinedEntry
-                  id="cylinder"
-                  path="/ovalAndCylinderDrawer"/>
-         </contribution>
-         <contribution>
-            <entry
-            	  defineOnly="true"
-                  id="ovalAndCylinderDrawerDefinedOnly"
-                  kind="drawer"
-                  label="ovalAndCylinderDrawerDefinedOnly"
-                  path="/"/>
-            <predefinedEntry
-                  id="/ovalDrawer/oval"
-                  path="/ovalAndCylinderDrawerDefinedOnly"/>
-            <predefinedEntry
-                  id="cylinder"
-                  path="/ovalAndCylinderDrawerDefinedOnly"/>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Highest">
-         </Priority>
-         <contribution>
-            <predefinedEntry
-                  id="ovalAndCylinderDrawer">
-               <expand force="true"/>
-            </predefinedEntry>
-            <predefinedEntry
-                  id="ovalAndCylinderDrawerDefinedOnly"
-                  path="/">
-               <expand force="true"/>
-            </predefinedEntry>
-            <predefinedEntry
-                  id="/ovalDrawer/circle"
-                  remove="true"/>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <editor
-               class="org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor">
-         </editor>
-         <contribution>
-            <entry
-                  id="squareDrawer"
-                  kind="drawer"
-                  label="squareDrawer"
-                  path="/"/>
-            <entry
-                  label="square"
-                  kind="tool"
-                  path="squareDrawer/"
-                  id="square">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension>
-
-   <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.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor">
-         </editor>
-         <contribution>
-            <entry
-                  id="rectangleDrawer"
-                  kind="drawer"
-                  label="rectangleDrawer"
-                  path="/"/>
-            <predefinedEntry
-                  id="/squareDrawer/square"
-                  path="/rectangleDrawer"/>
-         </contribution>
-      </paletteProvider>
-   </extension>   
-   
-   <!-- testStaticMethodInPaletteExtension -->
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority name="Lowest"/>
-         <editor class="org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor"/>
-         <content>
-            <staticMethod
-                  name="org.eclipse.gmf.tests.runtime.diagram.ui/org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests.shouldStaticMethodDrawerBeShown()"
-                  value="true"/>
-         </content>
-         <contribution>
-            <entry
-                  id="staticMethodDrawer"
-                  kind="drawer"
-                  label="staticMethodDrawer"
-                  path="/"/>
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <!-- testCapabilityFilteringOfSpecificEntries -->
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="MyPaletteActivityProviderID"
-            name="MyPaletteActivityProvider"/>
-      <activityPatternBinding
-            activityId="MyPaletteActivityProviderID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.diagram\.ui/activityEnabledProviderID"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="MyPaletteActivityEntriesID"
-            name="MyPaletteActivityEntries"/>
-      <activityPatternBinding
-            activityId="MyPaletteActivityEntriesID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.diagram\.ui/activityEnabledDrawerID"/>
-      <activityPatternBinding
-            activityId="MyPaletteActivityEntriesID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.diagram\.ui/activityEnabledToolID"/>
-      <activityPatternBinding
-            activityId="MyPaletteActivityEntriesID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.diagram\.ui/activityEnabledStackID"/>
-      <activityPatternBinding
-            activityId="MyPaletteActivityEntriesID"
-            pattern="org\.eclipse\.gmf\.tests\.runtime\.diagram\.ui/activityEnabledSeparatorID"/>
-   </extension>
-   <extension
-         id="activityEnabledProviderID"
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority name="Medium"/>
-         <editor class="org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests$PaletteServiceTestEditor"/>
-         <contribution>
-            <entry
-                  id="nonActivityDrawerID"
-                  kind="drawer"
-                  label="nonActivityDrawer"
-                  path="/"/>
-            <entry
-                  label="nonActivityTool"
-                  kind="tool"
-                  path="nonActivityDrawerID/"
-                  id="nonActivityToolID"/>
-            <entry
-                  label="nonActivityStack"
-                  kind="stack"
-                  path="nonActivityDrawerID/"
-                  id="nonActivityStackID"/>
-            <entry
-                  label="nonActivitySeparator"
-                  kind="separator"
-                  path="nonActivityDrawerID/"
-                  id="nonActivitySeparatorID"/>
-            <entry
-                  id="activityEnabledDrawerID"
-                  kind="drawer"
-                  label="activityEnabledDrawer"
-                  path="/"/>
-            <entry
-                  label="activityEnabledTool"
-                  kind="tool"
-                  path="/nonActivityDrawerID/nonActivityStackID"
-                  id="activityEnabledToolID"/>
-            <entry
-                  label="activityEnabledStack"
-                  kind="stack"
-                  path="/nonActivityDrawerID/nonActivitySeparatorID"
-                  id="activityEnabledStackID"/>
-            <entry
-                  label="activityEnabledSeparator"
-                  kind="separator"
-                  path="nonActivityDrawerID/"
-                  id="activityEnabledSeparatorID"/>                                  
-         </contribution>
-      </paletteProvider>
-   </extension>
-   
-   <extension
-         point="org.eclipse.gmf.runtime.diagram.core.diagramEventBrokerProviders">
-      <diagramEventBrokerProvider class="org.eclipse.gmf.tests.runtime.diagram.ui.services.LogicDiagramEventBrokerProvider">
-         <Priority name="Lowest"/>
-         <editingDomain ID="org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"/>
-      </diagramEventBrokerProvider>      
-   </extension>
-
-	<!-- Label Tests:  Adds label testing support so that when
-	this test plugin is loaded, labels can be tested in the UI -->
-<!--
-	<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="Label">
-        </propertyCategory>
-      </propertyContributor>
-   </extension>
- 
-  <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-  	<propertyTabs contributorId="org.eclipse.gmf.runtime.diagram.ui.properties">           
-    	<propertyTab
-        	category="Label"
-            id="property.tab.TextLabelPropertySection"
-            label="Label Figure">
-        </propertyTab>                   
-    </propertyTabs>
-  </extension>
-  
-  <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-  	<propertySections contributorId="org.eclipse.gmf.runtime.diagram.ui.properties">           
-		<propertySection tab="property.tab.TextLabelPropertySection" 
-	 		filter="org.eclipse.gmf.tests.runtime.diagram.ui.label.TextLabelPropertySectionFilter" 
-	 		class="org.eclipse.gmf.tests.runtime.diagram.ui.label.TextLabelPropertySection" 
-	 		id="property.section.TextLabelPropertySection">
-	 	</propertySection>     
-  	</propertySections>
-  </extension>
--->
-  
-  	<!-- And again for modeler <START> -->	
-<!--
-	<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-    	<propertyContributor
-        	typeMapper="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ModelElementTypeMapper"
-            contributorId="com.ibm.xtools.modeler.ui.properties"
-            labelProvider="org.eclipse.gmf.runtime.common.ui.services.util.CommonLabelProvider">
-        <propertyCategory
-        	category="Label2">
-        </propertyCategory>
-      </propertyContributor>
-   </extension>
- 
-  <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-  	<propertyTabs contributorId="com.ibm.xtools.modeler.ui.properties">           
-    	<propertyTab
-        	category="Label2"
-            id="property.tab.TextLabelPropertySection2"
-            label="Label Figure">
-        </propertyTab>                   
-    </propertyTabs>
-  </extension>
-  
-  <extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-  	<propertySections contributorId="com.ibm.xtools.modeler.ui.properties">           
-		<propertySection tab="property.tab.TextLabelPropertySection2" 
-	 		filter="org.eclipse.gmf.tests.runtime.diagram.ui.label.TextLabelPropertySectionFilter" 
-	 		class="org.eclipse.gmf.tests.runtime.diagram.ui.label.TextLabelPropertySection" 
-	 		id="property.section.TextLabelPropertySection2">
-	 	</propertySection>     
-  	</propertySections>
-  </extension>
--->
-  <!-- And again for modeler <END> -->
-   
-  <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-    <specializationType
-            id="org.eclipse.gmf.examples.runtime.diagram.label.WrappingLabelNote"     
-            name="WrappingLabel"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="WrappingLabelNote"/> 
-    </specializationType>
-    <specializationType
-            id="org.eclipse.gmf.examples.runtime.diagram.label.GEFLabelNote"     
-            name="GEF Label"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="GEFLabelNote"/> 
-    </specializationType>
-    <specializationType
-            id="org.eclipse.gmf.examples.runtime.diagram.label.OldWrapLabelNote"     
-            name="OldWrapLabel"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="OldWrapLabelNote"/> 
-    </specializationType>
-    <specializationType
-            id="org.eclipse.gmf.examples.runtime.diagram.label.WrapLabelNote"     
-            name="WrapLabel"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="WrapLabelNote"/> 
-    </specializationType>
-  </extension>
-   
-  <!--extension
-         point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders">
-      <paletteProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-         <Priority
-               name="Low">
-         </Priority>
-         <contribution
-               factoryClass="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelPaletteFactory">
-            <entry
-                  label="LabelDrawer"
-                  kind="drawer"
-                  description="LabelDrawer"
-                  path="/"
-                  id="labelDrawer">
-            </entry>
-            <entry
-                  label="New WrappingLabel"
-                  kind="tool"
-                  description="New WrappingLabel"
-                  path="/labelDrawer/"
-                  id="org.eclipse.gmf.examples.runtime.diagram.label.WrappingLabelNote">
-            </entry>
-            <entry
-                  label="GEFLabel"
-                  kind="tool"
-                  description="GEFLabel"
-                  path="/labelDrawer/"
-                  id="org.eclipse.gmf.examples.runtime.diagram.label.GEFLabelNote">
-            </entry>
-            <entry
-                  label="WrapLabel Delegating to New WrappingLabel"
-                  kind="tool"
-                  description="WrapLabel Delegating to New WrappingLabel"
-                  path="/labelDrawer/"
-                  id="org.eclipse.gmf.examples.runtime.diagram.label.WrapLabelNote">
-            </entry>
-            <entry
-                  label="Previous WrapLabel"
-                  kind="tool"
-                  description="Previous WrapLabel"
-                  path="/labelDrawer/"
-                  id="org.eclipse.gmf.examples.runtime.diagram.label.OldWrapLabelNote">
-            </entry>
-         </contribution>
-      </paletteProvider>
-   </extension-->
-	
-   <extension 
-   		id="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelViewProvider" 
-   		name="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelViewProvider" 
-   		point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
-      <viewProvider class="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelViewProvider">
-         <Priority name="Low">
-         </Priority>                
-         <context 
-         	viewClass="org.eclipse.gmf.runtime.notation.Node" 
-         	semanticHints="GEFLabelNote, WrappingLabelNote, OldWrapLabelNote, WrapLabelNote, GEFLabel, WrappingLabel, OldWrapLabel, WrapLabel">
-         </context>                     
-      </viewProvider>
-   </extension> 
-   
-   <extension 
-   		id="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelEditPartProvider" 
-   		name="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelEditPartProvider" 
-   		point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
-      <editpartProvider class="org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelEditPartProvider">
-         <Priority name="Low">
-         </Priority>
-         <object class="org.eclipse.gmf.runtime.notation.View" id="ShapesByType">
-            <method 
-            	name="getType()" 
-            	value="GEFLabelNote, WrappingLabelNote, OldWrapLabelNote, WrapLabelNote, GEFLabel, WrappingLabel, OldWrapLabel, WrapLabel">
-            </method>
-         </object>
-         <context views="ShapesByType">
-         </context>
-      </editpartProvider>
-   </extension> 
-   
-	<!-- End Label Tests -->    
-</plugin>
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/pom.xml b/org.eclipse.gmf.tests.runtime.diagram.ui/pom.xml
deleted file mode 100644
index 86c6913..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.diagram.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.diagram.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.diagram.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.diagram.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <!--argLine>${tycho.testArgLine} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -Xnoagent -Djava.compiler=NONE</argLine-->
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPartTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPartTests.java
deleted file mode 100644
index 3965038..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/AbstractImageEditPartTests.java
+++ /dev/null
@@ -1,190 +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.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-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.Diagram;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.DiagramCreator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-
-
-/**
- * @author sshaw
- *
- * Test class for the AbstractEditPartImage class.
- */
-abstract public class AbstractImageEditPartTests 
-extends TestCase {
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	private Node node;
-
-	public Node getNode() {
-		return node;
-	}
-
-	private TransactionalEditingDomain editingDomain;
-	
-	/**
-	 * Sets up the fixture, for example, open a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		final Diagram dgrm = DiagramCreator.createEmptyDiagram(getPreferenceHint(),
-			editingDomain);
-		
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-            editingDomain, "") { //$NON-NLS-1$
-
-            protected IStatus doExecute(IProgressMonitor monitor,
-                    IAdaptable info)
-                throws ExecutionException {
-                
-		Resource resource = editingDomain
-			.createResource("null:/org.eclipse.gmf.tests.runtime.diagram.ui"); //$NON-NLS-1$
-		resource.getContents().add(dgrm);
-                
-                return Status.OK_STATUS;
-            };
-        };
-        try {
-            OperationHistoryFactory.getOperationHistory().execute(operation,
-                    new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-            assertFalse(false);
-        }
-        
-		node = createNode(dgrm);
-	}
-	
-	/**
-	 * @return
-	 */
-	protected PreferencesHint getPreferenceHint() {
-		return PreferencesHint.USE_DEFAULTS;
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	protected Node createNode(final Diagram diagram) {
-
-		final List list = new ArrayList(1);
-		
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			editingDomain, "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				Node note1 = ViewService.createNode(diagram,
-					ViewType.NOTE, getPreferenceHint());
-				assertNotNull("Note1 creation failed", note1); //$NON-NLS-1$
-				list.add(note1);
-				
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-
-		return (Node)list.get(0);
-	}
-	
-	abstract public List getFixtures();
-	
-	public void test_regenerateImageFromSource() {
-		List fixtures = getFixtures();
-		ListIterator li = fixtures.listIterator();
-		int testno = 1;
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof AbstractImageEditPart) {
-				AbstractImageEditPart fixture = (AbstractImageEditPart)obj;
-				
-				RenderedImage renderedImage = fixture.regenerateImageFromSource();
-				verifyRenderedImage(renderedImage, testno++);
-			}
-		}
-	}
-	
-	/**
-	 * @param renderedImage
-	 */
-	protected void verifyRenderedImage(RenderedImage renderedImage, int testno) {
-		assertTrue("renderedImage is null in testno " + (new Integer(testno)).toString(),//$NON-NLS-1$
-			renderedImage != null);
-		
-		Image swtImage = renderedImage.getSWTImage();
-		assertTrue("swtImage is null in testno " + (new Integer(testno)).toString(), //$NON-NLS-1$
-			swtImage != null);
-		
-		// ensure the protection image isn't being returned.
-		Rectangle rect = swtImage.getBounds();
-		assertTrue("swtImage is not correct size in testno " + (new Integer(testno)).toString(),//$NON-NLS-1$
-			rect.width > 10 && rect.height > 10);
-	}
-
-	public void test_getRenderedImage() {
-		List fixtures = getFixtures();
-		ListIterator li = fixtures.listIterator();
-		int testno = 1;
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof AbstractImageEditPart) {
-				AbstractImageEditPart fixture = (AbstractImageEditPart)obj;
-				
-				RenderedImage renderedImage = fixture.getRenderedImage();
-				verifyRenderedImage(renderedImage, testno++);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPartTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPartTests.java
deleted file mode 100644
index d52575e..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/URLImageEditPartTests.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.diagram.ui.render.editparts;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.TestsPlugin;
-import org.eclipse.gmf.runtime.diagram.ui.render.editparts.AbstractImageEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.render.editparts.URLImageEditPart;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author sshaw
- *
- * Test class for URL based images
- */
-public class URLImageEditPartTests
-	extends AbstractImageEditPartTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.gmf.tests.runtime.diagram.ui.internal.editparts"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(URLImageEditPartTests.class);
-		//$JUnit-END$
-		return suite;
-	}
-	
-	// image tests
-	//private String TEST1 = "test1.WMF";//$NON-NLS-1$
-	private String TEST2 = "test2.emf";//$NON-NLS-1$
-	private String TEST3 = "test3.jpg";//$NON-NLS-1$
-	private String TEST4 = "test4.gif";//$NON-NLS-1$
-	private String TEST5 = "test5.bmp";//$NON-NLS-1$
-	private String TEST6 = "test6.svg";//$NON-NLS-1$
-	
-	// non-image tests 
-	private String TEST7 = "test7.txt";//$NON-NLS-1$
-	private String TEST8 = "test8.doc";//$NON-NLS-1$
-	private String TEST9 = "test9.xls";//$NON-NLS-1$
-	private String TEST10 = "nofile.xxx";//$NON-NLS-1$
-	//private String TEST11 = "test11.xsd";//$NON-NLS-1$
-	
-	private static final String TRANSLATE_PATH_ARGUMENT = "$nl$"; //$NON-NLS-1$
-	private static final String IMAGES = "images"; //$NON-NLS-1$
-
-	protected String getImagePathName() {
-		return IMAGES + IPath.SEPARATOR;
-	}
-	
-	private URL getURL( String fileName ) {
-		/* 
-		 * prefix path with "$nl$" and use Plugin.find() to search for the 
-		 * locale specific file
-		 */
-		IPath path =
-			new Path(TRANSLATE_PATH_ARGUMENT).append(
-				getImagePathName() + fileName);
-		return FileLocator.find(TestsPlugin.getDefault().getBundle(), path, null);
-	}
-	
-	class URLImageEditPartFixture1 extends URLImageEditPart {
-		
-		private URL url;
-		
-		/**
-		 * @param view
-		 */
-		public URLImageEditPartFixture1(View view, URL url) {
-			super(view);
-			this.url = url;
-		}
-		protected URL getURL() {
-			if (url == null)
-				return super.getURL();
-			
-			return url;
-		}
-		protected String getImagePath() {
-			return null;
-		}
-		protected String getPathImagePathIsRelativeTo() {
-			return null;
-		}
-		public RenderedImage regenerateImageFromSourceTest() {
-			return super.regenerateImageFromSource();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.render.editparts.AbstractImageEditPartTests#getFixture()
-	 */
-	public List getFixtures() {
-		List fixtures = new ArrayList(6);
-		
-		//fixtures.add(new URLImageEditPartFixture1(
-		//	getNode(), getURL(TEST1)));
-		fixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST2)));
-		fixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST3)));
-		fixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST4)));
-		fixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST5)));
-		fixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST6)));
-		
-		return fixtures;
-	}
-	
-	/**
-	 * @return
-	 */
-	protected List getNonImageFixtures() {
-		List nonImageFixtures = new ArrayList(3);
-		
-		nonImageFixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST7)));
-		nonImageFixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST8)));
-		nonImageFixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST9)));
-		nonImageFixtures.add(new URLImageEditPartFixture1(
-			getNode(), getURL(TEST10)));
-		//nonImageFixtures.add(new URLImageEditPartFixture1(
-			//getNode(), getURL(TEST11)));
-		nonImageFixtures.add(new URLImageEditPartFixture1(
-			getNode(), null)); // test null URL
-		return nonImageFixtures;
-	}
-	
-	public void test_regenerateImageFromSource() {
-		List fixtures = getFixtures();
-		ListIterator li = fixtures.listIterator();
-		int testno = 1;
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof AbstractImageEditPart) {
-				
-				URLImageEditPartFixture1 fixture = (URLImageEditPartFixture1)obj;
-				RenderedImage renderedImage = fixture.regenerateImageFromSourceTest();
-				verifyRenderedImage(renderedImage, testno++);
-			}
-		} 
-	}
-	
-	public void test_regenerateImageFromSource_InvalidSource() {
-		List fixtures = getNonImageFixtures();
-		ListIterator li = fixtures.listIterator();
-		int testno = 1;
-		while (li.hasNext()) {
-			Object obj = li.next();
-			if (obj instanceof AbstractImageEditPart) {
-				URLImageEditPartFixture1 fixture = (URLImageEditPartFixture1)obj;
-				
-				RenderedImage renderedImage = fixture.regenerateImageFromSourceTest();
-				
-				assertNull("Non image file was rendered to an image? " + (new Integer(testno++)).toString(), //$NON-NLS-1$
-						(renderedImage == null?(Object) renderedImage:(Object) renderedImage.getSWTImage()));
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/core/DiagramEditingDomainFactoryTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/core/DiagramEditingDomainFactoryTests.java
deleted file mode 100644
index 00b1bc6..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/core/DiagramEditingDomainFactoryTests.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2010 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.diagram.core;

-

-import java.util.HashMap;

-import java.util.Map;

-

-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.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;

-

-/**

- * Unit tests for the {@link DiagramEditingDomainFactory}.

- * 

- * @author ldamus

- */

-public class DiagramEditingDomainFactoryTests extends TestCase {

-

-	public DiagramEditingDomainFactoryTests(String name) {

-		super(name);

-	}

-

-	public static void main(String[] args) {

-		TestRunner.run(suite());

-	}

-

-	public static Test suite() {

-		return new TestSuite(DiagramEditingDomainFactoryTests.class);

-	}

-

-	/**

-	 * Tests that the editing domain created by the

-	 * {@link DiagramEditingDomainFactory} is configured only once.

-	 */

-	public void test_getEditingDomain_254621() {

-

-		DiagramEditingDomainFactoryFixture fixture = new DiagramEditingDomainFactoryFixture();

-

-		// createEditingDomain

-		TransactionalEditingDomain domain = fixture.createEditingDomain();

-		assertEquals(1, fixture.getConfigureCount(domain));

-

-		// createEditingDomain(IOperationHistory)

-		domain = fixture.createEditingDomain(OperationHistoryFactory

-				.getOperationHistory());

-		assertEquals(1, fixture.getConfigureCount(domain));

-

-		// createEditingDomain(ResourceSet)

-		domain = fixture.createEditingDomain(new ResourceSetImpl());

-		assertEquals(1, fixture.getConfigureCount(domain));

-

-		// createEditingDomain(ResourceSet, IOperationHistory)

-		domain = fixture.createEditingDomain(new ResourceSetImpl(),

-				OperationHistoryFactory.getOperationHistory());

-		assertEquals(1, fixture.getConfigureCount(domain));

-	}

-

-	/**

-	 * Fixture that keeps track of how many times each editing domain is

-	 * configured.

-	 */

-	protected static class DiagramEditingDomainFactoryFixture extends

-			DiagramEditingDomainFactory {

-

-		private Map<TransactionalEditingDomain, Integer> configureCount = new HashMap<TransactionalEditingDomain, Integer>();

-

-		@Override

-		protected void configure(TransactionalEditingDomain domain) {

-			super.configure(domain);

-

-			Integer count = configureCount.get(domain);

-

-			if (count == null) {

-				count = Integer.valueOf(1);

-

-			} else {

-				count = count + 1;

-			}

-

-			configureCount.put(domain, count);

-		}

-

-		public int getConfigureCount(TransactionalEditingDomain domain) {

-			Integer count = configureCount.get(domain);

-			return count == null ? 0 : count;

-		}

-	}

-}

diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractConnectionTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractConnectionTests.java
deleted file mode 100644
index d6cd472..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractConnectionTests.java
+++ /dev/null
@@ -1,220 +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.diagram.ui;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SetConnectionBendpointsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-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.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.runtime.notation.Smoothness;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestCommandCallback;
-
-/**
- * @author choang
- *
- * AbstractConnectTests that contain the test logic that is common across diagram
- * Should be extended by diagram specic test to test connections functionality.
- */
-public abstract class AbstractConnectionTests extends AbstractTestBase {
-
-	/**
-	 * Constructor for AbstractConnectionTests.
-	 * @param arg0
-	 */
-	public AbstractConnectionTests(String arg0) {
-		super(arg0);
-	}
-
-	static public final Point ptStart = new Point(100, 100);
-	static public final Point ptEnd = new Point(300, 300);
-	static public final Point ptMiddle = new Point(200, 200);
-
-	public void testDeleteConnection() throws Exception {
-
-		final Object[] diagramValues = new Object[2];
-		getTestFixture().getEditingDomain().runExclusive(
-			new Runnable() {
-			public void run() {
-
-				Diagram dgrm2 =
-					getTestFixture().getConnectorView().getDiagram();
-
-				diagramValues[0] = dgrm2;
-				diagramValues[1] = new Integer(dgrm2.getEdges().size());
-			}
-		});
-
-		final Diagram dgrm = (Diagram) diagramValues[0];
-
-		final int dgrmSize = ((Integer) diagramValues[1]).intValue();
-
-		DeleteCommand delete =
-			new DeleteCommand(getTestFixture()
-            .getEditingDomain(), getTestFixture().getConnectorView());
-
-		testCommand(delete, new ITestCommandCallback() {
-			public void onCommandExecution() {
-				assertTrue(dgrm.getEdges().size() == (dgrmSize - 1));
-			}
-		});
-
-	}
-
-	public void testAddBendpoints() throws Exception {
-
-				// moved to setup of super class 
-				final Edge connectorView =
-					getTestFixture().getConnectorView();
-
-				RelativeBendpoints pbs = (RelativeBendpoints) connectorView.getBendpoints(); 
-				assertTrue(pbs.getPoints().size() == 2);
-
-				PointList newpts = new PointList(3);
-				newpts.addPoint(new Point(ptStart));
-				newpts.addPoint(new Point(ptMiddle));
-				newpts.addPoint(new Point(ptEnd));
-
-				Point r1 = new Point(ptStart);
-				Point r2 = new Point(ptEnd);
-
-				SetConnectionBendpointsCommand bendpointsChanged =
-					new SetConnectionBendpointsCommand(getTestFixture().getEditingDomain());
-				bendpointsChanged.setEdgeAdapter(new EObjectAdapter(connectorView));
-				bendpointsChanged.setNewPointList(newpts, r1, r2);
-				testCommand(bendpointsChanged, new ITestCommandCallback() {
-					public void onCommandExecution() {
-						RelativeBendpoints bendpoints = (RelativeBendpoints) connectorView.getBendpoints(); 
-						assertTrue(bendpoints.getPoints().size() == 3);
-					}
-				});
-				flushEventQueue();
-
-				// now test smooth connector
-				final Smoothness s1 = Smoothness.NORMAL_LITERAL;
-				SetPropertyCommand c =
-					new SetPropertyCommand(getTestFixture().getEditingDomain(), new EObjectAdapter(connectorView),
-						Properties.ID_SMOOTHNESS,
-						"", //$NON-NLS-1$
-						s1);
-				testCommand(c, new ITestCommandCallback() {
-					public void onCommandExecution() {
-						Object s2 = ViewUtil.getStructuralFeatureValue(connectorView,
-							NotationPackage.eINSTANCE.getRoutingStyle_Smoothness());
-						assertTrue(s1.equals(s2));
-					}
-				});
-
-				newpts.removeAllPoints();
-
-				newpts.addPoint(new Point(ptStart));
-				newpts.addPoint(new Point(ptMiddle));
-				newpts.addPoint(
-					new Point(
-						getDiagramEditPart()
-							.getFigure()
-							.getBounds()
-							.getBottomRight()));
-				newpts.addPoint(new Point(ptEnd));
-
-				bendpointsChanged = new SetConnectionBendpointsCommand(getTestFixture().getEditingDomain());
-				bendpointsChanged.setEdgeAdapter(new EObjectAdapter(connectorView));
-				bendpointsChanged.setNewPointList(newpts, r1, r2);
-				testCommand(bendpointsChanged, new ITestCommandCallback() {
-					public void onCommandExecution() {
-						RelativeBendpoints bendpoints = (RelativeBendpoints) connectorView.getBendpoints(); 
-						assertTrue(bendpoints.getPoints().size() == 4);
-					}
-				});
-				flushEventQueue();
-			}
-
-	/**
-	 * Method testConnectionProperties.
-	 * @throws Exception
-	 */
-	public void testConnectionProperties() throws Exception {
-				final Edge connectorView =
-					getTestFixture().getConnectorView();
-
-				testProperty(
-					connectorView,
-					Properties.ID_JUMPLINKS_STATUS,
-					JumpLinkStatus.ABOVE_LITERAL);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_JUMPLINKS_TYPE,
-					JumpLinkType.SEMICIRCLE_LITERAL);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_JUMPLINKS_REVERSE,
-					Boolean.TRUE);
-				flushEventQueue();
-
-//				testProperty(
-//					connectorView,
-//					Properties.ID_LINECOLOR,
-//					org.eclipse.draw2d.ColorConstants.red);
-//				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_CLOSESTDISTANCE,
-					Boolean.TRUE);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_AVOIDOBSTRUCTIONS,
-					Boolean.TRUE);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_SMOOTHNESS,
-					Smoothness.NORMAL_LITERAL);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_ROUTING,
-					Routing.RECTILINEAR_LITERAL);
-				flushEventQueue();
-
-				testProperty(
-					connectorView,
-					Properties.ID_ROUTING,
-					Routing.MANUAL_LITERAL);
-				flushEventQueue();
-				
-				testProperty(
-					connectorView,
-					Properties.ID_ROUNDED_BENDPOINTS_RADIUS,
-					10);
-				flushEventQueue();				
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractDiagramTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractDiagramTests.java
deleted file mode 100644
index acd1ade..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractDiagramTests.java
+++ /dev/null
@@ -1,229 +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.diagram.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-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.RootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gmf.runtime.diagram.ui.actions.AlignAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SelectAllAction;
-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.ShapeNodeEditPart;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestActionCallback;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public abstract class AbstractDiagramTests extends AbstractTestBase {
-
-	/**
-	 * 
-	 * @param TestName name for the test
-	 */
-	public AbstractDiagramTests(String arg0) {
-		super(arg0);
-	}
-
-	protected ZoomManager getZoomManager() {
-		RootEditPart root = getDiagramEditPart().getViewer().getRootEditPart();
-		if (root instanceof DiagramRootEditPart) {
-			return ((DiagramRootEditPart)root).getZoomManager();
-		}
-		
-		return null;
-	}
-	
-	public void testZoom() throws Exception {
-		getTestFixture().openDiagram();
-
-		assertNotNull("no drawing surface", getDrawSurfaceEditPart()); //$NON-NLS-1$
-		ZoomManager zoomManager = getZoomManager();
-		// Ensure the zoom manager exists
-		assertTrue(zoomManager != null);
-
-		// Zoom in
-		zoomManager.setZoom(zoomManager.getMinZoom());
-		while (zoomManager.canZoomIn()) {
-			double state = zoomManager.getNextZoomLevel();
-			assertTrue(state <= zoomManager.getMaxZoom());
-			assertTrue(state >= zoomManager.getMinZoom());
-			zoomManager.setZoom(state);
-		}
-
-		// Zoom out
-		while (zoomManager.canZoomOut()) {
-			double state = zoomManager.getPreviousZoomLevel();
-			assertTrue(state <= zoomManager.getMaxZoom());
-			assertTrue(state >= zoomManager.getMinZoom());
-			zoomManager.setZoom(state);
-		}
-
-		// Zoom to fit
-		zoomManager.zoomTo(getDrawSurfaceFigure().getBounds());
-	}
-	
-	public void testZoomToolFunctionality() throws Exception {
-		getTestFixture().openDiagram();
-
-		RootEditPart root = getDiagramEditPart().getViewer().getRootEditPart();
-		DiagramRootEditPart dgrmRoot = (DiagramRootEditPart)root;
-		double currentZoom = dgrmRoot.getZoomManager().getZoom();
-		dgrmRoot.zoomIn(new Point(200, 200));
-		double newZoom = dgrmRoot.getZoomManager().getZoom();
-		assertTrue(newZoom > currentZoom);
-		
-		currentZoom = newZoom;
-		dgrmRoot.zoomOut(new Point(300, 300));
-		newZoom = dgrmRoot.getZoomManager().getZoom();
-		assertTrue(newZoom < currentZoom);
-		
-		currentZoom = newZoom;
-		dgrmRoot.zoomTo(new Rectangle(20, 20, 500, 500));
-		newZoom = dgrmRoot.getZoomManager().getZoom();
-		assertTrue(newZoom < currentZoom);
-	}
-
-	/** Return the supplied editpart's {@link ShapeNodeEditPart}children. */
-	protected List getSelectableShapesIn(IGraphicalEditPart parent) {
-		assertNotNull(parent);
-		List shapes = new ArrayList();
-		
-		Iterator it = parent.getChildren().iterator();
-		while (it.hasNext()) {
-			Object child = it.next();
-			if (child instanceof ShapeNodeEditPart) {
-				if (((ShapeNodeEditPart)child).isSelectable())
-					shapes.add(child);
-			}
-			shapes.addAll(getSelectableShapesIn((IGraphicalEditPart)child));
-		}
-		return shapes;
-	}
-	
-	public void testSelect() throws Exception {
-		getTestFixture().openDiagram();
-
-		final List connectors = getConnectors();
-		final List shapes = getSelectableShapesIn(getDrawSurfaceEditPart());
-		final List all = new ArrayList();
-		all.addAll(connectors);
-		all.addAll(shapes);
-		
-		selectAll(getDrawSurfaceEditPart(), all);
-	}
-	
-	/**
-	 * @param currentSelection <code>EditPart</code> to that will be given the current
-	 * selection before the action executes.  Can be <code>null</code> indicating no current 
-	 * selection.
-	 * @throws Exception
-	 */
-	protected void selectAll(final IGraphicalEditPart currentSelection, final List shouldSelect) throws Exception {
-		assertNotNull("no drawing surface", getDrawSurfaceEditPart()); //$NON-NLS-1$
-
-		// test select all
-		//
-		// prime the selection action to perform the selection within currentSelection
-		if (currentSelection != null) {
-			getDiagramEditPart().getViewer().setSelection(
-				new StructuredSelection(currentSelection));
-		}
-		SelectAllAction selectAction =
-			SelectAllAction.createSelectAllAction(getWorkbenchPage());
-
-		testAction(selectAction, new ITestActionCallback() {
-			public void onRunExecution() {
-
-				List selectedParts = getDiagramEditPart().getViewer()
-					.getSelectedEditParts();
-				if (!shouldSelect.isEmpty()) {
-					assertTrue(
-						shouldSelect.containsAll(selectedParts)
-							&& selectedParts.containsAll(shouldSelect));
-				}
-				else {
-					assertTrue( selectedParts.contains(currentSelection));
-				}
-			}
-		});
-	}
-
-	public void testAlignment() throws Exception {
-
-		getTestFixture().openDiagram();
-
-		assertNotNull("no drawing surface", getDrawSurfaceEditPart()); //$NON-NLS-1$
-
-		AlignAction a1 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_LEFT, PositionConstants.LEFT);
-		AlignAction a2 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_RIGHT, PositionConstants.RIGHT);
-		AlignAction a3 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_TOP, PositionConstants.TOP);
-		AlignAction a4 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_BOTTOM, PositionConstants.BOTTOM);
-		AlignAction a5 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_CENTER, PositionConstants.CENTER);
-		AlignAction a6 =
-			new AlignAction(getWorkbenchPage(), GEFActionConstants.ALIGN_MIDDLE, PositionConstants.MIDDLE);
-
-		EditPartViewer viewer = getDiagramEditPart().getRoot().getViewer();
-
-		// test alignment for all shapes selected
-		viewer.deselectAll();
-
-		List shapeChildren = getDrawSurfaceEditPart().getChildren();
-		for (int i = 0; i < shapeChildren.size(); i++) {
-			viewer.appendSelection((EditPart) shapeChildren.get(i));
-		}
-
-		testAction(a1, new ITestActionCallback() {
-			public void onRunExecution() {
-				// empty block
-			}
-		});
-		testAction(a2, new ITestActionCallback() {
-			public void onRunExecution() {
-				//empty block
-			}
-		});
-		testAction(a3, new ITestActionCallback() {
-			public void onRunExecution() {
-				// empty block
-			}
-		});
-		testAction(a4, new ITestActionCallback() {
-			public void onRunExecution() {
-				// emtpy block
-			}
-		});
-		testAction(a5, new ITestActionCallback() {
-			public void onRunExecution() {
-				// empty block
-			}
-		});
-		testAction(a6, new ITestActionCallback() {
-			public void onRunExecution() {
-				// empty block
-			}
-		});
-	}
-	
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractShapeTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractShapeTests.java
deleted file mode 100644
index 870f651..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractShapeTests.java
+++ /dev/null
@@ -1,135 +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.diagram.ui;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-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.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestCommandCallback;
-
-/**
- * @author chmahone,choang
- * 
- * <p>Abstract Test class that implements the shapes test.  This abstract class doesn't not
- * know what diagram or if we are dealing with EMF or RMS
- * Diagram Test that wish to run the shapes test in the specific context of thier digram should 
- * extend this abstract class.</p>
- * 
- * <p>What's left for you to do</p>
- * <br> 1.  Implement all the abstract methods and the suite() as described in the javadoc for </br>
- * <br> @see org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase
- */
-public abstract class AbstractShapeTests extends AbstractTestBase {
-
-    public AbstractShapeTests(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Executes a generic command on all the EditParts in the diagram (assuming they provide
-     * the command).  Checks that the property value is updated after the command.
-     * 
-     * @param request         request for the command to be executed
-     * @param propertyValue   value that the property will be changed to 
-     * @param propertyID      property id string that identifies this view property
-     */
-    protected void testCommandOnEditParts(
-        final Request request,
-        final Object propertyValue,
-        final EStructuralFeature feature) {
-        Iterator objects = getShapesIn(getDrawSurfaceEditPart()).iterator();
-        while (objects.hasNext()) {
-            IGraphicalEditPart editPart = (IGraphicalEditPart) objects.next();
-            Command cmd = editPart.getCommand(request);
-            if (cmd != null) {
-                final View view = (View)editPart.getModel();
-                testCommand(cmd, new ITestCommandCallback() {
-                    public void onCommandExecution() {
-                        assertTrue(
-                            ViewUtil.getStructuralFeatureValue(view,feature).equals(
-                                propertyValue));
-                    }
-                });
-            }
-        }
-    }
-
-    /**
-     * Method testRATLC00046844.
-     * Tests to make sure undo is working when resizing an editpart.
-     * @throws Exception
-     */
-    public void testRATLC00046844() throws Exception {
-
-        // get the first edit part
-        IGraphicalEditPart editPart = null;
-        Iterator objects = getShapesIn(getDrawSurfaceEditPart()).iterator();
-        while (objects.hasNext()) {
-            editPart = (IGraphicalEditPart) objects.next();
-            break;
-        }
-
-        View shapeView = (View) editPart.getModel();
-
-        getDrawSurfaceFigure().invalidate();
-		getDrawSurfaceFigure().validate();
-
-        final Dimension newDim = new Dimension(400, 400);
-        final Dimension oldDim = editPart.getFigure().getSize();
-
-        SetBoundsCommand cmd = new SetBoundsCommand(getTestFixture()
-            .getEditingDomain(), "testRATLC00046844", new EObjectAdapter(shapeView), newDim); //$NON-NLS-1$
-        
-        testCommand(cmd, new ITestCommandCallback() {
-            public void onCommandExecution() {
-            	// do nothing
-            }
-        });
-
-        // force an undo to test value is restored.
-        getTestFixture().getCommandStack().undo();
-		getDrawSurfaceFigure().invalidate();
-		getDrawSurfaceFigure().validate();
-
-        assertTrue(editPart.getFigure().getSize().equals(oldDim));
-    }
-
-    /**
-     * @see junit.framework.TestCase#setUp()
-     * 
-     * Setup the data for the shapes tests which involves
-     * 1. calling super.setup() which will create project,diagram and open the diagram
-     * 2. create the shapes and the connectors on the diagram
-     * 
-     * Note it calls the abstract method createConnectorView which needs to be implemented by
-     * the class that implements this abstract class.
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    /**
-     * @see junit.framework.TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractTestBase.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractTestBase.java
deleted file mode 100644
index dc45c2d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AbstractTestBase.java
+++ /dev/null
@@ -1,617 +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.diagram.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.Disposable;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.common.ui.action.IDisposableAction;
-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.diagram.ui.actions.internal.SelectAllAction;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-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.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RefreshConnectionsRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.DiagramState;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.IPresentationTestFixture;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestActionCallback;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestCommandCallback;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @author choang
- * 
- * The abstract base class should be used by any tests that we write for the shapes team
- * It provides a framework for which the tests will run.
- * 
- * It contains implementation of some ulitiy helper methods also.
- * 
- * what's left for you to do?
- * <p>1.  Implement the following abstract methods
- * 	<p>a.  createConnectorViews - which setups up the diagram with the common shapes and connectors that will be used for your tests
- * 	<p>b.  setDefaultDiagramExt - sets the diagram extension type which will be used for the tests.  Based on the ext given
- * 		the diagram manager will use that as a hint to determine which DiagramEditor class to use to manuipulate the diagram.
- * 	<p>c.  public static suite() - to return the Test that will be our Action Menus will run.  Note this is not defined as an abstract
- * 		method here because it needs to be a static method in your test class.
- *     d.   setTestFixtureLogic() - which sets the <code>org.eclipse.gmf.tests.runtime.diagram.ui.util.IPresentataionTestFixtureLogic</code> class
- * 			that will be responsible for creating the fixture(i.e test data) for this test.
- * <p>2.  Add your tests methods
- *		You need to name your tests method like test*.  The Junit framework will  run all the methods that start with test*.  For each test
- * in you class the Junit framework will first run the setup(), then your testName1() method and the tearDown().
- * 
- * 
- */
-public abstract class AbstractTestBase extends TestCase { 
-
-	protected IPresentationTestFixture testFixture = null;
-	
-	/** Verbose system property. */
-	public static final String SYSPROP_VERBOSE = "presentation.test.verbose";//$NON-NLS-1$
-	
-	/** verbose flag. */
-	private static boolean _verbose = Boolean.getBoolean(SYSPROP_VERBOSE);
-	
-	/**
-	 * Constructor for AbstractTestBase.
-	 * @param TestName
-	 */
-	public AbstractTestBase(String arg0) {
-		super(arg0);
-		setTestFixture();
-	}
-
-	/**
-	 * Enable verbose mode.  If enabled, {@link junit.framework.Assert#fail(java.lang.String)} 
-	 * will print the supplied string; otherwise the string is ignored.
-	 * 
-	 * Verbose mode can also be enabled using the {@link #SYSPROP_VERBOSE} system property.
-	 * @param enabled boolean flag
-	 */
-	protected final void enableVerbose( boolean enabled ) {
-		_verbose = enabled;
-	}
-	
-	/** Return the verbose mode. */
-	public final boolean isVerbose() {
-		return _verbose;
-		
-	}
-		
-	/** Calls <code>System.out.println(msg)</code> if in verbose mode. */
-	public static final void println( Object msg ) {
-		if ( _verbose ) {
-			System.out.println(msg);
-		}
-	}
-	
-	/** Calls <code>System.out.print(msg)</code> if in verbose mode. */
-	public static final void print( Object msg ) {
-		if ( _verbose ) {
-			System.out.print(msg);
-		}
-	}
-	
-	/**
-	 * Method getCommandStack.
-	 * @return CommandStack  Command stack for the diagram editor
-	 */
-	protected CommandStack getCommandStack() {
-		return getTestFixture().getCommandStack();
-	}
-	/**
-	 * Method setTestFixtureLogic.
-	 *
-	 * Sets the fixture logic for the tests.  A fixture is the set of "data" that the test will run against
-	 * Typically many tests will use the same fixture.
-	 * 
-	 */
-	protected abstract void setTestFixture();
-
-	protected IPresentationTestFixture getTestFixture() {
-		return testFixture;
-	}
-
-	protected IDiagramWorkbenchPart getDiagramWorkbenchPart() {
-		return getTestFixture().getDiagramWorkbenchPart();
-	}
-
-	protected IWorkbenchPage getWorkbenchPage() {
-		return getDiagramWorkbenchPart().getSite().getPage();
-	}
-
-	protected DiagramEditPart getDiagramEditPart() {
-		return getTestFixture().getDiagramEditPart();
-	}
-
-	protected Diagram getDiagram() {
-		return getTestFixture().getDiagram();
-	}
-
-	protected void saveDiagram() {
-		if (getDiagramWorkbenchPart() instanceof IEditorPart) {
-			IWorkbenchPage page = getDiagramWorkbenchPart().getSite().getPage();
-
-			page.saveEditor((IEditorPart) getDiagramWorkbenchPart(), false);
-			flushEventQueue();
-		}
-	}
-
-	protected boolean isDirty() {
-		if (getDiagramWorkbenchPart() instanceof IEditorPart) {
-			return ((IEditorPart) getDiagramWorkbenchPart()).isDirty();
-		}
-		return false;
-	}
-
-	protected DiagramState getDiagramState() {
-
-		try {
-			return (DiagramState) TransactionUtil
-				.getEditingDomain(getDiagram()).runExclusive(
-					new RunnableWithResult.Impl() {
-
-					public void run() {
-
-						setResult(new DiagramState(getDiagramEditPart()));
-
-					}
-				});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-			assertTrue(false);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Description:  Will execute the <code>Command</code> and then the <code>ITestCommandCallBack</code>, which 
-	 * has the logic to verify that the command executed successful.
-	 * <p>The command is executed within an UndoInterval and WriteAction model operation.
-	 * @throws <AssertFailError> if the command did not run successfully 
-	 * @author choang
-	 */
-	protected void testCommand(
-		final ICommand command,
-		final ITestCommandCallback callback) {
-		testCommand(new ICommandProxy(command), callback);
-	}
-	
-	/**
-	 * Description:  Will execute the <code>Command</code> and then the <code>ITestCommandCallBack</code>, which 
-	 * has the logic to verify that the command executed successful.
-	 * <p>The command is executed within an UndoInterval and WriteAction model operation.
-	 * @throws <AssertFailError> if the command did not run successfully 
-	 * @author choang
-	 */
-	protected void testCommand(
-		final Command command,
-		final ITestCommandCallback callback) {
-		
-		assertNotNull(command);
-
-		// Had to wrap each command in separate model operations
-		// as if we didn't we got some weird behavior in some of the tests
-		// such as the ConnectorTests#testSelfConnections where we get a null pointer
-		// exception.
-
-		final DiagramState state1 = getDiagramState();
-
-		getCommandStack().execute(command);
-		flushEventQueue();
-
-		try {
-			TransactionUtil.getEditingDomain(getDiagram()).runExclusive(
-				new Runnable() {
-				public void run() {
-					callback.onCommandExecution();
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-			assertTrue(false);
-		}
-		
-		DiagramState state2 = getDiagramState();
-
-		// checking if the command stack is in an undoable state first
-		// not that selfConnections and deleteConnections tests are
-		// failing .. if i do a check via command.canUndo() instead of
-		// using getCommandSTack().canUndo()
-		// which suggest that something is out of synch between the command
-		// and the command stack .. need to look into it later.
-		if (getCommandStack().canUndo()) {
-
-			getCommandStack().undo();
-			flushEventQueue();
-
-			assertTrue(state1.equals(getDiagramState()));
-
-			getCommandStack().redo();
-			flushEventQueue();
-		}
-
-		assertTrue(state2.equals(getDiagramState()));
-
-	}
-
-	/**
-	 * Description:  Will execute the <code>Action</code> and then the <code>ITestCommandCallBack</code>, which 
-	 * has the logic to verify that the command executed successful.
-	 * This method will test if the action implements the Disposable interface from GEF
-	 * If it does it will call the dispose() method on the action. Callers should not 
-	 * call it themselves
-	 * @throws <AssertFailError> if the command did not run successfully 
-	 * 
-	 */
-	protected void testAction(IAction action, ITestActionCallback callback) {
-		flushEventQueue();
-		assertTrue(action.isEnabled());
-		action.run();
-		flushEventQueue();
-		if (action instanceof Disposable)
-			((Disposable) action).dispose();
-		if (callback != null)
-			callback.onRunExecution();
-	}
-
-	/**
-	 * Description:  Will execute the <code>Action</code> and then the <code>ITestCommandCallBack</code>, which 
-	 * has the logic to verify that the command executed successful.
-	 * This method will test if the action implements the IDisposableAction interface from common.ui
-	 * If it does it will first set active the diagrameditorpart of the diagram and then call the init() method before running the action. At the end,
-	 * it will call the dispose() method on the action. Callers should not 
-	 * call these two methods themselves themselves
-	 * @throws <AssertFailError> if the command did not run successfully 
-	 * 
-	 */
-	protected void testAction(IDisposableAction action, ITestActionCallback callback) {
-
-		getWorkbenchPage().activate(getDiagramWorkbenchPart());
-		action.init();
-
-		if( action.isEnabled() ) {
-		
-			action.run();
-			flushEventQueue();
-		}
-
-		action.dispose();
-		if (callback != null)
-			callback.onRunExecution();
-	}
-	
-	/**
-	 * Does the same as <code>testAction</code> but also does an undo and
-	 * redo afterwards and compares the diagram state.
-	 * 
-	 * @param action
-	 * @param callback
-	 */
-	protected void testActionAndUndoRedo(IDisposableAction action, ITestActionCallback callback) {
-
-		final DiagramState state1 = getDiagramState();
-
-		getWorkbenchPage().activate(getDiagramWorkbenchPart());
-		action.init();
-
-		if( action.isEnabled() ) {
-		
-			action.run();
-			flushEventQueue();
-		}
-
-		action.dispose();
-		if (callback != null)
-			callback.onRunExecution();
-		
-		DiagramState state2 = getDiagramState();
-		assertTrue("testActionAndUndoRedo: Action cannot be undone.", getCommandStack().canUndo()); //$NON-NLS-1$
-		getCommandStack().undo();
-		assertTrue("diagram state different after undo of action", state1.equals(getDiagramState())); //$NON-NLS-1$
-		getCommandStack().redo();
-		assertTrue("diagram state different after redo of action", state2.equals(getDiagramState())); //$NON-NLS-1$
-	}
-
-	/**
-	 * Method testProperty.
-	 * Generic method for testing a property change in a view.
-	 * 
-	 * @param view IView to set the property value in
-	 * @param property String ID of the property to test
-	 * @param expectedValue Object that is the value of the property to test
-	 */
-	protected void testProperty(
-		final View view,
-		final String property,
-		final Object expectedValue) {
-		
-		DiagramEditPart diagramEP = getDiagramEditPart();
-		assertNotNull( "The DiagramEditPart is null", diagramEP ); //$NON-NLS-1$
-		
-		RootEditPart rootEP = diagramEP.getRoot();
-		assertNotNull( "The RootEditPart is null", rootEP ); //$NON-NLS-1$
-		
-		EditPartViewer viewer = rootEP.getViewer();
-		assertNotNull( "The EditPartViewer is null", viewer ); //$NON-NLS-1$
-		
-		Map epRegistry = viewer.getEditPartRegistry();
-		assertNotNull( "The EditPartRegistery is null", epRegistry ); //$NON-NLS-1$
-		
-		final IGraphicalEditPart ep = (IGraphicalEditPart) epRegistry.get(view);
-		assertNotNull( "Couldn't find the GraphicalEditPart in the Registery", ep ); //$NON-NLS-1$
-
-		Request request = new ChangePropertyValueRequest(
-				StringStatics.BLANK,
-				property,
-				expectedValue );
-		
-		Command cmd = ep.getCommand( request );
-
-		testCommand(cmd, new ITestCommandCallback() {
-			public void onCommandExecution() {
-					assertEquals( expectedValue, ep.getStructuralFeatureValue((EStructuralFeature)PackageUtil.getElement(property)) );
-			}
-		});
-	}
-
-	/**
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		getTestFixture().setup();
-	}
-
-	/**
-	 * Clears the display's event queue.
-	 * Same as calling <code>getTestFixture().flushEventQueue()</code>
-	 */
-	protected void flushEventQueue() {
-		getTestFixture().flushEventQueue();
-	}
-
-	/** Same as calling <code>getTestFixture().tearDown()</code>. */
-	protected void tearDown() throws Exception {
-
-		flushEventQueue();
-		getTestFixture().tearDown();
-	}
-
-	/**
-	 * Creates a new shape view as a child of the diagram at the given location
-	 * @param editor
-	 * @param semanticElement
-	 * @param location
-	 * @return IShapeView
-	 * @deprecated use createShapeView(IDiagramWorkbenchPart,Eobject,Point)
-	 */
-	/*
-	protected IShapeView createShapeView(
-		IDiagramWorkbenchPart editor,
-		IElement semanticElement,
-		Point location) {
-
-		CompoundCommand cc = new CompoundCommand();
-
-		CreateViewRequest request =	new CreateViewRequest(semanticElement);
-		request.setLocation(location);
-
-		cc.add(editor.getDiagramEditPart().getCommand(request));
-
-		RefreshConnectorsRequest rcRequest =
-			new RefreshConnectorsRequest(request.getNewObject());
-		cc.add(
-			getDiagramWorkbenchPart().getDiagramEditPart().getCommand(
-				rcRequest));
-
-		getCommandStack().execute(cc);
-
-		return (IShapeView)
-			((IAdaptable) (request.getNewObject()).get(0)).getAdapter(
-			IShapeView.class);
-	}
-	*/
-
-	/**
-	 * Creates a new shape view as a child of the diagram at the given location
-	 * @param editor
-	 * @param semanticElement
-	 * @param location
-	 * @return IShapeView
-	 */
-	protected View createShapeView(
-		DiagramEditPart diagramEP,
-		EObject semanticElement,
-		Point location) {
-
-		CompoundCommand cc = new CompoundCommand();
-
-		CreateViewRequest request = new CreateViewRequest(semanticElement,
-			getTestFixture().getPreferencesHint());
-		request.setLocation(location);
-
-		cc.add(diagramEP.getCommand(request));
-
-		RefreshConnectionsRequest rcRequest =
-			new RefreshConnectionsRequest((List)request.getNewObject());
-		cc.add(getDiagramEditPart().getCommand(rcRequest));
-
-		getCommandStack().execute(cc);
-
-		return (View)
-			((IAdaptable) ((List)request.getNewObject()).get(0)).getAdapter(
-			View.class);
-	}
-
-	protected void clearDiagram() {
-		testAction(SelectAllAction.createSelectAllAction(getWorkbenchPage()), null);
-
-		testAction(
-			GlobalActionManager.getInstance().createActionHandler(
-				getWorkbenchPage(),
-				GlobalActionId.DELETE), null);
-	}
-	
-	/** 
-	 * Return the figure in which elements are being added to. 
-	 * @return <code>getDiagramEditPart().getFigure()</code>.
-	 */
-	protected IFigure getDrawSurfaceFigure() {
-		return getDiagramEditPart().getFigure();
-	}
-	
-	/** 
-	 * Return the editpart in which elements are being added to.
-	 * @return <code>getDiagramEditPart()</code>.
-	 */
-	protected IGraphicalEditPart getDrawSurfaceEditPart() {
-		return getDiagramEditPart();
-	}
-	
-	
-	/** Return the supplied editpart's {@link ShapeNodeEditPart}children. */
-	protected List getShapesIn(IGraphicalEditPart parent) {
-		assertNotNull(parent);
-		List shapes = new ArrayList();
-		
-		Iterator it = parent.getChildren().iterator();
-		while (it.hasNext()) {
-			Object child = it.next();
-			if (child instanceof ShapeNodeEditPart) {
-				shapes.add(child);
-			}
-		}
-		return shapes;
-	}
-
-	/** Return <code>getDiagramEditPart().getConnectors()</code>. */
-	protected List getConnectors() {
-		return getDiagramEditPart().getConnections();
-	}
-	
-	/* Will run teardown if the setup fails.
-	 * @see junit.framework.TestCase#runBare()
-	 */
-	public void runBare()
-		throws Throwable {
-		
-		try {
-			setUp();
-			runTest();
-		}
-		finally {
-			tearDown();
-		}
-	}
-    
-    /**
-     * Reorients the connection to a new target.
-     * 
-     * @param connectionEditPart
-     *            the connection editpart to be reoriented
-     * @param targetEditPart
-     *            the new target editpart
-     * @param supported
-     *            should this gesture be supported?
-     * @return the command that was executed
-     */
-    protected Command reorientConnectionTarget(
-            final ConnectionEditPart connectionEditPart,
-            final IGraphicalEditPart targetEditPart, boolean supported) {
-        ReconnectRequest reconnectReq = new ReconnectRequest(
-            RequestConstants.REQ_RECONNECT_TARGET);
-        reconnectReq.setConnectionEditPart(connectionEditPart);
-        reconnectReq.setTargetEditPart(targetEditPart);
-        reconnectReq.setLocation(targetEditPart.getFigure().getBounds()
-            .getTopRight());
-        Command cmd = targetEditPart.getCommand(reconnectReq);
-        if (supported) {
-            testCommand(cmd, new ITestCommandCallback() {
-
-                public void onCommandExecution() {
-                    assertTrue(connectionEditPart.getTarget() == targetEditPart);
-                }
-            });
-        } else {
-            assertTrue(cmd == null || !cmd.canExecute());
-        }
-        return cmd;
-    }
-
-    /**
-     * Reorients the connection to a new source.
-     * 
-     * @param connectionEditPart
-     *            the connection editpart to be reoriented
-     * @param sourceEditPart
-     *            the new source editpart
-     * @param supported
-     *            should this gesture be supported?
-     * @return the command that was executed
-     */
-    protected Command reorientConnectionSource(
-            final ConnectionEditPart connectionEditPart,
-            final IGraphicalEditPart sourceEditPart, boolean supported) {
-        ReconnectRequest reconnectReq = new ReconnectRequest(
-            RequestConstants.REQ_RECONNECT_SOURCE);
-        reconnectReq.setConnectionEditPart(connectionEditPart);
-        reconnectReq.setTargetEditPart(sourceEditPart);
-        reconnectReq.setLocation(sourceEditPart.getFigure().getBounds()
-            .getTopRight());
-        Command cmd = sourceEditPart.getCommand(reconnectReq);
-        if (supported) {
-            testCommand(cmd, new ITestCommandCallback() {
-
-                public void onCommandExecution() {
-                    assertTrue(connectionEditPart.getSource() == sourceEditPart);
-                }
-            });
-        } else {
-            assertTrue(cmd == null || !cmd.canExecute());
-        }
-        return cmd;
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AllTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AllTests.java
deleted file mode 100644
index 4097239..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/AllTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************

- * Copyright (c) 2002, 2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this 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.diagram.ui;

-

-import java.util.Arrays;

-

-import junit.framework.Test;

-import junit.framework.TestCase;

-import junit.framework.TestSuite;

-import junit.textui.TestRunner;

-

-import org.eclipse.gmf.tests.runtime.diagram.core.DiagramEditingDomainFactoryTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandUtilitiesTest;

-import org.eclipse.gmf.tests.runtime.diagram.ui.commands.SemanticCreateCommandTest;

-import org.eclipse.gmf.tests.runtime.diagram.ui.label.LabelTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.DiagramAssistantTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.DiagramGraphicalViewerTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.GroupTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.GroupsInCompartmentTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LayoutTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicCanonicalTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicCreationTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicDiagramTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicTransientViewsTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.PaletteTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.TextAlignmentTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.parts.ConnectionHandleLocatorTest;

-import org.eclipse.gmf.tests.runtime.diagram.ui.parts.ConnectionHandleTest;

-import org.eclipse.gmf.tests.runtime.diagram.ui.parts.DiagramCommandStackTest;

-import org.eclipse.gmf.tests.runtime.diagram.ui.parts.GraphicalNodeEditPolicyTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.render.util.CopyToImageUtilTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.requests.RequestTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.services.DiagramEventBrokerServiceTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.services.PaletteServiceTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.tools.ConnectionToolTests;

-import org.eclipse.gmf.tests.runtime.diagram.ui.tools.RubberBandSelectionToolTest;

-

-public class AllTests extends TestCase {

-

-	public static void main(String[] args) {

-		TestRunner.run(suite());

-	}

-

-	public static Test suite() {

-		TestSuite suite = new TestSuite();

-		suite.addTest(DiagramCommandStackTest.suite());

-		suite.addTest(ConnectionHandleLocatorTest.suite());

-		suite.addTest(ConnectionHandleTest.suite());

-		suite.addTest(NoteTests.suite());

-		suite.addTest(CommandTests.suite());

-		//suite.addTest(URLImageEditPartTests.suite());

-		suite.addTest(ConnectorTests.suite()); 

-		suite.addTest(DiagramTests.suite());

-		suite.addTest(ShapeTests.suite());

-		suite.addTestSuite(RubberBandSelectionToolTest.class);

-		suite.addTest(PaletteServiceTests.suite());

-		suite.addTest(LogicCanonicalTests.suite());

-		suite.addTest(LogicCreationTests.suite());

-		suite.addTest(DiagramGraphicalViewerTests.suite());

-		suite.addTest(LogicDiagramTests.suite());

-		//suite.addTest(LogicShapeTests.suite());

-		suite.addTest(DiagramAssistantTests.suite());

-		suite.addTest(SemanticCreateCommandTest.suite());

-		suite.addTest(PaletteTests.suite());

-		suite.addTest(GraphicalNodeEditPolicyTests.suite());

-		// temporarily removed to check if it's causing problems on a build server

-		//suite.addTest(DiagramEventBrokerTests.suite());

-		suite.addTest(LogicTransientViewsTests.suite());

-		suite.addTest(RequestTests.suite());

-		suite.addTest(ConnectionToolTests.suite());

-        suite.addTest(CopyToImageUtilTests.suite());

-        suite.addTest(DiagramEditingDomainTestCase.suite());

-        suite.addTest(CommandUtilitiesTest.suite());

-        suite.addTest(DiagramEventBrokerServiceTests.suite());  

-        suite.addTest(LabelTests.suite());        

-        suite.addTest(GroupTests.suite());

-        suite.addTest(GroupsInCompartmentTests.suite());

-        suite.addTest(LayoutTests.suite());

-        suite.addTest(TextAlignmentTests.suite());

-        suite.addTest(DiagramEditingDomainFactoryTests.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.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ConnectorTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ConnectorTests.java
deleted file mode 100644
index a3808f8..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ConnectorTests.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.Connection;
-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.gef.ConnectionEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gef.tools.ConnectionEndpointTracker;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-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.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.commands.SetConnectionBendpointsCommand;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.LineSeg;
-import org.eclipse.gmf.runtime.draw2d.ui.geometry.PointListUtilities;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Routing;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture;
-
-/**
- * @author sshaw
- * 
- * ConnectorsTests
- */
-public class ConnectorTests
-	extends AbstractConnectionTests {
-
-	public static Test suite() {
-		return new TestSuite(ConnectorTests.class);
-	}
-
-	/**
-	 * @param arg0
-	 */
-	public ConnectorTests(String arg0) {
-		super(arg0);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new DiagramTestFixture();
-	}
-
-	protected AbstractPresentationTestFixture getFixture() {
-		return (AbstractPresentationTestFixture) testFixture;
-	}
-
-	public void testSelfConnector_RATLC00533255()
-		throws Exception {
-		try {
-			getFixture().openDiagram();
-			// Add a notes.
-			NoteEditPart note1EP = (NoteEditPart) getFixture()
-				.createShapeUsingTool(DiagramNotationType.NOTE,
-					new Point(10, 10));
-
-			ConnectionNodeEditPart line = (ConnectionNodeEditPart) getFixture()
-				.createConnectorUsingTool(note1EP, note1EP, GeoshapeType.LINE);
-
-			flushEventQueue();
-
-			class MyConnectorEndpointTracker
-				extends ConnectionEndpointTracker {
-
-				private Point location;
-
-				public MyConnectorEndpointTracker(ConnectionEditPart cep,
-						Point location) {
-					super(cep);
-					this.location = location;
-				}
-
-				public void updateTargetRequest() {
-					super.updateTargetRequest();
-				}
-
-				public Request getTargetRequest() {
-					return super.getTargetRequest();
-				}
-
-				public Point getLocation() {
-					return location;
-				}
-
-				public boolean updateTargetUnderMouse() {
-					return false;
-				}
-			}
-
-			PointList pointList = line.getConnectionFigure().getPoints();
-			assertTrue(pointList.size() > 1);
-			assertFalse(pointList.getFirstPoint().equals(
-				pointList.getLastPoint()));
-			Point copySrcPoint = pointList.getFirstPoint().getCopy();
-			copySrcPoint.translate(0, 20);
-			MyConnectorEndpointTracker tracker = new MyConnectorEndpointTracker(
-				line, copySrcPoint);
-			tracker.setCommandName(RequestConstants.REQ_RECONNECT_SOURCE);
-			tracker.setConnectionEditPart(line);
-			tracker.updateTargetRequest();
-			ReconnectRequest reconnectRequest = (ReconnectRequest) tracker
-				.getTargetRequest();
-			reconnectRequest.setTargetEditPart(note1EP);
-
-			Command command = note1EP.getCommand(reconnectRequest);
-			getCommandStack().execute(command);
-			flushEventQueue();
-
-			PointList pointList_2 = line.getConnectionFigure().getPoints();
-			assertTrue(pointList.size() > 1);
-			Point srcPoint_2 = pointList_2.getFirstPoint();
-			Point targetPoint_2 = pointList_2.getLastPoint();
-			assertFalse(srcPoint_2.equals(targetPoint_2));
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		} finally {
-			getFixture().closeDiagram();
-		}
-	}
-
-	public void testReorientRectilinear_bugzilla113003()
-		throws Exception {
-		try {
-			getFixture().openDiagram();
-			// Add a notes.
-			NoteEditPart note1EP = (NoteEditPart) getFixture()
-				.createShapeUsingTool(DiagramNotationType.NOTE,
-					new Point(10, 10));
-
-			NoteEditPart note2EP = (NoteEditPart) getFixture()
-			.createShapeUsingTool(DiagramNotationType.NOTE,
-				new Point(300, 10));
-			
-			ConnectionNodeEditPart line = (ConnectionNodeEditPart) getFixture()
-			.createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-			
-			flushEventQueue();
-
-			Request request = new ChangePropertyValueRequest(
-				StringStatics.BLANK,
-				Properties.ID_ROUTING,
-				Routing.RECTILINEAR_LITERAL );
-		
-			Command cmd = line.getCommand( request );
-			getCommandStack().execute(cmd);
-
-			// Now move the line in order to create 2 bendpoints
-			PointList pointList = line.getConnectionFigure().getPoints();
-			
-			PointList newpts = new PointList(3);
-			newpts.addPoint(new Point(pointList.getFirstPoint()));
-			newpts.addPoint(new Point(new Point(150, 100)));
-			newpts.addPoint(new Point(pointList.getLastPoint()));
-
-			Point r1 = new Point(pointList.getFirstPoint());
-			Point r2 = new Point(pointList.getLastPoint());
-
-			SetConnectionBendpointsCommand bendpointsChanged =
-				new SetConnectionBendpointsCommand(getTestFixture().getEditingDomain());
-			bendpointsChanged.setEdgeAdapter(new EObjectAdapter(line.getNotationView()));
-			bendpointsChanged.setNewPointList(newpts, r1, r2);
-			
-			getCommandStack().execute(new ICommandProxy(bendpointsChanged));
-			flushEventQueue();
-
-			assertEquals("Wrong number of points.", 5, line.getConnectionFigure().getPoints().size()); //$NON-NLS-1$
-			
-			class MyConnectorEndpointTracker
-				extends ConnectionEndpointTracker {
-
-				private Point location;
-
-				public MyConnectorEndpointTracker(ConnectionEditPart cep,
-						Point location) {
-					super(cep);
-					this.location = location;
-				}
-
-				public boolean handleDragInProgress() {
-					return super.handleDragInProgress();
-				}
-
-				public Request getTargetRequest() {
-					return super.getTargetRequest();
-				}
-
-				public Point getLocation() {
-					return location;
-				}
-
-				public boolean updateTargetUnderMouse() {
-					return false;
-				}
-			}
-
-			assertTrue(pointList.size() > 1);
-			assertFalse(pointList.getFirstPoint().equals(
-				pointList.getLastPoint()));
-			
-			// track it into space...
-			Point newSrcPoint = new Point(500, 500);
-			MyConnectorEndpointTracker tracker = new MyConnectorEndpointTracker(
-				line, newSrcPoint);
-			tracker.setCommandName(RequestConstants.REQ_RECONNECT_SOURCE);
-			tracker.setConnectionEditPart(line);
-			tracker.handleDragInProgress();
-			line.getConnectionFigure().revalidate();
-			
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		} finally {
-			getFixture().closeDiagram();
-		}
-	}
-    
-    /**
-     * A callback mechanism to test the line.
-     */
-    private static interface LineTester {
-        void testLine(ConnectionEditPart lineEP); 
-    }
-    
-    /**
-     * Performs some tests with rectilinear connections to ensure that the line is
-     * always connected to the source and target and that the line is rectilinear.See bugzilla#112996 for a
-     * description of the original issue.If this test fails, it can be
-     * reproduced manually on a logic diagram with notes and note attachments.
-     * See the console output for the location of the notes.
-     * 
-     * @author Cherie Revells
-     * @throws Exception
-     */
-    public void testRectilinearRoutingToConnection()
-        throws Exception {
-        try {
-            getFixture().openDiagram();
-
-            // Add three notes.
-            final ShapeEditPart note1EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(100, 100));
-            final ShapeEditPart note2EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(200, 300));
-            final ShapeEditPart note3EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(300, 100));
-
-            flushEventQueue();
-
-            ConnectionNodeEditPart targetLineEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-            ConnectionNodeEditPart lineToTestEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note3EP, targetLineEP,
-                    GeoshapeType.LINE);
-
-            Request request = new ChangePropertyValueRequest(
-                StringStatics.BLANK, Properties.ID_ROUTING,
-                Routing.RECTILINEAR_LITERAL);
-
-            Command cmd = lineToTestEP.getCommand(request);
-            getCommandStack().execute(cmd);
-            flushEventQueue();
-
-            moveShapeAndTestLine(note3EP, lineToTestEP, new LineTester() {
-
-                public void testLine(ConnectionEditPart lineEP) {
-                    if (!areEndsConnected(lineEP)) {
-                        failWithMessage("ends not connected", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    } else if (!isRectilinear(lineEP)) {
-                        failWithMessage("not rectilinear", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    }
-                }
-            });
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            getFixture().closeDiagram();
-        }
-    }
-
-    /**
-     * Performs some tests with rectilinear connections to ensure that the line is
-     * always connected to the source and target and that the line is rectilinear.See bugzilla#112996 for a
-     * description of the original issue.If this test fails, it can be
-     * reproduced manually on a logic diagram with notes and note attachments.
-     * See the console output for the location of the notes.
-     * 
-     * @author Cherie Revells
-     * @throws Exception
-     */
-    public void testRectilinearRoutingFromConnection()
-        throws Exception {
-        try {
-            getFixture().openDiagram();
-
-            // Add three notes.
-            final ShapeEditPart note1EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(100, 100));
-            final ShapeEditPart note2EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(200, 300));
-            final ShapeEditPart note3EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(300, 100));
-
-            flushEventQueue();
-
-            ConnectionNodeEditPart sourceLineEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-
-            // Throw in some bendpoints
-
-            ConnectionNodeEditPart lineToTestEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(sourceLineEP, note3EP,
-                    GeoshapeType.LINE);
-
-            Request request = new ChangePropertyValueRequest(
-                StringStatics.BLANK, Properties.ID_ROUTING,
-                Routing.RECTILINEAR_LITERAL);
-
-            Command cmd = lineToTestEP.getCommand(request);
-            getCommandStack().execute(cmd);
-            flushEventQueue();
-
-            moveShapeAndTestLine(note3EP, lineToTestEP, new LineTester() {
-
-                public void testLine(ConnectionEditPart lineEP) {
-                    if (!areEndsConnected(lineEP)) {
-                        failWithMessage("ends not connected", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    } else if (!isRectilinear(lineEP)) {
-                        failWithMessage("not rectilinear", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    }
-                }
-            });
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            getFixture().closeDiagram();
-        }
-    }
-
-    /**
-     * Performs some tests with oblique connections to ensure that the line is
-     * always connected to the source and target.If this test fails, it can be
-     * reproduced manually on a logic diagram with notes and note attachments.
-     * See the console output for the location of the notes.
-     * 
-     * @author Cherie Revells
-     * @throws Exception
-     */
-    public void testObliqueRoutingToConnection()
-        throws Exception {
-        try {
-            getFixture().openDiagram();
-
-            // Add three notes.
-            final ShapeEditPart note1EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(100, 100));
-            final ShapeEditPart note2EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(200, 300));
-            final ShapeEditPart note3EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(300, 100));
-            flushEventQueue();
-
-            ConnectionNodeEditPart targetLineEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-            ConnectionNodeEditPart lineToTestEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note3EP, targetLineEP,
-                    GeoshapeType.LINE);
-            flushEventQueue();
-
-            moveShapeAndTestLine(note3EP, lineToTestEP, new LineTester() {
-
-                public void testLine(ConnectionEditPart lineEP) {
-                    if (!areEndsConnected(lineEP)) {
-                        failWithMessage("ends not connected", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    }
-                }
-            });
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            getFixture().closeDiagram();
-        }
-    }
-
-    /**
-     * Performs some tests with oblique connections to ensure that the line is
-     * always connected to the source and target.If this test fails, it can be
-     * reproduced manually on a logic diagram with notes and note attachments.
-     * See the console output for the location of the notes.
-     * 
-     * @author Cherie Revells
-     * @throws Exception
-     */
-    public void testObliqueRoutingFromConnection()
-        throws Exception {
-        try {
-            getFixture().openDiagram();
-
-            // Add three notes.
-            final ShapeEditPart note1EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(100, 100));
-            final ShapeEditPart note2EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(200, 300));
-            final ShapeEditPart note3EP = getFixture().createShapeUsingTool(
-                DiagramNotationType.NOTE, new Point(300, 100));
-            flushEventQueue();
-
-            ConnectionNodeEditPart sourceLineEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-            ConnectionNodeEditPart lineToTestEP = (ConnectionNodeEditPart) getFixture()
-                .createConnectorUsingTool(sourceLineEP, note3EP,
-                    GeoshapeType.LINE);
-            flushEventQueue();
-
-            moveShapeAndTestLine(note3EP, lineToTestEP, new LineTester() {
-
-                public void testLine(ConnectionEditPart lineEP) {
-                    if (!areEndsConnected(lineEP)) {
-                        failWithMessage("ends not connected", lineEP, note1EP, //$NON-NLS-1$
-                            note2EP, note3EP);
-                    }
-                }
-            });
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            getFixture().closeDiagram();
-        }
-    }
-
-    public void testConnectionBendpoints()
-    	throws Exception {
-    try {
-        getFixture().openDiagram();
-
-        // Add three notes.
-        final ShapeEditPart note1EP = getFixture().createShapeUsingTool(
-            DiagramNotationType.NOTE, new Point(100, 100));
-        final ShapeEditPart note2EP = getFixture().createShapeUsingTool(
-            DiagramNotationType.NOTE, new Point(200, 300));
-        flushEventQueue();
-
-        ConnectionNodeEditPart lineEP = (ConnectionNodeEditPart) getFixture()
-            .createConnectorUsingTool(note1EP, note2EP, GeoshapeType.LINE);
-        flushEventQueue();
-        
-		PointList pointList = lineEP.getConnectionFigure().getPoints().getCopy();
-		Point pt1 = pointList.getFirstPoint();
-		Point pt2 = pointList.getLastPoint();
-		Point bend = new Point((pt1.x + pt2.x) / 2, pt1.y);
-		pointList.insertPoint(bend, 1);
-		SetConnectionBendpointsCommand bendpointsChanged =
-			new SetConnectionBendpointsCommand(getTestFixture().getEditingDomain());
-		bendpointsChanged.setEdgeAdapter(new EObjectAdapter(lineEP.getNotationView()));
-			bendpointsChanged.setNewPointList(pointList, lineEP
-					.getConnectionFigure().getSourceAnchor()
-					.getReferencePoint(), lineEP.getConnectionFigure()
-					.getTargetAnchor().getReferencePoint());
-		
-		getCommandStack().execute(new ICommandProxy(bendpointsChanged));
-		flushEventQueue();
-		assertEquals("Wrong number of bendpoints for the model", 3, ((RelativeBendpoints)((Edge)lineEP.getNotationView()).getBendpoints()).getPoints().size());
-		assertEquals("Wrong number of bendpoints for the figure", 3, lineEP.getConnectionFigure().getPoints().size());
-		
-		pointList = lineEP.getConnectionFigure().getPoints().getCopy();
-		pt1 = pointList.getFirstPoint();
-		pt2 = pointList.getLastPoint();
-		bend = new Point((pt1.x + pt2.x) / 4, (pt1.y + pt2.y) / 2);
-		pointList.insertPoint(bend, 2);
-		bendpointsChanged =
-			new SetConnectionBendpointsCommand(getTestFixture().getEditingDomain());
-		bendpointsChanged.setEdgeAdapter(new EObjectAdapter(lineEP.getNotationView()));
-			bendpointsChanged.setNewPointList(pointList, lineEP
-					.getConnectionFigure().getSourceAnchor()
-					.getReferencePoint(), lineEP.getConnectionFigure()
-					.getTargetAnchor().getReferencePoint());
-		getCommandStack().execute(new ICommandProxy(bendpointsChanged));
-		flushEventQueue();
-		assertEquals("Wrong number of bendpoints for the model", 4, ((RelativeBendpoints)((Edge)lineEP.getNotationView()).getBendpoints()).getPoints().size());
-		assertEquals("Wrong number of bendpoints for the figure", 4, lineEP.getConnectionFigure().getPoints().size());
-
-		getCommandStack().undo();
-		flushEventQueue();		
-		assertEquals("Wrong number of bendpoints for the model", 3, ((RelativeBendpoints)((Edge)lineEP.getNotationView()).getBendpoints()).getPoints().size());
-		assertEquals("Wrong number of bendpoints for the figure", 3, lineEP.getConnectionFigure().getPoints().size());
-		
-		getCommandStack().redo();
-		flushEventQueue();
-		assertEquals("Wrong number of bendpoints for the model", 4, ((RelativeBendpoints)((Edge)lineEP.getNotationView()).getBendpoints()).getPoints().size());
-		assertEquals("Wrong number of bendpoints for the figure", 4, lineEP.getConnectionFigure().getPoints().size());
-
-    } catch (Exception ex) {
-        ex.printStackTrace();
-    } finally {
-        getFixture().closeDiagram();
-    }
-}
-    /**
-     * Verifies conditions on the line as note3 is moved around.
-     * @param note1EP
-     * @param note2EP
-     * @param note3EP
-     * @param lineToTestEP
-     * @param isRectilinear
-     */
-    private void moveShapeAndTestLine(ShapeEditPart shapeToMoveEP,
-            ConnectionNodeEditPart lineToTestEP, LineTester lineTester) {
-
-        lineTester.testLine(lineToTestEP);
-
-        // Move the end note around a bit so that the rectilinear connection
-        // will move.
-        ChangeBoundsRequest moveRequest = new ChangeBoundsRequest(
-            RequestConstants.REQ_MOVE);
-        moveRequest.setEditParts(shapeToMoveEP);
-
-        for (int i = 0; i <= 50; i++) {
-            moveRequest.setMoveDelta(new Point(0, 5));
-            getCommandStack().execute(shapeToMoveEP.getCommand(moveRequest));
-            flushEventQueue();
-            lineTester.testLine(lineToTestEP);
-        }
-        for (int i = 0; i <= 50; i++) {
-            moveRequest.setMoveDelta(new Point(-5, 0));
-            getCommandStack().execute(shapeToMoveEP.getCommand(moveRequest));
-            flushEventQueue();
-            lineTester.testLine(lineToTestEP);
-        }
-        for (int i = 0; i <= 50; i++) {
-            moveRequest.setMoveDelta(new Point(0, -5));
-            getCommandStack().execute(shapeToMoveEP.getCommand(moveRequest));
-            flushEventQueue();
-            lineTester.testLine(lineToTestEP);
-        }
-    }
-
-    /**
-     * Verifies that the connection editpart passed in is connected to the
-     * source and target ends.
-     * 
-     * @param lineEP
-     * @return
-     */
-    private boolean areEndsConnected(ConnectionEditPart lineEP) {
-
-        Point firstPoint = ((Connection) lineEP.getFigure()).getPoints()
-            .getFirstPoint();
-        Point lastPoint = ((Connection) lineEP.getFigure()).getPoints()
-            .getLastPoint();
-
-        // Leave a little space to account for rounding errors in himetric mode.  It is hardly noticeable.
-        Dimension buffer = new Dimension(3, 3);
-
-        lineEP.getFigure().translateToRelative(buffer);
-
-        IFigure sourceFigure = ((IGraphicalEditPart) lineEP.getSource())
-            .getFigure();
-        if (sourceFigure instanceof Connection) {
-            PointList points = ((Connection) sourceFigure).getPoints();
-            int index = PointListUtilities.findNearestLineSegIndexOfPoint(
-                points, firstPoint);
-            LineSeg lineSeg = (LineSeg) PointListUtilities.getLineSegments(
-                points).get(index - 1);
-            if (!lineSeg.containsPoint(firstPoint, buffer.height * 2)) {
-                return false;
-            }
-        } else {
-            Rectangle bounds = sourceFigure.getBounds().getCopy();
-            bounds.expand(buffer.width, buffer.height);
-            if (!bounds.contains(firstPoint)) {
-                return false;
-            }
-        }
-
-        IFigure targetFigure = ((IGraphicalEditPart) lineEP.getTarget())
-            .getFigure();
-        if (targetFigure instanceof Connection) {
-            PointList points = ((Connection) targetFigure).getPoints();
-            int index = PointListUtilities.findNearestLineSegIndexOfPoint(
-                points, lastPoint);
-            LineSeg lineSeg = (LineSeg) PointListUtilities.getLineSegments(
-                points).get(index - 1);
-            if (!lineSeg.containsPoint(lastPoint, buffer.height * 2)) {
-                return false;
-            }
-        } else {
-            Rectangle bounds = targetFigure.getBounds().getCopy();
-            bounds.expand(buffer.width, buffer.height);
-            if (!bounds.contains(lastPoint)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Verifies that the connection editpart passed in is actually rectilinear.
-     * 
-     * @param lineEP
-     * @return
-     */
-    private boolean isRectilinear(ConnectionEditPart lineEP) {
-
-        PointList points = ((Connection) lineEP.getFigure()).getPoints();
-
-        // Verify that the line is in fact rectilinear.
-        for (int i = 0; i < points.size() - 1; i++) {
-            Point ptCurrent = points.getPoint(i);
-            Point ptNext = points.getPoint(i + 1);
-            if (!(ptCurrent.x == ptNext.x || ptCurrent.y == ptNext.y)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Prints debug info to the console and fails the test.
-     */
-    private void failWithMessage(String message, ConnectionEditPart lineEP,
-            ShapeEditPart note1EP, ShapeEditPart note2EP, ShapeEditPart note3EP) {
-        System.out.println("------ " + message); //$NON-NLS-1$
-        System.out
-            .println("Issue can be reproduced with notes in the following locations:"); //$NON-NLS-1$
-        System.out.println("note1: " + note1EP.getFigure().getBounds()); //$NON-NLS-1$
-        System.out.println("note2: " + note2EP.getFigure().getBounds()); //$NON-NLS-1$
-        System.out.println("note3: " + note3EP.getFigure().getBounds()); //$NON-NLS-1$
-        System.out.println("connection start: " //$NON-NLS-1$
-            + ((Connection) lineEP.getFigure()).getPoints().getFirstPoint());
-        System.out.println("connection end: " //$NON-NLS-1$
-            + ((Connection) lineEP.getFigure()).getPoints().getLastPoint());
-
-        fail("See console for details."); //$NON-NLS-1$
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramEditingDomainTestCase.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramEditingDomainTestCase.java
deleted file mode 100644
index b0f421c..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramEditingDomainTestCase.java
+++ /dev/null
@@ -1,130 +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.diagram.ui;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-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.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.ResourceSetListenerImpl;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-
-
-public class DiagramEditingDomainTestCase
-	extends TestCase {
-
-	EClass eCls;
-	
-	public void testDiagramEventBrokerAsSpecialListener() {
-		final TransactionalEditingDomain domain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		final Resource r = domain.getResourceSet().createResource(URI.createURI("file:///foo.logic2")); //$NON-NLS-1$
-		eCls = EcoreFactory.eINSTANCE.createEClass();
-		eCls.setName(""); //$NON-NLS-1$
-		
-		// Set up the resource contents.
-		try {
-			new AbstractTransactionalCommand(domain, "Setup", null) { //$NON-NLS-1$
-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-					
-					r.getContents().add(eCls);
-					
-					return CommandResult.newOKCommandResult();
-				}
-			}.execute(new NullProgressMonitor(),null);
-		} catch (ExecutionException e) {
-			fail();
-		}
-		
-		DiagramEventBroker.startListening(domain);
-		DiagramEventBroker.getInstance(domain).addNotificationListener(eCls, new NotificationListener() {
-			public void notifyChanged(Notification notification) {
-				if (notification.getNotifier() == eCls && notification.getFeature() == EcorePackage.eINSTANCE.getENamedElement_Name()) {
-					try {
-						new AbstractTransactionalCommand(domain, "Add Attribute", null) { //$NON-NLS-1$
-							protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-								throws ExecutionException {
-								
-								eCls.getEStructuralFeatures().add(EcoreFactory.eINSTANCE.createEAttribute());
-								
-								return CommandResult.newOKCommandResult();
-							}
-							
-						}.execute(new NullProgressMonitor(),null);
-					} catch (ExecutionException e) {
-						fail();
-					}
-				}
-			}
-		});
-		
-		AbstractTransactionalCommand cmd = new AbstractTransactionalCommand(domain, "Set Name", null) { //$NON-NLS-1$
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info)
-				throws ExecutionException {
-				eCls.setName("foo"); //$NON-NLS-1$
-				
-				return CommandResult.newOKCommandResult();
-			}
-		};
-		
-		final boolean[] regularListenerWasCalled = new boolean[1];
-		final boolean[] notificationsWereEmpty = new boolean[1];
-		regularListenerWasCalled[0] = false;
-		notificationsWereEmpty[0] = true;
-		
-		domain.addResourceSetListener(new ResourceSetListenerImpl() {
-			public boolean isPostcommitOnly() {
-				return true;
-			}
-			
-			public void resourceSetChanged(ResourceSetChangeEvent event) {
-				regularListenerWasCalled[0] = true;
-				notificationsWereEmpty[0] = event.getNotifications().isEmpty();
-			}
-		});
-		
-		try {
-			cmd.execute(new NullProgressMonitor(),null);
-			cmd.undo(new NullProgressMonitor(),null);
-			cmd.redo(new NullProgressMonitor(), null);
-			cmd.undo(new NullProgressMonitor(),null);
-			cmd.redo(new NullProgressMonitor(),null);
-		} catch (ExecutionException e) {
-			fail();
-		}
-
-		assertSame(eCls.eResource(),r);
-		assertEquals(3,eCls.getEStructuralFeatures().size());
-		assertTrue(regularListenerWasCalled[0]);
-		assertFalse(notificationsWereEmpty[0]);
-	}
-
-	public static Test suite() {
-		return new TestSuite(DiagramEditingDomainTestCase.class);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramLinkTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramLinkTest.java
deleted file mode 100644
index ce02e65..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramLinkTest.java
+++ /dev/null
@@ -1,158 +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.diagram.ui;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-/**
- * @author mmostafa
- */
-public class DiagramLinkTest
-	extends TestCase {
-	
-	/**
-	 * 
-	 * @param TestName name for the test
-	 */
-	public DiagramLinkTest(String arg0) {
-		super(arg0);
-	}
-
-	
-	/**
-	 * Sets up the fixture.  The default setup includes:
-	 * - creating the project
-	 * - creating a diagram
-	 * - opening the diagram
-	 * - adding shapes
-	 * - adding connectors
-	 * 
-	 * This method is called before each test method is executed.
-	 */
-	protected void setup() throws Exception {
-		super.setUp();
-	}
-	
-	public static Test suite() {
-		return new TestSuite(DiagramLinkTest.class);
-	}
-	
-	public void testBrokenDiagramLink(){
-//		EAnnotation annotation = EcoreFactory.eINSTANCE.createEAnnotation();
-//		annotation.setSource("uml2.diagrams"); //$NON-NLS-1$
-//		Diagram diagram1 = NotationFactory.eINSTANCE.createDiagram();
-//		diagram1.setType("Class"); //$NON-NLS-1$
-//		diagram1.setName("Diagram1"); //$NON-NLS-1$
-//		diagram1.setVisible(true);
-//		
-//		// temp diagram 
-//		Diagram diagram2 = NotationFactory.eINSTANCE.createDiagram();
-//		diagram2.setType("Class"); //$NON-NLS-1$
-//		diagram2.setName("Diagram2"); //$NON-NLS-1$
-//		diagram1.setVisible(true);
-//		
-//		// add the diagrams to the model (so they will have guids)
-//		annotation.getContents().add(diagram1);
-//		annotation.getContents().add(diagram2);
-//		
-//		// simulate creating a valid Diagram Link	using the new format
-//		View link1 = ViewService.getInstance().createNode(new EObjectAdapter(diagram1),diagram1,ViewType.NOTE,0,true, PreferencesHint.USE_DEFAULTS); 
-//		assertValidDiagramLinkView(link1);
-//		
-//		
-//		//simulate loading  broken link using the new format	
-//		View link2 = ViewService.getInstance().createNode(new EObjectAdapter(diagram2),diagram1,ViewType.NOTE,0,true, PreferencesHint.USE_DEFAULTS); 
-//		assertValidDiagramLinkView(link2);
-//		link2.setElement(null);
-//		View link2NotationView = (View)EcoreUtil.copy(link2);
-//		diagram1.insertChild(link2NotationView);
-//		assertValidDiagramLinkView(link2NotationView);
-//		
-//		//simulate loading  valid link using the old format	
-//		View diagramLink = NotationFactory.eINSTANCE.createNode();
-//		diagramLink.setElement(diagram1);
-//		diagramLink.setVisible(true);
-//		diagram1.insertChild(diagramLink);
-//		assertValidDiagramLinkView(diagramLink);
-//		
-//		//simulate loading broken link using the old format	
-//		diagramLink = NotationFactory.eINSTANCE.createNode();
-//		diagramLink.setElement(null);
-//		diagramLink.setVisible(true);
-//		diagram1.insertChild(diagramLink);
-//		assertCorruptView(diagramLink);
-//		
-//		// last check will be making sure that normal Notes still working fine
-//		diagramLink = NotationFactory.eINSTANCE.createNode();
-//		diagramLink.setElement(null);
-//		diagramLink.setType(ViewType.NOTE);
-//		diagramLink.setVisible(true);
-//		diagram1.insertChild(diagramLink);
-//		assertValidNoteView(diagramLink);
-		
-	}
-
-
-	/**
-	 * @param link1
-	 * @return
-	 */
-	/*private IGraphicalEditPart assertValidDiagramLinkView(View link1) {
-		assertNotNull(link1);
-		// try to get the edit part
-		IGraphicalEditPart gEditPart1 = EditPartService.getInstance().createGraphicEditPart(link1);
-		assertNotNull(gEditPart1);
-		assertFalse(gEditPart1 instanceof DefaultNodeEditPart);
-		IFigure figure = gEditPart1.getFigure();
-		assertTrue(figure instanceof NoteFigure);
-		NoteFigure noteFigure = (NoteFigure)figure;
-		assertTrue(noteFigure.isDiagramLinkMode());
-		return gEditPart1;
-	}*/
-	
-	/**
-	 * @param link1
-	 * @return
-	 */
-	/*private IGraphicalEditPart assertValidNoteView(View link1) {
-		assertNotNull(link1);
-		// try to get the edit part
-		IGraphicalEditPart gEditPart1 = EditPartService.getInstance().createGraphicEditPart(link1);
-		assertNotNull(gEditPart1);
-		assertFalse(gEditPart1 instanceof DefaultNodeEditPart);
-		IFigure figure = gEditPart1.getFigure();
-		assertTrue(figure instanceof NoteFigure);
-		NoteFigure noteFigure = (NoteFigure)figure;
-		assertFalse(noteFigure.isDiagramLinkMode());
-		return gEditPart1;
-	}*/
-	
-	/**
-	 * @param link1
-	 * @return
-	 */
-	/*private IGraphicalEditPart assertCorruptView(View link1) {
-		if (link1==null)
-			return null;
-		assertNotNull(link1);
-		// try to get the edit part
-		IGraphicalEditPart gEditPart1 = EditPartService.getInstance().createGraphicEditPart(link1);
-		assertNotNull(gEditPart1);
-		assertFalse(gEditPart1 instanceof DefaultNodeEditPart);
-		return null;
-	}*/
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTestFixture.java
deleted file mode 100644
index 06929c9..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTestFixture.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.DiagramCreator;
-
-
-/**
- * @author sshaw
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class DiagramTestFixture extends AbstractPresentationTestFixture {
-
-	protected void createDiagram()
-		throws Exception {
-		setDiagram(DiagramCreator.createEmptyDiagram(getPreferencesHint(),
-			getEditingDomain()));
-	}
-
-	
-	protected void createProject()
-		throws Exception {
-		// do nothing
-
-	}
-	
-	protected void createShapesAndConnectors()
-		throws Exception {
-		
-		DiagramCreator.createNodes(getDiagram(), getPreferencesHint(),
-			getEditingDomain());
-			
-		EList children = getDiagram().getChildren();
-		Node node = (Node)children.get(0);
-		EList edges = node.getSourceEdges();
-		if (edges.size() > 0)
-			setConnectorView((Edge)edges.get(0));
-		else {
-			edges = node.getTargetEdges();
-			if (edges.size() > 0) {
-				setConnectorView((Edge)edges.get(0));
-			}
-		}
-	}
-	
-	public void openDiagram() throws Exception {
-		createDiagram();
-
-		createDiagramEditPart();
-	}
-	
-	public boolean closeDiagram() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.IPresentationTestFixture#getPreferencesHint()
-	 */
-	public PreferencesHint getPreferencesHint() {
-		return PreferencesHint.USE_DEFAULTS;
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTests.java
deleted file mode 100644
index e51a07b..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/DiagramTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui;
-
-import java.util.Date;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.Animation;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-
-/**
- * @author sshaw
- *
- * Diagram Tests
- */
-public class DiagramTests extends AbstractDiagramTests {
-
-	/**
-	 * @param arg0
-	 */
-	public DiagramTests(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public static Test suite() {
-		return new TestSuite(DiagramTests.class);
-	}
-	
-	protected void setTestFixture() {
-		testFixture = new DiagramTestFixture();
-	}
-	
-	
-	public void testAlignment()
-		throws Exception {
-		// do nothing since we can't open an editor for the default diagram case.
-	}
-	
-	public void testSelect()
-		throws Exception {
-		// do nothing since we can't open an editor for the default diagram case.
-	}
-	
-	public void testAnimatedLayout() throws Exception {
-		ArrangeRequest request = new ArrangeRequest(
-			ActionIds.ACTION_ARRANGE_ALL);
-		Command layoutCmd = getDiagramEditPart().getCommand(request);
-		
-		Animation.markBegin();
-		
-		assertTrue((layoutCmd != null && layoutCmd.canExecute()));
-		getCommandStack().execute(layoutCmd);
-		
-		long startTime = new Date().getTime();
-		Animation.run(800);
-		long endTime = new Date().getTime();
-		
-		assertTrue((endTime - startTime) >= 800);
-	}
-
-	public void testSetPixelMeasurementUnit(){
-		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();
-		diagram.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL);
-		assertEquals("get just after set (pixels)", MeasurementUnit.PIXEL_LITERAL, diagram.getMeasurementUnit()); //$NON-NLS-N$
-		try {
-			diagram.setMeasurementUnit(MeasurementUnit.HIMETRIC_LITERAL);
-		} catch (UnsupportedOperationException e) {
-			
-		} finally {
-			assertEquals("MeasurementUnit can't change now", MeasurementUnit.PIXEL_LITERAL, diagram.getMeasurementUnit()); //$NON-NLS-1$		
-		}
-	}
-
-	public void testSetHiMetricMeasurementUnit(){
-		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();
-		diagram.setMeasurementUnit(MeasurementUnit.HIMETRIC_LITERAL);
-		assertEquals("get just after set (hi-metric)", MeasurementUnit.HIMETRIC_LITERAL, diagram.getMeasurementUnit()); //$NON-NLS-N$
-		try {
-			diagram.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL);
-		} catch (UnsupportedOperationException e) {
-			
-		} finally {
-			assertEquals("MeasurementUnit can't change now", MeasurementUnit.HIMETRIC_LITERAL, diagram.getMeasurementUnit()); //$NON-NLS-1$		
-		}
-	}
-	
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/NoteTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/NoteTests.java
deleted file mode 100644
index fa309ec..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/NoteTests.java
+++ /dev/null
@@ -1,200 +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.tests.runtime.diagram.ui;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.INotableEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.TextEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantService;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestCommandCallback;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestFixture;
-
-/**
- * Tests functionality relating to notes, note attachments, and text shapes.
- * 
- * @author cmahoney
- */
-public class NoteTests
-	extends AbstractTestBase {
-
-	public NoteTests(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(NoteTests.class);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new PresentationTestFixture();
-	}
-
-	protected PresentationTestFixture getFixture() {
-		return (PresentationTestFixture) testFixture;
-	}
-
-	/**
-	 * Tests notes and note attachments.
-	 */
-	public void testNotesAndNoteAttachments()
-		throws Exception {
-
-		final DiagramEditPart diagramEP = getFixture().getDiagramEditPart();
-		assertTrue(diagramEP.getChildren().isEmpty());
-
-		// Add two notes.
-		NoteEditPart note1EP = (NoteEditPart) getFixture()
-			.createShapeUsingTool(DiagramNotationType.NOTE,
-				new Point(10, 10));
-		NoteEditPart note2EP = (NoteEditPart) getFixture()
-			.createShapeUsingTool(DiagramNotationType.NOTE,
-				new Point(100, 100));
-
-		// Create note attachment between the two notes.
-		NoteAttachmentEditPart noteAttachment1EP = (NoteAttachmentEditPart) getFixture()
-			.createConnectorUsingTool(note1EP, note2EP,
-				DiagramNotationType.NOTE_ATTACHMENT);
-
-		// Create a note attachment between a note and a connector.
-		getFixture().createConnectorUsingTool(note1EP, noteAttachment1EP,
-			DiagramNotationType.NOTE_ATTACHMENT);
-
-		// Test delete views.
-		Request request = new GroupRequest(RequestConstants.REQ_DELETE);
-		noteAttachment1EP.getCommand(request).execute();
-		note1EP.getCommand(request).execute();
-		note2EP.getCommand(request).execute();
-
-		assertTrue(diagramEP.getChildren().isEmpty());
-	}
-
-	/**
-	 * Tests text shape.
-	 */
-	public void testTextShape()
-		throws Exception {
-
-		final DiagramEditPart diagramEP = getFixture().getDiagramEditPart();
-		assertTrue(diagramEP.getChildren().isEmpty());
-
-		// Add a text shape.
-		TextEditPart textEP = (TextEditPart) getFixture().createShapeUsingTool(
-			DiagramNotationType.TEXT, new Point(10, 10));
-
-		testCommand(textEP.getCommand(new GroupRequest(
-			RequestConstants.REQ_DELETE)), new ITestCommandCallback() {
-
-			public void onCommandExecution() {
-				assertTrue(diagramEP.getChildren().isEmpty());
-			}
-		});
-
-	}
-	
-	/**
-	 * Test that note attachment type will only show up on connector handles
-	 * between notes and <code>INoteableEditParts</code> that support note
-	 * attachments.
-	 * 
-	 * @throws Exception
-	 */
-	public void testConnectionHandleForNoteAttachment()
-		throws Exception {
-
-		NoteEditPart noteEP = (NoteEditPart) getFixture().createShapeUsingTool(
-			DiagramNotationType.NOTE, new Point(10, 10));
-
-		class NonAttachableNoteableEP
-			extends ShapeNodeEditPart
-			implements INotableEditPart {
-
-			public NonAttachableNoteableEP() {
-				super(null);
-			}
-
-			public boolean canAttachNote() {
-				return false;
-			}
-
-			protected NodeFigure createNodeFigure() {
-				return null;
-			}
-		}
-
-		class AttachableNoteableEP
-			extends ShapeNodeEditPart
-			implements INotableEditPart {
-
-			public AttachableNoteableEP() {
-				super(null);
-			}
-
-			public boolean canAttachNote() {
-				return true;
-			}
-
-			protected NodeFigure createNodeFigure() {
-				return null;
-			}
-		}
-
-		ShapeNodeEditPart attachableNoteableEP = new AttachableNoteableEP();
-		ShapeNodeEditPart nonAttachableNoteableEP = new NonAttachableNoteableEP();
-
-		ModelingAssistantService service = ModelingAssistantService
-			.getInstance();
-
-		assertTrue(service.getRelTypesOnSource(noteEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-		assertTrue(service.getRelTypesOnSource(attachableNoteableEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-		assertFalse(service.getRelTypesOnSource(nonAttachableNoteableEP)
-			.contains(DiagramNotationType.NOTE_ATTACHMENT));
-
-		assertTrue(service.getRelTypesOnTarget(noteEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-		assertTrue(service.getRelTypesOnTarget(attachableNoteableEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-		assertFalse(service.getRelTypesOnTarget(nonAttachableNoteableEP)
-			.contains(DiagramNotationType.NOTE_ATTACHMENT));
-
-		assertTrue(service.getRelTypesOnSourceAndTarget(noteEP,
-			attachableNoteableEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-		assertFalse(service.getRelTypesOnSourceAndTarget(noteEP,
-			nonAttachableNoteableEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-
-		assertTrue(service.getRelTypesOnSourceAndTarget(attachableNoteableEP,
-			noteEP).contains(DiagramNotationType.NOTE_ATTACHMENT));
-		assertFalse(service.getRelTypesOnSourceAndTarget(
-			nonAttachableNoteableEP, noteEP).contains(
-			DiagramNotationType.NOTE_ATTACHMENT));
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ShapeTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ShapeTests.java
deleted file mode 100644
index 25a2bbd..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/ShapeTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author sshaw
- *
- * Shape Tests
- */
-public class ShapeTests extends AbstractShapeTests {
-
-	/**
-	 * @param arg0
-	 */
-	public ShapeTests(String arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-	
-	protected void setTestFixture() {
-		testFixture = new DiagramTestFixture();
-	}
-	
-	public static Test suite() {
-		return new TestSuite(ShapeTests.class);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/AbstractTestAction.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/AbstractTestAction.java
deleted file mode 100644
index a78a99c..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/AbstractTestAction.java
+++ /dev/null
@@ -1,133 +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.diagram.ui.action;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.ActionDelegate;
-
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.TestsPlugin;
-
-
-
-/**
- * @author choang
- *
- * Abst
- */
-public abstract class AbstractTestAction extends ActionDelegate implements IWorkbenchWindowActionDelegate {
-	
-	private ArrayList failures = new ArrayList(4);
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		// empty block
-	}
-
-	/**
-	 * Returns the test suite to be executed by the action
-	 * 
-	 */
-	public abstract Test getTestSuite();
-	
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow arg0) {
-		//empty block
-	}
-
-	/** 
-	 * Return the testplugin.   Subclasses may override to return their specific
-	 * test plugin
-	 */
-	protected Plugin getTestPlugin() {
-		return TestsPlugin.getDefault();
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction arg0) {
-		failures.clear();
-		TestSuite suite = new TestSuite();
-		
-		Test test = getTestSuite();
-		if (test == null)
-			return;
-		suite.addTest(test);
-		
-		
-		TestResult result = new TestResult();
-		suite.run(result);
-		System.out.println("Test results: " + result.errorCount() + " errors, " + result.failureCount() + " failures."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$;
-		Enumeration en = result.errors();
-		while (en.hasMoreElements()) {
-			Object e = en.nextElement();
-			failures.add(e);
-			System.out.println(e);
-		}
-		en = result.failures();
-		while (en.hasMoreElements()) {
-			Object e = en.nextElement();
-			failures.add(e);
-			System.out.println(e);
-		}
-		
-		logTestResults();
-	}
-	
-	public void logTestResults() {
-		Plugin plugin = getTestPlugin();
-		Log.info( plugin, IStatus.INFO, "Test Results:" ); //$NON-NLS-1$
-		List results = getFailures();
-		for ( int i = 0; i < results.size(); i++ ) {
-			Object entry = results.get(i);
-			try {
-				Log.error( plugin, IStatus.ERROR, entry.toString(), ((TestFailure)entry).thrownException());
-			}
-			catch( Exception e ) {
-				Log.error( plugin, IStatus.ERROR, entry.toString() );
-			}
-		}
-	}
-	
-	/** Returns the list of test errors and failures. */
-	public List getFailures() {
-		return failures;	
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection arg1) {
-		action.setEnabled(true);
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/DeleteFromDiagramTestAction.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/DeleteFromDiagramTestAction.java
deleted file mode 100644
index ba0677f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/action/DeleteFromDiagramTestAction.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.tests.runtime.diagram.ui.action;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.ui.IWorkbenchPage;
-
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.DeleteFromDiagramAction;
-
-
-/**
- * @author mmostafa
- */
-public class DeleteFromDiagramTestAction
-	extends DeleteFromDiagramAction {
-
-	/**
-	 * @param workbenchPage
-	 */
-	public DeleteFromDiagramTestAction(IWorkbenchPage workbenchPage) {
-		super(workbenchPage);
-	}
-	
-	public Command _getCommand(){
-		return super.getCommand();
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringForwardCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringForwardCommandTest.java
deleted file mode 100644
index bd27569..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringForwardCommandTest.java
+++ /dev/null
@@ -1,125 +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.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.BringForwardCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * @author jschofie
- */
-public class BringForwardCommandTest
-	extends CommandTestFixture {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#createCommand()
-	 */
-	protected ICommand createCommand() {
-		return new BringForwardCommand(getEditingDomain(), noteView);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#testDoExecute()
-	 */
-	public void testDoExecute() {
-		assertEquals(getDiagram().getChildren().size(), 1);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-
-		ICommand zorderCommand = new BringForwardCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-	}
-
-	public void testFirstEntry() {
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 2);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-
-		ICommand zorderCommand = new BringForwardCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-	}
-	
-	public void testMiddleEntry() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new BringForwardCommand(getEditingDomain(), secondNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-		assertEquals(getDiagram().getChildren().get(1), thirdNote);
-		assertEquals(getDiagram().getChildren().get(2), secondNote);
-	}
-
-	public void testBringToFront() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new BringForwardCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-		assertEquals(getDiagram().getChildren().get(2), thirdNote);
-		
-		zorderCommand = new BringForwardCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-		
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), thirdNote);
-		assertEquals(getDiagram().getChildren().get(2), firstNote);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringToFrontCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringToFrontCommandTest.java
deleted file mode 100644
index 2037dcf..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/BringToFrontCommandTest.java
+++ /dev/null
@@ -1,95 +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.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.BringToFrontCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Test the BringToFront ZOrder command
- * 
- * @author jschofie
- */
-public class BringToFrontCommandTest
-	extends CommandTestFixture {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#createCommand()
-	 */
-	protected ICommand createCommand() {
-		return new BringToFrontCommand(getEditingDomain(), noteView);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#testDoExecute()
-	 */
-	public void testDoExecute() {
-		assertEquals(getDiagram().getChildren().size(), 1);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-
-		ICommand zorderCommand = new BringToFrontCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-	}
-	
-	public void testFirstEntry() {
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 2);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-
-		ICommand zorderCommand = new BringToFrontCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-	}
-	
-	public void testMiddleEntry() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new BringToFrontCommand(getEditingDomain(), secondNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-		assertEquals(getDiagram().getChildren().get(1), thirdNote);
-		assertEquals(getDiagram().getChildren().get(2), secondNote);
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTestFixture.java
deleted file mode 100644
index 1ce14bc..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTestFixture.java
+++ /dev/null
@@ -1,155 +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.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-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.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.framework.DiagramTestCase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestsViewProvider;
-
-
-/**
- * This test fixture can be used to test various presentation commands
- *
- * @author jschofie
- */
-public abstract class CommandTestFixture extends DiagramTestCase {
-
-	protected ICommand command;
-	protected Diagram diagramView;
-	protected View noteView;
-	
-	/**
-	 * Constructor
-	 */
-	public CommandTestFixture() {
-		super("CommandTestFixture"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.framework.DiagramTestCase#createDiagram()
-	 */
-	protected IFile createDiagram()
-		throws Exception {
-
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			getEditingDomain(), "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				Diagram diagram = ViewService.createDiagram(
-					PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND, PreferencesHint.USE_DEFAULTS);
-				diagramView = diagram;
-                setDiagram(diagram);
-			
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-//		MEditingDomain.INSTANCE.runAsUnchecked(new MRunnable() {
-//
-//			public Object run() {
-//				Diagram diagram = ViewService.createDiagram(
-//					PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND, PreferencesHint.USE_DEFAULTS);
-//				diagramView = diagram;
-//                setDiagram(diagram);
-//				return null;
-//			}
-//		});
-
-		return null;
-	}
-
-	protected View createView() {
-		final View []toCreate = new View[1];
-		
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			getEditingDomain(), "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				View view = ViewService.getInstance().createNode(null,diagramView,"Note",0,false, PreferencesHint.USE_DEFAULTS); //$NON-NLS-1$
-				toCreate[0] = view;
-				
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-//			MEditingDomain.INSTANCE.runAsUnchecked(new MRunnable() {
-//
-//			public Object run() {
-//				View view = ViewService.getInstance().createNode(null,diagramView,"Note",0,false, PreferencesHint.USE_DEFAULTS); //$NON-NLS-1$
-//				toCreate[0] = view;
-//				return null;
-//			}
-//		});
-
-		return toCreate[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.framework.DiagramTestCase#createShapesAndConnectors()
-	 */
-	protected void createShapesAndConnectors()
-		throws Exception {
-
-		noteView = createView();
-		command = createCommand();
-		assertNotNull("Failed to create command", command); //$NON-NLS-1$
-	}
-	
-	protected ICommand getCommand() {
-		return command;
-	}
-
-	protected abstract ICommand createCommand();
-
-	public abstract void testDoExecute();
-	
-	protected Diagram getDiagram() {
-		return diagramView;
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTests.java
deleted file mode 100644
index c601b33..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandTests.java
+++ /dev/null
@@ -1,35 +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.diagram.ui.commands;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author jschofie
- */
-public class CommandTests {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.gmf.tests.runtime.diagram.ui.commands"); //$NON-NLS-1$
-		//$JUnit-BEGIN$
-		suite.addTestSuite(SetBoundsCommandTest.class);
-		suite.addTestSuite(SendToBackCommandTest.class);
-		suite.addTestSuite(BringToFrontCommandTest.class);
-		suite.addTestSuite(SendBackwardCommandTest.class);
-		suite.addTestSuite(BringForwardCommandTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandUtilitiesTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandUtilitiesTest.java
deleted file mode 100644
index 6fecb29..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/CommandUtilitiesTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.commands;
-
-import java.util.Collection;
-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.IUndoContext;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-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.Path;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.diagram.ui.commands.CommandUtilities;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-
-/**
- * @author ldamus
- */
-public class CommandUtilitiesTest extends TestCase {
-
-	public CommandUtilitiesTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(CommandUtilitiesTest.class,
-				"CommandUtilities tests"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Verifies that the utility that derives affected files from a GEF command
-	 * produces an empty list when the input is <code>null</code>.
-	 */
-	public void test_getAffectedFiles_nullCommand_161668() {
-		Collection affectedFiles = CommandUtilities.getAffectedFiles(null);
-		assertTrue(affectedFiles.isEmpty());
-	}
-
-	/**
-	 * Verifies that the utility that derives affected files from a GEF command
-	 * returns the correct affected files when the input implements ICommand.
-	 */
-	public void test_getAffectedFiles_ICommand_161668() {
-		List files = getFiles("CommandUtilitiesTest/test_getAffectedFiles_ICommand_161668"); //$NON-NLS-1$
-		CommandImplementingICommand command = new CommandImplementingICommand(
-				files);
-		Collection affectedFiles = CommandUtilities.getAffectedFiles(command);
-		assertEquals(files, affectedFiles);
-	}
-
-	/**
-	 * Verifies that the utility that derives affected files from a GEF command
-	 * returns the correct affected files of the delegate command when the input
-	 * is an ICommandProxy.
-	 */
-	public void test_getAffectedFiles_ICommandProxy_161668() {
-		List files = getFiles("CommandUtilitiesTest/test_getAffectedFiles_ICommandProxy_161668"); //$NON-NLS-1$
-		ICommand iCommand = new AbstractCommand(
-				"test_getAffectedFiles_ICommandProxy_161668()", files) { //$NON-NLS-1$
-
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				return CommandResult.newOKCommandResult();
-			}
-
-			protected CommandResult doRedoWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				return CommandResult.newOKCommandResult();
-			}
-
-			protected CommandResult doUndoWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				return CommandResult.newOKCommandResult();
-			}
-		};
-
-		ICommandProxy commandProxy = new ICommandProxy(iCommand);
-
-		Collection affectedFiles = CommandUtilities
-				.getAffectedFiles(commandProxy);
-		assertEquals(files, affectedFiles);
-	}
-
-	/**
-	 * Verifies that the utility that derives affected files from a GEF command
-	 * returns the correct affected files of the child commands when the input
-	 * is a CompoundCommand.
-	 */
-	public void test_getAffectedFiles_CompoundCommand_161668() {
-
-		// create an ICommand
-		List iCommandFiles = getFiles("CommandUtilitiesTest/getAffectedFiles_CompoundCommand_161668_ICommand"); //$NON-NLS-1$
-		CommandImplementingICommand iCommand = new CommandImplementingICommand(
-				iCommandFiles);
-
-		// create an ICommandProxy
-		List iCommandProxyFiles = getFiles("CommandUtilitiesTest/getAffectedFiles_CompoundCommand_161668_ICommandProxy"); //$NON-NLS-1$
-		ICommandProxy iCommandProxy = new ICommandProxy(
-				new AbstractCommand(
-						"test_getAffectedFiles_ICommandProxy_161668()", iCommandProxyFiles) { //$NON-NLS-1$
-
-					protected CommandResult doExecuteWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-
-					protected CommandResult doRedoWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-
-					protected CommandResult doUndoWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-				});
-
-		// put them both in a CompoundCommand
-		CompoundCommand command = new CompoundCommand(
-				"getAffectedFiles_CompoundCommand_161668"); //$NON-NLS-1$
-		command.add(iCommand);
-		command.add(iCommandProxy);
-
-		// verify the affected files
-		Collection affectedFiles = CommandUtilities.getAffectedFiles(command);
-		assertEquals(iCommandFiles.size() + iCommandProxyFiles.size(),
-				affectedFiles.size());
-		assertTrue(affectedFiles.containsAll(iCommandFiles));
-		assertTrue(affectedFiles.containsAll(iCommandProxyFiles));
-	}
-
-	private List getFiles(String path) {
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IFile file = workspaceRoot.getFile(new Path(path));
-		return Collections.singletonList(file);
-	}
-
-	//
-	// Test fixtures
-	//
-
-	private class CommandImplementingICommand extends Command implements
-			ICommand {
-
-		private List affectedFiles;
-
-		private ICommand delegate;
-
-		public CommandImplementingICommand(List affectedFiles) {
-			this.affectedFiles = affectedFiles;
-		}
-
-		protected ICommand getDelegate() {
-			if (delegate == null) {
-				delegate = new AbstractCommand(
-						"CommandImplementingICommand", affectedFiles) { //$NON-NLS-1$
-
-					protected CommandResult doExecuteWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-
-					protected CommandResult doRedoWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-
-					protected CommandResult doUndoWithResult(
-							IProgressMonitor progressMonitor, IAdaptable info)
-							throws ExecutionException {
-						return CommandResult.newOKCommandResult();
-					}
-				};
-			}
-			return delegate;
-		};
-
-		public ICommand compose(IUndoableOperation operation) {
-			return getDelegate().compose(operation);
-		}
-
-		public List getAffectedFiles() {
-			return getDelegate().getAffectedFiles();
-		}
-
-		public CommandResult getCommandResult() {
-			return getDelegate().getCommandResult();
-		}
-
-		public ICommand reduce() {
-			return getDelegate().reduce();
-		}
-
-		public void addContext(IUndoContext context) {
-			getDelegate().addContext(context);
-		}
-
-		public boolean canRedo() {
-			return getDelegate().canRedo();
-		}
-
-		public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-				throws ExecutionException {
-			return getDelegate().execute(monitor, info);
-		}
-
-		public IUndoContext[] getContexts() {
-			return getDelegate().getContexts();
-		}
-
-		public boolean hasContext(IUndoContext context) {
-			return getDelegate().hasContext(context);
-		}
-
-		public IStatus redo(IProgressMonitor monitor, IAdaptable info)
-				throws ExecutionException {
-			return getDelegate().redo(monitor, info);
-		}
-
-		public void removeContext(IUndoContext context) {
-			getDelegate().removeContext(context);
-		}
-
-		public IStatus undo(IProgressMonitor monitor, IAdaptable info)
-				throws ExecutionException {
-			return getDelegate().undo(monitor, info);
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SemanticCreateCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SemanticCreateCommandTest.java
deleted file mode 100644
index 30a9ffb..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SemanticCreateCommandTest.java
+++ /dev/null
@@ -1,199 +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.diagram.ui.commands;
-
-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.IUndoContext;
-import org.eclipse.core.commands.operations.UndoContext;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-
-/**
- * @author ldamus
- */
-public class SemanticCreateCommandTest
-	extends TestCase {
-
-	private SemanticCreateCommand fixture;
-
-	public SemanticCreateCommandTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(SemanticCreateCommandTest.class);
-	}
-
-	protected SemanticCreateCommand getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(SemanticCreateCommand fixture) {
-		this.fixture = fixture;
-	}
-
-	public void test_wrapCompositeModelCommand() {
-
-		String commandLabel = "test_wrapCompositeModelCommand"; //$NON-NLS-1$
-
-		// Create:
-		// ICommandProxy(CompositeModelCommand(AbstractCommand2))
-		ICommand command = new AbstractCommand(commandLabel, null) {
-
-			protected CommandResult doExecuteWithResult(
-                    IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-
-                return CommandResult.newOKCommandResult();
-            };
-            
-            protected CommandResult doRedoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-
-                return null;
-            }
-            
-            protected CommandResult doUndoWithResult(IProgressMonitor progressMonitor, IAdaptable info)
-                throws ExecutionException {
-
-                return null;
-            }
-		};
-
-        TransactionalEditingDomain editingDomain = TransactionalEditingDomain.Factory.INSTANCE
-            .createEditingDomain();
-		CompositeTransactionalCommand compositeModelCommand = new CompositeTransactionalCommand(editingDomain, 
-			commandLabel);
-        
-		compositeModelCommand.compose(command);
-		ICommandProxy proxyCommand = new ICommandProxy(
-			compositeModelCommand);
-
-		// Now wrap this in a compound command
-		CompoundCommand compoundCommand = new CompoundCommand();
-		compoundCommand.add(proxyCommand);
-
-		// Create the test fixture
-		CreateElementRequest createRequest = new CreateElementRequest(
-            editingDomain, null, null);
-		CreateElementRequestAdapter requestAdapter = new CreateElementRequestAdapter(
-			createRequest);
-		
-		setFixture(new SemanticCreateCommand(requestAdapter, compoundCommand));
-		
-		// Execute the test fixture
-        try {
-            getFixture().execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-		
-		CommandResult result = getFixture().getCommandResult();
-		assertTrue(result.getStatus().isOK());
-		
-		// Should return the request adapter
-		assertSame(requestAdapter, result.getReturnValue());
-	}
-	
-	/**
-	 * Verifies that contexts in the real semantic command are propagated to the
-	 * SemanticCreateCommand wrapper when it is created.
-	 */
-	public void test_contextPropagation_141122() {
-
-		final IUndoContext contextA = new UndoContext();
-		final IUndoContext contextB = new UndoContext();
-		final IUndoContext contextC = new UndoContext();
-		
-		// create an ICommand
-		ICommand iCommand = new AbstractCommand(
-				"test_contextPropagation_141122") { //$NON-NLS-1$
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				
-				// change my contexts
-				removeContext(contextB);
-				addContext(contextC);
-				
-				return CommandResult.newOKCommandResult();
-			}
-
-			protected CommandResult doRedoWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				return CommandResult.newOKCommandResult();
-			}
-
-			protected CommandResult doUndoWithResult(
-					IProgressMonitor progressMonitor, IAdaptable info)
-					throws ExecutionException {
-				return CommandResult.newOKCommandResult();
-			}
-		};
-
-		// add two contexts to the ICommand
-		iCommand.addContext(contextA);
-		iCommand.addContext(contextB);
-
-		// wrap the ICommand in an ICommandProxy
-		Command command = new ICommandProxy(iCommand);
-
-		// Create the test fixture
-		TransactionalEditingDomain editingDomain = TransactionalEditingDomain.Factory.INSTANCE
-				.createEditingDomain();
-
-		CreateElementRequest createRequest = new CreateElementRequest(
-				editingDomain, null, null);
-
-		CreateElementRequestAdapter requestAdapter = new CreateElementRequestAdapter(
-				createRequest);
-
-		SemanticCreateCommand semanticCreateCommand = new SemanticCreateCommand(
-				requestAdapter, command);
-
-		// verify that both contexts have been propagated to the semanticCreateCommand fixture
-		assertTrue(semanticCreateCommand.hasContext(contextA));
-		assertTrue(semanticCreateCommand.hasContext(contextB));
-		
-		// execute removes contextB and adds contextC
-		try {
-			semanticCreateCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-        
-        assertTrue(semanticCreateCommand.hasContext(contextA));
-		assertFalse(semanticCreateCommand.hasContext(contextB));
-		assertTrue(semanticCreateCommand.hasContext(contextC));
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendBackwardCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendBackwardCommandTest.java
deleted file mode 100644
index 0ba6e23..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendBackwardCommandTest.java
+++ /dev/null
@@ -1,126 +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.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.SendBackwardCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Test the SendBackward ZOrder command
- *
- * @author jschofie
- */
-public class SendBackwardCommandTest
-	extends CommandTestFixture {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#createCommand()
-	 */
-	protected ICommand createCommand() {
-		return new SendBackwardCommand(getEditingDomain(), noteView);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#testDoExecute()
-	 */
-	public void testDoExecute() {
-		assertEquals(getDiagram().getChildren().size(), 1);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-
-		ICommand zorderCommand = new SendBackwardCommand(getEditingDomain(), firstNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-	}
-
-	public void testLastEntry() {
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 2);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-
-		ICommand zorderCommand = new SendBackwardCommand(getEditingDomain(), secondNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-	}
-	
-	public void testMiddleEntry() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new SendBackwardCommand(getEditingDomain(), secondNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-		assertEquals(getDiagram().getChildren().get(2), thirdNote);
-	}
-	
-	public void testSendToBack() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new SendBackwardCommand(getEditingDomain(), thirdNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-		assertEquals(getDiagram().getChildren().get(1), thirdNote);
-		assertEquals(getDiagram().getChildren().get(2), secondNote);
-		
-		zorderCommand = new SendBackwardCommand(getEditingDomain(), thirdNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-		
-		assertEquals(getDiagram().getChildren().get(0), thirdNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-		assertEquals(getDiagram().getChildren().get(2), secondNote);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendToBackCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendToBackCommandTest.java
deleted file mode 100644
index 063f927..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SendToBackCommandTest.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.tests.runtime.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.internal.commands.SendToBackCommand;
-import org.eclipse.gmf.runtime.notation.View;
-
-
-/**
- * Test the SendToBack ZOrder command
- *
- * @author jschofie
- */
-public class SendToBackCommandTest
-	extends CommandTestFixture {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#createCommand()
-	 */
-	protected ICommand createCommand() {
-		return new SendToBackCommand(getEditingDomain(), noteView);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#testDoExecute()
-	 */
-	public void testDoExecute() {
-		assertEquals(getDiagram().getChildren().size(), 1);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-
-		ICommand zorderCommand = new SendToBackCommand(getEditingDomain(), firstNote);
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), firstNote);
-	}
-	
-	public void testLastEntry() {
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 2);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-
-		ICommand zorderCommand = new SendToBackCommand(getEditingDomain(), secondNote);
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-	}
-	
-	public void testMiddleEntry() {
-		createView();
-		createView();
-		assertEquals(getDiagram().getChildren().size(), 3);
-		View firstNote  = (View)getDiagram().getChildren().get(0);
-		View secondNote = (View)getDiagram().getChildren().get(1);
-		View thirdNote  = (View)getDiagram().getChildren().get(2);
-
-		ICommand zorderCommand = new SendToBackCommand(getEditingDomain(), secondNote);
-		
-        try {
-            zorderCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail("command execution failure: " + e.getLocalizedMessage()); //$NON-NLS-1$
-        }
-
-		assertEquals(getDiagram().getChildren().get(0), secondNote);
-		assertEquals(getDiagram().getChildren().get(1), firstNote);
-		assertEquals(getDiagram().getChildren().get(2), thirdNote);
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SetBoundsCommandTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SetBoundsCommandTest.java
deleted file mode 100644
index 400dc8d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/commands/SetBoundsCommandTest.java
+++ /dev/null
@@ -1,114 +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.diagram.ui.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-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.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * @author jschofie
- */
-public class SetBoundsCommandTest
-	extends CommandTestFixture {
-
-	private int XPOS = 500;
-	private int YPOS = 500;
-	private int WIDTH = 50;
-	private int HEIGHT = 50;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.commands.CommandTestFixture#createCommand()
-	 */
-	protected ICommand createCommand() {
-		return new SetBoundsCommand(getEditingDomain(), 
-			"SetBounds", new EObjectAdapter(noteView), new Rectangle(0, 0, WIDTH, HEIGHT)); //$NON-NLS-1$
-	}
-
-	public void testDoExecute() {
-		assertTrue(getCommand().canExecute());
-	
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Width()));
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Height()));
-		
-        try {
-            getCommand().execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-		
-		assertEquals( new Integer(WIDTH),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Width()));
-		assertEquals( new Integer(HEIGHT),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Height()));
-	}
-	
-	public void testMove() {
-		ICommand moveCommand = new SetBoundsCommand(getEditingDomain(),
-			"SetBounds Move Test",new EObjectAdapter(noteView), new Point(XPOS, YPOS)); //$NON-NLS-1$
-		
-		assertTrue(moveCommand.canExecute());
-		
-		assertEquals( new Integer(0),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getLocation_X()));
-		assertEquals( new Integer(0),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getLocation_Y()));
-			
-        try {
-            moveCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-			
-		assertEquals( new Integer(XPOS),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getLocation_X()));
-		assertEquals( new Integer(YPOS),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getLocation_Y()));
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Width()));
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Height()));
-	}
-	
-	public void testResize() {
-		ICommand resizeCommand = new SetBoundsCommand(getEditingDomain(), 
-			"SetBounds Move Test",new EObjectAdapter(noteView), new Dimension(WIDTH, HEIGHT)); //$NON-NLS-1$
-		
-		assertTrue(resizeCommand.canExecute());
-		
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Width()));
-		assertEquals( new Integer(-1),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Height()));
-			
-        try {
-            resizeCommand.execute(new NullProgressMonitor(), null);
-        } catch (ExecutionException e) {
-            fail(e.getLocalizedMessage());
-        }
-			
-		assertEquals( new Integer(WIDTH),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Width()));
-		assertEquals( new Integer(HEIGHT),
-			ViewUtil.getStructuralFeatureValue(noteView,NotationPackage.eINSTANCE.getSize_Height()));
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/framework/DiagramTestCase.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/framework/DiagramTestCase.java
deleted file mode 100644
index f73c305..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/framework/DiagramTestCase.java
+++ /dev/null
@@ -1,648 +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.diagram.ui.framework;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.common.ui.util.FileUtil;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.TestsPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * This is an Abstract base class for Diagram testcases
- * 
- * @author Jody Schofield
- */
-public abstract class DiagramTestCase extends TestCase {
-
-	private IProject project = null;
-	private IDiagramWorkbenchPart diagramWorkbenchPart = null;
-	private IFile diagramFile = null;
-    private Diagram diagramView;
-    private TransactionalEditingDomain editingDomain;
-    private Resource resource;
-
-
-	/**
-	 * Constructs a Diagram TestCase with a given name
-	 * 
-	 * @param name Name of the diagram test case
-	 */
-	public DiagramTestCase(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets up the fixture.  The default setup includes:
-	 * - creating the project
-	 * - creating a diagram
-	 * - opening the diagram
-	 * - adding shapes
-	 * - adding connectors
-	 * 
-	 * This method is called before each test method is executed.
-	 */
-	protected void setUp() throws Exception {
-
-		// Create a project
-		createProject();
-
-		// Create and open a diagram
-		setDiagramFile(createDiagram());
-        createResource();
-		openDiagram();
-
-		// Allow the OS to process editor related events
-		flushEventQueue();
-
-		createShapesAndConnectors();
-	}
-	
-	/**
-	 * Will delete the project that was used for the test and removed all the
-	 * resources in it.
-	 */
-	protected void tearDown() throws Exception {
-
-		// Allow the OS to process editor related events
-		flushEventQueue();
-
-		// Close the diagram
-		closeDiagram();
-        diagramView = null;
-        
-        // unload the resource
-        resource.unload();
-        resource = null;
-
-		// Close and delete the project
-		closeProject();		
-	}
-
-	protected IFile getDiagramFile() {
-		return diagramFile;
-	}
-    
-    protected Diagram getDiagram() {
-        return diagramView;
-    }
-    
-    protected void setDiagram(Diagram diagram) {
-        this.diagramView = diagram;
-    }
-	
-	protected void setDiagramFile(IFile theFile) {
-		diagramFile = theFile;
-	}
-	/**
-	 * Get the name for the project to be created
-	 * 
-	 * @return project name
-	 */
-	protected String getProjectName() {
-		return "pxdemodelproj"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the project.  The project is created in the
-	 * createProject method.
-	 * 
-	 * @return the project that was created
-	 */
-	protected IProject getProject() {
-		return project;
-	}
-
-	/**
-	 * Creates a project to be used for the test.
-	 */
-	protected void createProject() throws Exception {
-		
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IWorkspaceRoot wsroot = workspace.getRoot();
-		
-		project = wsroot.getProject( getProjectName() );
-		
-		IProjectDescription desc =
-			workspace.newProjectDescription(project.getName());
-
-		// Create the project if it doesn't exist
-		if (!project.exists()) {
-			project.create(desc, null);
-		}
-
-		// Open the project if it isn't open
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-	}
-    
-    /**
-     * Creates the editing domain and resource and adds the diagram to
-     * that resource.
-     */
-    protected void createResource() {
-        
-        IFile file = getDiagramFile();
-        
-        if (file != null) {
-            String filePath = file.getLocation().toOSString();
-            resource = getEditingDomain().loadResource(filePath);
-
-        } else {
-            resource = getEditingDomain()
-                .createResource("null:/org.eclipse.gmf.tests.runtime.diagram.ui"); //$NON-NLS-1$
-        }
-
-        final Diagram d = getDiagram();  
-        
-        if (d != null) {
-
-            AbstractEMFOperation operation = new AbstractEMFOperation(
-            	getEditingDomain(), "AbstractPresentationTestFixture setup") { //$NON-NLS-1$
-
-                protected IStatus doExecute(IProgressMonitor monitor,
-                        IAdaptable info)
-                    throws ExecutionException {
-
-                    resource.getContents().add(getDiagram());
-                    return Status.OK_STATUS;
-                };
-            };
-
-            try {
-                operation.execute(new NullProgressMonitor(), null);
-            } catch (ExecutionException ie) {
-                fail("createResource failed: " + ie.getLocalizedMessage()); //$NON-NLS-1$
-            }
-        }
-    }
-
-	/**
-     * Close and delete the project
-     */
-	protected void closeProject() {
-	
-		try {
-			project.delete(true, true, null);
-		} catch (CoreException e) {
-			
-			Log.error(TestsPlugin.getDefault(),
-				IStatus.ERROR, "Failed to delete project", e); //$NON-NLS-1$
-		} finally {
-			
-			project = null;
-		}
-	}
-
-//	protected IFile createDiagramFile(String filePath) throws Exception {
-//		IFile file = project.getFile(filePath);
-//		if (!file.exists()) {
-//			FileUtil.createFile(
-//				file,
-//				new FileInputStream(filePath),
-//				new NullProgressMonitor());
-//		}
-//
-//		return file;
-//	}
-
-	protected void deleteDiagramFile() throws Exception {
-		FileUtil.deleteFile(getDiagramFile(), new NullProgressMonitor());
-	}
-
-	/**
-	 * Close the diagram
-	 */
-	protected void closeDiagram() {	
-		if (getDiagramWorkbenchPart() instanceof IEditorPart) {
-			IWorkbenchPage page = getDiagramWorkbenchPart().getSite().getPage();
-			
-			page.closeEditor(
-					(IEditorPart) getDiagramWorkbenchPart(),
-					false);
-		}
-		setDiagramWorkbenchPart(null);
-		setDiagramFile(null);
-	}
-
-	/**
-	 * Clears the diaplay's event queue.
-	 */
-	protected void flushEventQueue() {
-		Display display = Display.getDefault();
-		while (display.readAndDispatch()) {
-			// do nothing
-		}
-	}
-	
-	/**
-	 * Returns the editor.
-	 * 
-	 * @return IDiagramWorkbenchPart
-	 */
-	public IDiagramWorkbenchPart getDiagramWorkbenchPart() {
-		return diagramWorkbenchPart;
-	}
-
-	/**
-	 * Sets the diagramWorkbenchPart.
-	 * 
-	 * @param diagramWorkbenchPart
-	 *            The editorPart to set
-	 */
-	protected void setDiagramWorkbenchPart(IDiagramWorkbenchPart diagramWorkbenchPart) {
-		this.diagramWorkbenchPart = diagramWorkbenchPart;
-	}
-
-	/**
-	 * Return the Diagrams EditPart.
-	 *
-	 * @return The DiagramEditPart for the diagram being tested
-	 */
-	public DiagramEditPart getDiagramEditPart() {
-		assertNotNull(getDiagramWorkbenchPart());		
-		return getDiagramWorkbenchPart().getDiagramEditPart();
-	}
-
-	/**
-	 * Returns the Workbench page for the current Diagram Workbench Part
-	 * @return IWorkbenchPage for the current Diagram
-	 */
-	protected IWorkbenchPage getWorkbenchPage() {
-		return getDiagramWorkbenchPart().getSite().getPage();
-	}
-
-	/**
-	 * Implement to create the diagram and the diagram file for which the test
-	 * should run under.  This method should return the file for the diagram.
-	 * @return the file for the diagram
-	 */
-	protected abstract IFile createDiagram() throws Exception;
-
-	/**
-	 * Implement to open the diagram.
-	 * 
-	 * @throws Exception
-	 */
-	protected void openDiagram() throws Exception {
-
-		if( getDiagramFile() == null)
-			return;
-
-		IWorkbenchPage page =
-			PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage();
-
-		setDiagramWorkbenchPart((IDiagramWorkbenchPart)IDE.openEditor(page, getDiagramFile(), true));
-	}
-
-	/**
-	 * Implement this to creates the shapes and the connectors for the tests.
-	 * Will set the connect view if there is one needed for the test.
-	 */
-	protected abstract void createShapesAndConnectors() throws Exception;
-
-    public TransactionalEditingDomain getEditingDomain() {
-    	if (editingDomain == null) {
-    		editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-    	}
-        return editingDomain;
-    }
-
-	//
-//	protected boolean isDirty() {
-//		if (getDiagramWorkbenchPart() instanceof IEditorPart) {
-//			return ((IEditorPart) getDiagramWorkbenchPart()).isDirty();
-//		}
-//		return false;
-//	}
-//
-//	protected DiagramState getDiagramState() {
-//
-//		final DiagramState[] returnState = new DiagramState[1];
-//
-////		// wrapping around model operation so i can return the result
-////		getDiagramEditPart()
-////			.getDiagramEditDomain()
-////			.getModelOperation()
-////			.executeAsReadAction(DefaultKey.ACTION, new Runnable() {
-////			public void run() {
-////
-////				returnState[0] = new DiagramState(getDiagramWorkbenchPart());
-////
-////			}
-////		});
-//
-//		return returnState[0];
-//	}
-//
-//	/**
-//	 * Description: Will execute the <code>Command</code> and then the <code>ITestCommandCallBack</code>,
-//	 * which has the logic to verify that the command executed successful.
-//	 * <p>
-//	 * The command is executed within an UndoInterval and WriteAction model
-//	 * operation.
-//	 * 
-//	 * @throws <AssertFailError>
-//	 *             if the command did not run successfully
-//	 * @author choang
-//	 */
-//	protected void testCommand(
-//		final ICommand command,
-//		final ITestCommandCallback callback) {
-//		testCommand(new ICommandProxy(command), callback);
-//	}
-//
-//	/**
-//	 * Description: Will execute the <code>Command</code> and then the <code>ITestCommandCallBack</code>,
-//	 * which has the logic to verify that the command executed successful.
-//	 * <p>
-//	 * The command is executed within an UndoInterval and WriteAction model
-//	 * operation.
-//	 * 
-//	 * @throws <AssertFailError>
-//	 *             if the command did not run successfully
-//	 * @author choang
-//	 */
-//	protected void testCommand(
-//		final Command command,
-//		final ITestCommandCallback callback) {
-//
-//		// Had to wrap each command in separate model operations
-//		// as if we didn't we got some weird behavior in some of the tests
-//		// such as the ConnectorTests#testSelfConnections where we get a null
-//		// pointer
-//		// exception.
-//
-//		final DiagramState state1 = getDiagramState();
-//
-//		getCommandStack().execute(command);
-//		flushEventQueue();
-//
-////		getDiagramEditPart()
-////			.getDiagramEditDomain()
-////			.getModelOperation()
-////			.executeAsReadAction(DefaultKey.ACTION, new Runnable() {
-////			public void run() {
-////				callback.onCommandExecution();
-////			}
-////		});
-//		DiagramState state2 = getDiagramState();
-//
-//		// checking if the command stack is in an undoable state first
-//		// not that selfConnections and deleteConnections tests are
-//		// failing .. if i do a check via command.canUndo() instead of
-//		// using getCommandSTack().canUndo()
-//		// which suggest that something is out of synch between the command
-//		// and the command stack .. need to look into it later.
-//		if (getCommandStack().canUndo()) {
-//
-//			getCommandStack().undo();
-//			flushEventQueue();
-//
-//			assertTrue(state1.equals(getDiagramState()));
-//
-//			getCommandStack().redo();
-//			flushEventQueue();
-//		}
-//
-//		assertTrue(state2.equals(getDiagramState()));
-//
-//	}
-//
-//	/**
-//	 * Description: Will execute the <code>Action</code> and then the <code>ITestCommandCallBack</code>,
-//	 * which has the logic to verify that the command executed successful. This
-//	 * method will test if the action implements the Disposable interface from
-//	 * GEF If it does it will call the dispose() method on the action. Callers
-//	 * should not call it themselves
-//	 * 
-//	 * @throws <AssertFailError>
-//	 *             if the command did not run successfully
-//	 *  
-//	 */
-//	protected void testAction(IAction action, ITestActionCallback callback) {
-//		flushEventQueue();
-//		assertTrue(action.isEnabled());
-//		action.run();
-//		flushEventQueue();
-//		if (action instanceof Disposable)
-//			 ((Disposable) action).dispose();
-//		if (callback != null)
-//			callback.onRunExecution();
-//	}
-//
-//	/**
-//	 * Description: Will execute the <code>Action</code> and then the <code>ITestCommandCallBack</code>,
-//	 * which has the logic to verify that the command executed successful. This
-//	 * method will test if the action implements the IDisposableAction
-//	 * interface from common.ui If it does it will first set active the
-//	 * diagrameditorpart of the diagram and then call the init() method before
-//	 * running the action. At the end, it will call the dispose() method on the
-//	 * action. Callers should not call these two methods themselves themselves
-//	 * 
-//	 * @throws <AssertFailError>
-//	 *             if the command did not run successfully
-//	 *  
-//	 */
-//	protected void testAction(
-//		IDisposableAction action,
-//		ITestActionCallback callback) {
-//
-//		getWorkbenchPage().activate(getDiagramWorkbenchPart());
-//		action.init();
-//
-//		if (action.isEnabled()) {
-//
-//			action.run();
-//			flushEventQueue();
-//		}
-//
-//		action.dispose();
-//		if (callback != null)
-//			callback.onRunExecution();
-//	}
-//
-//	/**
-//	 * Does the same as <code>testAction</code> but also does an undo and
-//	 * redo afterwards and compares the diagram state.
-//	 * 
-//	 * @param action
-//	 * @param callback
-//	 */
-//	protected void testActionAndUndoRedo(
-//		IDisposableAction action,
-//		ITestActionCallback callback) {
-//
-//		final DiagramState state1 = getDiagramState();
-//
-//		getWorkbenchPage().activate(getDiagramWorkbenchPart());
-//		action.init();
-//
-//		if (action.isEnabled()) {
-//
-//			action.run();
-//			flushEventQueue();
-//		}
-//
-//		action.dispose();
-//		if (callback != null)
-//			callback.onRunExecution();
-//
-//		DiagramState state2 = getDiagramState();
-//		assertTrue("testActionAndUndoRedo: Action cannot be undone.", getCommandStack().canUndo()); //$NON-NLS-1$
-//		getCommandStack().undo();
-//		assertTrue("diagram state different after undo of action", state1.equals(getDiagramState())); //$NON-NLS-1$
-//		getCommandStack().redo();
-//		assertTrue("diagram state different after redo of action", state2.equals(getDiagramState())); //$NON-NLS-1$
-//	}
-//
-//	/**
-//	 * Method testProperty. Generic method for testing a property change in a
-//	 * view.
-//	 * 
-//	 * @param view
-//	 *            IView to set the property value in
-//	 * @param property
-//	 *            String ID of the property to test
-//	 * @param expectedValue
-//	 *            Object that is the value of the property to test
-//	 */
-//	protected void testProperty(
-//		final IView view,
-//		final String property,
-//		final Object expectedValue) {
-//
-//		DiagramEditPart diagramEP = getDiagramEditPart();
-//		assertNotNull("The DiagramEditPart is null", diagramEP); //$NON-NLS-1$
-//
-//		RootEditPart rootEP = diagramEP.getRoot();
-//		assertNotNull("The RootEditPart is null", rootEP); //$NON-NLS-1$
-//
-//		EditPartViewer viewer = rootEP.getViewer();
-//		assertNotNull("The EditPartViewer is null", viewer); //$NON-NLS-1$
-//
-//		Map epRegistry = viewer.getEditPartRegistry();
-//		assertNotNull("The EditPartRegistery is null", epRegistry); //$NON-NLS-1$
-//
-//		final IGraphicalEditPart ep = (IGraphicalEditPart) epRegistry.get(view);
-//		assertNotNull("Couldn't find the GraphicalEditPart in the Registery", ep); //$NON-NLS-1$
-//
-//		Request request =
-//			new ChangePropertyValueRequest(
-//				StringStatics.BLANK,
-//				property,
-//				expectedValue);
-//
-//		Command cmd = ep.getCommand(request);
-//
-//		testCommand(cmd, new ITestCommandCallback() {
-//			public void onCommandExecution() {
-//
-//				assertEquals(expectedValue, ep.getPropertyValue(property));
-//			}
-//		});
-//	}
-//
-//
-//	protected void clearDiagram() {
-//		testAction(
-//			SelectAllAction.createSelectAllAction(getWorkbenchPage()),
-//			null);
-//
-//		testAction(
-//			GlobalActionManager.getInstance().createActionHandler(
-//				getWorkbenchPage(),
-//				GlobalActionId.DELETE),
-//			null);
-//	}
-//
-//	/**
-//	 * Return the figure in which elements are being added to.
-//	 * 
-//	 * @return <code>getDiagramEditPart().getFigure()</code>.
-//	 */
-//	protected IFigure getDrawSurfaceFigure() {
-//		return getDiagramEditPart().getFigure();
-//	}
-//
-//	/**
-//	 * Return the editpart in which elements are being added to.
-//	 * 
-//	 * @return <code>getDiagramEditPart()</code>.
-//	 */
-//	protected IGraphicalEditPart getDrawSurfaceEditPart() {
-//		return getDiagramEditPart();
-//	}
-//
-//	/** Return the supplied editpart's {@link ShapeNodeEditPart}children. */
-//	protected List getShapesIn(IGraphicalEditPart parent) {
-//
-//		assertNotNull(parent);
-//		List shapes = new ArrayList();
-//		Iterator it = parent.getChildren().iterator();
-//		while (it.hasNext()) {
-//			Object child = it.next();
-//			if (child instanceof ShapeNodeEditPart) {
-//				shapes.add(child);
-//			}
-//		}
-//		return shapes;
-//	}
-//
-//	/** Return <code>getDiagramEditPart().getConnectors()</code>. */
-//	protected List getConnectors() {
-//		return getDiagramEditPart().getConnectors();
-//	}
-//
-//
-//	/**
-//	 * Method getCommandStack.
-//	 * 
-//	 * @return CommandStack Command stack for the diagram editor
-//	 */
-//	public CommandStack getCommandStack() {
-//		return (CommandStack) getDiagramWorkbenchPart().getAdapter(
-//			CommandStack.class);
-//	}
-//
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelConstants.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelConstants.java
deleted file mode 100644
index 3ffbc3f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelConstants.java
+++ /dev/null
@@ -1,47 +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.diagram.ui.label;
-
-/**
- * @author crevells
- */
-class LabelConstants {
-
-    public final static String ID_WRAPLABEL = "org.eclipse.gmf.examples.runtime.diagram.label.WrapLabelNote"; //$NON-NLS-1$
-
-    public final static String ID_GEFLABEL = "org.eclipse.gmf.examples.runtime.diagram.label.GEFLabelNote"; //$NON-NLS-1$
-
-    public final static String ID_WRAPPINGLABEL = "org.eclipse.gmf.examples.runtime.diagram.label.WrappingLabelNote"; //$NON-NLS-1$
-
-    public final static String ID_OLDWRAPLABEL = "org.eclipse.gmf.examples.runtime.diagram.label.OldWrapLabelNote"; //$NON-NLS-1$
-
-    public final static String VIEWTYPE_GEFLABEL_NOTE = LabelNotationType.GEFLABEL_NOTE
-        .getSemanticHint();
-
-    public final static String VIEWTYPE_WRAPPINGLABEL_NOTE = LabelNotationType.WRAPPINGLABEL_NOTE
-        .getSemanticHint();
-
-    public final static String VIEWTYPE_OLDWRAPLABEL_NOTE = LabelNotationType.OLDWRAPLABEL_NOTE
-        .getSemanticHint();
-
-    public final static String VIEWTYPE_WRAPLABEL_NOTE = LabelNotationType.WRAPLABEL_NOTE
-        .getSemanticHint();
-
-    public final static String VIEWTYPE_GEFLABEL = "GEFLabel"; //$NON-NLS-1$
-
-    public final static String VIEWTYPE_WRAPPINGLABEL = "WrappingLabel"; //$NON-NLS-1$
-
-    public final static String VIEWTYPE_OLDWRAPLABEL = "OldWrapLabel"; //$NON-NLS-1$
-
-    public final static String VIEWTYPE_WRAPLABEL = "WrapLabel"; //$NON-NLS-1$
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelEditPartProvider.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelEditPartProvider.java
deleted file mode 100644
index 6b80e95..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelEditPartProvider.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.label;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DescriptionCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.label.LabelExDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.LabelEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author crevells
- */
-public class LabelEditPartProvider
-    extends AbstractEditPartProvider {
-
-    static public class GEFLabelNoteEditPart
-        extends NoteEditPart {
-
-        public GEFLabelNoteEditPart(View view) {
-            super(view);
-        }
-
-        public EditPart getPrimaryChildEditPart() {
-            return getChildBySemanticHint(LabelConstants.VIEWTYPE_GEFLABEL);
-        }
-    }
-
-    static public class WrappingLabelNoteEditPart
-        extends NoteEditPart {
-
-        public WrappingLabelNoteEditPart(View view) {
-            super(view);
-        }
-
-        public EditPart getPrimaryChildEditPart() {
-            return getChildBySemanticHint(LabelConstants.VIEWTYPE_WRAPPINGLABEL);
-        }
-    }
-
-    static public class OldWrapLabelNoteEditPart
-        extends NoteEditPart {
-
-        public OldWrapLabelNoteEditPart(View view) {
-            super(view);
-        }
-
-        public EditPart getPrimaryChildEditPart() {
-            return getChildBySemanticHint(LabelConstants.VIEWTYPE_OLDWRAPLABEL);
-        }
-    }
-
-    static public class WrapLabelNoteEditPart
-        extends NoteEditPart {
-
-        public WrapLabelNoteEditPart(View view) {
-            super(view);
-        }
-
-        public EditPart getPrimaryChildEditPart() {
-            return getChildBySemanticHint(LabelConstants.VIEWTYPE_WRAPLABEL);
-        }
-    }
-
-    static public class GEFLabelTextCompartmentEditPart
-        extends DescriptionCompartmentEditPart {
-
-        public GEFLabelTextCompartmentEditPart(View view) {
-            super(view);
-        }
-
-        protected IFigure createFigure() {
-            LabelEx label = new LabelEx();
-            return label;
-        }
-
-        protected ILabelDelegate createLabelDelegate() {
-            Assert.isTrue(getFigure() instanceof LabelEx);
-            return new LabelExDelegate((LabelEx) getFigure());
-        }
-
-        public IParser getParser() {
-            if (parser == null) {
-                EObject object = getPrimaryView();
-                ParserHintAdapter hintAdapter = new ParserHintAdapter(object,
-                    CommonParserHint.DESCRIPTION);
-                parser = ParserService.getInstance().getParser(hintAdapter);
-
-            }
-            return parser;
-        }
-    }
-
-    static public class WrappingLabelTextCompartmentEditPart
-        extends DescriptionCompartmentEditPart {
-
-        public WrappingLabelTextCompartmentEditPart(View view) {
-            super(view);
-        }
-
-        protected IFigure createFigure() {
-            WrappingLabel label = new WrappingLabel("New WrappingLabel"); //$NON-NLS-1$
-             label.setTextWrap(true);
-            return label;
-        }
-
-        protected ILabelDelegate createLabelDelegate() {
-            Assert.isTrue(getFigure() instanceof WrappingLabel);
-            return new WrappingLabelDelegate((WrappingLabel) getFigure());
-        }
-
-        public IParser getParser() {
-            if (parser == null) {
-                EObject object = getPrimaryView();
-                ParserHintAdapter hintAdapter = new ParserHintAdapter(object,
-                    CommonParserHint.DESCRIPTION);
-                parser = ParserService.getInstance().getParser(hintAdapter);
-
-            }
-            return parser;
-        }
-    }
-
-    static public class OldWrapLabelTextCompartmentEditPart
-        extends DescriptionCompartmentEditPart {
-
-        public OldWrapLabelTextCompartmentEditPart(View view) {
-            super(view);
-        }
-
-        protected IFigure createFigure() {
-            OriginalWrapLabel label = new OriginalWrapLabel("Old WrapLabel"); //$NON-NLS-1$
-            label.setTextWrap(true);
-            return label;
-        }
-
-        protected ILabelDelegate createLabelDelegate() {
-            Assert.isTrue(getFigure() instanceof OriginalWrapLabel);
-            return new OriginalWrapLabelDelegate(
-                (OriginalWrapLabel) getFigure());
-        }
-
-        public IParser getParser() {
-            if (parser == null) {
-                EObject object = getPrimaryView();
-                ParserHintAdapter hintAdapter = new ParserHintAdapter(object,
-                    CommonParserHint.DESCRIPTION);
-                parser = ParserService.getInstance().getParser(hintAdapter);
-
-            }
-            return parser;
-        }
-    }
-
-    static public class WrapLabelTextCompartmentEditPart
-        extends DescriptionCompartmentEditPart {
-
-        public WrapLabelTextCompartmentEditPart(View view) {
-            super(view);
-        }
-
-        protected IFigure createFigure() {
-            WrapLabel label = new WrapLabel("WrapLabel Delegate"); //$NON-NLS-1$
-             label.setTextWrap(true);
-           return label;
-        }
-
-        protected ILabelDelegate createLabelDelegate() {
-            Assert.isTrue(getFigure() instanceof WrapLabel);
-            return new WrappingLabelDelegate(
-                (WrapLabel) getFigure());
-        }
-        public IParser getParser() {
-            if (parser == null) {
-                EObject object = getPrimaryView();
-                ParserHintAdapter hintAdapter = new ParserHintAdapter(object,
-                    CommonParserHint.DESCRIPTION);
-                parser = ParserService.getInstance().getParser(hintAdapter);
-
-            }
-            return parser;
-        }
-    }
-
-    /** list of supported shape editparts. */
-    private Map shapeMap = new HashMap();
-    {
-        shapeMap.put(LabelConstants.VIEWTYPE_GEFLABEL_NOTE,
-            GEFLabelNoteEditPart.class);
-        shapeMap.put(LabelConstants.VIEWTYPE_WRAPPINGLABEL_NOTE,
-            WrappingLabelNoteEditPart.class);
-        shapeMap.put(LabelConstants.VIEWTYPE_OLDWRAPLABEL_NOTE,
-            OldWrapLabelNoteEditPart.class);
-        shapeMap.put(LabelConstants.VIEWTYPE_WRAPLABEL_NOTE,
-            WrapLabelNoteEditPart.class);
-    }
-
-    /** list of supported text editparts. */
-    private Map textCompartmentMap = new HashMap();
-    {
-        textCompartmentMap.put(LabelConstants.VIEWTYPE_GEFLABEL,
-            GEFLabelTextCompartmentEditPart.class);
-        textCompartmentMap.put(LabelConstants.VIEWTYPE_WRAPPINGLABEL,
-            WrappingLabelTextCompartmentEditPart.class);
-        textCompartmentMap.put(LabelConstants.VIEWTYPE_OLDWRAPLABEL,
-            OldWrapLabelTextCompartmentEditPart.class);
-        textCompartmentMap.put(LabelConstants.VIEWTYPE_WRAPLABEL,
-            WrapLabelTextCompartmentEditPart.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 type = view.getType();
-        Class clazz = null;
-        if (type != null && type.length() > 0) {
-            clazz = (Class) textCompartmentMap.get(type);
-            if (clazz == null)
-                clazz = (Class) shapeMap.get(type);
-        } else {
-            if (NotationPackage.eINSTANCE
-                .getDiagram().isSuperTypeOf(getReferencedElementEClass(view))) {
-                clazz = NoteEditPart.class;
-            }
-        }
-        return clazz;
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelNotationType.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelNotationType.java
deleted file mode 100644
index c7625c4..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelNotationType.java
+++ /dev/null
@@ -1,32 +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.diagram.ui.label;
-
-import org.eclipse.gmf.runtime.diagram.ui.util.INotationType;
-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
-
-/**
- * Element types for notation elements defined in the Diagram UI plugin.
- * 
- * @author crevells
- */
-public class LabelNotationType
-    extends AbstractElementTypeEnumerator {
-
-    public static final INotationType GEFLABEL_NOTE = (INotationType) getElementType(LabelConstants.ID_GEFLABEL);
-
-    public static final INotationType WRAPPINGLABEL_NOTE = (INotationType) getElementType(LabelConstants.ID_WRAPPINGLABEL);
-
-    public static final INotationType OLDWRAPLABEL_NOTE = (INotationType) getElementType(LabelConstants.ID_OLDWRAPLABEL);
-
-    public static final INotationType WRAPLABEL_NOTE = (INotationType) getElementType(LabelConstants.ID_WRAPLABEL);
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelPaletteFactory.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelPaletteFactory.java
deleted file mode 100644
index 7d55b98..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelPaletteFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.label;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool;
-
-/**
- * @author crevells
- */
-public class LabelPaletteFactory
-    extends PaletteFactory.Adapter {
-
-    public Tool createTool(String toolId) {
-
-        if (toolId.equals(LabelConstants.ID_WRAPPINGLABEL)) {
-            return new CreationTool(LabelNotationType.WRAPPINGLABEL_NOTE);
-        } else if (toolId.equals(LabelConstants.ID_GEFLABEL)) {
-            return new CreationTool(LabelNotationType.GEFLABEL_NOTE);
-        } else if (toolId.equals(LabelConstants.ID_WRAPLABEL)) {
-            return new CreationTool(LabelNotationType.WRAPLABEL_NOTE);
-        } else if (toolId.equals(LabelConstants.ID_OLDWRAPLABEL)) {
-            return new CreationTool(LabelNotationType.OLDWRAPLABEL_NOTE);
-        }
-
-        return null;
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelTests.java
deleted file mode 100644
index 6b09084..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelTests.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.label;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicTestFixture;
-
-/**
- * Tests functionality relating to notes, note attachments, and text shapes.
- * 
- * @author crevells
- */
-public class LabelTests
-    extends AbstractTestBase {
-
-    public LabelTests(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(LabelTests.class);
-    }
-
-    protected void setTestFixture() {
-        testFixture = new LogicTestFixture();
-    }
-
-    protected LogicTestFixture getFixture() {
-        return (LogicTestFixture) testFixture;
-    }
-
-    public void testWrapLabelDelegate()
-        throws Exception {
-
-        getFixture().openDiagram();
-
-        NoteEditPart oldWrapLabelEP = (NoteEditPart) getFixture()
-            .createShapeUsingTool(LabelNotationType.OLDWRAPLABEL_NOTE,
-                new Point(10, 10), new Dimension(200, 50), getDiagramEditPart());
-        OriginalWrapLabel oldWrapLabel = (OriginalWrapLabel) oldWrapLabelEP
-            .getChildBySemanticHint(LabelConstants.VIEWTYPE_OLDWRAPLABEL)
-            .getFigure();
-
-        NoteEditPart wrapLabelDelegateEP = (NoteEditPart) getFixture()
-            .createShapeUsingTool(LabelNotationType.WRAPLABEL_NOTE,
-                new Point(10, 10), new Dimension(200, 50), getDiagramEditPart());
-        WrapLabel wrapLabel = (WrapLabel) wrapLabelDelegateEP
-            .getChildBySemanticHint(LabelConstants.VIEWTYPE_WRAPLABEL)
-            .getFigure();
-
-        oldWrapLabel
-            .setText("Let's put a bit of text in here that would cause the label to wrap."); //$NON-NLS-1$
-        oldWrapLabel.setIcon(SharedImages.get(SharedImages.IMG_NOTE));
-        wrapLabel
-            .setText("Let's put a bit of text in here that would cause the label to wrap."); //$NON-NLS-1$
-        wrapLabel.setIcon(SharedImages.get(SharedImages.IMG_NOTE));
-
-        flushEventQueue();
-
-        assertEquals(oldWrapLabel.getIconAlignment(), wrapLabel
-            .getIconAlignment());
-        assertEquals(oldWrapLabel.getIconTextGap(), wrapLabel.getIconTextGap());
-        assertEquals(oldWrapLabel.getText(), wrapLabel.getText());
-        assertEquals(oldWrapLabel.getTextAlignment(), wrapLabel
-            .getTextAlignment());
-        assertEquals(oldWrapLabel.getTextPlacement(), wrapLabel
-            .getTextPlacement());
-        assertEquals(oldWrapLabel.isTextTruncated(), wrapLabel
-            .isTextTruncated());
-        assertEquals(oldWrapLabel.isTextUnderlined(), wrapLabel
-            .isTextUnderlined());
-        assertEquals(oldWrapLabel.isTextStrikedThrough(), wrapLabel
-            .isTextStrikedThrough());
-        assertEquals(oldWrapLabel.isTextWrapped(), wrapLabel.isTextWrapped());
-        assertEquals(oldWrapLabel.getTextWrapAlignment(), wrapLabel
-            .getTextWrapAlignment());
-        assertEquals(oldWrapLabel.isSelected(), wrapLabel.isSelected());
-        assertEquals(oldWrapLabel.hasFocus(), wrapLabel.hasFocus());
-
-    }
-
-    public void testLabelAlignment()
-        throws Exception {
-        getFixture().openDiagram();
-
-        NoteEditPart noteEP = (NoteEditPart) getFixture().createShapeUsingTool(
-            DiagramNotationType.NOTE, new Point(10, 10),
-            new Dimension(300, 300), getDiagramEditPart());
-        IGraphicalEditPart labelEP = noteEP
-            .getChildBySemanticHint(CommonParserHint.DESCRIPTION);
-        ILabelDelegate label = (ILabelDelegate) labelEP
-            .getAdapter(ILabelDelegate.class);
-
-        label.setText("hi"); //$NON-NLS-1$
-
-        Point loc[][] = new Point[3][3];
-        label.setAlignment(PositionConstants.TOP | PositionConstants.LEFT);
-        flushEventQueue();
-        loc[0][0] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.TOP);
-        flushEventQueue();
-        loc[0][1] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.TOP | PositionConstants.RIGHT);
-        flushEventQueue();
-        loc[0][2] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.LEFT);
-        flushEventQueue();
-        loc[1][0] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.CENTER);
-        flushEventQueue();
-        loc[1][1] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.RIGHT);
-        flushEventQueue();
-        loc[1][2] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.BOTTOM | PositionConstants.LEFT);
-        flushEventQueue();
-        loc[2][0] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.BOTTOM);
-        flushEventQueue();
-        loc[2][1] = label.getTextBounds().getLocation();
-
-        label.setAlignment(PositionConstants.BOTTOM | PositionConstants.RIGHT);
-        flushEventQueue();
-        loc[2][2] = label.getTextBounds().getLocation();
-
-        for (int i = 0; i < 2; i++) {
-            assertTrue(loc[i][0].x < loc[i][1].x && loc[i][1].x < loc[i][2].x);
-            assertTrue(loc[i][0].y == loc[i][1].y && loc[i][1].y == loc[i][2].y);
-        }
-
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelViewProvider.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelViewProvider.java
deleted file mode 100644
index b408f19..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/LabelViewProvider.java
+++ /dev/null
@@ -1,162 +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.diagram.ui.label;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.NoteViewFactory;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * @author crevells
- */
-public class LabelViewProvider
-    extends AbstractViewProvider {
-
-    static public class GEFLabelNoteViewFactory
-        extends NoteViewFactory {
-
-        protected void decorateView(View containerView, View view,
-                IAdaptable semanticAdapter, String semanticHint, int index,
-                boolean persisted) {
-            initializeFromPreferences(view);
-
-            FillStyle fillStyle = (FillStyle) view
-                .getStyle(NotationPackage.Literals.FILL_STYLE);
-            if (fillStyle != null) {
-                // fill color
-                RGB fillRGB = ColorConstants.lightGray.getRGB();
-                fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-                    .intValue());
-            }
-
-            getViewService().createNode(semanticAdapter, view,
-                LabelConstants.VIEWTYPE_GEFLABEL, ViewUtil.APPEND, persisted,
-                getPreferencesHint());
-        }
-    }
-
-    static public class WrappingLabelNoteViewFactory
-        extends NoteViewFactory {
-
-        protected void decorateView(View containerView, View view,
-                IAdaptable semanticAdapter, String semanticHint, int index,
-                boolean persisted) {
-            initializeFromPreferences(view);
-
-            FillStyle fillStyle = (FillStyle) view
-                .getStyle(NotationPackage.Literals.FILL_STYLE);
-            if (fillStyle != null) {
-                // fill color
-                RGB fillRGB = ColorConstants.lightBlue.getRGB();
-                fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-                    .intValue());
-            }
-
-            getViewService().createNode(semanticAdapter, view,
-                LabelConstants.VIEWTYPE_WRAPPINGLABEL, ViewUtil.APPEND,
-                persisted, getPreferencesHint());
-        }
-    }
-
-    static public class OldWrapLabelNoteViewFactory
-        extends NoteViewFactory {
-
-        protected void decorateView(View containerView, View view,
-                IAdaptable semanticAdapter, String semanticHint, int index,
-                boolean persisted) {
-            initializeFromPreferences(view);
-
-            FillStyle fillStyle = (FillStyle) view
-                .getStyle(NotationPackage.Literals.FILL_STYLE);
-            if (fillStyle != null) {
-                // fill color
-                RGB fillRGB = ColorConstants.lightGreen.getRGB();
-                fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-                    .intValue());
-            }
-
-            getViewService().createNode(semanticAdapter, view,
-                LabelConstants.VIEWTYPE_OLDWRAPLABEL, ViewUtil.APPEND,
-                persisted, getPreferencesHint());
-        }
-    }
-
-    static public class WrapLabelNoteViewFactory
-        extends NoteViewFactory {
-
-        protected void decorateView(View containerView, View view,
-                IAdaptable semanticAdapter, String semanticHint, int index,
-                boolean persisted) {
-            initializeFromPreferences(view);
-
-            FillStyle fillStyle = (FillStyle) view
-                .getStyle(NotationPackage.Literals.FILL_STYLE);
-            if (fillStyle != null) {
-                // fill color
-                RGB fillRGB = ColorConstants.yellow.getRGB();
-                fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB)
-                    .intValue());
-            }
-
-            getViewService().createNode(semanticAdapter, view,
-                LabelConstants.VIEWTYPE_WRAPLABEL, ViewUtil.APPEND,
-                persisted, getPreferencesHint());
-        }
-    }
-    /** list of supported shape views. */
-    static private final Map nodeMap = new HashMap();
-    static {
-        nodeMap.put(LabelConstants.VIEWTYPE_GEFLABEL_NOTE,
-            GEFLabelNoteViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_WRAPPINGLABEL_NOTE,
-            WrappingLabelNoteViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_OLDWRAPLABEL_NOTE,
-            OldWrapLabelNoteViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_WRAPLABEL_NOTE,
-            WrapLabelNoteViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_GEFLABEL,
-            BasicNodeViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_WRAPPINGLABEL,
-            BasicNodeViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_OLDWRAPLABEL,
-            BasicNodeViewFactory.class);
-        nodeMap.put(LabelConstants.VIEWTYPE_WRAPLABEL,
-            BasicNodeViewFactory.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) {
-        if (semanticHint != null && semanticHint.length() > 0)
-            return (Class) nodeMap.get(semanticHint);
-        return (Class) nodeMap.get(getSemanticEClass(semanticAdapter));
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabel.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabel.java
deleted file mode 100644
index 1acfd4a..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabel.java
+++ /dev/null
@@ -1,1714 +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.diagram.ui.label;
-
-import java.lang.ref.WeakReference;
-import java.text.BreakIterator;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.StringTokenizer;
-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.IFigure;
-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;
-
-
-/**
- * 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 OriginalWrapLabel
-	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 OriginalWrapLabel() {
-		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 OriginalWrapLabel(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 OriginalWrapLabel(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 OriginalWrapLabel(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
-	 */
-	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()) {
-            x = p.x;
-			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;			
-		}
-	}
-
-    
-	
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabelDelegate.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabelDelegate.java
deleted file mode 100644
index 221cf11..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/OriginalWrapLabelDelegate.java
+++ /dev/null
@@ -1,138 +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.diagram.ui.label;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @since 2.1
- * @author crevells
- * @deprecated
- */
-public class OriginalWrapLabelDelegate
-    extends ILabelDelegate.Stub {
-
-    private OriginalWrapLabel label;
-
-    public OriginalWrapLabelDelegate(OriginalWrapLabel wrapLabel) {
-        this.label = wrapLabel;
-    }
-
-    public String getText() {
-        return label.getText();
-    }
-
-    public void setIcon(Image image) {
-        label.setIcon(image);
-    }
-
-    public void setIcon(Image image, int index) {
-        label.setIcon(image, index);
-    }
-
-    public void setAlignment(int right) {
-        label.setLabelAlignment(right);
-    }
-
-    public void setText(String text) {
-        label.setText(text);
-    }
-
-    public void setTextStrikeThrough(boolean strikeThrough) {
-        label.setTextStrikeThrough(strikeThrough);
-    }
-
-    public void setTextUnderline(boolean underline) {
-        label.setTextUnderline(underline);
-    }
-
-    public int getTextJustification() {
-        return label.getTextWrapAlignment();
-    }
-
-    public void setTextJustification(int justification) {
-        label.setTextWrapAlignment(justification);
-    }
-
-    public void setFocus(boolean b) {
-        label.setFocus(b);
-    }
-
-    public void setSelected(boolean b) {
-        label.setSelected(b);
-    }
-
-    public void setTextAlignment(int alignment) {
-        label.setTextAlignment(alignment);
-    }
-
-    public void setIconAlignment(int alignment) {
-        label.setIconAlignment(alignment);
-    }
-
-    public boolean isTextWrapOn() {
-        return label.isTextWrapped();
-    }
-
-    public Rectangle getTextBounds() {
-        Rectangle rect = label.getTextBounds();
-        label.translateToAbsolute(rect);
-        return rect;
-    }
-
-    public void setTextPlacement(int placement) {
-        label.setTextPlacement(placement);
-    }
-
-    public void setTextWrapOn(boolean textWrappingOn) {
-        label.setTextWrap(textWrappingOn);
-    }
-    
-    public Image getIcon(int index) {
-        return label.getIcon(index);
-    }
-
-    public int getIconAlignment() {
-        return label.getIconAlignment();
-    }
-
-    public int getTextAlignment() {
-        return label.getTextAlignment();
-    }
-
-    public int getTextPlacement() {
-        return label.getTextPlacement();
-    }
-
-    public boolean hasFocus() {
-        return label.hasFocus();
-    }
-
-    public boolean isSelected() {
-        return label.isSelected();
-    }
-
-    public boolean isTextStrikedThrough() {
-        return label.isTextStrikedThrough();
-    }
-
-    public boolean isTextUnderlined() {
-        return label.isTextUnderlined();
-    }
-
-    public int getAlignment() {
-        return label.getLabelAlignment();
-    }
-    
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySection.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySection.java
deleted file mode 100644
index fe47e45..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySection.java
+++ /dev/null
@@ -1,701 +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.diagram.ui.label;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
-import org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.LabelEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.TestsPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-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.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.Group;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-public class TextLabelPropertySection
-    extends AbstractPropertySection {
-
-    private static final String ICON = "Icon"; //$NON-NLS-1$
-
-    private static final String LABEL_ALIGNMENT = "Label Alignment"; //$NON-NLS-1$
-
-    private static final String ICON_ALIGNMENT = "Icon Alignment"; //$NON-NLS-1$
-
-    private static final String TEXT_ALIGNMENT = "Text Alignment"; //$NON-NLS-1$
-
-    private static final String TEXT_PLACEMENT = "Text Placement"; //$NON-NLS-1$
-
-    private static final String TEXT_JUSTIFICATION = "Text Justification"; //$NON-NLS-1$
-
-    private static final String TEXT_UNDERLINE = "Text Underline"; //$NON-NLS-1$
-
-    private static final String TEXT_STRIKETHROUGH = "Text Strikethrough"; //$NON-NLS-1$
-
-    private static final String TEXT_WRAP = "Text Wrapping"; //$NON-NLS-1$
-
-    private static final String BIG_IMAGE_PATH = "images/test4.gif"; //$NON-NLS-1$
-
-    private static Image bigIcon;
-
-    // radio button widgets cache with a button as a value and abstract
-    // label string as a key
-    protected Map buttons = new HashMap();
-
-    private class ButtonKey {
-
-        String label;
-
-        Object value;
-
-        public ButtonKey(String label, Object value) {
-            super();
-            this.label = label;
-            this.value = value;
-        }
-
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((label == null) ? 0
-                : label.hashCode());
-            result = prime * result + ((value == null) ? 0
-                : value.hashCode());
-            return result;
-        }
-
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            final ButtonKey other = (ButtonKey) obj;
-            if (label == null) {
-                if (other.label != null)
-                    return false;
-            } else if (!label.equals(other.label))
-                return false;
-            if (value == null) {
-                if (other.value != null)
-                    return false;
-            } else if (!value.equals(other.value))
-                return false;
-            return true;
-        }
-
-    }
-
-    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));
-
-        // Create the groups for this section
-        createTextJustificationGroup(parent);
-        createTextPlacementGroup(parent);
-        createLabelAlignmentGroup(parent);
-        createIconAlignmentGroup(parent);
-        createTextAlignmentGroup(parent);
-        createIconGroup(parent);
-        createTextUnderlineGroup(parent);
-        createTextStrikethroughGroup(parent);
-        createTextWrappingGroup(parent);
-    }
-
-    public void refresh() {
-        super.refresh();
-
-        // 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 first textcompartment figure
-        IGraphicalEditPart ep = (IGraphicalEditPart) getPrimarySelection();
-
-        if (ep == null) {
-            return;
-        }
-
-        enableLabelAlignmentButtons();
-
-        checkButton(new ButtonKey(LABEL_ALIGNMENT, new Integer(
-            getLabelAlignment(ep))));
-        checkButton(new ButtonKey(ICON_ALIGNMENT, new Integer(
-            getIconAlignment(ep))));
-        checkButton(new ButtonKey(TEXT_ALIGNMENT, new Integer(
-            getTextAlignment(ep))));
-        checkButton(new ButtonKey(TEXT_PLACEMENT, new Integer(
-            getTextPlacement(ep))));
-        checkButton(new ButtonKey(TEXT_JUSTIFICATION, new Integer(
-            getTextJustification(ep))));
-        checkButton(new ButtonKey(TEXT_UNDERLINE, new Boolean(
-            getTextUnderline(ep))));
-        checkButton(new ButtonKey(TEXT_STRIKETHROUGH, new Boolean(
-            getTextStrikethrough(ep))));
-        checkButton(new ButtonKey(TEXT_WRAP, new Boolean(getWrappingOn(ep))));
-
-    }
-
-    private void enableLabelAlignmentButtons() {
-        boolean enableCorners = true;
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            if (ep.getFigure() instanceof OriginalWrapLabel
-                || ep.getFigure() instanceof LabelEx) {
-                enableCorners = false;
-                break;
-            }
-        }
-
-        Integer[] CORNERS = new Integer[] {
-            new Integer(PositionConstants.TOP | PositionConstants.LEFT),
-            new Integer(PositionConstants.TOP | PositionConstants.RIGHT),
-            new Integer(PositionConstants.BOTTOM | PositionConstants.LEFT),
-            new Integer(PositionConstants.BOTTOM | PositionConstants.RIGHT)};
-
-        for (int i = 0; i < CORNERS.length; i++) {
-            Button button = (Button) buttons.get(new ButtonKey(LABEL_ALIGNMENT,
-                CORNERS[i]));
-            if (button != null && !button.isDisposed()) {
-                button.setEnabled(enableCorners);
-            }
-        }
-    }
-
-    private void checkButton(ButtonKey buttonKey) {
-        Button button = (Button) buttons.get(buttonKey);
-        if (button != null && !button.isDisposed()) {
-            button.setSelection(true);
-        }
-    }
-
-    private Group createGroup(Composite parent, String label, int size) {
-        Group group = getWidgetFactory().createGroup(parent, label);
-        group.setLayout(new GridLayout(size, true));
-        GridData data = new GridData(GridData.FILL_BOTH);
-        group.setLayoutData(data);
-        return group;
-    }
-
-    private void createTextJustificationGroup(Composite parent) {
-        String labels[] = new String[] {"LEFT", "RIGHT", "CENTER"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        int values[] = new int[] {PositionConstants.LEFT,
-            PositionConstants.RIGHT, PositionConstants.CENTER};
-
-        Group group = createGroup(parent, TEXT_JUSTIFICATION, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final int value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_JUSTIFICATION, new Integer(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setTextJustification(value);
-                }
-            });
-        }
-    }
-
-    private void setTextJustification(int alignment) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextJustification(alignment);
-            }
-        }
-    }
-
-    private int getTextJustification(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.getTextJustification();
-        }
-        return -1;
-    }
-
-    private void createTextAlignmentGroup(Composite parent) {
-        String labels[] = new String[] {"LEFT", "RIGHT", "CENTER", "TOP", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-            "BOTTOM"}; //$NON-NLS-1$
-        int values[] = new int[] {PositionConstants.LEFT,
-            PositionConstants.RIGHT, PositionConstants.CENTER,
-            PositionConstants.TOP, PositionConstants.BOTTOM};
-
-        Group group = createGroup(parent, TEXT_ALIGNMENT, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final int value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_ALIGNMENT, new Integer(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setTextAlignment(value);
-                }
-            });
-        }
-    }
-
-    private void setTextAlignment(int alignment) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextAlignment(alignment);
-            }
-        }
-    }
-
-    private int getTextAlignment(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.getTextAlignment();
-        }
-        return -1;
-    }
-
-    private void createIconAlignmentGroup(Composite parent) {
-        String labels[] = new String[] {"LEFT", "RIGHT", "CENTER", "TOP",//$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-            "BOTTOM"};//$NON-NLS-1$ 
-        int values[] = new int[] {PositionConstants.LEFT,
-            PositionConstants.RIGHT, PositionConstants.CENTER,
-            PositionConstants.TOP, PositionConstants.BOTTOM};
-
-        Group group = createGroup(parent, ICON_ALIGNMENT, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final int value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(ICON_ALIGNMENT, new Integer(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setIconAlignment(value);
-                }
-            });
-        }
-    }
-
-    private void setIconAlignment(int alignment) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setIconAlignment(alignment);
-            }
-        }
-    }
-
-    private int getIconAlignment(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.getIconAlignment();
-        }
-        return -1;
-    }
-
-    private void createLabelAlignmentGroup(Composite parent) {
-        String labels[] = new String[] {"TOP | LEFT", "TOP", "TOP | RIGHT",//$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-            "RIGHT", "BOTTOM | RIGHT", "BOTTOM", "BOTTOM | LEFT", "LEFT",//$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
-            "CENTER"};//$NON-NLS-1$ 
-        int values[] = new int[] {
-            PositionConstants.TOP | PositionConstants.LEFT,
-            PositionConstants.TOP,
-            PositionConstants.TOP | PositionConstants.RIGHT,
-            PositionConstants.RIGHT,
-            PositionConstants.BOTTOM | PositionConstants.RIGHT,
-            PositionConstants.BOTTOM,
-            PositionConstants.BOTTOM | PositionConstants.LEFT,
-            PositionConstants.LEFT, PositionConstants.CENTER};
-
-        Group group = createGroup(parent, LABEL_ALIGNMENT, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final int value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(LABEL_ALIGNMENT, new Integer(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setLabelAlignment(value);
-                }
-            });
-        }
-    }
-
-    private void setLabelAlignment(int alignment) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setAlignment(alignment);
-            }
-
-        }
-    }
-
-    private int getLabelAlignment(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.getAlignment();
-        }
-        return -1;
-    }
-
-    private void createIconGroup(Composite parent) {
-        String labels[] = new String[] {"none", "big", "small", "two", "three"};//$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$ 
-
-        Group group = createGroup(parent, ICON, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            final String label = labels[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(ICON, label), radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setIcon(label);
-                }
-            });
-        }
-    }
-
-    private void setIcon(String iconDescription) {
-        Image[] icons = new Image[3];
-        if (iconDescription.equals("big")) {//$NON-NLS-1$ 
-            if (bigIcon == null) {
-                URL url = FileLocator.find(
-                    TestsPlugin.getDefault().getBundle(), new Path(
-                        BIG_IMAGE_PATH), null);
-                bigIcon = ImageDescriptor.createFromURL(url).createImage();
-            }
-            icons[0] = bigIcon;
-        } else if (iconDescription.equals("small")) {//$NON-NLS-1$
-            icons[0] = SharedImages.get(SharedImages.IMG_NOTE);
-        } else if (iconDescription.equals("two")) {//$NON-NLS-1$
-            icons[0] = SharedImages.get(SharedImages.IMG_NOTE);
-            icons[1] = SharedImages.get(SharedImages.IMG_NOTE);
-        } else if (iconDescription.equals("three")) {//$NON-NLS-1$
-            icons[0] = SharedImages.get(SharedImages.IMG_NOTE);
-            icons[1] = SharedImages.get(SharedImages.IMG_NOTE);
-            icons[2] = SharedImages.get(SharedImages.IMG_NOTE);
-        }
-
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                for (int i = 0; i < icons.length; i++) {
-                    label.setIcon(icons[i], i);
-                }
-            }
-        }
-    }
-
-    private void createTextPlacementGroup(Composite parent) {
-        String labels[] = new String[] {"EAST", "WEST", "NORTH", "SOUTH"};//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-        int values[] = new int[] {PositionConstants.EAST,
-            PositionConstants.WEST, PositionConstants.NORTH,
-            PositionConstants.SOUTH};
-
-        Group group = createGroup(parent, TEXT_PLACEMENT, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final int value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_PLACEMENT, new Integer(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setTextPlacement(value);
-                }
-            });
-        }
-    }
-
-    private void setTextPlacement(int placement) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextPlacement(placement);
-            }
-        }
-    }
-
-    private int getTextPlacement(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.getTextPlacement();
-        }
-        return -1;
-    }
-
-    private void createTextUnderlineGroup(Composite parent) {
-        String labels[] = new String[] {"on", //$NON-NLS-1$
-            "off"}; //$NON-NLS-1$
-        boolean values[] = new boolean[] {true, false};
-
-        Group group = createGroup(parent, TEXT_UNDERLINE, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final boolean value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_UNDERLINE, new Boolean(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setTextUnderline(value);
-                }
-            });
-        }
-    }
-
-    private void setTextUnderline(boolean underline) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextUnderline(underline);
-            }
-        }
-    }
-
-    private boolean getTextUnderline(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.isTextUnderlined();
-        }
-        return false;
-    }
-
-    private void createTextStrikethroughGroup(Composite parent) {
-        String labels[] = new String[] {"on", //$NON-NLS-1$
-            "off"}; //$NON-NLS-1$
-        boolean values[] = new boolean[] {true, false};
-
-        Group group = createGroup(parent, TEXT_STRIKETHROUGH, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final boolean value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_STRIKETHROUGH, new Boolean(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setTextStrikethrough(value);
-                }
-            });
-        }
-    }
-
-    private void setTextStrikethrough(boolean strikethrough) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextStrikeThrough(strikethrough);
-            }
-        }
-    }
-
-    private boolean getTextStrikethrough(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.isTextStrikedThrough();
-        }
-        return false;
-    }
-
-    private void createTextWrappingGroup(Composite parent) {
-        String labels[] = new String[] {"on", //$NON-NLS-1$
-            "off"}; //$NON-NLS-1$
-        boolean values[] = new boolean[] {true, false};
-
-        Group group = createGroup(parent, TEXT_WRAP, labels.length);
-
-        for (int i = 0; i < labels.length; i++) {
-            String label = labels[i];
-            final boolean value = values[i];
-
-            Button radioButton = getWidgetFactory().createButton(group, label,
-                SWT.RADIO);
-            buttons.put(new ButtonKey(TEXT_WRAP, new Boolean(value)),
-                radioButton);
-            radioButton.addSelectionListener(new SelectionAdapter() {
-
-                public void widgetSelected(SelectionEvent event) {
-                    setWrappingOn(value);
-                }
-            });
-        }
-    }
-
-    private void setWrappingOn(boolean wrappingOn) {
-        for (Iterator iterator = getSelectedLabelEditParts().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart ep = (IGraphicalEditPart) iterator.next();
-            ILabelDelegate label = (ILabelDelegate) ep
-                .getAdapter(ILabelDelegate.class);
-            if (label != null) {
-                label.setTextWrapOn(wrappingOn);
-            }
-        }
-    }
-
-    private boolean getWrappingOn(IGraphicalEditPart ep) {
-        ILabelDelegate label = (ILabelDelegate) ep
-            .getAdapter(ILabelDelegate.class);
-        if (label != null) {
-            return label.isTextWrapOn();
-        }
-        return false;
-    }
-
-    protected Object getPrimarySelection() {
-        return (getSelectedLabelEditParts() != null
-            && !getSelectedLabelEditParts().isEmpty() ? getSelectedLabelEditParts()
-            .get(0)
-            : null);
-    }
-
-    private List getSelectedLabelEditParts() {
-        List textCompartmentEPs = new ArrayList();
-        if (getSelection() != null && !getSelection().isEmpty()) {
-            for (Iterator iterator = ((IStructuredSelection) getSelection())
-                .iterator(); iterator.hasNext();) {
-                IGraphicalEditPart shapeEP = (IGraphicalEditPart) iterator
-                    .next();
-                textCompartmentEPs
-                    .addAll(getNestedTextCompartmentEditParts(shapeEP));
-            }
-        }
-        return textCompartmentEPs;
-    }
-
-    private Collection getNestedTextCompartmentEditParts(
-            IGraphicalEditPart containerEP) {
-        HashSet textCompartmentEPs = new HashSet();
-        for (Iterator iterator = containerEP.getChildren().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart childEP = (IGraphicalEditPart) iterator.next();
-            if (childEP instanceof TextCompartmentEditPart) {
-                textCompartmentEPs.add(childEP);
-            } else {
-                textCompartmentEPs
-                    .addAll(getNestedTextCompartmentEditParts(childEP));
-            }
-        }
-        return textCompartmentEPs;
-    }
-
-    private TextFlowEx getTextFlow(WrappingLabel label) {
-        return ((TextFlowEx) ((IFigure) label.getChildren().get(0))
-            .getChildren().get(0));
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySectionFilter.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySectionFilter.java
deleted file mode 100644
index 9e3dae5..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/label/TextLabelPropertySectionFilter.java
+++ /dev/null
@@ -1,54 +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.diagram.ui.label;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart;
-import org.eclipse.jface.viewers.IFilter;
-
-/**
- * Filter to display a property section if the selection is a shape editpart
- * that has text compartment editpart children.
- * 
- * @author crevells
- */
-public class TextLabelPropertySectionFilter
-    implements IFilter {
-
-    public boolean select(Object object) {
-        if (object instanceof ShapeEditPart) {
-            ShapeEditPart shapeEP = (ShapeEditPart) object;
-            return !getNestedTextCompartmentEditParts(shapeEP).isEmpty();
-        }
-        return false;
-    }
-
-    private Collection getNestedTextCompartmentEditParts(
-            IGraphicalEditPart containerEP) {
-        HashSet textCompartmentEPs = new HashSet();
-        for (Iterator iterator = containerEP.getChildren().iterator(); iterator
-            .hasNext();) {
-            IGraphicalEditPart childEP = (IGraphicalEditPart) iterator.next();
-            if (childEP instanceof TextCompartmentEditPart) {
-                textCompartmentEPs.add(childEP);
-            }
-            textCompartmentEPs
-                .addAll(getNestedTextCompartmentEditParts(childEP));
-        }
-        return textCompartmentEPs;
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/CanonicalTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/CanonicalTestFixture.java
deleted file mode 100644
index 7867e9f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/CanonicalTestFixture.java
+++ /dev/null
@@ -1,159 +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.diagram.ui.logic;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourceAttributes;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.SemanticPackage;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-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.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class CanonicalTestFixture extends LogicTestFixture {
-
-	public void destroy(EObject eObject) {
-		DestroyElementRequest destroy = new DestroyElementRequest(
-				getEditingDomain(),
-				eObject,
-				false);
-		IElementType context = ElementTypeRegistry.getInstance().getElementType(
-				destroy.getEditHelperContext());
-		
-		execute(context.getEditCommand(destroy));
-	}
-
-	/** Sets the <tt>COLLAPSED</tt> property value. */
-	public void setCollapsed(IResizableCompartmentEditPart rep, boolean collapse) {
-		SetPropertyCommand spc = new SetPropertyCommand(getEditingDomain(), new EObjectAdapter(
-				(View) rep.getModel()), Properties.ID_COLLAPSED,
-				Properties.ID_COLLAPSED, Boolean.valueOf(collapse));
-		execute(spc);
-		assertEquals(
-				"Enexpected collapsed value", collapse, ((Boolean) rep.getStructuralFeatureValue(NotationPackage.eINSTANCE.getDrawerStyle_Collapsed())).booleanValue());//$NON-NLS-1$
-	}
-
-	/** Sets the <tt>IS_VISIBLE</tt> property value. */
-	public void setVisible(IGraphicalEditPart gep, boolean visible) {
-		SetPropertyCommand spc = new SetPropertyCommand(getEditingDomain(), new EObjectAdapter(
-				(View) gep.getModel()), Properties.ID_ISVISIBLE,
-				Properties.ID_ISVISIBLE, Boolean.valueOf(visible));
-		execute(spc);
-		assertEquals(
-				"Enexpected visible value", visible, ((Boolean) gep.getStructuralFeatureValue(NotationPackage.eINSTANCE.getView_Visible())).booleanValue());//$NON-NLS-1$
-	}
-	
-	/** Sets the <tt>IS_VISIBLE</tt> property value. */
-	public void setVisible(View view, boolean visible) {
-		SetPropertyCommand spc = new SetPropertyCommand(getEditingDomain(), new EObjectAdapter(
-				view), Properties.ID_ISVISIBLE,
-				Properties.ID_ISVISIBLE, Boolean.valueOf(visible));
-		execute(spc);
-		assertEquals(
-				"Enexpected visible value", visible, ((Boolean) ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getView_Visible())).booleanValue());//$NON-NLS-1$
-	}
-
-	/** Sets the <tt>ID_ISCANONICAL</tt> property value. */
-	public void enableCanonical(IGraphicalEditPart gep, boolean enabled) {
-		SetPropertyCommand spc = new SetPropertyCommand(getEditingDomain(), new EObjectAdapter(
-				(View) gep.getModel()), Properties.ID_ISCANONICAL,
-				Properties.ID_ISCANONICAL, Boolean.valueOf(enabled));
-		execute(spc);
-		assertEquals(
-				"Unexpected canonical value", enabled, ((Boolean) gep.getStructuralFeatureValue(NotationPackage.eINSTANCE.getCanonicalStyle_Canonical())).booleanValue());//$NON-NLS-1$
-	}
-
-	/** Returns the list of shape views that resolve to the supplied eClass. */
-	public List getShapes(EClass eClass, EditPart editPart) {
-		List retval = new ArrayList();
-		Iterator children = editPart.getChildren().iterator();
-		while (children.hasNext()) {
-			IAdaptable child = (IAdaptable) children.next();
-			View view = (View) child.getAdapter(View.class);
-			if (view != null) {
-				EObject eObject = ViewUtil.resolveSemanticElement(view);
-				if (eClass.equals(eObject.eClass())) {
-					retval.add(child);
-				}
-			}
-		}
-		return retval;
-	}		
-
-	
-	/** Returns the list of shape views that resolve to the supplied eClass. */
-	public List getShapes(EClass eClass) {
-		return getShapes(eClass, getDiagramEditPart());
-	}
-
-	/** Sets the model's read-only flag to the supplied value. */
-	public void makeModelReadOnly(boolean readOnly) {
-		IFile file = getDiagramFile(); // getModelFile();
-		assertNotNull("file expected.", file);//$NON-NLS-1$
-		ResourceAttributes resourceAttributes = file.getResourceAttributes();
-		resourceAttributes.setReadOnly(readOnly);
-		try {
-			file.setResourceAttributes(resourceAttributes);
-		} catch (CoreException e) {
-			// nothing we can do here 
-		}
-		//setResourceAttributes
-		println(file.getFullPath() + ".isReadOnly() == " + file.isReadOnly());//$NON-NLS-1$
-	}
-
-	/**
-	 * Closes the diagram editor.
-	 * 
-	 * @param save
-	 *            saves the diagram editor if set <tt>true</tt>.
-	 */
-	public void closeDiagramEditor(boolean save) {
-		IWorkbenchPage page = getDiagramWorkbenchPart().getSite().getPage();
-		if (page != null) {
-			getDiagramWorkbenchPart().getSite().getPage();
-			page.closeEditor((IEditorPart)getDiagramWorkbenchPart(), save);
-			setDiagramWorkbenchPart(null);
-			
-			assertNull(
-					"unexpected editor", page.findEditor(new FileEditorInput(getDiagramFile())));//$NON-NLS-1$
-		}
-	}
-	
-	public IGraphicalEditPart getCanonicalCompartment(int index) {
-		List circuits = getShapes( SemanticPackage.eINSTANCE.getCircuit());
-		assertTrue( "Failed to create circuit shapes.", !circuits.isEmpty() );//$NON-NLS-1$
-		
-		IGraphicalEditPart circuitEP = (IGraphicalEditPart)circuits.get(index);
-		IGraphicalEditPart logicCompartment = circuitEP.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-		
-		return logicCompartment;
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramAssistantTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramAssistantTests.java
deleted file mode 100644
index aed4730..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramAssistantTests.java
+++ /dev/null
@@ -1,157 +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.diagram.ui.logic;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Tests for the diagram assistant functionality.
- * 
- * @author cmahoney
- */
-public class DiagramAssistantTests
-	extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(DiagramAssistantTests.class);
-		return s;
-	}
-
-	public DiagramAssistantTests() {
-		super("Diagram Assistant Tests");//$NON-NLS-1$
-	}
-
-	/** installs the composite state test fixture. */
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-	
-	/**
-	 * A diagram assistant editpolicy that exposes the
-	 * {@link #shouldShowDiagramAssistant()} method.
-	 * 
-	 * @author cmahoney
-	 */
-	class TestDiagramAssistantEditPolicy
-		extends DiagramAssistantEditPolicy {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#isDiagramAssistant(java.lang.Object)
-		 */
-		protected boolean isDiagramAssistant(Object object) {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#isDiagramAssistantShowing()
-		 */
-		protected boolean isDiagramAssistantShowing() {
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#showDiagramAssistant(org.eclipse.draw2d.geometry.Point)
-		 */
-		protected void showDiagramAssistant(Point referencePoint) {
-			// do nothing
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramAssistantEditPolicy#hideDiagramAssistant()
-		 */
-		protected void hideDiagramAssistant() {
-			// do nothing
-		}
-
-		/**
-		 * Make public for testing purposes.
-		 */
-		public boolean shouldShowDiagramAssistant() {
-			return super.shouldShowDiagramAssistant();
-		}
-
-	}
-
-	/**
-	 * Tests {@link DiagramAssistantEditPolicy#shouldShowDiagramAssistant()}
-	 * 
-	 * @throws Exception
-	 */
-	public void testShouldShowDiagramAssistant()
-		throws Exception {
-
-		getTestFixture().openDiagram();
-
-		IGraphicalEditPart ep = (IGraphicalEditPart) getDiagramEditPart()
-			.getPrimaryEditParts().get(0);
-
-		TestDiagramAssistantEditPolicy da = new TestDiagramAssistantEditPolicy();
-		ep.installEditPolicy("TestDiagramAssistantRole", //$NON-NLS-1$
-			da);
-		da.activate();
-
-		assertTrue(da.shouldShowDiagramAssistant());
-
-		// should not be shown if the editpart is not editable
-		ep.disableEditMode();
-		assertFalse(da.shouldShowDiagramAssistant());
-
-		ep.enableEditMode();
-		assertTrue(da.shouldShowDiagramAssistant());
-
-		// should not be shown if the editpart is inactive
-		ep.deactivate();
-		assertFalse(da.shouldShowDiagramAssistant());
-
-		ep.activate();
-		assertTrue(da.shouldShowDiagramAssistant());
-
-		// should not be shown if the diagram editor is not the active editor
-		IWorkbenchPage page = PlatformUI.getWorkbench()
-			.getActiveWorkbenchWindow().getActivePage();
-        IDiagramWorkbenchPart diagramPart = getDiagramWorkbenchPart();
-		if (page.getViewReferences().length > 0) {
-			// Activate the first view found, if there is one.
-		    for (int i = 0; i < page.getViewReferences().length; i++) {
-                IWorkbenchPart part = page.getViewReferences()[i].getPart(false);
-                if (part != null & part != diagramPart) {
-                    page.activate(part);
-                    assertFalse(da.shouldShowDiagramAssistant());
-                    break;
-                }               
-            }
-		}
-
-		page.activate(getDiagramWorkbenchPart());
-		assertTrue(da.shouldShowDiagramAssistant());
-
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramEventBrokerTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramEventBrokerTests.java
deleted file mode 100644
index f425cca..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramEventBrokerTests.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.logic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.Assert;
-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.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.Transaction;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.commands.Command;
-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.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutType;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractShapeTests;
-import org.eclipse.swt.widgets.Display;
-
-public class DiagramEventBrokerTests extends AbstractShapeTests {
-
-	private class TestListenningEditPart extends GraphicalEditPart {
-
-		private boolean receivedTypeEvent = false;
-
-		private DiagramEventBroker eventBroker;
-
-		private DiagramEditPart diagremEditPart;
-
-		public boolean receivedTypeEvent() {
-			return receivedTypeEvent;
-		}
-
-		protected Diagram getDiagramView() {
-			return diagremEditPart.getDiagramView();
-		}
-
-		public TestListenningEditPart(DiagramEditPart dEP,
-				DiagramEventBroker eventBroker, EObject model) {
-			super(model);
-			this.eventBroker = eventBroker;
-			this.diagremEditPart = dEP;
-			addListenerFilter(
-					"Type", this, model, NotationPackage.eINSTANCE.getView_Type()); //$NON-NLS-1$
-		}
-
-		public IFigure createFigure() {
-			return null;
-		}
-
-		/**
-		 * Adds a listener filter by adding the given listener to a passed
-		 * notifier
-		 * 
-		 * @param filterId
-		 *            A unique filter id (within the same editpart instance)
-		 * @param listener
-		 *            A listener instance
-		 * @param element
-		 *            An element to add the listener to
-		 */
-		protected void addListenerFilter(String filterId,
-				NotificationListener listener, EObject element,
-				EStructuralFeature feature) {
-			if (element == null)
-				return;
-			Assert.isNotNull(filterId);
-			Assert.isNotNull(listener);
-			eventBroker.addNotificationListener(element, feature, listener);
-		}
-
-		/**
-		 * Create an instance.
-		 * 
-		 * @param model
-		 *            the underlying model.
-		 */
-		public TestListenningEditPart(EObject model) {
-			super(model);
-		}
-
-		/**
-		 * Handles the property changed event
-		 * 
-		 * @param event
-		 *            the property changed event
-		 */
-		protected void handleNotificationEvent(Notification event) {
-			if (NotationPackage.eINSTANCE.getView_Type().equals(
-					event.getFeature()))
-				receivedTypeEvent = true;
-		}
-
-		/**
-		 * indicates if this edit part's model is a view or not
-		 * 
-		 * @return <code>true</code> or <code>false</code>
-		 */
-		public boolean hasNotationView() {
-			return false;
-		}
-
-		/**
-		 * This method adds all listeners to the semantic world
-		 * (IUMLElement...etc) Override this method to add more semantic
-		 * listeners down the hierarchy This method is called only if the
-		 * semantic element is resolvable
-		 */
-		protected void addSemanticListeners() {
-			// do not add any thing
-		}
-	}
-
-	public DiagramEventBrokerTests(String arg0) {
-		super(arg0);
-	}
-
-	public static Test suite() {
-		return new TestSuite(DiagramEventBrokerTests.class);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-
-	/** Return <code>(CanonicalTestFixture)getTestFixture();</code> */
-	protected LogicTestFixture getLogicTestFixture() {
-		return (LogicTestFixture) getTestFixture();
-	}
-
-	/**
-	 * Gets the diagram event broker from the editing domain.
-	 * 
-	 * @return the diagram event broker
-	 */
-	public DiagramEventBroker getDiagramEventBroker(
-			TransactionalEditingDomain theEditingDomain) {
-		if (theEditingDomain != null) {
-			return DiagramEventBroker.getInstance(theEditingDomain);
-		}
-		return null;
-	}
-
-	/**
-	 * Test to verify that copy appearance properties is working properly
-	 * 
-	 * @throws Exception
-	 */
-	public void testDiagramEventBroker() throws Exception {
-		final View view = getDiagramEditPart().getNotationView();
-		DiagramEditPart diagramEP = getDiagramEditPart();
-
-		TestListenningEditPart ep = new TestListenningEditPart(diagramEP,
-				getDiagramEventBroker(diagramEP.getEditingDomain()), view);
-
-		final TransactionalEditingDomain editingDomain = ep.getEditingDomain();
-		ep.activate();
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-				editingDomain, "") { //$NON-NLS-1$
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				view.setType("ddd"); //$NON-NLS-1$
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-		flushEventQueue();
-		assertTrue(ep.receivedTypeEvent());
-	}
-
-	public void testBlockingUI_Protected() {
-		DiagramEditPart diagramEP = getDiagramEditPart();
-		final TransactionalEditingDomain editingDomain = diagramEP
-				.getEditingDomain();
-
-		final Boolean result[] = new Boolean[2];
-		result[0] = Boolean.FALSE;
-
-		final AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				editingDomain, StringStatics.BLANK, null,
-				new ArrayList()) {
-
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				try {
-					result[0] = Boolean.TRUE;
-
-					Thread.sleep(10000);
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-				return new CommandResult(Status.OK_STATUS);
-			}
-
-		};
-
-		final Thread transactionThread = new Thread(new Runnable() {
-			public void run() {
-				try {
-					command.execute(new NullProgressMonitor(), null);
-				} catch (ExecutionException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		});
-
-		// get rid of queued asynch commands
-		Display.getDefault().readAndDispatch();
-
-		transactionThread.start();
-
-		while (!result[0].booleanValue()) {
-			Display.getDefault().readAndDispatch();
-		}
-
-		// try to access the UI while the transaction is running
-		ArrangeRequest arrRequest = new ArrangeRequest(
-				RequestConstants.REQ_ARRANGE_DEFERRED, LayoutType.DEFAULT);
-
-		arrRequest.setViewAdaptersToArrange(new ArrayList());
-		Command arrCmd = getDiagramEditPart().getCommand(arrRequest);
-
-		// make sure that the command is not valid and can't be executed
-		// which validates that the UI has been disabled while the transaction
-		// is running
-		assertTrue(arrCmd == null || !arrCmd.canExecute());
-
-		transactionThread.stop();
-	}
-
-	public void testBlockingUI_Unprotected() {
-		DiagramEditPart diagramEP = getDiagramEditPart();
-		final TransactionalEditingDomain editingDomain = diagramEP
-				.getEditingDomain();
-
-		final Map unchecked_options = new HashMap();
-		unchecked_options.put(Transaction.OPTION_NO_UNDO, Boolean.TRUE);
-		unchecked_options.put(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
-
-		final Boolean result[] = new Boolean[2];
-		result[0] = Boolean.FALSE;
-		result[1] = Boolean.FALSE;
-
-		final AbstractTransactionalCommand command = new AbstractTransactionalCommand(
-				editingDomain, StringStatics.BLANK, unchecked_options,
-				new ArrayList()) {
-
-			protected CommandResult doExecuteWithResult(
-					IProgressMonitor monitor, IAdaptable info)
-					throws ExecutionException {
-				final Thread accessCommandThread = new Thread(new Runnable() {
-					public void run() {
-						// try to access the UI while the transaction is running
-						ArrangeRequest arrRequest = new ArrangeRequest(
-								RequestConstants.REQ_ARRANGE_DEFERRED,
-								LayoutType.DEFAULT);
-
-						arrRequest.setViewAdaptersToArrange(new ArrayList());
-						Command arrCmd = getDiagramEditPart().getCommand(
-								arrRequest);
-						
-						result[0] = new Boolean(arrCmd == null || !arrCmd.canExecute());
-						result[1] = Boolean.TRUE;
-					}
-				});
-
-				accessCommandThread.start();
-				while (!result[1].booleanValue()) {
-					Display.getDefault().readAndDispatch();
-				}
-				accessCommandThread.stop();
-				return new CommandResult(Status.OK_STATUS);
-			}
-
-		};
-		
-		try {
-			command.execute(new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		assertTrue(result[0].booleanValue());
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramGraphicalViewerTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramGraphicalViewerTests.java
deleted file mode 100644
index 4ba1764..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/DiagramGraphicalViewerTests.java
+++ /dev/null
@@ -1,164 +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.diagram.ui.logic;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LEDEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestCommandCallback;
-
-/**
- * Tests the
- * {@link org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer}
- * class.
- * 
- * @author cmahoney
- */
-public class DiagramGraphicalViewerTests
-	extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(DiagramGraphicalViewerTests.class);
-		return s;
-	}
-
-	public DiagramGraphicalViewerTests() {
-		super("Diagram Graphical Viewer Test Suite");//$NON-NLS-1$
-	}
-
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-
-	/** Returns the logic test fixture */
-	protected LogicTestFixture getLogicTestFixture() {
-		return (LogicTestFixture) getTestFixture();
-	}
-
-	/**
-	 * Tests the ID to EditPart registry in the
-	 * <code>DiagramGraphicalViewer</code>.
-	 * 
-	 * @throws Exception
-	 */
-	public void testIDToEditPartRegistry()
-		throws Exception {
-
-		final LogicTestFixture fixture = getLogicTestFixture();
-		fixture.openDiagram();
-
-		Rectangle rect = new Rectangle(getDiagramEditPart().getFigure()
-			.getBounds());
-		getDiagramEditPart().getFigure().translateToAbsolute(rect);
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType(
-			"logic.led");//$NON-NLS-1$
-		IElementType typeWire = ElementTypeRegistry.getInstance().getType(
-			"logic.wire");//$NON-NLS-1$
-
-		Point createPt = new Point(100, 100);
-		LEDEditPart led1EP = (LEDEditPart) getLogicTestFixture()
-			.createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		createPt.getTranslated(led1EP.getFigure().getSize().getExpanded(100,
-			100));
-
-		LEDEditPart led2EP = (LEDEditPart) getLogicTestFixture()
-			.createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		createPt.getTranslated(led2EP.getFigure().getSize().getExpanded(100,
-			100));
-
-		final IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) getDiagramEditPart()
-			.getViewer();
-
-		EObject led1 = led1EP.getNotationView()
-		.getElement();
-		EObject led2 = led2EP.getNotationView()
-		.getElement();
-		final String led1ID = ((XMLResource) led1.eResource()).getID(led1);
-		final String led2ID = ((XMLResource) led2.eResource()).getID(led2);
-
-		// Create a wire relationship between an outgoing terminal on LED1 and
-		// an incoming terminal on LED2.
-		EObject outputTerminal = (EObject) ((LED) ((View) led1EP.getModel())
-				.getElement()).getOutputTerminals().get(0);
-		TerminalEditPart outputTerminalEP = (TerminalEditPart) viewer
-			.findEditPartsForElement(
-				((XMLResource) outputTerminal.eResource()).getID(outputTerminal),
-				TerminalEditPart.class).get(0);
-
-		EObject inputTerminal = (EObject) ((LED) ((View) led2EP.getModel())
-				.getElement()).getInputTerminals().get(0);
-		TerminalEditPart inputTerminalEP = (TerminalEditPart) viewer
-			.findEditPartsForElement(
-				((XMLResource) inputTerminal.eResource()).getID(inputTerminal),
-				TerminalEditPart.class).get(0);
-		ConnectionEditPart wireEP = getLogicTestFixture()
-			.createConnectorUsingTool(outputTerminalEP, inputTerminalEP,
-				typeWire);
-
-		EObject wire = ((View) wireEP.getModel()).getElement();
-		String wireID = ((XMLResource) wire.eResource()).getID(wire);
-
-		assertEquals("Number of LEDEditPart for led1ID incorrect", 1, viewer//$NON-NLS-1$
-			.findEditPartsForElement(led1ID, LEDEditPart.class).size());
-		assertEquals("Number of ConnectionEditParts for led1ID incorrect", 0,//$NON-NLS-1$
-			viewer.findEditPartsForElement(led1ID, ConnectionEditPart.class)
-				.size());
-
-		View shape3 = createShapeView(getDiagramEditPart(), ViewUtil
-			.resolveSemanticElement(led2EP.getNotationView()), new Point(100,
-			200));
-
-		assertEquals("Number of ShapeEditParts for led2ID incorrect", 2, viewer//$NON-NLS-1$
-			.findEditPartsForElement(led2ID, ShapeEditPart.class).size());
-
-		DeleteCommand delete = new DeleteCommand(getLogicTestFixture().getEditingDomain(), shape3);
-		testCommand(delete, new ITestCommandCallback() {
-
-			public void onCommandExecution() {
-				assertEquals("Number of LEDEditParts for led1ID incorrect", 1,//$NON-NLS-1$
-					viewer.findEditPartsForElement(led1ID, LEDEditPart.class)
-						.size());
-				assertEquals("Number of LEDEditParts for led2ID incorrect", 1,//$NON-NLS-1$
-					viewer.findEditPartsForElement(led2ID, LEDEditPart.class)
-						.size());
-			}
-		});
-		clearDiagram();
-		assertEquals("Number of IGraphicalEditParts for led1ID incorrect", 0,//$NON-NLS-1$
-			viewer.findEditPartsForElement(led1ID, IGraphicalEditPart.class)
-				.size());
-		assertEquals("Number of IGraphicalEditParts for led2ID incorrect", 0,//$NON-NLS-1$
-			viewer.findEditPartsForElement(led2ID, IGraphicalEditPart.class)
-				.size());
-		assertEquals("Number of IGraphicalEditParts for wireID incorrect", 0,//$NON-NLS-1$
-			viewer.findEditPartsForElement(wireID, IGraphicalEditPart.class)
-				.size());
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java
deleted file mode 100644
index ef6cf90..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java
+++ /dev/null
@@ -1,1266 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.logic;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-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.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.ArrangeAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.GroupAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.SelectAllAction;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.UngroupAction;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestActionCallback;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-
-/**
- * Tests for group and ungroup functionality.
- * 
- * @author crevells
- */
-public class GroupTests
-    extends AbstractTestBase {
-
-    public static Test suite() {
-        TestSuite s = new TestSuite(GroupTests.class);
-        return s;
-    }
-
-    public GroupTests() {
-        super("Group Tests");//$NON-NLS-1$
-    }
-
-    public class GroupTestFixture
-        extends LogicTestFixture {
-
-        protected void createShapesAndConnectors()
-            throws Exception {
-            // do nothing, each test will create the shapes it wants
-        }
-    }
-
-    protected void setTestFixture() {
-        testFixture = new GroupTestFixture();
-    }
-
-    protected LogicTestFixture getFixture() {
-        return (LogicTestFixture) testFixture;
-    }
-
-    /** the shape in the north-east */
-    protected View neView;
-
-    /** the shape in the north-west */
-    protected View nwView;
-
-    /** the shape in the south-east */
-    protected View seView;
-
-    /** the shape in the south-west */
-    protected View swView;
-
-    /**
-     * Create the four shapes to be used to test grouping.
-     */
-    protected void setupShapes() {
-
-        IElementType CIRCUIT_TYPE = ElementTypeRegistry.getInstance().getType(
-            "logic.circuit"); //$NON-NLS-1$
-
-        ShapeEditPart nwCircuitEP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(10, 10), new Dimension(50, 50),
-            getContainerEP());
-
-        ShapeEditPart neNoteEP = getFixture().createShapeUsingTool(
-            DiagramNotationType.NOTE, new Point(100, 10),
-            new Dimension(50, 50), getContainerEP());
-
-        ShapeEditPart swGeoshapeEP = getFixture().createShapeUsingTool(
-            DiagramNotationType.NOTE, new Point(10, 100),
-            new Dimension(50, 50), getContainerEP());
-
-        ShapeEditPart seCircuitEP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(100, 100), new Dimension(50, 50),
-            getContainerEP());
-
-        flushEventQueue();
-
-        // Cache the views so we can find the editparts again later.
-        nwView = (View) nwCircuitEP.getModel();
-        neView = (View) neNoteEP.getModel();
-        swView = (View) swGeoshapeEP.getModel();
-        seView = (View) seCircuitEP.getModel();
-
-        // Create some connections just to make things more complicated.
-        getFixture().createConnectorUsingTool(swGeoshapeEP, nwCircuitEP,
-            GeoshapeType.LINE);
-        getFixture().createConnectorUsingTool(neNoteEP, seCircuitEP,
-            GeoshapeType.LINE);
-        getFixture().createConnectorUsingTool(neNoteEP, swGeoshapeEP,
-            GeoshapeType.LINE);
-        getFixture().createConnectorUsingTool(swGeoshapeEP, seCircuitEP,
-            GeoshapeType.LINE);
-
-        flushEventQueue();
-    }
-
-    protected IGraphicalEditPart getContainerEP() {
-        return getDiagramEditPart();
-    }
-
-    protected ShapeEditPart getNWShape() {
-        return (ShapeEditPart) findEditPart(nwView);
-    }
-
-    protected ShapeEditPart getNEShape() {
-        return (ShapeEditPart) findEditPart(neView);
-    }
-
-    protected ShapeEditPart getSWShape() {
-        return (ShapeEditPart) findEditPart(swView);
-    }
-
-    protected ShapeEditPart getSEShape() {
-        return (ShapeEditPart) findEditPart(seView);
-    }
-
-    protected void setupShapesAndGroups() {
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-
-        GroupEditPart groupEP = groupShapes(shapes);
-
-        shapes.clear();
-        shapes.add(groupEP);
-        shapes.add(getNEShape());
-
-        groupShapes(shapes);
-
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-        assertEquals(2, getInnerGroupEP().getChildren().size());
-    }
-
-    protected GroupEditPart getInnerGroupEP() {
-        return (GroupEditPart) getNWShape().getParent();
-    }
-
-    protected GroupEditPart getOuterGroupEP() {
-        return (GroupEditPart) getNEShape().getParent();
-    }
-
-    protected GroupEditPart groupShapes(List<ShapeEditPart> editparts) {
-        View childView = (View) editparts.get(0).getModel();
-
-        GroupRequest request = new GroupRequest(ActionIds.ACTION_GROUP);
-        request.setEditParts(editparts);
-        Command cmd = editparts.get(0).getParent().getCommand(request);
-        assertTrue(cmd.canExecute());
-        getCommandStack().execute(cmd);
-        flushEventQueue();
-
-        EditPart groupEP = findEditPart(childView).getParent();
-        assertTrue(groupEP instanceof GroupEditPart);
-        return (GroupEditPart) groupEP;
-    }
-
-    protected Tool getSelectionToolFromPalette() {
-        PaletteViewer paletteViewer = getDiagramEditPart().getViewer()
-            .getEditDomain().getPaletteViewer();
-        ToolEntry selectionTool = paletteViewer.getPaletteRoot()
-            .getDefaultEntry();
-        paletteViewer.setActiveTool(selectionTool);
-        Tool tool = selectionTool.createTool();
-        tool.setEditDomain((EditDomain) getDiagramWorkbenchPart()
-            .getDiagramEditDomain());
-        return tool;
-    }
-
-    /**
-     * @return
-     */
-    protected IGraphicalEditPart findEditPart(View view) {
-        return (IGraphicalEditPart) getDiagramEditPart().getViewer()
-            .getEditPartRegistry().get(view);
-    }
-
-    protected MouseEvent createMouseEvent(int x, int y) {
-        Event e = new Event();
-
-        e.widget = getDiagramEditPart().getViewer().getControl();
-        ;
-        e.display = e.widget.getDisplay();
-        e.button = 1; // left button
-        e.x = x;
-        e.y = y;
-
-        return new MouseEvent(e);
-    }
-
-    protected MouseEvent createRightMouseEvent(int x, int y) {
-        Event e = new Event();
-
-        e.widget = getDiagramEditPart().getViewer().getControl();
-        ;
-        e.display = e.widget.getDisplay();
-        e.button = 3; // right button
-        e.x = x;
-        e.y = y;
-
-        return new MouseEvent(e);
-    }
-
-    protected Rectangle getAbsoluteBounds(IGraphicalEditPart editpart) {
-        IFigure figure = editpart.getFigure();
-        Rectangle bounds = (figure instanceof IExpandableFigure) ? ((IExpandableFigure) figure)
-            .getExtendedBounds().getCopy()
-            : figure.getBounds().getCopy();
-        editpart.getFigure().translateToAbsolute(bounds);
-        return bounds;
-    }
-
-    protected void assertNotEquals(Object object1, Object object2) {
-        assertFalse(object1.equals(object2));
-    }
-
-    public void testGroupCommandAndUndoRedo()
-        throws Exception {
-
-        setupShapes();
-
-        // Group the NE shape and the SE shape and test undo/redo of the action.
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-
-        GroupEditPart group1EP = groupShapes(shapes);
-
-        assertEquals(3, getContainerEP().getChildren().size());
-        assertEquals(group1EP, getSWShape().getParent());
-        assertEquals(group1EP.getParent(), getContainerEP());
-        assertEquals(2, group1EP.getChildren().size());
-        assertEquals(getAbsoluteBounds(group1EP), getAbsoluteBounds(
-            getNWShape()).union(getAbsoluteBounds(getSWShape())));
-
-        assertTrue(getCommandStack().canUndo());
-        getCommandStack().undo();
-        flushEventQueue();
-
-        assertEquals(getContainerEP(), getNWShape().getParent());
-        assertEquals(getSWShape().getParent(), getContainerEP());
-        assertEquals(4, getContainerEP().getChildren().size());
-
-        assertTrue(getCommandStack().canRedo());
-        getCommandStack().redo();
-        flushEventQueue();
-
-        group1EP = (GroupEditPart) getNWShape().getParent();
-        assertEquals(group1EP, getSWShape().getParent());
-        assertEquals(group1EP.getParent(), getContainerEP());
-        assertEquals(2, group1EP.getChildren().size());
-        assertEquals(3, getContainerEP().getChildren().size());
-        assertEquals(getAbsoluteBounds(group1EP), getAbsoluteBounds(
-            getNWShape()).union(getAbsoluteBounds(getSWShape())));
-
-        // Group group1 and the NE shape and test undo/redo of the action.
-
-        shapes.clear();
-        shapes.add(group1EP);
-        shapes.add(getNEShape());
-
-        GroupEditPart group2EP = groupShapes(shapes);
-
-        group1EP = (GroupEditPart) getNWShape().getParent();
-
-        assertEquals(group1EP, getSWShape().getParent());
-        assertEquals(group2EP, group1EP.getParent());
-        assertEquals(group2EP, getNEShape().getParent());
-        assertEquals(getContainerEP(), group2EP.getParent());
-        assertEquals(2, group1EP.getChildren().size());
-        assertEquals(2, group2EP.getChildren().size());
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(getAbsoluteBounds(group2EP), getAbsoluteBounds(
-            getNEShape()).union(getAbsoluteBounds(group1EP)));
-
-        assertTrue(getCommandStack().canUndo());
-        getCommandStack().undo();
-        flushEventQueue();
-
-        group1EP = (GroupEditPart) getNWShape().getParent();
-        assertEquals(getContainerEP(), group1EP.getParent());
-        assertEquals(getContainerEP(), getNEShape().getParent());
-        assertEquals(3, getContainerEP().getChildren().size());
-
-        assertTrue(getCommandStack().canRedo());
-        getCommandStack().redo();
-        flushEventQueue();
-
-        group1EP = (GroupEditPart) getNWShape().getParent();
-        group2EP = (GroupEditPart) getNEShape().getParent();
-        assertEquals(group2EP, group1EP.getParent());
-        assertEquals(getContainerEP(), group2EP.getParent());
-        assertEquals(2, group1EP.getChildren().size());
-        assertEquals(2, group2EP.getChildren().size());
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(getAbsoluteBounds(group2EP), getAbsoluteBounds(
-            getNEShape()).union(getAbsoluteBounds(group1EP)));
-    }
-
-    public void testUngroupCommandAndUndoRedo()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        // Ungroup the top-level group.
-        Request request = new Request(ActionIds.ACTION_UNGROUP);
-        Command cmd = getOuterGroupEP().getCommand(request);
-        assertTrue(cmd.canExecute());
-        getCommandStack().execute(cmd);
-        // flushEventQueue();
-
-        assertEquals(3, getContainerEP().getChildren().size());
-        assertEquals(getContainerEP(), getInnerGroupEP().getParent());
-        assertEquals(getContainerEP(), getNEShape().getParent());
-
-        // Undo the ungroup of the top-level group.
-        assertTrue(getCommandStack().canUndo());
-        getCommandStack().undo();
-
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(getOuterGroupEP(), getInnerGroupEP().getParent());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-
-        // Redo the ungroup of the top-level group.
-        assertTrue(getCommandStack().canRedo());
-        getCommandStack().redo();
-        // flushEventQueue();
-
-        assertEquals(3, getContainerEP().getChildren().size());
-        assertEquals(getContainerEP(), getInnerGroupEP().getParent());
-        assertEquals(getContainerEP(), getNEShape().getParent());
-    }
-
-    public void testGroupIsSelectedAfterGroupAction()
-        throws Exception {
-
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-
-        GroupAction action = new GroupAction(getWorkbenchPage());
-        getWorkbenchPage().activate(getDiagramWorkbenchPart());
-        action.init();
-
-        EditPartViewer viewer = getDiagramWorkbenchPart()
-            .getDiagramGraphicalViewer();
-        viewer.deselectAll();
-        viewer.setSelection(new StructuredSelection(shapes));
-
-        action.refresh();
-        assertTrue(action.isEnabled());
-        action.run();
-        action.dispose();
-
-        flushEventQueue();
-
-        assertEquals(1, ((StructuredSelection) viewer.getSelection()).size());
-        assertTrue(((StructuredSelection) viewer.getSelection())
-            .getFirstElement() instanceof GroupEditPart);
-    }
-
-    @SuppressWarnings("unchecked")
-	public void testGroupActionEnablement()
-        throws Exception {
-        setupShapes();
-
-        GroupAction action = new GroupAction(getWorkbenchPage());
-        getWorkbenchPage().activate(getDiagramWorkbenchPart());
-        action.init();
-
-        EditPartViewer viewer = getDiagramWorkbenchPart()
-            .getDiagramGraphicalViewer();
-        viewer.deselectAll();
-
-        // should be disabled when there is only one shape and connections are included in the selection
-        List<EditPart> selection = new LinkedList<EditPart>(getDiagramEditPart().getConnections());
-        selection.add(getNWShape());
-        viewer.setSelection(new StructuredSelection(selection));
-        action.refresh();
-        assertFalse(action.isEnabled());
-        
-        // should be enabled when connections are included in the selection
-        selection = new LinkedList<EditPart>(getDiagramEditPart().getConnections());
-        selection.addAll(getContainerEP().getChildren());
-        viewer.setSelection(new StructuredSelection(selection));
-        action.refresh();
-        assertTrue(action.isEnabled());
-
-        // should be disabled when only one shape is selected
-        viewer.setSelection(new StructuredSelection(getNWShape()));
-        action.refresh();
-        assertFalse(action.isEnabled());
-
-        // should be disabled when only connections are selected
-        viewer.setSelection(new StructuredSelection(getDiagramEditPart()
-            .getConnections()));
-        action.refresh();
-        assertFalse(action.isEnabled());
-
-        // should be enabled on groups
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-        GroupEditPart groupEP = groupShapes(shapes);
-        shapes.clear();
-        shapes.add(groupEP);
-        shapes.add(getNEShape());
-        viewer.setSelection(new StructuredSelection(shapes));
-        action.refresh();
-        assertTrue(action.isEnabled());
-
-        // should be disabled on uneditable diagrams
-        getContainerEP().disableEditMode();
-        action.refresh();
-        assertFalse(action.isEnabled());
-    }
-
-    public void testUngroupActionEnablement()
-        throws Exception {
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-        GroupEditPart group1EP = groupShapes(shapes);
-
-        shapes.clear();
-        shapes.add(getNEShape());
-        shapes.add(getSEShape());
-        GroupEditPart group2EP = groupShapes(shapes);
-
-        UngroupAction action = new UngroupAction(getWorkbenchPage());
-        getWorkbenchPage().activate(getDiagramWorkbenchPart());
-        action.init();
-
-        EditPartViewer viewer = getDiagramWorkbenchPart()
-            .getDiagramGraphicalViewer();
-        viewer.deselectAll();
-
-        // should be enabled when one group is selected
-        viewer.setSelection(new StructuredSelection(getInnerGroupEP()));
-        action.refresh();
-        assertTrue(action.isEnabled());
-
-        // should be enabled when multiple groups are selected
-        List<ShapeEditPart> groups = new LinkedList<ShapeEditPart>();
-        groups.add(group1EP);
-        groups.add(group2EP);
-        viewer.setSelection(new StructuredSelection(groups));
-        action.refresh();
-        assertTrue(action.isEnabled());
-    }
-
-    public void testSelectGroupWithClickAndDrag()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        PaletteViewer paletteViewer = viewer.getEditDomain().getPaletteViewer();
-
-        ToolEntry selectionTool = paletteViewer.getPaletteRoot()
-            .getDefaultEntry();
-        paletteViewer.setActiveTool(selectionTool);
-        Tool tool = selectionTool.createTool();
-        tool.setEditDomain((EditDomain) getDiagramWorkbenchPart()
-            .getDiagramEditDomain());
-
-        // draw rubber band around all the shapes
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-        tool.mouseDown(createMouseEvent(0, 0), viewer);
-        tool.mouseDrag(createMouseEvent(200, 200), viewer);
-        tool.mouseUp(createMouseEvent(200, 200), viewer);
-        tool.deactivate();
-
-        // size should be 6: 1 group, 1 shape, 4 connections
-        assertEquals(6, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getOuterGroupEP()));
-    }
-
-    public void testSelectGroupWithRightClick()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Tool tool = getSelectionToolFromPalette();
-
-        // click on a shape in the outer group and the outer group should be
-        // selected
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-        Point point = getAbsoluteBounds(getNEShape()).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getOuterGroupEP()));
-
-        // right-click on the same shape a second time and the group should
-        // still be
-        // selected
-        tool.mouseDown(createRightMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createRightMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getOuterGroupEP()));
-    }
-
-    public void testSelectShapesAndGroupsWithClick()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Tool tool = getSelectionToolFromPalette();
-
-        // click on a shape in the outer group and the outer group should be
-        // selected
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-        Point point = getAbsoluteBounds(getNEShape()).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getOuterGroupEP()));
-
-        // click on the same shape a second time and the shape should be
-        // selected
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getNEShape()));
-
-        // right-click on the same shape and it should remain selected
-        tool.mouseDown(createRightMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createRightMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getNEShape()));
-
-        // click on a shape not in the group and that shape itself should be
-        // selected
-        viewer.getSelectionManager().deselectAll();
-        point = getAbsoluteBounds(getSEShape()).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getSEShape()));
-
-        // click on an area of blank space in a group and nothing should be
-        // selected
-        viewer.getSelectionManager().deselectAll();
-        point = getAbsoluteBounds(getNWShape()).getBottom();
-        Point point2 = getAbsoluteBounds(getSWShape()).getTop();
-        point.translate(0, (point2.y - point.y) / 2);
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertTrue(
-            "should be empty unless we happened to click on one of the lines", //$NON-NLS-1$
-            viewer.getSelectedEditParts().isEmpty()
-                || viewer.getSelectedEditParts().get(0) instanceof ConnectionEditPart);
-
-        // click on a shape in the inner group and the outer group should be
-        // selected
-        viewer.getSelectionManager().deselectAll();
-        point = getAbsoluteBounds(getNWShape()).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getOuterGroupEP()));
-
-        // click on the same shape a second time and the inner group should be
-        // selected
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getInnerGroupEP()));
-
-        // click on the same shape a third time and the shape itself should be
-        // selected
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(getNWShape()));
-
-        tool.deactivate();
-    }
-
-    public void testSelectGroupWithClickOddScenario()
-        throws Exception {
-
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-
-        GroupEditPart group1EP = groupShapes(shapes);
-
-        shapes.clear();
-        shapes.add(getNEShape());
-        shapes.add(getSEShape());
-
-        GroupEditPart group2EP = groupShapes(shapes);
-
-        shapes.clear();
-        shapes.add(group1EP);
-        shapes.add(group2EP);
-
-        GroupEditPart outerGroupEP = groupShapes(shapes);
-
-        Tool tool = getSelectionToolFromPalette();
-
-        // click on a shape and the outer group should be
-        // selected
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-        Point point = getAbsoluteBounds(getNEShape()).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertTrue(viewer.getSelectedEditParts().contains(outerGroupEP));
-
-        tool.deactivate();
-    }
-
-    /**
-     * This ensure that when a group is created you can select a connection that
-     * exists between shapes in the group. The issue was that the connection
-     * editpart was not active.
-     * 
-     * This fails because of GEF Bugzilla 174085.
-     * 
-     * @throws Exception
-     */
-    public void testSelectConnectionInGroupWithClick()
-        throws Exception {
-
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-        GroupEditPart groupEP = groupShapes(shapes);
-
-        ConnectionEditPart connectionEP = (ConnectionEditPart) getNWShape()
-            .getTargetConnections().get(0);
-
-        Tool tool = getSelectionToolFromPalette();
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-
-        Point point = getAbsoluteBounds(connectionEP).getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-
-        assertEquals(1, viewer.getSelectedEditParts().size());
-        assertEquals(connectionEP, viewer.getSelectedEditParts().get(0));
-        assertTrue(connectionEP.isActive());
-        assertTrue(connectionEP.getSource().isActive());
-        assertEquals(groupEP, connectionEP.getSource().getParent());
-        assertTrue(connectionEP.getTarget().isActive());
-        assertEquals(groupEP, connectionEP.getTarget().getParent());
-
-        tool.deactivate();
-    }
-
-    public void disabledM6testMoveGroup()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Tool tool = getSelectionToolFromPalette();
-
-        Rectangle origGroupBounds = getAbsoluteBounds(getInnerGroupEP());
-        Rectangle origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        Rectangle origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        Point offset = new Point(25, 25);
-
-        // Click and drag the group in one gesture.
-        EditPartViewer viewer = getDiagramEditPart().getViewer();
-        viewer.getSelectionManager().deselectAll();
-        tool.activate();
-        Point point = origNEShapeBounds.getCenter();
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        point.translate(offset);
-        tool.mouseDrag(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-        tool.deactivate();
-        flushEventQueue();
-
-        // Cannot test the exact bounds because I can't figure out what the
-        // exact bounds should be (maybe there are rounding issues?) so the
-        // tests here will have to do.
-        Dimension resultingOffset = origGroupBounds.getLocation()
-            .getDifference(getAbsoluteBounds(getInnerGroupEP()).getLocation());
-        assertTrue(resultingOffset.height != 0 && resultingOffset.width != 0);
-        assertEquals(resultingOffset, origNEShapeBounds.getLocation()
-            .getDifference(getAbsoluteBounds(getNWShape()).getLocation()));
-        assertEquals(resultingOffset, origSEShapeBounds.getLocation()
-            .getDifference(getAbsoluteBounds(getSWShape()).getLocation()));
-
-        // Now select the group first and then click over a shape and drag. This
-        // should move the group.
-        origGroupBounds = getAbsoluteBounds(getInnerGroupEP());
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getSWShape());
-        point = origNEShapeBounds.getCenter();
-        offset = new Point(-25, -25);
-
-        viewer.getSelectionManager().deselectAll();
-        viewer.select(getInnerGroupEP());
-        tool.activate();
-
-        tool.mouseDown(createMouseEvent(point.x, point.y), viewer);
-        point.translate(offset);
-        tool.mouseDrag(createMouseEvent(point.x, point.y), viewer);
-        tool.mouseUp(createMouseEvent(point.x, point.y), viewer);
-        tool.deactivate();
-
-        flushEventQueue();
-
-        // Cannot test the exact bounds because I can't figure out what the
-        // exact bounds should be (maybe there are rounding issues?) so the
-        // tests here will have to do.
-        resultingOffset = origGroupBounds.getLocation().getDifference(
-            getAbsoluteBounds(getInnerGroupEP()).getLocation());
-        assertTrue(resultingOffset.height != 0 && resultingOffset.width != 0);
-
-        resultingOffset = origNEShapeBounds.getLocation().getDifference(
-            getAbsoluteBounds(getNWShape()).getLocation());
-        assertTrue(resultingOffset.height != 0 && resultingOffset.width != 0);
-
-        resultingOffset = origSEShapeBounds.getLocation().getDifference(
-            getAbsoluteBounds(getSWShape()).getLocation());
-        assertTrue(resultingOffset.height != 0 && resultingOffset.width != 0);
-
-        // Confirm sizes are still the same.
-        assertEquals(origGroupBounds.getSize(), getAbsoluteBounds(
-            getInnerGroupEP()).getSize());
-        assertEquals(origNEShapeBounds.getSize(), getAbsoluteBounds(
-            getNWShape()).getSize());
-        assertEquals(origSEShapeBounds.getSize(), getAbsoluteBounds(
-            getSWShape()).getSize());
-    }
-
-    public void testMoveShapeInGroup2()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Rectangle origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        Rectangle origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        // Move NEShape.
-        ChangeBoundsRequest request = new ChangeBoundsRequest(
-            RequestConstants.REQ_MOVE);
-        request.setMoveDelta(new Point(-20, -20));
-        request.setEditParts(getNWShape());
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-        assertEquals(getAbsoluteBounds(getNEShape()).union(
-            getAbsoluteBounds(getInnerGroupEP())),
-            getAbsoluteBounds(getOuterGroupEP()));
-
-        // Move the NE shape back to where it was.
-        request.setMoveDelta(new Point(20, 20));
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-        assertEquals(getAbsoluteBounds(getNEShape()).union(
-            getAbsoluteBounds(getInnerGroupEP())),
-            getAbsoluteBounds(getOuterGroupEP()));
-
-        // Move the NE shape out beyond the bottom-right of the group.
-        request.setMoveDelta(getAbsoluteBounds(getOuterGroupEP())
-            .getBottomRight().getTranslated(20, 20));
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origNEShapeBounds.getLocation(), getAbsoluteBounds(
-            getNWShape()).getLocation());
-        assertEquals(origSEShapeBounds.getLocation(), getAbsoluteBounds(
-            getSWShape()).getLocation());
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-        assertEquals(getAbsoluteBounds(getNEShape()).union(
-            getAbsoluteBounds(getInnerGroupEP())),
-            getAbsoluteBounds(getOuterGroupEP()));
-    }
-
-    public void testUngroupShapesMaintainsShapeLocations()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        // Ungroup the inner group.
-
-        // First cache the bounds in absolute coordinates of one of the figures.
-        Rectangle origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        // Perform the ungroup.
-        Request request = new Request(ActionIds.ACTION_UNGROUP);
-        Command cmd = getInnerGroupEP().getCommand(request);
-        assertTrue(cmd.canExecute());
-        getCommandStack().execute(cmd);
-        flushEventQueue();
-
-        // Test that the bounds in absolute have not changed.
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-
-        // Ungroup the outer group.
-
-        // First cache the bounds in absolute coordinates of one of the figures.
-        Rectangle origNWShapeBounds = getAbsoluteBounds(getNEShape());
-
-        // Perform the ungroup.
-        request = new Request(ActionIds.ACTION_UNGROUP);
-        cmd = getInnerGroupEP().getCommand(request);
-        assertTrue(cmd.canExecute());
-        getCommandStack().execute(cmd);
-        flushEventQueue();
-
-        // Test that the bounds in absolute have not changed.
-        assertEquals(origNWShapeBounds, getAbsoluteBounds(getNEShape()));
-    }
-
-    public void testDeleteShapeInGroup()
-        throws Exception {
-
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-        shapes.add(getSEShape());
-
-        GroupEditPart groupEP = groupShapes(shapes);
-
-        shapes.clear();
-        shapes.add(groupEP);
-        shapes.add(getNEShape());
-
-        groupShapes(shapes);
-
-        // Inner group has 3 shapes, outer group has inner group and 1 shape.
-        assertEquals(1, getContainerEP().getChildren().size());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-        assertEquals(3, getInnerGroupEP().getChildren().size());
-
-        Request request = new GroupRequest(RequestConstants.REQ_DELETE);
-
-        // Delete one shape from the inner group.
-        getCommandStack().execute(getSWShape().getCommand(request));
-
-        // Inner group should now have 2 shapes.
-        assertEquals(2, getInnerGroupEP().getChildren().size());
-
-        // Delete another shape from the inner group.
-        getCommandStack().execute(getNWShape().getCommand(request));
-
-        // Inner group should not exist anymore.
-        assertEquals(getOuterGroupEP(), getSEShape().getParent());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-
-        // Now try undo.
-        getCommandStack().undo();
-        getCommandStack().undo();
-
-        // Inner group has 3 shapes, outer group has inner group and 1 shape.
-        assertEquals(1, getContainerEP().getChildren().size());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-        assertEquals(3, getInnerGroupEP().getChildren().size());
-
-    }
-
-    /**
-     * Resizing a group is not supported yet.
-     * 
-     * @throws Exception
-     */
-    public void testCannotResizeGroup()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        ChangeBoundsRequest request = new ChangeBoundsRequest(
-            RequestConstants.REQ_RESIZE);
-        request.setResizeDirection(PositionConstants.SOUTH);
-        request.setEditParts(getOuterGroupEP());
-        request.setSizeDelta(new Dimension(0, 100));
-
-        Command cmd = getOuterGroupEP().getCommand(request);
-        assertTrue(cmd == null || !cmd.canExecute());
-    }
-
-    public void testResizeShapeInGroup()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Rectangle origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        Rectangle origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        // Resize the NE shape to the south-west.
-        ChangeBoundsRequest request = new ChangeBoundsRequest(
-            RequestConstants.REQ_RESIZE);
-        request.setResizeDirection(PositionConstants.SOUTH_WEST);
-        request.setMoveDelta(new Point(-10, 0));
-        request.setEditParts(getNWShape());
-        request.setSizeDelta(new Dimension(10, 10));
-
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origNEShapeBounds.getSize(), getAbsoluteBounds(
-            getNWShape()).getSize());
-        assertNotEquals(origNEShapeBounds.getLocation(), getAbsoluteBounds(
-            getNWShape()).getLocation());
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        // Resize the NE shape to the north-east
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        request.setResizeDirection(PositionConstants.NORTH_EAST);
-        request.setMoveDelta(new Point(0, -10));
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origNEShapeBounds.getLocation(), getAbsoluteBounds(
-            getNWShape()).getLocation());
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        // Resize SEShape to the south-east
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        request.setResizeDirection(PositionConstants.SOUTH_EAST);
-        request.setMoveDelta(new Point(0, 0));
-        request.setEditParts(getSWShape());
-
-        getSWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origSEShapeBounds.getSize(), getAbsoluteBounds(
-            getSWShape()).getSize());
-        assertEquals(origSEShapeBounds.getLocation(), getAbsoluteBounds(
-            getSWShape()).getLocation());
-        assertEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        // Resize SEShape to the north-west
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        request.setResizeDirection(PositionConstants.NORTH_WEST);
-        request.setMoveDelta(new Point(-10, -10));
-        getSWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origSEShapeBounds.getSize(), getAbsoluteBounds(
-            getSWShape()).getSize());
-        assertNotEquals(origSEShapeBounds.getLocation(), getAbsoluteBounds(
-            getSWShape()).getLocation());
-        assertEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        // Decrease NEShape's size by 10 on each side.
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getSWShape());
-
-        request.setResizeDirection(PositionConstants.NORTH_EAST);
-        request.setMoveDelta(new Point(0, 10));
-        request.setEditParts(getNWShape());
-        request.setSizeDelta(new Dimension(-10, -10));
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        request.setResizeDirection(PositionConstants.SOUTH_WEST);
-        request.setMoveDelta(new Point(10, 0));
-        getNWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertEquals(origSEShapeBounds, getAbsoluteBounds(getSWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        // Decrease SEShape's size by 10 on each side.
-        origNEShapeBounds = getAbsoluteBounds(getNWShape());
-        origSEShapeBounds = getAbsoluteBounds(getNWShape());
-
-        request.setResizeDirection(PositionConstants.SOUTH_EAST);
-        request.setMoveDelta(new Point(0, 0));
-        request.setEditParts(getSWShape());
-        getSWShape().getCommand(request).execute();
-        flushEventQueue();
-
-        assertNotEquals(origSEShapeBounds, getSWShape().getFigure().getBounds());
-        assertEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-
-        request.setResizeDirection(PositionConstants.NORTH_WEST);
-        request.setMoveDelta(new Point(10, 10));
-        getSWShape().getCommand(request).execute();
-
-        assertEquals(origNEShapeBounds, getAbsoluteBounds(getNWShape()));
-        assertEquals(getAbsoluteBounds(getNWShape()).union(
-            getAbsoluteBounds(getSWShape())),
-            getAbsoluteBounds(getInnerGroupEP()));
-    }
-
-    public void testDeleteGroup()
-        throws Exception {
-
-        setupShapesAndGroups();
-
-        Request request = new GroupRequest(RequestConstants.REQ_DELETE);
-        getCommandStack().execute(getOuterGroupEP().getCommand(request));
-
-        assertEquals(1, getContainerEP().getChildren().size());
-
-        getCommandStack().undo();
-
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(2, getOuterGroupEP().getChildren().size());
-        assertEquals(2, getInnerGroupEP().getChildren().size());
-
-    }
-
-    public void testSelectActions()
-        throws Exception {
-        setupShapesAndGroups();
-
-        // test select all
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-
-        SelectAllAction selectAction = SelectAllAction
-            .createSelectAllAction(getWorkbenchPage());
-
-        testAction(selectAction, new ITestActionCallback() {
-
-            public void onRunExecution() {
-
-                List selectedParts = getContainerEP().getViewer()
-                    .getSelectedEditParts();
-
-                // 2 shapes and 4 connectors
-                assertEquals(6, selectedParts.size());
-                assertTrue(selectedParts.contains(getOuterGroupEP()));
-                assertTrue(selectedParts.contains(getNEShape()
-                    .getSourceConnections().get(0)));
-                assertFalse(selectedParts.contains(getNWShape()));
-
-            }
-        });
-
-        // test select all shapes
-        getContainerEP().getViewer().deselectAll();
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-
-        selectAction = SelectAllAction
-            .createSelectAllShapesAction(getWorkbenchPage());
-
-        testAction(selectAction, new ITestActionCallback() {
-
-            public void onRunExecution() {
-
-                List selectedParts = getContainerEP().getViewer()
-                    .getSelectedEditParts();
-
-                // 2 shapes
-                assertEquals(2, selectedParts.size());
-                assertTrue(selectedParts.contains(getOuterGroupEP()));
-                assertTrue(selectedParts.contains(getSEShape()));
-
-            }
-        });
-
-        // test select all connections
-        getContainerEP().getViewer().deselectAll();
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-
-        selectAction = SelectAllAction
-            .createSelectAllConnectionsAction(getWorkbenchPage());
-
-        testAction(selectAction, new ITestActionCallback() {
-
-            public void onRunExecution() {
-
-                List selectedParts = getContainerEP().getViewer()
-                    .getSelectedEditParts();
-
-                // 4 connectors
-                assertEquals(4, selectedParts.size());
-                assertTrue(selectedParts.contains(getNEShape()
-                    .getSourceConnections().get(0)));
-            }
-        });
-    }
-
-    public void disabledM6testArrangeActions()
-        throws Exception {
-        setupShapesAndGroups();
-
-        // test arrange all
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-
-        final Rectangle origOuterGroupBounds = getAbsoluteBounds(getOuterGroupEP());
-        final Rectangle seShapeBounds = getAbsoluteBounds(getSEShape());
-
-        ArrangeAction arrangeAction = ArrangeAction
-            .createArrangeAllAction(getWorkbenchPage());
-        testAction(arrangeAction, new ITestActionCallback() {
-
-            public void onRunExecution() {
-                assertEquals(origOuterGroupBounds.getSize(), getAbsoluteBounds(
-                    getOuterGroupEP()).getSize());
-                assertNotEquals(seShapeBounds.getLocation(), getAbsoluteBounds(
-                    getSEShape()).getLocation());
-            }
-        });
-
-        getCommandStack().undo();
-
-        // test arrange selection with a group selected
-        getContainerEP().getViewer().deselectAll();
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getOuterGroupEP()));
-
-        final Rectangle origInnerGroupBounds = getAbsoluteBounds(getInnerGroupEP());
-        final Rectangle swShapeBounds = getAbsoluteBounds(getSWShape());
-
-        arrangeAction = ArrangeAction
-            .createArrangeSelectionAction(getWorkbenchPage());
-        testAction(arrangeAction, new ITestActionCallback() {
-
-            public void onRunExecution() {
-                assertAlmostEquals(origInnerGroupBounds.getSize(), getAbsoluteBounds(
-                    getInnerGroupEP()).getSize());
-                assertNotEquals(swShapeBounds.getLocation(), getAbsoluteBounds(
-                    getSWShape()).getLocation());
-            }
-        });
-
-    }
-    
-    /**
-     * It is possible that two himetric values may be off slightly just because
-     * we are mixing doubles and integers in GMF/GEF and there could be slight
-     * rounding differences. This method will treat a difference of less than 1
-     * as being equal.
-     * 
-     * @param d1
-     * @param d2
-     * @return
-     */
-    private void assertAlmostEquals(Dimension d1, Dimension d2) {
-        assertTrue((Math.abs(d1.height - d2.height) <= 1)
-            && (Math.abs(d1.width - d2.width) <= 1));
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupsInCompartmentTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupsInCompartmentTests.java
deleted file mode 100644
index da59357..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupsInCompartmentTests.java
+++ /dev/null
@@ -1,119 +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.diagram.ui.logic;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.CircuitEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-
-/**
- * Repeat all the same tests in <code>GroupTests</code> but within a
- * compartment.  There are also additional tests here.
- * 
- * @author crevells
- */
-public class GroupsInCompartmentTests
-    extends GroupTests {
-
-    public static Test suite() {
-        TestSuite s = new TestSuite(GroupsInCompartmentTests.class);
-        return s;
-    }
-
-    private static IElementType CIRCUIT_TYPE = ElementTypeRegistry
-        .getInstance().getType("logic.circuit"); //$NON-NLS-1$
-
-    private IGraphicalEditPart logicCompartmentEP;
-
-    protected IGraphicalEditPart getContainerEP() {
-        return logicCompartmentEP;
-    }
-
-    protected void setTestFixture() {
-        testFixture = new GroupTestFixture() {
-
-            protected void createShapesAndConnectors()
-                throws Exception {
-
-                // create the circuit that is the container
-                CircuitEditPart circuitEP = (CircuitEditPart) getFixture()
-                    .createShapeUsingTool(CIRCUIT_TYPE, new Point(5, 5),
-                        new Dimension(300, 300));
-                logicCompartmentEP = circuitEP
-                    .getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-            }
-        };
-    }
-
-    public void testRefreshCanonicalDoesNotCreateDoubles()
-        throws Exception {
-        setupShapesAndGroups();
-
-        assertEquals(2, getContainerEP().getChildren().size());
-
-        // trigger a canonical refresh
-        getFixture().createShapeUsingTool(CIRCUIT_TYPE, new Point(10, 10),
-            new Dimension(50, 50), getContainerEP());
-        flushEventQueue();
-
-        assertEquals(3, getContainerEP().getChildren().size());
-    }
-
-    public void testDeleteShapeInGroupDoesNotReappear()
-        throws Exception {
-
-        setupShapes();
-
-        List<ShapeEditPart> shapes = new LinkedList<ShapeEditPart>();
-        shapes.add(getNWShape());
-        shapes.add(getSWShape());
-        shapes.add(getSEShape());
-
-        GroupEditPart groupEP = groupShapes(shapes);
-
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(3, groupEP.getChildren().size());
-
-        Request request = new GroupRequest(RequestConstants.REQ_DELETE);
-
-        // Delete one shape from the inner group.
-        getCommandStack().execute(getNWShape().getCommand(request));
-
-        assertEquals(2, getContainerEP().getChildren().size());
-        assertEquals(2, groupEP.getChildren().size());
-
-        // trigger a canonical refresh
-        getFixture().createShapeUsingTool(CIRCUIT_TYPE, new Point(10, 10),
-            new Dimension(50, 50), getContainerEP());
-        flushEventQueue();
-
-        assertEquals(3, getContainerEP().getChildren().size());
-        assertEquals(2, groupEP.getChildren().size());
-
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LayoutTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LayoutTests.java
deleted file mode 100644
index a9a0a74..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LayoutTests.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.logic;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-/**
- * Tests for layout scenarios.
- * 
- * @author crevells
- */
-public class LayoutTests
-    extends AbstractTestBase {
-
-    public static Test suite() {
-        TestSuite s = new TestSuite(LayoutTests.class);
-        return s;
-    }
-
-    public class LayoutTestFixture
-        extends LogicTestFixture {
-
-        protected void createShapesAndConnectors()
-            throws Exception {
-            // do nothing, each test will create the shapes it wants
-        }
-    }
-
-    IElementType CIRCUIT_TYPE = ElementTypeRegistry.getInstance().getType(
-        "logic.circuit"); //$NON-NLS-1$
-
-    IElementType LED_TYPE = ElementTypeRegistry.getInstance().getType(
-        "logic.led"); //$NON-NLS-1$
-
-    public LayoutTests() {
-        super("Layout Tests");//$NON-NLS-1$
-    }
-
-    protected void setTestFixture() {
-        testFixture = new LayoutTestFixture();
-    }
-
-    protected LayoutTestFixture getFixture() {
-        return (LayoutTestFixture) testFixture;
-    }
-
-    protected IGraphicalEditPart getContainerEP() {
-        return getDiagramEditPart();
-    }
-
-    protected void assertNotEquals(Object object1, Object object2) {
-        assertFalse(object1.equals(object2));
-    }
-
-    /**
-     * Tests the scenario where a multiple arrange on a circuit was continually
-     * moving the circuit.
-     * 
-     * @throws Exception
-     */
-    public void test151214MultipleArrangeOneCircuit()
-        throws Exception {
-        getTestFixture().openDiagram();
-
-        ShapeEditPart circuitEP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(25, 55), new Dimension(100, 100),
-            getContainerEP());
-        flushEventQueue();
-        Rectangle prevBounds = circuitEP.getFigure().getBounds().getCopy();
-
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-        ArrangeRequest request = new ArrangeRequest(
-            ActionIds.ACTION_ARRANGE_ALL);
-
-        getCommandStack().execute(getContainerEP().getCommand(request));
-        flushEventQueue();
-
-        assertNotEquals(prevBounds, circuitEP.getFigure().getBounds());
-        prevBounds = circuitEP.getFigure().getBounds().getCopy();
-
-        getCommandStack().execute(getContainerEP().getCommand(request));
-        flushEventQueue();
-
-        assertEquals(prevBounds, circuitEP.getFigure().getBounds());
-    }
-
-    /**
-     * Tests the scenario where an arrange with a circuit not in autosize mode
-     * (i.e. its size will not change), was arranging other siblings as if the
-     * circuit had been in autosize mode.
-     * 
-     * @throws Exception
-     */
-    public void test151214DoesNotAssumeAutosizeIsOn()
-        throws Exception {
-        getTestFixture().openDiagram();
-
-        // create circuit1 with autosize on
-        ShapeEditPart circuit1EP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(22, 58), getContainerEP());
-
-        // create circuit2 with autosize off
-        ShapeEditPart circuit2EP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(27, 199), new Dimension(111, 111),
-            getContainerEP());
-
-        // create circuit3 with autosize on
-        ShapeEditPart circuit3EP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(373, 55), getContainerEP());
-
-        // Add a bunch of LEDs to circuit2 so it's autosize would be big after
-        // the arrange
-        EObject circuit2 = circuit2EP.getNotationView().getElement();
-        getFixture().createLED(circuit2);
-        getFixture().createLED(circuit2);
-        getFixture().createLED(circuit2);
-        getFixture().createLED(circuit2);
-        getFixture().createLED(circuit2);
-
-        flushEventQueue();
-
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-        ArrangeRequest request = new ArrangeRequest(
-            ActionIds.ACTION_ARRANGE_ALL);
-
-        getCommandStack().execute(getContainerEP().getCommand(request));
-        flushEventQueue();
-
-        int diffX_12 = circuit2EP.getFigure().getBounds().getLeft().x
-            - circuit1EP.getFigure().getBounds().getRight().x;
-        int diffX_23 = circuit3EP.getFigure().getBounds().getLeft().x
-            - circuit2EP.getFigure().getBounds().getRight().x;
-
-        assertTrue(diffX_23 < diffX_12 * 2);
-    }
-
-    /**
-     * The Composite Layout should accomodate for the fact that container shapes
-     * in autosize mode will grow. If one circuit is in autosize mode and it
-     * ends up growing vertically, any shapes below the circuit will be
-     * positioned wrongly until Arrange All is done a second time.
-     * 
-     * @throws Exception
-     */
-    public void test151214CompositeLayoutRespectsNewSize()
-        throws Exception {
-        getTestFixture().openDiagram();
-
-        // create circuit with autosize on
-        ShapeEditPart circuitEP = getFixture().createShapeUsingTool(
-            CIRCUIT_TYPE, new Point(39, 81), getContainerEP());
-
-        // Add a bunch of LEDs the circuit so it's autosize will be big after
-        // the arrange
-        EObject circuit = circuitEP.getNotationView().getElement();
-        getFixture().createLED(circuit);
-        getFixture().createLED(circuit);
-        getFixture().createLED(circuit);
-        getFixture().createLED(circuit);
-        getFixture().createLED(circuit);
-        flushEventQueue();
-
-        IGraphicalEditPart compartmentEP = circuitEP
-            .getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-        ShapeEditPart innerLed1EP = (ShapeEditPart) compartmentEP.getChildren()
-            .get(0);
-        ShapeEditPart innerLed2EP = (ShapeEditPart) compartmentEP.getChildren()
-            .get(1);
-
-        ShapeEditPart geoshapeEP = getFixture().createShapeUsingTool(
-            GeoshapeType.DIAMOND, new Point(161, 25), getContainerEP());
-
-        getFixture().createConnectorUsingTool(innerLed1EP, innerLed2EP,
-            GeoshapeType.LINE);
-
-        getFixture().createConnectorUsingTool(innerLed2EP, geoshapeEP,
-            GeoshapeType.LINE);
-
-        flushEventQueue();
-
-        getContainerEP().getViewer().setSelection(
-            new StructuredSelection(getContainerEP()));
-        ArrangeRequest request = new ArrangeRequest(
-            ActionIds.ACTION_ARRANGE_ALL);
-
-        getCommandStack().execute(getContainerEP().getCommand(request));
-        flushEventQueue();
-
-        assertFalse(geoshapeEP.getFigure().getBounds().intersects(
-            circuitEP.getFigure().getBounds()));
-    }
-
-//    /**
-//     * The Composite Layout should place all the shapes in the top row at the
-//     * same y value. See bugzilla 214077.
-//     * 
-//     * @throws Exception
-//     */
-//    public void test215077CompositeLayoutAlignedAtTop()
-//        throws Exception {
-//        getTestFixture().openDiagram();
-//
-//        // create circuit with autosize on
-//        ShapeEditPart circuitEP = getFixture().createShapeUsingTool(
-//            CIRCUIT_TYPE, new Point(44, 177), getContainerEP());
-//
-//        ShapeEditPart ledEP = getFixture().createShapeUsingTool(LED_TYPE,
-//            new Point(174, 177), getContainerEP());
-//
-//        ShapeEditPart geoshapeEP = getFixture().createShapeUsingTool(
-//            GeoshapeType.DIAMOND, new Point(259, 25), getContainerEP());
-//
-//        getFixture().createConnectorUsingTool(ledEP, geoshapeEP,
-//            GeoshapeType.LINE);
-//
-//        flushEventQueue();
-//
-//        getContainerEP().getViewer().setSelection(
-//            new StructuredSelection(getContainerEP()));
-//        ArrangeRequest request = new ArrangeRequest(
-//            ActionIds.ACTION_ARRANGE_ALL);
-//
-//        getCommandStack().execute(getContainerEP().getCommand(request));
-//        flushEventQueue();
-//
-//        assertEquals(circuitEP.getFigure().getBounds().getTop().y, ledEP
-//            .getFigure().getBounds().getTop().y);
-//    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCanonicalTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCanonicalTests.java
deleted file mode 100644
index 602247b..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCanonicalTests.java
+++ /dev/null
@@ -1,327 +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.diagram.ui.logic;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.LEDEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.editparts.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Wire;
-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.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart;
-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.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-
-/**
- * Tests the canonical editpolicies installed on the class attribute and 
- * operation list compartments.
- * @author mhanner
- */
-public class LogicCanonicalTests extends AbstractTestBase {
-	
-	/**
-	 * Defines the statechart diagram test suite.
-	 * 
-	 * @return the test suite.
-	 */
-	public static Test suite() {
-		TestSuite s = new TestSuite(LogicCanonicalTests.class);
-		return s;
-	}
-	
-	/** Create an instance. */
-	public LogicCanonicalTests() {
-		super("Canonical Test Suite");//$NON-NLS-1$
-	}
-
-	/** installs the composite state test fixture. */
-	protected void setTestFixture() {
-		testFixture = new CanonicalTestFixture();
-	}
-
-	/** Return <code>(CanonicalTestFixture)getTestFixture();</code> */
-	protected CanonicalTestFixture getCanonicalTestFixture() {
-		return (CanonicalTestFixture)getTestFixture();
-	}
-	
-	/** 
-	 * Tests the ability to disable the canonical editpolicy on  the 
-	 * attribute list compartment.
-	 */
-	public void test_DisableCanonical() {
-		try {
-			println("test_DisableCanonical() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			_testFixture.enableCanonical( logicCompartment, false );
-			final int SIZE = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				_testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-				assertEquals( "Unexpected LED", SIZE, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			
-			_testFixture.enableCanonical( logicCompartment, true );
-			assertEquals( "Unexpected LED", count, logicCompartment.getChildren().size() );//$NON-NLS-1$
-		}
-		finally {
-			println("test_DisableCanonical() complete.");//$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Tests if the canonical editpolicy will refresh when the list compartment
-	 * is collapsed.
-	 */
-	public void test_RefreshWhileCollapsed() {
-		try {
-			println("test_RefreshWhileCollapsed() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			_testFixture.setCollapsed( (IResizableCompartmentEditPart)logicCompartment, true );
-			final int SIZE = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				_testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-				assertEquals( "Unexpected LED", SIZE, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			_testFixture.setCollapsed( (IResizableCompartmentEditPart)logicCompartment, false );
-			assertEquals( "Unexpected LED", count, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			
-		}
-		finally {
-			println("test_RefreshWhileCollapsed() complete.");//$NON-NLS-1$
-		}
-	}
-	
-	
-	/**
-	 * Tests if the canonical editpolicy will refresh when the list compartment
-	 * is not visible.
-	 */
-	public void test_RefreshWhileVisible() {
-		try {
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			println("test_RefreshWhileVisible() starting ...");//$NON-NLS-1$
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			View view = logicCompartment.getNotationView();
-			_testFixture.setVisible( logicCompartment, false );
-			final int SIZE = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				_testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-				assertEquals( "Unexpected LED", SIZE, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			_testFixture.setVisible( view, true );
-			IGraphicalEditPart logicCompartment1 = _testFixture.getCanonicalCompartment(0);
-			assertEquals( "Unexpected LED", count, logicCompartment1.getChildren().size() );//$NON-NLS-1$
-		}
-		finally {
-			println("test_RefreshWhileVisible() complete.");//$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Tests the creation and deletion of an attribute view based on the
-	 * creation and destruction of semantic elements.
-	 */
-	public void test_AddRemoveLED() {
-		try {
-			println("test_AddRemoveLED() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			List properties = new ArrayList();
-			int size = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				properties.add( _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView())));
-				size++;
-				assertEquals( "Unexpected LED count.", size, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			
-			size = logicCompartment.getChildren().size();
-			EObject[] toDelete = new EObject[ properties.size() ];
-			properties.toArray( toDelete );
-			
-			for ( int i = 0; i < toDelete.length; i++ ) {
-				_testFixture.destroy( toDelete[i] );
-				size--;
-				assertEquals( "Unexpected LED count.", size, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-		}
-		finally {
-			println("test_AddRemoveAttribute() complete.");//$NON-NLS-1$
-		}
-	}
-	
-	public void test_AddDeleteWire() {
-		try {
-			println("test_AddDeleteWire() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			LED led1 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			LED led2 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			Terminal term1 = (Terminal)led1.getOutputTerminals().get(0);
-			Terminal term2 = (Terminal)led2.getInputTerminals().get(0);
-			
-			IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-			IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-			
-			CreateRelationshipRequest crr = new CreateRelationshipRequest(
-                getCanonicalTestFixture().getEditingDomain(), term1, term2,
-                typeWire);
-            ICommand createWire = typeCircuit.getEditHelper().getEditCommand(crr);
-			_testFixture.execute(createWire);
-			flushEventQueue();
-			
-			List connectorEPs = getDiagramEditPart().getConnections();
-			
-			assertEquals( "Unexpected Wire count.", 1, connectorEPs.size()); //$NON-NLS-1$
-			ConnectionEditPart ep = (ConnectionEditPart)connectorEPs.get(0);
-			assertTrue( "Unexpected source.", ((View)ep.getSource().getModel()).getElement().equals(term1));//$NON-NLS-1$
-			assertTrue( "Unexpected target.", ((View)ep.getTarget().getModel()).getElement().equals(term2));//$NON-NLS-1$
-			assertTrue(((View)ep.getModel()).getElement() instanceof Wire);
-			
-			// now destroy it
-			_testFixture.destroy( ((View)ep.getModel()).getElement() );
-			flushEventQueue();
-			
-			connectorEPs = getDiagramEditPart().getConnections();
-			assertEquals( "Unexpected Wire count.", 0, connectorEPs.size()); //$NON-NLS-1$
-		}
-		finally {
-			println("test_AddDeleteWire() complete.");//$NON-NLS-1$
-		}
-	}
-		
-
-	/**
-	 * Tests the creation and deletion of an attribute view based on
-	 * moving an semantic attribute between classes.
-	 */
-	public void test_ReparentLED() {
-		try {
-			println("test_ReparentLED() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture fixture = (CanonicalTestFixture)getTestFixture();
-			
-			IGraphicalEditPart logicCompartment = fixture.getCanonicalCompartment(0);
-			IGraphicalEditPart logicCompartment2 = fixture.getCanonicalCompartment(1);
-			Circuit circuit1 = (Circuit)ViewUtil.resolveSemanticElement(logicCompartment.getNotationView());
-			Circuit circuit2 = (Circuit)ViewUtil.resolveSemanticElement(logicCompartment2.getNotationView());
-			
-			LED movingLED = fixture.createLED(circuit1);
-			flushEventQueue();
-			assertEquals( "Unexpected LED count.", 1, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			
-			MoveRequest mr = new MoveRequest(getTestFixture()
-                .getEditingDomain(), circuit2, movingLED);
-            IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-			ICommand reparentCmd = typeCircuit.getEditHelper().getEditCommand(mr);
-			fixture.execute(reparentCmd);
-			flushEventQueue();
-			
-			assertTrue( "unexpected LED", logicCompartment.getChildren().isEmpty() );//$NON-NLS-1$
-			assertEquals( "Unexpected LED count.", 1, logicCompartment2.getChildren().size() );//$NON-NLS-1$
-			
-			mr = new MoveRequest(getTestFixture().getEditingDomain(), circuit1,
-                movingLED);
-            reparentCmd = typeCircuit.getEditHelper().getEditCommand(mr);
-			fixture.execute(reparentCmd);
-			flushEventQueue();
-			
-			assertTrue( "unexpected LED", logicCompartment2.getChildren().isEmpty() );//$NON-NLS-1$
-			assertEquals( "Unexpected LED count.", 1, logicCompartment.getChildren().size() );//$NON-NLS-1$
-		}
-		finally {
-			println("test_ReparentLED() complete.");//$NON-NLS-1$
-		}
-	}
-	
-	public void test_createLEDUsingTool() {
-		CanonicalTestFixture fixture = (CanonicalTestFixture)getTestFixture();
-		IGraphicalEditPart logicCompartment = fixture.getCanonicalCompartment(0);
-		Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-		logicCompartment.getFigure().translateToAbsolute(rect);
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-		
-		getCanonicalTestFixture().createShapeUsingTool(typeLED, rect.getCenter(), logicCompartment);
-		assertEquals( "Unexpected LED count.", 1, logicCompartment.getChildren().size() );//$NON-NLS-1$
-	}
-	
-	public void test_createWireUsingTool() {
-		try {
-			println("test_AddDeleteWire() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture fixture = (CanonicalTestFixture)getTestFixture();
-			IGraphicalEditPart logicCompartment = fixture.getCanonicalCompartment(0);
-			
-			Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-			IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-			LEDEditPart ledEP1 = (LEDEditPart)getCanonicalTestFixture().createShapeUsingTool(typeLED, rect.getTopLeft().getTranslated(10, 10), logicCompartment);
-			rect = new Rectangle(logicCompartment.getFigure().getBounds());
-			LEDEditPart ledEP2 = (LEDEditPart)getCanonicalTestFixture().createShapeUsingTool(typeLED, rect.getBottomRight().getTranslated(-10, -10), logicCompartment);
-			
-			Terminal term1 = (Terminal)((LED)ledEP1.getNotationView().getElement()).getOutputTerminals().get(0);
-			TerminalEditPart tep1 = null;
-			ListIterator li = ledEP1.getChildren().listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				if (gep.getNotationView().getElement().equals(term1))
-					tep1 = (TerminalEditPart)gep;
-			}
-			
-			Terminal term2 = (Terminal)((LED)ledEP2.getNotationView().getElement()).getInputTerminals().get(0);
-			TerminalEditPart tep2 = null;
-			li = ledEP2.getChildren().listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				if (gep.getNotationView().getElement().equals(term2))
-					tep2 = (TerminalEditPart)gep;
-			}
-			
-			IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-						
-			getCanonicalTestFixture().createConnectorUsingTool(tep1, tep2, typeWire);
-			List connectorEPs = getDiagramEditPart().getConnections();
-			
-			assertEquals( "Unexpected Wire count.", 1, connectorEPs.size()); //$NON-NLS-1$
-			ConnectionEditPart ep = (ConnectionEditPart)connectorEPs.get(0);
-			assertTrue( "Unexpected source.", ((View)ep.getSource().getModel()).getElement().equals(term1));//$NON-NLS-1$
-			assertTrue( "Unexpected target.", ((View)ep.getTarget().getModel()).getElement().equals(term2));//$NON-NLS-1$
-			assertTrue(((View)ep.getModel()).getElement() instanceof Wire);
-		}
-		finally {
-			println("test_AddDeleteWire() complete.");//$NON-NLS-1$
-		}
-	}
-
-}
-
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCreationTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCreationTests.java
deleted file mode 100644
index 8b7c841..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicCreationTests.java
+++ /dev/null
@@ -1,215 +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.diagram.ui.logic;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.LogicGateEditPart;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ArrangeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * Tests the canonical editpolicies installed on the class attribute and 
- * operation list compartments.
- * @author mhanner
- */
-public class LogicCreationTests extends AbstractTestBase {
-
-	/**
-	 * Defines the statechart diagram test suite.
-	 * 
-	 * @return the test suite.
-	 */
-	public static Test suite() {
-		TestSuite s = new TestSuite(LogicCreationTests.class);
-		return s;
-	}
-	
-	/** Create an instance. */
-	public LogicCreationTests() {
-		super("Logic Shape Creation Test Suite");//$NON-NLS-1$
-	}
-
-	/** installs the composite state test fixture. */
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-	
-	/** Return <code>(CanonicalTestFixture)getTestFixture();</code> */
-	protected AbstractPresentationTestFixture getLogicTestFixture() {
-		return (AbstractPresentationTestFixture)getTestFixture();
-	}
-	
-	public void test_createLogicShapes() {
-		Rectangle rect = new Rectangle(getDiagramEditPart().getFigure().getBounds());
-		getDiagramEditPart().getFigure().translateToAbsolute(rect);
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-		IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-		IElementType typeAndGate = ElementTypeRegistry.getInstance().getType("logic.andgate"); //$NON-NLS-1$
-		IElementType typeXorGate = ElementTypeRegistry.getInstance().getType("logic.xorgate"); //$NON-NLS-1$
-		IElementType typeFlowContainer = ElementTypeRegistry.getInstance().getType("logic.flowcontainer"); //$NON-NLS-1$
-		IElementType typeOrGate = ElementTypeRegistry.getInstance().getType("logic.orgate"); //$NON-NLS-1$
-		
-		Point createPt = new Point(100, 100);
-		LEDEditPart ledEP = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		createPt.getTranslated(ledEP.getFigure().getSize().getExpanded(100, 100));
-		
-		CircuitEditPart circuitEP = (CircuitEditPart)getLogicTestFixture().createShapeUsingTool(typeCircuit, createPt, getDiagramEditPart());
-		createPt.getTranslated(circuitEP.getFigure().getSize().getExpanded(100, 100));
-		
-		LogicGateEditPart andGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeAndGate, createPt, getDiagramEditPart());
-		createPt.getTranslated(andGateEP.getFigure().getSize().getExpanded(100, 100));
-		
-		LogicGateEditPart orGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeOrGate, createPt, getDiagramEditPart());
-		createPt.getTranslated(orGateEP.getFigure().getSize().getExpanded(100, 100));
-		
-		LogicGateEditPart xorGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeXorGate, createPt, getDiagramEditPart());
-		createPt.getTranslated(xorGateEP.getFigure().getSize().getExpanded(100, 100));
-		
-		getLogicTestFixture().createShapeUsingTool(typeFlowContainer, createPt, getDiagramEditPart());
-	}
-	
-	public void test_bugzilla124678() {
-		final Command cc = getLongProgressCommand();
-		
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-			public void run(final IProgressMonitor monitor)
-				throws InvocationTargetException, InterruptedException {
-				
-				((DiagramCommandStack)getCommandStack()).execute(cc, monitor);
-			}
-
-		};
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(PlatformUI
-			.getWorkbench().getActiveWorkbenchWindow().getShell());
-		try {
-			dialog.run(true, true, runnable);
-		} catch (InvocationTargetException e) {
-			assertTrue(false);
-		} catch (InterruptedException e) {
-			assertTrue(false);
-		}
-	}
-	
-	private Command getLongProgressCommand() {
-		CompoundCommand cc = new CompoundCommand("Add Multiple Octagons"); //$NON-NLS-1$
-		ArrayList newViews = new ArrayList();
-
-		EditPart containerEditPart = getDiagramEditPart();
-		
-		for (int x = 0; x < 500; x = x + 55) {
-			for (int y = 0; y < 500; y = y + 55) {
-				CreateViewRequest createOctagon = CreateViewRequestFactory
-					.getCreateShapeRequest(GeoshapeType.OCTAGON,
-						PreferencesHint.USE_DEFAULTS);
-
-				createOctagon.setLocation(new Point(x, y));
-				Command createCmd = containerEditPart.getCommand(createOctagon);
-				cc.add(createCmd);
-
-				Object obj = createOctagon.getNewObject();
-				if (obj instanceof Collection) {
-					Iterator iter = ((Collection)obj).iterator();
-					while (iter.hasNext()) {
-						newViews.add(iter.next());
-					}
-				}
-				else
-					newViews.add(createOctagon.getNewObject());
-			}
-		}
-
-		ArrangeRequest arrangeRequest = new ArrangeRequest(
-		RequestConstants.REQ_ARRANGE_DEFERRED);
-		arrangeRequest.setViewAdaptersToArrange(newViews);
-		Command arrangeCommand = containerEditPart.getCommand(arrangeRequest);
-		cc.add(arrangeCommand);
-
-		return cc;
-	}
-    
-    public void test_reorientingNoteAttachments() {
-        
-        // Add two LEDs.
-        IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$        
-        LEDEditPart led1 = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, new Point(100, 10), getDiagramEditPart());        
-        LEDEditPart led2 = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, new Point(200, 10), getDiagramEditPart());
-
-        // Add two notes.
-        NoteEditPart note1 = (NoteEditPart)getLogicTestFixture().createShapeUsingTool(DiagramNotationType.NOTE, new Point(100, 100), getDiagramEditPart());        
-        NoteEditPart note2 = (NoteEditPart)getLogicTestFixture().createShapeUsingTool(DiagramNotationType.NOTE, new Point(200, 100), getDiagramEditPart());
-
-        // Create a note attachment from note1 to led1.
-        ConnectionEditPart noteAttachment = getLogicTestFixture()
-            .createConnectorUsingTool(note1,
-                led1, DiagramNotationType.NOTE_ATTACHMENT);
-        
-        // Reorient the note attachment to led2.
-        reorientConnectionTarget(noteAttachment, led2, true);
-
-        // Reorient the note attachment to note2.
-        reorientConnectionSource(noteAttachment, note2, true);
-                
-        // Test that we cannot reorient a note attachment between two LEDs.
-        reorientConnectionSource(noteAttachment, led1, false);
-        
-        // Now test this all again but creating the note attachment from the LED
-        // to the note.
-        
-        // Create a note attachment from led1 to note1.
-        noteAttachment = getLogicTestFixture()
-            .createConnectorUsingTool(led1,
-                note1, DiagramNotationType.NOTE_ATTACHMENT);
-        
-        // Reorient the note attachment to led2.
-        reorientConnectionSource(noteAttachment, led2, true);
-
-        // Reorient the note attachment to note2.
-        reorientConnectionTarget(noteAttachment, note2, true);
-                
-        // Test that we cannot reorient a note attachment between two LEDs.
-        reorientConnectionTarget(noteAttachment, led1, false);
-    }
-
-}
-
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicDiagramTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicDiagramTests.java
deleted file mode 100644
index 897840d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicDiagramTests.java
+++ /dev/null
@@ -1,406 +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.diagram.ui.logic;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.tools.SelectionTool;
-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.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-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.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.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.diagram.ui.commands.CommandProxy;
-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.figures.ICanonicalShapeCompartmentLayout;
-import org.eclipse.gmf.runtime.diagram.ui.internal.actions.ZoomContributionItem;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
-import org.eclipse.gmf.runtime.diagram.ui.render.actions.CopyToImageAction;
-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractDiagramTests;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorSite;
-
-/**
- * Diagram tests for the logic diagram and general diagrams.
- * 
- * @author cmahoney
- */
-public class LogicDiagramTests
-	extends AbstractDiagramTests {
-
-	public LogicDiagramTests(String arg0) {
-		super(arg0);
-	}
-
-	public static Test suite() {
-		return new TestSuite(LogicDiagramTests.class);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-
-	/** Return <code>(LogicTestFixture)getTestFixture();</code> */
-	protected LogicTestFixture getLogicTestFixture() {
-		return (LogicTestFixture)getTestFixture();
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		List children = getTestFixture().getDiagramEditPart().getChildren();
-		if (children.isEmpty())
-			assertFalse(true);
-		
-		EditPart firstEP = (EditPart)children.get(0);
-		if (firstEP instanceof CircuitEditPart ) {
-			CircuitEditPart circuitEditPart = (CircuitEditPart)firstEP;
-			
-			IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-			Point pos = circuitEditPart.getFigure().getBounds().getBottomRight();
-			circuitEditPart.getFigure().translateToAbsolute(pos);
-			pos.translate(100, 100);
-			LEDEditPart ledEP2 = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, pos, getDiagramEditPart());
-			
-			Terminal term1 = (Terminal)((Circuit)circuitEditPart.getNotationView().getElement()).getOutputTerminals().get(0);
-			TerminalEditPart tep1 = null;
-			ListIterator li = circuitEditPart.getChildren().listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				if (gep.getNotationView().getElement().equals(term1))
-					tep1 = (TerminalEditPart)gep;
-			}
-			
-			Terminal term2 = (Terminal)((LED)ledEP2.getNotationView().getElement()).getInputTerminals().get(0);
-			TerminalEditPart tep2 = null;
-			li = ledEP2.getChildren().listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart)li.next();
-				if (gep.getNotationView().getElement().equals(term2))
-					tep2 = (TerminalEditPart)gep;
-			}
-			
-			IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-						
-			getLogicTestFixture().createConnectorUsingTool(tep1, tep2, typeWire);
-			
-			IGraphicalEditPart logicCompartment = circuitEditPart.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-			
-			Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-			logicCompartment.getFigure().translateToAbsolute(rect);
-			
-			CreateRequest request = getLogicTestFixture().getCreationRequest(typeLED);
-			request.setLocation(rect.getCenter());
-			Command cmd = logicCompartment.getCommand(request);
-
-			getCommandStack().execute(cmd);
-			
-			assertEquals( "Unexpected LED count.", 1, logicCompartment.getChildren().size() );//$NON-NLS-1$
-		}
-	}
-
-	public void testZoomDoesntDirtyDiagram() throws Exception {
-		getTestFixture().openDiagram();
-
-	       ZoomManager zoomManager = getZoomManager();
-	       // Ensure the zoom manager exists
-	        assertTrue(zoomManager != null);
-	        
-	        this.saveDiagram();
-	        
-	        // Change to the another zoom level
-	        if (zoomManager.canZoomIn()) {
-	            zoomManager.setZoom(zoomManager.getNextZoomLevel());
-	        } else {
-	            zoomManager.setZoom(zoomManager.getPreviousZoomLevel());
-	        }
-	        
-	        assertTrue(false == isDirty());                               
-		}
-
-	public void testSelectAllInContext() throws Exception {
-		List children = getTestFixture().getDiagramEditPart().getChildren();
-		if (children.isEmpty())
-			assertFalse(true);
-		
-		CircuitEditPart circuitEP = null;
-		ListIterator li = children.listIterator();
-		while (li.hasNext()) {
-			EditPart ep = (EditPart)li.next();
-			if (ep instanceof CircuitEditPart ) {
-				circuitEP = (CircuitEditPart)ep;
-				
-				// select the logic compartment as a target
-				IGraphicalEditPart logicCompartment = circuitEP.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-				
-				final List shapes = getSelectableShapesIn(logicCompartment);
-				final List all = new ArrayList();
-				all.addAll(shapes);
-				
-				selectAll(logicCompartment, shapes);
-			}
-		}
-		
-		final List connectors = getConnectors();
-		final List shapes = getSelectableShapesIn(getDrawSurfaceEditPart());
-		final List all = new ArrayList();
-		all.addAll(connectors);
-		all.addAll(shapes);
-		
-		selectAll(circuitEP, all);
-	}
-
-	/**
-	 * Tests the initial enablement of the zoom toolbar entry. See Bugzilla
-	 * 110815.
-	 * 
-	 * @throws Exception
-	 */
-	public void testZoomToolbarEnablement()
-		throws Exception {
-
-		getTestFixture().openDiagram();
-
-		IContributionItem[] items = ((IEditorSite) getDiagramWorkbenchPart()
-			.getSite()).getActionBars().getToolBarManager().getItems();
-		boolean foundIt = false;
-		for (int i = 0; i < items.length; i++) {
-			IContributionItem item = items[i];
-			if (item instanceof ZoomContributionItem) {
-				foundIt = true;
-				assertTrue(item.isEnabled());
-			}
-		}
-		assertTrue(foundIt);
-	}
-	
-	/**
-	 * Tests the CTRL-D keystroke which initiates a delete from model action.
-	 * See Bugzilla 115108.
-	 */
-	public void testDeleteFromModel()
-		throws Exception {
-
-		getTestFixture().openDiagram();
-		
-		LEDEditPart editPartToDelete = (LEDEditPart) getLogicTestFixture()
-				.createShapeUsingTool(LogicSemanticType.LED, new Point(0,0),
-						getDiagramEditPart());
-		
-		List primaryEditParts = getDiagramEditPart().getPrimaryEditParts();
-		
-		assertTrue(primaryEditParts.contains(editPartToDelete));
-		
-		EObject semanticElement = (EObject) editPartToDelete
-			.getAdapter(EObject.class);
-		EObject semanticContainer = semanticElement.eContainer();
-
-		// Select the edit part to be deleted.
-		EditPartViewer rootViewer = getDiagramEditPart().getRoot().getViewer();
-		rootViewer.deselectAll();
-		rootViewer.select(editPartToDelete);
-
-		// Set the preference to not confirm the element deletion.
-		((IPreferenceStore) getDiagramEditPart().getDiagramPreferencesHint()
-			.getPreferenceStore()).setValue(
-			IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_MODEL, false);
-
-		// Create the CTRL-D event
-		Event e = new Event();
-		e.character = (char) 0x4;
-		e.keyCode = 100;
-		e.stateMask = SWT.CTRL;
-		e.widget = editPartToDelete.getViewer().getControl();
-
-		// Simulate the CTRL-D keystroke
-		SelectionTool tool = new SelectionTool();
-		tool.setEditDomain((EditDomain) getDiagramWorkbenchPart()
-			.getDiagramEditDomain());
-		tool.activate();
-		tool.keyDown(new KeyEvent(e), rootViewer);
-
-		// Verify that the edit part and the semantic element have been deleted.
-		primaryEditParts = getDiagramEditPart().getPrimaryEditParts();
-
-		assertFalse(
-			"Primary edit part not deleted.", primaryEditParts.contains(editPartToDelete)); //$NON-NLS-1$
-
-		assertFalse(
-			"Semantic element not deleted.", semanticContainer.eContents().contains(semanticElement)); //$NON-NLS-1$
-	}
-
-	public void testCopyToImageActionEnablement()
-		throws Exception {
-
-		getTestFixture().openDiagram();
-
-		List children = getTestFixture().getDiagramEditPart().getChildren();
-
-		CircuitEditPart circuitEP = null;
-		ListIterator li = children.listIterator();
-		while (li.hasNext()) {
-			Object ep = li.next();
-			if (ep instanceof CircuitEditPart) {
-				circuitEP = (CircuitEditPart) ep;
-			}
-		}
-
-		assertNotNull(circuitEP);
-
-		CopyToImageAction action = new CopyToImageAction(getWorkbenchPage());
-		action.init();
-		EditPartViewer viewer = getDiagramEditPart().getRoot().getViewer();
-		viewer.deselectAll();
-		viewer.select(getDiagramEditPart());
-		flushEventQueue();
-		assertTrue(action.isEnabled());
-
-		viewer.deselectAll();
-		viewer.select(circuitEP);
-		flushEventQueue();
-		assertTrue(action.isEnabled());
-
-	}
-
-    /**
-     * Performs a <code>DropObjectsRequest</code> in a modal context thread.
-     * Verifies that the diagram refreshes on the UI thread.
-     * 
-     * @throws Exception
-     *             if an unexpected exception occurs
-     */
-    public void test_drop_modalContextThread()
-        throws Exception {
-
-        // Open the test fixture diagram
-        getTestFixture().openDiagram();
-        final DiagramEditPart diagramEditPart = getDiagramEditPart();
-
-        //Create an AND gate in the semantic model
-        ICommand andCommand = new AbstractTransactionalCommand(getTestFixture()
-            .getEditingDomain(), "Create AND Gate", null) { //$NON-NLS-1$
-
-            protected CommandResult doExecuteWithResult(
-                    IProgressMonitor monitor, IAdaptable info)
-                throws ExecutionException {
-
-                AndGate newElement = (AndGate) SemanticPackage.eINSTANCE
-                    .getEFactoryInstance().create(
-                        SemanticPackage.eINSTANCE.getAndGate());
-
-                ContainerElement semanticElement = (ContainerElement) diagramEditPart
-                    .resolveSemanticElement();
-
-                semanticElement.getChildren().add(newElement);
-                return CommandResult.newOKCommandResult(newElement);
-            }
-        };
-
-        andCommand.execute(new NullProgressMonitor(), null);
-        AndGate andGate = (AndGate) andCommand.getCommandResult()
-            .getReturnValue();
-
-        // Get the initial number of edit parts on the diagram
-        List primaryEditParts = diagramEditPart.getPrimaryEditParts();
-        int initialEditPartCount = primaryEditParts.size();
-
-        // Get the command to drop the AND gate onto the diagram
-        Point dropLocation = ICanonicalShapeCompartmentLayout.UNDEFINED
-            .getLocation();
-        DropObjectsRequest request = new DropObjectsRequest();
-        request.setObjects(Collections.singletonList(andGate));
-        request.setAllowedDetail(DND.DROP_COPY);
-        request.setLocation(dropLocation);
-
-        Command command = diagramEditPart.getCommand(request);
-        final CommandProxy proxy = new CommandProxy(command);
-
-        //Execute the command in a forking progress monitor dialog
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-
-            public void run(IProgressMonitor monitor)
-                throws InvocationTargetException, InterruptedException {
-                
-                try {
-                    OperationHistoryFactory.getOperationHistory().execute(
-                        proxy, monitor, null);
-
-                } catch (ExecutionException e) {
-                    throw new InvocationTargetException(e);
-                }
-            }
-        };
-
-        new ProgressMonitorDialog(null).run(true, true, runnable);
-
-        // Verify that a new edit part has been added to the diagram for the AND gate
-        primaryEditParts = getDiagramEditPart().getPrimaryEditParts();
-
-        assertTrue(
-            "Size of primary edit parts should have increased.", primaryEditParts.size() > initialEditPartCount); //$NON-NLS-1$
-
-        IGraphicalEditPart andGateEditPart = null;
-        for (Iterator i = primaryEditParts.iterator(); i.hasNext();) {
-            IGraphicalEditPart nextEditPart = (IGraphicalEditPart) i.next();
-
-            if (andGate.equals(nextEditPart.resolveSemanticElement())) {
-                andGateEditPart = nextEditPart;
-                break;
-            }
-        }
-        assertNotNull(
-            "Expected a new edit part for the AND gate", andGateEditPart); //$NON-NLS-1$
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicShapeTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicShapeTests.java
deleted file mode 100644
index 32eb652..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicShapeTests.java
+++ /dev/null
@@ -1,165 +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.diagram.ui.logic;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-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.TerminalEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.util.StringConstants;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.ISurfaceEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.requests.ApplyAppearancePropertiesRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.ShapeStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractShapeTests;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-
-public class LogicShapeTests extends AbstractShapeTests {
-
-	public LogicShapeTests(String arg0) {
-		super(arg0);
-	}
-
-	public static Test suite() {
-		return new TestSuite(LogicShapeTests.class);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-	
-	/** Return <code>(CanonicalTestFixture)getTestFixture();</code> */
-	protected LogicTestFixture getLogicTestFixture() {
-		return (LogicTestFixture)getTestFixture();
-	}
-	
-	/**
-	 * Test to verify that copy appearance properties is working properly
-	 * @throws Exception
-	 */
-	public void testCopyAppearanceProperties()
-		throws Exception {
-		
-		Rectangle rect = new Rectangle(getDiagramEditPart().getFigure().getBounds());
-		getDiagramEditPart().getFigure().translateToAbsolute(rect);
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-		
-		Point createPt = new Point(100, 100);
-		final LEDEditPart ledEP1 = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		createPt.getTranslated(ledEP1.getFigure().getSize().getExpanded(100, 100));
-		
-		final LEDEditPart ledEP2 = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		final Color red = new Color(null, 255, 0, 0);
-		final int fontHeight = 10;
-		
-		getLogicTestFixture().execute(new AbstractTransactionalCommand(getLogicTestFixture().getEditingDomain(), "", null) { //$NON-NLS-1$
-			protected CommandResult doExecuteWithResult(
-                        IProgressMonitor progressMonitor, IAdaptable info)
-                    throws ExecutionException {
-				View ledView = ledEP2.getNotationView();
-				ShapeStyle shapeStyle = (ShapeStyle)ledView.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-				shapeStyle.setFillColor((FigureUtilities.colorToInteger(red)).intValue());
-				shapeStyle.setLineColor((FigureUtilities.colorToInteger(red)).intValue());
-				shapeStyle.setFontColor((FigureUtilities.colorToInteger(red)).intValue());
-				shapeStyle.setFontHeight(fontHeight);
-				return CommandResult.newOKCommandResult();
-			}
-		});
-		
-		ApplyAppearancePropertiesRequest request = new ApplyAppearancePropertiesRequest();;
-		request.setViewToCopyFrom(ledEP2.getNotationView());
-		Command cmd = ledEP1.getCommand(request);
-		getCommandStack().execute(cmd);
-		flushEventQueue();
-		
-		ledEP1.getEditingDomain().runExclusive( new Runnable() {
-			public void run() {
-				View ledView = ledEP1.getNotationView();
-				ShapeStyle shapeStyle = (ShapeStyle)ledView.getStyle(NotationPackage.eINSTANCE.getShapeStyle());
-				assertTrue(shapeStyle.getFillColor() == ((FigureUtilities.colorToInteger(red)).intValue()));
-				assertTrue(shapeStyle.getLineColor() == ((FigureUtilities.colorToInteger(red)).intValue()));
-				assertTrue(shapeStyle.getFontColor() == ((FigureUtilities.colorToInteger(red)).intValue()));
-				assertTrue(shapeStyle.getFontHeight() == fontHeight);
-			}
-		});
-	}
-	
-	/**
-	 * Tests <code>ISurfaceEditPart.getPrimaryEditParts()</code> by creating a
-	 * half-adder.
-	 * 
-	 * @throws Exception
-	 */
-	public void testGetPrimaryEditParts()
-		throws Exception {
-
-		Rectangle rect = new Rectangle(getDiagramEditPart().getFigure()
-			.getBounds());
-		getDiagramEditPart().getFigure().translateToAbsolute(rect);
-		IElementType typeHalfAdder = ElementTypeRegistry.getInstance().getType(
-			"logic.halfAdder"); //$NON-NLS-1$
-
-		Point createPt = new Point(100, 100);
-		CircuitEditPart circuitEP = (CircuitEditPart) getLogicTestFixture()
-			.createShapeUsingTool(typeHalfAdder, createPt, getDiagramEditPart());
-
-		ISurfaceEditPart logicCompartmentEP = (ISurfaceEditPart) circuitEP
-			.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-		assertEquals(8, logicCompartmentEP.getPrimaryEditParts().size());
-	}
-	
-	public void disabledM6testPropertiesSetStyle() throws Exception {
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType(
-				"logic.led"); //$NON-NLS-1$
-
-		Point createPt = new Point(200, 200);
-		LEDEditPart ledEP = (LEDEditPart) getLogicTestFixture()
-				.createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-		Request request = new Request(StringConstants.PORTSCOLOR_REQUEST);
-		Integer color = FigureUtilities.RGBToInteger(new RGB(100, 100, 100));
-		request.getExtendedData().put(
-				StringConstants.PORTS_COLOR_PROPERTY_NAME, color);
-		Command cmd = ledEP.getCommand(request);
-		getCommandStack().execute(cmd);
-		flushEventQueue();
-
-		for (Iterator itr = ledEP.getChildren().iterator(); itr.hasNext();) {
-			Object obj = itr.next();
-			if (obj instanceof TerminalEditPart) {
-				Integer currentColor = FigureUtilities
-						.colorToInteger(((TerminalEditPart) obj).getFigure()
-								.getBackgroundColor());
-				assertEquals(color, currentColor);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTestFixture.java
deleted file mode 100644
index 123e6c6..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTestFixture.java
+++ /dev/null
@@ -1,158 +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.diagram.ui.logic;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-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.examples.runtime.diagram.logic.semantic.Circuit;
-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.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-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.CreateElementRequest;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture;
-import org.eclipse.ui.PlatformUI;
-
-
-public class LogicTestFixture
-	extends AbstractPresentationTestFixture {
-
-	protected void createProject()
-		throws Exception {
-		IWorkspace workspace = null;
-		String aProjectName = "logicProj"; //$NON-NLS-1$
-
-		workspace = ResourcesPlugin.getWorkspace();
-		IWorkspaceRoot wsroot = workspace.getRoot();
-		IProject project = wsroot.getProject(aProjectName);
-		IProjectDescription desc =
-			workspace.newProjectDescription(project.getName());
-
-		IPath locationPath = Platform.getLocation();
-		locationPath = null;
-		desc.setLocation(locationPath);
-		if (!project.exists())
-			project.create(desc, null);
-		if (!project.isOpen())
-			project.open(null);
-
-		setProject(project);
-	}
-
-	protected void createDiagram()
-		throws Exception {
-		
-		IFile diagramFile = LogicEditorUtil.createNewDiagramFile(
-			LogicDiagramFileCreator.getInstance(), 
-			getProject().getFullPath(),
-			"logicTest", //$NON-NLS-1$
-			LogicEditorUtil.getInitialContents(),
-			"logic", //$NON-NLS-1$
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-			new NullProgressMonitor(), (String)null);
-		setDiagramFile(diagramFile);
-		
-		openDiagram();
-	}
-
-	protected void createShapesAndConnectors()
-		throws Exception {
-		
-		IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-		CompoundCommand cc = new CompoundCommand();
-
-		CreateViewAndElementRequest shapeRequest =
-			new CreateViewAndElementRequest(typeCircuit, getPreferencesHint());
-		
-		shapeRequest.setLocation(new Point(200, 200));
-  
-		// execute the commands to get the note edit part
-		cc.add(getDiagramEditPart().getCommand(shapeRequest));
-
-		shapeRequest.setLocation(new Point(500, 500));
-		cc.add(getDiagramEditPart().getCommand(shapeRequest));
-
-		execute(cc);
-	}
-
-	public PreferencesHint getPreferencesHint() {
-		return PreferencesHint.USE_DEFAULTS;
-	}
-
-	/** Executes the supplied command. */
-	protected Collection execute(ICommand cmd) {
-		ICommandProxy command = new ICommandProxy(cmd);
-		execute(command);
-		return DiagramCommandStack.getReturnValues(command);
-	}
-	
-	/** Executes the supplied command. */
-	protected void execute(Command cmd) {
-		getCommandStack().execute(cmd);
-	}
-
-	/**
-	 * Creates a semantic element
-	 * 
-	 * @param type
-	 *            type of element to create
-	 * @param parent
-	 *            containing element.
-	 * @return a new element; <tt>null</tt> if element creation failed.
-	 */
-	public EObject createElement(IElementType type, EObject parent, EReference ref) {
-	
-		CreateElementRequest cer = new CreateElementRequest(getEditingDomain(), parent, type, ref);
-		ICommand cmd = type.getEditHelper().getEditCommand(cer);
-		print("\tcreating semantic " + type.getDisplayName() + " element... ");//$NON-NLS-2$//$NON-NLS-1$
-	
-		Collection result = execute(cmd);
-		
-		assertTrue("Failed to create " + type.getDisplayName() + " element.",//$NON-NLS-2$//$NON-NLS-1$
-				!result.isEmpty());
-		println("OK.");//$NON-NLS-1$
-		return (EObject) result.iterator().next();
-	}
-
-	/** Creates an operation in the supplied class. */
-	public LED createLED(EObject parent) {
-		IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-		return (LED)createElement(typeLED, parent, SemanticPackage.eINSTANCE.getContainerElement_Children());
-	}
-	
-	/** Creates an operation in the supplied class. */
-	public Circuit createCircuit(EObject parent) {
-		IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-		return (Circuit)createElement(typeCircuit, parent, SemanticPackage.eINSTANCE.getContainerElement_Children());
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTransientViewsTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTransientViewsTests.java
deleted file mode 100644
index d0a7166..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicTransientViewsTests.java
+++ /dev/null
@@ -1,451 +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.diagram.ui.logic;
-
-/**
- * Tests the Transient Views functionality
- * @author mmostafa
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.Status;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Circuit;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.Terminal;
-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.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-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.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-
-
-public class LogicTransientViewsTests extends AbstractTestBase{
-	/**
-	 * Defines the statechart diagram test suite.
-	 * 
-	 * @return the test suite.
-	 */
-	public static Test suite() {
-		TestSuite s = new TestSuite(LogicTransientViewsTests.class);
-		return s;
-	}
-	
-	/** Create an instance. */
-	public LogicTransientViewsTests() {
-		super("Transient View Test Suite");//$NON-NLS-1$
-	}
-
-	/** installs the composite state test fixture. */
-	protected void setTestFixture() {
-		testFixture = new CanonicalTestFixture();
-	}
-
-	/** Return <code>(CanonicalTestFixture)getTestFixture();</code> */
-	protected CanonicalTestFixture getCanonicalTestFixture() {
-		return (CanonicalTestFixture)getTestFixture();
-	}
-	
-	public void testTransientWiresCreation_AcrossTransientLeds(){
-		try {
-			println("testTransientWiresCreation_AcrossTransientLeds() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			LED led1 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			LED led2 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			Terminal term1 = (Terminal)led1.getOutputTerminals().get(0);
-			Terminal term2 = (Terminal)led2.getInputTerminals().get(0);
-			
-			IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-			IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-			
-			CreateRelationshipRequest crr = new CreateRelationshipRequest(getTestFixture().getEditingDomain(), term1, term2, typeWire);
-			ICommand createWire = typeCircuit.getEditHelper().getEditCommand(crr);
-			_testFixture.execute(createWire);
-			flushEventQueue();
-			
-			List connectorEPs = getDiagramEditPart().getConnections();
-			
-			assertEquals( "Unexpected Wire count.", 1, connectorEPs.size()); //$NON-NLS-1$
-			final ConnectionEditPart ep = (ConnectionEditPart)connectorEPs.get(0);
-			assertTransient((View)ep.getSource().getModel());
-			assertTransient((View)ep.getTarget().getModel());
-			assertTransient((View)ep.getModel());
-			
-			final TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)ep).getEditingDomain();
-			
-			AbstractEMFOperation operation = new AbstractEMFOperation(
-				editingDomain, "") { //$NON-NLS-1$
-
-				protected IStatus doExecute(IProgressMonitor monitor,
-						IAdaptable info)
-					throws ExecutionException {
-					
-					((View)ep.getModel()).setVisible(false);
-					
-					return Status.OK_STATUS;
-				};
-			};
-			try {
-				OperationHistoryFactory.getOperationHistory().execute(operation,
-						new NullProgressMonitor(), null);
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-				assertFalse(false);
-			}
-//			
-//			editingDomain.runInUndoInterval(new Runnable() {
-//				public void run() {
-//					try {
-//						editingDomain.runAsWrite(new MRunnable() {
-//							public Object run() {
-//								((View)ep.getModel()).setVisible(false);
-//								return null;
-//							}});
-//					} catch (MSLActionAbandonedException e) {
-//						// do nothing
-//					}
-//				}});
-				
-			assertPersisted((View)ep.getSource().getModel());
-			assertPersisted((View)ep.getTarget().getModel());
-			assertPersisted((View)ep.getModel());
-			
-			
-		}
-		finally {
-			println("testTransientWiresCreation_AcrossTransientLeds() complete.");//$NON-NLS-1$
-		}
-	}
-	
-    private GraphicalEditPart _editPartForSemanticElement(GraphicalEditPart container, Object element){
-        List children = container.getChildren();
-        for (Iterator iter = children.iterator(); iter.hasNext();) {
-            GraphicalEditPart ep = (GraphicalEditPart) iter.next();
-            if (ep.getNotationView().getElement()==element){
-                return ep;
-            }else {
-                ep  = _editPartForSemanticElement(ep,element);
-                if (ep !=null)
-                    return ep;
-            }
-        }
-        return null;
-    }
-       
-    public void testTransientWiresCreation_AcrossPersistedLeds(){
-        try {
-            println("testTransientWiresCreation_AcrossPersistedLeds() starting ...");//$NON-NLS-1$
-            CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-            IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-            
-            LED led1 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-            LED led2 = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-            
-            GraphicalEditPart ledEditPart = (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);
-            Terminal term1 = (Terminal)led1.getOutputTerminals().get(0);
-            Terminal term2 = (Terminal)led2.getInputTerminals().get(0);
-            
-            flushEventQueue();
-            
-            final GraphicalEditPart ep1 = _editPartForSemanticElement(ledEditPart,term1);
-            
-            
-            // force the led to be persisted
-            final TransactionalEditingDomain editingDomain = ledEditPart.getEditingDomain();
-            
-			AbstractEMFOperation operation = new AbstractEMFOperation(
-				editingDomain, "") { //$NON-NLS-1$
-
-				protected IStatus doExecute(IProgressMonitor monitor,
-						IAdaptable info)
-					throws ExecutionException {
-					
-                    ((View)((View)ep1.getModel()).eContainer()).persistChildren();
-					
-					return Status.OK_STATUS;
-				};
-			};
-			try {
-				getDiagramEditPart().getDiagramEditDomain().getActionManager()
-					.getOperationHistory().execute(operation,
-						new NullProgressMonitor(), null);
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-				assertFalse(false);
-			}
-                
-            assertPersisted((View)ep1.getModel());
-            
-            IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-            IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-            
-            CreateRelationshipRequest crr = new CreateRelationshipRequest(editingDomain, term1, term2, typeWire);
-            ICommand createWire = typeCircuit.getEditHelper().getEditCommand(crr);
-            _testFixture.execute(createWire);
-            flushEventQueue();
-            
-            List connectorEPs = getDiagramEditPart().getConnections();
-            
-            assertEquals( "Unexpected Wire count.", 1, connectorEPs.size()); //$NON-NLS-1$
-            final ConnectionEditPart ep = (ConnectionEditPart)connectorEPs.get(0);
-            assertTransient((View)ep.getModel());
-        }
-        finally {
-            println("testTransientWiresCreation_AcrossPersistedLeds() complete.");//$NON-NLS-1$
-        }
-    }
-	
-	public void testTransientLEDsCreation(){
-		try {
-			println("testTransientLEDsCreation() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			List properties = new ArrayList();
-			int size = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				properties.add( _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView())));
-				size++;
-				assertEquals( "Unexpected LED count.", size, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			
-			assertTransient(logicCompartment.getChildren());
-			
-			Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-			logicCompartment.getFigure().translateToAbsolute(rect);
-			IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-			getCanonicalTestFixture().createShapeUsingTool(typeLED, rect.getCenter(), logicCompartment);
-			assertPersisted(logicCompartment.getChildren());
-			
-			LED led  = _testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			List children = logicCompartment.getChildren();
-			for (Iterator iter = children.iterator(); iter.hasNext();) {
-				GraphicalEditPart element = (GraphicalEditPart) iter.next();
-				View view = element.getNotationView();
-				if (view !=null){
-					Object _led = view.getElement();
-					if (_led == led){
-						assertTransient(view);
-					} else {
-						assertPersisted(view);
-					}
-				}
-				
-			}	
-		}
-		finally {
-			println("testTransientLEDsCreation() complete.");//$NON-NLS-1$
-		}
-	}
-
-	public void testTransientCircuitsCreation(){
-		try {
-			println("testTransientCircuitsCreation() starting ...");//$NON-NLS-1$
-			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-			
-			List properties = new ArrayList();
-			int size = logicCompartment.getChildren().size();
-			int count = 5;
-			for ( int i = 0; i < count; i++ ) {
-				properties.add( _testFixture.createCircuit(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView())));
-				size++;
-				assertEquals( "Unexpected Circuit count.", size, logicCompartment.getChildren().size() );//$NON-NLS-1$
-			}
-			
-			assertTransient(logicCompartment.getChildren());
-			
-			Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-			logicCompartment.getFigure().translateToAbsolute(rect);
-			IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-			getCanonicalTestFixture().createShapeUsingTool(typeCircuit, rect.getCenter(), logicCompartment);
-			assertPersisted(logicCompartment.getChildren());
-			
-			Circuit circuit  = _testFixture.createCircuit(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-			List children = logicCompartment.getChildren();
-			for (Iterator iter = children.iterator(); iter.hasNext();) {
-				GraphicalEditPart element = (GraphicalEditPart) iter.next();
-				View view = element.getNotationView();
-				if (view !=null){
-					Object _circuit = view.getElement();
-					if (_circuit == circuit){
-						assertTransient(view);
-					} else {
-						assertPersisted(view);
-					}
-				}
-				
-			}	
-		}
-		finally {
-			println("testTransientCircuitsCreation() complete.");//$NON-NLS-1$
-		}
-	}
-    
-    public void XtestPersistViewUndoTransaction(){
-        try {
-            println("testPersistViewUndoTransaction() starting ...");//$NON-NLS-1$
-            CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-            IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-            List properties = new ArrayList();
-            int size = logicCompartment.getChildren().size();
-            // create 4 circuits
-            int count = 4;
-            for ( int i = 0; i < count; i++ ) {
-                properties.add( _testFixture.createCircuit(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView())));
-                size++;
-                assertEquals( "Unexpected Circuit count.", size, logicCompartment.getChildren().size() );//$NON-NLS-1$
-            }
-            List editParts = logicCompartment.getChildren();
-            assertTransient(editParts);
-            List views = getViewsFromEditParts(editParts);
-            
-            Rectangle rect = new Rectangle(logicCompartment.getFigure().getBounds());
-            logicCompartment.getFigure().translateToAbsolute(rect);
-            IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-            getCanonicalTestFixture().createShapeUsingTool(typeCircuit, rect.getCenter(), logicCompartment);
-            assertPersisted(logicCompartment.getChildren());
-            if (getCommandStack().canUndo()){
-                getCommandStack().undo();
-                flushEventQueue();
-                // now verify that the views are the same
-                List editParts2 = logicCompartment.getChildren();
-                List views2 = getViewsFromEditParts(editParts2);
-                for (Iterator iter = views.iterator(); iter.hasNext();) {
-                    Object element = iter.next();
-                    if (!views2.contains(element)){
-                        fail("undo operation failed"); //$NON-NLS-1$
-                    }
-                }
-            }
-        }
-        finally {
-            println("testPersistViewUndoTransaction() complete.");//$NON-NLS-1$
-        }
-    }
-
-private List getViewsFromEditParts(List editParts) {
-    List views = new ArrayList();
-        for (Iterator iter = editParts.iterator(); iter.hasNext();) {
-            GraphicalEditPart gEP  =   (GraphicalEditPart) iter.next();
-            views.add(gEP.getModel());
-        }
-        return views;
-    }
-
-//	/**
-//	 * Test that moving a transient LED will cause it to be persisted.
-//	 */
-//	public void testPersistedAfterMove(){
-//		try {
-//			println("test_testPersistedAfterMove() starting ...");//$NON-NLS-1$
-//			CanonicalTestFixture _testFixture = getCanonicalTestFixture();
-//			IGraphicalEditPart logicCompartment = _testFixture.getCanonicalCompartment(0);
-//			
-//			_testFixture.createLED(ViewUtil.resolveSemanticElement(logicCompartment.getNotationView()));
-//			assertEquals( "Unexpected LED count.", 1, logicCompartment.getChildren().size() );//$NON-NLS-1$
-//			
-//			// Starts out as being transient.
-//			assertTransient(logicCompartment.getChildren());
-//			
-//			// Move LED.
-//			IGraphicalEditPart ledEP = (IGraphicalEditPart) logicCompartment.getChildren().get(0);
-//			Point oldLocation = ledEP.getFigure().getBounds().getLocation();
-//			ChangeBoundsRequest request = new ChangeBoundsRequest(
-//				RequestConstants.REQ_MOVE);
-//			request.setEditParts(ledEP);
-//			request.setMoveDelta(new Point(100, 100));
-//			Command cmd = ledEP.getCommand(request);
-//			cmd.execute();
-//			flushEventQueue();
-//			assertFalse(oldLocation.equals(ledEP.getFigure().getBounds().getLocation()));		
-//			
-//			// Should be persisted after a move.
-//			assertPersisted(logicCompartment.getChildren());				
-//		}
-//		finally {
-//			println("test_testPersistedAfterMove() complete.");//$NON-NLS-1$
-//		}
-//	}
-	
-	private void assertPersisted(View view) {
-		if (view != null){
-			EStructuralFeature feature = view.eContainingFeature();
-			if (feature!=null){
-				assertFalse("Expected a Persisted View", feature.isTransient()); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private void assertTransient(View view) {
-		if (view != null){
-			EStructuralFeature feature = view.eContainingFeature();
-			if (feature!=null){
-				assertTrue("Expected a Transient View", feature.isTransient()); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private void assertPersisted(List children) {
-		for (Iterator iter = children.iterator(); iter.hasNext();) {
-			GraphicalEditPart element = (GraphicalEditPart) iter.next();
-			View view = element.getNotationView();
-			if (view != null){
-				EStructuralFeature feature = view.eContainingFeature();
-				if (feature!=null){
-					assertFalse("Expected a Persisted View", feature.isTransient()); //$NON-NLS-1$
-				}
-			}
-			
-		}
-		
-	}
-
-	private void assertTransient(List children) {
-		for (Iterator iter = children.iterator(); iter.hasNext();) {
-			GraphicalEditPart element = (GraphicalEditPart) iter.next();
-			View view = element.getNotationView();
-			if (view != null){
-				EStructuralFeature feature = view.eContainingFeature();
-				if (feature!=null){
-					assertTrue("Expected a Transient View", feature.isTransient()); //$NON-NLS-1$
-				}
-			}
-			
-		}
-		
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicViewRefactorTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicViewRefactorTests.java
deleted file mode 100644
index c404ecd..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/LogicViewRefactorTests.java
+++ /dev/null
@@ -1,373 +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.diagram.ui.logic;
-
-import java.util.Collection;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.providers.LogicConstants;
-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.FlowContainer;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.LED;
-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.Terminal;
-import org.eclipse.gmf.examples.runtime.diagram.logic.semantic.XORGate;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewRefactorHelper;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-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.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-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.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Bounds;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.swt.graphics.RGB;
-
-
-/**
- * A collection of tests for the view refactor helper in the context of logic diagrams
- * 
- * @author melaasar
- */
-public class LogicViewRefactorTests extends AbstractTestBase {
-
-	private class LogicRefactorTestFixture extends LogicTestFixture {
-
-		private IGraphicalEditPart andEP;
-		
-		public IGraphicalEditPart getAndEP() {
-			return andEP;
-		}
-		
-		protected void createShapesAndConnectors() throws Exception {
-			// create Circuit
-			IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-
-			CreateViewAndElementRequest shapeRequest =
-				new CreateViewAndElementRequest(typeCircuit, getPreferencesHint());
-			
-			shapeRequest.setLocation(new Point(20, 20));
-			shapeRequest.setSize(new Dimension(200, 200));
-	  
-			execute(getDiagramEditPart().getCommand(shapeRequest));
-			assertFalse("Circuit creation failed", getDiagramEditPart().getChildren().isEmpty()); //$NON-NLS-1$
-
-			IGraphicalEditPart circuitEP = (IGraphicalEditPart) getDiagramEditPart().getChildren().get(0);
-			
-			IGraphicalEditPart logicCompartmentEP = circuitEP.getChildBySemanticHint(LogicConstants.LOGIC_SHAPE_COMPARTMENT);
-			
-			// create Led
-			IElementType typeLed = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-
-			shapeRequest =	new CreateViewAndElementRequest(typeLed, getPreferencesHint());
-			
-			shapeRequest.setLocation(new Point(30, 30));
-	  
-			execute(logicCompartmentEP.getCommand(shapeRequest));
-			assertTrue("Led creation failed",logicCompartmentEP.getChildren().size() == 1);//$NON-NLS-1$
-
-			// create And Gate
-			IElementType typeAnd = ElementTypeRegistry.getInstance().getType("logic.andgate"); //$NON-NLS-1$
-
-			shapeRequest = new CreateViewAndElementRequest(typeAnd, getPreferencesHint());
-			
-			shapeRequest.setLocation(new Point(30, 110));
-	  
-			execute(logicCompartmentEP.getCommand(shapeRequest));
-			assertTrue("And gate creation failed", logicCompartmentEP.getChildren().size() == 2);//$NON-NLS-1$
-
-			// create Or Gate
-			IElementType typeOr = ElementTypeRegistry.getInstance().getType("logic.orgate"); //$NON-NLS-1$
-
-			shapeRequest =	new CreateViewAndElementRequest(typeOr, getPreferencesHint());
-			
-			shapeRequest.setLocation(new Point(100, 110));
-	  
-			execute(logicCompartmentEP.getCommand(shapeRequest));
-			assertTrue("Or gate creation failed", logicCompartmentEP.getChildren().size() == 3);//$NON-NLS-1$
-
-			// create Wire between Led and And gate and between And and Or gate
-			flushEventQueue();
-			IGraphicalEditPart ledEP = (IGraphicalEditPart) logicCompartmentEP.getChildren().get(0);
-			LED led = (LED) ledEP.getAdapter(LED.class);
-
-			andEP = (IGraphicalEditPart) logicCompartmentEP.getChildren().get(1);
-			AndGate andGate = (AndGate) andEP.getAdapter(AndGate.class);
-
-			IGraphicalEditPart orEP = (IGraphicalEditPart) logicCompartmentEP.getChildren().get(2);
-			OrGate orGate = (OrGate) orEP.getAdapter(OrGate.class);
-
-			IElementType typeWire = ElementTypeRegistry.getInstance().getType("logic.wire"); //$NON-NLS-1$
-
-			Terminal outTerminal1 = (Terminal) led.getOutputTerminals().get(3);
-			IGraphicalEditPart outTerminalEP1 = (IGraphicalEditPart) ledEP.findEditPart(null, outTerminal1);
-
-			Terminal inTerminal1 = (Terminal) andGate.getInputTerminals().get(0);
-			IGraphicalEditPart inTerminalEP1 = (IGraphicalEditPart) andEP.findEditPart(null, inTerminal1);
-			
-			createConnectorUsingTool(outTerminalEP1, inTerminalEP1, typeWire);
-			assertTrue("Led to And gate connection failed", getDiagramEditPart().getConnections().size() == 1);//$NON-NLS-1$
-
-			Terminal outTerminal2 = (Terminal) andGate.getOutputTerminals().get(0);
-			IGraphicalEditPart outTerminalEP2 = (IGraphicalEditPart) andEP.findEditPart(null, outTerminal2);
-
-			Terminal inTerminal2 = (Terminal) orGate.getInputTerminals().get(0);
-			IGraphicalEditPart inTerminalEP2 = (IGraphicalEditPart) orEP.findEditPart(null, inTerminal2);
-
-			createConnectorUsingTool(outTerminalEP2, inTerminalEP2, typeWire);
-			assertTrue("And to Or gate connection failed", getDiagramEditPart().getConnections().size() == 2);//$NON-NLS-1$
-		}
-		
-		public ConnectionEditPart createConnectorUsingTool(
-				final IGraphicalEditPart sourceEditPart,
-				final IGraphicalEditPart targetEditPart, 
-				IElementType elementType) {
-
-			class ConnectorCreationTool	extends	org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool {
-
-				public ConnectorCreationTool(IElementType theElementType) {
-					super(theElementType);
-				}
-
-				/** Make public. */
-				public Request createTargetRequest() {
-					return super.createTargetRequest();
-				}
-				
-				protected PreferencesHint getPreferencesHint() {
-					return PreferencesHint.USE_DEFAULTS;
-				}
-			}
-
-			ConnectorCreationTool tool = new ConnectorCreationTool(elementType);
-			CreateConnectionRequest request = (CreateConnectionRequest) tool.createTargetRequest();
-			request.setTargetEditPart(sourceEditPart);
-			request.setType(RequestConstants.REQ_CONNECTION_START);
-			sourceEditPart.getCommand(request);
-			request.setSourceEditPart(sourceEditPart);
-			request.setTargetEditPart(targetEditPart);
-			request.setType(RequestConstants.REQ_CONNECTION_END);
-			Command cmd = targetEditPart.getCommand(request);
-
-			getCommandStack().execute(cmd);
-
-			Object newView = ((IAdaptable) request.getNewObject()).getAdapter(View.class);
-			assertNotNull(newView);
-
-			ConnectionEditPart newConnector = (ConnectionEditPart) getDiagramEditPart()
-				.getViewer().getEditPartRegistry().get(newView);
-			assertNotNull(newConnector);
-
-			return newConnector;
-		}
-	}
-	
-	/**
-	 * Defines the statechart diagram test suite.
-	 * 
-	 * @return the test suite.
-	 */
-	public static Test suite() {
-		TestSuite s = new TestSuite(LogicViewRefactorTests.class);
-		return s;
-	}
-
-	public LogicViewRefactorTests() {
-		super("Logic View Refactor Test Suite");//$NON-NLS-1$
-	}
-
-	protected void setTestFixture() {
-		testFixture = new LogicRefactorTestFixture();
-	}
-
-	protected LogicRefactorTestFixture getLogicRefactorTestFixture() {
-		return (LogicRefactorTestFixture) getTestFixture();
-	}
-	
-	/**
-	 * Tests the notational refactoring of an AND gate to an XOR gate
-	 */
-	public void test_RefactorANDIntoXOR() {
-		try {
-			final IGraphicalEditPart andEP = getLogicRefactorTestFixture().getAndEP();
-			
-			final int color = FigureUtilities.RGBToInteger(new RGB(255, 0, 255)).intValue();
-			
-            TransactionalEditingDomain editingDomain = getLogicRefactorTestFixture().getEditingDomain();
-            
-			// do notational changes to the And gate
-			getLogicRefactorTestFixture().execute(
-                new AbstractTransactionalCommand(editingDomain, "", null) { //$NON-NLS-1$
-                    
-				protected CommandResult doExecuteWithResult(
-                            IProgressMonitor progressMonitor, IAdaptable info)
-                        throws ExecutionException {
-                    
-					Node node = (Node) andEP.getNotationView();
-					Bounds bounds = (Bounds) node.getLayoutConstraint();
-					bounds.setX(800);
-					bounds.setY(3000);
-					FillStyle fStyle = (FillStyle) node.getStyle(NotationPackage.eINSTANCE.getFillStyle());
-					fStyle.setFillColor(color);
-					return CommandResult.newOKCommandResult();
-				}
-			});
-			
-			
-			// create new Xor gate
-			final IElementType typeXor = ElementTypeRegistry.getInstance().getType("logic.xorgate"); //$NON-NLS-1$
-	
-			final Circuit circuit = (Circuit) ViewUtil.getContainerView(andEP.getNotationView()).getElement();
-			CreateElementRequest createRequest = new CreateElementRequest(editingDomain, circuit, typeXor);
-            ICommand command = typeXor.getEditHelper().getEditCommand(createRequest);
-			getLogicRefactorTestFixture().execute(command);
-			assertTrue("Xor creation failed", circuit.getChildren().size() == 6); //$NON-NLS-1$
-
-			// do the notation morphing
-			Collection results = getLogicRefactorTestFixture().execute(new AbstractTransactionalCommand(editingDomain, "", null) {//$NON-NLS-1$
-				protected CommandResult doExecuteWithResult(
-                            IProgressMonitor progressMonitor, IAdaptable info)
-                        throws ExecutionException {
-					AndGate oldObject = (AndGate) circuit.getChildren().get(1);
-					XORGate newObject = (XORGate) circuit.getChildren().get(5);
-
-					newObject.getTerminals().clear();
-					newObject.getTerminals().addAll(oldObject.getTerminals());
-
-					new ViewRefactorHelper(PreferencesHint.USE_DEFAULTS).refactor(oldObject, newObject);
-					DestroyElementCommand.destroy(oldObject);
-					
-					return CommandResult.newOKCommandResult(newObject);
-				}
-			});
-			
-			// validate the morphing
-			XORGate xorGate = (XORGate) results.iterator().next();
-			Collection newNodes = EMFCoreUtil.getReferencers(xorGate, new EReference[]{NotationPackage.eINSTANCE.getView_Element()});
-			assertFalse("morphing view failed", newNodes.isEmpty());//$NON-NLS-1$
-			
-			Node newNode = (Node) newNodes.iterator().next();
-			Bounds bounds = (Bounds) newNode.getLayoutConstraint();
-			assertEquals(800, bounds.getX());
-			assertEquals(3000, bounds.getY());
-			FillStyle fStyle = (FillStyle) newNode.getStyle(NotationPackage.eINSTANCE.getFillStyle());
-			assertEquals(color, fStyle.getFillColor());
-			assertEquals(1, ((Node)newNode.getChildren().get(0)).getTargetEdges().size());
-			assertEquals(1, ((Node)newNode.getChildren().get(2)).getSourceEdges().size());
-			
-		} catch (Exception e) {
-			assertTrue(e.toString(), false);
-		}
-	}
-
-	/**
-	 * Tests the notational refactoring of an Circuit to a Logic Flow
-	 */
-	public void test_RefactorCircuitIntoLogicFlow() {
-		try {
-			final IGraphicalEditPart circuitEP = (IGraphicalEditPart) getLogicRefactorTestFixture().getAndEP().getParent().getParent();
-			
-            TransactionalEditingDomain editingDomain = getLogicRefactorTestFixture().getEditingDomain();
-            
-			final int color = FigureUtilities.RGBToInteger(new RGB(255, 0, 255)).intValue();
-			
-			// do notational changes to the And gate
-			getLogicRefactorTestFixture().execute(new AbstractTransactionalCommand(editingDomain, "", null) {//$NON-NLS-1$
-				protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-					Node node = (Node) circuitEP.getNotationView();
-					Bounds bounds = (Bounds) node.getLayoutConstraint();
-					bounds.setX(1000);
-					bounds.setY(1000);
-					FillStyle fStyle = (FillStyle) node.getStyle(NotationPackage.eINSTANCE.getFillStyle());
-					fStyle.setFillColor(color);
-					return CommandResult.newOKCommandResult();
-				}
-			});
-			
-			// create new Xor gate
-			final IElementType typeFlowContainer = ElementTypeRegistry.getInstance().getType("logic.flowcontainer"); //$NON-NLS-1$
-	
-			final Model model = (Model) ViewUtil.getContainerView(circuitEP.getNotationView()).getElement();
-			CreateElementRequest createRequest = new CreateElementRequest(editingDomain, model, typeFlowContainer);
-			getLogicRefactorTestFixture().execute(typeFlowContainer.getEditHelper().getEditCommand(createRequest));
-			assertTrue("Flow Container creation failed", model.getChildren().size() == 2);//$NON-NLS-1$
-
-			// do the notation morphing
-			Collection results = getLogicRefactorTestFixture().execute(new AbstractTransactionalCommand(editingDomain, "", null) {//$NON-NLS-1$
-				protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
-					final Circuit oldObject = (Circuit) model.getChildren().get(0);
-					FlowContainer newObject = (FlowContainer) model.getChildren().get(1);
-
-					newObject.getChildren().clear();
-					newObject.getChildren().addAll(oldObject.getChildren());
-
-					new ViewRefactorHelper(PreferencesHint.USE_DEFAULTS) {
-						protected void copyViewChild(View oldView, View newView, Node oldChildNode) {
-							if (oldChildNode.getType().equals(LogicConstants.LOGIC_SHAPE_COMPARTMENT)) {
-								Node newChildNode = (Node) ViewUtil.getChildBySemanticHint(newView, LogicConstants.LOGIC_FLOW_COMPARTMENT);
-								if (newChildNode != null) {
-									copyNodeFeatures(oldChildNode, newChildNode);
-								}
-							} else {
-								super.copyViewChild(oldView, newView, oldChildNode);
-							}
-						}						
-					}.refactor(oldObject, newObject);
-					DestroyElementCommand.destroy(oldObject);
-					
-					return CommandResult.newOKCommandResult(newObject);
-				}
-			});
-			
-			// validate the morphing
-			FlowContainer flowContainer = (FlowContainer) results.iterator().next();
-			Collection newNodes = EMFCoreUtil.getReferencers(flowContainer, new EReference[]{NotationPackage.eINSTANCE.getView_Element()});
-			assertFalse("morphing view failed", newNodes.isEmpty());//$NON-NLS-1$
-			
-			Node newNode = (Node) newNodes.iterator().next();
-			Bounds bounds = (Bounds) newNode.getLayoutConstraint();
-			assertEquals(1000, bounds.getX());
-			assertEquals(1000, bounds.getY());
-			FillStyle fStyle = (FillStyle) newNode.getStyle(NotationPackage.eINSTANCE.getFillStyle());
-			assertEquals(color, fStyle.getFillColor());
-			
-		} catch (Exception e) {
-			assertTrue(e.toString(), false);
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/PaletteTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/PaletteTests.java
deleted file mode 100644
index b3748d5..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/PaletteTests.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.logic;
-
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.dnd.TemplateTransfer;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDropTargetListener;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-
-/**
- * Tests for the palette functionality.
- * 
- * @author cmahoney
- */
-public class PaletteTests
-	extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(PaletteTests.class);
-		return s;
-	}
-
-	public PaletteTests() {
-		super("Palette Tests");//$NON-NLS-1$
-	}
-
-	/** installs the composite state test fixture. */
-	protected void setTestFixture() {
-		testFixture = new LogicTestFixture();
-	}
-
-	protected LogicTestFixture getFixture() {
-		return (LogicTestFixture) testFixture;
-	}
-
-	/**
-	 * Test the listeners that are used for drag and drop of palette tools on
-	 * the diagram.
-	 * 
-	 * @throws Exception
-	 */
-	public void testDNDFromPalette()
-		throws Exception {
-
-		class MyPaletteToolTransferDragSourceListener
-			extends PaletteToolTransferDragSourceListener {
-
-			public MyPaletteToolTransferDragSourceListener(EditPartViewer viewer) {
-				super(viewer);
-			}
-
-			/** Make public. */
-			public Object getTemplate() {
-				return super.getTemplate();
-			}
-
-		}
-
-		class MyPaletteToolTransferDropTargetListener
-			extends PaletteToolTransferDropTargetListener {
-
-			public MyPaletteToolTransferDropTargetListener(EditPartViewer viewer) {
-				super(viewer);
-			}
-
-			/** Make public. */
-			public Request createTargetRequest() {
-				return super.createTargetRequest();
-			}
-
-			protected Point getDropLocation() {
-				return new Point(10, 10);
-			}
-		}
-
-		getFixture().openDiagram();
-		System.out.println(getDiagramEditPart().getPrimaryEditParts().size());
-		assertEquals(2, getDiagramEditPart().getPrimaryEditParts().size());
-
-		PaletteViewer paletteViewer = (PaletteViewer) getFixture()
-			.getDiagramWorkbenchPart().getAdapter(PaletteViewer.class);
-
-		MyPaletteToolTransferDragSourceListener dragListener = new MyPaletteToolTransferDragSourceListener(
-			paletteViewer);
-		MyPaletteToolTransferDropTargetListener dropListener = new MyPaletteToolTransferDropTargetListener(
-			paletteViewer);
-
-		PaletteEntry noteEntry = findChildPaletteEntryRecursive(paletteViewer
-			.getPaletteRoot(), "noteTool"); //$NON-NLS-1$
-		assertNotNull(noteEntry);
-
-		paletteViewer.setActiveTool((ToolEntry) noteEntry);
-		paletteViewer.select((EditPart) paletteViewer.getEditPartRegistry()
-			.get(noteEntry));
-
-		// Verify that drag is enabled.
-		TemplateTransfer.getInstance().setTemplate(noteEntry);
-		assertNotNull(dragListener.getTemplate());
-
-		// Verify that the request works.
-		CreateRequest request = (CreateRequest) dropListener
-			.createTargetRequest();
-		request.setLocation(new Point(10, 10));
-		getDiagramEditPart().getCommand(request).execute();
-		assertEquals(3, getDiagramEditPart().getPrimaryEditParts().size());
-		Object noteEP = getDiagramEditPart().getPrimaryEditParts().get(2);
-		assertTrue(noteEP instanceof NoteEditPart);
-
-		// I cannot figure out how to test if the selection of the new shape
-		// works since the call to
-		// PaletteToolTransferDropTargetListener.handleDrop() expects a
-		// DropTargetEvent and I cannot instantiate one.
-
-		// Verify that drag is disabled for connection tools.
-		PaletteEntry noteAttachmentEntry = findChildPaletteEntryRecursive(
-			paletteViewer.getPaletteRoot(), "noteattachmentTool"); //$NON-NLS-1$
-		paletteViewer.setActiveTool((ToolEntry) noteAttachmentEntry);
-		paletteViewer.select((EditPart) paletteViewer.getEditPartRegistry()
-			.get(noteAttachmentEntry));
-		TemplateTransfer.getInstance().setTemplate(noteAttachmentEntry);
-		assertNull(dragListener.getTemplate());
-	}
-
-	private static PaletteEntry findChildPaletteEntryRecursive(
-			PaletteContainer container, String childId) {
-
-		Iterator entries = container.getChildren().iterator();
-		while (entries.hasNext()) {
-			PaletteEntry entry = (PaletteEntry) entries.next();
-			if (entry.getId().equals(childId)) {
-				return entry;
-			} else {
-				if (entry instanceof PaletteContainer) {
-					PaletteEntry entry2 = findChildPaletteEntryRecursive(
-						(PaletteContainer) entry, childId);
-					if (entry2 != null) {
-						return entry2;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/TextAlignmentTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/TextAlignmentTests.java
deleted file mode 100644
index 8a6038f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/TextAlignmentTests.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.logic;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.diagram.ui.actions.internal.TextAlignmentAction;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-import org.eclipse.gmf.runtime.notation.TextAlignment;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.ITestActionCallback;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-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;
-
-/**
- * Tests for the text alignment feature.
- * 
- * @author Anthony Hunter
- */
-public class TextAlignmentTests extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(TextAlignmentTests.class);
-		return s;
-	}
-
-	public TextAlignmentTests() {
-		super("Group Tests");//$NON-NLS-1$
-	}
-
-	public class TextAlignmentTestFixture extends LogicTestFixture {
-
-		public void setup() throws Exception {
-			closeWelcome();
-			super.setup();
-		}
-
-		public void closeWelcome() {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			if (workbench != null) {
-				IWorkbenchWindow workbenchWindow = workbench
-						.getActiveWorkbenchWindow();
-				if (workbenchWindow != null) {
-					IWorkbenchPage workbenchPage = workbenchWindow
-							.getActivePage();
-					if (workbenchPage != null) {
-						IWorkbenchPart workbenchPart = workbenchPage
-								.getActivePart();
-						if (workbenchPart != null) {
-							IWorkbenchPartSite workbenchPartSite = workbenchPart
-									.getSite();
-							if (workbenchPartSite != null) {
-								if (workbenchPartSite.getId().equals(
-										"org.eclipse.ui.internal.introview")) { //$NON-NLS-1$
-									IViewPart welcomeView = (IViewPart) workbenchPart;
-									workbenchPage.hideView(welcomeView);
-
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		protected void createShapesAndConnectors() throws Exception {
-			/**
-			 * Override so that the test creates the shapes it wants
-			 */
-		}
-	}
-
-	protected void setTestFixture() {
-		testFixture = new TextAlignmentTestFixture();
-	}
-
-	protected LogicTestFixture getFixture() {
-		return (LogicTestFixture) testFixture;
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	/** the note edit part */
-	protected ShapeEditPart noteEditPart;
-
-	/** the square edit part */
-	protected ShapeEditPart squareEditPart;
-
-	/** the note shape */
-	protected View noteView;
-
-	/** the square shape */
-	protected View squareView;
-
-	/**
-	 * Create the four shapes to be used to test grouping.
-	 */
-	protected void setupShapes() {
-
-		final String description = "Text align this text\nThe quick brown fox\njumps over\nthe lazy\ndog"; //$NON-NLS-1$
-
-		/* create a square geoshape */
-		squareEditPart = getFixture().createShapeUsingTool(
-				GeoshapeType.RECTANGLE, new Point(10, 10),
-				new Dimension(-1, -1), getDiagramEditPart());
-
-		squareView = (View) squareEditPart.getModel();
-
-		/* set the description (text) for the square geoshape */
-		testProperty(squareView, Properties.ID_DESCRIPTION, description);
-
-		/* create a note */
-		noteEditPart = getFixture().createShapeUsingTool(
-				DiagramNotationType.NOTE, new Point(200, 200),
-				new Dimension(-1, -1), getDiagramEditPart());
-
-		noteView = (View) noteEditPart.getModel();
-		
-		/* set the description (text) for the note */
-		testProperty(noteView, Properties.ID_DESCRIPTION, description);
-
-		flushEventQueue();
-
-	}
-
-	public void testSetTextAlignmentCenterAction() throws Exception {
-		setupShapes();
-
-		getDiagramEditPart().getViewer().setSelection(
-				new StructuredSelection(squareEditPart));
-
-		TextAlignmentAction action = TextAlignmentAction
-				.createTextAlignmentCenterAction(getWorkbenchPage());
-		testAction(action, new ITestActionCallback() {
-
-			public void onRunExecution() {
-
-				assertEquals(
-						TextAlignment.CENTER_LITERAL,
-						squareEditPart
-								.getStructuralFeatureValue((EStructuralFeature) PackageUtil
-										.getElement(Properties.ID_TEXT_ALIGNMENT)));
-
-			}
-		});
-		
-		getCommandStack().undo();
-		
-		assertEquals(
-				TextAlignment.LEFT_LITERAL,
-				squareEditPart
-						.getStructuralFeatureValue((EStructuralFeature) PackageUtil
-								.getElement(Properties.ID_TEXT_ALIGNMENT)));
-		
-	}
-
-	public void testSetTextAlignmentRightAction() throws Exception {
-		setupShapes();
-
-		getDiagramEditPart().getViewer().setSelection(
-				new StructuredSelection(noteEditPart));
-
-		TextAlignmentAction action = TextAlignmentAction
-				.createTextAlignmentRightAction(getWorkbenchPage());
-		testAction(action, new ITestActionCallback() {
-
-			public void onRunExecution() {
-
-				assertEquals(
-						TextAlignment.RIGHT_LITERAL,
-						noteEditPart
-								.getStructuralFeatureValue((EStructuralFeature) PackageUtil
-										.getElement(Properties.ID_TEXT_ALIGNMENT)));
-
-			}
-		});
-		
-		getCommandStack().undo();
-		
-		assertEquals(
-				TextAlignment.LEFT_LITERAL,
-				noteEditPart
-						.getStructuralFeatureValue((EStructuralFeature) PackageUtil
-								.getElement(Properties.ID_TEXT_ALIGNMENT)));
-		
-	}
-
-	public void testSetTextAlignmentProperty() throws Exception {
-
-		setupShapes();
-
-		testProperty(squareView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.RIGHT_LITERAL);
-
-		testProperty(squareView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.CENTER_LITERAL);
-
-		testProperty(squareView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.LEFT_LITERAL);
-
-		testProperty(noteView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.RIGHT_LITERAL);
-
-		testProperty(noteView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.CENTER_LITERAL);
-
-		testProperty(noteView, Properties.ID_TEXT_ALIGNMENT,
-				TextAlignment.LEFT_LITERAL);
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleLocatorTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleLocatorTest.java
deleted file mode 100644
index b02ebac..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleLocatorTest.java
+++ /dev/null
@@ -1,199 +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.tests.runtime.diagram.ui.parts;
-
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Point;
-
-import org.eclipse.gmf.runtime.diagram.ui.handles.ConnectionHandle;
-import org.eclipse.gmf.runtime.diagram.ui.handles.ConnectionHandleLocator;
-
-/**
- * Unit testing of the ConnectionHandleLocator class.
- * 
- * @author cmahoney
- */
-public class ConnectionHandleLocatorTest
-	extends TestCase {
-
-	private RectangleFigure rectangle;
-
-	private class FakeConnectionHandle
-		extends ConnectionHandle {
-
-		public FakeConnectionHandle() {
-			super(null, null, null);
-			setSize(1, 1);
-		}
-	}
-
-	public ConnectionHandleLocatorTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ConnectionHandleLocatorTest.class);
-	}
-
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp()
-		throws Exception {
-
-		rectangle = new RectangleFigure();
-		rectangle.setLocation(new Point(100, 100));
-		rectangle.setSize(100, 200);
-	}
-
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown()
-		throws Exception {
-
-		rectangle = null;
-	}
-
-	/**
-	 * Tests the public API of the ConnectionHandleLocator class.
-	 * 
-	 * @throws Exception
-	 */
-	public void testConnectionHandleLocator()
-		throws Exception {
-
-		Object data[][] = {
-			{new Point(130, 100), new Integer(PositionConstants.NORTH)},
-			{new Point(130, 200), new Integer(PositionConstants.WEST)},
-			{new Point(180, 170), new Integer(PositionConstants.EAST)},
-			{new Point(140, 290), new Integer(PositionConstants.SOUTH)}};
-
-		for (int i = 0; i < data.length; i++) {
-			ConnectionHandleLocator locator = new ConnectionHandleLocator(
-				rectangle, (Point) data[i][0]);
-
-			ConnectionHandle handle = new FakeConnectionHandle();
-
-			locator.addHandle(handle);
-			locator.relocate(handle);
-
-			assertTrue(rectangle.getBounds().getPosition(handle.getLocation()) == ((Integer) data[i][1])
-				.intValue());
-			assertTrue(locator.getBorderSide() == ((Integer) data[i][1])
-				.intValue());
-			assertTrue(!locator.isEastWestSouth());
-		}
-		for (int i = 0; i < data.length; i++) {
-			ConnectionHandleLocator locator = new ConnectionHandleLocator(
-				rectangle, (Point) data[i][0]);
-
-			ConnectionHandle handle1 = new FakeConnectionHandle();
-			ConnectionHandle handle2 = new FakeConnectionHandle();
-
-			locator.addHandle(handle1);
-			locator.addHandle(handle2);
-			locator.relocate(handle1);
-			locator.relocate(handle2);
-
-			int expectedSide = ((Integer) data[i][1]).intValue();
-			if (expectedSide != PositionConstants.NORTH) { // North will be off
-				// to left.
-				assertTrue(rectangle.getBounds().getPosition(
-					handle1.getLocation()) == expectedSide);
-				assertTrue(rectangle.getBounds().getPosition(
-					handle2.getLocation()) == expectedSide);
-			}
-			assertTrue(locator.getBorderSide() == expectedSide);
-			if (expectedSide == PositionConstants.NORTH
-				|| expectedSide == PositionConstants.SOUTH) {
-				assertTrue(handle1.getLocation().y == handle2.getLocation().y);
-				assertTrue(handle1.getLocation().x != handle2.getLocation().x);
-			} else {
-				assertTrue(handle1.getLocation().y != handle2.getLocation().y);
-				assertTrue(handle1.getLocation().x == handle2.getLocation().x);
-			}
-		}
-
-		Object data2[][] = {
-			{new Point(130, 100), new Integer(PositionConstants.WEST)},
-			{new Point(180, 110), new Integer(PositionConstants.EAST)},
-			{new Point(130, 200), new Integer(PositionConstants.WEST)},
-			{new Point(180, 170), new Integer(PositionConstants.EAST)},
-			{new Point(140, 290), new Integer(PositionConstants.SOUTH)}};
-
-		for (int i = 0; i < data.length; i++) {
-			ConnectionHandleLocator locator = new ConnectionHandleLocator(
-				rectangle, (Point) data2[i][0]);
-			locator.setEastWestSouth(true);
-
-			ConnectionHandle handle = new FakeConnectionHandle();
-
-			locator.addHandle(handle);
-			locator.relocate(handle);
-
-			assertTrue(rectangle.getBounds().getPosition(handle.getLocation()) == ((Integer) data2[i][1])
-				.intValue());
-			assertTrue(locator.getBorderSide() == ((Integer) data2[i][1])
-				.intValue());
-			assertTrue(locator.isEastWestSouth());
-		}
-	}
-
-	/**
-	 * Tests the ConnectionHandleLocator class for memory leaks.
-	 * 
-	 * @throws Exception
-	 */
-	public void testConnectionHandleLocatorForMemoryLeaks()
-		throws Exception {
-
-		ConnectionHandleLocator objTested = new ConnectionHandleLocator(
-			rectangle, new Point(10, 10));
-		ConnectionHandle handle = new FakeConnectionHandle();
-		objTested.addHandle(handle);
-		objTested.relocate(handle);
-
-		ReferenceQueue spy = new ReferenceQueue();
-		PhantomReference refObjTested = new PhantomReference(objTested, spy);
-
-		// Release the reference to object tested.
-		objTested = null;
-
-		System.gc();
-
-		if (!refObjTested.isEnqueued()) {
-			System.runFinalization();
-		}
-
-		assertTrue(refObjTested.isEnqueued());
-
-		Reference removedRef = spy.remove();
-		if (removedRef != null)
-			removedRef.clear();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleTest.java
deleted file mode 100644
index 9b9cfd8..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/ConnectionHandleTest.java
+++ /dev/null
@@ -1,144 +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.tests.runtime.diagram.ui.parts;
-
-import java.lang.ref.PhantomReference;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Point;
-
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.handles.ConnectionHandle;
-import org.eclipse.gmf.runtime.diagram.ui.handles.ConnectionHandleLocator;
-
-/**
- * Unit testing of the ConnectionHandle class.
- * 
- * @author cmahoney
- */
-public class ConnectionHandleTest
-	extends TestCase {
-
-	private class FakeEditPart
-		extends ShapeEditPart {
-
-		public FakeEditPart() {
-			super(null);
-		}
-
-		protected IFigure createFigure() {
-			RectangleFigure rectangle = new RectangleFigure();
-			rectangle.setLocation(new Point(0, 0));
-			rectangle.setSize(100, 200);
-			return rectangle;
-		}
-
-	}
-
-	public ConnectionHandleTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(ConnectionHandleTest.class);
-	}
-
-	/**
-	 * Tests the public API of the ConnectionHandle class.
-	 * 
-	 * @throws Exception
-	 */
-	public void testConnectionHandle()
-		throws Exception {
-
-		FakeEditPart editpart = new FakeEditPart();
-		ConnectionHandle handle = new ConnectionHandle(editpart,
-			ConnectionHandle.HandleDirection.OUTGOING, "the tooltip"); //$NON-NLS-1$
-		ConnectionHandleLocator locator = new ConnectionHandleLocator(editpart
-			.getFigure(), new Point(90, 90));
-
-		handle.setLocator(locator);
-
-		assertTrue(handle.getChildren().isEmpty());
-
-		handle.validate();
-
-		assertTrue(handle.getChildren().size() == 1);
-		assertTrue(handle.getLocator() == locator);
-		assertTrue(handle.getOwner() == editpart);
-		assertTrue(!handle.isIncoming());
-		assertTrue(editpart.getFigure().getBounds().getPosition(
-			handle.getBounds().getCenter()) == PositionConstants.EAST);
-		assertTrue(handle.findFigureAt(handle.getBounds().getCenter()) == handle);
-
-		handle.addErrorIcon();
-
-		assertTrue(handle.getChildren().size() == 2);
-
-		handle.removeErrorIcon();
-
-		assertTrue(handle.getChildren().size() == 1);
-
-		handle = new ConnectionHandle(editpart,
-			ConnectionHandle.HandleDirection.INCOMING, "the tooltip"); //$NON-NLS-1$
-		assertTrue(handle.isIncoming());
-	}
-
-	/**
-	 * Tests the ConnectionHandle class for memory leaks.
-	 * 
-	 * @throws Exception
-	 */
-	public void testConnectionHandleForMemoryLeaks()
-		throws Exception {
-
-		FakeEditPart editpart = new FakeEditPart();
-		ConnectionHandle objTested = new ConnectionHandle(editpart,
-			ConnectionHandle.HandleDirection.OUTGOING, "the tooltip"); //$NON-NLS-1$
-		ConnectionHandleLocator locator = new ConnectionHandleLocator(editpart
-			.getFigure(), new Point(90, 90));
-		objTested.setLocator(locator);
-		objTested.validate();
-
-		ReferenceQueue spy = new ReferenceQueue();
-		PhantomReference refObjTested = new PhantomReference(objTested, spy);
-
-		// Release the reference to object tested.
-		objTested = null;
-
-		System.gc();
-
-		if (!refObjTested.isEnqueued()) {
-			System.runFinalization();
-		}
-
-		assertTrue(refObjTested.isEnqueued());
-
-		Reference removedRef = spy.remove();
-		if (removedRef != null)
-			removedRef.clear();
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/DiagramCommandStackTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/DiagramCommandStackTest.java
deleted file mode 100644
index e4f9df0..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/DiagramCommandStackTest.java
+++ /dev/null
@@ -1,123 +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.diagram.ui.parts;
-
-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.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-
-/**
- * This test should be run as a JUnit Plugin Test
- * 
- * @author ldamus
- */
-public class DiagramCommandStackTest extends TestCase {
-
-	private static class MyProgressMonitor implements IProgressMonitor {
-		public void beginTask(String name, int totalWork) {
-			// do nothing
-		}
-		public void done() {
-			// do nothing
-		}
-		public void internalWorked(double work) {
-			// do nothing
-		}
-		public boolean isCanceled() {
-			return false;
-		}
-		public void setCanceled(boolean value) {
-			// do nothing
-		}
-		public void setTaskName(String name) {
-			// do nothing
-		}
-		public void subTask(String name) {
-			// do nothing
-		}
-		public void worked(int work) {
-			// do nothing
-		}
-	}
-
-	private DiagramCommandStack fixture = null;
-
-	public DiagramCommandStackTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(DiagramCommandStackTest.class);
-	}
-
-	private String getLabel() {
-		return "DiagramCommandStackTest"; //$NON-NLS-1$
-	}
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	protected DiagramCommandStack getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(DiagramCommandStack fixture) {
-		this.fixture = fixture;
-	}
-
-	public void test_execute() {
-
-		// Verify that the progress monitor is transfered from the
-		// ICommandProxy to the execute method of the ICommand
-
-		final IProgressMonitor progressMonitor = new MyProgressMonitor();
-		ICommand iCommand = new AbstractCommand(getLabel(), null) {
-			protected CommandResult doExecuteWithResult(IProgressMonitor pm, IAdaptable info) throws ExecutionException {
-				assertEquals(progressMonitor, progressMonitor);
-				return CommandResult.newOKCommandResult();
-			}
-            protected CommandResult doRedoWithResult(IProgressMonitor pm, IAdaptable info)
-                throws ExecutionException {
-                return null;
-            }
-            protected CommandResult doUndoWithResult(IProgressMonitor pm, IAdaptable info)
-                throws ExecutionException {
-                return null;
-            }
-		};
-		ICommandProxy proxyCommand = new ICommandProxy(iCommand);
-
-		DiagramEditDomain domain = new DiagramEditDomain(null);
-				
-		setFixture(new DiagramCommandStack(domain));
-		getFixture().execute(proxyCommand, progressMonitor);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/GraphicalNodeEditPolicyTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/GraphicalNodeEditPolicyTests.java
deleted file mode 100644
index 91841d8..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/parts/GraphicalNodeEditPolicyTests.java
+++ /dev/null
@@ -1,293 +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.diagram.ui.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.SetPropertyCommand;
-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.commands.CreateOrSelectElementCommand;
-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.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.handles.ConnectionHandle;
-import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.Properties;
-import org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestFixture;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * GraphicalNodeEditPolicy class tests.
- * 
- * @author cmahoney
- */
-public class GraphicalNodeEditPolicyTests
-	extends AbstractTestBase {
-
-	/**
-	 * Extend the <code>GraphicalNodeEditPolicy</code> class to support a menu
-	 * popup that not only creates a note attachment, but also allows the user
-	 * to choose what color to make the note attachment.
-	 * 
-	 * @author cmahoney
-	 */
-	static class NoteGraphicalNodeEditPolicy
-		extends GraphicalNodeEditPolicy {
-
-		/**
-		 * Provides a description of the type of note attachment to be created.
-		 */
-		static class NoteAttachmentDescriptor {
-
-			Color color;
-
-			NoteAttachmentDescriptor(Color color) {
-				super();
-				this.color = color;
-			}
-		}
-
-		static NoteAttachmentDescriptor USER_CHOICE = new NoteAttachmentDescriptor(
-			ColorConstants.red);
-
-		protected List getConnectionMenuContent(CreateConnectionRequest request) {
-			List content = super.getConnectionMenuContent(request);
-			if (content.contains(DiagramNotationType.NOTE_ATTACHMENT)) {
-				content.add(new NoteAttachmentDescriptor(ColorConstants.blue));
-				content.add(USER_CHOICE);
-				content
-					.add(new NoteAttachmentDescriptor(ColorConstants.yellow));
-			}
-			return content;
-		}
-
-		protected Command getConnectionCompleteCommand(Object connectionType,
-				CreateConnectionRequest request) {
-			if (connectionType instanceof NoteAttachmentDescriptor) {
-				CompoundCommand cc = new CompoundCommand(
-					"Create Note Attachment"); //$NON-NLS-1$
-				cc.add(super.getConnectionCompleteCommand(
-					DiagramNotationType.NOTE_ATTACHMENT, request));
-
-				if (request instanceof CreateUnspecifiedTypeConnectionRequest)
-					cc
-						.add(new ICommandProxy(
-							new SetPropertyCommand(
-                                ((IGraphicalEditPart) getHost()).getEditingDomain(),
-								((CreateConnectionViewRequest) ((CreateUnspecifiedTypeConnectionRequest) request)
-									.getRequestForType(DiagramNotationType.NOTE_ATTACHMENT))
-									.getConnectionViewDescriptor(),
-								Properties.ID_LINECOLOR,
-								Properties.ID_LINECOLOR,
-								FigureUtilities
-									.colorToInteger(((NoteAttachmentDescriptor) connectionType).color))));
-				return cc.unwrap();
-			}
-			return super.getConnectionCompleteCommand(connectionType, request);
-		}
-
-		protected ICommand getPromptAndCreateConnectionCommand(List content,
-				CreateConnectionRequest request) {
-
-			class TestablePromptAndCreateConnectionCommand
-				extends PromptAndCreateConnectionCommand {
-
-				class TestablePopupMenu
-					extends PopupMenu {
-
-					TestablePopupMenu(List theContent,
-							ILabelProvider theLabelProvider) {
-						super(theContent, theLabelProvider);
-					}
-
-					/*
-					 * (non-Javadoc)
-					 * 
-					 * @see org.eclipse.gmf.runtime.diagram.ui.menus.PopupMenu#show(org.eclipse.swt.widgets.Control)
-					 */
-					public boolean show(Control parent) {
-						assertTrue(getContent().contains(USER_CHOICE));
-						setResult(Collections.singletonList(USER_CHOICE));
-						return true;
-					}
-
-				}
-
-				/**
-				 * Creates a new instance.
-				 * 
-				 * @param theContent
-				 * @param theRequest
-				 */
-				TestablePromptAndCreateConnectionCommand(List theContent,
-						CreateConnectionRequest theRequest) {
-					super(theContent, theRequest);
-					setPopupMenu(new TestablePopupMenu(theContent,
-						getLabelProvider()));
-
-				}
-
-				protected ILabelProvider getLabelProvider() {
-					return new CreateOrSelectElementCommand.LabelProvider() {
-
-						public String getText(Object object) {
-							if (object instanceof NoteAttachmentDescriptor) {
-								return "Create a note attachment colored " //$NON-NLS-1$
-									+ ((NoteAttachmentDescriptor) object).color;
-							}
-							return super.getText(object);
-						}
-					};
-				}
-
-			}
-			return new TestablePromptAndCreateConnectionCommand(content,
-				request);
-		}
-
-	}
-
-	/**
-	 * Subclass the Connection handle tool to make it usable in the test
-	 * environment.
-	 * 
-	 * @author cmahoney
-	 */
-	class ConnectionHandleTool
-		extends
-		org.eclipse.gmf.runtime.diagram.ui.internal.tools.ConnectionHandleTool {
-
-		public ConnectionHandleTool(ConnectionHandle connectorHandle) {
-			super(connectorHandle);
-		}
-
-		/** Make public. */
-		public Request createTargetRequest() {
-			return super.createTargetRequest();
-		}
-
-		protected PreferencesHint getPreferencesHint() {
-			return PreferencesHint.USE_DEFAULTS;
-		}
-	}
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(GraphicalNodeEditPolicyTests.class);
-		return s;
-	}
-
-	public GraphicalNodeEditPolicyTests() {
-		super("GraphicalNodeEditPolicy Test Suite");//$NON-NLS-1$
-	}
-
-	protected void setTestFixture() {
-		testFixture = new PresentationTestFixture();
-	}
-
-	protected PresentationTestFixture getFixture() {
-		return (PresentationTestFixture) testFixture;
-	}
-
-	/**
-	 * Tests the ability to use a custom prompt and add non-element types to the
-	 * prompt.
-	 * 
-	 * @throws Exception
-	 */
-	public void testCustomPrompt()
-		throws Exception {
-
-		NoteEditPart sourceEP = getFixture().createNote();
-		NoteEditPart targetEP = getFixture().createNote();
-
-		sourceEP.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-			new NoteGraphicalNodeEditPolicy());
-		targetEP.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
-			new NoteGraphicalNodeEditPolicy());
-
-		ConnectionHandle handle = new ConnectionHandle(sourceEP,
-			ConnectionHandle.HandleDirection.OUTGOING, "the tooltip"); //$NON-NLS-1$
-		ConnectionHandleTool tool = new ConnectionHandleTool(handle);
-		CreateConnectionRequest request = (CreateConnectionRequest) tool
-			.createTargetRequest();
-		request.setTargetEditPart(sourceEP);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		sourceEP.getCommand(request);
-		request.setSourceEditPart(sourceEP);
-		request.setTargetEditPart(targetEP);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		targetEP.getCommand(request).execute();
-
-		assertEquals(1, getDiagramEditPart().getConnections().size());
-		NoteAttachmentEditPart noteAttachmentEP = (NoteAttachmentEditPart) getDiagramEditPart()
-			.getConnections().get(0);
-		assertEquals(sourceEP, noteAttachmentEP.getSource());
-		assertEquals(targetEP, noteAttachmentEP.getTarget());
-		assertTrue(FigureUtilities.integerToColor(
-			(Integer) ViewUtil.getStructuralFeatureValue(noteAttachmentEP
-				.getNotationView(), NotationPackage.eINSTANCE
-				.getLineStyle_LineColor())).equals(
-			NoteGraphicalNodeEditPolicy.USER_CHOICE.color));
-
-		noteAttachmentEP.getCommand(
-			new GroupRequest(RequestConstants.REQ_DELETE)).execute();
-		assertEquals(0, getDiagramEditPart().getConnections().size());
-
-		handle = new ConnectionHandle(targetEP,
-			ConnectionHandle.HandleDirection.INCOMING, "the tooltip"); //$NON-NLS-1$
-		tool = new ConnectionHandleTool(handle);
-		request = (CreateConnectionRequest) tool.createTargetRequest();
-		request.setTargetEditPart(targetEP);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		targetEP.getCommand(request);
-		request.setSourceEditPart(targetEP);
-		request.setTargetEditPart(sourceEP);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		sourceEP.getCommand(request).execute();
-
-		assertEquals(1, getDiagramEditPart().getConnections().size());
-		noteAttachmentEP = (NoteAttachmentEditPart) getDiagramEditPart()
-			.getConnections().get(0);
-		assertEquals(sourceEP, noteAttachmentEP.getSource());
-		assertEquals(targetEP, noteAttachmentEP.getTarget());
-		assertTrue(FigureUtilities.integerToColor(
-			(Integer) ViewUtil.getStructuralFeatureValue(noteAttachmentEP
-				.getNotationView(), NotationPackage.eINSTANCE
-				.getLineStyle_LineColor())).equals(
-			NoteGraphicalNodeEditPolicy.USER_CHOICE.color));
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/render/util/CopyToImageUtilTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/render/util/CopyToImageUtilTests.java
deleted file mode 100644
index 4b4ef3d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/render/util/CopyToImageUtilTests.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.render.util;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-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.core.runtime.Path;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewType;
-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.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.providers.GeoshapeConstants;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.diagram.ui.requests.ChangePropertyValueRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;
-import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;
-import org.eclipse.gmf.runtime.emf.core.util.PackageUtil;
-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.datatype.GradientData;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicTestFixture;
-import org.eclipse.swt.widgets.Shell;
-
-public class CopyToImageUtilTests
-    extends AbstractTestBase {
-
-    public CopyToImageUtilTests(String arg0) {
-        super(arg0);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase#setTestFixture()
-     */
-    protected void setTestFixture() {
-        testFixture = new LogicTestFixture();
-    }
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		DiagramEditPart dgmEP = getDiagramEditPart();
-
-		CreateViewRequest shapeRequest =
-			new CreateViewRequest(new ViewDescriptor(null, Node.class, ViewType.NOTE, dgmEP.getDiagramPreferencesHint()));
-		
-		shapeRequest.setLocation(new Point(300, 300));
-		getCommandStack().execute(getDiagramEditPart().getCommand(shapeRequest));
-		
-		shapeRequest =
-			new CreateViewRequest(new ViewDescriptor(null, Node.class, GeoshapeConstants.TOOL_CYLINDER, dgmEP.getDiagramPreferencesHint()));
-		
-		shapeRequest.setLocation(new Point(400, 400));
-		getCommandStack().execute(getDiagramEditPart().getCommand(shapeRequest));
-		
-		IGraphicalEditPart cylinderEP = getDiagramEditPart().getChildBySemanticHint(GeoshapeConstants.TOOL_CYLINDER);
-		
-		assertNotNull(cylinderEP);
-		
-		String propertyID = PackageUtil.getID(NotationPackage.eINSTANCE.getFillStyle_Gradient());
-		String propertyName = PackageUtil.getDisplayName(NotationPackage.eINSTANCE.getFillStyle_Gradient());
-		GradientData gradientData = new GradientData();
-		gradientData.setGradientColor1(FigureUtilities.colorToInteger(ColorConstants.darkBlue));
-		gradientData.setGradientColor2(FigureUtilities.colorToInteger(ColorConstants.white));
-		ChangePropertyValueRequest request = new ChangePropertyValueRequest(propertyName, propertyID, gradientData);
-		getCommandStack().execute(cylinderEP.getCommand(request));
-		
-	}
-
-	public static Test suite() {
-        return new TestSuite(CopyToImageUtilTests.class);
-    }
-
-    public void testCopyToImageUtilTest_BMP()
-        throws Exception {
-        copyToImageTestForFormat(".bmp", ImageFileFormat.BMP);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageUtilTest_GIF()
-        throws Exception {
-        copyToImageTestForFormat(".gif", ImageFileFormat.GIF);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageUtilTest_JPEG()
-        throws Exception {
-        copyToImageTestForFormat(".jpeg", ImageFileFormat.JPEG);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageUtilTest_JPG()
-        throws Exception {
-        copyToImageTestForFormat(".jpg", ImageFileFormat.JPG);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageUtilTest_PNG()
-        throws Exception {
-        copyToImageTestForFormat(".png", ImageFileFormat.PNG);//$NON-NLS-1$ 
-    }
-    
-    public void testCopyToImageOffscreenUtilTest_BMP()
-        throws Exception {
-        copyToImageOffscreenTestForFormat(".bmp", ImageFileFormat.BMP);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageOffscreenUtilTest_GIF()
-        throws Exception {
-        copyToImageOffscreenTestForFormat(".gif", ImageFileFormat.GIF);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageOffscreenUtilTest_JPEG()
-        throws Exception {
-        copyToImageOffscreenTestForFormat(".jpeg", ImageFileFormat.JPEG);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageOffscreenUtilTest_JPG()
-        throws Exception {
-        copyToImageOffscreenTestForFormat(".jpg", ImageFileFormat.JPG);//$NON-NLS-1$ 
-    }
-
-    public void testCopyToImageOffscreenUtilTest_PNG()
-        throws Exception {
-        copyToImageOffscreenTestForFormat(".png", ImageFileFormat.PNG);//$NON-NLS-1$ 
-    }
-    
-    public void testCopyToImageUtilTest_SVG() throws Exception {
-       copyToImageTestForFormat(".svg", ImageFileFormat.SVG);//$NON-NLS-1$
-    }
-
-    private void copyToImageTestForFormat(String suffix, ImageFileFormat type)
-        throws IOException, CoreException {
-        IProgressMonitor monitor = new NullProgressMonitor();
-        File file = File.createTempFile("test", suffix);//$NON-NLS-1$ 
-        IPath tmpDest = new Path(file.getPath());
-
-        // export to each file type
-        new CopyToImageUtil().copyToImage(getDiagramEditPart(), tmpDest, type,
-            monitor);
-
-        RenderedImage ri = RenderedImageFactory.getInstance(tmpDest.toString());
-        file.delete();
-        assertTrue("RenderedImage is null", ri != null);//$NON-NLS-1$ 
-        assertTrue("SWTImage is null", ri.getSWTImage() != null);//$NON-NLS-1$
-        /*
-         * Entries in the RenederdImageFactory#instanceMap may not get a chance to be garbage collected.
-         * Hence, schedule a garbage collection.
-         */
-        System.gc();
-    }
-
-    private void copyToImageOffscreenTestForFormat(String suffix,
-			ImageFileFormat type) throws IOException, CoreException {
-		IProgressMonitor monitor = new NullProgressMonitor();
-		File file = File.createTempFile("test", suffix);//$NON-NLS-1$ 
-		IPath tmpDest = new Path(file.getPath());
-
-		// export to each file type
-		Diagram diagram = getDiagram();
-		PreferencesHint hint = getDiagramEditPart().getDiagramPreferencesHint();
-		Shell shell = new Shell();
-		try {
-			DiagramEditPart diagramEditPart = OffscreenEditPartFactory
-					.getInstance().createDiagramEditPart(diagram, shell, hint);
-			assertNotNull(
-					"Offsreen editpart factory failed to generate diagram editpart. Diagram EditPart is null.", //$NON-NLS-1$
-					diagramEditPart);
-			new CopyToImageUtil().copyToImage(diagramEditPart, tmpDest, type,
-					monitor);
-		} finally {
-			shell.dispose();
-			RenderedImage ri = RenderedImageFactory.getInstance(tmpDest
-					.toString());
-			file.delete();
-			assertTrue("RenderedImage is null", ri != null);//$NON-NLS-1$ 
-			assertTrue("SWTImage is null", ri.getSWTImage() != null);//$NON-NLS-1$ 
-	        /*
-	         * Entries in the RenederdImageFactory#instanceMap may not get a chance to be garbage collected.
-	         * Hence, schedule a garbage collection.
-	         */
-			System.gc();
-		}
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/requests/RequestTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/requests/RequestTests.java
deleted file mode 100644
index 97f02bb..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/requests/RequestTests.java
+++ /dev/null
@@ -1,106 +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.diagram.ui.requests;
-
-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 org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestFixture;
-
-/**
- * Tests things relating to Requests.
- * 
- * @author cmahoney
- */
-public class RequestTests
-	extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(RequestTests.class);
-		return s;
-	}
-
-	public RequestTests() {
-		super("RequestTests Test Suite");//$NON-NLS-1$
-	}
-
-	protected void setTestFixture() {
-		testFixture = new PresentationTestFixture();
-	}
-
-	protected PresentationTestFixture getFixture() {
-		return (PresentationTestFixture) testFixture;
-	}
-
-	/**
-	 * Tests the API of the <code>CreateUnspecifiedTypeRequest</code>.
-	 * 
-	 * @throws Exception
-	 */
-	public void testCreateUnspecifiedTypeRequest()
-		throws Exception {
-
-		List elementTypes = new ArrayList();
-		elementTypes.add(DiagramNotationType.NOTE);
-		elementTypes.add(DiagramNotationType.TEXT);
-
-		CreateUnspecifiedTypeRequest request = new CreateUnspecifiedTypeRequest(
-			elementTypes, PreferencesHint.USE_DEFAULTS);
-
-		Map extendedData = new HashMap();
-		Point location = new Point(1, 2);
-		Dimension size = new Dimension(10, 5);
-		Object type = new Integer(5);
-
-		request.setExtendedData(extendedData);
-		request.setLocation(location);
-		request.setSize(size);
-		request.setType(type);
-
-		assertEquals(extendedData, request.getExtendedData());
-		assertEquals(extendedData, request.getRequestForType(
-			DiagramNotationType.NOTE).getExtendedData());
-		assertEquals(extendedData, request.getRequestForType(
-			DiagramNotationType.TEXT).getExtendedData());
-
-		assertEquals(location, request.getLocation());
-		assertEquals(location, request.getRequestForType(
-			DiagramNotationType.NOTE).getLocation());
-		assertEquals(location, request.getRequestForType(
-			DiagramNotationType.TEXT).getLocation());
-
-		assertEquals(size, request.getSize());
-		assertEquals(size, request.getRequestForType(DiagramNotationType.NOTE)
-			.getSize());
-		assertEquals(size, request.getRequestForType(DiagramNotationType.TEXT)
-			.getSize());
-
-		assertEquals(type, request.getType());
-		assertEquals(type, request.getRequestForType(DiagramNotationType.NOTE)
-			.getType());
-		assertEquals(type, request.getRequestForType(DiagramNotationType.TEXT)
-			.getType());
-
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DecoratorServiceTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DecoratorServiceTests.java
deleted file mode 100644
index 442948f..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DecoratorServiceTests.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.tests.runtime.diagram.ui.services;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-import junit.textui.TestRunner;

-

-import org.eclipse.draw2d.Ellipse;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.requests.GroupRequest;

-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.editparts.NoteEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.Decoration;

-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration;

-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.draw2d.ui.mapmode.MapModeUtil;

-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;

-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestFixture;

-

-/**

- * Tests for the Decorator Service.

- * 

- * @author cmahoney

- */

-public class DecoratorServiceTests

-	extends AbstractTestBase {

-

-	/**

-	 * Provides decorators for this test. This class is referenced in the

-	 * plugin.xml file.

-	 * 

-	 * @author cmahoney

-	 */

-	public static class TestDecoratorProvider

-		extends AbstractProvider

-		implements IDecoratorProvider {

-

-		public static final String TEST_DECORATOR = "TestDecorator"; //$NON-NLS-1$

-

-		/**

-		 * Is this provider active? False by default.

-		 */

-		private static boolean isActive = false;

-

-		/**

-		 * Is this provider active?

-		 * 

-		 * @return true if this provider is active; false otherwise

-		 */

-		public static boolean isActive() {

-			return isActive;

-		}

-

-		/**

-		 * Sets the flag indicating if this provider is active.

-		 * 

-		 * @param isProviderActive

-		 *            true if this provider is active; false otherwise

-		 */

-		public static void setActive(boolean isProviderActive) {

-			isActive = isProviderActive;

-		}

-

-		/**

-		 * Cache the one and only decorator.

-		 */

-		private static NoteDecorator myNoteDecorator;

-

-		/**

-		 * Gets the one and only decorator for testing purposes.

-		 * 

-		 * @return the decorator

-		 */

-		public static NoteDecorator getMyNoteDecorator() {

-			return myNoteDecorator;

-		}

-

-		public static void deactivate() {

-			TestDecoratorProvider.myNoteDecorator = null;

-		}

-

-		public TestDecoratorProvider() {

-			super();

-			myNoteDecorator = null;

-		}

-

-		/* (non-Javadoc)

-		 * @see org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider#createDecorators(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget)

-		 */

-		public void createDecorators(IDecoratorTarget decoratorTarget) {

-			NoteEditPart noteEP = (NoteEditPart) decoratorTarget

-				.getAdapter(NoteEditPart.class);

-			if (noteEP != null) {

-				if (myNoteDecorator == null) {

-					myNoteDecorator = new NoteDecorator(decoratorTarget);

-				}

-				decoratorTarget.installDecorator(TEST_DECORATOR,

-					myNoteDecorator);

-			}

-		}

-

-		/*

-		 * (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) {

-			if (!isActive()) {

-				return false;

-			}

-

-			IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation)

-				.getDecoratorTarget();

-			return decoratorTarget.getAdapter(NoteEditPart.class) != null;

-		}

-	}

-

-	/**

-	 * Decorates notes with a circle figure.

-	 * 

-	 * @author cmahoney

-	 */

-	public static class NoteDecorator

-		extends AbstractDecorator {

-

-		static final int DIAMETER = 20;

-

-		/**

-		 * True if the decoration's visibility is not to be affected by the

-		 * parent's visibility; false otherwise.

-		 */

-		static boolean ignoreParentVisibility = false;

-

-		/**

-		 * Creates a new instance.

-		 * 

-		 * @param decoratorTarget

-		 */

-		public NoteDecorator(IDecoratorTarget decoratorTarget) {

-			super(decoratorTarget);

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator.IDecoratorBase#activate()

-		 */

-		public void activate() {

-			refresh();

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator.IDecoratorBase#refresh()

-		 */

-		public void refresh() {

-			removeDecoration();

-			NoteEditPart noteEP = (NoteEditPart) getDecoratorTarget()

-				.getAdapter(NoteEditPart.class);

-			if (noteEP != null) {

-				Ellipse circle = new Ellipse();

-				circle.setSize(DIAMETER, DIAMETER);

-				IDecoration decoration = getDecoratorTarget()

-					.addShapeDecoration(circle,

-						IDecoratorTarget.Direction.NORTH_EAST,

-						MapModeUtil.getMapMode(noteEP.getFigure()).DPtoLP(-4), false);

-				decoration.setIgnoreParentVisibility(ignoreParentVisibility);

-				setDecoration(decoration);

-			}

-		}

-

-	}

-

-	public DecoratorServiceTests(String name) {

-		super(name);

-	}

-

-	public static void main(String[] args) {

-		TestRunner.run(suite());

-	}

-

-	public static Test suite() {

-		return new TestSuite(DecoratorServiceTests.class);

-	}

-

-	protected void setUp()

-		throws Exception {

-		super.setUp();

-		TestDecoratorProvider.setActive(true);

-		NoteDecorator.ignoreParentVisibility = false;

-	}

-

-	protected void tearDown()

-		throws Exception {

-		super.tearDown();

-		TestDecoratorProvider.setActive(false);

-		TestDecoratorProvider.deactivate();

-	}

-

-	protected void setTestFixture() {

-		testFixture = new PresentationTestFixture();

-	}

-

-	protected PresentationTestFixture getFixture() {

-		return (PresentationTestFixture) testFixture;

-	}

-

-	/**

-	 * Some basic decorator tests.

-	 * 

-	 * @throws Exception

-	 */

-	public void testNoteDecorator()

-		throws Exception {

-

-		getFixture().createNote();

-

-		NoteDecorator myDecorator = TestDecoratorProvider.getMyNoteDecorator();

-		Decoration decoration = myDecorator.getDecoration();

-		assertNotNull(decoration);

-

-		NoteEditPart noteEP = (NoteEditPart) getDiagramEditPart()

-			.getPrimaryEditParts().get(0);

-		assertEquals(noteEP.getFigure(), decoration.getOwnerFigure());

-

-		assertTrue(decoration.isVisible());

-		assertTrue(noteEP.getFigure().getBounds().contains(

-			decoration.getBounds()));

-		assertEquals(NoteDecorator.DIAMETER, decoration.getSize().height);

-        assertTrue(getFixture().getDiagramEditPart().getViewer().getVisualPartMap().containsKey(decoration));

-

-		// verify decoration is hidden if owner figure is not visible

-		noteEP.getFigure().setVisible(false);

-		assertFalse(decoration.isVisible());

-

-		// bring back to visible

-		noteEP.getFigure().setVisible(true);

-		assertTrue(decoration.isVisible());

-

-		// verify decoration is removed when shape is deleted

-		noteEP.getCommand(new GroupRequest(RequestConstants.REQ_DELETE))

-			.execute();

-		assertNull(myDecorator.getDecoration());

-        

-        // verify decoration is removed from viewer -- bugzilla 193190

-        assertFalse(getFixture().getDiagramEditPart().getViewer().getVisualPartMap().containsKey(decoration));

-	}

-

-	/**

-	 * Tests the ability to have the decoration continue to appear even if the

-	 * parent is made invisible. See RATLC00538197.

-	 * 

-	 * @throws Exception

-	 */

-	public void testIgnoreParentVisibility()

-		throws Exception {

-

-		NoteDecorator.ignoreParentVisibility = true;

-

-		getFixture().createNote();

-

-		NoteDecorator myDecorator = TestDecoratorProvider.getMyNoteDecorator();

-		Decoration decoration = myDecorator.getDecoration();

-		assertNotNull(decoration);

-

-		NoteEditPart noteEP = (NoteEditPart) getDiagramEditPart()

-			.getPrimaryEditParts().get(0);

-		assertEquals(noteEP.getFigure(), decoration.getOwnerFigure());

-

-		assertTrue(decoration.isVisible());

-		assertTrue(noteEP.getFigure().getBounds().contains(

-			decoration.getBounds()));

-		assertEquals(NoteDecorator.DIAMETER, decoration.getSize().height);

-

-		// verify decoration is not hidden if owner figure is not visible

-		noteEP.getFigure().setVisible(false);

-		assertTrue(decoration.isVisible());

-

-	}

-

-}

diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DiagramEventBrokerServiceTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DiagramEventBrokerServiceTests.java
deleted file mode 100644
index e19f503..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/DiagramEventBrokerServiceTests.java
+++ /dev/null
@@ -1,86 +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.diagram.ui.services;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-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.LogicGateEditPart;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.logic.LogicTestFixture;
-
-
-public class DiagramEventBrokerServiceTests extends AbstractTestBase{
-
-    /** Create an instance. */
-    public DiagramEventBrokerServiceTests() {
-        super("Diagram Event Broker Service Test Suite");//$NON-NLS-1$
-    }
-
-    protected void setTestFixture() {
-        testFixture = new LogicTestFixture();        
-    }
-    
-    /**
-     * Defines the statechart diagram test suite.
-     * 
-     * @return the test suite.
-     */
-    public static Test suite() {
-        TestSuite s = new TestSuite(DiagramEventBrokerServiceTests.class);
-        return s;
-    }
-    
-    /** Return <code>(LogicTestFixture)getTestFixture();</code> */
-    protected LogicTestFixture getLogicTestFixture() {
-        return (LogicTestFixture)getTestFixture();
-    }
-    
-    public void test_DiagramEventBrokerProvider() {
-        Rectangle rect = new Rectangle(getDiagramEditPart().getFigure().getBounds());
-        getDiagramEditPart().getFigure().translateToAbsolute(rect);
-        IElementType typeLED = ElementTypeRegistry.getInstance().getType("logic.led"); //$NON-NLS-1$
-        IElementType typeCircuit = ElementTypeRegistry.getInstance().getType("logic.circuit"); //$NON-NLS-1$
-        IElementType typeAndGate = ElementTypeRegistry.getInstance().getType("logic.andgate"); //$NON-NLS-1$
-        IElementType typeXorGate = ElementTypeRegistry.getInstance().getType("logic.xorgate"); //$NON-NLS-1$
-        IElementType typeFlowContainer = ElementTypeRegistry.getInstance().getType("logic.flowcontainer"); //$NON-NLS-1$
-        IElementType typeOrGate = ElementTypeRegistry.getInstance().getType("logic.orgate"); //$NON-NLS-1$
-        
-        Point createPt = new Point(100, 100);
-        LEDEditPart ledEP = (LEDEditPart)getLogicTestFixture().createShapeUsingTool(typeLED, createPt, getDiagramEditPart());
-        createPt.getTranslated(ledEP.getFigure().getSize().getExpanded(100, 100));
-        
-        CircuitEditPart circuitEP = (CircuitEditPart)getLogicTestFixture().createShapeUsingTool(typeCircuit, createPt, getDiagramEditPart());
-        createPt.getTranslated(circuitEP.getFigure().getSize().getExpanded(100, 100));
-        
-        LogicGateEditPart andGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeAndGate, createPt, getDiagramEditPart());
-        createPt.getTranslated(andGateEP.getFigure().getSize().getExpanded(100, 100));
-        
-        LogicGateEditPart orGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeOrGate, createPt, getDiagramEditPart());
-        createPt.getTranslated(orGateEP.getFigure().getSize().getExpanded(100, 100));
-        
-        LogicGateEditPart xorGateEP = (LogicGateEditPart)getLogicTestFixture().createShapeUsingTool(typeXorGate, createPt, getDiagramEditPart());
-        createPt.getTranslated(xorGateEP.getFigure().getSize().getExpanded(100, 100));
-        
-        getLogicTestFixture().createShapeUsingTool(typeFlowContainer, createPt, getDiagramEditPart());
-        
-        assertTrue(LogicDiagramEventBroker.isCreated());
-        assertTrue(LogicDiagramEventBroker.isMethodInvoked());
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBroker.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBroker.java
deleted file mode 100644
index 6cf87b3..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBroker.java
+++ /dev/null
@@ -1,178 +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.diagram.ui.services;
-
-import java.lang.ref.WeakReference;
-import java.util.Set;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.transaction.ResourceSetChangeEvent;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;
-import org.eclipse.gmf.runtime.diagram.core.listener.NotificationPreCommitListener;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-
-public class LogicDiagramEventBroker
-    extends DiagramEventBroker {
-    
-    static private boolean isCreated = false;
-    static private boolean isMethodInvoked = false;
-    
-    public LogicDiagramEventBroker(){
-        isCreated = true;
-    }
-    
-    static public boolean isCreated() {
-        return isCreated;
-    }
-    
-    static public boolean isMethodInvoked() {
-        return isMethodInvoked;
-    }
-    
-    WeakReference editingDomainRef;
-    
-    public LogicDiagramEventBroker(TransactionalEditingDomain editingDomain) {
-        super();
-        isCreated = true;
-        editingDomainRef = new WeakReference(editingDomain);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker#resourceSetChanged(org.eclipse.emf.transaction.ResourceSetChangeEvent)
-     */
-    public void resourceSetChanged(ResourceSetChangeEvent event) {
-        isMethodInvoked = true;
-        if (shouldSynchronizeWithMainThread(event)) {
-            // force synchronization with the main thread
-            final ResourceSetChangeEvent eventToHandle = event;
-            TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editingDomainRef.get();
-            if (editingDomain != null) {
-                PlatformUI.getWorkbench().getDisplay().syncExec(editingDomain.createPrivilegedRunnable(new Runnable() { 
-                    public void run() {
-                        internal_resourceSetChanged(eventToHandle);
-                    }
-                }));
-                    
-                return;
-            }
-        }
-        
-        super.resourceSetChanged(event);
-    }
-    
-    private boolean shouldSynchronizeWithMainThread(ResourceSetChangeEvent event) {
-        if (Display.getCurrent() == null)
-            return true;
-        
-        return false;
-    }
-    
-    private void internal_resourceSetChanged(ResourceSetChangeEvent event) {
-        super.resourceSetChanged(event);
-    }
-
-    public void addNotificationListener(EObject target, EStructuralFeature key, NotificationListener listener) {
-        isMethodInvoked = true;
-        super.addNotificationListener(target, key, listener);
-    }
-
-    public void addNotificationListener(EObject target, EStructuralFeature key, NotificationPreCommitListener listener) {
-        isMethodInvoked = true;
-        super.addNotificationListener(target, key, listener);
-    }
-
-    public void addNotificationListener(EObject target, NotificationListener listener) {
-        isMethodInvoked = true;
-        super.addNotificationListener(target, listener);
-    }
-
-    public void addNotificationListener(EObject target, NotificationPreCommitListener listener) {
-        isMethodInvoked = true;
-        super.addNotificationListener(target, listener);
-    }
-
-    protected void fireNotification(Notification event) {
-        isMethodInvoked = true;
-        super.fireNotification(event);
-    }
-
-    protected Set getInterestedNotificationListeners(Notification event, NotifierToKeyToListenersSetMap listeners) {
-        isMethodInvoked = true;
-        return super.getInterestedNotificationListeners(event, listeners);
-    }
-
-    protected NotifierToKeyToListenersSetMap getPostCommitListenersMap() {
-        isMethodInvoked = true;
-        return super.getPostCommitListenersMap();
-    }
-
-    protected NotifierToKeyToListenersSetMap getPreCommitListenersMap() {
-        isMethodInvoked = true;
-        return super.getPreCommitListenersMap();
-    }
-
-    protected void handleNotificationOnDeletedElement(ResourceSetChangeEvent event) {
-        isMethodInvoked = true;
-        super.handleNotificationOnDeletedElement(event);
-    }
-
-    public boolean isAggregatePrecommitListener() {
-        isMethodInvoked = true;
-        return super.isAggregatePrecommitListener();
-    }
-
-    protected boolean isDeleted(Set deletedObjects, EObject notifier) {
-        isMethodInvoked = true;
-        return super.isDeleted(deletedObjects, notifier);
-    }
-
-    public void removeNotificationListener(EObject target, NotificationListener listener) {
-        isMethodInvoked = true;
-        super.removeNotificationListener(target, listener);
-    }
-
-    public void removeNotificationListener(EObject target, NotificationPreCommitListener listener) {
-        isMethodInvoked = true;
-        super.removeNotificationListener(target, listener);
-    }
-
-    public void removeNotificationListener(EObject target, Object key, NotificationListener listener) {
-        isMethodInvoked = true;
-        super.removeNotificationListener(target, key, listener);
-    }
-
-    public void removeNotificationListener(EObject target, Object key, NotificationPreCommitListener listener) {
-        isMethodInvoked = true;
-        super.removeNotificationListener(target, key, listener);
-    }
-
-   
-    protected boolean shouldIgnoreNotification(Notification notification) {
-        isMethodInvoked = true;
-        return super.shouldIgnoreNotification(notification);
-    }
-
-    public Command transactionAboutToCommit(ResourceSetChangeEvent event) {
-        isMethodInvoked = true;
-        return super.transactionAboutToCommit(event);
-    }
-    
-    
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBrokerProvider.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBrokerProvider.java
deleted file mode 100644
index dc82b2d..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/LogicDiagramEventBrokerProvider.java
+++ /dev/null
@@ -1,29 +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.diagram.ui.services;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractDiagramEventBrokerProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.eventbroker.CreateDiagramEventBrokerOperation;
-
-
-public class LogicDiagramEventBrokerProvider extends AbstractDiagramEventBrokerProvider {
-
-    public DiagramEventBroker createDiagramEventBroker(TransactionalEditingDomain editingDomain) {
-        return new LogicDiagramEventBroker(editingDomain);
-    }
-
-    public boolean provides(CreateDiagramEventBrokerOperation operation) {
-        return operation.getEditingDomain().getID().equals("org.eclipse.gmf.examples.runtime.diagram.logicEditingDomain"); //$NON-NLS-1$
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/PaletteServiceTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/PaletteServiceTests.java
deleted file mode 100644
index cfb6300..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/services/PaletteServiceTests.java
+++ /dev/null
@@ -1,712 +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.diagram.ui.services;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.PaletteRoot;
-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.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteDrawer;
-import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack;
-import org.eclipse.gmf.tests.runtime.common.core.internal.util.TestingConfigurationElement;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-
-/**
- * Tests for the Palette Service.
- * 
- * @author cmahoney
- * 
- */
-public class PaletteServiceTests
-	extends TestCase {
-
-	static class MyPaletteService
-		extends PaletteService {
-
-		/**
-		 * Override to allow passing in of the provider, instead of initializing
-		 * via the <code>ConfigurationElement</code>.
-		 */
-		static class ProviderDescriptor
-			extends PaletteService.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 MyPaletteService() {
-			super();
-		}
-
-		public void addPaletteProvider(ProviderPriority priority,
-				ProviderDescriptor provider) {
-
-			super.addProvider(priority, provider);
-		}
-
-		public void removePaletteProvider(Service.ProviderDescriptor provider) {
-
-			super.removeProvider(provider);
-		}
-	}
-
-	/**
-	 * A test palette provider.
-	 */
-	public static class ProviderA
-		extends DefaultPaletteProvider {
-
-		public static String DRAWER_A = "DRAWER_A"; //$NON-NLS-1$
-
-		public static String TOOL_A = "TOOL_A"; //$NON-NLS-1$
-
-		public static String STACK_A = "STACK_A"; //$NON-NLS-1$
-
-		public void contributeToPalette(IEditorPart editor, Object content,
-				PaletteRoot root, Map predefinedEntries) {
-
-			PaletteDrawer drawerA = new PaletteDrawer(DRAWER_A, DRAWER_A);
-			drawerA.add(new PaletteToolEntry(TOOL_A, TOOL_A, null));
-			PaletteStack stackA = new PaletteStack(STACK_A, STACK_A, STACK_A,
-				null);
-			stackA.add(new PaletteToolEntry(TOOL_A, TOOL_A, null));
-			drawerA.add(stackA);
-			root.add(drawerA);
-		}
-	}
-
-	/**
-	 * A test palette provider.
-	 */
-	public static class ProviderB
-		extends DefaultPaletteProvider {
-
-		public static String DRAWER_B = "DRAWER_B"; //$NON-NLS-1$
-
-		public static String TOOL_B = "TOOL_B"; //$NON-NLS-1$
-
-		public void contributeToPalette(IEditorPart editor, Object content,
-				PaletteRoot root, Map predefinedEntries) {
-
-			PaletteDrawer drawerB = new PaletteDrawer(DRAWER_B, DRAWER_B);
-			drawerB.add(new PaletteToolEntry(TOOL_B, TOOL_B, null));
-			root.add(drawerB);
-
-			PaletteDrawer drawerA = (PaletteDrawer) findChildPaletteEntry(root,
-				ProviderA.DRAWER_A);
-			drawerA.add(new PaletteToolEntry(TOOL_B, TOOL_B, null));
-			PaletteStack stackA = (PaletteStack) findChildPaletteEntry(drawerA,
-				ProviderA.STACK_A);
-			stackA.add(new PaletteToolEntry(TOOL_B, TOOL_B, null));
-		}
-	}
-
-	/**
-	 * A test palette provider.
-	 */
-	public static class ProviderC
-		extends DefaultPaletteProvider {
-
-		public static String DRAWER_C = "DRAWER_C"; //$NON-NLS-1$
-
-		public static String TOOL_C = "TOOL_C"; //$NON-NLS-1$
-
-		public void contributeToPalette(IEditorPart editor, Object content,
-				PaletteRoot root, Map predefinedEntries) {
-
-			PaletteDrawer drawerC = new PaletteDrawer(DRAWER_C, DRAWER_C);
-			drawerC.add(new PaletteToolEntry(TOOL_C, TOOL_C, null));
-			root.add(drawerC);
-
-			PaletteDrawer drawerA = (PaletteDrawer) findChildPaletteEntry(root,
-				ProviderA.DRAWER_A);
-			drawerA.add(new PaletteToolEntry(TOOL_C, TOOL_C, null));
-			PaletteStack stackA = (PaletteStack) findChildPaletteEntry(drawerA,
-				ProviderA.STACK_A);
-			stackA.add(new PaletteToolEntry(TOOL_C, TOOL_C, null));
-		}
-	}
-
-	/**
-	 * A test palette provider.
-	 */
-	public static class ProviderD
-		extends DefaultPaletteProvider {
-
-		public static String DRAWER_D = "DRAWER_D"; //$NON-NLS-1$
-
-		public static String TOOL_D = "TOOL_D"; //$NON-NLS-1$
-
-		public void contributeToPalette(IEditorPart editor, Object content,
-				PaletteRoot root, Map predefinedEntries) {
-
-			PaletteDrawer drawerD = new PaletteDrawer(DRAWER_D, DRAWER_D);
-			drawerD.add(new PaletteToolEntry(TOOL_D, TOOL_D, null));
-			root.add(drawerD);
-
-			PaletteDrawer drawerA = (PaletteDrawer) findChildPaletteEntry(root,
-				ProviderA.DRAWER_A);
-			drawerA.add(new PaletteToolEntry(TOOL_D, TOOL_D, null));
-			PaletteDrawer drawerB = (PaletteDrawer) findChildPaletteEntry(root,
-				ProviderB.DRAWER_B);
-			if (drawerB != null) {
-				drawerB.add(new PaletteToolEntry(TOOL_D, TOOL_D, null));
-			}
-			PaletteStack stackA = (PaletteStack) findChildPaletteEntry(drawerA,
-				ProviderA.STACK_A);
-			stackA.add(new PaletteToolEntry(TOOL_D, TOOL_D, null));
-		}
-	}
-    
-    private static boolean shouldStaticMethodDrawerBeShown = false;
-    
-    /**
-     * Called by the extension point in the XML and used by the {@link #testStaticMethodInPaletteExtension()}.
-     * @return
-     */
-    public static boolean shouldStaticMethodDrawerBeShown() {
-        return shouldStaticMethodDrawerBeShown;
-    }
-    
-    /**
-     * We need a special editor type so that the XML palette providers can
-     * contribute to this editor and only.
-     * 
-     * @author cmahoney
-     */
-    public class PaletteServiceTestEditor
-        extends DiagramDocumentEditor {
-
-        final TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory
-            .getInstance().createEditingDomain();
-
-        public PaletteServiceTestEditor() {
-            super(true);
-        }
-
-        public TransactionalEditingDomain getEditingDomain() {
-            return editingDomain;
-        }
-    };
-    
-    public PaletteServiceTests(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(PaletteServiceTests.class);
-	}
-
-	/**
-	 * Finds a palette entry starting from the given container and using the
-	 * given path
-	 * 
-	 * @param paletteRoot
-	 * @param path
-	 * @return the entry or <code>null</code> if not found
-	 */
-	private static PaletteEntry findChildPaletteEntry(
-			PaletteContainer container, String childId) {
-
-		Iterator entries = container.getChildren().iterator();
-		while (entries.hasNext()) {
-			PaletteEntry entry = (PaletteEntry) entries.next();
-			if (entry.getId().equals(childId)) {
-				return entry;
-			}
-		}
-		return null;
-	}
-
-	MyPaletteService paletteService;
-
-	protected void setUp()
-		throws Exception {
-		super.setUp();
-		setPaletteService(new MyPaletteService());
-	}
-
-	public MyPaletteService getPaletteService() {
-		return paletteService;
-	}
-
-	public void setPaletteService(MyPaletteService service) {
-		paletteService = 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 providerA
-		MyPaletteService.ProviderDescriptor descriptorA = new MyPaletteService.ProviderDescriptor(
-			new ProviderA());
-		getPaletteService().addPaletteProvider(ProviderPriority.LOW,
-			descriptorA);
-
-		// set up providerB
-		MyPaletteService.ProviderDescriptor descriptorB = new MyPaletteService.ProviderDescriptor(
-			new ProviderB());
-		getPaletteService().addPaletteProvider(ProviderPriority.MEDIUM,
-			descriptorB);
-
-		// set up providerC
-		MyPaletteService.ProviderDescriptor descriptorC = new MyPaletteService.ProviderDescriptor(
-			new ProviderC());
-		getPaletteService().addPaletteProvider(ProviderPriority.HIGH,
-			descriptorC);
-
-		// set up providerD
-		MyPaletteService.ProviderDescriptor descriptorD = new MyPaletteService.ProviderDescriptor(
-			new ProviderD());
-		getPaletteService().addPaletteProvider(ProviderPriority.HIGHEST,
-			descriptorD);
-		
-        PaletteServiceTestEditor editor = new PaletteServiceTestEditor();
-
-		PaletteRoot paletteRoot = getPaletteService().createPalette(editor,
-			"DUMMY CONTENT"); //$NON-NLS-1$
-
-		PaletteDrawer drawerA = (PaletteDrawer) paletteRoot.getChildren()
-			.get(1);
-		PaletteEntry toolA = (PaletteEntry) drawerA.getChildren().get(0);
-		PaletteStack stackA = (PaletteStack) drawerA.getChildren().get(1);
-		PaletteEntry stackAToolA = (PaletteEntry) stackA.getChildren().get(0);
-		PaletteEntry stackAToolC = (PaletteEntry) stackA.getChildren().get(2);
-
-		validatePaletteEntries(paletteRoot, true, true);
-
-		stackA.setActiveEntry(stackAToolC);
-
-		descriptorB.setActivitiesEnabled(false);
-		getPaletteService().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-		validatePaletteEntries(paletteRoot, false, true);
-
-		descriptorB.setActivitiesEnabled(true);
-		descriptorD.setActivitiesEnabled(false);
-		getPaletteService().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-		validatePaletteEntries(paletteRoot, true, false);
-
-		descriptorB.setActivitiesEnabled(false);
-		descriptorD.setActivitiesEnabled(true);
-		getPaletteService().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-		validatePaletteEntries(paletteRoot, false, true);
-
-		descriptorD.setActivitiesEnabled(false);
-		getPaletteService().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-		validatePaletteEntries(paletteRoot, false, false);
-
-		// Verify that the instances of the entries did not change.
-		assertEquals(drawerA, paletteRoot.getChildren().get(1));
-		assertEquals(toolA, drawerA.getChildren().get(0));
-		assertEquals(stackA, drawerA.getChildren().get(1));
-		assertEquals(stackAToolA, stackA.getChildren().get(0));
-		assertEquals(stackAToolC, stackA.getActiveEntry());
-
-	}
-
-    /**
-     * 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 testCapabilityFilteringOfSpecificEntries()
-        throws Exception {
-
-        toggleActivity("MyPaletteActivityProviderID", true); //$NON-NLS-1$
-        toggleActivity("MyPaletteActivityEntriesID", true); //$NON-NLS-1$          
-
-        PaletteServiceTestEditor editor = new PaletteServiceTestEditor();
-        PaletteRoot paletteRoot = PaletteService.getInstance().createPalette(
-            editor, "DUMMY CONTENT"); //$NON-NLS-1$
-
-        validateSpecificEntries(paletteRoot, true, true);        
-
-        toggleActivity("MyPaletteActivityEntriesID", false); //$NON-NLS-1$        
-        PaletteService.getInstance().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        validateSpecificEntries(paletteRoot, true, false);
-
-        toggleActivity("MyPaletteActivityProviderID", false); //$NON-NLS-1$
-        PaletteService.getInstance().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        validateSpecificEntries(paletteRoot, false, false);
-
-        toggleActivity("MyPaletteActivityEntriesID", true); //$NON-NLS-1$     
-        PaletteService.getInstance().updatePalette(paletteRoot, editor, "DUMMY CONTENT"); //$NON-NLS-1$
-
-        validateSpecificEntries(paletteRoot, false, true);
-
-    }
-    
-    private void validateSpecificEntries(PaletteRoot paletteRoot,
-            boolean activityProviderIDEnabled, boolean activityEntriesIDEnabled) {
-
-        PaletteDrawer nonActivityDrawer = null;
-        PaletteDrawer activityEnabledDrawer = null;
-
-        for (Iterator iter = paletteRoot.getChildren().iterator(); iter
-            .hasNext();) {
-            Object paletteEntry = iter.next();
-            if (paletteEntry instanceof PaletteDrawer) {
-                PaletteDrawer drawer = (PaletteDrawer) paletteEntry;
-                if (drawer.getId().equals("nonActivityDrawerID")) { //$NON-NLS-1$
-                    nonActivityDrawer = drawer;
-                } else if (drawer.getId().equals("activityEnabledDrawerID")) { //$NON-NLS-1$
-                    activityEnabledDrawer = drawer;
-                }
-            }
-        }
-
-        if (!activityProviderIDEnabled) {
-            assertNull(nonActivityDrawer);
-            assertNull(activityEnabledDrawer);
-        } else {
-            assertNotNull(nonActivityDrawer);
-
-            PaletteEntry nonActivityTool = findChildPaletteEntry(
-                nonActivityDrawer, "nonActivityToolID"); //$NON-NLS-1$
-            PaletteContainer nonActivityStack = (PaletteContainer) findChildPaletteEntry(
-                nonActivityDrawer, "nonActivityStackID"); //$NON-NLS-1$
-            PaletteEntry nonActivitySeparator = findChildPaletteEntry(
-                nonActivityDrawer, "nonActivitySeparatorID"); //$NON-NLS-1$
-            
-            PaletteEntry activityEnabledTool = findChildPaletteEntry(
-                nonActivityStack, "activityEnabledToolID"); //$NON-NLS-1$
-            PaletteContainer activityEnabledStack = (PaletteContainer) findChildPaletteEntry(
-                nonActivityDrawer, "activityEnabledStackID"); //$NON-NLS-1$
-            PaletteEntry activityEnabledSeparator = findChildPaletteEntry(
-                nonActivityDrawer, "activityEnabledSeparatorID"); //$NON-NLS-1$
-
-            if (activityEntriesIDEnabled) {
-                assertNotNull(activityEnabledDrawer);
-                assertNotNull(activityEnabledTool);
-                assertNotNull(activityEnabledStack);
-                assertNotNull(activityEnabledSeparator);
-                assertNotNull(nonActivityTool);
-                assertNotNull(nonActivityStack);
-                assertNotNull(nonActivitySeparator);
-            } else {
-                assertNull(activityEnabledDrawer);
-                assertNull(activityEnabledTool);
-                assertNull(activityEnabledStack);
-                assertNull(activityEnabledSeparator);
-            }
-        }
-    }
-    
-    /**
-	 * Validates many of the palette entries.
-	 * 
-	 * @param providerBEnabled
-	 *            true if provider B is enabled
-	 * @param providerDEnabled
-	 *            true if provider D is enabled
-	 */
-	private void validatePaletteEntries(PaletteRoot paletteRoot,
-			boolean providerBEnabled, boolean providerDEnabled) {
-
-		PaletteDrawer drawerA = null;
-		PaletteDrawer drawerB = null;
-		PaletteStack stackA;
-
-		// verify drawers
-		int index = 1; // skip default drawer
-		drawerA = (PaletteDrawer) paletteRoot.getChildren().get(index++);
-		assertEquals(ProviderA.DRAWER_A, drawerA.getId());
-		if (providerBEnabled) {
-			drawerB = (PaletteDrawer) paletteRoot.getChildren().get(index++);
-			assertEquals(ProviderB.DRAWER_B, drawerB.getId());
-		}
-		assertEquals(ProviderC.DRAWER_C, (((PaletteDrawer) paletteRoot
-			.getChildren().get(index++)).getId()));
-		if (providerDEnabled) {
-			assertEquals(ProviderD.DRAWER_D, (((PaletteDrawer) paletteRoot
-				.getChildren().get(index++)).getId()));
-		}
-
-		// verify drawer A tools
-		index = 0;
-		assertEquals(ProviderA.TOOL_A, (((PaletteEntry) drawerA.getChildren()
-			.get(index++)).getId()));
-		stackA = (PaletteStack) drawerA.getChildren().get(index++);
-		assertEquals(ProviderA.STACK_A, stackA.getId());
-		if (providerBEnabled) {
-			assertEquals(ProviderB.TOOL_B, (((PaletteEntry) drawerA
-				.getChildren().get(index++)).getId()));
-		}
-		assertEquals(ProviderC.TOOL_C, (((PaletteEntry) drawerA.getChildren()
-			.get(index++)).getId()));
-		if (providerDEnabled) {
-			assertEquals(ProviderD.TOOL_D, (((PaletteEntry) drawerA
-				.getChildren().get(index++)).getId()));
-		}
-
-		// verify stack A tools
-		index = 0;
-		assertEquals(ProviderA.TOOL_A, (((PaletteEntry) stackA.getChildren()
-			.get(index++)).getId()));
-		if (providerBEnabled) {
-			assertEquals(ProviderB.TOOL_B, (((PaletteEntry) stackA
-				.getChildren().get(index++)).getId()));
-		}
-		assertEquals(ProviderC.TOOL_C, (((PaletteEntry) stackA.getChildren()
-			.get(index++)).getId()));
-		if (providerDEnabled) {
-			assertEquals(ProviderD.TOOL_D, (((PaletteEntry) stackA
-				.getChildren().get(index++)).getId()));
-		}
-
-		// verify drawer B tools
-		if (providerBEnabled) {
-			index = 0;
-			assertEquals(ProviderB.TOOL_B, (((PaletteEntry) drawerB
-				.getChildren().get(index++)).getId()));
-			if (providerDEnabled) {
-				assertEquals(ProviderD.TOOL_D, (((PaletteEntry) drawerB
-					.getChildren().get(index++)).getId()));
-			}
-
-		}
-	}
-    
-    
-    
-    /**
-     * Tests the abilities of the palette relating to predefining palette
-     * entries in one extension and contributing the palette entries in another
-     * extension. This test uses the palette extensions defined in the XML for
-     * this plugin.
-     * 
-     * @throws Exception
-     */
-    public void testPredefineAndContributeEntries()
-        throws Exception {
-
-        PaletteServiceTestEditor editor = new PaletteServiceTestEditor();
-
-        PaletteRoot paletteRoot = PaletteService.getInstance().createPalette(
-            editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        boolean ovalDrawerFound = false;
-        boolean ovalAndCylinderDrawerFound = false;
-        boolean ovalAndCylinderDrawerFoundDefinedOnly = false;
-        boolean rectangleDrawerFound = false;
-        
-        for (Iterator iter = paletteRoot.getChildren().iterator(); iter.hasNext();) {
-            Object paletteEntry = iter.next();
-            if (paletteEntry instanceof PaletteDrawer) {
-                PaletteDrawer drawer = (PaletteDrawer) paletteEntry;
-                if (drawer.getId().equals("ovalDrawer")) { //$NON-NLS-1$
-
-                    ovalDrawerFound = true;
-
-                    assertEquals(
-                        "oval", ((PaletteEntry) drawer.getChildren().get(0)).getId()); //$NON-NLS-1$
-                    
-                    // verify that the circle tool has been removed.
-                    assertEquals(1, drawer.getChildren().size());
-                    
-                } else if (drawer.getId().equals("ovalAndCylinderDrawer")) { //$NON-NLS-1$
-                    
-                    ovalAndCylinderDrawerFound = true;
-                    
-                    assertEquals(
-                        "oval", ((PaletteEntry) drawer.getChildren().get(0)).getId()); //$NON-NLS-1$
-                    assertEquals(
-                        "cylinder", ((PaletteEntry) drawer.getChildren().get(1)).getId()); //$NON-NLS-1$
-                     assertTrue(drawer.isInitiallyOpen());      
-                     
-                } else if (drawer.getId().equals("ovalAndCylinderDrawerDefinedOnly")) { //$NON-NLS-1$
-                    
-                    ovalAndCylinderDrawerFoundDefinedOnly = true;
-                    
-                    assertEquals(
-                        "oval", ((PaletteEntry) drawer.getChildren().get(0)).getId()); //$NON-NLS-1$
-                    assertEquals(
-                        "cylinder", ((PaletteEntry) drawer.getChildren().get(1)).getId()); //$NON-NLS-1$
-                     assertTrue(drawer.isInitiallyOpen());      
-                     
-                } else if (drawer.getId().equals("rectangleDrawer")) { //$NON-NLS-1$
-
-                    rectangleDrawerFound = true;
-
-                    assertEquals(
-                        "square", ((PaletteEntry) drawer.getChildren().get(0)).getId()); //$NON-NLS-1$
-                } 
-            }           
-        }
-        
-        assertTrue(ovalDrawerFound);
-        assertTrue(ovalAndCylinderDrawerFound);
-        assertTrue(ovalAndCylinderDrawerFoundDefinedOnly);
-        assertTrue(rectangleDrawerFound);
-
-     }
-  
-    /**
-     * Tests the ability of a client to use a static method to assist in
-     * identifying the editor in the extension point XML.This test uses the
-     * palette extensions defined in the XML for this plugin.
-     * 
-     * @throws Exception
-     */
-    public void testStaticMethodInPaletteExtension()
-        throws Exception {
-
-        shouldStaticMethodDrawerBeShown = false;
-
-        PaletteServiceTestEditor editor = new PaletteServiceTestEditor();
-        PaletteRoot paletteRoot = PaletteService.getInstance().createPalette(
-            editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        boolean staticMethodDrawerFound = false;        
-        for (Iterator iter = paletteRoot.getChildren().iterator(); iter.hasNext();) {
-            Object paletteEntry = iter.next();
-            if (paletteEntry instanceof PaletteDrawer) {
-                PaletteDrawer drawer = (PaletteDrawer) paletteEntry;
-                if (drawer.getId().equals("staticMethodDrawer")) { //$NON-NLS-1$
-                    staticMethodDrawerFound = true;
-                } 
-            }           
-        }        
-        assertFalse(staticMethodDrawerFound);
-        
-        shouldStaticMethodDrawerBeShown = true;
-
-        editor = new PaletteServiceTestEditor();
-        paletteRoot = PaletteService.getInstance().createPalette(
-            editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        staticMethodDrawerFound = false;        
-        for (Iterator iter = paletteRoot.getChildren().iterator(); iter.hasNext();) {
-            Object paletteEntry = iter.next();
-            if (paletteEntry instanceof PaletteDrawer) {
-                PaletteDrawer drawer = (PaletteDrawer) paletteEntry;
-                if (drawer.getId().equals("staticMethodDrawer")) { //$NON-NLS-1$
-                    staticMethodDrawerFound = true;
-                } 
-            }           
-        }        
-        assertTrue(staticMethodDrawerFound);
-
-        shouldStaticMethodDrawerBeShown = false;
-
-        editor = new PaletteServiceTestEditor();
-        paletteRoot = PaletteService.getInstance().createPalette(
-            editor, "DUMMY CONTENT"); //$NON-NLS-1$
-        
-        staticMethodDrawerFound = false;        
-        for (Iterator iter = paletteRoot.getChildren().iterator(); iter.hasNext();) {
-            Object paletteEntry = iter.next();
-            if (paletteEntry instanceof PaletteDrawer) {
-                PaletteDrawer drawer = (PaletteDrawer) paletteEntry;
-                if (drawer.getId().equals("staticMethodDrawer")) { //$NON-NLS-1$
-                    staticMethodDrawerFound = true;
-                } 
-            }           
-        }        
-        assertFalse(staticMethodDrawerFound);
-     }   
-
-    /**
-     * Toggles the enablement of the activity id
-     * which is defined in the plugin.xml.
-     * 
-     * @param activityID
-     * @param enabled
-     */
-    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);
-        }
-    }
-    
-//	 /**
-//         * Prints out the palette entries to the console. Used for debugging.
-//         * 
-//         * @param paletteContainer
-//         */
-//    private void printPalette(PaletteContainer paletteContainer, String prefix) {
-//        for (Iterator iter = paletteContainer.getChildren().iterator(); iter
-//            .hasNext();) {
-//            PaletteEntry entry = (PaletteEntry) iter.next();
-//            System.out.println(prefix + entry.getLabel());
-//            if (entry instanceof PaletteContainer) {
-//                printPalette((PaletteContainer) entry, prefix + " "); //$NON-NLS-1$
-//            }
-//        }
-//    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/ConnectionToolTests.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/ConnectionToolTests.java
deleted file mode 100644
index f9c3870..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/ConnectionToolTests.java
+++ /dev/null
@@ -1,101 +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.diagram.ui.tools;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestFixture;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-
-/**
- * Tests for Connection Tools.
- * 
- * @author cmahoney
- */
-public class ConnectionToolTests
-	extends AbstractTestBase {
-
-	public static Test suite() {
-		TestSuite s = new TestSuite(ConnectionToolTests.class);
-		return s;
-	}
-
-	public ConnectionToolTests(String name) {
-		super(name);
-	}
-
-	protected void setTestFixture() {
-		testFixture = new PresentationTestFixture();
-	}
-
-	protected PresentationTestFixture getFixture() {
-		return (PresentationTestFixture) testFixture;
-	}
-
-	/**
-	 * Test selection of notes where there is currently no focus edit part.
-	 */
-	public void test_doubleClickUnspecifiedTypeConnectionTool()
-		throws Exception {
-
-		getFixture().openDiagram();
-
-		List eps = new ArrayList(2);
-		eps.add(getFixture().createNote());
-		eps.add(getFixture().createNote());
-
-		assertEquals("Notes not created properly.", //$NON-NLS-1$
-			2, getDiagramEditPart().getPrimaryEditParts().size());
-		assertEquals("There shouldn't be any connections yet.", //$NON-NLS-1$
-			0, getDiagramEditPart().getConnections().size());
-
-		getDiagramEditPart().getViewer().setSelection(
-			new StructuredSelection(eps));
-
-		UnspecifiedTypeConnectionTool tool = new UnspecifiedTypeConnectionTool(
-			Collections.singletonList(DiagramNotationType.NOTE_ATTACHMENT));
-		tool.setEditDomain((EditDomain) getDiagramWorkbenchPart()
-			.getDiagramEditDomain());
-		tool.activate();
-		tool.mouseDoubleClick(createMouseEvent(0, 0), getDiagramEditPart()
-			.getViewer());
-		tool.deactivate();
-
-		assertEquals("Connection wasn't created.", //$NON-NLS-1$
-			1, getDiagramEditPart().getConnections().size());
-	}
-
-	MouseEvent createMouseEvent(int x, int y) {
-		Event e = new Event();
-
-		e.widget = getDiagramEditPart().getViewer().getControl();
-		;
-		e.display = e.widget.getDisplay();
-		e.button = 1; // left button
-		e.x = x;
-		e.y = y;
-
-		return new MouseEvent(e);
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/RubberBandSelectionToolTest.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/RubberBandSelectionToolTest.java
deleted file mode 100644
index 4ca1827..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/tools/RubberBandSelectionToolTest.java
+++ /dev/null
@@ -1,300 +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.diagram.ui.tools;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-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.draw2d.geometry.Point;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.CreateRequest;
-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.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandSelectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorInput;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.framework.DiagramTestCase;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.DiagramTestEditor;
-import org.eclipse.gmf.tests.runtime.diagram.ui.util.PresentationTestsViewProvider;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * Unit tests for the {@link RubberBandSelectionTool}.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class RubberBandSelectionToolTest
-	extends DiagramTestCase {
-
-	private Diagram diagramView;
-	
-	private RubberbandSelectionTool tool;
-	
-	private NoteEditPart note1;
-	private NoteEditPart note2;
-	
-	public RubberBandSelectionToolTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Test selection of notes where there is currently no focus edit part.
-	 */
-	public void test_basicSelect() {
-		AbstractTestBase.println("** Running test_basicSelect"); //$NON-NLS-1$
-		
-		AbstractTestBase.println("Activating rubber band tool"); //$NON-NLS-1$
-		tool.activate();
-		
-		AbstractTestBase.println("Drawing rubber band around the shapes"); //$NON-NLS-1$
-		tool.mouseDown(createMouseEvent(0, 0), getViewer());
-		tool.mouseDrag(createMouseEvent(210, 210), getViewer());
-		tool.mouseUp(createMouseEvent(210, 210), getViewer());
-		
-		AbstractTestBase.println("Deactivating rubber band tool"); //$NON-NLS-1$
-		tool.deactivate();
-		
-		assertEquals("Wrong number of edit parts selected.", //$NON-NLS-1$
-			2, getViewer().getSelectedEditParts().size());
-		assertTrue("note1 not selected. ", //$NON-NLS-1$
-			getViewer().getSelectedEditParts().contains(note1));
-		assertTrue("note2 not selected. ", //$NON-NLS-1$
-			getViewer().getSelectedEditParts().contains(note2));
-	}
-	
-	/**
-	 * Test selection of notes where one of them currently has the focus.  Its
-	 * compatments, though selectable by the mouse only because this note has
-	 * the focus, should not be selected by the rubber band.
-	 */
-	public void test_selectWithInitialFocus() {
-		AbstractTestBase.println("** Running test_selectWithInitialFocus"); //$NON-NLS-1$
-		
-		AbstractTestBase.println("Activating rubber band tool"); //$NON-NLS-1$
-		tool.activate();
-		
-		AbstractTestBase.println("Drawing rubber band around the shapes"); //$NON-NLS-1$
-		tool.mouseDown(createMouseEvent(0, 0), getViewer());
-		tool.mouseDrag(createMouseEvent(210, 210), getViewer());
-		tool.mouseUp(createMouseEvent(210, 210), getViewer());
-		
-		AbstractTestBase.println("Deactivating rubber band tool"); //$NON-NLS-1$
-		tool.deactivate();
-		
-		// we must not have more than two edit parts selected.  We would have
-		//    more than two if we didn't suppress note1's focus
-		assertEquals("Wrong number of edit parts selected.", //$NON-NLS-1$
-			2, getViewer().getSelectedEditParts().size());
-		assertTrue("note1 not selected. ", //$NON-NLS-1$
-			getViewer().getSelectedEditParts().contains(note1));
-		assertTrue("note2 not selected. ", //$NON-NLS-1$
-			getViewer().getSelectedEditParts().contains(note2));
-	}
-	
-	//
-	// Fixture stuff
-	//
-	
-	MouseEvent createMouseEvent(int x, int y) {
-		Event e = new Event();
-		
-		e.widget = getViewer().getControl();;
-		e.display = e.widget.getDisplay();
-		e.button = 1;  // left button
-		e.x = x;
-		e.y = y;
-		
-		return new MouseEvent(e);
-	}
-	
-	EditPartViewer getViewer() {
-		return getDiagramEditPart().getViewer();
-	}
-	
-	/* (non-Javadoc)
-	 * Redefines/Implements/Extends the inherited method.
-	 */
-	protected void setUp()
-		throws Exception {
-		
-		super.setUp();
-		
-		tool = new RubberbandSelectionTool();
-		tool.setEditDomain((EditDomain) getDiagramWorkbenchPart().getDiagramEditDomain());
-	}
-	
-	
-	/* (non-Javadoc)
-	 * Redefines/Implements/Extends the inherited method.
-	 */
-	protected void tearDown()
-		throws Exception {
-		
-		super.tearDown();
-		
-		tool = null;
-		diagramView = null;
-		note1 = null;
-		note2 = null;
-	}
-	
-	/* (non-Javadoc)
-	 * Redefines/Implements/Extends the inherited method.
-	 */
-	protected void createShapesAndConnectors()
-		throws Exception {
-
-		// Add two notes.
-		AbstractTestBase.println("Creating note shapes"); //$NON-NLS-1$
-		note1 = (NoteEditPart) createShapeUsingTool(DiagramNotationType.NOTE,
-				new Point(10, 10));
-		note2 = (NoteEditPart) createShapeUsingTool(DiagramNotationType.NOTE,
-				new Point(100, 100));
-
-		// ensure that the new shapes and connectors are properly laid out
-		AbstractTestBase.println("Update figure layout"); //$NON-NLS-1$
-		flushEventQueue();
-	}
-	
-	/**
-	 * Creates a new shape using the request created by the
-	 * <code>CreationTool</code>.
-	 * 
-	 * @param elementType
-	 *            the type of the shape/element to be created
-	 * @param location
-	 *            the location for the new shape
-	 * @return the new shape's editpart
-	 */
-	public ShapeEditPart createShapeUsingTool(IElementType elementType,
-			Point location) {
-
-		class CreationTool
-			extends org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool {
-
-			public CreationTool(IElementType theElementType) {
-				super(theElementType);
-			}
-
-			/** Make public. */
-			public Request createTargetRequest() {
-				return super.createTargetRequest();
-			}
-
-			protected PreferencesHint getPreferencesHint() {
-				return PreferencesHint.USE_DEFAULTS;
-			}
-		}
-
-		CreationTool ctool = new CreationTool(elementType);
-		CreateRequest request = (CreateRequest) ctool.createTargetRequest();
-		request.setLocation(location);
-		Command cmd = getDiagramEditPart().getCommand(request);
-
-		int previousNumPrimaryEPs = getDiagramEditPart().getPrimaryEditParts()
-			.size();
-		getDiagramWorkbenchPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);
-		assertEquals(previousNumPrimaryEPs + 1, getDiagramEditPart()
-			.getPrimaryEditParts().size());
-
-		Object newView = ((IAdaptable) ((List) request.getNewObject()).get(0))
-			.getAdapter(View.class);
-		assertNotNull(newView);
-
-		ShapeEditPart newShape = (ShapeEditPart) getDiagramEditPart()
-			.getViewer().getEditPartRegistry().get(newView);
-		assertNotNull(newShape);
-
-		return newShape;
-	}
-	
-	protected IFile createDiagram()
-		throws Exception {
-		
-		AbstractTestBase.println("Creating diagram"); //$NON-NLS-1$
-		
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			getEditingDomain(), "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				diagramView = ViewService.createDiagram(
-					PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND, PreferencesHint.USE_DEFAULTS);
-				setDiagram(diagramView);
-			
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-//		MEditingDomain.INSTANCE.runAsUnchecked(new MRunnable() {
-//			public Object run() {
-//				diagramView = ViewService.createDiagram(
-//					PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND, PreferencesHint.USE_DEFAULTS);
-//				setDiagram(diagramView);
-//                return null;
-//			}});
-		
-		return null;
-	}
-
-	protected void openDiagram() throws Exception {
-
-		AbstractTestBase.println("Opening diagram"); //$NON-NLS-1$
-		IWorkbenchPage page =
-			PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage();
-
-		setDiagramWorkbenchPart((IDiagramWorkbenchPart)IDE.openEditor(
-			page,
-			new DiagramEditorInput(getDiagramView()),
-			DiagramTestEditor.ID,
-			true));
-	}
-	
-	protected Diagram getDiagramView() {
-		return diagramView;
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/AbstractPresentationTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/AbstractPresentationTestFixture.java
deleted file mode 100644
index 4620caf..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/AbstractPresentationTestFixture.java
+++ /dev/null
@@ -1,636 +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.diagram.ui.util;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.common.core.util.Log;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-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.ConnectionEditPart;
-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.ShapeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.util.IDEEditorUtil;
-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.View;
-import org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.EditorPart;
-
-
-/**
- * @author choang
- *
- * Most fixture should extend fromthis Abstract class.  The only things that are left to do is to implement the following
- * abstract methods
- * 1.  createProject,createDiagram,craeteShapesAndConnectors
- * 2.  Implement you test class which should extend from org.junit.org or @see org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase
- * 
- */
-public abstract class AbstractPresentationTestFixture
-	extends Assert
-	implements IPresentationTestFixture {
-	
-	private IProject project = null;
-	private IDiagramWorkbenchPart diagramWorkbenchPart = null;
-	private IFile diagramFile = null;
-    private TransactionalEditingDomain editingDomain;
-    private Resource resource;
-	
-	private Diagram diagram;
-	private DiagramEditPart diagramEditPart;
-	
-	private Edge connectorView = null; 
-	// connector view for the test fixture
-
-    /**
-     * Temporary shell to be used when creating the diagram editpart.
-     */
-    private Shell tempShell;
-    
-	/** verbose flag. */
-	private static boolean _verbose = Boolean.getBoolean(AbstractTestBase.SYSPROP_VERBOSE);
-	
-	/**
-	 * Returns the diagramFile.
-	 * @return IFile
-	 */
-	public IFile getDiagramFile() {
-		return diagramFile;
-	}
-
-	/**
-	 * Enable verbose mode.  If enabled, {@link junit.framework.Assert#fail(java.lang.String)} 
-	 * will print the supplied string; otherwise the string is ignored.
-	 * 
-	 * Verbose mode can also be enabled using the {@link AbstractTestBase#SYSPROP_VERBOSE} system property.
-	 * @param enabled boolean flag
-	 */
-	protected final void enableVerbose( boolean enabled ) {
-		_verbose = enabled;
-	}
-	
-	/** Return the verbose mode. */
-	public final boolean isVerbose() {
-		return _verbose;
-		
-	}
-	
-	/** Calls <code>System.out.println(msg)</code> if in verbose mode. */
-	public static final void println( Object msg ) {
-		if ( _verbose ) {
-			System.out.println(msg);
-		}
-	}
-
-	
-	/** Calls <code>System.out.print(msg)</code> if in verbose mode. */
-	public static final void print( Object msg ) {
-		if ( _verbose ) {
-			System.out.print(msg);
-		}
-	}
-	
-	/**
-	 * Returns the editor.
-	 * @return IDiagramWorkbenchPart
-	 */
-	public IDiagramWorkbenchPart getDiagramWorkbenchPart() {
-		if (diagramWorkbenchPart == null) {
-			assertTrue(
-				"It appears that the diagram needs to be opened for this test.  Call openDiagram().", false); //$NON-NLS-1$
-		}
-		return diagramWorkbenchPart;
-	}
-
-	/**
-	 * Returns the project.
-	 * @return IProject
-	 */
-	public IProject getProject() {
-		return project;
-	}
-
-	/**
-	 * Sets the diagramFile.
-	 * @param diagramFile The diagramFile to set
-	 */
-	protected void setDiagramFile(IFile diagramFile) {
-		this.diagramFile = diagramFile;
-	}
-
-	/**
-	 * Method getCommandStack.
-	 * @return CommandStack  Command stack for the diagram edit domain
-	 */
-	public CommandStack getCommandStack() {
-		return getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack();
-	}
-	/**
-	 * Sets the diagramWorkbenchPart.
-	 * @param diagramWorkbenchPart The editorPart to set
-	 */
-	public void setDiagramWorkbenchPart(IDiagramWorkbenchPart diagramWorkbenchPart) {
-		this.diagramWorkbenchPart = diagramWorkbenchPart;
-	}
-
-	/**
-	 * Sets the project.
-	 * @param project The project to set
-	 */
-	protected void setProject(IProject project) {
-		this.project = project;
-	}
-
-	/**
-	 * 
-	 * Setup up the data for a test.  It will create the project,diagram and then opent the diagram
-	 * and then create the test shapes and connectors on the diagram for the tests.
-	 */
-	public void setup() throws Exception {
-		createProject();
-		createDiagram();
-        createResource();
-		createDiagramEditPart();
-		
-		flushEventQueue(); // so that all editor related events are fired
-		createShapesAndConnectors();
-	}
-
-	/**
-	 * Will delete the project that was used for the test and removed all the resources in it.
-	 */
-	public final void tearDown() throws Exception { 
-        if (tempShell != null) {
-            tempShell.dispose();
-            tempShell = null;
-        }	
-//		flushEventQueue();
-		boolean diagramClosed = false;
-		Throwable cde = null; // close diagram exception
-		Throwable pde = null;  //project delete exception
-		try {
-			
-			try {
-				diagramClosed = closeDiagram();
-			}
-			catch( Throwable cdt ) {
-				cde = cdt;
-			}
-			try { 
-				if (project != null)
-					project.delete(true, true, null);
-			}
-			catch( Throwable pdt ) {
-				pde = pdt;
-			}
-		}
-		finally {
-            
-			// erasing all the data
-			setDiagramWorkbenchPart(null);
-            // unload resource
-            if (getResource() != null) {
-                getResource().unload();
-                setResource(null);
-            }
-			setDiagramFile(null);
-			setProject(null);
-			setConnectorView(null);
-			flushEventQueue();
-			if ( !diagramClosed ) {
-				Log.error( TestsPlugin.getDefault(), IStatus.ERROR, "FAILED TO CLOSE DIAGRAM", cde);//$NON-NLS-1$
-			}
-			if ( pde != null ) {
-				Log.error( TestsPlugin.getDefault(), IStatus.ERROR, "FAILED TO DELETE PROJECT", pde);//$NON-NLS-1$
-			}
-		}
-	}
-	
-	/**
-	 * Returns the connectorView.
-	 * Maybe null if there is no connector view for this test
-	 * @return IConnectorView
-	 */
-	public Edge getConnectorView() {
-		// maybe null if there is no connector view for this test
-		return connectorView;
-	}
-
-	/**
-	 * Sets the connectorView.
-	 * @param connectorView The connectorView to set
-	 */
-	protected void setConnectorView(Edge connectorView) {
-		this.connectorView = connectorView;
-	}
-
-	/** Clears the diaplay's event queue. */
-	public void flushEventQueue() {
-		Display display = Display.getCurrent();
-		while (display.readAndDispatch()) {
-			// empty block
-		}
-	}
-
-	public void openDiagram() throws Exception {
-		if (getDiagramFile() == null) {
-			createDiagram();
-		}
-
-		assertTrue("creation of diagram failed", getDiagramFile() != null); //$NON-NLS-1$
-		IWorkbenchPage page =
-			PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage();
-
-		IDEEditorUtil.openDiagram(getDiagramFile(), page.getWorkbenchWindow(),
-            false, new NullProgressMonitor());
-
-		setDiagramWorkbenchPart((IDiagramWorkbenchPart)IDE.openEditor(page, getDiagramFile(), true));
-		setDiagramEditPart(getDiagramWorkbenchPart().getDiagramEditPart());
-        setDiagram(getDiagramEditPart().getDiagramView());
-        setResource(getDiagram().eResource());
-	}
-
-	public boolean closeDiagram() {
-		boolean closed = true;
-		if (diagramWorkbenchPart != null // only close if it was opened
-			&& diagramWorkbenchPart instanceof IEditorPart) {
-			IWorkbenchPage page =
-			getDiagramWorkbenchPart().getSite().getPage();
-			closed = page.closeEditor((IEditorPart)getDiagramWorkbenchPart(), false);
-			setDiagramWorkbenchPart(null);
-		}
-		return closed;
-	}
-
-	protected boolean isDirty() {
-		return ((EditorPart) getDiagramWorkbenchPart()).isDirty();
-	}
-	
-	/**
-	 * @param diagram The diagram to set.
-	 */
-	public void setDiagram(Diagram diagram) {
-		this.diagram = diagram;
-	}
-	/**
-	 * @param diagramEditPart The diagramEditPart to set.
-	 */
-	public void setDiagramEditPart(DiagramEditPart diagramEditPart) {
-		this.diagramEditPart = diagramEditPart;
-	}
-
-	public Diagram getDiagram() {
-		return diagram;
-	}
-
-	public DiagramEditPart getDiagramEditPart() {
-		return diagramEditPart;
-	}
-
-	/**
-	 * Implement to setup the project for the tests.
-	 */
-	protected abstract void createProject() throws Exception;
-
-	/**
-	 * Implement to create the diagram and the diagram file for which
-	 * the test should run under.  Please set the diagramFile variable.
-	 */
-	protected abstract void createDiagram() throws Exception;
-    
-	/**
-     * Creates the editing domain and resource and adds the diagram to
-     * that resource.
-     */
-    protected void createResource() {  
-    	if (getResource() == null) {
-	        IFile file = getDiagramFile();
-	        
-	        if (file != null) {
-	            String filePath = file.getLocation().toOSString();
-	            setResource(getEditingDomain().loadResource(filePath));
-	
-	        } else {
-                setResource(getEditingDomain()
-	                .createResource("null:/org.eclipse.gmf.tests.runtime.diagram.ui")); //$NON-NLS-1$
-	        }
-	
-	        if (getDiagram() != null) {
-	            
-	            AbstractEMFOperation operation = new AbstractEMFOperation(
-	            	getEditingDomain(), "AbstractPresentationTestFixture setup") { //$NON-NLS-1$
-	
-	                protected IStatus doExecute(IProgressMonitor monitor,
-	                        IAdaptable info)
-	                    throws ExecutionException {
-	                    
-	                    getResource().getContents().add(getDiagram());
-	                    return Status.OK_STATUS;
-	                };
-	            };
-	
-	    
-	            try {
-	                operation.execute(new NullProgressMonitor(), null);
-	            } catch (ExecutionException ie) {
-	                fail("createResource failed: " + ie.getLocalizedMessage()); //$NON-NLS-1$
-	            }
-	        }
-    	}
-    }
-
-	/**
-	 * Creates and sets the diagram editpart using the offscreen rendering
-	 * capabilities.
-	 */
-	protected void createDiagramEditPart()
-		throws Exception
-	{
-		if (getDiagramEditPart() == null) {
-			setDiagramEditPart(OffscreenEditPartFactory.getInstance()
-				.createDiagramEditPart(getDiagram(), getTempShell()));
-		}
-	}
-	
-    public ShapeEditPart createShapeUsingTool(IElementType elementType,
-            Point location, IGraphicalEditPart containerEP) {
-        return createShapeUsingTool(elementType, location, null, containerEP);
-    }
-    
-	/**
-	 * Creates a new shape using the request created by the
-	 * <code>CreationTool</code>.
-	 * 
-	 * @param elementType
-	 *            the type of the shape/element to be created
-	 * @param location
-	 *            the location for the new shape
-	 * @return the new shape's editpart
-	 */
-	public ShapeEditPart createShapeUsingTool(IElementType elementType,
-			Point location, Dimension size, IGraphicalEditPart containerEP) {
-
-		CreateRequest request = getCreationRequest(elementType);
-		request.setLocation(location);
-		if (size != null) {
-		    request.setSize(size);
-		}
-		Command cmd = containerEP.getCommand(request);
-
-		int previousNumChildren = containerEP.getChildren().size();
-
-		getCommandStack().execute(cmd);
-		assertEquals(previousNumChildren + 1, containerEP.getChildren().size());
-
-		Object newView = ((IAdaptable) ((List) request.getNewObject()).get(0)).getAdapter(View.class);
-		assertNotNull(newView);
-		assertTrue(!ViewUtil.isTransient((View)newView));
-		
-		EObject element = ((View)newView).getElement();
-		
-		getCommandStack().undo();
-		assertEquals(previousNumChildren, containerEP.getChildren().size());
-
-		getCommandStack().redo();
-		assertEquals(previousNumChildren + 1, containerEP.getChildren().size());
-
-		IGraphicalEditPart newShape = null;
-		if (element != null) {
-			List children = containerEP.getChildren();
-			ListIterator li = children.listIterator();
-			while (li.hasNext()) {
-				IGraphicalEditPart gep = (IGraphicalEditPart) li.next();
-                if (gep.getNotationView() != null
-                    && element.equals(gep.getNotationView().getElement())) {
-                    newShape = gep;
-                }
-			}
-		}
-		else {
-			newShape = (ShapeEditPart) getDiagramEditPart()
-			.getViewer().getEditPartRegistry().get(newView);
-			assertNotNull(newShape);
-		}
-		
-		assertTrue(newShape != null && newShape instanceof ShapeEditPart);
-		return (ShapeEditPart)newShape;
-	}
-
-	/**
-	 * Given an <code>IElementType</code>, gets the creation request that can be used to 
-	 * retrieve the command to creation the element for the type.
-	 * 
-	 * @param elementType
-	 * @return
-	 */
-	public CreateRequest getCreationRequest(IElementType elementType) {
-		class CreationTool
-			extends org.eclipse.gmf.runtime.diagram.ui.tools.CreationTool {
-
-			public CreationTool(IElementType theElementType) {
-				super(theElementType);
-			}
-
-			/** Make public. */
-			public Request createTargetRequest() {
-				return super.createTargetRequest();
-			}
-			
-			protected PreferencesHint getPreferencesHint() {
-				return PreferencesHint.USE_DEFAULTS;
-			}
-		}
-
-		CreationTool tool = new CreationTool(elementType);
-		CreateRequest request = (CreateRequest) tool.createTargetRequest();
-		return request;
-	}
-
-	/**
-	 * Creates a new shape using the request created by the
-	 * <code>CreationTool</code>.
-	 * 
-	 * @param elementType
-	 *            the type of the shape/element to be created
-	 * @param location
-	 *            the location for the new shape
-	 * @return the new shape's editpart
-	 */
-	public ShapeEditPart createShapeUsingTool(IElementType elementType,
-			Point location) {
-
-		return createShapeUsingTool(elementType, location, getDiagramEditPart());
-
-	}
-	
-	   /**
-     * Creates a new shape using the request created by the
-     * <code>CreationTool</code>.
-     * 
-     * @param elementType
-     *            the type of the shape/element to be created
-     * @param location
-     *            the location for the new shape
-     * @return the new shape's editpart
-     */
-    public ShapeEditPart createShapeUsingTool(IElementType elementType,
-            Point location, Dimension size) {
-
-        return createShapeUsingTool(elementType, location, size, getDiagramEditPart());
-
-    }
-	
-	/**
-	 * Creates a new connector using the request created by the
-	 * <code>ConnectionCreationTool</code>.
-	 * 
-	 * @param sourceEditPart
-	 *            the new connector's source
-	 * @param targetEditPart
-	 *            the new connector's target
-	 * @param elementType
-	 *            the type of the connector/relationship to be created
-	 * @return the new connector's editpart
-	 */
-	public ConnectionEditPart createConnectorUsingTool(
-			final IGraphicalEditPart sourceEditPart,
-			final IGraphicalEditPart targetEditPart, IElementType elementType) {
-
-		class ConnectorCreationTool
-			extends
-			org.eclipse.gmf.runtime.diagram.ui.tools.ConnectionCreationTool {
-
-			public ConnectorCreationTool(IElementType theElementType) {
-				super(theElementType);
-			}
-
-			/** Make public. */
-			public Request createTargetRequest() {
-				return super.createTargetRequest();
-			}
-			
-			protected PreferencesHint getPreferencesHint() {
-				return PreferencesHint.USE_DEFAULTS;
-			}
-		}
-
-		ConnectorCreationTool tool = new ConnectorCreationTool(elementType);
-		CreateConnectionRequest request = (CreateConnectionRequest) tool
-			.createTargetRequest();
-		request.setTargetEditPart(sourceEditPart);
-		request.setType(RequestConstants.REQ_CONNECTION_START);
-		sourceEditPart.getCommand(request);
-		request.setSourceEditPart(sourceEditPart);
-		request.setTargetEditPart(targetEditPart);
-		request.setType(RequestConstants.REQ_CONNECTION_END);
-		Command cmd = targetEditPart.getCommand(request);
-
-		int previousNumConnectors = getDiagramEditPart().getConnections().size();
-
-		getCommandStack().execute(cmd);
-		assertEquals(previousNumConnectors + 1, getDiagramEditPart()
-			.getConnections().size());
-		getCommandStack().undo();
-		assertEquals(previousNumConnectors, getDiagramEditPart()
-			.getConnections().size());
-		getCommandStack().redo();
-		assertEquals(previousNumConnectors + 1, getDiagramEditPart()
-			.getConnections().size());
-
-		Object newView = ((IAdaptable) request.getNewObject())
-			.getAdapter(View.class);
-		assertNotNull(newView);
-
-		ConnectionEditPart newConnector = (ConnectionEditPart) getDiagramEditPart()
-			.getViewer().getEditPartRegistry().get(newView);
-		assertNotNull(newConnector);
-
-		return newConnector;
-	}
-
-	/**
-	 * Implement this to creates the shapes and the connectors for the tests.
-	 * Will set the connect view if there is one needed for the test.
-	 */
-	protected abstract void createShapesAndConnectors() throws Exception;
-
-    
-    public TransactionalEditingDomain getEditingDomain() {
-    	if (editingDomain == null) {
-            if (getDiagram() != null) {
-                editingDomain = TransactionUtil.getEditingDomain(getDiagram());
-            } else {
-                editingDomain = DiagramEditingDomainFactory.getInstance()
-                    .createEditingDomain();
-            }
-        }
-        return editingDomain;
-    }
-    
-    protected Resource getResource() {
-        return resource;
-    }
-    
-    protected void setResource(Resource resource) {
-        this.resource = resource;
-    }
-    
-    /**
-     * Lazily creates a new shell.
-     * @return
-     */
-    private Shell getTempShell() {
-        if (tempShell == null) {
-            tempShell = new Shell();
-        }
-        return tempShell;
-    }
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramCreator.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramCreator.java
deleted file mode 100644
index baf226a..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramCreator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.diagram.ui.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.runtime.Assert;
-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.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.examples.runtime.diagram.logic.internal.LogicDiagramPlugin;
-import org.eclipse.gmf.runtime.common.core.util.StringStatics;
-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.diagram.core.util.ViewType;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-
-
-/**
- * @author sshaw
- *
- * Utility class for creating simple diagrams for testing
- */
-public class DiagramCreator {
-
-	static public Diagram createEmptyDiagram(final PreferencesHint preferencesHint, TransactionalEditingDomain editingDomain) {
-		final Diagram[] dgmContainer = new Diagram[1];
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			editingDomain, "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				Diagram diagram = ViewService.createDiagram("logic", preferencesHint); //$NON-NLS-1$
-				Assert.isNotNull(diagram);
-				dgmContainer[0] = diagram;
-
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-				new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		}
-		return dgmContainer[0];
-	}
-
-	static public List createNodes(final Diagram diagram,
-			final PreferencesHint preferencesHint,
-			TransactionalEditingDomain editingDomain) {
-
-		final List list = new ArrayList(2);
-		
-        AbstractEMFOperation operation = new AbstractEMFOperation(
-			editingDomain, StringStatics.BLANK) {
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-
-				Node note1 = ViewService.createNode(diagram,
-					ViewType.NOTE, preferencesHint);
-				Assert.isNotNull(note1, "Note1 creation failed"); //$NON-NLS-1$
-				Assert.isTrue(diagram.getChildren().get(0) == note1,
-					"Note1 is not inserted in diagram"); //$NON-NLS-1$
-
-				Node note2 = ViewService.createNode(diagram,
-					ViewType.NOTE, preferencesHint);
-				Assert.isNotNull(note2, "Note2 creation failed"); //$NON-NLS-1$
-				Assert.isTrue(diagram.getChildren().get(1) == note2,
-					"Note2 is not inserted in diagram"); //$NON-NLS-1$
-
-				Edge noteAttachment = ViewService.createEdge(
-					note1, note2, ViewType.NOTEATTACHMENT, preferencesHint);
-				Assert.isNotNull(noteAttachment,
-					"NoteAttachment creation failed"); //$NON-NLS-1$
-				Assert.isTrue(diagram.getEdges().get(0) == noteAttachment,
-					"NoteAttachment is not inserted in diagram"); //$NON-NLS-1$
-				Assert.isTrue(note1.getSourceEdges().get(0) == noteAttachment,
-					"NoteAttachment is not inserted in note1"); //$NON-NLS-1$
-				Assert.isTrue(note2.getTargetEdges().get(0) == noteAttachment, 
-					"NoteAttachment is not inserted in note2"); //$NON-NLS-1$
-				Assert.isTrue(noteAttachment.getSource() == note1,
-					"Note1 is not source for noteattachment"); //$NON-NLS-1$
-				Assert.isTrue(noteAttachment.getTarget() == note2, 
-					"Note2 is not target for noteattachment"); //$NON-NLS-1$
-
-				list.add(note1);
-				list.add(note2);
-				
-				return new Status(IStatus.OK, LogicDiagramPlugin.getPluginId(),
-					DiagramStatusCodes.OK, StringStatics.BLANK, null);
-			};
-		};
-
-		try {
-			operation.execute(new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-		}
-
-
-		return list;
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramState.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramState.java
deleted file mode 100644
index 1e93eb9..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramState.java
+++ /dev/null
@@ -1,136 +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.diagram.ui.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author gsturov
- * 
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- */
-public class DiagramState {
-	
-	public ArrayList props = new ArrayList();
-	
-	public DiagramState(DiagramEditPart diagramEditPart) {
-
-		//EditPartViewer viewer = diagramEditPart.getViewer();
-		final Diagram d = (Diagram) diagramEditPart.getModel();
-		
-		ArrayList views = new ArrayList();
-		views.addAll(d.getChildren());
-		
-		Collections.sort(views, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				return (ViewUtil.getIdStr((View)o1).compareTo(ViewUtil.getIdStr(((View) o2))));
-			}
-		});
-		
-//		for (Iterator it = views.iterator(); it.hasNext();) {
-			//TODO sc - add check back in
-//			IView view = (IView) it.next();
-//			props.add(view.getIdStr());
-//			IGraphicalEditPart editpart = (IGraphicalEditPart) viewer.getEditPartRegistry().get(view);
-//			IPropertySource propSource = (IPropertySource) editpart.getAdapter(IPropertySource.class);
-//			IPropertyDescriptor [] descriptors = propSource.getPropertyDescriptors();
-//            
-//
-//            ArrayList descriptorList= new ArrayList();
-//            descriptorList.addAll(Arrays.asList(descriptors));
-//            
-//            // We are sorting the list of properties based on their id
-//            // Before we had assumed that the order of the properties was
-//            // always the same if the view had the same set of properties
-//            // this assumption is now incorrect.  Don't know why .. just
-//            // start changed after a build.
-//            Collections.sort(descriptorList,new Comparator() {
-//               public int compare(Object ob1,Object ob2){
-//                String a1= ((IPropertyDescriptor)ob1).getId().toString();
-//                String a2 =((IPropertyDescriptor)ob2).getId().toString();
-//                return a1.compareTo(a2);
-//               }
-//            });
-//            
-//            for (Iterator it1 = descriptorList.iterator(); it1.hasNext();){
-//                IPropertyDescriptor descriptor = (IPropertyDescriptor)it1.next();
-//                ILabelProvider label = descriptor.getLabelProvider();
-//                Object id = descriptor.getId();
-//                String name = descriptor.getDisplayName();
-//                String val = label.getText(propSource.getPropertyValue(id));
-//                
-//                props.add("  " + name + " = " + val); //$NON-NLS-1$ //$NON-NLS-2$
-//            }           			
-//		
-		//}
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof DiagramState))
-			return false;
-			
-		DiagramState state = (DiagramState) obj;
-		
-		int i1 = props.size();
-		int i2 = state.props.size();
-		
-		if (i1 > i2) {
-			reportDifference(i1 - 1, state);
-			return false;
-		}
-		
-		if (i2 > i1) {
-			reportDifference(i2 - 1, state);
-			return false;
-		}
-		
-		int i = 0;
-		for (Iterator it = props.iterator(); it.hasNext();) {
-			String s1 = (String) it.next();
-			String s2 = (String) state.props.get(i);
-			if (!s1.equals(s2)) {
-				reportDifference(i, state);
-				return false;
-			}
-			i++;
-		}
-		
-		return true;		
-	}
-	
-	public void reportDifference(int propIndex, DiagramState state) {
-		
-		System.out.println("-----------------------------------------------------"); //$NON-NLS-1$
-		System.out.println("Diagram Status difference report. See the last entry!"); //$NON-NLS-1$
-		
-		int i1 = props.size();
-		int i2 = state.props.size();
-		
-		for (int i = 0; i <= propIndex; i++) {
-			String s1 = i <= i1 - 1 ? (String) props.get(i) : "---------"; //$NON-NLS-1$
-			String s2 = i <= i2 - 1 ? (String) state.props.get(i) : "---------"; //$NON-NLS-1$
-			String s = s1 + "    " + s2; //$NON-NLS-1$
-			System.out.println(s);
-		}
-		System.out.println("-----------------------------------------------------"); //$NON-NLS-1$
-	}
-}
-
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramTestEditor.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramTestEditor.java
deleted file mode 100644
index b9ecf8e..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/DiagramTestEditor.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.tests.runtime.diagram.ui.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-
-
-/**
- * A simple editor for using in JUnit tests that require UI interaction.
- *
- * @author Christian W. Damus (cdamus)
- */
-public class DiagramTestEditor
-	extends DiagramEditor {
-
-	/** The editor ID for use in opening the editor. */
-	public static final String ID = "org.eclipse.gmf.tests.runtime.diagram.ui.DiagramTestEditor"; //$NON-NLS-1$
-	
-    
-	public void doSave(IProgressMonitor monitor) {
-		// no need to implement this
-	}
-
-	public void doSaveAs() {
-		// no need to implement this
-	}
-
-	public boolean isDirty() {
-		return false;
-	}
-
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixture.java
deleted file mode 100644
index a8bee3a..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixture.java
+++ /dev/null
@@ -1,126 +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.diagram.ui.util;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.CommandStack;
-
-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.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-
-/**
- * @author choang
- *
- * All fixture should implement this interface.  
- */
-
-public interface IPresentationTestFixture
-{
-	public Diagram getDiagram();
-	/**
-	 * Returns the diagramFile.
-	 * @return IFile
-	 */
-	//public IFile getDiagramFile();
-
-	/**
-	 * Returns the editor.
-	 * @return IDiagramWorkbenchPart
-	 */
-	public IDiagramWorkbenchPart getDiagramWorkbenchPart();
-
-	/**
-	 * Returns the project.
-	 * @return IProject
-	 */
-	public IProject getProject();
-	
-	/**
-	 * Method getCommandStack.
-	 * @return CommandStack  Command stack for the diagram editor
-	 */
-	public CommandStack getCommandStack();	
-	/**
-	 * Returns the connectView for test
-	 * If the test doesn't have a connector view it returns null
-	 * @return IConnectorView
-	 */
-	public Edge getConnectorView();
-	/**
-	 * Will setup all the data for the fixture
-	 * such as creating the diagram and project, and
-	 * all the tests data.
-	 * and opening it the diagram diagram
-	 */
-	 public void setup() throws Exception;
-	 public void openDiagram() throws Exception;
-	 public boolean closeDiagram();
-	
-    /**
-     * Method getdiagramEditPart
-     * Helper method that returns the <code>DiagramEditPart</code>
-     * for the diagram type that we are using for the tests.  Note that
-     * for each different type of diagram their is an corresponding DiagrmEditPart
-     * class
-     * 
-     * 
-     */	
-	 public DiagramEditPart getDiagramEditPart();
-     	 
-	
-	
-	/**
-	 * Will clean up all the resources create during setup
-	 * and the test ensuring that all the project resources
-	 * have been deleted.
-	 * 
-	 */
-	public void tearDown() throws Exception;
-
-	/** Clears the diaplay's event queue. */
-	void flushEventQueue();
-    
-     /**
-     * Method createRelationship will create and return a  relationship between the <code>sourceEditPart</code>
-     * and the <code>targetEditPart</code> 
-     * @param sourceEditPart
-     * @param targetEditPart
-     * @param elementTypeInfo a create relationship element kind of this type element info.
-     * @return IGraphicalEditPart The graphical editpart that will be created to control the interactions
-     * between the view and the figure world
-     */
-    // public IGraphicalEditPart createRelationship(final IGraphicalEditPart sourceEditPart,final IGraphicalEditPart targetEditPart, IElementTypeInfo elementTypeInfo);
-   
-	/**
-	 * 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 PreferencesHint getPreferencesHint();
-    
-    /**
-     * Gets the transactional editing domain through which model changes will be
-     * made.
-     * 
-     * @return the editing domain
-     */
-    public TransactionalEditingDomain getEditingDomain();
-
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixtureLogic.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixtureLogic.java
deleted file mode 100644
index 18ff936..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/IPresentationTestFixtureLogic.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.diagram.ui.util;
- 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.ui.IEditorPart;
-
-import org.eclipse.gmf.runtime.notation.View;
-
-/**
- * @author choang
- *
- * <p>Interface to define what a Test Fixture Logic methods.  Used
- * <br>by @see org.eclipse.gmf.tests.runtime.diagram.ui.AbstractTestBase to setup
- * </br> the fixture for the tests.
-  */
-public interface IPresentationTestFixtureLogic
-{
-	
-	/*
-	 * Consider refactoring this so that it is not stateless and stores the member varaibles so it is the actual
-	 * fixture instead of just the FixtureLogic.  The reason for this is because I can see the need for the craeteConnectView
-	 * method to potential update member variables that the test would want to access.
-	 * 
-	 */
-	static public final Point ptStart = new Point(100, 100);
-
-	static public final Point ptEnd = new Point(300, 300);
-
-	static public final Point ptMiddle = new Point(200, 200);
-
-	
-	
-	/**
-	 * Method createProject.
-	 * @param aProjectName  Name of project to be created
-	 * @param workspace Workspace to create the project in.
-	 * @return IProject The project with the specificed name <code>aProjectname</code>
-	 * @throws Exception
-	 */
-	public IProject createProject(String aProjectName,IWorkspace workspace) throws Exception;
-	
-	/**
-	 * Method createDiagramFile.
-	 * @param fullFilePath  
-	 * @param project The project which the diagram should be created under
-	 * @return IFile A file handle to the diagram created.
-	 * @throws Exception
-	 */
-	public IFile createDiagramFile(String fullFilePath, IProject project) throws Exception;
-
-	
-	/**
-	 * Method createConnectorView.
-	 * @param project The project to for which to create the shapes and connectors in.
-	 * @param editor 
-	 * @return IConnectorView The connectView associated with the test.  Will be null if there is no connector to test.
-	 * @throws Exception
-	 * 
-	 * <p>Will create the shapes and connectors for this test in the diagram and return the connector view (if there is one needed for the test)
-	 * <p>Probably should be reneamed to createShapesAndConnectors( ...)
-	 */
-	public View createConnectorView(IProject project,IEditorPart editor) throws Exception;
-	
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestActionCallback.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestActionCallback.java
deleted file mode 100644
index 57790e4..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestActionCallback.java
+++ /dev/null
@@ -1,17 +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.diagram.ui.util;
-
-public interface ITestActionCallback {
-	void onRunExecution();
-}
-
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestCommandCallback.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestCommandCallback.java
deleted file mode 100644
index d64a3d4..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/ITestCommandCallback.java
+++ /dev/null
@@ -1,20 +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.diagram.ui.util;
-
-/**
- * @author gsturov
- */
-public interface ITestCommandCallback {
-	void onCommandExecution();
-}
-
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestFixture.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestFixture.java
deleted file mode 100644
index f53c57a..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestFixture.java
+++ /dev/null
@@ -1,142 +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.tests.runtime.diagram.ui.util;
-
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-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.core.runtime.Status;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-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.editparts.NoteEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditorInput;
-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.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * This is a test fixture for presentation. It creates a non-UML diagram and a
- * diagram editpart. It does not create a project or add any shapes or
- * connectors to the diagram. This class can be subclassed or used as is.
- * 
- * @author cmahoney
- */
-public class PresentationTestFixture
-	extends AbstractPresentationTestFixture {
-
-	/**
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture#createProject()
-	 */
-	protected void createProject()
-		throws Exception {
-
-		// Do nothing. Override if a project is required.
-
-	}
-
-	/**
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture#createDiagram()
-	 */
-	protected void createDiagram()
-		throws Exception {
-
-		AbstractEMFOperation operation = new AbstractEMFOperation(
-			getEditingDomain(), "") { //$NON-NLS-1$
-
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info)
-				throws ExecutionException {
-				
-				setDiagram(ViewService
-					.createDiagram(
-						PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND,
-						getPreferencesHint()));
-				
-				return Status.OK_STATUS;
-			};
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(operation,
-					new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			e.printStackTrace();
-			assertFalse(false);
-		}
-	}
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture#openDiagram()
-	 */
-	public void openDiagram()
-		throws Exception {
-		IWorkbenchPage page =
-			PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow()
-				.getActivePage();
-
-		setDiagramWorkbenchPart((IDiagramWorkbenchPart)IDE.openEditor(
-			page,
-			new DiagramEditorInput(getDiagram()),
-			DiagramTestEditor.ID,
-			true));	}
-
-	/**
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.AbstractPresentationTestFixture#createShapesAndConnectors()
-	 */
-	protected void createShapesAndConnectors()
-		throws Exception {
-
-		// Override to create shapes and connectors.
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.tests.runtime.diagram.ui.util.IPresentationTestFixture#getPreferencesHint()
-	 */
-	public PreferencesHint getPreferencesHint() {
-		return PreferencesHint.USE_DEFAULTS;
-	}
-	
-	/**
-	 * Creates a note on the diagram and returns its editpart.
-	 */
-	public NoteEditPart createNote() {
-		CreateViewRequest createRequest = CreateViewRequestFactory
-			.getCreateShapeRequest(DiagramNotationType.NOTE,
-				PreferencesHint.USE_DEFAULTS);
-		createRequest.setLocation(new Point(10, 10));
-		createRequest.setSize(new Dimension(100, 100));
-		getDiagramEditPart().getCommand(createRequest).execute();
-		flushEventQueue();
-		return (NoteEditPart) getDiagramEditPart().getViewer()
-			.getEditPartRegistry().get(
-				((IAdaptable) ((List) createRequest.getNewObject()).get(0))
-					.getAdapter(View.class));
-	}
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsEditPartProvider.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsEditPartProvider.java
deleted file mode 100644
index ac4d9cc..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsEditPartProvider.java
+++ /dev/null
@@ -1,33 +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.diagram.ui.util;
-
-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;
-
-
-/**
- * @author mmostafa
- */
-public class PresentationTestsEditPartProvider
-	extends AbstractEditPartProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider#getDiagramEditPartClass(org.eclipse.gmf.runtime.notation.View)
-	 */
-	protected Class getDiagramEditPartClass(View view) {
-		if (view.getType().equals(PresentationTestsViewProvider.PRESENTATION_TESTS_DIAGRAM_KIND))
-			return DiagramEditPart.class;
-		return super.getDiagramEditPartClass(view);
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsViewProvider.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsViewProvider.java
deleted file mode 100644
index e360471..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/PresentationTestsViewProvider.java
+++ /dev/null
@@ -1,42 +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.diagram.ui.util;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
-
-/**
- * This is a view provider for the presentation tests. It needs to provide a
- * default diagram view so that we can create diagrams in this package without
- * depending on UML. If ever this capability becomes available in presentation
- * itself, then it can be removed from here.
- * 
- * @author cmahoney
- */
-public class PresentationTestsViewProvider
-	extends AbstractViewProvider {
-
-	/** the diagram kind to use to request a 'presentation tests diagram' */
-	public static final String PRESENTATION_TESTS_DIAGRAM_KIND = "PresentationTestsDiagramKind"; //$NON-NLS-1$
-
-	/**
-	 * @see org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider#getDiagramViewClass(IAdaptable,
-	 *      java.lang.String)
-	 */
-	protected Class getDiagramViewClass(IAdaptable semanticAdapter,
-			String diagramKind) {
-		return PRESENTATION_TESTS_DIAGRAM_KIND.equals(diagramKind) ? DiagramViewFactory.class
-			: null;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/TestsPlugin.java b/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/TestsPlugin.java
deleted file mode 100644
index c9494ba..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/util/TestsPlugin.java
+++ /dev/null
@@ -1,76 +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.diagram.ui.util;
-
-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 TestsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static TestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle= ResourceBundle.getBundle("org.eclipse.gmf.tests.runtime.diagram.ui.TestsPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static TestsPlugin 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= TestsPlugin.getDefault().getResourceBundle();
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.diagram.ui/test.xml b/org.eclipse.gmf.tests.runtime.diagram.ui/test.xml
deleted file mode 100644
index 5bae560..0000000
--- a/org.eclipse.gmf.tests.runtime.diagram.ui/test.xml
+++ /dev/null
@@ -1,64 +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.diagram.ui" />
-	<property name="classname" value="org.eclipse.gmf.tests.runtime.diagram.ui.AllTests" />
-	<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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.render/.classpath b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.gmf.tests.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.cvsignore b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.cvsignore
deleted file mode 100644
index d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.project b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.project
deleted file mode 100644
index e475e5d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.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.tests.runtime.draw2d.ui.render/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/META-INF/MANIFEST.MF
deleted file mode 100644
index dbd790a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/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.tests.runtime.draw2d.ui.render

-Bundle-Version: 1.5.0.qualifier

-Bundle-Activator: org.eclipse.gmf.tests.runtime.draw2d.ui.render.Activator

-Bundle-Vendor: %Plugin.providerName

-Bundle-Localization: plugin

-Export-Package: org.eclipse.gmf.runtime.draw2d.ui.render.internal.svg.metafile;x-internal:=true,

- org.eclipse.gmf.tests.runtime.draw2d.ui.render;x-internal:=true,

- org.eclipse.gmf.tests.runtime.draw2d.ui.render.internal.svg;x-internal:=true

-Require-Bundle: org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.draw2d.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/about.html b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/org.eclipse.gmf.tests.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, 2007</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.render/build.properties b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/build.properties
deleted file mode 100644
index 9e6d285..0000000
--- a/org.eclipse.gmf.tests.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,\
-               resources/,\
-               META-INF/,\
-               .,\
-               about.html,\
-               test.xml
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/plugin.properties b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/plugin.properties
deleted file mode 100644
index 12f2268..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/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 render tests
-Plugin.providerName = Eclipse Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/pom.xml b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/pom.xml
deleted file mode 100644
index 6977630..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.draw2d.ui.render</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.draw2d.ui.render</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.draw2d.ui.render</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.draw2d.ui.render.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.svg
deleted file mode 100644
index 73c2d6a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="618" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="306" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2292,2,2)" stroke="white">

-      <image x="0" y="0" width="98" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAAAwCAIAAABlgTilAAABr0lEQVR42u2a63XD

-IAyFDcdLMEczUzJG3TGSmZo5OgYl0GCMwWDzSANXP/LEOkdfroSMQjjnAyxkFAhi

-bFRPN3ICC6ed+feMSb6/AoplN3JB0qE2ARMwARMwARMMmA504XvbrVY67GtmTArQ

-j+zcG2qyT5Gwxj4BKVNBCVhBUjTGV5OMzACDxYRWK0YTIYdX+q6N95lIim4A+ho+

-culIxDNxvh2V/nZanRTqT0wPymdGTYl4fbCoj1GFRHvEqdHIF/rRxrH8NruarGoV

-iykvI/2zm4L609fzE71gy4+xxro86/Z3icJUojlSinCG5EQz4/Nnls9hiTo1lk63

-dZy5aspUbNghSS26hNffrHh3MSmoIIsSgkq9WclJZ1mVKl++14ia02mN1dnj/r8x

-CUTQUJMVWr8PeMfWHAcpUUatgwWGuaaRdFBTgppgsZiQd+uMg5oSkq7z/1ww12Em

-9S3tFpNTJdS39HO49wZLxCui3r3TdVXO2ebggB5QYG+MonY64aJtTbGIAVT4IOXp

-4j60OvXNMs5Er4D2EpiACZiA6Z1t3uka2+yLYDpjUoCkS7dfGk7jno9OHlYAAAAA

-SUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="48" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.wmf
deleted file mode 100644
index a037cc8..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Activite.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.svg
deleted file mode 100644
index 4fdbbed..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="145" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="93" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="145" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJEAAABdCAIAAAAqkBO7AAATn0lEQVR42u1dCWwc

-13l+15w7e3J3SS7FU9Qty1YkX7ItK45qO46D3EiaIilQN1drp2gOpGkbIGgbtAgQ

-oGkDNAgQIEbjBonbpEnhA3DsKLHj+oqrWLIkS7JEiqSWSy73mtm5573+syvJUuIA

-TV1XlDy/ltzlLjkzfN/7vv/7//eWwkIIlMQlFSQZggSzJBLMkkgwSzBLIsEsiQSz

-BLMkEsySSDBLMEsiwSyJBLMEsyQSzJJIMEsiwSzBLIkEsyQSzBLMkkgwS+K3Craa

-L47z+NOZqcXPm2iEvK5n5b82r/nrf9rLATMhRMAD03YCwXVJTikq/X8ZM4FxZNve

-Sot7AcsaSj4jmIR7ryCEE8xeBadzD19erH714X9/bPZYm+LRQuEdW7Z/9Oo9eT31

-upy39y9+wPnSk7+Y/co3o589jzwfVUrpD905fffvq/nsKgEMgn7xi19chQx7Yeb4

-e7/8hQdrs8s53SwYC1TsWzjxwtzJm8emM6qGMf4/B61Po/kHHz3xoU8VXp7N55Rc

-RjU813n06dkDh0p7d0v663Dey8ODwMh1HPsL933zcGDjkUE0UJD0FNBLy+cfNmt/

-8/Sjbhi8PmfGTq1+6q//YVgIfTjL0hpKMZrX8pWc/PC+k9/5werZJL/qMMMCnVqu

-/eTIAZzNClXGEhuk0pSsjEqSoeqP1GZrtvk6zZbmoSPspZOSIRNGBWWYZTChVCL5

-VLbxwM+4HySY/SbQkG1Z3U4HSRJijGBcUbQ/3HjDhkxRJrjj21boi3OBXsvcP+8w

-vRP7rQbDPpYZHJZkhsXt70JyShBEGUHLbRHxBLNXBwxClhWmKiKKYFS5ENXAe3pp

-ZtG1bXidUvrKNb8myETv5+EEke9zOBdCkpEOEUVRJDDi3WX05E9Q0EURDz1O88C5

-1TJWq9Dri8pAaefY9FNmA9lpIUsLmHzn9DGORCDQpnxZJWxmubawUuc82r52XVrV

-X8sM6Rw6evAb/8wGCrlN66iuu+URv9WWYWKILq5bUKlxM2g5nfzbbiSylGD26slM

-IFzK5++5411Hv/H3DWUFRYJnQpcxqGhxEHjVlz/63Jfmq/N128qtW/vtj3362pGJ

-/3kF0bOH4pXHcMYDh/QHftxumVXX7xaNdjdEFhoKhaJTgDRywlbHC3btHP/AOxDB

-CWa/aeoLGJz37n6L43l/96PvvTxzWhQySNegdBKnlw4tLB81dLZm2N02FRXy7cg/

-BwhGryhlL9GBuEKIAMQtirww8sP4M0XIDkOGCagulyRtoVbM5ssDg7zr2S2z5nSq

-3F/u+BmLSQgHjBY/fOe2z9+tDZV6h+XnqrSL6PtXG2ai1zwSza41WCxvKA2f2P+s

-qDdBlyD0XCa7+xqtNNBV6EIQOUFgQtl7BqH4DiDygtCFG+ADUAkehGK2bblBbB9C

-zoGrcXsl4rpEAziNokxWlwZFhHVJzunSUDrdzhaWO/PtTtV1HRQhIkk8bB07oQzk

-pEzq7MTACc8uQMz1/R8+9fg/PfSDZ1467MJTxRzN54pDpVwxpxsGwSSIAhZFJB76

-wAw8Jwjnmt0gCKIwatpuJERKkbteOGSojMZsA7gUKTagWY1RTFue7wcRoyQNnoJS

-vWMSSqSCKhUNQDVsSjmVGgV9jeOuWHbddk7ed//L9/9w8u237fjCn+TWr0WroKxe

-dR7k+HL1z+//1snAxZumUDGP0gZSZMbihAbqyDHv6xIhBGxltdE6tlDfX21QQjWZ

-6JS1/RCKKsJwJqVosgQUDBmLuMgoUkaSMMEjnIc8ll+JEM92UNdGMmUZVc4bIoy4

-52IuGCE5XS2obCLQrFaq0XBnv/vDQ5Oj1/3VZwhKMPu1mB6s3L73tq//4nGRz6KU

-iiiOeGRG2KCICviKxYYfrlsgn5AX6kvb0hNZXbGDCOg1kTOsMAIBLOhyRjSxWVOI

-yBlloo0QJveVDcdG50w28juteqtJNMYyGtZl7HmxbkIdFs8NuOco4IorlAjh8Yml

-m/fUWnY5q9PYjOAEs1dCZezTu2/fN3PssLmCJCjGwL9hVwiPCxkEEaQOA+P6NRpe

-DpxQoA2lHLjKoqFmYkYiuz5ffe4bnZWHimqdpjBOlXH+BjH6YWysR5icMw+xeTG7

-otVmxRRgRnU1dD3uBCgEfeVYxKBFTtS1g2Xqtj7wPpE2fn58/pqJoTUD2Ytbqq3C

-fiOezA185qZbU0GIvADFsx4FQnSh+O25DbhiirGEgTLERd6m4UIhk9owmAPMZIl0

-Fmeevu+TwaGvDapzap6TsiC5Gg7ux8fuQe39v3ou30c8ZGmNZlNYkYBkkR3geFYg

-OBt8GZpBE9zm7p1bf/cOgzGMxWPH5pba5sUdotXXb+wJ13u37ti7fityHORHsY8U

-3EIcamoemwqANdYHSGp118wZDNDqkyf03f0P/KNXfXqoIEmqjDSKVYJkgTSGlFkx

-/1Xkr5x/Lg6jD64/q1EjhSnhXZfDLEEwSyIBytiNLMdvDaiTn71bleWRjIY4Obpi

-ziw1g17fJMHsgqZSWlbvvv7WAo1zTEw1zn0unLO9QcBHQnGNG/gB+BJytkho104s

-vPiTtMHAbcS/GRU9ypQEl4VEsf8cMg/02mFnjhPWW1SiLGdgIwVPB6Yt4kZwrMDC

-i3wzrCNv7J7fW3vDDoUQkEpDjgvtpbbtusF5jcoEMxSrnhcEg1J+V2Ur8VwUhvAM

-x6jbM+6il5RApyA8LEwAtQdYFAaLR5/1rDbqb0qAAQUyAKDa9ZiN4PiwDmo9gbjd

-+/74O6KlOtEkVshgTRWOF7Wd2FOCBoPpt4KG54jrrtz4kQ/pslRIa34UFDT5+kqx

-6bler8d/scpqttqEEcSv6/kH5+pHao23TV51qDV/otOIzUIQdSlpZ418NkcYiTFD

-2EO4apvThSKo4qHH7v3lg1/nkXBc7HgiEwDyAnng+fYh7KMIXL+Mlr6HUlQUP4pZ

-ASZAtNJghkJzGSjUwo4VWh7ucUy4kWMGKzLa9rmPq6UCXJQuK1hQyKNw58aAJb7x

-PFl0vODxYwuzKyZkr7Fs5g+27vrbJ75vW46wbb/rVoUwc9nyhikpnwXH7yFxutvh

-UXRk3788869fjqIQkly7ixqWyGci2Y6JIPwOsBLBOFuRSDmoeS+IIip/CgmVN5tK

-LoUzmbiD0ugIN4wRi0kWNkK/dNd7Knt2xQTtefteO0w0HZ9iJEus7zwvCtVWhTb2

-V8IgXN/fP1s7ttyCsnjIUCfz6buuvvaOK3YIRcaqhmUZ7EinujT35PN2rS4z6iOx

-aFut00dfePjrIgpgBP2Qt0x8qiaqde52Qt4OcCMU9QithKHDhQZVHsGd7wj7iTgZ

-tVuskMYpTXS7/orJwamCxXeDjula00ObP/dxpqs9tJAD3ILrI9gOwnImrSrSG5pn

-vUwOkGGY68cXW788vQKJoqBK04XUWCmTSen3XHPLT08eW4rqCEYqCBBnkFCWfvEi

-nhoJs4YFCnfqkNWoYrATccmMWpYIFgg4O9OJihmuyfHMjEKkVGRDi1ffBPdx9wkh

-7QIFpPkhJMtRoxW2uiIMeRD5nbBB+Lo/+4QxNtxX6ygUTcv2Odd6TeLRgZzEaNIj

-jn//uukcWlyRCS1r8mhGK2aNTLxtBl1bGf+ja9/8pcd+FAYRVGzxWigjbsfET+0H

-72iObXNSFg8FeHXwKQCrH+J6G4HUnVpEAzkBFl1V0fhmeXRUgdkAMwRDjccXwyZA

-49NCAexIsNQITS/e2ehETbNL33r92Ntv66ESVxaNTnepYz8zv3Td6PD2NeX1Q4WL

-23RcLb4RRK/aNKH+Sst0FLCSpLyh4d7VSYR+5Kpd20cnhSwJqLporznCqGCScHxr

-bqEyNTG+VgF/LziQlegKhiQFP1hdwcdOocU2KW1UR69UGSP9pWkEyU2a9qttIiOc

-z4mu5dea4PKBZG7bbZayGz//x0o23Xewpu0+P7v42ImFJdvrhP5UOa/DNbzB+40w

-Z2EYPT8Envk8Gk3rkMxkiSiy1Hst/pYhI/2p6/d+pLZghiF2fRFGiJD+IqTVtTKV

-tXvePtFcnl+u8kadWx0MaoYJVQ1SGiZjG2ihJJEzLX5wDSiKdEHfFCzWqEywpvFq

-Lah3EBSAdlD3vOHP3lV609Z+/75ju48cnvnp8fnxfFrxo6FcOmuoF721vxryWSxB

-NoAWBgQTFXKFAKEDd4bPeLaeHrx1avM7t1377WefEK4XZzUgDYmbh2an4+GhZnvL

-QG52eEwCaw+unkexgBAFM6l3EJgUvLdciXEYiVZjOjexQzR/zIDK4PKry7zlAMnM

-lhNes2XdXe8nkgzJ9dDplX3HTp1otDcPFuBqto0NXjFSBsE8U9W/kbWx/+tDXcUI

-SStxH5Ej4UXRhU0GkZaUe3bcuKZUQpqKJAZjDfIIt2Wr44QhK9/2Xz+PGjXIaEhh

-GHyHIqN401a/uAaSUcqpsC1x8jm3624nkoGjAEwjcl3/9Ero+KHpr0h47Wc+ppYG

-Xq63QA+BYfPtbsBR2dCumRrZu3FCV3otM4SQeGPzrL99ijChMOq4PmDFoFj2Atvz

-Mkw7g2vsK9H28sgnr73lL9r/5nsupB+ADfi43G6bjrNm4uqXxORTj54YnmKVcZrO

-YaaTHiUoCGkUIKsRLM+FzQUfBeKKm26Fw1G3K+Vy4Bj9WkM4QdtznPfcenBy6vjR

-uf88UV3qWpU01Ns0l1JuWj9WTKd6Spzs1z8HWuz35JQq7z+9RHB2OMNCLmpNU1WY

-BHw6O1IUkw9u2v6DYweetLrI9oQfIsZWTLPr2FJ5fHjznpf2HT09Q6pzGMriKF4H

-oKCTCOQyjEgoZIZU2RvcsCs1uBEFoXBtoqvB4jK2ukSJgt0bwg++56GDJ0uqjAmW

-KXOjcP1Q/s6ta7PgavqK0M+9CWbxUAgYUFow9NFsutrplg3wbFBmOVKdDRcyktSf

-4rEfGdKNP7365hdq85Zlg2/BkuR3gGYOpnJ+cqf81LeoxImk+F1cryOrQ6A00CRu

-6MLQOLhEKkmFdW9hai7qtKXIcYjWsLpPjo4ujI1ed8ft6eLgmLMUCm4HwbZKcc/6

-sYGUqsns3P6gM5eRYHbmOigppPV1gwWvumz5Xsv2oWzt+v5c0xwppoezaTVuF8Wr

-zLeNr3/fVdfd22yLroskykM/9D2Y/oXJG/OVzXb9oJZKMUWVJcnOKq7HeWAS3GHM

-Z4wamWxmfPeplqmF0cHM0MGWZWuD6kRwJFXavHZLRVesILhxbQXKjI3lQkaV+z0r

-FGfFVdRMXxWY9fZ3YF2RgFWgS23LcyOorxuR4EVVq7544t1XrN0yUmw4/lDOSDH5

-01fd8PiJw8frK5lQ23XdjZWhCsx+pqSGt7515meH07qhS+U5ViQG4bZjmKc4VONK

-JpdPHdU3vjQP5Js52WhrQ+vL6VZzpZnTlUq6oCpyOWt84sZtQHdVor0026M2XnWr

-H6sBM9wvmyglhiYP46wq2VWr64R8QJdDhGbanYeOnGx3ndNWt5Q2ihl9JJ/+2i3v

-++Xkzh1Dw1dWRgHHJqQ3JPLTe448+926SFFqPGAWh7A34xe2MFxJlZ8j41em9QN4

-zU6fg0mtmfaGUk6URm7ZvPnF6tLW4YFrJioKCHR/42kvb519hAVGr3Gf+WXbu8Jx

-v1yCygyG7vp4yUo/1Yi9dl5TDEU6uNRou8H3Dp7YMzli+f5IOp3CAw8eXh4xBg8v

-th4/eTqlyCNZ/Rn2OwNOoxOAb5AKksxVvZjK73founL5oEvSRu5kswNl+5qcMV3M

-rSvlQI1vWjcqM3L+zpxfyVtnDUiC2asppBDxIhVokyLRrK5uGS4udaxyRhWRqHac

-rEaBU6WUBqX3gVrj3Vsmm7bz/FxtMK1GETdt96lWd83Ipr0D7vcX2UgOVzRmtoOp

-AVqrtsBZ3FxkxujkxqEB+Kl15UJWUySo4HosF/3NWOjSiFX4Hot4hjNGGKWKAuWR

-NlXOu37446NzkGW2Dhf8KNoyVCAz+MDSStsPZk1r+2gpvdwMoD4Igm5q+D/mj+Tk

-9hrJbi+2Kt3o1KJ524CWTg1PXvHmzNg0JSB1hXObr/qWsGfh8QVFfoLZb0W13njG

-WYRhKggCvVQVZe+mCaCFhHDEURDx8WLu+y8eXyOlFUIr+cw7t07Xuw6wkGJ+5NFH

-xqUjhEgvtJczlpbSWEEZLxpytjwJ+QqdZVZvbpzby32ms4lWydtvLy2enRs0fOGk

-z6fUs10TpAmRQfL7t29ouf6goRmynNaVsVK2P/4b1l/pHXwkMzQmk64FpbQ6KCua

-Vl5Htey5o1+QrfAlwq9VrI2/ob91gV2JP4oprZjSz3upv0UYZcZ3LR2vkHhlIGaV

-qqeZrEi5IUxoTwIvGWxWb4/4f10enDXgv0JIJKVLUvlNBHFFjff5K6pGKFULY+iS

-B+uSwgyfDdS/nQHp7GLNec/0b6mRG1ynq6XiN2xiwbXBtUzLoMvlf+cjlxy/8HkQ

-vgIjPrM7qi+RcmkL0dfLyHbNZsjD7NTVmDJ0uRCNocsmzr7nFu5lvSjt/EtUfvKK

-kXpl865UcWKVvN0vwezXyrqecvT/NhVWCtl1d2anxXkwkYRnq1M7L3yAMbrsIvn7

-jQlmSSSYJZFglmCWRIJZEglmCWZJJJglkWCWYJZEglkSCWYJZkkkmCWRYJZEglmC

-WRIJZkkkmCWYJZFglkSC2eUe/w2E/KAVUD2ebAAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="93" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.wmf
deleted file mode 100644
index 33e7a2e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInRose.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.svg
deleted file mode 100644
index c70f4be..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="455" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="381" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(0,31,159)" stroke="rgb(0,31,159)">

-      <path d="M206 199 L225 206 L225 209 L206 202 L206 199 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M206 199 L225 206 L225 209 L206 202 L206 199 Z" />

-      <path fill="navy" d="M225 206 L250 190 L250 193 L225 209 L225 206 Z" stroke="none" />

-      <path fill="none" d="M225 206 L250 190 L250 193 L225 209 L225 206 Z" />

-      <path fill="blue" d="M206 199 L225 206 L250 190 L232 185 L206 199 Z" stroke="none" />

-      <path fill="none" d="M206 199 L225 206 L250 190 L232 185 L206 199 Z" />

-      <path d="M211 201 L222 205 L246 189 L237 186 L211 201 Z" stroke="none" />

-      <path fill="none" d="M211 201 L222 205 L246 189 L237 186 L211 201 Z" />

-      <path fill="navy" d="M211 201 L222 205 L222 206 L211 202 L211 201 Z" stroke="none" />

-      <path fill="none" d="M211 201 L222 205 L222 206 L211 202 L211 201 Z" />

-      <path d="M209 199 L210 199 L211 198 L210 198 L209 199 Z" stroke="none" />

-      <path d="M214 196 L215 196 L216 196 L215 196 L214 196 Z" stroke="none" />

-      <path d="M218 194 L219 194 L220 193 L219 193 L218 194 Z" stroke="none" />

-      <path d="M222 191 L223 192 L224 191 L224 191 L222 191 Z" stroke="none" />

-      <path d="M227 189 L228 189 L229 188 L228 188 L227 189 Z" stroke="none" />

-      <path d="M231 187 L232 187 L233 186 L232 186 L231 187 Z" stroke="none" />

-      <path d="M226 204 L227 204 L228 203 L227 203 L226 204 Z" stroke="none" />

-      <path d="M231 201 L231 201 L232 200 L232 200 L231 201 Z" stroke="none" />

-      <path d="M235 198 L236 198 L237 198 L236 197 L235 198 Z" stroke="none" />

-      <path d="M239 196 L239 196 L240 195 L240 195 L239 196 Z" stroke="none" />

-      <path d="M242 193 L243 193 L244 193 L243 193 L242 193 Z" stroke="none" />

-      <path d="M246 191 L247 191 L248 190 L247 190 L246 191 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M216 181 L218 181 L218 181 L218 181 L219 181 L219 181 L219 181 L219 182 L219 182 L219 186 L219 187 L219 187 L219 187 L219 193 L218 193 L218 193 L218 187 L218 187 L218 187 L218 187 L218 186 L218 183 L218 182 L217 182 L217 182 L217 181 L217 181 L216 181 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M212 183 L214 182 L214 182 L214 183 L215 183 L215 183 L215 183 L215 183 L215 184 L215 189 L215 189 L215 189 L215 189 L215 195 L214 195 L214 195 L214 189 L214 189 L213 189 L213 189 L213 188 L213 185 L213 184 L213 184 L213 184 L213 183 L213 183 L212 183 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M208 186 L209 185 L210 185 L210 185 L211 185 L211 185 L211 185 L211 186 L211 186 L211 191 L211 191 L211 191 L211 191 L211 197 L210 198 L210 197 L210 191 L209 191 L209 191 L209 191 L209 191 L209 187 L209 186 L209 186 L209 186 L209 186 L208 186 L208 186 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M220 179 L222 179 L222 179 L223 179 L223 179 L223 179 L223 179 L223 180 L223 180 L223 184 L223 185 L223 185 L223 185 L223 191 L222 191 L222 191 L222 185 L222 185 L222 185 L222 185 L222 184 L222 181 L222 180 L222 180 L221 180 L221 180 L221 179 L220 179 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M225 177 L226 176 L226 176 L227 176 L227 177 L227 177 L227 177 L227 177 L227 178 L227 182 L227 182 L227 182 L227 182 L227 188 L227 188 L226 188 L226 182 L226 182 L226 182 L226 182 L226 182 L226 178 L226 178 L226 178 L226 177 L225 177 L225 177 L225 177 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M228 175 L230 175 L230 175 L230 175 L231 175 L231 175 L231 175 L231 175 L231 176 L231 180 L231 180 L231 180 L230 180 L230 186 L230 186 L230 186 L230 180 L230 180 L229 180 L229 180 L229 180 L229 176 L229 176 L229 176 L229 176 L229 175 L229 175 L228 175 Z" stroke="none" />

-      <path fill="silver" d="M217 181 L218 180 L218 180 L219 180 L219 181 L219 181 L219 181 L219 181 L219 182 L219 186 L219 186 L219 187 L219 187 L219 192 L219 193 L218 192 L218 187 L218 187 L218 186 L218 186 L218 186 L218 182 L218 182 L218 182 L218 181 L217 181 L217 181 L217 181 Z" stroke="none" />

-      <path fill="silver" d="M212 183 L214 182 L214 182 L215 182 L215 182 L215 183 L215 183 L215 183 L215 184 L215 188 L215 188 L215 189 L215 189 L215 195 L215 195 L214 195 L214 189 L214 189 L214 188 L214 188 L214 188 L214 184 L214 184 L214 184 L213 183 L213 183 L213 183 L212 183 Z" stroke="none" />

-      <path fill="silver" d="M208 185 L210 184 L210 184 L211 185 L211 185 L211 185 L211 185 L211 185 L211 186 L211 191 L211 191 L211 191 L211 191 L211 197 L210 197 L210 197 L210 191 L210 191 L210 191 L209 191 L209 190 L209 187 L209 186 L209 186 L209 186 L209 185 L209 185 L208 185 Z" stroke="none" />

-      <path fill="silver" d="M221 179 L222 178 L223 178 L223 178 L223 179 L223 179 L223 179 L223 179 L224 180 L224 184 L223 184 L223 185 L223 185 L223 190 L223 191 L222 190 L222 185 L222 184 L222 184 L222 184 L222 184 L222 180 L222 180 L222 180 L222 179 L221 179 L221 179 L221 179 Z" stroke="none" />

-      <path fill="silver" d="M225 177 L226 176 L227 176 L227 176 L227 176 L227 177 L227 177 L228 177 L228 177 L228 182 L227 182 L227 182 L227 182 L227 188 L227 188 L227 188 L227 182 L226 182 L226 182 L226 182 L226 182 L226 178 L226 178 L226 177 L226 177 L226 177 L225 177 L225 177 Z" stroke="none" />

-      <path fill="silver" d="M229 175 L230 174 L230 174 L231 174 L231 174 L231 175 L231 175 L231 175 L231 175 L231 180 L231 180 L231 180 L231 180 L231 185 L230 186 L230 185 L230 180 L230 180 L230 180 L230 180 L230 180 L230 176 L230 176 L230 175 L229 175 L229 175 L229 175 L229 175 Z" stroke="none" />

-      <path fill="rgb(0,31,159)" d="M206 189 L222 194 L223 191 L205 186 L206 189 Z" stroke="none" />

-      <path fill="none" d="M206 189 L222 194 L223 191 L205 186 L206 189 Z" />

-      <path fill="rgb(95,127,255)" d="M205 186 L207 183 L222 187 L223 191 L205 186 Z" stroke="none" />

-      <path fill="none" d="M205 186 L207 183 L222 187 L223 191 L205 186 Z" />

-      <path fill="navy" d="M223 191 L222 194 L248 180 L248 177 L223 191 Z" stroke="none" />

-      <path fill="none" d="M223 191 L222 194 L248 180 L248 177 L223 191 Z" />

-      <path fill="rgb(63,127,255)" d="M222 187 L223 191 L248 177 L246 175 L222 187 Z" stroke="none" />

-      <path fill="none" d="M222 187 L223 191 L248 177 L246 175 L222 187 Z" />

-      <path fill="rgb(159,191,255)" d="M207 183 L222 187 L246 175 L230 172 L207 183 Z" stroke="none" />

-      <path fill="none" d="M207 183 L222 187 L246 175 L230 172 L207 183 Z" />

-      <path fill="rgb(63,63,63)" d="M233 185 L235 184 L235 184 L235 185 L236 185 L236 185 L236 185 L236 185 L236 186 L236 190 L236 191 L236 191 L236 191 L236 197 L235 197 L235 197 L235 191 L235 191 L234 191 L234 190 L234 190 L234 186 L234 186 L234 186 L234 186 L234 185 L234 185 L233 185 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M229 188 L230 187 L231 187 L231 187 L231 187 L232 187 L232 187 L232 188 L232 188 L232 193 L232 193 L232 193 L231 193 L231 199 L231 200 L231 199 L231 193 L230 193 L230 193 L230 193 L230 193 L230 189 L230 188 L230 188 L230 188 L230 188 L229 188 L229 188 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M224 190 L226 189 L226 189 L227 190 L227 190 L227 190 L227 190 L227 190 L227 191 L227 196 L227 196 L227 196 L227 196 L227 202 L227 202 L226 202 L226 196 L226 196 L226 196 L226 196 L226 195 L226 191 L226 191 L225 191 L225 191 L225 190 L225 190 L224 190 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M237 183 L239 182 L239 182 L239 182 L240 183 L240 183 L240 183 L240 183 L240 184 L240 188 L240 188 L240 188 L240 189 L240 194 L239 195 L239 194 L239 189 L239 188 L239 188 L239 188 L239 188 L239 184 L239 184 L238 184 L238 183 L238 183 L238 183 L237 183 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M241 181 L242 180 L243 180 L243 180 L243 180 L244 181 L244 181 L244 181 L244 181 L244 186 L244 186 L244 186 L243 186 L243 192 L243 192 L243 192 L243 186 L243 186 L242 186 L242 186 L242 186 L242 182 L242 182 L242 181 L242 181 L242 181 L242 181 L241 181 Z" stroke="none" />

-      <path fill="rgb(63,63,63)" d="M245 179 L246 178 L246 178 L247 178 L247 178 L247 179 L247 179 L247 179 L247 179 L247 184 L247 184 L247 184 L247 184 L247 189 L247 190 L246 189 L246 184 L246 184 L246 184 L246 184 L246 184 L246 180 L246 180 L246 179 L246 179 L245 179 L245 179 L245 179 Z" stroke="none" />

-      <path fill="silver" d="M233 185 L235 184 L235 184 L236 184 L236 184 L236 185 L236 185 L236 185 L236 186 L236 190 L236 190 L236 190 L236 191 L236 196 L236 197 L235 196 L235 191 L235 190 L235 190 L235 190 L235 190 L235 186 L235 186 L235 186 L234 185 L234 185 L234 185 L233 185 Z" stroke="none" />

-      <path fill="silver" d="M229 187 L231 186 L231 186 L231 187 L232 187 L232 187 L232 187 L232 187 L232 188 L232 193 L232 193 L232 193 L232 193 L232 199 L231 199 L231 199 L231 193 L231 193 L231 193 L231 193 L231 192 L231 189 L231 188 L230 188 L230 188 L230 187 L230 187 L229 187 Z" stroke="none" />

-      <path fill="silver" d="M224 190 L226 189 L227 189 L227 189 L227 189 L227 190 L228 190 L228 190 L228 191 L228 195 L228 196 L227 196 L227 196 L227 202 L227 202 L226 202 L226 196 L226 196 L226 196 L226 195 L226 195 L226 191 L226 191 L226 191 L226 190 L225 190 L225 190 L224 190 Z" stroke="none" />

-      <path fill="silver" d="M238 183 L239 182 L239 182 L240 182 L240 182 L240 182 L240 183 L240 183 L240 183 L240 188 L240 188 L240 188 L240 188 L240 194 L240 194 L239 194 L239 188 L239 188 L239 188 L239 188 L239 188 L239 184 L239 184 L239 183 L239 183 L238 183 L238 183 L238 183 Z" stroke="none" />

-      <path fill="silver" d="M241 181 L243 180 L243 180 L244 180 L244 180 L244 180 L244 181 L244 181 L244 181 L244 185 L244 186 L244 186 L244 186 L244 191 L243 192 L243 191 L243 186 L243 186 L243 186 L243 186 L243 185 L243 182 L243 181 L243 181 L242 181 L242 181 L242 181 L241 181 Z" stroke="none" />

-      <path fill="silver" d="M245 179 L246 178 L247 178 L247 178 L247 178 L247 178 L248 179 L248 179 L248 179 L248 183 L248 184 L247 184 L247 184 L247 189 L247 189 L247 189 L247 184 L246 184 L246 184 L246 183 L246 183 L246 180 L246 179 L246 179 L246 179 L246 179 L245 179 L245 179 Z" stroke="none" />

-      <path d="M223 182 L224 182 L225 182 L224 183 L223 182 Z" stroke="none" />

-      <path fill="rgb(95,127,255)" d="M223 182 L224 182 L225 182 L224 183 L223 182 Z" stroke="none" />

-      <path d="M214 185 L217 185 L217 185 L217 185 L217 185 L217 185 L217 184 L217 184 L216 184 L216 184 L216 184 L215 184 L215 184 L215 184 L214 185 Z" stroke="none" />

-      <path d="M214 185 L217 185 L217 186 L214 185 L214 185 Z" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.wmf
deleted file mode 100644
index 8782cb6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/AddInVB.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.svg
deleted file mode 100644
index 9d6bd59..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="606" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="343" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2292,0,0,6.2222,2,2)" stroke="white">

-      <image x="0" y="0" width="96" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA2CAIAAAC3LQuFAAADWklEQVR42mP8//8/

-wyjADZhGgwA/YAHiWYwmowGBFaT9P8MCY80cDQ40MIsxfTSLjZZBowFEj0J6sIHG

-Aao06v+fGRoBBAKYrTNGRgYKmmwNQO1AEo8JYAVDJ4CoGjoEgmbIl0EUh85wK4PI

-C50GHHmEwjTFNJp2hmwKIjHt/P/fQKLxjMSkI6bRtDM0A2jQDMKMtqSHUQAByxpS

-q6rRFDTaDsKop4isfUZT0GgKwtHGwUxHEJJxJLakR1MQkfHMiFIGNWCNfxqVSqMp

-aHjUYkjpqIG+jezRFDR0U1BjI4isr6dKKdNAbuobTUFDNwUhpx3atHFGU9CIqcWQ

-29D4AaSVNFqLjaYgbKUP8amjgXotptEUNCzKINJnLKhWEo2moGHXmycm7dC2HTR7

-9vre3iUfP37BquHVq3dAWSBJia1UMWRgUtCjRy/S0lp9fe2srfUtLHSB3Dt3Hjs5

-mcIZV67cLSmZIC0tamWlLycnARHn4uIAKgZqBwbr2bPXdXSUgcqA5I8fv4Cyxsaa

-/Pw8+/adBiqAqMRvCC1KFqqt7jh27GJNTXJUlPvWrUeAXKC7nZ0zkRnI4Nath/Ly

-Pl+//gAqrq2dDgkgoLLFi7etXr0nJaUFSE6YsHzVqt3AxAJUBlTQ1jZ/xYqdaIbk

-5HQJC/MfPXoRmKwGewpatmwnMHTExIQiI6tzc8MxNaioyAJJSMwDMyMwNH19bdXV

-5dTVg+Hqi4tjgOkFGFKbNvUZGqqfP3+TnZ3t69dvwLAAyj59+hqoHW4IJLz27DkF

-jIMZM9YC9dK0b0VRAF28eGvz5kP29kZAPwBz2cmTV+XkxCHpAhL/aEBCQuTcuRtA

-xvfvP4EkMFiBmQWrNdu3H7169V5zcyamFDc3FzCvQcKlsjJxsKUglCx26tRVYIoA

-uhWIgOkImEAUFKSAISUg4LBt2xGIGmCcA0WAOQuYRuzsDIEimZntBgZRe/dOx2ON

-kZFGS8tcYA46ePAcmiHABAhMlYyMJkDU3j6fCqNIkIEkKgHG////z2I0oWQhOTB9

-ActgKroJtIiT7DyFMcxGfOMSbRHnLMZ0xEp7SgB1Q4eKo0jDuqFI90UKQymAsK5X

-HhSF9CgYDaDRABoNoIEppCGbx0YB9gBKG0y1xmADAAI5hxjV10XdAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="54" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.wmf
deleted file mode 100644
index 2ae8b13..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Automate.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.emf
deleted file mode 100644
index f6d7ed6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.svg
deleted file mode 100644
index 4a927c4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BB3ValueObject.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1025" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="428" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="16" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M377 15 C330 15 293 53 293 100 C293 146 330 184 377 184 C424 184 461 146 461 100 C461 53 424 15 377 15" />

-      <path fill="none" d="M612 15 C566 15 528 53 528 100 C528 146 566 184 612 184 C659 184 697 146 697 100 C697 53 659 15 612 15" />

-      <path d="M-3816 -2565 ZM176 238 L823 238 L823 263 L176 263 ZM754 196 L848 251 L754 305 C748 309 741 307 737 301 C734 295 736 287 742 284 L817 240 L817 262 L742 218 C736 214 734 207 737 201 C741 195 748 193 754 196 Z" stroke="none" />

-      <path fill="none" d="M-3816 -2565 ZM176 238 L823 238 L823 263 L176 263 ZM754 196 L848 251 L754 305 C748 309 741 307 737 301 C734 295 736 287 742 284 L817 240 L817 262 L742 218 C736 214 734 207 737 201 C741 195 748 193 754 196 Z" stroke-width="1" stroke-linecap="butt" stroke-linejoin="bevel" />

-      <path fill="none" d="M377 15 C330 15 293 53 293 100 C293 146 330 184 377 184 C424 184 461 146 461 100 C461 53 424 15 377 15" />

-      <path fill="none" d="M612 15 C566 15 528 53 528 100 C528 146 566 184 612 184 C659 184 697 146 697 100 C697 53 659 15 612 15" />

-      <path d="M-3816 -2565 ZM176 238 L823 238 L823 263 L176 263 ZM754 196 L848 251 L754 305 C748 309 741 307 737 301 C734 295 736 287 742 284 L817 240 L817 262 L742 218 C736 214 734 207 737 201 C741 195 748 193 754 196 Z" stroke="none" />

-      <path fill="none" d="M-3816 -2565 ZM176 238 L823 238 L823 263 L176 263 ZM754 196 L848 251 L754 305 C748 309 741 307 737 301 C734 295 736 287 742 284 L817 240 L817 262 L742 218 C736 214 734 207 737 201 C741 195 748 193 754 196 Z" stroke-width="1" stroke-linecap="butt" stroke-linejoin="bevel" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.svg
deleted file mode 100644
index ad78da8..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="181" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="175" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2593,2,3)" stroke="white">

-      <image x="0" y="0" width="28" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAbCAIAAADganh7AAAAxElEQVR42t2WUQ6D

-MAiGwexeHq30aJ6MNZh1DeiKGzzMphpb6Sc/NFQkiG+PdhXmQGJFXCDJ01prMFXF

-lIjU0M5M7AFS5CMJP1Q7SfZLicw+kUs+4ta6n5sS07R9+lk4wCq9Pbfbxrz+6qkg

-ejRdRJf8F9dLnMsfuHD77KMkeFDN+yQPBbcPuzGbcrwcRZDVMvWxPrNb2rde+Xal

-EjSBorTRWjn+TaKs/KvcC9nnk/PRFVMr33K742pvvCv/fxzRmPGH8gQO42W6Fp7k

-tgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="27" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.wmf
deleted file mode 100644
index c08cc3d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNC.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.svg
deleted file mode 100644
index 0f8f6e2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="181" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="175" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2593,2,3)" stroke="white">

-      <image x="0" y="0" width="28" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAbCAIAAADganh7AAAAuElEQVR42t2WWw6E

-MAhFwbgvl1a6NFeGHcxMCPWBKXyMpBpLyJELhooE8Ta3qzAHEiviBEmZ1lqDqaam

-RGS2vecmHiBFPpLwQ7WTdL+UyO4TueQjrm35uSk1TftOr4UDLLLac7utzMtopoL4

-VdNFdMn/cr3Ee/mKC6/vPkqDlWrenawG7r49jLzKlMX0OwzCRHI3473yz7jemqKY

-FmUSN5G93yX/jDsqv+/GqPyn3M/k/48jGjP+UDYT6WixKRd/jAAAAABJRU5ErkJg

-gg==" xlink:type="simple" xlink:actuate="onLoad" height="27" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.wmf
deleted file mode 100644
index 102d773..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BNF.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.svg
deleted file mode 100644
index c7f2da5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="266" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="137" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M3 3 L264 3 L264 135 L3 135 L3 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="silver" stroke="silver">

-      <path d="M4 133 L25 112 L242 25 L262 4 L4 4 L4 133 Z" clip-path="url(#clipPath1)" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 133 L25 112 L242 25 L262 4 L4 4 L4 133 Z" clip-path="url(#clipPath1)" />

-      <path fill="none" d="M4 4 L25 25" clip-path="url(#clipPath1)" />

-      <path fill="gray" d="M25 112 L4 133 L262 133 L262 4 L242 25 L25 112 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M25 112 L4 133 L262 133 L262 4 L242 25 L25 112 Z" clip-path="url(#clipPath1)" />

-      <path fill="none" d="M262 133 L242 112" clip-path="url(#clipPath1)" />

-      <path fill="white" d="M242 25 L25 25 L25 112 L242 112 L242 25 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M242 25 L25 25 L25 112 L242 112 L242 25 Z" clip-path="url(#clipPath1)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.wmf
deleted file mode 100644
index 8b5141f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BoutonAction.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.svg
deleted file mode 100644
index b1f2583..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="45" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="35" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L19.0244 0 L19.0244 14.0323 L0 14.0323 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(2.05,0,0,2.0667,3,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAPCAIAAABr+ngCAAAAlElEQVR42mP88ecH

-A7mABVOoo6UDmVtRU4FLMxOmzoqaBgcHBziJZhZOmyE6Txw5YGHjACcrahw6WtC1

-QZzDiOxnsOYKgl4FKmtoaABqZMImy3HiyAk8JE4/AwGaszFJfJrx6wSSKJoh4QkP

-VdJshgQSPKhIs3lg/MyCLW02MDAcOHAAD4lNM9DbHCwcxGcMRkpyFQD1xrMU20Bw

-/QAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="15" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.wmf
deleted file mode 100644
index 72f2b7a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/BrancheDossier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.svg
deleted file mode 100644
index d8f5107..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="618" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="331" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2308,2,2)" stroke="white">

-      <image x="0" y="0" width="98" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAAA0CAIAAAD+EHqzAAABwUlEQVR42u3ai23D

-IBAA0IBY4vbITMkaWcOZqXt0DBcFiRrzjQ34OO5UqcqvsZ+O4wqIdV1vHLmQTFAS

-yvx6iztbBOOx/vwzfR4vjLKLt3jyoOPaxEzMxEzMNFHfNMSs7LYzy3RMQQgbv58G

-z/vIPd4QLqSYrE4QIh2Jj2wFa5GpsXS+FTRk57EUGZ0Emc2vw16qG1BPnVh+HfZS

-tIHSXuVYqqkRHqDYYCyUko2AMBttsdK9SMNsGgLIlcoPQDmzkZXKppWc3KhwACo8

-Ri8hnIeRLR/ztu2r/jNkVwjsrZofX+3ahJIYUqlDOtBcSLmKzEx8/qzHy3K9atPQ

-E9xgJdyvVv1LOHam7NT2lVoL4golXBc8XfbONk26D3BvL9o3ee/sUPIRzXSJW929

-lEZpQcYznRMQWVqpw6T/NJA++sPZlE+lmky0E6pmNg0tBckF38qDbkQpfcGQWxSv

-3xCYNuqGaUPlcBK1LeH6i4dIKyjeWWnYXmJOK8CzT2evAw8W4Nz19bEu8YIhzhDs

-LrGnFwx3IqWbF9A435TwCkYQEeY5LVd4Y0HEGc9enkHkFQKi//oSDrUpAU/myDA9

-qG+0nYw/ShkUFfV8oggAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="52" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.wmf
deleted file mode 100644
index ac4f310..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/CasUtilisation.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.svg
deleted file mode 100644
index c996ccc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="250" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="85" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 85 L250 85 L250 0 L0 0 L0 85 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 85 L250 85 L250 0 L0 0 L0 85 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.wmf
deleted file mode 100644
index cd82d54..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ChampTexte.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.svg
deleted file mode 100644
index 0121678..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="606" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="337" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2292,0,0,6.2264,2,2)" stroke="white">

-      <image x="0" y="0" width="96" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAAA1CAIAAAAxuXkrAAABLUlEQVR42u2bgQ2C

-MBBFrekS7OFMuIZrwEzs4Ri1iUGhLbQEqL36fpQ0l4aE5/27Q1EZYy5oWdq+e3UD

-RFCtGfS46sDhqFd3e7wCYl0AAhCAAASgwuegw1ujzJGnywHI6mkGcXSa5VEZi1GD

-AAQgAAHI10Op98sJVj4HbaAzflE3XZNBASJ2XWDi/DiDXGShDPpQm9HcF5QKKNGD

-O4NVdbHoJYWT7oRapos1v1+YptXqmyCh4IENUZdmqKDF/ByZbVgNCuxi87a1XiOc

-nSmJtnVDkXPQgi/8Dc7ORItFzy/AYtEqGzRLem0WbDHuxQAEIHRikW7qelaEXzUi

-HyoWowYBCEAAAhBtnjmIOQgBCEAAAhBt/s8B1fenGCwGIADlqEFyn5DPAagVePeU

-TS8t6q0W/6bjEwAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="53" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.wmf
deleted file mode 100644
index ba91e79..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Classe.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.svg
deleted file mode 100644
index e8b9ab3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="480" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="599" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M4 97 L476 97 L476 4 L4 4 L4 97 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 97 L476 97 L476 4 L4 4 L4 97 Z" />

-      <path fill="white" d="M4 595 L476 595 L476 97 L4 97 L4 595 Z" stroke="none" />

-      <path fill="none" d="M4 595 L476 595 L476 97 L4 97 L4 595 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.wmf
deleted file mode 100644
index ba49730..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ColonneDeListe.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.svg
deleted file mode 100644
index 3fddf92..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="42" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="21" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="42" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAVCAIAAAC/jet0AAAA7klEQVR42mP8//8/

-w8ABJoYBBaPWDyvrnzx5UlxcDCQHxvp3796tWLHiHRj8+fMHv2IWGoXq58+fV61a

-JSgoqK6uzsjI+O/fP6BTgFwVFRV6WA8Ee/fuvXHjBjAMvnz5wsHBwczMrKWltXPn

-TiCD5kmPh4fHzc3t27dvQLuBIQH0/devXxMTE5HtpqH1wABPSUlJTk4G+ltAQADI

-TUtLi4iIoF/GA1qZlJQkIyPz/ft3oCMqKirQvE7zfC8hIVFXV2doaJibmyskJES/

-lA8H/mAwWuiOCOtlZWX7+vqAJDGKqZ/0gCVreHj4aNwTAQC+yVUHpiuPFgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="21" preserveAspectRatio="none" xlink:show="embed" />

-      <path d="M1 20 L4 17 L38 4 L41 1 L1 1 L1 20 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M1 20 L4 17 L38 4 L41 1 L1 1 L1 20 Z" />

-      <path fill="none" d="M1 1 L4 4" />

-      <path fill="gray" d="M4 17 L1 20 L41 20 L41 1 L38 4 L4 17 Z" stroke="none" />

-      <path fill="none" d="M4 17 L1 20 L41 20 L41 1 L38 4 L4 17 Z" />

-      <path fill="none" d="M41 20 L38 17" />

-      <path fill="white" d="M38 4 L4 4 L4 17 L38 17 L38 4 Z" stroke="none" />

-      <path fill="none" d="M38 4 L4 4 L4 17 L38 17 L38 4 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.wmf
deleted file mode 100644
index 876d704..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ComboBox.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.svg
deleted file mode 100644
index 8772d43..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="599" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="362" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M4 358 L595 358 L595 4 L4 4 L4 358 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 358 L595 358 L595 4 L4 4 L4 358 Z" />

-      <path fill="none" d="M79 358 L79 4" />

-      <path fill="none" d="M520 358 L520 4" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.wmf
deleted file mode 100644
index fafe4ac..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Contrainte.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.svg
deleted file mode 100644
index 6ed5cf7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1234" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1295" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <ellipse rx="608.5" ry="590" cx="621.5" cy="703" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <ellipse rx="608.5" fill="none" ry="590" cx="621.5" cy="703" />

-      <path fill="none" d="M760 14 L496 125" />

-      <path fill="none" d="M761 235 L497 124" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.wmf
deleted file mode 100644
index b07aa22..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Controleur.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.emf
deleted file mode 100644
index 6fdbec2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.svg
deleted file mode 100644
index a3dd564..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/DesktopComputer.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="85" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="92" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M66 68 L17 68 L17 58 L66 58 L66 68 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M66 68 L17 68 L17 58 L66 58 L66 68 Z" />

-      <path fill="white" d="M75 90 L8 90 L8 66 L75 66 L75 90 Z" stroke="none" />

-      <path fill="none" d="M75 90 L8 90 L8 66 L75 66 L75 90 Z" />

-      <path fill="white" d="M-209 844 ZM71 59 C71 60 70 61 70 61 C14 61 14 61 14 61 C13 61 12 60 12 59 C12 3 12 3 12 3 C12 3 13 2 14 2 C70 2 70 2 70 2 C70 2 71 3 71 3 Z" stroke="none" />

-      <path fill="none" d="M-209 844 ZM71 59 C71 60 70 61 70 61 C14 61 14 61 14 61 C13 61 12 60 12 59 C12 3 12 3 12 3 C12 3 13 2 14 2 C70 2 70 2 70 2 C70 2 71 3 71 3 Z" />

-      <path fill="white" d="M71 3 ZM66 48 C66 49 66 50 65 50 C19 50 19 50 19 50 C18 50 17 49 17 48 C17 9 17 9 17 9 C17 9 18 8 19 8 C65 8 65 8 65 8 C66 8 66 9 66 9 Z" stroke="none" />

-      <path fill="none" d="M71 3 ZM66 48 C66 49 66 50 65 50 C19 50 19 50 19 50 C18 50 17 49 17 48 C17 9 17 9 17 9 C17 9 18 8 19 8 C65 8 65 8 65 8 C66 8 66 9 66 9 Z" />

-      <path fill="white" d="M66 9 ZM64 55 C64 57 63 58 62 58 C60 58 59 57 59 55 C59 54 60 53 62 53 C63 53 64 54 64 55 Z" stroke="none" />

-      <path fill="none" d="M66 9 ZM64 55 C64 57 63 58 62 58 C60 58 59 57 59 55 C59 54 60 53 62 53 C63 53 64 54 64 55 Z" />

-      <path fill="white" d="M41 65 L41 90 Z" stroke="none" />

-      <path fill="none" d="M41 65 L41 90" />

-      <path fill="white" d="M62 65 L62 90 Z" stroke="none" />

-      <path fill="none" d="M62 65 L62 90" />

-      <path fill="white" d="M41 73 L62 73 Z" stroke="none" />

-      <path fill="none" d="M41 73 L62 73" />

-      <path fill="white" d="M41 82 L62 82 Z" stroke="none" />

-      <path fill="none" d="M41 82 L62 82" />

-      <path fill="white" d="M45 69 L58 69 Z" stroke="none" />

-      <path fill="none" d="M45 69 L58 69" />

-      <path fill="white" d="M47 71 L56 71 Z" stroke="none" />

-      <path fill="none" d="M47 71 L56 71" />

-      <path d="M60 68 L59 68 L59 67 L60 67 L60 68 Z" stroke="none" />

-      <path fill="white" d="M59 78 L44 78 L44 75 L59 75 L59 78 Z" stroke="none" />

-      <path fill="none" d="M59 78 L44 78 L44 75 L59 75 L59 78 Z" />

-      <path fill="white" d="M56 80 L59 80 Z" stroke="none" />

-      <path fill="none" d="M56 80 L59 80" stroke-linecap="round" />

-      <path fill="white" d="M75 71 L68 71 L68 67 L75 67 L75 71 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M75 71 L68 71 L68 67 L75 67 L75 71 Z" />

-      <path fill="white" d="M83 90 L1 90 L1 84 L83 84 L83 90 Z" stroke="none" />

-      <path fill="none" d="M83 90 L1 90 L1 84 L83 84 L83 90 Z" />

-      <path fill="white" d="M1 86 L82 86 Z" stroke="none" />

-      <path fill="none" d="M1 86 L82 86" />

-      <path fill="white" d="M54 55 L28 55 L28 52 L54 52 L54 55 Z" stroke="none" />

-      <path fill="none" d="M54 55 L28 55 L28 52 L54 52 L54 55 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.svg
deleted file mode 100644
index f9585c3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1610" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1417" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <rect width="586" x="17" height="199" y="27" stroke="none" />

-      <rect width="1593" x="18" height="1201" y="216" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect fill="none" width="1593" x="18" height="1201" y="216" />

-      <line y2="23" fill="none" x1="19" x2="19" y1="215" />

-      <line y2="23" fill="none" x1="21" x2="607" y1="23" />

-      <line y2="215" fill="none" x1="607" x2="607" y1="23" />

-      <ellipse fill="white" rx="449.5" cx="803.5" ry="450" cy="827" stroke="none" />

-      <ellipse rx="449.5" fill="none" ry="450" cx="803.5" cy="827" />

-      <path fill="none" d="M721 911 L565 800 L543 657 L589 619 L624 563 L614 540 L577 556 L566 550 L519 573 L494 547 L527 529 L480 524 L700 447 L717 471 L792 447 L785 462 L805 474 L805 451 L827 437 L876 478 L894 475 L895 476 L906 483 L907 483 L908 483 L947 452 L1008 498 L986 520 L957 593 L966 618 L966 619 L918 624 L921 638 L873 647 L866 651 L834 680 L813 685 L809 705 L794 714 L792 731 L761 746 L748 774 L730 777 L701 837 L703 839 L718 842 L714 879 L735 895 L761 886 L768 896 L805 884 L864 908 L869 911 Z" />

-      <path fill="none" d="M1198 620 L1178 635 L1179 709 L1118 850 L1136 876 L1145 906 L1177 930 L1238 932" />

-      <path fill="none" d="M1021 436 L999 446 L1037 529 L1072 533 L1115 504" />

-      <path fill="none" d="M828 1275 L808 1249 L797 1135 L766 1116 L710 989 L739 938 L725 913 L873 913 L946 965 L1025 1035 L996 1102 L993 1145 L967 1158 L946 1224 L907 1264" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.wmf
deleted file mode 100644
index 4604174..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Domaine.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.svg
deleted file mode 100644
index fd1e455..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="575" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="174" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 175 L575 175 L575 0 L0 0 L0 175 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 175 L575 175 L575 0 L0 0 L0 175 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.wmf
deleted file mode 100644
index eb581c2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/EcranLogique.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.svg
deleted file mode 100644
index 84092b9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1207" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1196" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <circle r="591.5" cx="602.5" cy="597.5" stroke="none" />

-    </g>

-    <g fill="rgb(36,39,40)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(36,39,40)">

-      <circle fill="none" r="591.5" cx="602.5" cy="597.5" />

-      <path fill="none" d="M10 1187 L1194 1187" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.wmf
deleted file mode 100644
index edd5c1f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Entite.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.emf
deleted file mode 100644
index 9ae052a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.svg
deleted file mode 100644
index b6c47b4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fachkomponente.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="859" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="765" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="16" stroke-miterlimit="8" stroke-linecap="round">

-      <path fill="none" d="M74 75 L74 689 L782 689 L782 75 Z" />

-      <path fill="none" d="M168 169 L168 358 L404 358 L404 169 Z" />

-      <path fill="none" d="M451 406 L451 594 L688 594 L688 406 Z" />

-      <path fill="none" d="M74 75 L74 689 L782 689 L782 75 Z" />

-      <path fill="none" d="M168 169 L168 358 L404 358 L404 169 Z" />

-      <path fill="none" d="M451 406 L451 594 L688 594 L688 406 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.svg
deleted file mode 100644
index 154dbb6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="56" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="53" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L20.4 0 L20.4 19.4043 L0 19.4043 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(2.5,0,0,2.4737,3,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAATCAIAAAAf7rriAAAAn0lEQVR42sVTwQ2A

-IAxEQsI0DMAqbMKPH5uwCjPxs7EJqaC1aoz3QtLrXY+6tNbUU2j1Av+RDf0IIfDV

-pZRvlJ1zMcazUmstR0bUWudL7/2FsoQgJVMXh40W3DDMuc/Mx94z18KZOduomXPG

-SFNKaAEaDYZp5ruZ4wY4QBdq4WxyMxvuFXAYbqTvPK/EBZlq0lWDRoe/vWG2T6rc

-o7qFFRUbPzcuLvUxAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="19" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.wmf
deleted file mode 100644
index bf00bdd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/FeuilleDossier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.svg
deleted file mode 100644
index c850b05..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="268" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="306" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L42.1609 0 L42.1609 48.1605 L0 48.1605 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2292,2,2)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="42" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAwCAIAAADo7H/xAAACnklEQVR42u1YPa8B

-QRR9K2oUiERCQi1C4aORiI7wD5TEK3QKESoKBTWJn6AjShGF0IiIQiQ0EgpR0Gi9

-k3eTycZ6z8cbWXnZW0xm787O2Ttz7pm7K5zP5w/5TPUhqynwMpr6qlcQhNdBisn+

-ltFLX5OLSRf1jal3PB4LhQLrf36b2F+tVtkA3GLBNRoNDos/n89LpdJ0Os3lcrjc

-bDbRaHS9Xlut1larNRqNXC5XKBSKRCJ+v58egRNtMpl0OBw+n+9P0Xc6HbTAxkTU

-N5lMFJnBYICn2Wyib7PZ8vl8KpWip/Aq3W73Huwb8Igbkw4Gg91uh0tEHAgEsB5w

-zmYzi8WC9QCw0WhMp9PUhx8jJ5MJh8UHHusXi0W0Wq1WnA6JRII6eAM2mDn/heiC

-29VvkzKf0kHMdhrMR3ZAY6L0cDg8nU79fp8xHx0iudvthme73drtdko8DOYDD/aC

-TcFgECTf7/di5lM6IFaPxwNsDMhkMhiMFvzgtvhg3Gq1Asn1er2Y+UgHuotloCwA

-Ki4fwr4RvZTJF8x/gupKuaHAK/DvXeuxMqZer0NqarUaaTsSHXqn0+kOhwNaOJfL

-ZblczmazUCc6G3lqPqRNqu1kdBxoNJrxeIwjPxwOc4ueNB9qj3mh9hfaXqlU2HEA

-1F6vh0e8Xi/PvUcZQ2ov1XZ2HGBTgIrSyOl0ou7gufeYju2lVNuvVjucqfeiD4xn

-Eo/Km6v1v7jyeVXeo/JHCoDk2OlYLIaY4vE4iElOyo6fQr/6yfYYPHiOFCCSt9vt

-xWJhNpupCoITLZh4P/bDew8aouaH8gAb6UeaQ6RDajwU95PUuyA5SeEvdPv9M1n1

-Uqrf/ERXyYjNP+9Zft/5a0L9hFb8RWfe67wXlJ+qCrw89gXyypDVZm0NjgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="48" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.wmf
deleted file mode 100644
index 69d11d3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Fichier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.svg
deleted file mode 100644
index c0170d1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1844" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1196" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <ellipse rx="609.5" ry="589" cx="1226.5" cy="600" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <ellipse rx="609.5" fill="none" ry="589" cx="1226.5" cy="600" />

-      <path fill="none" d="M10 288 L9 923" />

-      <path fill="none" d="M13 601 L616 602" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.wmf
deleted file mode 100644
index e6c7a47..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Frontiere.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.svg
deleted file mode 100644
index 292dd5b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="32" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="32" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="32" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAP0lEQVR42mNgoDFg

-BOL////TynRGRiZa+2DUglELhoAFDAOfk4G5EY8CgrKjkTxqwagFoxaMWjBqwagF

-gwMAAOEKDDkNp6WgAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="32" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.wmf
deleted file mode 100644
index 5270c62..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADSpecifique.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.svg
deleted file mode 100644
index 292dd5b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="32" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="32" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="32" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAP0lEQVR42mNgoDFg

-BOL////TynRGRiZa+2DUglELhoAFDAOfk4G5EY8CgrKjkTxqwagFoxaMWjBqwagF

-gwMAAOEKDDkNp6WgAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="32" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.wmf
deleted file mode 100644
index 5270c62..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IADStandard.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.svg
deleted file mode 100644
index 292dd5b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="32" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="32" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="32" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAP0lEQVR42mNgoDFg

-BOL////TynRGRiZa+2DUglELhoAFDAOfk4G5EY8CgrKjkTxqwagFoxaMWjBqwagF

-gwMAAOEKDDkNp6WgAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="32" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.wmf
deleted file mode 100644
index 5270c62..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IAT.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.svg
deleted file mode 100644
index 737ff44..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="362" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="312" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2105,0,0,6.2245,2,2)" stroke="white">

-      <image x="0" y="0" width="57" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADkAAAAxCAIAAADvKZa/AAACEElEQVR42u1YvarC

-MBi9uXTXyUUQNwdfQHCw6OwoXAU3dXO6jkLrczgK+gDiJlIXQTdXNwV3cXLrPTQX

-CdVKq/kx2A8MaRLCycn5vhwk9pc2YeBnue4rWxBC2E/3td2CYkCIETg3GFiWFQao

-D5s34ori9W48B9Tj1c+0bdthdouGFVxGgg4Qy6V5O+44vk8n5C1F4/XujkFnANYw

-t+04fBL4W0L+4kjaYBWYW0E1iGqObdVjDao4FBzbSg6dNKCzXh+U2IDnQBHWqCqE

-skOezTRNgW9syJCZZJ+dW1EVL08Dr6giqvE1RPAqyPiq4fU542uI1ihH42sIpZOv

-8eVfBwi/p8xnfD+1vhIv2A6rBLZVX19pxbktPbyM72e/sYL+yOCpAQnGlw9WOcZX

-mR94Isn461Wc+9bQv2632/l8TvvNZnM0GqFNpVLT6RQj1WqVTg2Hw/P53Gq1EomE

-Mv+azWbT6XS9Xt/v95fLpdfr1Wo1jO92u+vSw+HQ6XSAu1gsFgoFZf4VPIFFdDKZ

-DDDdXbparfr9fj6fn81mD7C+hX8dj8eNRgNHAv3dbpee7S38K5SA9nQ6JZNJKmho

-t1QqHY9HyGC9Xl9FLNu/LhaLSqVCbwcymEwmuVwOfUBEkmF8s9lAAL9egF0kmXz/

-+s9ruVxmdf3jBbuu3W4/mI39a+xfY/8a+9fYv+rsX4mtTx34A1bqSk650SSAAAAA

-AElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="49" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.wmf
deleted file mode 100644
index 531f6d1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUA.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.svg
deleted file mode 100644
index 7a7b9e2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="343" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="318" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2037,0,0,6.22,2,2)" stroke="white">

-      <image x="0" y="0" width="54" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAAyCAIAAACYtr+cAAAA5UlEQVR42u1ZWw6D

-MAyjE/dqb7btZt3JsopIU1kZkBCgrM4XRDwsx0mMcETU1R23rvoARECsJfoy5dzz

-REBEdxRazllJG1hER58Qa6bHVVl8DL1GB3LpsjPMRUCUxGuI7Zm256L33iSDdgFE

-gRbz0c8rhzMxxo+28sx4VYxu5HaWKnIZYno6v1W0EtPFOkCWTmexYRvq6L384pci

-t/imvSAaejl9octtix29QlXpgMvHYyiEMFPZSS3qOrrXqWpGauZfFNjRh0G08tht

-u24rjw3XDYgaLU6aZ7D4gyz8AwREQPwjiG9YropCy+2wvgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="50" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.wmf
deleted file mode 100644
index 5ff7934..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUE.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.svg
deleted file mode 100644
index 0e57cf1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="331" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="281" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2308,0,0,6.2273,2,2)" stroke="white">

-      <image x="0" y="0" width="52" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAAsCAIAAAClnwxKAAABB0lEQVR42u1XUQ6D

-IAwVw73gZttuxk7WMZs1RJhg6aYI/RETbJ+v79GgAGA6a8zTiUPjQ6mHeGqA25WZ

-m8XZqiesKc1Jhax222DuvigGBJn49m25KHtyq6yLe3KrrIvbZu5IFw+3cl083Mp1

-8TWZS7uYy59ann269bkEb923W40x7HX7zH1cs9dl73DOWWvRwl5M8Zq2ec4KC1W1

-1dfGMggiuYdQogn8Kx1ACHSDFE1lstzwNLfaExbKyu7I8ZX9czFwYVuTLSYo5W39

-n1sZs05tf1OuOcwT7qfMqyRkoyz6KnCygz/Opnm9iEGjzlBDe9djtvY7W8VP0bav

-hlXnXNeX6gHuN/ECOnuxXEHsDZUAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="44" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.wmf
deleted file mode 100644
index 3e10a8a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUGE.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.svg
deleted file mode 100644
index 40114a5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="268" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="293" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2174,2,2)" stroke="white">

-      <image x="0" y="0" width="42" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAuCAIAAADRMBwaAAAA60lEQVR42u1Y0Q7D

-IAj0Gj/cP2dLnIlR6oCYMWJ5MI21wePwhIKIkp9dydWy+UsAwpWLAAdE/8EtTpq6

-no2BM/qz3Wd7VvdrrOLxx5lP6TsmJDypd5DmM3wrdTAm+oq7gSzDCH0MgqDncI/P

-ROoYBMv8IhjHGyFmtcPpeVlw37+lwNzPe28VgJj7EOceqi6n1azlRvWSnPWA6NeV

-IIW78eDb4eZ1bOvm5i5pmBnokEPKLIWLrkzSwr1nPFVPjn6be3m7v9l9nwHVfn3w

-qJk2EpcX69vc21i/lR1wddLsY5YBQwxw9H+9x/257l/BanveQxWkXgAAAABJRU5E

-rkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="46" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.wmf
deleted file mode 100644
index 0f9cafd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/IUS.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.svg
deleted file mode 100644
index 5ad0063..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="20" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="20" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAiElEQVR42mP8//8/

-A4ngdAQzhMFChjbT0/wgtulHFjK0wQELedoIa8ajDZ9mgtqwayZSG7pmkrQhNJOh

-DQKYvW80A7VJP+MgVecz6Z9Mpiv+AqMbiBhIByBnA/WT72cIIMMI9KgiyQjsiYRI

-I/AlT4JGEM4YeIwgNktiNYK0wgDZCJI1IxsBBABAjkS+iwrVQgAAAABJRU5ErkJg

-gg==" xlink:type="simple" xlink:actuate="onLoad" height="20" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.wmf
deleted file mode 100644
index a0e6d80..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienExterne.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.svg
deleted file mode 100644
index e3e5e08..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="496" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="48" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g />

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.wmf
deleted file mode 100644
index 28fc626..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/LienHypertexte.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.svg
deleted file mode 100644
index a79ca86..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1832" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="915" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M4 899 L1817 899 L1817 16 L4 16 L4 899 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 899 L1817 899 L1817 16 L4 16 L4 899 Z" />

-      <path fill="rgb(179,179,179)" d="M1756 826 L1817 826 L1817 89 L1756 89 L1756 826 Z" stroke="none" />

-      <path fill="none" d="M1756 826 L1817 826 L1817 89 L1756 89 L1756 826 Z" />

-      <path fill="rgb(179,179,179)" d="M1756 89 L1817 89 L1817 28 L1756 28 L1756 89 Z" stroke="none" />

-      <path fill="none" d="M1756 89 L1817 89 L1817 28 L1756 28 L1756 89 Z" />

-      <path d="M1789 43 L1774 74 L1805 74 L1789 43 Z" stroke="none" />

-      <path fill="none" d="M1789 43 L1774 74 L1805 74 L1789 43 Z" stroke-width="6" />

-      <path fill="rgb(179,179,179)" d="M1756 887 L1817 887 L1817 826 L1756 826 L1756 887 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M1756 887 L1817 887 L1817 826 L1756 826 L1756 887 Z" />

-      <path d="M1789 872 L1805 842 L1774 842 L1789 872 Z" stroke="none" />

-      <path fill="none" d="M1789 872 L1805 842 L1774 842 L1789 872 Z" stroke-width="6" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.wmf
deleted file mode 100644
index 794a6df..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ListeDeroulante.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.svg
deleted file mode 100644
index 2ef9075..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="268" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="306" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L42.1609 0 L42.1609 48.1605 L0 48.1605 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2292,2,2)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="42" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAwCAIAAADo7H/xAAAAuklEQVR42u2Y4Q6A

-IAiEg/n+r2xb/WmUiJfpmse/tuqjAw9Ncs7bvNBtahBP/Jr4dL0QkWHg028ovq9P

-lyiVVYFnerHr4r/P4PqGu5xalV2O+ILtfb25uzUDk3SpjTTeevEMzJ1OC2vVHEwh

-OrKj6z7eCkbw6tKN2k6kEJFi467nZwCwm0231AoYG/R8pxVafRocOY8YYEbgE8/A

-sPmU3m8ZuNcjnnjiif/1KWfYWXNt8YX/9Ygnfjn8DvKKXV7am5JRAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="48" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.wmf
deleted file mode 100644
index 8f8fa32..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Message.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.emf
deleted file mode 100644
index 52ebcd6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.svg
deleted file mode 100644
index 20341f9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_FDDIhub.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="77" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="77" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M11 14 L66 62" />

-      <path fill="none" d="M13 64 L64 13" />

-      <path fill="none" d="M1 39 L74 39" />

-      <path fill="none" d="M38 1 L38 75" />

-      <path fill="white" d="M-213 836 ZM62 39 C62 51 51 62 38 62 C26 62 15 51 15 39 C15 26 26 15 38 15 C51 15 62 26 62 39 Z" stroke="none" />

-      <path fill="none" d="M-213 836 ZM62 39 C62 51 51 62 38 62 C26 62 15 51 15 39 C15 26 26 15 38 15 C51 15 62 26 62 39 Z" />

-      <path fill="white" d="M30 59 L18 47 L18 30 L30 18 L47 18 L59 30 L59 47 L47 59 L30 59 Z" stroke="none" />

-      <path fill="none" d="M30 59 L18 47 L18 30 L30 18 L47 18 L59 30 L59 47 L47 59 L30 59 Z" />

-      <path fill="white" d="M33 53 L25 45 L25 33 L33 25 L45 25 L53 33 L53 45 L45 53 L33 53 Z" stroke="none" />

-      <path fill="none" d="M33 53 L25 45 L25 33 L33 25 L45 25 L53 33 L53 45 L45 53 L33 53 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.emf
deleted file mode 100644
index 5658894..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.svg
deleted file mode 100644
index 4f162ef..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_PCWithTower.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="94" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="87" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M74 78 L48 78 L48 71 L74 71 L74 78 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M74 78 L48 78 L48 71 L74 71 L74 78 Z" />

-      <path fill="white" d="M86 84 L37 84 L37 77 L86 77 L86 84 Z" stroke="none" />

-      <path fill="none" d="M86 84 L37 84 L37 77 L86 77 L86 84 Z" />

-      <path fill="white" d="M-205 841 ZM91 72 C91 72 90 73 90 73 C34 73 34 73 34 73 C33 73 32 72 32 72 C32 16 32 16 32 16 C32 15 33 14 34 14 C90 14 90 14 90 14 C90 14 91 15 91 16 Z" stroke="none" />

-      <path fill="none" d="M-205 841 ZM91 72 C91 72 90 73 90 73 C34 73 34 73 34 73 C33 73 32 72 32 72 C32 16 32 16 32 16 C32 15 33 14 34 14 C90 14 90 14 90 14 C90 14 91 15 91 16 Z" />

-      <path fill="white" d="M91 16 ZM86 60 C86 61 86 62 85 62 C39 62 39 62 39 62 C38 62 37 61 37 60 C37 21 37 21 37 21 C37 21 38 20 39 20 C85 20 85 20 85 20 C86 20 86 21 86 21 Z" stroke="none" />

-      <path fill="none" d="M91 16 ZM86 60 C86 61 86 62 85 62 C39 62 39 62 39 62 C38 62 37 61 37 60 C37 21 37 21 37 21 C37 21 38 20 39 20 C85 20 85 20 85 20 C86 20 86 21 86 21 Z" />

-      <path fill="white" d="M86 21 ZM84 68 C84 69 83 70 82 70 C80 70 79 69 79 68 C79 66 80 65 82 65 C83 65 84 66 84 68 Z" stroke="none" />

-      <path fill="none" d="M86 21 ZM84 68 C84 69 83 70 82 70 C80 70 79 69 79 68 C79 66 80 65 82 65 C83 65 84 66 84 68 Z" />

-      <path fill="white" d="M74 67 L48 67 L48 64 L74 64 L74 67 Z" stroke="none" />

-      <path fill="none" d="M74 67 L48 67 L48 64 L74 64 L74 67 Z" />

-      <path fill="white" d="M30 85 L1 85 L1 2 L30 2 L30 85 Z" stroke="none" />

-      <path fill="none" d="M30 85 L1 85 L1 2 L30 2 L30 85 Z" />

-      <path fill="white" d="M5 31 L5 6 L26 6 L26 31 L5 31 Z" stroke="none" />

-      <path fill="none" d="M5 31 L5 6 L26 6 L26 31 L5 31 Z" />

-      <path fill="white" d="M5 14 L26 14 Z" stroke="none" />

-      <path fill="none" d="M5 14 L26 14" />

-      <path fill="white" d="M5 22 L26 22 Z" stroke="none" />

-      <path fill="none" d="M5 22 L26 22" />

-      <path fill="white" d="M9 10 L22 10 Z" stroke="none" />

-      <path fill="none" d="M9 10 L22 10" />

-      <path fill="white" d="M11 11 L20 11 Z" stroke="none" />

-      <path fill="none" d="M11 11 L20 11" />

-      <path d="M24 9 L23 9 L23 8 L24 8 L24 9 Z" stroke="none" />

-      <path fill="white" d="M23 19 L8 19 L8 16 L23 16 L23 19 Z" stroke="none" />

-      <path fill="none" d="M23 19 L8 19 L8 16 L23 16 L23 19 Z" />

-      <path fill="white" d="M20 21 L23 21 Z" stroke="none" />

-      <path fill="none" d="M20 21 L23 21" stroke-linecap="round" />

-      <path fill="white" d="M28 50 L21 50 L21 47 L28 47 L28 50 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M28 50 L21 50 L21 47 L28 47 L28 50 Z" />

-      <path fill="white" d="M23 28 L7 28 L7 25 L23 25 L23 28 Z" stroke="none" />

-      <path fill="none" d="M23 28 L7 28 L7 25 L23 25 L23 28 Z" />

-      <path fill="white" d="M20 29 L23 29 Z" stroke="none" />

-      <path fill="none" d="M20 29 L23 29" stroke-linecap="round" />

-      <path fill="white" d="M26 40 L5 40 L5 31 L26 31 L26 40 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M26 40 L5 40 L5 31 L26 31 L26 40 Z" />

-      <path fill="white" d="M84 68 ZM26 78 C26 79 25 79 25 79 C7 79 7 79 7 79 C6 79 5 79 5 78 C5 56 5 56 5 56 C5 55 6 54 7 54 C25 54 25 54 25 54 C25 54 26 55 26 56 Z" stroke="none" />

-      <path fill="none" d="M84 68 ZM26 78 C26 79 25 79 25 79 C7 79 7 79 7 79 C6 79 5 79 5 78 C5 56 5 56 5 56 C5 55 6 54 7 54 C25 54 25 54 25 54 C25 54 26 55 26 56 Z" />

-      <path fill="white" d="M26 56 ZM21 77 C21 77 20 78 20 78 C12 78 12 78 12 78 C12 78 11 77 11 77 C11 77 11 77 11 77 C11 76 12 76 12 76 C20 76 20 76 20 76 C20 76 21 76 21 77 Z" stroke="none" />

-      <path fill="none" d="M26 56 ZM21 77 C21 77 20 78 20 78 C12 78 12 78 12 78 C12 78 11 77 11 77 C11 77 11 77 11 77 C11 76 12 76 12 76 C20 76 20 76 20 76 C20 76 21 76 21 77 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.emf
deleted file mode 100644
index 88601f0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.svg
deleted file mode 100644
index 677e26f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_cloudShape.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="96" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="86" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-204 841 ZM92 67 C92 63 89 59 85 58 C85 53 81 49 76 49 C73 49 70 51 69 53 C67 51 65 49 62 49 C57 49 53 53 53 58 C49 59 46 63 46 67 C46 71 49 74 53 76 C53 80 57 84 62 84 C65 84 67 83 69 81 C71 83 73 84 76 84 C81 84 85 80 85 76 C89 75 92 71 92 67 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-204 841 ZM92 67 C92 63 89 59 85 58 C85 53 81 49 76 49 C73 49 70 51 69 53 C67 51 65 49 62 49 C57 49 53 53 53 58 C49 59 46 63 46 67 C46 71 49 74 53 76 C53 80 57 84 62 84 C65 84 67 83 69 81 C71 83 73 84 76 84 C81 84 85 80 85 76 C89 75 92 71 92 67 Z" />

-      <path fill="white" d="M92 67 ZM88 67 C88 63 86 60 82 60 C82 55 79 52 75 52 C72 52 70 53 69 55 C67 53 65 52 63 52 C59 52 55 56 55 60 C52 60 50 63 50 67 C50 70 52 73 55 74 C55 78 59 81 63 81 C65 81 68 80 69 78 C70 80 72 81 75 81 C79 81 82 78 82 74 C86 73 88 70 88 67 Z" stroke="none" />

-      <path fill="none" d="M92 67 ZM88 67 C88 63 86 60 82 60 C82 55 79 52 75 52 C72 52 70 53 69 55 C67 53 65 52 63 52 C59 52 55 56 55 60 C52 60 50 63 50 67 C50 70 52 73 55 74 C55 78 59 81 63 81 C65 81 68 80 69 78 C70 80 72 81 75 81 C79 81 82 78 82 74 C86 73 88 70 88 67 Z" />

-      <path fill="white" d="M88 67 ZM93 37 C93 29 87 21 79 20 C79 10 71 2 61 2 C55 2 50 5 46 10 C43 5 38 2 32 2 C22 2 14 10 14 20 C6 22 1 29 1 37 C1 45 6 52 14 54 C14 64 22 72 32 72 C38 72 43 69 47 64 C50 69 55 72 61 72 C71 72 79 64 79 55 C87 53 93 46 93 37 Z" stroke="none" />

-      <path fill="none" d="M88 67 ZM93 37 C93 29 87 21 79 20 C79 10 71 2 61 2 C55 2 50 5 46 10 C43 5 38 2 32 2 C22 2 14 10 14 20 C6 22 1 29 1 37 C1 45 6 52 14 54 C14 64 22 72 32 72 C38 72 43 69 47 64 C50 69 55 72 61 72 C71 72 79 64 79 55 C87 53 93 46 93 37 Z" />

-      <path fill="white" d="M93 37 ZM85 37 C85 30 80 24 74 22 C74 14 67 8 59 8 C54 8 49 10 46 14 C44 10 39 8 34 8 C26 8 19 14 19 23 C13 24 8 30 8 37 C8 44 13 50 19 51 C19 60 26 66 34 66 C39 66 44 64 47 60 C49 64 54 66 59 66 C67 66 73 60 74 52 C80 50 85 44 85 37 Z" stroke="none" />

-      <path fill="none" d="M93 37 ZM85 37 C85 30 80 24 74 22 C74 14 67 8 59 8 C54 8 49 10 46 14 C44 10 39 8 34 8 C26 8 19 14 19 23 C13 24 8 30 8 37 C8 44 13 50 19 51 C19 60 26 66 34 66 C39 66 44 64 47 60 C49 64 54 66 59 66 C67 66 73 60 74 52 C80 50 85 44 85 37 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.emf
deleted file mode 100644
index c836733..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.svg
deleted file mode 100644
index 980a29e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_communicationLink.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="95" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="87" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M43 57 L70 40 L69 66 L88 61 L58 81 L60 52 L43 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M43 57 L70 40 L69 66 L88 61 L58 81 L60 52 L43 57 Z" />

-      <path fill="white" d="M55 51 L68 44 L66 69 L75 67 L61 76 L63 50 L55 51 Z" stroke="none" />

-      <path fill="none" d="M55 51 L68 44 L66 69 L75 67 L61 76 L63 50 L55 51 Z" />

-      <path fill="white" d="M1 35 L57 2 L54 55 L92 44 L33 85 L37 26 L1 35 Z" stroke="none" />

-      <path fill="none" d="M1 35 L57 2 L54 55 L92 44 L33 85 L37 26 L1 35 Z" />

-      <path fill="white" d="M27 25 L52 10 L49 61 L66 56 L39 74 L43 21 L27 25 Z" stroke="none" />

-      <path fill="none" d="M27 25 L52 10 L49 61 L66 56 L39 74 L43 21 L27 25 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.emf
deleted file mode 100644
index b8d514b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.svg
deleted file mode 100644
index 0a768d8..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_ethernet.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="92" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="80" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g>

-      <path d="M-207 836 ZM32 73 C32 77 32 77 32 77 C32 77 32 77 32 77 C32 78 31 78 31 78 C30 78 29 78 29 77 C29 77 29 77 29 77 C29 73 29 73 29 73 Z" stroke="none" />

-      <path fill="none" d="M-207 836 ZM32 73 C32 77 32 77 32 77 C32 77 32 77 32 77 C32 78 31 78 31 78 C30 78 29 78 29 77 C29 77 29 77 29 77 C29 73 29 73 29 73 Z" stroke-linejoin="round" />

-      <path d="M29 73 ZM60 73 C60 77 60 77 60 77 C60 77 60 77 60 77 C60 78 59 78 58 78 C57 78 57 78 57 77 C57 77 57 77 57 77 C57 73 57 73 57 73 Z" stroke-linejoin="round" stroke="none" />

-      <path fill="none" d="M29 73 ZM60 73 C60 77 60 77 60 77 C60 77 60 77 60 77 C60 78 59 78 58 78 C57 78 57 78 57 77 C57 77 57 77 57 77 C57 73 57 73 57 73 Z" stroke-linejoin="round" />

-      <path d="M57 73 ZM85 40 C89 40 89 40 89 40 C89 40 89 40 89 40 C89 40 89 40 89 41 C89 42 89 43 89 43 C89 43 89 43 89 43 C85 43 85 43 85 43 Z" stroke-linejoin="round" stroke="none" />

-      <path fill="none" d="M57 73 ZM85 40 C89 40 89 40 89 40 C89 40 89 40 89 40 C89 40 89 40 89 41 C89 42 89 43 89 43 C89 43 89 43 89 43 C85 43 85 43 85 43 Z" stroke-linejoin="round" />

-      <path fill="white" d="M85 43 ZM84 43 C84 43 85 42 85 41 C85 40 84 40 84 40 C84 40 84 40 84 41 C84 42 84 43 84 43 Z" stroke-linejoin="round" stroke="none" />

-      <path fill="none" d="M85 43 ZM84 43 C84 43 85 42 85 41 C85 40 84 40 84 40 C84 40 84 40 84 41 C84 42 84 43 84 43 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="white" stroke-miterlimit="4" stroke-linecap="butt" stroke="white">

-      <path d="M84 43 ZM26 48 C26 73 26 73 26 73 C26 73 26 73 26 73 C26 74 28 74 30 74 C33 74 35 74 35 73 C35 73 35 73 35 73 C35 48 35 48 35 48 Z" stroke="none" />

-      <path fill="none" d="M84 43 ZM26 48 C26 73 26 73 26 73 C26 73 26 73 26 73 C26 74 28 74 30 74 C33 74 35 74 35 73 C35 73 35 73 35 73 C35 48 35 48 35 48 Z" stroke="black" />

-      <path d="M35 48 ZM54 48 C54 73 54 73 54 73 C54 73 54 73 54 73 C54 74 56 74 58 74 C60 74 62 74 62 73 C62 73 62 73 62 73 C62 48 62 48 62 48 Z" stroke="none" />

-      <path fill="none" d="M35 48 ZM54 48 C54 73 54 73 54 73 C54 73 54 73 54 73 C54 74 56 74 58 74 C60 74 62 74 62 73 C62 73 62 73 62 73 C62 48 62 48 62 48 Z" stroke="black" />

-      <path d="M62 48 ZM6 52 C83 52 83 52 83 52 C83 52 83 52 83 52 C85 52 87 48 87 42 C87 36 85 31 83 31 C83 31 83 31 83 31 C6 31 6 31 6 31 Z" stroke="none" />

-      <path fill="none" d="M62 48 ZM6 52 C83 52 83 52 83 52 C83 52 83 52 83 52 C85 52 87 48 87 42 C87 36 85 31 83 31 C83 31 83 31 83 31 C6 31 6 31 6 31 Z" stroke="black" />

-      <path d="M6 31 ZM6 31 C9 31 10 35 10 42 C10 48 9 52 6 52 C4 52 2 48 2 42 C2 35 4 31 6 31 Z" stroke="none" />

-      <path fill="none" d="M6 31 ZM6 31 C9 31 10 35 10 42 C10 48 9 52 6 52 C4 52 2 48 2 42 C2 35 4 31 6 31 Z" stroke="black" />

-      <path d="M6 31 ZM12 7 C12 32 12 32 12 32 C12 32 12 32 12 32 C12 33 14 34 16 34 C19 34 21 33 21 32 C21 32 21 32 21 32 C21 7 21 7 21 7 Z" stroke="none" />

-      <path fill="none" d="M6 31 ZM12 7 C12 32 12 32 12 32 C12 32 12 32 12 32 C12 33 14 34 16 34 C19 34 21 33 21 32 C21 32 21 32 21 32 C21 7 21 7 21 7 Z" stroke="black" />

-      <path d="M21 7 ZM21 7 C21 8 19 9 16 9 C14 9 12 8 12 7 C12 7 14 6 16 6 C19 6 21 7 21 7 Z" stroke="none" />

-      <path fill="none" d="M21 7 ZM21 7 C21 8 19 9 16 9 C14 9 12 8 12 7 C12 7 14 6 16 6 C19 6 21 7 21 7 Z" stroke="black" />

-      <path d="M21 7 ZM40 7 C40 32 40 32 40 32 C40 32 40 32 40 32 C40 33 42 34 44 34 C47 34 48 33 49 32 C49 32 49 32 49 32 C49 7 49 7 49 7 Z" stroke="none" />

-      <path fill="none" d="M21 7 ZM40 7 C40 32 40 32 40 32 C40 32 40 32 40 32 C40 33 42 34 44 34 C47 34 48 33 49 32 C49 32 49 32 49 32 C49 7 49 7 49 7 Z" stroke="black" />

-      <path d="M49 7 ZM49 7 C49 8 47 9 44 9 C42 9 40 8 40 7 C40 7 42 6 44 6 C47 6 49 7 49 7 Z" stroke="none" />

-      <path fill="none" d="M49 7 ZM49 7 C49 8 47 9 44 9 C42 9 40 8 40 7 C40 7 42 6 44 6 C47 6 49 7 49 7 Z" stroke="black" />

-      <path d="M49 7 ZM67 7 C67 32 67 32 67 32 C67 32 67 32 67 32 C68 33 69 34 72 34 C74 34 76 33 76 32 C76 32 76 32 76 32 C76 7 76 7 76 7 Z" stroke="none" />

-      <path fill="none" d="M49 7 ZM67 7 C67 32 67 32 67 32 C67 32 67 32 67 32 C68 33 69 34 72 34 C74 34 76 33 76 32 C76 32 76 32 76 32 C76 7 76 7 76 7 Z" stroke="black" />

-      <path d="M76 7 ZM76 7 C76 8 74 9 72 9 C69 9 67 8 67 7 C67 7 69 6 72 6 C74 6 76 7 76 7 Z" stroke="none" />

-      <path fill="none" d="M76 7 ZM76 7 C76 8 74 9 72 9 C69 9 67 8 67 7 C67 7 69 6 72 6 C74 6 76 7 76 7 Z" stroke="black" />

-      <path fill="black" d="M76 7 ZM1 40 C6 40 6 40 6 40 C6 40 6 40 6 40 C6 40 6 40 6 41 C6 42 6 43 6 43 C6 43 6 43 6 43 C1 43 1 43 1 43 Z" stroke="none" />

-    </g>

-    <g stroke-linejoin="round" stroke-miterlimit="4">

-      <path fill="none" d="M76 7 ZM1 40 C6 40 6 40 6 40 C6 40 6 40 6 40 C6 40 6 40 6 41 C6 42 6 43 6 43 C6 43 6 43 6 43 C1 43 1 43 1 43 Z" />

-      <path fill="white" d="M1 43 ZM1 43 C1 43 1 42 1 41 C1 40 1 40 1 40 C1 40 1 40 1 41 C1 42 1 43 1 43 Z" stroke="none" />

-      <path fill="none" d="M1 43 ZM1 43 C1 43 1 42 1 41 C1 40 1 40 1 40 C1 40 1 40 1 41 C1 42 1 43 1 43 Z" stroke-linecap="butt" stroke-linejoin="miter" />

-      <path d="M1 43 ZM18 2 C18 7 18 7 18 7 C18 7 18 7 18 7 C18 7 17 7 16 7 C16 7 15 7 15 7 C15 7 15 7 15 7 C15 2 15 2 15 2 Z" stroke-linecap="butt" stroke-linejoin="miter" stroke="none" />

-      <path fill="none" d="M1 43 ZM18 2 C18 7 18 7 18 7 C18 7 18 7 18 7 C18 7 17 7 16 7 C16 7 15 7 15 7 C15 7 15 7 15 7 C15 2 15 2 15 2 Z" />

-      <path fill="white" d="M15 2 ZM15 2 C15 2 16 2 16 2 C17 2 18 2 18 2 C18 1 17 1 16 1 C16 1 15 1 15 2 Z" stroke="none" />

-      <path fill="none" d="M15 2 ZM15 2 C15 2 16 2 16 2 C17 2 18 2 18 2 C18 1 17 1 16 1 C16 1 15 1 15 2 Z" stroke-linecap="butt" stroke-linejoin="miter" />

-      <path d="M15 2 ZM46 2 C46 7 46 7 46 7 C46 7 46 7 46 7 C46 7 45 7 44 7 C43 7 43 7 43 7 C43 7 43 7 43 7 C43 2 43 2 43 2 Z" stroke-linecap="butt" stroke-linejoin="miter" stroke="none" />

-      <path fill="none" d="M15 2 ZM46 2 C46 7 46 7 46 7 C46 7 46 7 46 7 C46 7 45 7 44 7 C43 7 43 7 43 7 C43 7 43 7 43 7 C43 2 43 2 43 2 Z" />

-      <path fill="white" d="M43 2 ZM43 2 C43 2 43 2 44 2 C45 2 46 2 46 2 C46 1 45 1 44 1 C43 1 43 1 43 2 Z" stroke="none" />

-      <path fill="none" d="M43 2 ZM43 2 C43 2 43 2 44 2 C45 2 46 2 46 2 C46 1 45 1 44 1 C43 1 43 1 43 2 Z" stroke-linecap="butt" stroke-linejoin="miter" />

-      <path d="M43 2 ZM74 2 C74 7 74 7 74 7 C74 7 74 7 74 7 C74 7 73 7 72 7 C71 7 70 7 70 7 C70 7 70 7 70 7 C70 2 70 2 70 2 Z" stroke-linecap="butt" stroke-linejoin="miter" stroke="none" />

-      <path fill="none" d="M43 2 ZM74 2 C74 7 74 7 74 7 C74 7 74 7 74 7 C74 7 73 7 72 7 C71 7 70 7 70 7 C70 7 70 7 70 7 C70 2 70 2 70 2 Z" />

-      <path fill="white" d="M70 2 ZM70 2 C70 2 71 2 72 2 C73 2 74 2 74 2 C74 1 73 1 72 1 C71 1 70 1 70 2 Z" stroke="none" />

-      <path fill="none" d="M70 2 ZM70 2 C70 2 71 2 72 2 C73 2 74 2 74 2 C74 1 73 1 72 1 C71 1 70 1 70 2 Z" stroke-linecap="butt" stroke-linejoin="miter" />

-    </g>

-    <g fill="white" stroke-miterlimit="4" stroke-linecap="butt" stroke="white">

-      <path d="M9 50 L86 50 Z" stroke="none" />

-      <path fill="none" d="M9 50 L86 50" stroke="black" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.emf
deleted file mode 100644
index 36053cd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.svg
deleted file mode 100644
index 3641c32..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_externalModem.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="89" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="49" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M82 47 L6 47 L6 41 L82 41 L82 47 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M82 47 L6 47 L6 41 L82 41 L82 47 Z" />

-      <path fill="white" d="M-207 822 ZM83 20 C5 20 5 20 5 20 C4 20 4 21 4 22 C4 43 4 43 4 43 C84 43 84 43 84 43 C84 22 84 22 84 22 C84 21 83 20 83 20 Z" stroke="none" />

-      <path fill="none" d="M-207 822 ZM83 20 C5 20 5 20 5 20 C4 20 4 21 4 22 C4 43 4 43 4 43 C84 43 84 43 84 43 C84 22 84 22 84 22 C84 21 83 20 83 20 Z" />

-      <path fill="none" d="M15 35 L12 35 L12 21 L15 21 L15 35 Z" />

-      <path fill="none" d="M23 35 L20 35 L20 21 L23 21 L23 35 Z" />

-      <path fill="none" d="M32 35 L29 35 L29 21 L32 21 L32 35 Z" />

-      <path fill="none" d="M40 35 L37 35 L37 21 L40 21 L40 35 Z" />

-      <path fill="none" d="M83 20 ZM85 6 C79 6 79 6 79 6 C79 3 79 3 79 3 C79 2 78 2 78 2 C10 2 10 2 10 2 C9 2 9 2 9 3 C9 6 9 6 9 6 C2 6 2 6 2 6 C2 6 1 6 1 7 C1 43 1 43 1 43 C4 43 4 43 4 43 C4 22 4 22 4 22 C4 21 4 20 5 20 C83 20 83 20 83 20 C83 20 84 21 84 22 C84 43 84 43 84 43 C87 43 87 43 87 43 C87 7 87 7 87 7 C87 6 86 6 85 6 Z" />

-      <path fill="white" d="M85 6 ZM78 32 C78 34 76 36 73 36 C71 36 69 34 69 32 C69 29 71 27 73 27 C76 27 78 29 78 32 Z" stroke="none" />

-      <path fill="none" d="M85 6 ZM78 32 C78 34 76 36 73 36 C71 36 69 34 69 32 C69 29 71 27 73 27 C76 27 78 29 78 32 Z" />

-      <path fill="none" d="M1 16 L87 16" />

-      <path fill="white" d="M78 32 ZM76 32 C76 33 75 34 73 34 C72 34 71 33 71 32 C71 30 72 29 73 29 C75 29 76 30 76 32 Z" stroke="none" />

-      <path fill="none" d="M78 32 ZM76 32 C76 33 75 34 73 34 C72 34 71 33 71 32 C71 30 72 29 73 29 C75 29 76 30 76 32 Z" />

-      <path fill="white" d="M4 40 L83 40 Z" stroke="none" />

-      <path fill="none" d="M4 40 L83 40" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.emf
deleted file mode 100644
index f053b08..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.svg
deleted file mode 100644
index 0fa7946..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_faxMachine.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="91" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="87" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-206 841 ZM88 83 C88 84 88 85 87 85 C3 85 3 85 3 85 C2 85 1 84 1 83 C1 39 1 39 1 39 C1 39 2 38 3 38 C87 38 87 38 87 38 C88 38 88 39 88 39 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-206 841 ZM88 83 C88 84 88 85 87 85 C3 85 3 85 3 85 C2 85 1 84 1 83 C1 39 1 39 1 39 C1 39 2 38 3 38 C87 38 87 38 87 38 C88 38 88 39 88 39 Z" />

-      <path fill="white" d="M2 78 L88 78 Z" stroke="none" />

-      <path fill="none" d="M2 78 L88 78" />

-      <path fill="white" d="M88 39 ZM18 41 C18 44 15 47 11 47 C7 47 4 44 4 41 C4 37 7 34 11 34 C15 34 18 37 18 41 Z" stroke="none" />

-      <path fill="none" d="M88 39 ZM18 41 C18 44 15 47 11 47 C7 47 4 44 4 41 C4 37 7 34 11 34 C15 34 18 37 18 41 Z" />

-      <path fill="white" d="M18 41 ZM18 76 C18 80 15 83 11 83 C7 83 4 80 4 76 C4 73 7 70 11 70 C15 70 18 73 18 76 Z" stroke="none" />

-      <path fill="none" d="M18 41 ZM18 76 C18 80 15 83 11 83 C7 83 4 80 4 76 C4 73 7 70 11 70 C15 70 18 73 18 76 Z" />

-      <path fill="white" d="M18 76 ZM15 76 C15 76 15 77 14 77 C8 77 8 77 8 77 C7 77 7 76 7 76 C7 41 7 41 7 41 C7 40 7 39 8 39 C14 39 14 39 14 39 C15 39 15 40 15 41 Z" stroke="none" />

-      <path fill="none" d="M18 76 ZM15 76 C15 76 15 77 14 77 C8 77 8 77 8 77 C7 77 7 76 7 76 C7 41 7 41 7 41 C7 40 7 39 8 39 C14 39 14 39 14 39 C15 39 15 40 15 41 Z" />

-      <path fill="white" d="M20 39 L20 77 Z" stroke="none" />

-      <path fill="none" d="M20 39 L20 77" />

-      <path fill="white" d="M28 1 L79 1 L79 46 L28 46 L28 1 Z" stroke="none" />

-      <path fill="none" d="M28 1 L79 1 L79 46 L28 46 L28 1 Z" />

-      <path fill="white" d="M25 46 L82 46 Z" stroke="none" />

-      <path fill="none" d="M25 46 L82 46" stroke-width="2" />

-      <path fill="white" d="M15 41 ZM39 54 C39 55 39 55 38 55 C28 55 28 55 28 55 C27 55 26 55 26 54 C26 51 26 51 26 51 C26 50 27 50 28 50 C38 50 38 50 38 50 C39 50 39 50 39 51 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M15 41 ZM39 54 C39 55 39 55 38 55 C28 55 28 55 28 55 C27 55 26 55 26 54 C26 51 26 51 26 51 C26 50 27 50 28 50 C38 50 38 50 38 50 C39 50 39 50 39 51 Z" />

-      <path fill="white" d="M39 51 ZM54 54 C54 55 53 55 52 55 C42 55 42 55 42 55 C42 55 41 55 41 54 C41 51 41 51 41 51 C41 50 42 50 42 50 C52 50 52 50 52 50 C53 50 54 50 54 51 Z" stroke="none" />

-      <path fill="none" d="M39 51 ZM54 54 C54 55 53 55 52 55 C42 55 42 55 42 55 C42 55 41 55 41 54 C41 51 41 51 41 51 C41 50 42 50 42 50 C52 50 52 50 52 50 C53 50 54 50 54 51 Z" />

-      <path fill="white" d="M54 51 ZM68 54 C68 55 68 55 67 55 C57 55 57 55 57 55 C56 55 55 55 55 54 C55 51 55 51 55 51 C55 50 56 50 57 50 C67 50 67 50 67 50 C68 50 68 50 68 51 Z" stroke="none" />

-      <path fill="none" d="M54 51 ZM68 54 C68 55 68 55 67 55 C57 55 57 55 57 55 C56 55 55 55 55 54 C55 51 55 51 55 51 C55 50 56 50 57 50 C67 50 67 50 67 50 C68 50 68 50 68 51 Z" />

-      <path fill="white" d="M68 51 ZM39 61 C39 62 39 62 38 62 C28 62 28 62 28 62 C27 62 26 62 26 61 C26 58 26 58 26 58 C26 57 27 57 28 57 C38 57 38 57 38 57 C39 57 39 57 39 58 Z" stroke="none" />

-      <path fill="none" d="M68 51 ZM39 61 C39 62 39 62 38 62 C28 62 28 62 28 62 C27 62 26 62 26 61 C26 58 26 58 26 58 C26 57 27 57 28 57 C38 57 38 57 38 57 C39 57 39 57 39 58 Z" />

-      <path fill="white" d="M39 58 ZM54 61 C54 62 53 62 52 62 C42 62 42 62 42 62 C42 62 41 62 41 61 C41 58 41 58 41 58 C41 57 42 57 42 57 C52 57 52 57 52 57 C53 57 54 57 54 58 Z" stroke="none" />

-      <path fill="none" d="M39 58 ZM54 61 C54 62 53 62 52 62 C42 62 42 62 42 62 C42 62 41 62 41 61 C41 58 41 58 41 58 C41 57 42 57 42 57 C52 57 52 57 52 57 C53 57 54 57 54 58 Z" />

-      <path fill="white" d="M54 58 ZM68 61 C68 62 68 62 67 62 C57 62 57 62 57 62 C56 62 55 62 55 61 C55 58 55 58 55 58 C55 57 56 57 57 57 C67 57 67 57 67 57 C68 57 68 57 68 58 Z" stroke="none" />

-      <path fill="none" d="M54 58 ZM68 61 C68 62 68 62 67 62 C57 62 57 62 57 62 C56 62 55 62 55 61 C55 58 55 58 55 58 C55 57 56 57 57 57 C67 57 67 57 67 57 C68 57 68 57 68 58 Z" />

-      <path fill="white" d="M68 58 ZM39 68 C39 69 39 69 38 69 C28 69 28 69 28 69 C27 69 26 69 26 68 C26 65 26 65 26 65 C26 64 27 64 28 64 C38 64 38 64 38 64 C39 64 39 64 39 65 Z" stroke="none" />

-      <path fill="none" d="M68 58 ZM39 68 C39 69 39 69 38 69 C28 69 28 69 28 69 C27 69 26 69 26 68 C26 65 26 65 26 65 C26 64 27 64 28 64 C38 64 38 64 38 64 C39 64 39 64 39 65 Z" />

-      <path fill="white" d="M39 65 ZM54 68 C54 69 53 69 52 69 C42 69 42 69 42 69 C42 69 41 69 41 68 C41 65 41 65 41 65 C41 64 42 64 42 64 C52 64 52 64 52 64 C53 64 54 64 54 65 Z" stroke="none" />

-      <path fill="none" d="M39 65 ZM54 68 C54 69 53 69 52 69 C42 69 42 69 42 69 C42 69 41 69 41 68 C41 65 41 65 41 65 C41 64 42 64 42 64 C52 64 52 64 52 64 C53 64 54 64 54 65 Z" />

-      <path fill="white" d="M54 65 ZM68 68 C68 69 68 69 67 69 C57 69 57 69 57 69 C56 69 55 69 55 68 C55 65 55 65 55 65 C55 64 56 64 57 64 C67 64 67 64 67 64 C68 64 68 64 68 65 Z" stroke="none" />

-      <path fill="none" d="M54 65 ZM68 68 C68 69 68 69 67 69 C57 69 57 69 57 69 C56 69 55 69 55 68 C55 65 55 65 55 65 C55 64 56 64 57 64 C67 64 67 64 67 64 C68 64 68 64 68 65 Z" />

-      <path fill="white" d="M68 65 ZM39 75 C39 76 39 76 38 76 C28 76 28 76 28 76 C27 76 26 76 26 75 C26 72 26 72 26 72 C26 71 27 71 28 71 C38 71 38 71 38 71 C39 71 39 71 39 72 Z" stroke="none" />

-      <path fill="none" d="M68 65 ZM39 75 C39 76 39 76 38 76 C28 76 28 76 28 76 C27 76 26 76 26 75 C26 72 26 72 26 72 C26 71 27 71 28 71 C38 71 38 71 38 71 C39 71 39 71 39 72 Z" />

-      <path fill="white" d="M39 72 ZM54 75 C54 76 53 76 52 76 C42 76 42 76 42 76 C42 76 41 76 41 75 C41 72 41 72 41 72 C41 71 42 71 42 71 C52 71 52 71 52 71 C53 71 54 71 54 72 Z" stroke="none" />

-      <path fill="none" d="M39 72 ZM54 75 C54 76 53 76 52 76 C42 76 42 76 42 76 C42 76 41 76 41 75 C41 72 41 72 41 72 C41 71 42 71 42 71 C52 71 52 71 52 71 C53 71 54 71 54 72 Z" />

-      <path fill="white" d="M54 72 ZM68 75 C68 76 68 76 67 76 C57 76 57 76 57 76 C56 76 55 76 55 75 C55 72 55 72 55 72 C55 71 56 71 57 71 C67 71 67 71 67 71 C68 71 68 71 68 72 Z" stroke="none" />

-      <path fill="none" d="M54 72 ZM68 75 C68 76 68 76 67 76 C57 76 57 76 57 76 C56 76 55 76 55 75 C55 72 55 72 55 72 C55 71 56 71 57 71 C67 71 67 71 67 71 C68 71 68 71 68 72 Z" />

-      <path fill="white" d="M17 44 L17 73 Z" stroke="none" />

-      <path fill="none" d="M17 44 L17 73" />

-      <path fill="white" d="M5 44 L5 73 Z" stroke="none" />

-      <path fill="none" d="M5 44 L5 73" />

-      <path fill="white" d="M36 10 L71 10 Z" stroke="none" />

-      <path fill="none" d="M36 10 L71 10" />

-      <path fill="white" d="M36 15 L71 15 Z" stroke="none" />

-      <path fill="none" d="M36 15 L71 15" />

-      <path fill="white" d="M36 20 L71 20 Z" stroke="none" />

-      <path fill="none" d="M36 20 L71 20" />

-      <path fill="white" d="M36 25 L71 25 Z" stroke="none" />

-      <path fill="none" d="M36 25 L71 25" />

-      <path fill="white" d="M36 31 L71 31 Z" stroke="none" />

-      <path fill="none" d="M36 31 L71 31" />

-      <path fill="white" d="M36 36 L71 36 Z" stroke="none" />

-      <path fill="none" d="M36 36 L71 36" />

-      <path fill="white" d="M83 68 L71 68 L71 50 L83 50 L83 68 Z" stroke="none" />

-      <path fill="none" d="M83 68 L71 68 L71 50 L83 50 L83 68 Z" />

-      <path fill="white" d="M36 41 L71 41 Z" stroke="none" />

-      <path fill="none" d="M36 41 L71 41" />

-      <path fill="white" d="M80 74 L73 74 L73 72 L80 72 L80 74 Z" stroke="none" />

-      <path fill="none" d="M80 74 L73 74 L73 72 L80 72 L80 74 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.emf
deleted file mode 100644
index fa2e6d4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.svg
deleted file mode 100644
index 58786ce..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_flatbedScanner.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="89" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="76" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M81 74 L7 74 L7 60 L81 60 L81 74 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M81 74 L7 74 L7 60 L81 60 L81 74 Z" />

-      <path fill="white" d="M86 65 L1 65 L1 45 L86 45 L86 65 Z" stroke="none" />

-      <path fill="none" d="M86 65 L1 65 L1 45 L86 45 L86 65 Z" />

-      <path fill="white" d="M-207 836 ZM86 44 C86 43 86 43 86 42 C13 2 13 2 13 2 C12 2 12 2 11 2 C11 2 11 2 11 2 C11 3 11 4 12 4 C85 44 85 44 85 44 C85 44 86 44 86 44 Z" stroke="none" />

-      <path fill="none" d="M-207 836 ZM86 44 C86 43 86 43 86 42 C13 2 13 2 13 2 C12 2 12 2 11 2 C11 2 11 2 11 2 C11 3 11 4 12 4 C85 44 85 44 85 44 C85 44 86 44 86 44 Z" />

-      <path fill="white" d="M1 47 L86 47 Z" stroke="none" />

-      <path fill="none" d="M1 47 L86 47" />

-      <path fill="white" d="M86 44 ZM86 44 C86 45 85 45 85 45 C84 45 84 45 84 44 C84 44 84 43 85 43 C85 43 86 44 86 44 Z" stroke="none" />

-      <path fill="none" d="M86 44 ZM86 44 C86 45 85 45 85 45 C84 45 84 45 84 44 C84 44 84 43 85 43 C85 43 86 44 86 44 Z" />

-      <path fill="white" d="M75 57 L85 57 L85 52 L75 52 L75 57 Z" stroke="none" />

-      <path fill="none" d="M75 57 L85 57 L85 52 L75 52 L75 57 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.emf
deleted file mode 100644
index e7ed7b2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.svg
deleted file mode 100644
index 7b2b226..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laptopComputer.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="95" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="91" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-204 843 ZM75 88 C75 88 75 89 74 89 C2 89 2 89 2 89 C2 89 1 88 1 88 C1 77 1 77 1 77 C1 76 2 75 2 75 C74 75 74 75 74 75 C75 75 75 76 75 77 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-204 843 ZM75 88 C75 88 75 89 74 89 C2 89 2 89 2 89 C2 89 1 88 1 88 C1 77 1 77 1 77 C1 76 2 75 2 75 C74 75 74 75 74 75 C75 75 75 76 75 77 Z" />

-      <path fill="white" d="M75 77 ZM69 73 C68 73 68 72 68 71 C85 3 85 3 85 3 C85 2 86 1 87 1 C91 3 91 3 91 3 C92 3 92 4 92 4 C76 73 76 73 76 73 C75 74 75 74 74 74 Z" stroke="none" />

-      <path fill="none" d="M75 77 ZM69 73 C68 73 68 72 68 71 C85 3 85 3 85 3 C85 2 86 1 87 1 C91 3 91 3 91 3 C92 3 92 4 92 4 C76 73 76 73 76 73 C75 74 75 74 74 74 Z" />

-      <path fill="white" d="M74 74 ZM77 74 C77 76 76 78 74 78 C72 78 71 76 71 74 C71 72 72 71 74 71 C76 71 77 72 77 74 Z" stroke="none" />

-      <path fill="none" d="M74 74 ZM77 74 C77 76 76 78 74 78 C72 78 71 76 71 74 C71 72 72 71 74 71 C76 71 77 72 77 74 Z" />

-      <path fill="white" d="M1 78 L75 78 Z" stroke="none" />

-      <path fill="none" d="M1 78 L75 78" />

-      <path fill="white" d="M77 74 ZM32 89 C32 83 32 83 32 83 C32 82 31 82 30 82 C5 82 5 82 5 82 C4 82 4 82 4 83 C4 89 4 89 4 89 Z" stroke="none" />

-      <path fill="none" d="M77 74 ZM32 89 C32 83 32 83 32 83 C32 82 31 82 30 82 C5 82 5 82 5 82 C4 82 4 82 4 83 C4 89 4 89 4 89 Z" />

-      <path fill="white" d="M11 86 L24 86 Z" stroke="none" />

-      <path fill="none" d="M11 86 L24 86" />

-      <path fill="white" d="M12 87 L22 87 Z" stroke="none" />

-      <path fill="none" d="M12 87 L22 87" />

-      <path d="M25 84 L24 84 L24 83 L25 83 L25 84 Z" stroke="none" />

-      <path d="M4 89 ZM75 74 C75 75 74 75 74 75 C74 75 73 75 73 74 C73 74 74 74 74 74 C74 74 75 74 75 74 Z" stroke="none" />

-      <path fill="none" d="M4 89 ZM75 74 C75 75 74 75 74 75 C74 75 73 75 73 74 C73 74 74 74 74 74 C74 74 75 74 75 74 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.emf
deleted file mode 100644
index 2b98435..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.svg
deleted file mode 100644
index 4cb5eb5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_laserPrinter.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="92" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="80" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M21 56 L8 59 L1 28 L13 25 L21 56 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M21 56 L8 59 L1 28 L13 25 L21 56 Z" />

-      <path fill="white" d="M63 3 L61 1 L28 18 Z" stroke="none" />

-      <path fill="none" d="M63 3 L61 1 L28 18" />

-      <path fill="white" d="M64 14 L60 3 L27 21 Z" stroke="none" />

-      <path fill="none" d="M64 14 L60 3 L27 21" />

-      <path fill="white" d="M63 78 L11 78 L11 64 L63 64 L63 78 Z" stroke="none" />

-      <path fill="none" d="M63 78 L11 78 L11 64 L63 64 L63 78 Z" />

-      <path fill="white" d="M65 49 L52 28 L48 30 L63 56 L89 40 L86 36 L65 49 Z" stroke="none" />

-      <path fill="none" d="M65 49 L52 28 L48 30 L63 56 L89 40 L86 36 L65 49 Z" />

-      <path fill="white" d="M-206 838 ZM66 11 C7 11 7 11 7 11 C7 26 7 26 7 26 C7 67 7 67 7 67 C67 67 67 67 67 67 C67 12 67 12 67 12 C67 12 67 11 66 11 Z" stroke="none" />

-      <path fill="none" d="M-206 838 ZM66 11 C7 11 7 11 7 11 C7 26 7 26 7 26 C7 67 7 67 7 67 C67 67 67 67 67 67 C67 12 67 12 67 12 C67 12 67 11 66 11 Z" />

-      <path fill="white" d="M7 23 L68 23 Z" stroke="none" />

-      <path fill="none" d="M7 23 L68 23" />

-      <path fill="white" d="M12 69 L62 69 Z" stroke="none" />

-      <path fill="none" d="M12 69 L62 69" />

-      <path fill="white" d="M7 53 L67 53 Z" stroke="none" />

-      <path fill="none" d="M7 53 L67 53" />

-      <path fill="white" d="M65 30 L51 30 L51 24 L65 24 L65 30 Z" stroke="none" />

-      <path fill="none" d="M65 30 L51 30 L51 24 L65 24 L65 30 Z" />

-      <path fill="white" d="M16 67 L67 67 L67 56 L16 56 L16 67 Z" stroke="none" />

-      <path fill="none" d="M16 67 L67 67 L67 56 L16 56 L16 67 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.emf
deleted file mode 100644
index e21efe5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.svg
deleted file mode 100644
index 583dfab..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_macClassic.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="85" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="91" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-209 843 ZM74 87 C74 3 74 3 74 3 C74 2 74 1 73 1 C10 1 10 1 10 1 C10 1 9 2 9 3 C9 87 9 87 9 87 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-209 843 ZM74 87 C74 3 74 3 74 3 C74 2 74 1 73 1 C10 1 10 1 10 1 C10 1 9 2 9 3 C9 87 9 87 9 87 Z" />

-      <path fill="white" d="M9 87 ZM66 50 C66 51 66 51 65 51 C19 51 19 51 19 51 C18 51 17 51 17 50 C17 11 17 11 17 11 C17 10 18 10 19 10 C65 10 65 10 65 10 C66 10 66 10 66 11 Z" stroke="none" />

-      <path fill="none" d="M9 87 ZM66 50 C66 51 66 51 65 51 C19 51 19 51 19 51 C18 51 17 51 17 50 C17 11 17 11 17 11 C17 10 18 10 19 10 C65 10 65 10 65 10 C66 10 66 10 66 11 Z" />

-      <path fill="white" d="M83 89 L1 89 L1 83 L83 83 L83 89 Z" stroke="none" />

-      <path fill="none" d="M83 89 L1 89 L1 83 L83 83 L83 89 Z" />

-      <path fill="white" d="M1 85 L82 85 Z" stroke="none" />

-      <path fill="none" d="M1 85 L82 85" />

-      <path d="M66 11 ZM42 6 C42 6 42 5 42 5 C42 5 42 5 42 5 C42 4 41 5 41 5 C40 5 40 4 39 5 C39 5 39 5 39 6 C39 6 39 8 40 8 C40 8 40 8 41 8 C41 8 41 8 41 8 C42 8 42 7 42 7 C42 7 42 6 42 6 Z" stroke="none" />

-      <path fill="none" d="M66 11 ZM42 6 C42 6 42 5 42 5 C42 5 42 5 42 5 C42 4 41 5 41 5 C40 5 40 4 39 5 C39 5 39 5 39 6 C39 6 39 8 40 8 C40 8 40 8 41 8 C41 8 41 8 41 8 C42 8 42 7 42 7 C42 7 42 6 42 6 Z" />

-      <path d="M42 6 ZM41 3 C40 4 40 4 40 4 C41 4 41 4 41 4 C41 4 41 3 41 3 C41 3 41 3 41 3 Z" stroke="none" />

-      <path fill="white" d="M41 3 ZM56 61 C56 55 56 55 56 55 C56 54 55 54 54 54 C29 54 29 54 29 54 C29 54 28 54 28 55 C28 61 28 61 28 61 Z" stroke="none" />

-      <path fill="none" d="M41 3 ZM56 61 C56 55 56 55 56 55 C56 54 55 54 54 54 C29 54 29 54 29 54 C29 54 28 54 28 55 C28 61 28 61 28 61 Z" />

-      <path fill="white" d="M35 58 L48 58 Z" stroke="none" />

-      <path fill="none" d="M35 58 L48 58" />

-      <path fill="white" d="M37 59 L46 59 Z" stroke="none" />

-      <path fill="none" d="M37 59 L46 59" />

-      <path d="M49 56 L48 56 L48 55 L49 55 L49 56 Z" stroke="none" />

-      <path fill="white" d="M9 64 L74 64 Z" stroke="none" />

-      <path fill="none" d="M9 64 L74 64" />

-      <path fill="white" d="M9 74 L74 74 Z" stroke="none" />

-      <path fill="none" d="M9 74 L74 74" />

-      <path fill="white" d="M49 71 L34 71 L34 68 L49 68 L49 71 Z" stroke="none" />

-      <path fill="none" d="M49 71 L34 71 L34 68 L49 68 L49 71 Z" />

-      <path fill="white" d="M46 72 L49 72 Z" stroke="none" />

-      <path fill="none" d="M46 72 L49 72" stroke-linecap="round" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.emf
deleted file mode 100644
index f3a38c7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.svg
deleted file mode 100644
index b46a2a2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_machintoshComputer.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="86" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="86" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-209 841 ZM6 43 C6 57 4 69 1 78 C1 83 1 83 1 83 C1 84 1 84 2 84 C6 84 6 84 6 84 C15 81 28 79 42 79 C56 79 68 81 77 84 C82 84 82 84 82 84 C82 84 83 84 83 83 C83 78 83 78 83 78 C80 69 77 57 77 43 C77 29 80 17 83 8 C83 3 83 3 83 3 C83 3 82 2 82 2 C77 2 77 2 77 2 C68 5 56 8 42 8 C28 8 15 5 6 2 C2 2 2 2 2 2 C1 2 1 3 1 3 C1 8 1 8 1 8 C4 17 6 29 6 43 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-209 841 ZM6 43 C6 57 4 69 1 78 C1 83 1 83 1 83 C1 84 1 84 2 84 C6 84 6 84 6 84 C15 81 28 79 42 79 C56 79 68 81 77 84 C82 84 82 84 82 84 C82 84 83 84 83 83 C83 78 83 78 83 78 C80 69 77 57 77 43 C77 29 80 17 83 8 C83 3 83 3 83 3 C83 3 82 2 82 2 C77 2 77 2 77 2 C68 5 56 8 42 8 C28 8 15 5 6 2 C2 2 2 2 2 2 C1 2 1 3 1 3 C1 8 1 8 1 8 C4 17 6 29 6 43 Z" />

-      <path fill="white" d="M6 43 ZM73 71 C73 72 72 72 71 72 C12 72 12 72 12 72 C12 72 11 72 11 71 C11 15 11 15 11 15 C11 15 12 14 12 14 C71 14 71 14 71 14 C72 14 73 15 73 15 Z" stroke="none" />

-      <path fill="none" d="M6 43 ZM73 71 C73 72 72 72 71 72 C12 72 12 72 12 72 C12 72 11 72 11 71 C11 15 11 15 11 15 C11 15 12 14 12 14 C71 14 71 14 71 14 C72 14 73 15 73 15 Z" />

-      <path fill="white" d="M73 15 ZM8 78 C8 79 7 80 6 80 C5 80 4 79 4 78 C4 77 5 77 6 77 C7 77 8 77 8 78 Z" stroke="none" />

-      <path fill="none" d="M73 15 ZM8 78 C8 79 7 80 6 80 C5 80 4 79 4 78 C4 77 5 77 6 77 C7 77 8 77 8 78 Z" />

-      <path fill="white" d="M8 78 ZM79 79 C79 80 78 81 77 81 C76 81 75 80 75 79 C75 78 76 77 77 77 C78 77 79 78 79 79 Z" stroke="none" />

-      <path fill="none" d="M8 78 ZM79 79 C79 80 78 81 77 81 C76 81 75 80 75 79 C75 78 76 77 77 77 C78 77 79 78 79 79 Z" />

-      <path fill="white" d="M79 79 ZM79 7 C79 8 78 9 77 9 C76 9 75 8 75 7 C75 6 76 5 77 5 C78 5 79 6 79 7 Z" stroke="none" />

-      <path fill="none" d="M79 79 ZM79 7 C79 8 78 9 77 9 C76 9 75 8 75 7 C75 6 76 5 77 5 C78 5 79 6 79 7 Z" />

-      <path fill="white" d="M79 7 ZM8 7 C8 8 7 9 6 9 C5 9 4 8 4 7 C4 6 5 5 6 5 C7 5 8 6 8 7 Z" stroke="none" />

-      <path fill="none" d="M79 7 ZM8 7 C8 8 7 9 6 9 C5 9 4 8 4 7 C4 6 5 5 6 5 C7 5 8 6 8 7 Z" />

-      <path fill="none" d="M8 7 ZM45 42 C45 41 46 40 47 40 C46 39 46 38 45 38 C44 37 42 37 41 37 C40 37 38 37 37 37 C36 38 35 40 35 41 C35 43 37 46 38 47 C39 48 40 46 41 46 C43 46 43 48 44 47 C45 47 46 45 46 44 C46 43 45 43 45 42 Z" />

-      <path fill="none" d="M45 42 ZM42 34 C41 35 41 35 41 36 C42 36 42 36 43 35 C43 35 44 34 44 33 C43 33 42 34 42 34 Z" />

-      <path fill="white" d="M42 34 ZM35 10 C35 15 36 20 36 20 C36 23 39 25 42 25 C45 25 47 23 48 20 C48 20 48 14 48 10 Z" stroke="none" />

-      <path fill="none" d="M42 34 ZM35 10 C35 15 36 20 36 20 C36 23 39 25 42 25 C45 25 47 23 48 20 C48 20 48 14 48 10 Z" />

-      <path fill="white" d="M48 20 L48 20 Z" stroke="none" />

-      <path fill="none" d="M48 20 L48 20" />

-      <path fill="white" d="M48 20 L48 20 Z" stroke="none" />

-      <path fill="none" d="M48 20 L48 20" />

-      <path fill="white" d="M48 20 L48 20 Z" stroke="none" />

-      <path fill="none" d="M48 20 L48 20" />

-      <path fill="white" d="M48 10 ZM45 19 C45 21 44 23 42 23 C40 23 38 21 38 19 C38 17 40 16 42 16 C44 16 45 17 45 19 Z" stroke="none" />

-      <path fill="none" d="M48 10 ZM45 19 C45 21 44 23 42 23 C40 23 38 21 38 19 C38 17 40 16 42 16 C44 16 45 17 45 19 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.emf
deleted file mode 100644
index 36ed182..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.svg
deleted file mode 100644
index 8b9ae81..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_mainframeComputer.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="80" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="93" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M77 84 L47 84 L47 2 L77 2 L77 84 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M77 84 L47 84 L47 2 L77 2 L77 84 Z" />

-      <path fill="white" d="M75 17 L68 17 L68 20 L75 20 L75 17 Z" stroke="none" />

-      <path fill="none" d="M75 17 L68 17 L68 20 L75 20 L75 17 Z" />

-      <path fill="white" d="M8 90 L3 90 L3 85 L8 85 L8 90 Z" stroke="none" />

-      <path fill="none" d="M8 90 L3 90 L3 85 L8 85 L8 90 Z" />

-      <path fill="white" d="M7 91 L4 91 L4 86 L7 86 L7 91 Z" stroke="none" />

-      <path fill="none" d="M7 91 L4 91 L4 86 L7 86 L7 91 Z" />

-      <path fill="white" d="M74 90 L70 90 L70 85 L74 85 L74 90 Z" stroke="none" />

-      <path fill="none" d="M74 90 L70 90 L70 85 L74 85 L74 90 Z" />

-      <path fill="white" d="M74 91 L71 91 L71 86 L74 86 L74 91 Z" stroke="none" />

-      <path fill="none" d="M74 91 L71 91 L71 86 L74 86 L74 91 Z" />

-      <path fill="white" d="M55 90 L51 90 L51 85 L55 85 L55 90 Z" stroke="none" />

-      <path fill="none" d="M55 90 L51 90 L51 85 L55 85 L55 90 Z" />

-      <path fill="white" d="M55 91 L52 91 L52 86 L55 86 L55 91 Z" stroke="none" />

-      <path fill="none" d="M55 91 L52 91 L52 86 L55 86 L55 91 Z" />

-      <path fill="white" d="M30 84 L1 84 L1 2 L30 2 L30 84 Z" stroke="none" />

-      <path fill="none" d="M30 84 L1 84 L1 2 L30 2 L30 84 Z" />

-      <path fill="white" d="M59 84 L29 84 L29 2 L59 2 L59 84 Z" stroke="none" />

-      <path fill="none" d="M59 84 L29 84 L29 2 L59 2 L59 84 Z" />

-      <path fill="white" d="M25 57 L5 57 L5 55 L25 55 L25 57 Z" stroke="none" />

-      <path fill="none" d="M25 57 L5 57 L5 55 L25 55 L25 57 Z" />

-      <path fill="white" d="M25 60 L5 60 L5 59 L25 59 L25 60 Z" stroke="none" />

-      <path fill="none" d="M25 60 L5 60 L5 59 L25 59 L25 60 Z" />

-      <path fill="white" d="M25 64 L5 64 L5 63 L25 63 L25 64 Z" stroke="none" />

-      <path fill="none" d="M25 64 L5 64 L5 63 L25 63 L25 64 Z" />

-      <path fill="white" d="M25 68 L5 68 L5 66 L25 66 L25 68 Z" stroke="none" />

-      <path fill="none" d="M25 68 L5 68 L5 66 L25 66 L25 68 Z" />

-      <path fill="white" d="M25 71 L5 71 L5 70 L25 70 L25 71 Z" stroke="none" />

-      <path fill="none" d="M25 71 L5 71 L5 70 L25 70 L25 71 Z" />

-      <path fill="white" d="M25 75 L5 75 L5 73 L25 73 L25 75 Z" stroke="none" />

-      <path fill="none" d="M25 75 L5 75 L5 73 L25 73 L25 75 Z" />

-      <path fill="white" d="M25 79 L5 79 L5 77 L25 77 L25 79 Z" stroke="none" />

-      <path fill="none" d="M25 79 L5 79 L5 77 L25 77 L25 79 Z" />

-      <path fill="white" d="M55 57 L35 57 L35 55 L55 55 L55 57 Z" stroke="none" />

-      <path fill="none" d="M55 57 L35 57 L35 55 L55 55 L55 57 Z" />

-      <path fill="white" d="M55 60 L35 60 L35 59 L55 59 L55 60 Z" stroke="none" />

-      <path fill="none" d="M55 60 L35 60 L35 59 L55 59 L55 60 Z" />

-      <path fill="white" d="M55 64 L35 64 L35 63 L55 63 L55 64 Z" stroke="none" />

-      <path fill="none" d="M55 64 L35 64 L35 63 L55 63 L55 64 Z" />

-      <path fill="white" d="M55 68 L35 68 L35 66 L55 66 L55 68 Z" stroke="none" />

-      <path fill="none" d="M55 68 L35 68 L35 66 L55 66 L55 68 Z" />

-      <path fill="white" d="M55 71 L35 71 L35 70 L55 70 L55 71 Z" stroke="none" />

-      <path fill="none" d="M55 71 L35 71 L35 70 L55 70 L55 71 Z" />

-      <path fill="white" d="M55 75 L35 75 L35 73 L55 73 L55 75 Z" stroke="none" />

-      <path fill="none" d="M55 75 L35 75 L35 73 L55 73 L55 75 Z" />

-      <path fill="white" d="M55 79 L35 79 L35 77 L55 77 L55 79 Z" stroke="none" />

-      <path fill="none" d="M55 79 L35 79 L35 77 L55 77 L55 79 Z" />

-      <path fill="white" d="M63 83 L76 83 L76 34 L63 34 L63 83 Z" stroke="none" />

-      <path fill="none" d="M63 83 L76 83 L76 34 L63 34 L63 83 Z" />

-      <path fill="white" d="M26 30 L5 30 Z" stroke="none" />

-      <path fill="none" d="M26 30 L5 30" />

-      <path fill="none" d="M26 41 L5 41 L5 6 L26 6 L26 41 Z" />

-      <path fill="white" d="M54 30 L34 30 Z" stroke="none" />

-      <path fill="none" d="M54 30 L34 30" />

-      <path fill="none" d="M54 41 L34 41 L34 6 L54 6 L54 41 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.emf
deleted file mode 100644
index 8fbb75c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.svg
deleted file mode 100644
index 1a1b482..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_minicomputer.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="94" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M76 86 L1 86 L1 2 L76 2 L76 86 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M76 86 L1 86 L1 2 L76 2 L76 86 Z" />

-      <path fill="white" d="M8 91 L3 91 L3 86 L8 86 L8 91 Z" stroke="none" />

-      <path fill="none" d="M8 91 L3 91 L3 86 L8 86 L8 91 Z" />

-      <path fill="white" d="M7 92 L4 92 L4 88 L7 88 L7 92 Z" stroke="none" />

-      <path fill="none" d="M7 92 L4 92 L4 88 L7 88 L7 92 Z" />

-      <path fill="white" d="M74 91 L70 91 L70 86 L74 86 L74 91 Z" stroke="none" />

-      <path fill="none" d="M74 91 L70 91 L70 86 L74 86 L74 91 Z" />

-      <path fill="white" d="M73 92 L70 92 L70 88 L73 88 L73 92 Z" stroke="none" />

-      <path fill="none" d="M73 92 L70 92 L70 88 L73 88 L73 92 Z" />

-      <path fill="white" d="M55 91 L50 91 L50 86 L55 86 L55 91 Z" stroke="none" />

-      <path fill="none" d="M55 91 L50 91 L50 86 L55 86 L55 91 Z" />

-      <path fill="white" d="M54 92 L51 92 L51 88 L54 88 L54 92 Z" stroke="none" />

-      <path fill="none" d="M54 92 L51 92 L51 88 L54 88 L54 92 Z" />

-      <path fill="white" d="M48 15 L8 15 L8 7 L48 7 L48 15 Z" stroke="none" />

-      <path fill="none" d="M48 15 L8 15 L8 7 L48 7 L48 15 Z" />

-      <path fill="white" d="M8 18 L8 22 L8 26 L8 29 L8 30 L8 37 L48 37 L48 30 L48 29 L48 26 L48 22 L48 18 L8 18 Z" stroke="none" />

-      <path fill="none" d="M8 18 L8 22 L8 26 L8 29 L8 30 L8 37 L48 37 L48 30 L48 29 L48 26 L48 22 L48 18 L8 18 Z" />

-      <path fill="white" d="M48 48 L8 48 L8 40 L48 40 L48 48 Z" stroke="none" />

-      <path fill="none" d="M48 48 L8 48 L8 40 L48 40 L48 48 Z" />

-      <path fill="white" d="M48 59 L8 59 L8 51 L48 51 L48 59 Z" stroke="none" />

-      <path fill="none" d="M48 59 L8 59 L8 51 L48 51 L48 59 Z" />

-      <path fill="white" d="M48 69 L8 69 L8 61 L48 61 L48 69 Z" stroke="none" />

-      <path fill="none" d="M48 69 L8 69 L8 61 L48 61 L48 69 Z" />

-      <path fill="white" d="M48 80 L8 80 L8 72 L48 72 L48 80 Z" stroke="none" />

-      <path fill="none" d="M48 80 L8 80 L8 72 L48 72 L48 80 Z" />

-      <path fill="white" d="M71 15 L56 15 L56 7 L71 7 L71 15 Z" stroke="none" />

-      <path fill="none" d="M71 15 L56 15 L56 7 L71 7 L71 15 Z" />

-      <path fill="white" d="M71 26 L56 26 L56 18 L71 18 L71 26 Z" stroke="none" />

-      <path fill="none" d="M71 26 L56 26 L56 18 L71 18 L71 26 Z" />

-      <path fill="white" d="M71 37 L56 37 L56 29 L71 29 L71 37 Z" stroke="none" />

-      <path fill="none" d="M71 37 L56 37 L56 29 L71 29 L71 37 Z" />

-      <path fill="white" d="M71 48 L56 48 L56 40 L71 40 L71 48 Z" stroke="none" />

-      <path fill="none" d="M71 48 L56 48 L56 40 L71 40 L71 48 Z" />

-      <path fill="white" d="M71 59 L56 59 L56 51 L71 51 L71 59 Z" stroke="none" />

-      <path fill="none" d="M71 59 L56 59 L56 51 L71 51 L71 59 Z" />

-      <path fill="white" d="M71 69 L56 69 L56 61 L71 61 L71 69 Z" stroke="none" />

-      <path fill="none" d="M71 69 L56 69 L56 61 L71 61 L71 69 Z" />

-      <path fill="white" d="M71 80 L56 80 L56 72 L71 72 L71 80 Z" stroke="none" />

-      <path fill="none" d="M71 80 L56 80 L56 72 L71 72 L71 80 Z" />

-      <path fill="white" d="M11 62 L11 69 Z" stroke="none" />

-      <path fill="none" d="M11 62 L11 69" />

-      <path fill="white" d="M45 62 L45 70 Z" stroke="none" />

-      <path fill="none" d="M45 62 L45 70" />

-      <path fill="white" d="M42 69 L14 69 L14 64 L42 64 L42 69 Z" stroke="none" />

-      <path fill="none" d="M42 69 L14 69 L14 64 L42 64 L42 69 Z" />

-      <path fill="white" d="M11 51 L11 58 Z" stroke="none" />

-      <path fill="none" d="M11 51 L11 58" />

-      <path fill="white" d="M45 51 L45 59 Z" stroke="none" />

-      <path fill="none" d="M45 51 L45 59" />

-      <path fill="white" d="M46 18 L46 36 Z" stroke="none" />

-      <path fill="none" d="M46 18 L46 36" />

-      <path fill="white" d="M13 35 L11 35 L11 32 L13 32 L13 35 Z" stroke="none" />

-      <path fill="none" d="M13 35 L11 35 L11 32 L13 32 L13 35 Z" />

-      <path fill="white" d="M69 35 L61 35 L61 31 L69 31 L69 35 Z" stroke="none" />

-      <path fill="none" d="M69 35 L61 35 L61 31 L69 31 L69 35 Z" />

-      <path fill="white" d="M62 57 L58 57 L58 52 L62 52 L62 57 Z" stroke="none" />

-      <path fill="none" d="M62 57 L58 57 L58 52 L62 52 L62 57 Z" />

-      <path fill="white" d="M62 68 L58 68 L58 63 L62 63 L62 68 Z" stroke="none" />

-      <path fill="none" d="M62 68 L58 68 L58 63 L62 63 L62 68 Z" />

-      <path fill="white" d="M53 2 L53 86 Z" stroke="none" />

-      <path fill="none" d="M53 2 L53 86" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.emf
deleted file mode 100644
index c66e871..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.svg
deleted file mode 100644
index 150adb0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_networkHub.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="73" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="93" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M71 91 L1 91 L1 2 L71 2 L71 91 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M71 91 L1 91 L1 2 L71 2 L71 91 Z" />

-      <path fill="white" d="M19 6 L6 6 L6 16 L9 16 L9 19 L16 19 L16 16 L19 16 L19 6 Z" stroke="none" />

-      <path fill="none" d="M19 6 L6 6 L6 16 L9 16 L9 19 L16 19 L16 16 L19 16 L19 6 Z" />

-      <path fill="white" d="M16 9 L9 9 L9 14 L11 14 L11 15 L14 15 L14 14 L16 14 L16 9 Z" stroke="none" />

-      <path fill="none" d="M16 9 L9 9 L9 14 L11 14 L11 15 L14 15 L14 14 L16 14 L16 9 Z" />

-      <path fill="white" d="M19 23 L6 23 L6 33 L9 33 L9 36 L16 36 L16 33 L19 33 L19 23 Z" stroke="none" />

-      <path fill="none" d="M19 23 L6 23 L6 33 L9 33 L9 36 L16 36 L16 33 L19 33 L19 23 Z" />

-      <path fill="white" d="M16 26 L9 26 L9 31 L11 31 L11 32 L14 32 L14 31 L16 31 L16 26 Z" stroke="none" />

-      <path fill="none" d="M16 26 L9 26 L9 31 L11 31 L11 32 L14 32 L14 31 L16 31 L16 26 Z" />

-      <path fill="white" d="M19 39 L6 39 L6 50 L9 50 L9 53 L16 53 L16 50 L19 50 L19 39 Z" stroke="none" />

-      <path fill="none" d="M19 39 L6 39 L6 50 L9 50 L9 53 L16 53 L16 50 L19 50 L19 39 Z" />

-      <path fill="white" d="M16 43 L9 43 L9 48 L11 48 L11 49 L14 49 L14 48 L16 48 L16 43 Z" stroke="none" />

-      <path fill="none" d="M16 43 L9 43 L9 48 L11 48 L11 49 L14 49 L14 48 L16 48 L16 43 Z" />

-      <path fill="white" d="M19 56 L6 56 L6 67 L9 67 L9 69 L16 69 L16 67 L19 67 L19 56 Z" stroke="none" />

-      <path fill="none" d="M19 56 L6 56 L6 67 L9 67 L9 69 L16 69 L16 67 L19 67 L19 56 Z" />

-      <path fill="white" d="M16 60 L9 60 L9 65 L11 65 L11 66 L14 66 L14 65 L16 65 L16 60 Z" stroke="none" />

-      <path fill="none" d="M16 60 L9 60 L9 65 L11 65 L11 66 L14 66 L14 65 L16 65 L16 60 Z" />

-      <path fill="white" d="M19 73 L6 73 L6 84 L9 84 L9 86 L16 86 L16 84 L19 84 L19 73 Z" stroke="none" />

-      <path fill="none" d="M19 73 L6 73 L6 84 L9 84 L9 86 L16 86 L16 84 L19 84 L19 73 Z" />

-      <path fill="white" d="M16 77 L9 77 L9 82 L11 82 L11 83 L14 83 L14 82 L16 82 L16 77 Z" stroke="none" />

-      <path fill="none" d="M16 77 L9 77 L9 82 L11 82 L11 83 L14 83 L14 82 L16 82 L16 77 Z" />

-      <path fill="white" d="M34 6 L21 6 L21 16 L24 16 L24 19 L31 19 L31 16 L34 16 L34 6 Z" stroke="none" />

-      <path fill="none" d="M34 6 L21 6 L21 16 L24 16 L24 19 L31 19 L31 16 L34 16 L34 6 Z" />

-      <path fill="white" d="M31 9 L24 9 L24 14 L26 14 L26 15 L29 15 L29 14 L31 14 L31 9 Z" stroke="none" />

-      <path fill="none" d="M31 9 L24 9 L24 14 L26 14 L26 15 L29 15 L29 14 L31 14 L31 9 Z" />

-      <path fill="white" d="M34 23 L21 23 L21 33 L24 33 L24 36 L31 36 L31 33 L34 33 L34 23 Z" stroke="none" />

-      <path fill="none" d="M34 23 L21 23 L21 33 L24 33 L24 36 L31 36 L31 33 L34 33 L34 23 Z" />

-      <path fill="white" d="M31 26 L24 26 L24 31 L26 31 L26 32 L29 32 L29 31 L31 31 L31 26 Z" stroke="none" />

-      <path fill="none" d="M31 26 L24 26 L24 31 L26 31 L26 32 L29 32 L29 31 L31 31 L31 26 Z" />

-      <path fill="white" d="M34 39 L21 39 L21 50 L24 50 L24 53 L31 53 L31 50 L34 50 L34 39 Z" stroke="none" />

-      <path fill="none" d="M34 39 L21 39 L21 50 L24 50 L24 53 L31 53 L31 50 L34 50 L34 39 Z" />

-      <path fill="white" d="M31 43 L24 43 L24 48 L26 48 L26 49 L29 49 L29 48 L31 48 L31 43 Z" stroke="none" />

-      <path fill="none" d="M31 43 L24 43 L24 48 L26 48 L26 49 L29 49 L29 48 L31 48 L31 43 Z" />

-      <path fill="white" d="M34 56 L21 56 L21 67 L24 67 L24 69 L31 69 L31 67 L34 67 L34 56 Z" stroke="none" />

-      <path fill="none" d="M34 56 L21 56 L21 67 L24 67 L24 69 L31 69 L31 67 L34 67 L34 56 Z" />

-      <path fill="white" d="M31 60 L24 60 L24 65 L26 65 L26 66 L29 66 L29 65 L31 65 L31 60 Z" stroke="none" />

-      <path fill="none" d="M31 60 L24 60 L24 65 L26 65 L26 66 L29 66 L29 65 L31 65 L31 60 Z" />

-      <path fill="white" d="M34 73 L21 73 L21 84 L24 84 L24 86 L31 86 L31 84 L34 84 L34 73 Z" stroke="none" />

-      <path fill="none" d="M34 73 L21 73 L21 84 L24 84 L24 86 L31 86 L31 84 L34 84 L34 73 Z" />

-      <path fill="white" d="M31 77 L24 77 L24 82 L26 82 L26 83 L29 83 L29 82 L31 82 L31 77 Z" stroke="none" />

-      <path fill="none" d="M31 77 L24 77 L24 82 L26 82 L26 83 L29 83 L29 82 L31 82 L31 77 Z" />

-      <path fill="white" d="M49 6 L36 6 L36 16 L39 16 L39 19 L46 19 L46 16 L49 16 L49 6 Z" stroke="none" />

-      <path fill="none" d="M49 6 L36 6 L36 16 L39 16 L39 19 L46 19 L46 16 L49 16 L49 6 Z" />

-      <path fill="white" d="M46 9 L39 9 L39 14 L41 14 L41 15 L44 15 L44 14 L46 14 L46 9 Z" stroke="none" />

-      <path fill="none" d="M46 9 L39 9 L39 14 L41 14 L41 15 L44 15 L44 14 L46 14 L46 9 Z" />

-      <path fill="white" d="M49 23 L36 23 L36 33 L39 33 L39 36 L46 36 L46 33 L49 33 L49 23 Z" stroke="none" />

-      <path fill="none" d="M49 23 L36 23 L36 33 L39 33 L39 36 L46 36 L46 33 L49 33 L49 23 Z" />

-      <path fill="white" d="M46 26 L39 26 L39 31 L41 31 L41 32 L44 32 L44 31 L46 31 L46 26 Z" stroke="none" />

-      <path fill="none" d="M46 26 L39 26 L39 31 L41 31 L41 32 L44 32 L44 31 L46 31 L46 26 Z" />

-      <path fill="white" d="M49 39 L36 39 L36 50 L39 50 L39 53 L46 53 L46 50 L49 50 L49 39 Z" stroke="none" />

-      <path fill="none" d="M49 39 L36 39 L36 50 L39 50 L39 53 L46 53 L46 50 L49 50 L49 39 Z" />

-      <path fill="white" d="M46 43 L39 43 L39 48 L41 48 L41 49 L44 49 L44 48 L46 48 L46 43 Z" stroke="none" />

-      <path fill="none" d="M46 43 L39 43 L39 48 L41 48 L41 49 L44 49 L44 48 L46 48 L46 43 Z" />

-      <path fill="white" d="M49 56 L36 56 L36 67 L39 67 L39 69 L46 69 L46 67 L49 67 L49 56 Z" stroke="none" />

-      <path fill="none" d="M49 56 L36 56 L36 67 L39 67 L39 69 L46 69 L46 67 L49 67 L49 56 Z" />

-      <path fill="white" d="M46 60 L39 60 L39 65 L41 65 L41 66 L44 66 L44 65 L46 65 L46 60 Z" stroke="none" />

-      <path fill="none" d="M46 60 L39 60 L39 65 L41 65 L41 66 L44 66 L44 65 L46 65 L46 60 Z" />

-      <path fill="white" d="M49 73 L36 73 L36 84 L39 84 L39 86 L46 86 L46 84 L49 84 L49 73 Z" stroke="none" />

-      <path fill="none" d="M49 73 L36 73 L36 84 L39 84 L39 86 L46 86 L46 84 L49 84 L49 73 Z" />

-      <path fill="white" d="M46 77 L39 77 L39 82 L41 82 L41 83 L44 83 L44 82 L46 82 L46 77 Z" stroke="none" />

-      <path fill="none" d="M46 77 L39 77 L39 82 L41 82 L41 83 L44 83 L44 82 L46 82 L46 77 Z" />

-      <path fill="white" d="M67 10 L51 10 L51 6 L67 6 L67 10 Z" stroke="none" />

-      <path fill="none" d="M67 10 L51 10 L51 6 L67 6 L67 10 Z" />

-      <path fill="white" d="M67 16 L51 16 L51 13 L67 13 L67 16 Z" stroke="none" />

-      <path fill="none" d="M67 16 L51 16 L51 13 L67 13 L67 16 Z" />

-      <path fill="white" d="M67 23 L51 23 L51 19 L67 19 L67 23 Z" stroke="none" />

-      <path fill="none" d="M67 23 L51 23 L51 19 L67 19 L67 23 Z" />

-      <path fill="white" d="M67 29 L51 29 L51 25 L67 25 L67 29 Z" stroke="none" />

-      <path fill="none" d="M67 29 L51 29 L51 25 L67 25 L67 29 Z" />

-      <path fill="white" d="M67 35 L51 35 L51 32 L67 32 L67 35 Z" stroke="none" />

-      <path fill="none" d="M67 35 L51 35 L51 32 L67 32 L67 35 Z" />

-      <path fill="white" d="M67 42 L51 42 L51 38 L67 38 L67 42 Z" stroke="none" />

-      <path fill="none" d="M67 42 L51 42 L51 38 L67 38 L67 42 Z" />

-      <path fill="white" d="M67 48 L51 48 L51 45 L67 45 L67 48 Z" stroke="none" />

-      <path fill="none" d="M67 48 L51 48 L51 45 L67 45 L67 48 Z" />

-      <path fill="white" d="M67 55 L51 55 L51 51 L67 51 L67 55 Z" stroke="none" />

-      <path fill="none" d="M67 55 L51 55 L51 51 L67 51 L67 55 Z" />

-      <path fill="white" d="M67 61 L51 61 L51 57 L67 57 L67 61 Z" stroke="none" />

-      <path fill="none" d="M67 61 L51 61 L51 57 L67 57 L67 61 Z" />

-      <path fill="white" d="M67 67 L51 67 L51 64 L67 64 L67 67 Z" stroke="none" />

-      <path fill="none" d="M67 67 L51 67 L51 64 L67 64 L67 67 Z" />

-      <path fill="white" d="M67 74 L51 74 L51 70 L67 70 L67 74 Z" stroke="none" />

-      <path fill="none" d="M67 74 L51 74 L51 70 L67 70 L67 74 Z" />

-      <path fill="white" d="M67 80 L51 80 L51 77 L67 77 L67 80 Z" stroke="none" />

-      <path fill="none" d="M67 80 L51 80 L51 77 L67 77 L67 80 Z" />

-      <path fill="white" d="M67 86 L51 86 L51 83 L67 83 L67 86 Z" stroke="none" />

-      <path fill="none" d="M67 86 L51 86 L51 83 L67 83 L67 86 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.emf
deleted file mode 100644
index ec856f4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.svg
deleted file mode 100644
index 6de07dc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_paperPlotter.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="85" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="84" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M9 73 L2 73 L2 9 L9 9 L9 73 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M9 73 L2 73 L2 9 L9 9 L9 73 Z" />

-      <path fill="white" d="M10 81 L1 81 L1 70 L10 70 L10 81 Z" stroke="none" />

-      <path fill="none" d="M10 81 L1 81 L1 70 L10 70 L10 81 Z" />

-      <path fill="white" d="M8 82 L2 82 L2 74 L8 74 L8 82 Z" stroke="none" />

-      <path fill="none" d="M8 82 L2 82 L2 74 L8 74 L8 82 Z" />

-      <path fill="white" d="M81 73 L75 73 L75 9 L81 9 L81 73 Z" stroke="none" />

-      <path fill="none" d="M81 73 L75 73 L75 9 L81 9 L81 73 Z" />

-      <path fill="white" d="M83 81 L73 81 L73 70 L83 70 L83 81 Z" stroke="none" />

-      <path fill="none" d="M83 81 L73 81 L73 70 L83 70 L83 81 Z" />

-      <path fill="white" d="M81 82 L75 82 L75 74 L81 74 L81 82 Z" stroke="none" />

-      <path fill="none" d="M81 82 L75 82 L75 74 L81 74 L81 82 Z" />

-      <path fill="white" d="M78 20 L6 20 L6 8 L6 2 L78 2 L78 20 Z" stroke="none" />

-      <path fill="none" d="M78 20 L6 20 L6 8 L6 2 L78 2 L78 20 Z" />

-      <path fill="white" d="M78 8 L6 8 Z" stroke="none" />

-      <path fill="none" d="M78 8 L6 8" />

-      <path fill="white" d="M78 10 L6 10 Z" stroke="none" />

-      <path fill="none" d="M78 10 L6 10" />

-      <path fill="white" d="M76 64 L8 64 L8 63 L76 63 L76 64 Z" stroke="none" />

-      <path fill="none" d="M76 64 L8 64 L8 63 L76 63 L76 64 Z" />

-      <path fill="white" d="M77 7 L69 7 L69 4 L77 4 L77 7 Z" stroke="none" />

-      <path fill="none" d="M77 7 L69 7 L69 4 L77 4 L77 7 Z" />

-      <path fill="white" d="M67 45 L17 45 L17 10 L67 10 L67 45 Z" stroke="none" />

-      <path fill="none" d="M67 45 L17 45 L17 10 L67 10 L67 45 Z" />

-      <path fill="white" d="M55 40 L20 40 L20 10 L55 10 L55 40 Z" stroke="none" />

-      <path fill="none" d="M55 40 L20 40 L20 10 L55 10 L55 40 Z" />

-      <path fill="white" d="M63 40 L56 40 L56 10 L63 10 L63 40 Z" stroke="none" />

-      <path fill="none" d="M63 40 L56 40 L56 10 L63 10 L63 40 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.emf
deleted file mode 100644
index bbc4c3a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.svg
deleted file mode 100644
index 3a5f916..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_radioTower.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="96" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="94" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M47 4 L47 19 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M47 4 L47 19" />

-      <path fill="white" d="M82 90 L47 7 Z" stroke="none" />

-      <path fill="none" d="M82 90 L47 7" />

-      <path fill="white" d="M-204 845 ZM48 52 C48 53 48 53 47 53 C47 53 47 53 47 53 C46 53 45 53 45 52 C45 17 45 17 45 17 C45 16 46 16 47 16 C47 16 47 16 47 16 C48 16 48 16 48 17 Z" stroke="none" />

-      <path fill="none" d="M-204 845 ZM48 52 C48 53 48 53 47 53 C47 53 47 53 47 53 C46 53 45 53 45 52 C45 17 45 17 45 17 C45 16 46 16 47 16 C47 16 47 16 47 16 C48 16 48 16 48 17 Z" />

-      <path fill="white" d="M48 17 ZM50 91 C50 92 50 92 49 92 C45 92 45 92 45 92 C44 92 43 92 43 91 C43 39 43 39 43 39 C43 39 44 38 45 38 C49 38 49 38 49 38 C50 38 50 39 50 39 Z" stroke="none" />

-      <path fill="none" d="M48 17 ZM50 91 C50 92 50 92 49 92 C45 92 45 92 45 92 C44 92 43 92 43 91 C43 39 43 39 43 39 C43 39 44 38 45 38 C49 38 49 38 49 38 C50 38 50 39 50 39 Z" />

-      <path fill="white" d="M50 39 ZM52 90 C52 90 52 91 51 91 C42 91 42 91 42 91 C41 91 41 90 41 90 C41 70 41 70 41 70 C41 69 41 68 42 68 C51 68 51 68 51 68 C52 68 52 69 52 70 Z" stroke="none" />

-      <path fill="none" d="M50 39 ZM52 90 C52 90 52 91 51 91 C42 91 42 91 42 91 C41 91 41 90 41 90 C41 70 41 70 41 70 C41 69 41 68 42 68 C51 68 51 68 51 68 C52 68 52 69 52 70 Z" />

-      <path fill="white" d="M47 7 L12 90 Z" stroke="none" />

-      <path fill="none" d="M47 7 L12 90" />

-      <path fill="white" d="M34 84 L60 84 L60 92 L34 92 L34 84 Z" stroke="none" />

-      <path fill="none" d="M34 84 L60 84 L60 92 L34 92 L34 84 Z" />

-      <path fill="white" d="M5 89 L91 89 L91 92 L5 92 L5 89 Z" stroke="none" />

-      <path fill="none" d="M5 89 L91 89 L91 92 L5 92 L5 89 Z" />

-      <path fill="white" d="M48 6 L75 1 L73 8 L93 7 L67 13 L70 5 L48 6 Z" stroke="none" />

-      <path fill="none" d="M48 6 L75 1 L73 8 L93 7 L67 13 L70 5 L48 6 Z" />

-      <path fill="white" d="M0 8 L27 13 L25 6 L46 6 L20 1 L22 9 L0 8 Z" stroke="none" />

-      <path fill="none" d="M0 8 L27 13 L25 6 L46 6 L20 1 L22 9 L0 8 Z" />

-      <path fill="white" d="M46 38 L46 68 Z" stroke="none" />

-      <path fill="none" d="M46 38 L46 68" />

-      <path fill="white" d="M44 68 L44 84 Z" stroke="none" />

-      <path fill="none" d="M44 68 L44 84" />

-      <path fill="white" d="M40 84 L40 90 Z" stroke="none" />

-      <path fill="none" d="M40 84 L40 90" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.emf
deleted file mode 100644
index f36ff97..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.svg
deleted file mode 100644
index 043548b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_router.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="83" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="86" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M76 84 L5 84 L5 73 L76 73 L76 84 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M76 84 L5 84 L5 73 L76 73 L76 84 Z" />

-      <path fill="white" d="M81 79 L1 79 L1 2 L81 2 L81 79 Z" stroke="none" />

-      <path fill="none" d="M81 79 L1 79 L1 2 L81 2 L81 79 Z" />

-      <path fill="white" d="M49 2 L49 78 Z" stroke="none" />

-      <path fill="none" d="M49 2 L49 78" />

-      <path fill="white" d="M52 2 L52 78 Z" stroke="none" />

-      <path fill="none" d="M52 2 L52 78" />

-      <path fill="white" d="M56 2 L56 78 Z" stroke="none" />

-      <path fill="none" d="M56 2 L56 78" />

-      <path fill="white" d="M1 26 L48 26 Z" stroke="none" />

-      <path fill="none" d="M1 26 L48 26" />

-      <path fill="white" d="M56 26 L80 26 Z" stroke="none" />

-      <path fill="none" d="M56 26 L80 26" />

-      <path fill="white" d="M1 68 L48 68 Z" stroke="none" />

-      <path fill="none" d="M1 68 L48 68" />

-      <path fill="white" d="M56 68 L80 68 Z" stroke="none" />

-      <path fill="none" d="M56 68 L80 68" />

-      <path fill="white" d="M79 12 L72 12 L72 15 L79 15 L79 12 Z" stroke="none" />

-      <path fill="none" d="M79 12 L72 12 L72 15 L79 15 L79 12 Z" />

-      <path fill="white" d="M25 12 L3 12 L3 15 L25 15 L25 12 Z" stroke="none" />

-      <path fill="none" d="M25 12 L3 12 L3 15 L25 15 L25 12 Z" />

-      <path fill="white" d="M5 81 L76 81 Z" stroke="none" />

-      <path fill="none" d="M5 81 L76 81" />

-      <path fill="white" d="M13 49 L4 49 L4 39 L13 39 L13 49 Z" stroke="none" />

-      <path fill="none" d="M13 49 L4 49 L4 39 L13 39 L13 49 Z" />

-      <path fill="white" d="M12 50 L6 50 L6 42 L12 42 L12 50 Z" stroke="none" />

-      <path fill="none" d="M12 50 L6 50 L6 42 L12 42 L12 50 Z" />

-      <path fill="white" d="M78 49 L68 49 L68 39 L78 39 L78 49 Z" stroke="none" />

-      <path fill="none" d="M78 49 L68 49 L68 39 L78 39 L78 49 Z" />

-      <path fill="white" d="M76 50 L70 50 L70 42 L76 42 L76 50 Z" stroke="none" />

-      <path fill="none" d="M76 50 L70 50 L70 42 L76 42 L76 50 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.emf
deleted file mode 100644
index a705dbe..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.svg
deleted file mode 100644
index 3bd9b33..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_sattelite.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="93" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M27 36 L1 8 L15 2 L42 29 L27 36 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M27 36 L1 8 L15 2 L42 29 L27 36 Z" />

-      <path fill="white" d="M-205 842 ZM56 53 C56 56 55 57 53 58 C55 57 57 56 57 53 C57 51 57 49 55 48 C56 49 57 51 56 53 Z" stroke="none" />

-      <path fill="none" d="M-205 842 ZM56 53 C56 56 55 57 53 58 C55 57 57 56 57 53 C57 51 57 49 55 48 C56 49 57 51 56 53 Z" />

-      <path fill="white" d="M56 53 ZM52 59 C52 59 52 59 52 59 C50 58 49 55 50 52 C50 49 52 47 54 47 C54 47 54 47 54 47 C51 47 48 49 48 52 C47 55 49 58 52 59 Z" stroke="none" />

-      <path fill="none" d="M56 53 ZM52 59 C52 59 52 59 52 59 C50 58 49 55 50 52 C50 49 52 47 54 47 C54 47 54 47 54 47 C51 47 48 49 48 52 C47 55 49 58 52 59 Z" />

-      <path fill="white" d="M52 59 ZM55 47 C55 47 55 47 54 47 C55 47 56 48 56 48 C56 48 55 47 55 47 Z" stroke="none" />

-      <path fill="none" d="M52 59 ZM55 47 C55 47 55 47 54 47 C55 47 56 48 56 48 C56 48 55 47 55 47 Z" />

-      <path fill="white" d="M55 47 ZM53 59 C53 59 54 59 54 58 C54 59 53 59 52 59 C52 59 53 59 53 59 Z" stroke="none" />

-      <path fill="none" d="M55 47 ZM53 59 C53 59 54 59 54 58 C54 59 53 59 52 59 C52 59 53 59 53 59 Z" />

-      <path fill="white" d="M53 59 ZM50 52 C49 55 50 58 52 59 C53 59 54 59 54 58 C56 58 57 56 57 54 C58 51 57 49 56 48 C56 48 55 47 54 47 C52 47 50 49 50 52 Z" stroke="none" />

-      <path fill="none" d="M53 59 ZM50 52 C49 55 50 58 52 59 C53 59 54 59 54 58 C56 58 57 56 57 54 C58 51 57 49 56 48 C56 48 55 47 54 47 C52 47 50 49 50 52 Z" />

-      <path fill="white" d="M50 52 ZM61 47 C42 27 42 27 42 27 C22 46 22 46 22 46 C22 46 22 46 22 46 C21 48 24 53 29 58 C35 64 40 67 41 66 C41 66 41 66 41 66 Z" stroke="none" />

-      <path fill="none" d="M50 52 ZM61 47 C42 27 42 27 42 27 C22 46 22 46 22 46 C22 46 22 46 22 46 C21 48 24 53 29 58 C35 64 40 67 41 66 C41 66 41 66 41 66 Z" />

-      <path fill="white" d="M35 43 L33 40 L40 33 L43 36 L35 43 Z" stroke="none" />

-      <path fill="none" d="M35 43 L33 40 L40 33 L43 36 L35 43 Z" />

-      <path fill="white" d="M41 66 ZM35 53 C40 58 45 62 46 61 Z" stroke="none" />

-      <path fill="none" d="M35 53 C40 58 45 62 46 61" />

-      <path fill="white" d="M46 61 ZM28 41 C27 43 30 48 35 53 Z" stroke="none" />

-      <path fill="none" d="M28 41 C27 43 30 48 35 53" />

-      <path fill="white" d="M35 53 ZM61 47 C59 48 54 45 49 39 C44 34 41 29 42 28 C43 26 48 30 53 35 C59 41 62 46 61 47 Z" stroke="none" />

-      <path fill="none" d="M35 53 ZM61 47 C59 48 54 45 49 39 C44 34 41 29 42 28 C43 26 48 30 53 35 C59 41 62 46 61 47 Z" />

-      <path fill="white" d="M61 47 ZM29 38 C33 37 37 37 39 39 C36 36 32 35 28 36 C24 37 22 40 21 44 C22 41 25 39 29 38 Z" stroke="none" />

-      <path fill="none" d="M61 47 ZM29 38 C33 37 37 37 39 39 C36 36 32 35 28 36 C24 37 22 40 21 44 C22 41 25 39 29 38 Z" />

-      <path fill="white" d="M29 38 ZM41 40 C41 40 41 40 40 40 C41 43 38 47 32 49 C27 50 22 49 20 45 C20 46 21 46 21 46 C22 51 28 54 33 52 C39 51 42 45 41 40 Z" stroke="none" />

-      <path fill="none" d="M29 38 ZM41 40 C41 40 41 40 40 40 C41 43 38 47 32 49 C27 50 22 49 20 45 C20 46 21 46 21 46 C22 51 28 54 33 52 C39 51 42 45 41 40 Z" />

-      <path fill="white" d="M41 40 ZM20 45 C20 45 20 45 20 45 C20 44 20 43 20 42 C20 43 20 44 20 45 Z" stroke="none" />

-      <path fill="none" d="M41 40 ZM20 45 C20 45 20 45 20 45 C20 44 20 43 20 42 C20 43 20 44 20 45 Z" />

-      <path fill="white" d="M20 45 ZM40 39 C40 38 39 37 38 36 C39 37 40 38 40 40 C40 39 40 39 40 39 Z" stroke="none" />

-      <path fill="none" d="M20 45 ZM40 39 C40 38 39 37 38 36 C39 37 40 38 40 40 C40 39 40 39 40 39 Z" />

-      <path fill="white" d="M40 39 ZM32 49 C38 47 41 43 40 40 C40 38 39 37 38 36 C36 35 32 34 28 35 C24 36 21 39 20 42 C20 43 20 44 20 45 C22 49 27 50 32 49 Z" stroke="none" />

-      <path fill="none" d="M40 39 ZM32 49 C38 47 41 43 40 40 C40 38 39 37 38 36 C36 35 32 34 28 35 C24 36 21 39 20 42 C20 43 20 44 20 45 C22 49 27 50 32 49 Z" />

-      <path fill="white" d="M30 42 L29 38 Z" stroke="none" />

-      <path fill="none" d="M30 42 L29 38" />

-      <path fill="white" d="M32 49 ZM44 65 C42 65 40 64 39 63 C40 64 42 65 44 65 C47 65 48 64 49 62 C48 63 47 64 44 65 Z" stroke="none" />

-      <path fill="none" d="M32 49 ZM44 65 C42 65 40 64 39 63 C40 64 42 65 44 65 C47 65 48 64 49 62 C48 63 47 64 44 65 Z" />

-      <path fill="white" d="M44 65 ZM38 62 C38 62 38 62 38 62 C38 60 41 58 44 58 C47 58 49 59 50 61 C50 61 50 61 50 61 C50 58 47 56 44 56 C41 56 38 59 38 62 Z" stroke="none" />

-      <path fill="none" d="M44 65 ZM38 62 C38 62 38 62 38 62 C38 60 41 58 44 58 C47 58 49 59 50 61 C50 61 50 61 50 61 C50 58 47 56 44 56 C41 56 38 59 38 62 Z" />

-      <path fill="white" d="M38 62 ZM50 62 C50 62 50 62 50 61 C50 62 50 63 49 63 C50 63 50 62 50 62 Z" stroke="none" />

-      <path fill="none" d="M38 62 ZM50 62 C50 62 50 62 50 61 C50 62 50 63 49 63 C50 63 50 62 50 62 Z" />

-      <path fill="white" d="M50 62 ZM38 62 C38 63 38 63 39 64 C38 63 38 63 38 62 C38 62 38 62 38 62 Z" stroke="none" />

-      <path fill="none" d="M50 62 ZM38 62 C38 63 38 63 39 64 C38 63 38 63 38 62 C38 62 38 62 38 62 Z" />

-      <path fill="white" d="M38 62 ZM44 58 C41 58 38 60 38 62 C38 63 38 63 39 64 C40 65 42 66 44 66 C46 66 48 65 49 63 C50 63 50 62 50 61 C49 59 47 58 44 58 Z" stroke="none" />

-      <path fill="none" d="M38 62 ZM44 58 C41 58 38 60 38 62 C38 63 38 63 39 64 C40 65 42 66 44 66 C46 66 48 65 49 63 C50 63 50 62 50 61 C49 59 47 58 44 58 Z" />

-      <path fill="white" d="M44 62 L44 65 Z" stroke="none" />

-      <path fill="none" d="M44 62 L44 65" />

-      <path fill="white" d="M76 87 L50 59 L64 53 L91 80 L76 87 Z" stroke="none" />

-      <path fill="none" d="M76 87 L50 59 L64 53 L91 80 L76 87 Z" />

-      <path fill="white" d="M44 58 ZM64 44 C63 45 57 41 52 36 C47 31 44 25 45 24 C46 23 51 26 56 32 C62 37 65 43 64 44 Z" stroke="none" />

-      <path fill="none" d="M44 58 ZM64 44 C63 45 57 41 52 36 C47 31 44 25 45 24 C46 23 51 26 56 32 C62 37 65 43 64 44 Z" />

-      <path fill="white" d="M26 31 L6 11 L17 6 L37 26 L26 31 Z" stroke="none" />

-      <path fill="none" d="M26 31 L6 11 L17 6 L37 26 L26 31 Z" />

-      <path fill="white" d="M75 82 L55 62 L66 57 L86 77 L75 82 Z" stroke="none" />

-      <path fill="none" d="M75 82 L55 62 L66 57 L86 77 L75 82 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.emf
deleted file mode 100644
index 5e49c56..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.svg
deleted file mode 100644
index 9a72f2e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/NS_satteliteDish.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="84" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="82" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M56 76 L39 76 L39 51 L56 43 L56 76 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M56 76 L39 76 L39 51 L56 43 L56 76 Z" />

-      <path fill="white" d="M45 62 L41 62 L41 50 L45 50 L45 62 Z" stroke="none" />

-      <path fill="none" d="M45 62 L41 62 L41 50 L45 50 L45 62 Z" />

-      <path fill="white" d="M-210 839 ZM27 20 C33 11 41 6 49 6 C40 5 30 9 24 18 C18 27 17 38 21 46 C19 39 21 29 27 20 Z" stroke="none" />

-      <path fill="none" d="M-210 839 ZM27 20 C33 11 41 6 49 6 C40 5 30 9 24 18 C18 27 17 38 21 46 C19 39 21 29 27 20 Z" />

-      <path fill="white" d="M27 20 ZM55 6 C54 5 54 5 53 5 C60 11 60 25 52 36 C43 48 31 54 23 49 C23 50 23 50 24 50 C35 58 51 54 60 42 C68 30 66 14 55 6 Z" stroke="none" />

-      <path fill="none" d="M27 20 ZM55 6 C54 5 54 5 53 5 C60 11 60 25 52 36 C43 48 31 54 23 49 C23 50 23 50 24 50 C35 58 51 54 60 42 C68 30 66 14 55 6 Z" />

-      <path fill="white" d="M55 6 ZM21 49 C22 49 22 49 23 49 C20 47 18 45 17 42 C18 45 19 47 21 49 Z" stroke="none" />

-      <path fill="none" d="M55 6 ZM21 49 C22 49 22 49 23 49 C20 47 18 45 17 42 C18 45 19 47 21 49 Z" />

-      <path fill="white" d="M21 49 ZM52 4 C50 3 47 2 44 2 C47 2 50 3 53 5 C53 5 52 4 52 4 Z" stroke="none" />

-      <path fill="none" d="M21 49 ZM52 4 C50 3 47 2 44 2 C47 2 50 3 53 5 C53 5 52 4 52 4 Z" />

-      <path fill="white" d="M52 4 ZM52 36 C60 25 60 11 53 5 C50 3 47 2 44 2 C37 2 28 7 22 16 C16 25 14 35 17 42 C18 45 20 47 23 49 C31 54 43 48 52 36 Z" stroke="none" />

-      <path fill="none" d="M52 4 ZM52 36 C60 25 60 11 53 5 C50 3 47 2 44 2 C37 2 28 7 22 16 C16 25 14 35 17 42 C18 45 20 47 23 49 C31 54 43 48 52 36 Z" />

-      <path fill="white" d="M36 26 L27 20 Z" stroke="none" />

-      <path fill="none" d="M36 26 L27 20" />

-      <path fill="white" d="M52 36 ZM28 21 C28 21 27 21 27 21 C1 4 1 4 1 4 C1 4 1 4 1 3 C1 3 1 3 1 3 C1 3 2 3 2 3 C28 20 28 20 28 20 C28 20 28 20 28 21 Z" stroke="none" />

-      <path fill="none" d="M52 36 ZM28 21 C28 21 27 21 27 21 C1 4 1 4 1 4 C1 4 1 4 1 3 C1 3 1 3 1 3 C1 3 2 3 2 3 C28 20 28 20 28 20 C28 20 28 20 28 21 Z" />

-      <path fill="white" d="M36 49 L3 6 Z" stroke="none" />

-      <path fill="none" d="M36 49 L3 6" stroke-linecap="round" />

-      <path fill="white" d="M4 4 L34 5 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M4 4 L34 5" stroke-linecap="round" />

-      <path fill="white" d="M4 5 L57 24 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M4 5 L57 24" stroke-linecap="round" />

-      <path fill="white" d="M16 31 L3 6 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M16 31 L3 6" stroke-linecap="round" />

-      <path fill="white" d="M28 21 ZM43 30 C39 36 39 43 42 46 C46 43 50 40 53 35 C55 31 56 28 57 24 C53 22 47 25 43 30 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M28 21 ZM43 30 C39 36 39 43 42 46 C46 43 50 40 53 35 C55 31 56 28 57 24 C53 22 47 25 43 30 Z" />

-      <path fill="white" d="M73 77 L22 77 L22 71 L73 71 L73 77 Z" stroke="none" />

-      <path fill="none" d="M73 77 L22 77 L22 71 L73 71 L73 77 Z" />

-      <path fill="white" d="M14 80 L81 80 L81 74 L14 74 L14 80 Z" stroke="none" />

-      <path fill="none" d="M14 80 L81 80 L81 74 L14 74 L14 80 Z" />

-      <path fill="white" d="M43 30 ZM64 56 C68 59 70 63 70 66 C71 62 69 57 65 55 C61 52 56 52 52 54 C55 52 60 53 64 56 Z" stroke="none" />

-      <path fill="none" d="M43 30 ZM64 56 C68 59 70 63 70 66 C71 62 69 57 65 55 C61 52 56 52 52 54 C55 52 60 53 64 56 Z" />

-      <path fill="white" d="M64 56 ZM70 68 C70 68 70 68 71 68 C68 71 62 71 56 67 C51 63 49 58 51 54 C51 54 50 54 50 55 C47 60 48 67 54 71 C59 74 67 73 70 68 Z" stroke="none" />

-      <path fill="none" d="M64 56 ZM70 68 C70 68 70 68 71 68 C68 71 62 71 56 67 C51 63 49 58 51 54 C51 54 50 54 50 55 C47 60 48 67 54 71 C59 74 67 73 70 68 Z" />

-      <path fill="white" d="M70 68 ZM51 54 C51 54 51 54 51 54 C52 53 53 52 54 51 C53 52 52 53 51 54 Z" stroke="none" />

-      <path fill="none" d="M70 68 ZM51 54 C51 54 51 54 51 54 C52 53 53 52 54 51 C53 52 52 53 51 54 Z" />

-      <path fill="white" d="M51 54 ZM71 67 C72 66 72 65 72 64 C72 65 71 66 71 68 C71 68 71 67 71 67 Z" stroke="none" />

-      <path fill="none" d="M51 54 ZM71 67 C72 66 72 65 72 64 C72 65 71 66 71 68 C71 68 71 67 71 67 Z" />

-      <path fill="white" d="M71 67 ZM56 67 C62 71 68 71 71 68 C71 66 72 65 72 64 C72 60 69 57 65 54 C62 51 57 50 54 51 C53 52 52 53 51 54 C49 58 51 63 56 67 Z" stroke="none" />

-      <path fill="none" d="M71 67 ZM56 67 C62 71 68 71 71 68 C71 66 72 65 72 64 C72 60 69 57 65 54 C62 51 57 50 54 51 C53 52 52 53 51 54 C49 58 51 63 56 67 Z" />

-      <path fill="white" d="M61 60 L64 56 Z" stroke="none" />

-      <path fill="none" d="M61 60 L64 56" />

-      <path fill="white" d="M56 67 ZM63 57 C63 56 63 56 63 56 C71 45 71 45 71 45 C71 44 71 44 71 44 C71 44 71 44 71 44 C71 45 72 45 71 45 C64 56 64 56 64 56 C64 57 64 57 63 57 Z" stroke="none" />

-      <path fill="none" d="M56 67 ZM63 57 C63 56 63 56 63 56 C71 45 71 45 71 45 C71 44 71 44 71 44 C71 44 71 44 71 44 C71 45 72 45 71 45 C64 56 64 56 64 56 C64 57 64 57 63 57 Z" />

-      <path fill="white" d="M51 60 L70 45 Z" stroke="none" />

-      <path fill="none" d="M51 60 L70 45" stroke-linecap="round" />

-      <path fill="white" d="M71 46 L71 59 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M71 46 L71 59" stroke-linecap="round" />

-      <path fill="white" d="M70 46 L62 69 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M70 46 L62 69" stroke-linecap="round" />

-      <path fill="white" d="M59 51 L70 45 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M59 51 L70 45" stroke-linecap="round" />

-      <path fill="white" d="M63 57 ZM59 63 C57 61 53 61 52 63 C53 65 55 66 57 67 C59 68 60 69 62 70 C63 68 62 65 59 63 Z" stroke-linecap="round" stroke="none" />

-      <path fill="none" d="M63 57 ZM59 63 C57 61 53 61 52 63 C53 65 55 66 57 67 C59 68 60 69 62 70 C63 68 62 65 59 63 Z" />

-      <path fill="white" d="M38 70 L33 62 L38 62 L28 71 L36 55 Z" stroke="none" />

-      <path fill="none" d="M38 70 L33 62 L38 62 L28 71 L36 55" />

-      <path fill="white" d="M36 54 L38 62 Z" stroke="none" />

-      <path fill="none" d="M36 54 L38 62" />

-      <path fill="white" d="M39 54 L33 62 Z" stroke="none" />

-      <path fill="none" d="M39 54 L33 62" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.svg
deleted file mode 100644
index 7dd196f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="268" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="243" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L42.1609 0 L42.1609 38.161 L0 38.161 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2105,2,2)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="42" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAmCAIAAAA9Y553AAAAxElEQVR42u2W2w2A

-IAxFwTiYEziBuwi7OIETuBlGIQQfxSqJFG0/CAmYcnsPWGmMEvmiElnj3+nryJqU

-F1ikc5NZvTxV4HUb1YBfqim9BtWDmr/hfUT3bgPmuFCFCJOPjHidPCL87JD2PmQ4

-7lk6E1TJx5zaRdst4zjs5vjK0VCvtXii+KC7TPL73o7K8w8SEKo8em9j9R5DQEFv

-PsD5Rndwd8pUb//NGwLQuu/2g7S9d/6FLkLz73S63G5wek7P6b+afgaIb0+CfFIt

-IAAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="38" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.wmf
deleted file mode 100644
index ab1537f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationClassement.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.svg
deleted file mode 100644
index c1c079d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="231" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="231" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L36.1607 0 L36.1607 36.16 L0 36.16 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2222,0,0,6.25,2,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="36" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAIAAABuYg/PAAAAuUlEQVR42u3XwQ6A

-IAwDUGn8cP5cPXmRbG1HOBg4j73oSNF2Xf1YtpZhD4Rj4drYlHVOPzutdefJgm3e

-FlQ2q8Wot+DLwIwqbfQtGM4b5NEIPFKKXiPp8VIys9STpPyABJ4qUadx6BkSG1dp

-IzJr2GwM2vGpJgTxsKmUnyimkZRnqEiqh6IkeU4QP3My8tO5Yl7G8OBJnodilkse

-ireG5KEoSR684PDKMEUii8+JX1f7W/+HWFv5m3sDZ4x0x8pScicAAAAASUVORK5C

-YII=" xlink:type="simple" xlink:actuate="onLoad" height="36" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.wmf
deleted file mode 100644
index 2185ae7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationComplexeMAJ.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.svg
deleted file mode 100644
index cc2e912..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="237" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="256" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L37.1609 0 L37.1609 40.1606 L0 40.1606 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2162,0,0,6.225,2,2)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="37" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAoCAIAAAD2YqSKAAADkklEQVR42u2XrY/i

-QBjGhwuiknXb5FZUcmITKi6hEsm5RZxYcaJ1INct4sSu25O4zp8Ajkpk61oHjhF3

-SXHgtmIT7qEvzE7aUsrdZsXlJmQylM785nm/Zqhtt9/ZO7YP7H3bf97btvrJNzj/

-mHmyWq3Q39+/vCVPYobDoWVZGFxcXBiGkZLuH3etDiR6eq0ivn4SMxgM5K8g0WC9

-XgOfIvdPwK9CrWdgmNZqtTIYlbRaLS4vm4DJJ+oLmF6OzOpbLpc0CIKABrPZrNvt

-RlGEsa5rgAFJ4MMuJ+ht+4a+Os5P9K57VYknMe12Wz5MkoQGcYxuEccJVgeGeqmM

-kLZtx3HoOBFNyYCzvGazmSRxIRhPABYiMYwGkHgixEZamNjpnkJdN7tdGMNM5XKV

-muURDA2Lotc0vRCMvtPpkKlT9l700xNWx25COQWt1+sxdlUp/4AnMJYrMTXsDNfi

-ndvbW8/zms3GzU0/Feeo7ijgYQ5m5sHpcvtFCxXDzmqg3t3dbTYbyhxN04p5tv1r

-MgGvk+fRPg79XlmhYpDQE+z5+fmEPuxGjqex/0W30Dues9/Qpe3abhxHqWs1LEQ9

-gcfjcc4duzadfq5Ur4EBzG7ZsT3HhwnGV9zhDgqC6ZmobQTLT1TFqcYs4+n8EyEp

-SncmfXhF4muj0SB9x2MtyRjzKI9g1GqPNSxN47AfEpK+qvpkDhzz3FEegmJvQGqC

-1ZwaMhpDc2TSE6lA6vN9kfecEEJ1XkG8ZENUsK27RQXBZ7ePhzk8GoQBD3hGX15c

-1fNPhiiikQtaV8dOKR8QsaZp9s0+KriMT3U6YIVBdDo+22ZbVhkl+RLVmIf6Ekpx

-mRJ/9v2FR1zm+3D6Q1Yfi1t0UmacJ0kwyXz+tRKPRMB0bt91Rg6ChZQhMumnkIUl

-OXeePREyQvg0JiTF5ygcvR6TYXAs5wgGcWfcl9SqBuT6aY0cp7QDVeafzLzCsMwb

-s+r9E/mO2EG47txJsDRPEKIIGek81XPn3Qdxw1QPJmy/Z/RQSBlnyDxYGGO60VT3

-XJk+3LFwbPr+TO4XKQEADgeKoHwhriKu7HxP77KbxWKCw9qyOiQXSAhFtqPcqFLy

-4gqdd+I+QTdJSUXKASkLzUGNrxaUcnGV/j8oVE/VSkjPizL2LD+k6qxay2vNV0sS

-t1x++yt9JVoNw1I1HfPZn/PyVCKNx9dv9v+vnMrY9Vmz/vX/078Bsk/M5W+yBQsAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="40" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.wmf
deleted file mode 100644
index 50248dc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDestruction.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.svg
deleted file mode 100644
index c350834..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="231" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="231" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L36.1607 0 L36.1607 36.16 L0 36.16 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2222,0,0,6.25,2,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="36" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAIAAABuYg/PAAAA7UlEQVR42r2XUQ7D

-IAxDh7WD7+ZdJaaJAnVwEspfi52HaAhpOY7P66nxbh9K6cHSUjr76AUhSWO0j2/A

-SbkrgBlxhUc07RR8WySt5i+A+5NI+1xlyE0BPiDldxvdkTtQz1Nl+LK0tJhgopNR

-KXDXC5U0SZB0XhsQfDqRdJv6KTxWiHN5UztUg5ukVZAgyYA5jh3fDCSSTBfS70zi

-RfrtTCIgnUTiYAfJaHg2lfwu5u+K2Xe5XI6Er0ycLtV46hGpESoPwRoh8RAhqTwE

-SRJvtZUzNVxwaXhWpO4FTRoeU+rj3TY8XOrgdfby5G/uF7gnlasQvSf2AAAAAElF

-TkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="36" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.wmf
deleted file mode 100644
index c9c0c3a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationDetaillee.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.svg
deleted file mode 100644
index e61c4d6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="231" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="231" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L36.1607 0 L36.1607 36.16 L0 36.16 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2222,0,0,6.25,2,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="36" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAIAAABuYg/PAAAAg0lEQVR42u2XSw7A

-IAhEpfHgvbntijQlMXxStI6sXEBGHyhIrZ0ly46SaKlilVdEX/HkTA06mdxI0CSq

-KpXYyaf6DH/pIVSjzJmJp8YZCqOJpwk1JsYOT99zsy7GLZZXjftSRzBqEJn6ERRG

-38Cj4YmD8YYQHFI7/WiaAvl3zmjZn+cFzcVIUQe4b6AAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="36" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.wmf
deleted file mode 100644
index 53e2249..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationMAJ.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.svg
deleted file mode 100644
index 4dfa443..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="231" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="231" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L36.1607 0 L36.1607 36.16 L0 36.16 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(6.2222,0,0,6.25,2,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="36" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAIAAABuYg/PAAAAYklEQVR42u3WSw4A

-EAwE0FYcvDdnxaYhWp+FzqxF44UMppZShC4n0cM8HcZdj1nOeuoNIzBOjr+pF+o2

-mkB8i2MyrhCZqIMzajRfMf3LiGFHkjdbA48aFYMPD77faGpUzCAVur9MLU4RRA4AAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="36" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.wmf
deleted file mode 100644
index 19a26a7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/OperationSimple.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.svg
deleted file mode 100644
index 2cbd6f4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="618" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="375" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(6.2143,0,0,6.2373,2,2)" stroke="white">

-      <image x="0" y="0" width="98" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAAA7CAIAAAAPRshmAAABOElEQVR42u2biw2D

-IBRFS+MS3aMz2TW6hs7UPToGNWIRFfoBIzw9N40+BdJy5H0SqdJan9A3nUHwiypz

-atUVFl7V+jFi6q8boMzUqhtOR2wCE5iKz3TbBMLkpNPsGVOnZ59WU3TJWrLgdGAC

-E5jABCYwITAVVV6uUhyuVc1H1PpiqvC8jxOnK8npPuiu1GiX+v6iiNXU0Rk+DrJo

-1gfKdN207cyNbS7d43wlTvt7beGr6Q3COJ01rO11xqHJUgiM9XaWF5sSQ9JfY6O/

-qCrW6UJxZ9k0m3xorLeznEy3+N3uHddrQk2TboubKXSOUje54ekQmOJmu1YhRhUO

-JjCBCUxgAhMCE5jABCYwgQlMCExgAhOYwAQmMCEw/SpJu+V2jmkH//vE6cAEpmyx

-aZvtxLIx1UI2JOfSC0bLeWxTV5OtAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="59" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.wmf
deleted file mode 100644
index c59dedd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Paquetage.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.svg
deleted file mode 100644
index 95c7c8f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="20" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="20" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAABVElEQVR42mO0sTn/

-8+c/NjYmBuLA////P336+/LlLwsLPpa7d79Pm6ZKpE52dqZ58178/fuzqEgmMlKM

-hZGRKG2CgiwzZz5/+PBHSIhoWJiotDQ7UJCFJG3d3UoQbRDAQp42fJoJasOumUht

-6JpJ0obQ/PTpr6NHP5KkDar5/3+GefOe8/GxtLQoOjoKMJACmPn4kjs7lX79+r94

-8Utg0pGTYwcaRKxmXt5kb29heXkOa2v+3bvfz5//ApiMgFwgSaxmCEdbm9vSkm/O

-nOerV78WE2OVk+NgZmYkVjMEmJryAlFX1+N9+z5ISbHLyLDjSsJYNEMA0AlcXMwT

-Jjy5evWbrCyHqCgrCZohMQ8MiIcPf06f/gxrWOLTDAF4wpKwZjxhyczFlezjI0xk

-xAIDkpeXefLkp1u2vBUUZGWMiLh2//4PFhZG4hPWr1//3r79bWXFDwAcsqFsnBU+

-TQAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="20" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.wmf
deleted file mode 100644
index dae1d55..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ResolutionLien.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.svg
deleted file mode 100644
index 292dd5b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="32" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="32" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <image x="0" y="0" width="32" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAP0lEQVR42mNgoDFg

-BOL////TynRGRiZa+2DUglELhoAFDAOfk4G5EY8CgrKjkTxqwagFoxaMWjBqwagF

-gwMAAOEKDDkNp6WgAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="32" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.wmf
deleted file mode 100644
index 5270c62..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/Tablew.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.svg
deleted file mode 100644
index 4dedb76..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="53" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="41" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 -0 L19.1837 -0 L19.1837 13.8158 L0 13.8158 L0 -0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" transform="matrix(2.45,0,0,2.5333,3,3)" stroke="white">

-      <image x="0" y="0" clip-path="url(#clipPath1)" width="20" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAPCAIAAABr+ngCAAAAuklEQVR42qVTMQ7D

-IAwkKANPYsjAsxgYPHTIsxgy8CSGDnXtiliGRCj1cEosn+9smaW+q3kaa5/aX7v8

-jSnOkpGpqvvMmMx15Sh+C+XIjJhRXpqdgW3JbHyl4VaHy7I9WTEJizFOYGebvTHm

-DF8YYUyBvruZbxbLfQEghIxdOGOlIHlWDk+MCchUbu0sqyHyVv3mRzP/EChO8sy2

-G2LISqtmJv/1hi/Fr87zctt354nieACTD2P551V9APAjsdGo2W8OAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="15" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.wmf
deleted file mode 100644
index 33c860b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/VueDossier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.emf
deleted file mode 100644
index f49991a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.svg
deleted file mode 100644
index 9cc101c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/actor.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="34" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="55" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <circle r="8" cx="16" cy="8" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <circle fill="none" r="8" cx="16" cy="8" />

-      <path fill="none" d="M32 54 L16 37" />

-      <path fill="none" d="M0 54 L16 37" />

-      <path fill="none" d="M16 16 L16 37" />

-      <path fill="none" d="M1 20 L30 20" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.emf
deleted file mode 100644
index 67f2e46..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.svg
deleted file mode 100644
index e7a5ad9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_model.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="95" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="91" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M26 30 L51 17" />

-      <path fill="none" d="M56 27 L37 62" />

-      <path fill="none" d="M12 41 L24 61" />

-      <path fill="none" d="M35 81 L68 59" />

-      <path fill="rgb(255,255,153)" d="M70 31 L75 43 L70 31 Z" stroke="none" />

-      <path fill="none" d="M69 28 L75 46" />

-      <path fill="rgb(255,255,153)" d="M65 53 L92 53 L92 74 L65 74 L65 53 L65 53 L65 53 Z" stroke="none" />

-      <path fill="none" d="M65 53 L92 53 L92 74 L65 74 L65 53 L65 53 L65 53 Z" />

-      <path fill="rgb(255,255,153)" d="M65 44 L92 44 L92 53 L65 53 L65 44 L65 44 L65 44 Z" stroke="none" />

-      <path fill="none" d="M65 44 L92 44 L92 53 L65 53 L65 44 L65 44 L65 44 Z" />

-      <path fill="rgb(255,255,153)" d="M10 68 L38 68 L38 89 L10 89 L10 68 L10 68 L10 68 Z" stroke="none" />

-      <path fill="none" d="M10 68 L38 68 L38 89 L10 89 L10 68 L10 68 L10 68 Z" />

-      <path fill="rgb(255,255,153)" d="M10 59 L38 59 L38 68 L10 68 L10 59 L10 59 L10 59 Z" stroke="none" />

-      <path fill="none" d="M10 59 L38 59 L38 68 L10 68 L10 59 L10 59 L10 59 Z" />

-      <path fill="rgb(255,255,153)" d="M1 21 L28 21 L28 42 L1 42 L1 21 L1 21 L1 21 Z" stroke="none" />

-      <path fill="none" d="M1 21 L28 21 L28 42 L1 42 L1 21 L1 21 L1 21 Z" />

-      <path fill="rgb(255,255,153)" d="M1 12 L28 12 L28 21 L1 21 L1 12 L1 12 L1 12 Z" stroke="none" />

-      <path fill="none" d="M1 12 L28 12 L28 21 L1 21 L1 12 L1 12 L1 12 Z" />

-      <path fill="rgb(255,255,153)" d="M49 9 L76 9 L76 30 L49 30 L49 9 L49 9 L49 9 Z" stroke="none" />

-      <path fill="none" d="M49 9 L76 9 L76 30 L49 30 L49 9 L49 9 L49 9 Z" />

-      <path fill="rgb(255,255,153)" d="M49 1 L76 1 L76 9 L49 9 L49 1 L49 1 L49 1 Z" stroke="none" />

-      <path fill="none" d="M49 1 L76 1 L76 9 L49 9 L49 1 L49 1 L49 1 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.emf
deleted file mode 100644
index 8eef288..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.svg
deleted file mode 100644
index dbb15ea..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_package.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="59" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" />

-      <path fill="rgb(255,255,153)" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" stroke="none" />

-      <path fill="none" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" />

-      <path fill="rgb(255,255,153)" d="M22 28 L47 28 L47 47 L22 47 L22 28 L22 28 Z" stroke="none" />

-      <path fill="none" d="M22 28 L47 28 L47 47 L22 47 L22 28 L22 28 Z" />

-      <path fill="rgb(255,255,153)" d="M22 20 L47 20 L47 28 L22 28 L22 20 L22 20 Z" stroke="none" />

-      <path fill="none" d="M22 20 L47 20 L47 28 L22 28 L22 20 L22 20 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.emf
deleted file mode 100644
index 8eef288..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.svg
deleted file mode 100644
index dbb15ea..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_service_package.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="59" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" />

-      <path fill="rgb(255,255,153)" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" stroke="none" />

-      <path fill="none" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" />

-      <path fill="rgb(255,255,153)" d="M22 28 L47 28 L47 47 L22 47 L22 28 L22 28 Z" stroke="none" />

-      <path fill="none" d="M22 28 L47 28 L47 47 L22 47 L22 28 L22 28 Z" />

-      <path fill="rgb(255,255,153)" d="M22 20 L47 20 L47 28 L22 28 L22 20 L22 20 Z" stroke="none" />

-      <path fill="none" d="M22 20 L47 20 L47 28 L22 28 L22 20 L22 20 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.emf
deleted file mode 100644
index c998018..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.svg
deleted file mode 100644
index b51c774..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/analysis_system.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="69" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M32 11 L32 2 L9 2 L9 11 L9 11 L9 59 L77 59 L77 11 L32 11 L32 11 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M32 11 L32 2 L9 2 L9 11 L9 11 L9 59 L77 59 L77 11 L32 11 L32 11 Z" />

-      <path fill="rgb(255,255,153)" d="M69 67 L1 67 L1 20 L69 20 L69 67 L69 67 Z" stroke="none" />

-      <path fill="none" d="M69 67 L1 67 L1 20 L69 20 L69 67 L69 67 Z" />

-      <path fill="rgb(255,255,153)" d="M24 11 L1 11 L1 20 L24 20 L24 11 L24 11 Z" stroke="none" />

-      <path fill="none" d="M24 11 L1 11 L1 20 L24 20 L24 11 L24 11 Z" />

-      <path fill="rgb(255,255,153)" d="M22 38 L47 38 L47 57 L22 57 L22 38 L22 38 Z" stroke="none" />

-      <path fill="none" d="M22 38 L47 38 L47 57 L22 57 L22 38 L22 38 Z" />

-      <path fill="rgb(255,255,153)" d="M22 30 L47 30 L47 38 L22 38 L22 30 L22 30 Z" stroke="none" />

-      <path fill="none" d="M22 30 L47 30 L47 38 L22 38 L22 30 L22 30 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.svg
deleted file mode 100644
index 07f8b73..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="462" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="483" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(150,154,158)" stroke="rgb(150,154,158)">

-      <path d="M231 472 L243 472 L254 472 L264 471 L275 470 L286 469 L296 468 L306 467 L316 465 L326 463 L335 461 L344 459 L353 457 L362 454 L370 451 L378 448 L386 445 L393 442 L400 439 L406 436 L412 432 L418 428 L423 425 L428 421 L432 417 L436 413 L440 408 L443 404 L445 400 L447 395 L449 391 L449 386 L450 381 L449 377 L449 372 L447 368 L445 363 L443 359 L440 354 L436 350 L432 346 L428 342 L423 338 L418 334 L412 331 L406 327 L400 324 L393 320 L386 317 L378 314 L370 311 L362 309 L353 306 L344 304 L335 302 L326 300 L316 298 L306 296 L296 295 L286 294 L275 293 L264 292 L254 291 L243 291 L231 291 L220 291 L209 291 L198 292 L187 293 L177 294 L166 295 L156 296 L146 298 L137 300 L127 302 L118 304 L109 306 L101 309 L93 311 L85 314 L77 317 L70 320 L63 324 L56 327 L50 331 L45 334 L39 338 L35 342 L30 346 L26 350 L23 354 L20 359 L17 363 L15 368 L14 372 L13 377 L13 381 L13 386 L14 391 L15 395 L17 400 L20 404 L23 408 L26 413 L30 417 L35 421 L39 425 L45 428 L50 432 L56 436 L63 439 L70 442 L77 445 L85 448 L93 451 L101 454 L109 457 L118 459 L127 461 L137 463 L146 465 L156 467 L166 468 L177 469 L187 470 L198 471 L209 472 L220 472 L231 472 Z" stroke="none" />

-      <path d="M439 381 L439 381 L439 382 L439 383 L439 384 L439 385 L439 386 L439 386 L439 387 L438 388 L438 389 L438 390 L438 391 L437 392 L437 392 L437 393 L436 394 L436 395 L435 396 L435 397 L434 398 L434 399 L433 399 L433 400 L432 401 L432 402 L431 403 L430 404 L429 405 L429 406 L428 407 L427 407 L426 408 L425 409 L424 410 L423 411 L422 412 L421 413 L420 414 L419 415 L418 415 L417 416 L416 417 L415 418 L413 419 L412 420 L411 421 L410 421 L408 422 L407 423 L405 424 L404 425 L403 426 L401 426 L400 427 L398 428 L397 429 L395 430 L393 430 L392 431 L390 432 L389 433 L387 434 L385 434 L383 435 L382 436 L380 437 L378 437 L376 438 L374 439 L372 439 L371 440 L369 441 L367 441 L365 442 L363 443 L361 443 L359 444 L355 445 L350 447 L346 448 L342 449 L340 449 L337 450 L335 450 L333 451 L328 452 L324 453 L321 453 L319 454 L317 454 L314 455 L310 455 L305 456 L300 457 L295 458 L290 458 L285 459 L280 459 L274 460 L269 460 L264 461 L261 461 L259 461 L256 461 L253 461 L248 461 L242 462 L237 462 L231 462 L231 483 L237 482 L243 482 L248 482 L254 482 L257 482 L260 482 L262 482 L265 481 L271 481 L276 481 L281 480 L287 480 L292 479 L297 478 L303 478 L308 477 L313 476 L318 475 L320 475 L323 474 L325 474 L328 473 L333 472 L337 471 L340 471 L342 470 L345 470 L347 469 L351 468 L356 467 L360 465 L365 464 L367 463 L369 463 L371 462 L373 461 L375 460 L378 460 L380 459 L382 458 L384 457 L386 457 L388 456 L390 455 L391 454 L393 453 L395 453 L397 452 L399 451 L401 450 L403 449 L404 448 L406 447 L408 447 L409 446 L411 445 L413 444 L414 443 L416 442 L418 441 L419 440 L421 439 L422 438 L424 437 L425 436 L427 435 L428 434 L429 433 L431 432 L432 431 L433 430 L435 429 L436 427 L437 426 L438 425 L440 424 L441 423 L442 422 L443 421 L444 419 L445 418 L446 417 L447 416 L448 415 L449 413 L450 412 L451 411 L452 410 L452 408 L453 407 L454 406 L454 404 L455 403 L456 402 L456 400 L457 399 L457 397 L458 396 L458 395 L459 393 L459 392 L459 390 L459 389 L460 387 L460 386 L460 384 L460 383 L460 381 L460 381 Z" stroke="none" />

-      <path d="M231 301 L231 301 L237 301 L242 301 L248 301 L253 302 L259 302 L264 302 L269 303 L274 303 L280 303 L285 304 L290 305 L295 305 L300 306 L305 307 L310 307 L314 308 L319 309 L324 310 L328 311 L333 312 L337 313 L342 314 L346 315 L350 316 L355 317 L359 319 L363 320 L367 321 L371 323 L374 324 L378 325 L382 327 L385 328 L388 330 L392 332 L395 333 L397 334 L398 335 L400 336 L401 336 L403 337 L404 338 L405 339 L407 340 L408 340 L410 341 L411 342 L412 343 L413 344 L415 345 L416 346 L417 347 L418 347 L419 348 L420 349 L421 350 L422 351 L423 352 L424 353 L425 354 L426 354 L427 355 L428 356 L429 357 L429 358 L430 359 L431 360 L432 361 L432 362 L433 363 L433 363 L434 364 L434 365 L435 366 L435 367 L436 368 L436 369 L437 370 L437 370 L437 371 L438 372 L438 373 L438 374 L438 375 L439 375 L439 376 L439 377 L439 378 L439 379 L439 380 L439 381 L439 381 L460 381 L460 380 L460 378 L460 377 L460 375 L459 374 L459 373 L459 371 L459 370 L458 368 L458 367 L457 365 L457 364 L456 363 L456 361 L455 360 L454 359 L454 357 L453 356 L452 355 L452 353 L451 352 L450 351 L449 349 L448 348 L447 347 L446 346 L445 345 L444 343 L443 342 L442 341 L441 340 L440 339 L438 338 L437 336 L436 335 L435 334 L433 333 L432 332 L431 331 L429 330 L428 329 L427 328 L425 327 L424 326 L422 325 L421 324 L419 323 L418 322 L416 321 L414 320 L413 319 L411 318 L409 317 L408 316 L406 315 L404 314 L401 313 L397 311 L393 309 L390 308 L386 306 L382 305 L378 303 L373 302 L369 300 L365 299 L360 298 L356 296 L351 295 L347 294 L342 293 L338 292 L333 290 L328 289 L323 289 L318 288 L313 287 L308 286 L303 285 L297 285 L292 284 L287 283 L281 283 L276 282 L271 282 L265 281 L260 281 L254 281 L248 281 L243 280 L237 280 L231 280 L231 280 Z" stroke="none" />

-      <path d="M23 381 L23 381 L23 381 L23 380 L23 379 L24 378 L24 377 L24 376 L24 375 L24 375 L24 374 L25 373 L25 372 L25 371 L26 370 L26 370 L26 369 L27 368 L27 367 L28 366 L28 365 L29 364 L29 363 L30 363 L30 362 L31 361 L32 360 L32 359 L33 358 L34 357 L35 356 L36 355 L36 355 L37 354 L38 353 L39 352 L40 351 L41 350 L42 349 L43 348 L45 347 L46 347 L47 346 L48 345 L49 344 L50 343 L52 342 L53 341 L54 340 L56 340 L57 339 L59 338 L60 337 L61 336 L63 336 L64 335 L66 334 L68 333 L69 332 L71 332 L72 331 L74 330 L76 329 L77 328 L79 328 L81 327 L83 326 L85 325 L86 325 L88 324 L92 323 L96 321 L98 321 L100 320 L102 319 L104 319 L108 317 L112 316 L116 315 L121 314 L125 313 L130 312 L134 311 L139 310 L143 309 L148 308 L153 307 L158 307 L163 306 L168 305 L173 305 L178 304 L183 303 L188 303 L193 303 L199 302 L204 302 L209 302 L215 301 L220 301 L226 301 L231 301 L231 280 L226 280 L220 280 L214 281 L209 281 L203 281 L197 281 L192 282 L187 282 L181 283 L176 283 L170 284 L165 285 L160 285 L155 286 L150 287 L145 288 L140 289 L135 289 L130 290 L125 292 L120 293 L116 294 L111 295 L107 296 L102 298 L98 299 L96 300 L93 300 L91 301 L89 302 L85 303 L81 305 L79 305 L77 306 L75 307 L73 308 L71 309 L69 309 L67 310 L65 311 L64 312 L62 313 L60 314 L58 314 L57 315 L55 316 L53 317 L51 318 L50 319 L48 320 L46 321 L45 322 L43 323 L42 324 L40 325 L39 326 L37 327 L36 328 L34 329 L33 330 L32 331 L30 332 L29 333 L28 334 L27 335 L25 336 L24 338 L23 339 L22 340 L21 341 L20 342 L18 343 L17 345 L16 346 L15 347 L15 348 L14 349 L13 351 L12 352 L11 353 L10 355 L9 356 L9 357 L8 359 L7 360 L7 361 L6 363 L6 364 L5 365 L5 367 L4 368 L4 370 L4 371 L3 373 L3 374 L3 375 L3 377 L3 378 L3 380 L3 381 L3 381 Z" stroke="none" />

-      <path d="M231 462 L231 462 L226 462 L220 462 L215 461 L209 461 L207 461 L204 461 L201 461 L199 461 L193 460 L188 460 L183 459 L178 459 L173 458 L168 458 L163 457 L158 456 L153 455 L148 455 L146 454 L143 454 L141 453 L139 453 L134 452 L130 451 L127 450 L125 450 L123 449 L121 449 L119 448 L116 448 L114 447 L112 447 L110 446 L108 445 L106 445 L104 444 L102 443 L100 443 L98 442 L96 441 L94 441 L92 440 L90 439 L88 439 L86 438 L85 437 L83 437 L81 436 L79 435 L77 434 L76 434 L74 433 L72 432 L71 431 L69 431 L68 430 L66 429 L64 428 L63 427 L61 426 L60 426 L59 425 L57 424 L56 423 L54 422 L53 421 L52 421 L50 420 L49 419 L48 418 L47 417 L46 416 L44 415 L43 415 L42 414 L41 413 L40 412 L39 411 L38 410 L37 409 L36 408 L36 407 L35 407 L34 406 L33 405 L32 404 L32 403 L31 402 L30 401 L30 400 L29 399 L29 399 L28 398 L28 397 L27 396 L27 395 L26 394 L26 393 L26 392 L25 392 L25 391 L25 390 L24 389 L24 388 L24 387 L24 386 L24 386 L24 385 L23 384 L23 383 L23 382 L23 381 L3 381 L3 383 L3 384 L3 386 L3 387 L3 389 L3 390 L4 392 L4 393 L4 395 L5 396 L5 397 L6 399 L6 400 L7 402 L7 403 L8 404 L9 406 L9 407 L10 408 L11 410 L12 411 L13 412 L14 413 L15 415 L15 416 L16 417 L17 418 L18 419 L20 421 L21 422 L22 423 L23 424 L24 425 L25 426 L27 427 L28 429 L29 430 L30 431 L32 432 L33 433 L34 434 L36 435 L37 436 L39 437 L40 438 L42 439 L43 440 L45 441 L46 442 L48 443 L50 444 L51 445 L53 446 L55 447 L57 447 L58 448 L60 449 L62 450 L64 451 L65 452 L67 453 L69 453 L71 454 L73 455 L75 456 L77 457 L79 457 L81 458 L83 459 L85 460 L87 460 L89 461 L91 462 L93 463 L96 463 L98 464 L100 465 L102 465 L104 466 L107 467 L109 467 L111 468 L113 468 L116 469 L118 470 L120 470 L123 471 L125 471 L130 472 L135 473 L137 474 L140 474 L142 475 L145 475 L150 476 L155 477 L160 478 L165 478 L170 479 L176 480 L181 480 L187 481 L192 481 L197 481 L200 482 L203 482 L206 482 L209 482 L214 482 L220 482 L226 482 L231 483 L231 483 Z" stroke="none" />

-      <path d="M233 213 L244 213 L255 213 L266 212 L277 211 L287 210 L298 209 L308 208 L318 206 L327 204 L337 202 L346 200 L355 198 L363 195 L372 192 L379 190 L387 187 L394 183 L401 180 L408 177 L414 173 L419 169 L425 166 L430 162 L434 158 L438 154 L441 149 L444 145 L447 141 L449 136 L450 132 L451 127 L451 122 L451 118 L450 113 L449 109 L447 104 L444 100 L441 96 L438 91 L434 87 L430 83 L425 79 L419 76 L414 72 L408 68 L401 65 L394 62 L387 58 L379 55 L372 53 L363 50 L355 47 L346 45 L337 43 L327 41 L318 39 L308 37 L298 36 L287 35 L277 34 L266 33 L255 32 L244 32 L233 32 L222 32 L210 32 L200 33 L189 34 L178 35 L168 36 L158 37 L148 39 L138 41 L129 43 L120 45 L111 47 L102 50 L94 53 L86 55 L78 58 L71 62 L64 65 L58 68 L52 72 L46 76 L41 79 L36 83 L32 87 L28 91 L24 96 L21 100 L19 104 L17 109 L16 113 L15 118 L14 122 L15 127 L16 132 L17 136 L19 141 L21 145 L24 149 L28 154 L32 158 L36 162 L41 166 L46 169 L52 173 L58 177 L64 180 L71 183 L78 187 L86 190 L94 192 L102 195 L111 198 L120 200 L129 202 L138 204 L148 206 L158 208 L168 209 L178 210 L189 211 L200 212 L210 213 L222 213 L233 213 Z" stroke="none" />

-      <path d="M441 122 L441 122 L441 123 L441 124 L441 125 L441 126 L440 127 L440 128 L440 128 L440 129 L440 130 L439 131 L439 132 L439 133 L439 134 L438 134 L438 135 L437 136 L437 137 L436 138 L436 139 L435 140 L435 141 L434 141 L434 142 L433 143 L432 144 L432 145 L431 146 L430 147 L429 148 L428 148 L428 149 L427 150 L426 151 L425 152 L424 153 L423 154 L422 155 L421 156 L420 157 L418 157 L417 158 L416 159 L415 160 L414 161 L412 162 L411 163 L410 163 L408 164 L407 165 L406 166 L404 167 L403 168 L401 168 L400 169 L398 170 L396 171 L395 172 L393 172 L392 173 L390 174 L388 175 L387 175 L385 176 L383 177 L381 178 L379 178 L378 179 L376 180 L374 181 L372 181 L370 182 L368 183 L366 183 L364 184 L362 185 L360 185 L356 186 L352 188 L348 189 L343 190 L341 190 L339 191 L337 192 L334 192 L330 193 L325 194 L323 194 L321 195 L318 195 L316 196 L311 197 L306 197 L301 198 L296 199 L291 199 L286 200 L281 200 L276 201 L271 201 L265 202 L263 202 L260 202 L257 202 L255 202 L249 203 L244 203 L238 203 L233 203 L233 224 L238 224 L244 223 L250 223 L255 223 L258 223 L261 223 L264 223 L267 223 L272 222 L278 222 L283 221 L288 221 L294 220 L299 219 L304 219 L309 218 L314 217 L319 216 L322 216 L324 215 L327 215 L329 214 L334 213 L339 212 L341 212 L344 211 L346 211 L348 210 L353 209 L357 208 L362 206 L366 205 L368 204 L371 204 L373 203 L375 202 L377 202 L379 201 L381 200 L383 199 L385 199 L387 198 L389 197 L391 196 L393 195 L395 195 L397 194 L399 193 L400 192 L402 191 L404 190 L406 189 L408 189 L409 188 L411 187 L413 186 L414 185 L416 184 L418 183 L419 182 L421 181 L422 180 L424 179 L425 178 L427 177 L428 176 L430 175 L431 174 L432 173 L434 172 L435 171 L436 170 L438 169 L439 167 L440 166 L441 165 L442 164 L443 163 L445 162 L446 161 L447 159 L448 158 L449 157 L450 156 L450 154 L451 153 L452 152 L453 151 L454 149 L455 148 L455 147 L456 145 L457 144 L457 143 L458 141 L458 140 L459 138 L459 137 L460 136 L460 134 L460 133 L461 131 L461 130 L461 128 L461 127 L461 125 L461 124 L462 122 L462 122 Z" stroke="none" />

-      <path d="M233 42 L233 42 L238 42 L244 42 L249 42 L255 43 L260 43 L265 43 L271 44 L276 44 L281 45 L286 45 L291 46 L296 46 L301 47 L306 48 L311 48 L316 49 L321 50 L325 51 L330 52 L334 53 L339 54 L343 55 L348 56 L352 57 L356 59 L360 60 L364 61 L368 62 L372 64 L376 65 L380 67 L383 68 L387 70 L390 71 L393 73 L397 74 L398 75 L400 76 L401 77 L403 77 L404 78 L406 79 L407 80 L408 81 L410 82 L411 82 L412 83 L414 84 L415 85 L416 86 L417 87 L418 88 L420 88 L421 89 L422 90 L423 91 L424 92 L425 93 L426 94 L427 95 L428 96 L428 96 L429 97 L430 98 L431 99 L432 100 L432 101 L433 102 L434 103 L434 104 L435 105 L435 105 L436 106 L436 107 L437 108 L437 109 L438 110 L438 111 L439 111 L439 112 L439 113 L439 114 L440 115 L440 116 L440 117 L440 117 L440 118 L441 119 L441 120 L441 121 L441 122 L441 122 L462 122 L461 121 L461 120 L461 118 L461 117 L461 115 L461 114 L460 112 L460 111 L460 109 L459 108 L459 107 L458 105 L458 104 L457 102 L457 101 L456 100 L455 98 L455 97 L454 96 L453 94 L452 93 L451 92 L450 91 L450 89 L449 88 L448 87 L447 86 L446 84 L445 83 L443 82 L442 81 L441 80 L440 79 L439 78 L438 76 L436 75 L435 74 L434 73 L432 72 L431 71 L430 70 L428 69 L427 68 L425 67 L424 66 L422 65 L421 64 L419 63 L417 62 L416 61 L414 60 L413 59 L411 58 L409 57 L408 56 L406 56 L402 54 L399 52 L395 50 L391 49 L387 47 L383 46 L379 44 L375 43 L371 41 L366 40 L362 39 L357 37 L353 36 L348 35 L344 34 L339 33 L334 32 L329 31 L324 30 L319 29 L314 28 L309 27 L304 26 L299 26 L294 25 L288 24 L283 24 L278 23 L272 23 L267 22 L261 22 L255 22 L250 22 L244 22 L238 21 L233 21 L233 21 Z" stroke="none" />

-      <path d="M25 122 L25 122 L25 122 L25 121 L25 120 L25 119 L25 118 L25 117 L25 117 L26 116 L26 115 L26 114 L26 113 L27 112 L27 111 L27 111 L28 110 L28 109 L29 108 L29 107 L30 106 L30 105 L31 105 L31 104 L32 103 L33 102 L33 101 L34 100 L35 99 L35 98 L36 97 L37 97 L38 96 L39 95 L40 94 L41 93 L42 92 L43 91 L44 90 L45 89 L46 88 L47 88 L48 87 L49 86 L51 85 L52 84 L53 83 L54 82 L56 82 L57 81 L59 80 L60 79 L61 78 L63 77 L64 77 L66 76 L67 75 L69 74 L71 73 L72 73 L74 72 L76 71 L77 70 L79 70 L81 69 L82 68 L84 67 L86 67 L88 66 L90 65 L93 64 L97 62 L99 62 L101 61 L103 60 L105 60 L109 59 L114 57 L118 56 L122 55 L127 54 L131 53 L136 52 L140 51 L145 50 L150 49 L154 48 L159 48 L164 47 L169 46 L174 46 L179 45 L184 45 L190 44 L195 44 L200 43 L206 43 L211 43 L216 42 L222 42 L227 42 L233 42 L233 21 L227 21 L221 22 L216 22 L210 22 L204 22 L199 22 L193 23 L188 23 L183 24 L177 24 L172 25 L167 26 L161 26 L156 27 L151 28 L146 29 L141 30 L136 31 L131 32 L127 33 L122 34 L117 35 L113 36 L108 37 L104 39 L99 40 L97 41 L95 41 L93 42 L91 43 L86 44 L82 46 L80 46 L78 47 L76 48 L75 49 L73 50 L71 50 L69 51 L67 52 L65 53 L63 54 L61 55 L60 56 L58 56 L56 57 L55 58 L53 59 L51 60 L50 61 L48 62 L46 63 L45 64 L43 65 L42 66 L40 67 L39 68 L37 69 L36 70 L35 71 L33 72 L32 73 L31 74 L29 75 L28 76 L27 78 L26 79 L24 80 L23 81 L22 82 L21 83 L20 84 L19 86 L18 87 L17 88 L16 89 L15 91 L14 92 L13 93 L12 94 L12 96 L11 97 L10 98 L10 100 L9 101 L8 102 L8 104 L7 105 L7 107 L6 108 L6 109 L5 111 L5 112 L5 114 L5 115 L4 117 L4 118 L4 120 L4 121 L4 122 L4 122 Z" stroke="none" />

-      <path d="M233 203 L233 203 L227 203 L222 203 L216 203 L211 202 L208 202 L206 202 L203 202 L200 202 L195 201 L190 201 L184 200 L179 200 L174 199 L169 199 L164 198 L159 197 L154 197 L150 196 L147 195 L145 195 L143 194 L140 194 L136 193 L131 192 L129 192 L127 191 L124 190 L122 190 L120 189 L118 189 L116 188 L114 188 L111 187 L109 186 L107 186 L105 185 L103 185 L101 184 L99 183 L97 183 L95 182 L93 181 L92 181 L90 180 L88 179 L86 178 L84 178 L82 177 L81 176 L79 175 L77 175 L76 174 L74 173 L72 172 L71 172 L69 171 L67 170 L66 169 L64 168 L63 168 L61 167 L60 166 L59 165 L57 164 L56 163 L54 163 L53 162 L52 161 L51 160 L49 159 L48 158 L47 157 L46 157 L45 156 L44 155 L43 154 L42 153 L41 152 L40 151 L39 150 L38 149 L37 148 L36 148 L35 147 L35 146 L34 145 L33 144 L33 143 L32 142 L31 141 L31 141 L30 140 L30 139 L29 138 L29 137 L28 136 L28 135 L27 134 L27 134 L27 133 L26 132 L26 131 L26 130 L26 129 L25 128 L25 128 L25 127 L25 126 L25 125 L25 124 L25 123 L25 122 L4 122 L4 124 L4 125 L4 127 L4 128 L5 130 L5 131 L5 133 L5 134 L6 136 L6 137 L7 138 L7 140 L8 141 L8 143 L9 144 L10 145 L10 147 L11 148 L12 149 L12 151 L13 152 L14 153 L15 154 L16 156 L17 157 L18 158 L19 159 L20 161 L21 162 L22 163 L23 164 L24 165 L25 166 L27 167 L28 169 L29 170 L31 171 L32 172 L33 173 L35 174 L36 175 L37 176 L39 177 L40 178 L42 179 L43 180 L45 181 L46 182 L48 183 L50 184 L51 185 L53 186 L55 187 L56 188 L58 189 L60 189 L61 190 L63 191 L65 192 L67 193 L69 194 L71 195 L73 195 L75 196 L76 197 L78 198 L80 199 L82 199 L84 200 L86 201 L89 202 L91 202 L93 203 L95 204 L97 204 L99 205 L101 206 L104 206 L106 207 L108 208 L110 208 L113 209 L115 210 L117 210 L119 211 L122 211 L124 212 L127 212 L131 213 L136 214 L139 215 L141 215 L144 216 L146 216 L151 217 L156 218 L161 219 L167 219 L172 220 L177 221 L183 221 L188 222 L193 222 L199 223 L202 223 L204 223 L207 223 L210 223 L216 223 L221 223 L227 224 L233 224 L233 224 Z" stroke="none" />

-      <path d="M44 410 L44 124 L23 124 L23 410 Z" stroke="none" />

-      <path d="M460 404 L460 132 L446 132 L446 404 Z" stroke="none" />

-      <path fill="rgb(236,152,150)" d="M223 464 L234 463 L245 463 L255 463 L266 462 L276 461 L286 459 L296 458 L305 456 L315 455 L324 453 L333 450 L341 448 L350 445 L358 443 L365 440 L373 437 L380 434 L386 430 L393 427 L399 424 L404 420 L409 416 L414 412 L418 408 L422 404 L425 400 L428 395 L431 391 L433 387 L434 382 L435 378 L435 373 L435 368 L434 364 L433 359 L431 355 L428 350 L425 346 L422 342 L418 338 L414 334 L409 330 L404 326 L399 322 L393 319 L386 315 L380 312 L373 309 L365 306 L358 303 L350 300 L341 298 L333 295 L324 293 L315 291 L305 289 L296 288 L286 286 L276 285 L266 284 L255 283 L245 283 L234 282 L223 282 L212 282 L201 283 L191 283 L180 284 L170 285 L160 286 L150 288 L141 289 L131 291 L122 293 L113 295 L105 298 L96 300 L88 303 L81 306 L73 309 L66 312 L60 315 L53 319 L47 322 L42 326 L37 330 L32 334 L28 338 L24 342 L21 346 L18 350 L15 355 L13 359 L12 364 L11 368 L11 373 L11 378 L12 382 L13 387 L15 391 L18 395 L21 400 L24 404 L28 408 L32 412 L37 416 L42 420 L47 424 L53 427 L60 430 L66 434 L73 437 L81 440 L88 443 L96 445 L105 448 L113 450 L122 453 L131 455 L141 456 L150 458 L160 459 L170 461 L180 462 L191 463 L201 463 L212 463 L223 464 Z" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-width="9" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <path fill="none" d="M223 464 L234 463 L245 463 L255 463 L266 462 L276 461 L286 459 L296 458 L305 456 L315 455 L324 453 L333 450 L341 448 L350 445 L358 443 L365 440 L373 437 L380 434 L386 430 L393 427 L399 424 L404 420 L409 416 L414 412 L418 408 L422 404 L425 400 L428 395 L431 391 L433 387 L434 382 L435 378 L435 373 L435 368 L434 364 L433 359 L431 355 L428 350 L425 346 L422 342 L418 338 L414 334 L409 330 L404 326 L399 322 L393 319 L386 315 L380 312 L373 309 L365 306 L358 303 L350 300 L341 298 L333 295 L324 293 L315 291 L305 289 L296 288 L286 286 L276 285 L266 284 L255 283 L245 283 L234 282 L223 282 L212 282 L201 283 L191 283 L180 284 L170 285 L160 286 L150 288 L141 289 L131 291 L122 293 L113 295 L105 298 L96 300 L88 303 L81 306 L73 309 L66 312 L60 315 L53 319 L47 322 L42 326 L37 330 L32 334 L28 338 L24 342 L21 346 L18 350 L15 355 L13 359 L12 364 L11 368 L11 373 L11 378 L12 382 L13 387 L15 391 L18 395 L21 400 L24 404 L28 408 L32 412 L37 416 L42 420 L47 424 L53 427 L60 430 L66 434 L73 437 L81 440 L88 443 L96 445 L105 448 L113 450 L122 453 L131 455 L141 456 L150 458 L160 459 L170 461 L180 462 L191 463 L201 463 L212 463 L223 464 Z" />

-      <path fill="rgb(236,152,150)" d="M4 377 L443 377 L443 95 L4 95 L4 377 Z" stroke="none" />

-      <path fill="none" d="M4 377 L443 377 L443 95 L4 95 L4 377 Z" stroke="rgb(236,152,150)" />

-      <path fill="white" d="M224 186 L236 186 L247 185 L258 185 L268 184 L279 183 L289 182 L299 180 L309 179 L319 177 L328 175 L337 173 L346 170 L355 168 L363 165 L371 162 L379 159 L386 156 L393 153 L399 149 L405 146 L411 142 L416 138 L421 134 L426 130 L429 126 L433 122 L436 118 L438 113 L440 109 L442 104 L442 100 L443 95 L442 90 L442 86 L440 81 L438 77 L436 72 L433 68 L429 64 L426 60 L421 56 L416 52 L411 48 L405 44 L399 41 L393 37 L386 34 L379 31 L371 28 L363 25 L355 22 L346 20 L337 18 L328 15 L319 13 L309 12 L299 10 L289 8 L279 7 L268 6 L258 5 L247 5 L236 4 L224 4 L213 4 L202 5 L191 5 L180 6 L170 7 L160 8 L149 10 L140 12 L130 13 L120 15 L111 18 L102 20 L94 22 L86 25 L78 28 L70 31 L63 34 L56 37 L49 41 L43 44 L38 48 L32 52 L28 56 L23 60 L19 64 L16 68 L13 72 L10 77 L9 81 L7 86 L6 90 L6 95 L6 100 L7 104 L9 109 L10 113 L13 118 L16 122 L19 126 L23 130 L28 134 L32 138 L38 142 L43 146 L49 149 L56 153 L63 156 L70 159 L78 162 L86 165 L94 168 L102 170 L111 173 L120 175 L130 177 L140 179 L149 180 L160 182 L170 183 L180 184 L191 185 L202 185 L213 186 L224 186 Z" stroke="none" />

-      <path fill="none" d="M224 186 L236 186 L247 185 L258 185 L268 184 L279 183 L289 182 L299 180 L309 179 L319 177 L328 175 L337 173 L346 170 L355 168 L363 165 L371 162 L379 159 L386 156 L393 153 L399 149 L405 146 L411 142 L416 138 L421 134 L426 130 L429 126 L433 122 L436 118 L438 113 L440 109 L442 104 L442 100 L443 95 L442 90 L442 86 L440 81 L438 77 L436 72 L433 68 L429 64 L426 60 L421 56 L416 52 L411 48 L405 44 L399 41 L393 37 L386 34 L379 31 L371 28 L363 25 L355 22 L346 20 L337 18 L328 15 L319 13 L309 12 L299 10 L289 8 L279 7 L268 6 L258 5 L247 5 L236 4 L224 4 L213 4 L202 5 L191 5 L180 6 L170 7 L160 8 L149 10 L140 12 L130 13 L120 15 L111 18 L102 20 L94 22 L86 25 L78 28 L70 31 L63 34 L56 37 L49 41 L43 44 L38 48 L32 52 L28 56 L23 60 L19 64 L16 68 L13 72 L10 77 L9 81 L7 86 L6 90 L6 95 L6 100 L7 104 L9 109 L10 113 L13 118 L16 122 L19 126 L23 130 L28 134 L32 138 L38 142 L43 146 L49 149 L56 153 L63 156 L70 159 L78 162 L86 165 L94 168 L102 170 L111 173 L120 175 L130 177 L140 179 L149 180 L160 182 L170 183 L180 184 L191 185 L202 185 L213 186 L224 186 Z" />

-      <path fill="none" d="M6 97 L6 382" />

-      <path fill="none" d="M441 92 L441 381" />

-      <path fill="white" d="M171 339 L416 339 L416 212 L171 212 L171 339 Z" stroke="none" />

-      <path fill="none" d="M171 339 L416 339 L416 212 L171 212 L171 339 Z" stroke-width="6" />

-      <path d="M230 340 L230 214 L213 214 L213 340 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M272 211 L272 336" stroke-width="6" />

-      <path d="M413 234 L171 234 L171 251 L413 251 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M172 338 L413 338" stroke-width="6" />

-      <path fill="none" d="M172 305 L413 305" stroke-width="6" />

-      <path fill="none" d="M172 276 L413 276" stroke-width="6" />

-      <path fill="none" d="M319 211 L319 336" stroke-width="6" />

-      <path fill="none" d="M367 211 L367 336" stroke-width="6" />

-      <path fill="none" d="M414 211 L414 336" stroke-width="6" />

-      <path fill="white" d="M36 392 L232 392 L232 290 L36 290 L36 392 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M36 392 L232 392 L232 290 L36 290 L36 392 Z" stroke-width="6" />

-      <path d="M84 393 L84 292 L68 292 L68 393 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M117 290 L117 390" stroke-width="6" />

-      <path d="M230 307 L36 307 L36 323 L230 323 Z" stroke-width="6" stroke="none" />

-      <path fill="none" d="M36 391 L230 391" stroke-width="6" />

-      <path fill="none" d="M36 365 L230 365" stroke-width="6" />

-      <path fill="none" d="M36 342 L230 342" stroke-width="6" />

-      <path fill="none" d="M155 290 L155 390" stroke-width="6" />

-      <path fill="none" d="M193 290 L193 390" stroke-width="6" />

-      <path fill="none" d="M230 290 L230 390" stroke-width="6" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.wmf
deleted file mode 100644
index dd03f65..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_datastore.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.svg
deleted file mode 100644
index 49caf08..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="364" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="322" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" transform="matrix(10.4,0,0,10.3871,0,0)" stroke="white">

-      <image x="0" y="0" width="35" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAfCAIAAADiA+PYAAAAnklEQVR42mP8//8/

-A10AC4Rq7uihnR0T+7rfvHrJAue7ONjTwpo9Bw6i+AkCMrK3Ud2mkFBuCIOJKsbN

-mOoFRE8fT8NkwNUwMdALsFDFFF8/H1wM7DYB/UuuXV6kpQi4KLUAcnpGD73aihIq

-2nT8xOkBSBGjNo3aNGrTqE2jNo3aNBhtYkGrjJFrSVrZRPVGBHabgE1nOoUesIVO

-a5sA51o1q6PuLoAAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="31" preserveAspectRatio="none" xlink:show="embed" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.wmf
deleted file mode 100644
index 3d96683..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_executable.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.svg
deleted file mode 100644
index 8079704..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="418" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="372" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(31,26,23)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <path fill="none" d="M89 183 L340 183" />

-      <path fill="none" d="M90 183 L90 241" />

-      <path fill="none" d="M338 182 L338 246" />

-      <path fill="none" d="M203 122 L203 184" />

-      <path fill="rgb(250,248,204)" d="M260 108 L255 103 L157 103 L151 108 L260 108 Z" stroke="none" />

-      <path fill="none" d="M260 108 L255 103 L157 103 L151 108 L260 108 Z" />

-      <path fill="rgb(250,248,204)" d="M280 124 L274 120 L138 120 L133 124 L280 124 Z" stroke="none" />

-      <path fill="none" d="M280 124 L274 120 L138 120 L133 124 L280 124 Z" />

-      <path fill="rgb(250,248,204)" d="M150 103 L156 98 L174 98 L174 86 L161 86 L161 1 L210 1 L260 1 L260 66 L260 86 L246 86 L246 98 L257 98 L267 108 L283 121 L285 121 L285 124 L288 125 L288 127 L288 127 L288 128 L288 129 L287 130 L285 130 L284 131 L283 131 L202 131 L130 131 L127 131 L127 130 L126 130 L125 129 L124 129 L124 128 L124 127 L124 127 L125 125 L126 124 L127 121 L129 121 L113 121 L113 66 L113 18 L150 18 L150 103 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M150 103 L147 106 L133 117 L129 121 L150 103 Z" stroke="none" />

-      <path fill="none" d="M150 103 L156 98 L174 98 L174 86 L161 86 L161 1 L210 1 L260 1 L260 66 L260 86 L246 86 L246 98 L257 98 L267 108 L283 121 L285 121 L285 124 L288 125 L288 127 L288 127 L288 128 L288 129 L287 130 L285 130 L284 131 L283 131 L202 131 L130 131 L127 131 L127 130 L126 130 L125 129 L124 129 L124 128 L124 127 L124 127 L125 125 L126 124 L127 121 L129 121 L113 121 L113 66 L113 18 L150 18 L150 103 Z" />

-      <path fill="none" d="M150 103 L147 106 L133 117 L129 121 L150 103 Z" />

-      <path fill="rgb(250,248,204)" d="M246 15 L246 72 L174 72 L174 15 L246 15 Z" stroke="none" />

-      <path fill="none" d="M246 15 L246 72 L174 72 L174 15 L246 15 Z" />

-      <path fill="rgb(250,248,204)" d="M146 25 L146 27 L117 27 L117 25 L146 25 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M174 86 L246 86 L246 98 L174 98 L174 86 Z" stroke="none" />

-      <path fill="none" d="M146 25 L146 27 L117 27 L117 25 L146 25 Z" />

-      <path fill="none" d="M174 86 L246 86 L246 98 L174 98 L174 86 Z" />

-      <path fill="none" d="M150 103 L156 98 L174 98 L174 86 L161 86 L161 1 L210 1 L260 1 L260 66 L260 86 L246 86 L246 98 L257 98 L267 108 L283 121 L285 121 L285 124 L288 125 L288 127 L288 127 L288 128 L288 129 L287 130 L285 130 L284 131 L283 131 L202 131 L130 131 L127 131 L127 130 L126 130 L125 129 L124 129 L124 128 L124 127 L124 127 L125 125 L126 124 L127 121 L129 121 L113 121 L113 66 L113 18 L150 18 L150 103" />

-      <path fill="none" d="M150 103 L147 106 L133 117 L129 121 L150 103 Z" />

-      <path fill="none" d="M246 15 L246 72 L174 72 L174 15 L246 15 Z" />

-      <path fill="none" d="M174 86 L246 86 L246 98 L174 98" />

-      <path fill="rgb(250,248,204)" d="M270 116 L264 111 L147 111 L141 116 L270 116 Z" stroke="none" />

-      <path fill="none" d="M270 116 L264 111 L147 111 L141 116 L270 116 Z" />

-      <path fill="none" d="M158 108 L253 108" stroke-width="3" />

-      <path fill="none" d="M150 113 L259 113" stroke-width="3" />

-      <path fill="none" d="M141 122 L266 122" stroke-width="3" />

-      <path fill="rgb(250,248,204)" d="M149 344 L143 339 L45 339 L39 344 L149 344 Z" stroke-width="3" stroke="none" />

-      <path fill="none" d="M149 344 L143 339 L45 339 L39 344 L149 344 Z" />

-      <path fill="rgb(250,248,204)" d="M158 352 L152 347 L35 347 L30 352 L158 352 Z" stroke="none" />

-      <path fill="none" d="M158 352 L152 347 L35 347 L30 352 L158 352 Z" />

-      <path fill="rgb(250,248,204)" d="M168 360 L162 356 L26 356 L21 360 L168 360 Z" stroke="none" />

-      <path fill="none" d="M168 360 L162 356 L26 356 L21 360 L168 360 Z" />

-      <path fill="rgb(250,248,204)" d="M38 339 L44 334 L63 334 L63 322 L49 322 L49 237 L98 237 L148 237 L148 302 L148 322 L134 322 L134 334 L145 334 L155 344 L171 357 L173 357 L174 360 L176 361 L176 363 L176 363 L176 364 L176 365 L175 366 L174 366 L172 367 L171 367 L90 367 L18 367 L16 367 L15 366 L14 366 L13 365 L12 365 L12 364 L12 363 L12 363 L13 361 L14 360 L15 357 L17 357 L1 357 L1 302 L1 254 L38 254 L38 339 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M38 339 L35 342 L21 353 L17 357 L38 339 Z" stroke="none" />

-      <path fill="none" d="M38 339 L44 334 L63 334 L63 322 L49 322 L49 237 L98 237 L148 237 L148 302 L148 322 L134 322 L134 334 L145 334 L155 344 L171 357 L173 357 L174 360 L176 361 L176 363 L176 363 L176 364 L176 365 L175 366 L174 366 L172 367 L171 367 L90 367 L18 367 L16 367 L15 366 L14 366 L13 365 L12 365 L12 364 L12 363 L12 363 L13 361 L14 360 L15 357 L17 357 L1 357 L1 302 L1 254 L38 254 L38 339 Z" />

-      <path fill="none" d="M38 339 L35 342 L21 353 L17 357 L38 339 Z" />

-      <path fill="rgb(250,248,204)" d="M134 251 L134 308 L63 308 L63 251 L134 251 Z" stroke="none" />

-      <path fill="none" d="M134 251 L134 308 L63 308 L63 251 L134 251 Z" />

-      <path fill="rgb(250,248,204)" d="M34 261 L34 263 L5 263 L5 261 L34 261 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M63 322 L134 322 L134 334 L63 334 L63 322 Z" stroke="none" />

-      <path fill="none" d="M34 261 L34 263 L5 263 L5 261 L34 261 Z" />

-      <path fill="none" d="M63 322 L134 322 L134 334 L63 334 L63 322 Z" />

-      <path fill="none" d="M38 339 L44 334 L63 334 L63 322 L49 322 L49 237 L98 237 L148 237 L148 302 L148 322 L134 322 L134 334 L145 334 L155 344 L171 357 L173 357 L174 360 L176 361 L176 363 L176 363 L176 364 L176 365 L175 366 L174 366 L172 367 L171 367 L90 367 L18 367 L16 367 L15 366 L14 366 L13 365 L12 365 L12 364 L12 363 L12 363 L13 361 L14 360 L15 357 L17 357 L1 357 L1 302 L1 254 L38 254 L38 339" />

-      <path fill="none" d="M38 339 L35 342 L21 353 L17 357 L38 339 Z" />

-      <path fill="none" d="M134 251 L134 308 L63 308 L63 251 L134 251 Z" />

-      <path fill="none" d="M63 322 L134 322 L134 334 L63 334" />

-      <path fill="rgb(250,248,204)" d="M389 347 L383 342 L285 342 L279 347 L389 347 Z" stroke="none" />

-      <path fill="none" d="M389 347 L383 342 L285 342 L279 347 L389 347 Z" />

-      <path fill="rgb(250,248,204)" d="M398 356 L393 350 L276 350 L270 356 L398 356 Z" stroke="none" />

-      <path fill="none" d="M398 356 L393 350 L276 350 L270 356 L398 356 Z" />

-      <path fill="rgb(250,248,204)" d="M408 364 L402 359 L266 359 L261 364 L408 364 Z" stroke="none" />

-      <path fill="none" d="M408 364 L402 359 L266 359 L261 364 L408 364 Z" />

-      <path fill="rgb(250,248,204)" d="M279 342 L285 337 L303 337 L303 326 L289 326 L289 240 L338 240 L388 240 L388 305 L388 326 L374 326 L374 337 L385 337 L396 347 L412 360 L413 361 L414 363 L416 364 L416 366 L416 366 L416 367 L416 368 L415 369 L414 369 L412 370 L412 370 L330 370 L258 370 L256 370 L255 369 L254 369 L254 368 L252 368 L252 367 L252 366 L252 366 L254 364 L254 363 L255 361 L257 360 L241 360 L241 305 L241 257 L279 257 L279 342 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M279 342 L275 345 L262 356 L257 360 L279 342 Z" stroke="none" />

-      <path fill="none" d="M279 342 L285 337 L303 337 L303 326 L289 326 L289 240 L338 240 L388 240 L388 305 L388 326 L374 326 L374 337 L385 337 L396 347 L412 360 L413 361 L414 363 L416 364 L416 366 L416 366 L416 367 L416 368 L415 369 L414 369 L412 370 L412 370 L330 370 L258 370 L256 370 L255 369 L254 369 L254 368 L252 368 L252 367 L252 366 L252 366 L254 364 L254 363 L255 361 L257 360 L241 360 L241 305 L241 257 L279 257 L279 342 Z" />

-      <path fill="none" d="M279 342 L275 345 L262 356 L257 360 L279 342 Z" />

-      <path fill="rgb(250,248,204)" d="M374 254 L374 312 L303 312 L303 254 L374 254 Z" stroke="none" />

-      <path fill="none" d="M374 254 L374 312 L303 312 L303 254 L374 254 Z" />

-      <path fill="rgb(250,248,204)" d="M274 264 L274 266 L246 266 L246 264 L274 264 Z" stroke="none" />

-      <path fill="rgb(250,248,204)" d="M303 326 L374 326 L374 337 L303 337 L303 326 Z" stroke="none" />

-      <path fill="none" d="M274 264 L274 266 L246 266 L246 264 L274 264 Z" />

-      <path fill="none" d="M303 326 L374 326 L374 337 L303 337 L303 326 Z" />

-      <path fill="none" d="M279 342 L285 337 L303 337 L303 326 L289 326 L289 240 L338 240 L388 240 L388 305 L388 326 L374 326 L374 337 L385 337 L396 347 L412 360 L413 361 L414 363 L416 364 L416 366 L416 366 L416 367 L416 368 L415 369 L414 369 L412 370 L412 370 L330 370 L258 370 L256 370 L255 369 L254 369 L254 368 L252 368 L252 367 L252 366 L252 366 L254 364 L254 363 L255 361 L257 360 L241 360 L241 305 L241 257 L279 257 L279 342" />

-      <path fill="none" d="M279 342 L275 345 L262 356 L257 360 L279 342 Z" />

-      <path fill="none" d="M374 254 L374 312 L303 312 L303 254 L374 254 Z" />

-      <path fill="none" d="M303 326 L374 326 L374 337 L303 337" />

-      <path fill="rgb(250,248,204)" d="M157 353 L151 348 L35 348 L29 353 L157 353 Z" stroke="none" />

-      <path fill="none" d="M157 353 L151 348 L35 348 L29 353 L157 353 Z" />

-      <path fill="none" d="M45 345 L140 345" stroke-width="3" />

-      <path fill="none" d="M37 350 L146 350" stroke-width="3" />

-      <path fill="none" d="M28 359 L154 359" stroke-width="3" />

-      <path fill="rgb(250,248,204)" d="M396 356 L390 351 L273 351 L267 356 L396 356 Z" stroke-width="3" stroke="none" />

-      <path fill="none" d="M396 356 L390 351 L273 351 L267 356 L396 356 Z" />

-      <path fill="none" d="M283 348 L378 348" stroke-width="3" />

-      <path fill="none" d="M275 354 L385 354" stroke-width="3" />

-      <path fill="none" d="M266 362 L392 362" stroke-width="3" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.wmf
deleted file mode 100644
index 362168a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/artifact_infrastructure.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.emf
deleted file mode 100644
index 98949f5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.svg
deleted file mode 100644
index 58cadab..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_implementation.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="169" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,128)" stroke="rgb(255,255,128)">

-      <path d="M-1 57 L-1 167 L147 167 L147 65 L38 65 L38 48 L-1 48 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 57 L-1 167 L147 167 L147 65 L38 65 L38 48 L-1 48 Z" />

-      <path fill="aqua" d="M103 87 L158 0 L195 26 L140 112 Z" stroke="none" />

-      <path fill="none" d="M103 87 L158 0 L195 26 L140 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.emf
deleted file mode 100644
index 0a64039..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.svg
deleted file mode 100644
index f1a66f3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_private.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="187" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="213" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="7" stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="37" fill="none" ry="47" cx="57" cy="122" />

-      <ellipse fill="none" rx="45.5" cx="56.5" ry="53" cy="115" stroke="gray" stroke-width="19" />

-      <rect x="1" y="118" fill="silver" width="114" height="93" stroke="none" stroke-width="19" />

-      <rect x="1" y="118" fill="none" width="114" height="93" stroke-width="1" />

-      <rect x="1" y="119" fill="white" width="87" height="17" stroke="none" stroke-width="1" />

-      <rect x="1" y="119" fill="none" width="87" height="17" stroke-width="1" />

-      <rect x="40" y="152" width="33" height="34" stroke="none" stroke-width="1" />

-      <rect x="40" y="152" fill="none" width="33" height="34" stroke-width="1" />

-      <line fill="none" x1="35" x2="35" y1="75" y2="83" stroke="gray" stroke-width="19" />

-      <path fill="aqua" d="M93 87 L148 0 L185 26 L130 112 Z" stroke-width="19" stroke="none" />

-      <path fill="none" d="M93 87 L148 0 L185 26 L130 112 Z" stroke-width="1" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.emf
deleted file mode 100644
index d83b654..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.svg
deleted file mode 100644
index 58cadab..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_project.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="169" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,128)" stroke="rgb(255,255,128)">

-      <path d="M-1 57 L-1 167 L147 167 L147 65 L38 65 L38 48 L-1 48 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 57 L-1 167 L147 167 L147 65 L38 65 L38 48 L-1 48 Z" />

-      <path fill="aqua" d="M103 87 L158 0 L195 26 L140 112 Z" stroke="none" />

-      <path fill="none" d="M103 87 L158 0 L195 26 L140 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.emf
deleted file mode 100644
index b057ff5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.svg
deleted file mode 100644
index 60ede1e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_protected.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="173" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="203" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="yellow" stroke="yellow">

-      <path d="M79 10 L43 1 L3 10 L-1 44 L3 69 L19 82 L19 185 L39 202 L59 185 L59 159 L67 143 L57 133 L66 117 L59 108 L59 82 L79 74 L87 44 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M79 10 L43 1 L3 10 L-1 44 L3 69 L19 82 L19 185 L39 202 L59 185 L59 159 L67 143 L57 133 L66 117 L59 108 L59 82 L79 74 L87 44 Z" />

-      <ellipse rx="14" ry="14.5" cx="47" cy="43.5" stroke="none" />

-      <ellipse rx="14" fill="none" ry="14.5" cx="47" cy="43.5" />

-      <line y2="193" fill="none" x1="39" x2="39" y1="78" />

-      <path fill="aqua" d="M79 87 L134 0 L171 26 L116 112 Z" stroke="none" />

-      <path fill="none" d="M79 87 L134 0 L171 26 L116 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.emf
deleted file mode 100644
index c2d4b54..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.svg
deleted file mode 100644
index 6081be3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/attribute_public.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="94" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="114" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="aqua" stroke="aqua">

-      <path d="M0 87 L55 0 L92 26 L37 112 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 87 L55 0 L92 26 L37 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.emf
deleted file mode 100644
index 410a320..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.svg
deleted file mode 100644
index 674c832..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/beziers.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="401" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="351" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="blue" stroke-linecap="round" stroke-linejoin="round" stroke="blue">

-      <path fill="none" d="M0 50 C100 250 400 50 200 0 C0 200 150 50 200 350" />

-      <line y2="250" fill="none" x1="200" x2="100" y1="350" />

-      <polygon fill="none" points=" 100 250 400 50 200 0 0 200 150 50 200 350" />

-      <path fill="white" d="M100 250 L400 50 L200 0 L0 200 L150 50 L200 350 Z" stroke="none" />

-      <path fill="none" d="M100 250 L400 50 L200 0 L0 200 L150 50 L200 350 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.emf
deleted file mode 100644
index 07f7e8c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.svg
deleted file mode 100644
index 56702e1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/boundary.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="64" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="67" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M1 1 L1 65" />

-      <path fill="none" d="M15 31 L1 31" />

-      <path fill="rgb(255,255,153)" d="M-376 561 ZM61 31 C61 44 51 54 38 54 C25 54 15 44 15 31 C15 18 25 7 38 7 C51 7 61 18 61 31 Z" stroke="none" />

-      <path fill="none" d="M-376 561 ZM61 31 C61 44 51 54 38 54 C25 54 15 44 15 31 C15 18 25 7 38 7 C51 7 61 18 61 31 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.emf
deleted file mode 100644
index 1ff03dc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.svg
deleted file mode 100644
index 1968ab2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="196" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <circle r="92.5" cx="97.5" cy="96.5" stroke="none" />

-    </g>

-    <g stroke-width="8" stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="92.5" cx="97.5" cy="96.5" />

-      <line y2="160" fill="none" x1="33" x2="160" y1="32" />

-      <line y2="34" fill="none" x1="34" x2="161" y1="161" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.emf
deleted file mode 100644
index 1b45542..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.svg
deleted file mode 100644
index 2567a94..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/brokenref2.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="196" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <circle r="92.5" cx="97.5" cy="96.5" stroke="none" />

-    </g>

-    <g stroke-width="8" stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="92.5" cx="97.5" cy="96.5" />

-      <line y2="160" fill="none" x1="33" x2="160" y1="32" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.emf
deleted file mode 100644
index a0cbd4c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.svg
deleted file mode 100644
index b1a8d78..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/choice.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="87" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="79" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(20,20,22)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(20,20,22)">

-      <path fill="none" d="M0 78 L0 78 L0 0 L86 0 L86 78 L0 78 L0 78" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.emf
deleted file mode 100644
index d0a5f2d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.svg
deleted file mode 100644
index 549b458..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/clientpage.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="235" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="235" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAICAIAAAB/FOjAAAAAH0lEQVR42mNgoDVg

-hFAHDhxAk3BwcMAqzkSqDcNBAwCitwVMVDvkRgAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="white" stroke="white">

-      <path d="M4 230 L230 230 L230 4 L4 4 L4 230 Z" stroke="none" />

-    </g>

-    <g stroke-width="6" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 230 L230 230 L230 4 L4 4 L4 230 Z" />

-      <path fill="teal" d="M4 18 L230 18 L230 4 L4 4 L4 18 Z" stroke="none" />

-      <path fill="none" d="M4 18 L230 18 L230 4 L4 4 L4 18 Z" />

-      <path fill="rgb(230,230,230)" d="M174 60 L230 60 L230 18 L174 18 L174 60 Z" stroke="none" />

-      <path fill="none" d="M174 60 L230 60 L230 18 L174 18 L174 60 Z" stroke-width="2" />

-      <path fill="url(#pattern1)" d="M4 60 L174 60 L174 18 L4 18 L4 60 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M4 60 L174 60 L174 18 L4 18 L4 60 Z" stroke-width="2" />

-      <path fill="navy" d="M190 39 L192 32 L197 27 L204 25 L211 27 L216 32 L218 39 L216 46 L211 51 L204 53 L197 51 L192 46 L190 39 Z" stroke-width="2" stroke="none" />

-      <path fill="white" d="M18 46 L160 46 L160 32 L18 32 L18 46 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M39 88 L202 88" stroke-width="2" />

-      <path fill="none" d="M18 109 L202 109" stroke-width="2" />

-      <path fill="none" d="M18 132 L202 132" stroke-width="2" />

-      <path fill="none" d="M18 153 L202 153" stroke-width="2" />

-      <path fill="none" d="M18 174 L202 174" stroke-width="2" />

-      <path fill="none" d="M18 195 L202 195" stroke-width="2" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.emf
deleted file mode 100644
index f6d0cf4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.svg
deleted file mode 100644
index 7ab1f6f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/control.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="51" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="61" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M-383 558 ZM48 35 C48 48 37 59 24 59 C11 59 1 48 1 35 C1 22 11 11 24 11 C37 11 48 22 48 35 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-383 558 ZM48 35 C48 48 37 59 24 59 C11 59 1 48 1 35 C1 22 11 11 24 11 C37 11 48 22 48 35 Z" />

-      <path fill="none" d="M33 20 L24 11 L33 2" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.emf
deleted file mode 100644
index d68405d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.svg
deleted file mode 100644
index f9f6415..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/crossmodel.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="173" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="184" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="8" stroke-linecap="round" stroke-linejoin="round">

-      <line y2="142" fill="none" x1="10" x2="10" y1="10" />

-      <line y2="10" fill="none" x1="10" x2="94" y1="10" />

-      <line y2="18" fill="none" x1="94" x2="18" y1="18" />

-      <line y2="18" fill="none" x1="18" x2="18" y1="99" />

-      <line y2="14" fill="none" x1="14" x2="134" y1="14" />

-      <line y2="146" fill="none" x1="14" x2="14" y1="86" />

-      <line y2="146" fill="none" x1="26" x2="26" y1="5" />

-      <line y2="27" fill="none" x1="6" x2="138" y1="27" />

-      <line y2="22" fill="none" x1="6" x2="138" y1="22" />

-      <line y2="146" fill="none" x1="22" x2="22" y1="10" />

-      <line y2="146" fill="none" x1="18" x2="18" y1="5" />

-      <line y2="10" fill="none" x1="6" x2="138" y1="10" />

-      <line y2="18" fill="none" x1="6" x2="138" y1="18" />

-      <line y2="146" fill="none" x1="6" x2="6" y1="5" />

-      <line y2="5" fill="none" x1="138" x2="6" y1="5" />

-      <line fill="none" x1="26" x2="150" y1="27" y2="159" stroke-width="41" />

-      <line y2="31" fill="none" x1="150" x2="22" y1="167" />

-      <line y2="14" fill="none" x1="158" x2="22" y1="159" />

-      <line y2="35" fill="none" x1="146" x2="18" y1="171" />

-      <line y2="18" fill="none" x1="162" x2="34" y1="154" />

-      <line y2="35" fill="none" x1="142" x2="10" y1="176" />

-      <line y2="18" fill="none" x1="166" x2="42" y1="150" />

-      <line y2="146" fill="none" x1="10" x2="10" y1="5" />

-      <line y2="14" fill="none" x1="6" x2="138" y1="14" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.svg
deleted file mode 100644
index 85a226b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="605" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="662" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M1 580 L1 87" />

-      <path fill="none" d="M601 580 L601 87" />

-      <path fill="rgb(255,255,204)" d="M301 660 L317 660 L332 660 L347 659 L362 658 L376 657 L390 656 L404 655 L418 654 L431 652 L444 650 L457 648 L469 646 L481 644 L492 642 L503 639 L513 637 L523 634 L533 631 L542 628 L550 625 L558 622 L565 618 L572 615 L578 611 L583 608 L588 604 L592 600 L595 596 L598 592 L600 588 L601 584 L601 580 L601 576 L600 572 L598 568 L595 564 L592 560 L588 557 L583 553 L578 549 L572 546 L565 542 L558 539 L550 536 L542 533 L533 530 L523 527 L513 524 L503 521 L492 519 L481 517 L469 514 L457 512 L444 510 L431 509 L418 507 L404 506 L390 504 L376 503 L362 502 L347 502 L332 501 L317 501 L301 501 L286 501 L271 501 L256 502 L241 502 L226 503 L212 504 L198 506 L185 507 L171 509 L158 510 L146 512 L134 514 L122 517 L111 519 L100 521 L89 524 L79 527 L70 530 L61 533 L53 536 L45 539 L37 542 L31 546 L25 549 L19 553 L15 557 L11 560 L7 564 L5 568 L3 572 L2 576 L1 580 L2 584 L3 588 L5 592 L7 596 L11 600 L15 604 L19 608 L25 611 L31 615 L37 618 L45 622 L53 625 L61 628 L70 631 L79 634 L89 637 L100 639 L111 642 L122 644 L134 646 L146 648 L158 650 L171 652 L185 654 L198 655 L212 656 L226 657 L241 658 L256 659 L271 660 L286 660 L301 660 Z" stroke="none" />

-      <path fill="none" d="M301 660 L317 660 L332 660 L347 659 L362 658 L376 657 L390 656 L404 655 L418 654 L431 652 L444 650 L457 648 L469 646 L481 644 L492 642 L503 639 L513 637 L523 634 L533 631 L542 628 L550 625 L558 622 L565 618 L572 615 L578 611 L583 608 L588 604 L592 600 L595 596 L598 592 L600 588 L601 584 L601 580 L601 576 L600 572 L598 568 L595 564 L592 560 L588 557 L583 553 L578 549 L572 546 L565 542 L558 539 L550 536 L542 533 L533 530 L523 527 L513 524 L503 521 L492 519 L481 517 L469 514 L457 512 L444 510 L431 509 L418 507 L404 506 L390 504 L376 503 L362 502 L347 502 L332 501 L317 501 L301 501 L286 501 L271 501 L256 502 L241 502 L226 503 L212 504 L198 506 L185 507 L171 509 L158 510 L146 512 L134 514 L122 517 L111 519 L100 521 L89 524 L79 527 L70 530 L61 533 L53 536 L45 539 L37 542 L31 546 L25 549 L19 553 L15 557 L11 560 L7 564 L5 568 L3 572 L2 576 L1 580 L2 584 L3 588 L5 592 L7 596 L11 600 L15 604 L19 608 L25 611 L31 615 L37 618 L45 622 L53 625 L61 628 L70 631 L79 634 L89 637 L100 639 L111 642 L122 644 L134 646 L146 648 L158 650 L171 652 L185 654 L198 655 L212 656 L226 657 L241 658 L256 659 L271 660 L286 660 L301 660" />

-      <path fill="rgb(255,255,204)" d="M303 160 L318 160 L333 160 L348 159 L363 159 L378 158 L392 157 L406 155 L419 154 L433 152 L446 151 L458 149 L470 147 L482 144 L494 142 L504 140 L515 137 L525 134 L534 131 L543 128 L552 125 L559 122 L567 118 L573 115 L579 112 L585 108 L589 104 L593 100 L597 97 L599 93 L601 89 L603 85 L603 81 L603 77 L601 72 L599 69 L597 65 L593 61 L589 57 L585 53 L579 50 L573 46 L567 43 L559 39 L552 36 L543 33 L534 30 L525 27 L515 24 L504 22 L494 19 L482 17 L470 15 L458 13 L446 11 L433 9 L419 7 L406 6 L392 5 L378 4 L363 3 L348 2 L333 1 L318 1 L303 1 L287 1 L272 1 L257 2 L242 3 L228 4 L214 5 L200 6 L186 7 L173 9 L160 11 L147 13 L135 15 L123 17 L112 19 L101 22 L91 24 L81 27 L71 30 L62 33 L54 36 L46 39 L39 43 L32 46 L26 50 L21 53 L16 57 L12 61 L9 65 L6 69 L4 72 L3 77 L3 81 L3 85 L4 89 L6 93 L9 97 L12 100 L16 104 L21 108 L26 112 L32 115 L39 118 L46 122 L54 125 L62 128 L71 131 L81 134 L91 137 L101 140 L112 142 L123 144 L135 147 L147 149 L160 151 L173 152 L186 154 L200 155 L214 157 L228 158 L242 159 L257 159 L272 160 L287 160 L303 160 Z" stroke="none" />

-      <path fill="none" d="M303 160 L318 160 L333 160 L348 159 L363 159 L378 158 L392 157 L406 155 L419 154 L433 152 L446 151 L458 149 L470 147 L482 144 L494 142 L504 140 L515 137 L525 134 L534 131 L543 128 L552 125 L559 122 L567 118 L573 115 L579 112 L585 108 L589 104 L593 100 L597 97 L599 93 L601 89 L603 85 L603 81 L603 77 L601 72 L599 69 L597 65 L593 61 L589 57 L585 53 L579 50 L573 46 L567 43 L559 39 L552 36 L543 33 L534 30 L525 27 L515 24 L504 22 L494 19 L482 17 L470 15 L458 13 L446 11 L433 9 L419 7 L406 6 L392 5 L378 4 L363 3 L348 2 L333 1 L318 1 L303 1 L287 1 L272 1 L257 2 L242 3 L228 4 L214 5 L200 6 L186 7 L173 9 L160 11 L147 13 L135 15 L123 17 L112 19 L101 22 L91 24 L81 27 L71 30 L62 33 L54 36 L46 39 L39 43 L32 46 L26 50 L21 53 L16 57 L12 61 L9 65 L6 69 L4 72 L3 77 L3 81 L3 85 L4 89 L6 93 L9 97 L12 100 L16 104 L21 108 L26 112 L32 115 L39 118 L46 122 L54 125 L62 128 L71 131 L81 134 L91 137 L101 140 L112 142 L123 144 L135 147 L147 149 L160 151 L173 152 L186 154 L200 155 L214 157 L228 158 L242 159 L257 159 L272 160 L287 160 L303 160" />

-      <path fill="none" d="M13 584 L594 584 L594 431 L13 431 L13 584 Z" stroke="white" />

-      <image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="white" transform="matrix(9.5263,0,0,9.5,67,245)" width="19" xlink:show="embed" xlink:type="simple" fill="white" preserveAspectRatio="none" height="20" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAUCAIAAADgN5EjAAAAuklEQVR42pVSQRKD

-IAxMHC48qf6swrG2T7M/ghul0momxACrgzPJbtaEYEoJCKy1MUZoIasMC4UQoA+n

-cn2tCs/d3aVSTBds7y3XZdmJkTKjvLUnC/I+/eLyyBhpvs3/rD8mapTeEOksv/98

-lBCUCTA/8Hzs9L7Z/nzKZ/G5MeIpVDH1FSts1RPrddmjVRkj8JrFmp6nmyRWPYtg

-yJP3NuZJ3aUpG7bZ0A1DNtbDCDDp932NqZoQKifFB5cIV/0hB+eAAAAAAElFTkSuQmCC" xlink:actuate="onLoad" />

-      <image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="white" transform="matrix(10.3684,0,0,10.4,127,388)" width="19" xlink:show="embed" xlink:type="simple" fill="white" preserveAspectRatio="none" height="20" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAUCAIAAADgN5EjAAAAuklEQVR42pVSQRKD

-IAxMHC48qf6swrG2T7M/ghul0momxACrgzPJbtaEYEoJCKy1MUZoIasMC4UQoA+n

-cn2tCs/d3aVSTBds7y3XZdmJkTKjvLUnC/I+/eLyyBhpvs3/rD8mapTeEOksv/98

-lBCUCTA/8Hzs9L7Z/nzKZ/G5MeIpVDH1FSts1RPrddmjVRkj8JrFmp6nmyRWPYtg

-yJP3NuZJ3aUpG7bZ0A1DNtbDCDDp932NqZoQKifFB5cIV/0hB+eAAAAAAElFTkSuQmCC" xlink:actuate="onLoad" />

-      <image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="white" transform="matrix(10.3684,0,0,10.4,331,345)" width="19" xlink:show="embed" xlink:type="simple" fill="white" preserveAspectRatio="none" height="20" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAUCAIAAADgN5EjAAAAuklEQVR42pVSQRKD

-IAxMHC48qf6swrG2T7M/ghul0momxACrgzPJbtaEYEoJCKy1MUZoIasMC4UQoA+n

-cn2tCs/d3aVSTBds7y3XZdmJkTKjvLUnC/I+/eLyyBhpvs3/rD8mapTeEOksv/98

-lBCUCTA/8Hzs9L7Z/nzKZ/G5MeIpVDH1FSts1RPrddmjVRkj8JrFmp6nmyRWPYtg

-yJP3NuZJ3aUpG7bZ0A1DNtbDCDDp932NqZoQKifFB5cIV/0hB+eAAAAAAElFTkSuQmCC" xlink:actuate="onLoad" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.wmf
deleted file mode 100644
index f2cfe9e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/datastore.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.emf
deleted file mode 100644
index 121e51a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.svg
deleted file mode 100644
index 8c5cb31..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_model.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="95" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="91" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 31 L75 46" />

-      <path fill="none" d="M26 31 L52 19" />

-      <path fill="none" d="M56 30 L38 61" />

-      <path fill="none" d="M13 41 L24 61" />

-      <path fill="none" d="M36 80 L68 60" />

-      <path fill="rgb(255,255,153)" d="M92 59 L65 59 L65 46 L92 46 L92 59 L92 59 L92 59 Z" stroke="none" />

-      <path fill="none" d="M92 59 L65 59 L65 46 L92 46 L92 59 L92 59 L92 59 Z" />

-      <path fill="rgb(255,255,153)" d="M92 67 L65 67 L65 59 L92 59 L92 67 L92 67 L92 67 Z" stroke="none" />

-      <path fill="none" d="M92 67 L65 67 L65 59 L92 59 L92 67 L92 67 L92 67 Z" />

-      <path fill="rgb(255,255,153)" d="M92 76 L65 76 L65 67 L92 67 L92 76 L92 76 L92 76 Z" stroke="none" />

-      <path fill="none" d="M92 76 L65 76 L65 67 L92 67 L92 76 L92 76 L92 76 Z" />

-      <path fill="rgb(255,255,153)" d="M39 73 L11 73 L11 59 L39 59 L39 73 L39 73 L39 73 Z" stroke="none" />

-      <path fill="none" d="M39 73 L11 73 L11 59 L39 59 L39 73 L39 73 L39 73 Z" />

-      <path fill="rgb(255,255,153)" d="M39 80 L11 80 L11 73 L39 73 L39 80 L39 80 L39 80 Z" stroke="none" />

-      <path fill="none" d="M39 80 L11 80 L11 73 L39 73 L39 80 L39 80 L39 80 Z" />

-      <path fill="rgb(255,255,153)" d="M39 89 L11 89 L11 80 L39 80 L39 89 L39 89 L39 89 Z" stroke="none" />

-      <path fill="none" d="M39 89 L11 89 L11 80 L39 80 L39 89 L39 89 L39 89 Z" />

-      <path fill="rgb(255,255,153)" d="M28 27 L1 27 L1 14 L28 14 L28 27 L28 27 L28 27 Z" stroke="none" />

-      <path fill="none" d="M28 27 L1 27 L1 14 L28 14 L28 27 L28 27 L28 27 Z" />

-      <path fill="rgb(255,255,153)" d="M28 35 L1 35 L1 27 L28 27 L28 35 L28 35 L28 35 Z" stroke="none" />

-      <path fill="none" d="M28 35 L1 35 L1 27 L28 27 L28 35 L28 35 L28 35 Z" />

-      <path fill="rgb(255,255,153)" d="M28 43 L1 43 L1 35 L28 35 L28 43 L28 43 L28 43 Z" stroke="none" />

-      <path fill="none" d="M28 43 L1 43 L1 35 L28 35 L28 43 L28 43 L28 43 Z" />

-      <path fill="rgb(255,255,153)" d="M77 14 L49 14 L49 1 L77 1 L77 14 L77 14 L77 14 Z" stroke="none" />

-      <path fill="none" d="M77 14 L49 14 L49 1 L77 1 L77 14 L77 14 L77 14 Z" />

-      <path fill="rgb(255,255,153)" d="M77 22 L49 22 L49 14 L77 14 L77 22 L77 22 L77 22 Z" stroke="none" />

-      <path fill="none" d="M77 22 L49 22 L49 14 L77 14 L77 22 L77 22 L77 22 Z" />

-      <path fill="rgb(255,255,153)" d="M77 31 L49 31 L49 22 L77 22 L77 31 L77 31 L77 31 Z" stroke="none" />

-      <path fill="none" d="M77 31 L49 31 L49 22 L77 22 L77 31 L77 31 L77 31 Z" />

-      <path fill="rgb(255,255,153)" d="M70 32 L75 44 L70 32 Z" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.emf
deleted file mode 100644
index dfffe0b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.svg
deleted file mode 100644
index d206556..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_service_subsystem.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="59" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" />

-      <path fill="rgb(255,255,153)" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" stroke="none" />

-      <path fill="none" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" />

-      <path fill="rgb(255,255,153)" d="M47 32 L22 32 L22 20 L47 20 L47 32 L47 32 Z" stroke="none" />

-      <path fill="none" d="M47 32 L22 32 L22 20 L47 20 L47 32 L47 32 Z" />

-      <path fill="rgb(255,255,153)" d="M47 39 L22 39 L22 32 L47 32 L47 39 L47 39 Z" stroke="none" />

-      <path fill="none" d="M47 39 L22 39 L22 32 L47 32 L47 39 L47 39 Z" />

-      <path fill="rgb(255,255,153)" d="M47 47 L22 47 L22 39 L47 39 L47 47 L47 47 Z" stroke="none" />

-      <path fill="none" d="M47 47 L22 47 L22 39 L47 39 L47 47 L47 47 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.emf
deleted file mode 100644
index dfffe0b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.svg
deleted file mode 100644
index d206556..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_subsystem.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="59" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 57 L1 57 L1 10 L69 10 L69 57 L69 57 Z" />

-      <path fill="rgb(255,255,153)" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" stroke="none" />

-      <path fill="none" d="M24 1 L1 1 L1 10 L24 10 L24 1 L24 1 Z" />

-      <path fill="rgb(255,255,153)" d="M47 32 L22 32 L22 20 L47 20 L47 32 L47 32 Z" stroke="none" />

-      <path fill="none" d="M47 32 L22 32 L22 20 L47 20 L47 32 L47 32 Z" />

-      <path fill="rgb(255,255,153)" d="M47 39 L22 39 L22 32 L47 32 L47 39 L47 39 Z" stroke="none" />

-      <path fill="none" d="M47 39 L22 39 L22 32 L47 32 L47 39 L47 39 Z" />

-      <path fill="rgb(255,255,153)" d="M47 47 L22 47 L22 39 L47 39 L47 47 L47 47 Z" stroke="none" />

-      <path fill="none" d="M47 47 L22 47 L22 39 L47 39 L47 47 L47 47 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.emf
deleted file mode 100644
index fa252ef..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.svg
deleted file mode 100644
index 6af40c2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/design_system.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="69" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M32 11 L32 2 L9 2 L9 11 L9 11 L9 59 L77 59 L77 11 L32 11 L32 11 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M32 11 L32 2 L9 2 L9 11 L9 11 L9 59 L77 59 L77 11 L32 11 L32 11 Z" />

-      <path fill="rgb(255,255,153)" d="M69 67 L1 67 L1 20 L69 20 L69 67 L69 67 Z" stroke="none" />

-      <path fill="none" d="M69 67 L1 67 L1 20 L69 20 L69 67 L69 67 Z" />

-      <path fill="rgb(255,255,153)" d="M24 11 L1 11 L1 20 L24 20 L24 11 L24 11 Z" stroke="none" />

-      <path fill="none" d="M24 11 L1 11 L1 20 L24 20 L24 11 L24 11 Z" />

-      <path fill="rgb(255,255,153)" d="M47 42 L22 42 L22 30 L47 30 L47 42 L47 42 Z" stroke="none" />

-      <path fill="none" d="M47 42 L22 42 L22 30 L47 30 L47 42 L47 42 Z" />

-      <path fill="rgb(255,255,153)" d="M47 49 L22 49 L22 42 L47 42 L47 49 L47 49 Z" stroke="none" />

-      <path fill="none" d="M47 49 L22 49 L22 42 L47 42 L47 49 L47 49 Z" />

-      <path fill="rgb(255,255,153)" d="M47 57 L22 57 L22 49 L47 49 L47 57 L47 57 Z" stroke="none" />

-      <path fill="none" d="M47 57 L22 57 L22 49 L47 49 L47 57 L47 57 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.emf
deleted file mode 100644
index 7291500..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.svg
deleted file mode 100644
index 3195084..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="75" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M73 25 L55 8 L7 8 L7 87 L73 87 L73 26 L73 25 L73 25 Z" stroke="none" />

-      <path fill="none" d="M73 25 L55 8 L7 8 L7 87 L73 87 L73 26 L73 25 L73 25 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-      <path d="M73 26 L55 8 L73 26 L73 26 L73 26 Z" stroke-miterlimit="4" stroke-linecap="butt" stroke="none" />

-      <path fill="none" d="M73 26 L55 8 L73 26 L73 26 L73 26 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="white" stroke-miterlimit="4" stroke-linecap="butt" stroke="white">

-      <path d="M49 2 L1 2 L1 81 L67 81 L67 19 L67 19 L49 2 L49 2 Z" stroke="none" />

-      <path d="M67 19 L49 19 L49 2 L67 19 Z" stroke="none" />

-      <path fill="none" d="M49 2 L1 2 L1 81 L67 81 L67 19 L67 19 L49 2" stroke="black" />

-      <path fill="none" d="M67 19 L49 19 L49 2" stroke="black" />

-      <path d="M49 19 L67 19 L67 19 L49 2 L49 19 L49 19 Z" stroke="none" />

-      <path fill="none" d="M49 19 L67 19 L67 19 L49 2 L49 19 L49 19 Z" stroke-linejoin="bevel" stroke="black" />

-      <path fill="none" d="M6 75 L6 7 L44 7" stroke-linejoin="bevel" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.svg
deleted file mode 100644
index 41e2f40..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.svg
+++ /dev/null
@@ -1,1315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1024" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1378" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M0 0 L468.9915 0 L468.9915 473 L0 473 L0 0 Z" />

-      </clipPath>

-    </defs>

-    <g fill="silver" stroke="silver">

-      <path d="M75 1374 L1020 1374 L1020 75 L75 75 L75 1374 Z" stroke="none" />

-      <path fill="white" d="M4 1303 L949 1303 L949 4 L4 4 L4 1303 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 1303 L949 1303 L949 4 L4 4 L4 1303 Z" />

-      <text x="702" font-size="67" y="154" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">ssdfsdf</text>

-      <text x="698" font-size="67" y="234" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">dfmsldf</text>

-      <text x="702" font-size="67" y="314" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">ldfsmld</text>

-      <text x="704" font-size="67" y="394" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">kfmslkf</text>

-      <text x="683" font-size="67" y="474" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">1lsdkfm</text>

-      <text x="42" font-size="67" y="874" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">ùsmdfùsmdlùfmlsùdmflùsmsl</text>

-      <text x="218" font-size="67" y="954" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">dfmlskdmflskmfls</text>

-      <text x="101" font-size="67" y="1034" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">msldfmsldfkmsldkfmsldkf</text>

-      <text x="101" font-size="67" y="1114" font-family="&apos;Arial&apos;" stroke="none" xml:space="preserve">xlcxmlcvkmxlkvmlxckvmx</text>

-      <image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(0.9979,0,0,1,103,122)" width="473" xlink:show="embed" xlink:type="simple" clip-path="url(#clipPath1)" preserveAspectRatio="none" height="473" font-family="&apos;Arial&apos;" x="0" y="0" font-size="67" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAdkAAAHZCAIAAABFJdZVAAAgAElEQVR42uy9CZwd

-xXUvXNV999m0jvZdICOBQBJiETsYMMYYA8bGJnZsvCXOc74Xx/Hn5yRO7PySL1/s

-2M9+TrzHEGyzmH0HAZIAgRaE2AQSiwBJaB3Nppm5a3e9Pqequqv69h2NkAAt59jU

-9L26S9/q7tP/Oud//ocLIRgZGRkZ2ftqDk0BGRkZGfliMjIyMjKWCrd6enqC0fd9

-mhQyMjKyA2Bc/Rc+5g7A3+amAjhf1yVcTEZGRnaw4uKrrroqGDs6OtB7c5oaMjIy

-sv3DxZyls7CRawkGv9A2fsbRwcb3v/5nwThr0ljCxWRkZGQHKy5+6qmnmI4ak5GR

-kZEdCBcLoWHW1g7jxBnu9LmwkckO5ovz+XyyL07nYCy0KqQ9HHF1rhlG12UUzSAj

-IzuSTfIdaiUYd29luzbBhqzbyDWx4WOCv6NmHhuM009YuPCURcFGc0tr/cdQjIKM

-jIzsIADQe/n3pmHOCR8M/s6eMTkYhw0fsa27P9jo7OoKxnK57Hse3gOoeI+MjOzI

-M+F71Urw1xvAR5k8y2JQYsQ4GEdNmjl5YvB30YcvA286YtS4sRBXSKfdfffFs069

-+PKPB3/PO+/8YHxu7dO7lz4MqHz3Nhj7ev1ahXwxGRnZEeeEtS8W1Sr8LaMzHtgT

-PAMbMlJRGDH7rAuDv1dceVEwvrK51/UBvDpJkV2KUZCRkZEd9DGKMc3Zq676KPjs

-HGT2amtT/RXw673FMtwKBooMcbG6FRA4JiMjO6IswLnSBxb7YOzr5gxhcg1G9ubz

-PRtfDv6Oa4NHHcWmgW70nISLycjIyA41XJyFQpHjF51++nhAxFvwufPPPPEoJLNt

-enV6MA70dPsYtyZITEZGdmQZJslAwEfi4hKQGiq9nUseeoABOViC5e71LzwHcLkG

-4YTmnFtJp5ktUTEEXzxiQjBMn79IEuGacDxneuvE6efi5rl0LMjIyMhM6+3pGT9h

-gvnMriJ44V29sJ1JM8dtGIqgGAUZGRnZ+2+DxCggNJFvG7FLencMQoyiIjsyMjKy

-Branry/2jO9CUKKrGxhvY8a0DPJewsVkZGRkBzMuduCfPCEkLt6K8Y6xrWwCQWMy

-MjKyIZoDJXblchkftPB34osx1+cJH0PPrA8lg/ryjGVodsnIyMiGaOBIVb+kQYEs

-xSjIyMjI3n9L7fUVHmbtajX449U44WIyMjKyfTIxhAoMwsVkZGRkBz0uNtx5uEHJ

-OzIyMrIDbEPHxYIKncnIyMjed19MRkZGRka+mIyMjIx8MRkZGRkZ+WIyMjIy8sVk

-ZGRkZOSLycjIyMgXk5GRkZGRLyYjIyMjX0xGRkZGRr6YjIyMjHwxGRkZGRn5YjIy

-MjLyxWRkZGRk5IvJyMjIyBeTkZGRkZEvJiMjIyNfTEZGRkZGvpiMjIyMfDEZGRkZ

-GfliMjIyMvLFZGRkZGTvpaVoCg4Dq9a8YNxTKtfdWmXrbn6I/I5Gjcb1/nPY8HzR

-nM/Cq30/GPvLFdfB3y3EUD/n0Pj5am99HAvZTC59aF6t/h4Y+9azrQ/hRgXGYolV

-quFBhGOHB5cHhzLlwjO5HIxNKTbpI7DRfDSMbgv5YrKD9TzH8Vs//0Mw/vcfbsqn

-8Hqulpnv4T/7g7mmg3Gdhg6IO8xNw0Ymi5dlE8u34gaMorntwe/+ebCxs6s3GP/k

-X37G+7rhTZV+eE1pgFVLsFGrqklgehIO8nng2v06eFWmMixbgB+EF+l5557z2//3

-yzAHqUNkLVt+iXWugo1tT8LYuYf19sDBGCjiGVqpVGtwZ/U88zbquk4qBb83k4HR

-zeX4pufhH4Y1wzjxLDbqFLw1zaYYBRkZGRkZ4WIy297e1RWMv7nhpmDseXUd88qI

-iyusVjFw8UEPjHF9CqA4hIQ5gIQs3wZj60jWXEPUBJDq5DOmzWgfHmxMHgkwuTWX

-fvm5N/DH4m8f6GWlPsRlA7A+AOhVVZMgDu5VAg8RMa4Jsnm9GgBIeOv9j/zlxz8U

-bJw6a+rBexxrW2DceT+emqvY7s4wKOGVyzUEwjKeVqvxqucgLpYHR3A8B5xgTYQH

-qIynbrpSyhThXameAfjXXbexEY8hQD4Jx4+x9HjyxWQHhd2ybCV44ddfwxV9ilXU

-qa0W+3KRHvggywGJ99vl1HthDBG6KZbOqaBEM3hb1jwCx2EsC/6Iu5lg/MTp87K4

-Tpfjx8469eV169HnoudNp1WosdjPyhi1qEiPXNGzIZLuT+L9nxDHYU4sMoM3JIxU

-VLu7bl66+mD1xXjj7/oDexODEju2wdhbrpUq6HzBmdY830P3KifeF37sCAh8HPhk

-X70MHnrBYUPf7ZbhozLFVHYPHE1n9z0Y/XiaTT0VNsZ/LjjwFKMgIyMjIyNcfARb

-gB+uu+k2hFYKbDDJKHBdhTe5oyIVcnl+UKzPDVwMSBD3MIVIMBOsyjFR3jJc4WK5

-SA9W63iijhw3JhivOOU48+M+d8GiH/z+dsBfvV3qJ7sp9Zlp/FiJjstFHbep6TkR

-B8ec8GhxIOcBfi/Ohnyojmn6Dw8sCf5+908vxchM5qA5Datsy6/g75tPsQ6IDvn9

-A7gaqUhIq+BwMN2+iYIjcox5UggNnLk+Oh5u4CexqudXEGVnKziWtvG+BzAwNcBm

-/g98vUu4mIyMjIyMcPERaQ8+/eK6F16MYIXQQDgAhjID4ktc7KkknsSA7y8QVKy1

-MECsY6OBNQ1jTQiHm1plkFQx24JRwLsunPeBYJwyotn8vKPHjrhg0cJg4957kb6a

-SmuYGXw4gscMho/T/awCqT9WQcabV42C6e/vnAR7q5GvRsRNChfLny//lfOdW7YG

-f29Y+nQwfuVDi97/86+2HMZND7A3XoGNzoHqACLimszR+b4f8dUgdWqz3YUJiwUX

-1rPMj85VEb4s+EDhS5js4+jlqxhNLj7M+jfBK2ZeiufPmeSLyd5Tu/neh2qdHXjd

-Sp/LlS8OljvynJY5MfDFngpi6IXg+xOaAL+DuyS9ZDrHCi3KC8sROQPwvHyZoxfv

-6Lu/eM6CxI/+7Hkngy9+cKn0EPqGFLwrFzn0wOmXwVMAARkcxoDiV3g6ZPG+zYmu

-bkjlWEYm63C3Uxn4CeYqHu8iNy0GIsHnL1iUeR/XtAIyxuytW2F8YxvrhNBEtVgq

-S8ow3vh939fsdqF8sZmt44wbj8LQhPbX+sVcu2LtxnXEA+akLGq+gPtr3vfSb2D6

-2rsexmNclj+NYhRkZGRkZISLjwx7fdsuQIKPPKZyFRHi0FBL3mSFoxa5nlznegqF

-vHeMY66WpGFQIpWJghKFVtaEDGKZsgtQIdZcwf6bucead+LxUAJ70vRxid9x1txZ

-wThrNrxmw3PPsxS+V3CNNFIKXEuALHegnFEhC8VBrqlghe8bWO3dXyXIHZOBmkxO

-xShkyi5MwMoXB4fMhd+z4tmXgnHl+jfOmD3t/YpNsLcfRly8HcbuvloZ5rDqBZgV

-IbBvMyhFbEJDAMzrp0RohBwlVs1XCa6DFfqfZVKPVVkvLHfSm3fg2XUfm43leYdU

-Ko9wMRkZGRnhYrJ3ZPcuhwTOrlfWszTe+WX1Ugi1OI82JHxQ5DapoeMbgeN3D/np

-27yM/MpasnRORYQlHA5wsXwo/9UxkaABCRn71CLgsRUyyafrmFYIs37k1BMAF7/w

-EuO+equVHtKIOEyUyYcVGT4uq/Cx79nFIO/OFHEjgRksBWR2MSSxSU6ew2XGMoKX

-GD0v7gTod8uyle8HLkZSYMf17M31EhHDfpVKNQSnPoBVYU6ZOXfC3gK8ywWrE3QS

-wsDNcqpwEoQ6nQUzHjLNk6t5XgmxOe/FGX1zHSv8DLamfgVfdmiUgZAvPsRMnqG/

-vvkOvGgdmzjMo8WvdIWRQ8QNT/ti7iWsIQ/EstvQVHPVQlu6vAyuvgstijKsghJ5

-5XfU3hquSm57sG/tE8ZePP/ovX7/pz8I6Zqf/vH+ck+n2hP103wrWhJ+o4yHqCxi

-SYUsalXtlG1G9gGZJW4Jzhk8aMn0yFrECRZjHOga7iy868bFj//DZ4AzMKI5/x66

-4rth3LySdfajF8bQRM3z9zI5ChAIk8UTkSq4GTUTQogkuTpFoA9pONpx+3qrinDE

-QY/s9KScjVgq3YK3/JGfoRgFGRkZGRnh4sPRHnrm5WBc99yzCh7YPKH4Gj+KVBgw

-OViGK7wsDhjiE2Z4xDGCElmVpsu1KFwsicMqXODaANDcilDC2XOmzxozfK+7MH8K

-VOWdcvzsZUuf0L/aXiULo8QLKNiuClYocCpDFiVLUShAx6a+0gERQA6JfSlN7JMx

-CmBGO1ZkKfHQ4L/u3LT5lifhHPjyBae+J+fdThi2rcUYRS+oD0O+E8vqNJLFke89

-sBMLSkTLKWEEMOLC20KfE/G4h/pqJYNcqcEft1jKdsEM802oj9H2QZYaR7iYjIyM

-jIxw8WFnv7sdFKr8nh519MwifytebOJiR+MVjY5ldksY4/5iPccQVdBwjyF3Das5

-uMzRZXJCykKG+N1CmkY4VelUwIuvOXvB0Hfkyx85y8DFiTDN0EVDYKx3G3fMzbAU

-FuZJdAyC9GExiJFaeqfTpL5LRoollS2YKLVKSMX5W8yMd4cSZ4p799/3PPLe4eIB

-LLHbgZKY/SWBlXWGoJpI/rFygn1h/xzrkIRHKCrPM1Yg4Zvk+QLxYgMwC2Fs4Ovk

-LlVqtfQAHD5352YE8kvZ2E+RLyY7kLbh7Z0PP/5kdH2KOoYmt4MV4aj8DlcnvmOU

-/0YqOfu+1g4/03WU9m7gX2SaLisZxM2O3EB3IyL/yJKX/OGKFS/g2UdNCsZzjpk8

-9J06d+7RU46aGWy8tWG9SvSEv66R32eYaVSVfpoBnZK+uARi0Cwsz/MsfoXYx7lS

-KTutASTHdEZNXZiyE2GpmbmMD7OIkiXC16BS6JIXX4cpOnbGu3jaia1sN8h1sm68

-S5XLvpb7qfOoxkMuuM8bvUzE3iNYooYpF8lxocgh69cJEX2X54sqVgC6vRho2raM

-jcSq6PQEilGQkZGRkREuPlzs/idWbd+A1M6UFpqwIKoTdkyri1HYFDfhGAjLfydJ

-PK4/LSYDD7qXEI5wMGXHs3mBL/CHkvbiLMoxYhLmc2fNg4909wExjG1rvvR0iGn8

-5OX1TLaG80MsxW1oZaDmMKoT5fTw0qilmIu4uCZhcs3qoecPecbUXHEVBpF5wpQe

-oxWGDbq5kxREEhJEl3ZB7eWt2EzgXcPF+NXVZ9gupAkiiU0AkTiiBqOwhJpDbpyM

-+K9++LRghqgECxlump1WF7uIHTOdu+OJzXRFmO6U3yVEDSlufhlwsdPZzfZgjGXE

-lQ2WY4SLycjIyMgIFx9CVkWRwN/edq9Ku8Vxg2Zr8ZC2lfg8t9Axs+PFe6k0iwVY

-nXhBHZLVeKE5pbTWMhI4+oIN+rH2V6gcjT9qXHvw9+J5R7+DubribNAi+OXtD5a6

-Ow2cVvc6E5iZv06tIWwBjSr+zFoFsnmsXpC+0W+084SOri6Rn+mmo4WFfLuw38WS

-0ljqX4RcG92+ZEUw/u3VHx03rPldOO/wu/teYH0ltSwwVgMa8CqRCIztCmacgw5u

-eepHiLCsw1wCDDJ3g56FyY/DR75SoIcdzvSXWcfTiIs/Qb6YbH/tsRdfDcbnn16t

-0v2S/crq81E2P4Hbzyuqg45gCFfFKJQv9vfiULhjuZV0xJfguaZUAXyBmyvIoIQn

-ZWKEP1QvbDr6mjh3LuTfZo8b8Q7m6owPQK7vhGOOWvHUqkGvd2EtDYWRsA/jCSwV

-5fSk90zhzIce2fPs21hi0Ri34h6prLqBSUlMUZf6Cu8OwrxPxCR2fPlpW1+H3N09

-q1740rtCqMCmrr17dM9A3/TCKvCg5S851DlyEwDIE4Yzj4XBjLDQLlQG4rwuPrb3

-7G49/4Zz+yYmKSdyh8tV+Amw/6iz7B59cF7jFKMgIyMjI1xMNjT71c3Q0g16Gzux

-PJvNXeNJehTR8yG/2EglhfVdfgNcHEHFlAHuMjIoIeFwpqnVwe7FARyWaROz6e+Q

-F8T6i/K5q08/Yf/W1exPP3z2iqdWRz8zoqPxBHQsDIDGE8MLMs+WUuQ2RXSrRlw3

-+d5Yni2K56TU22VUxzFVOEQEdZkRNhE2ZuQ8Xvsnjxfu3i/veOiLiIsPcFpKvIRn

-XZ+WppR7zR2lxap2WufhVHMOrjJ7wsMf5uLyy9dkYF+Y4vDhj1MsRsHtMzA8c0M8

-bDx0ovUe1yc+Nx/qlnkeH0A+fj9GKlqPJl9M9k5sw9bdwbjkiRXqmuc8YVEf+dzQ

-2xrPOyF5Vo+OE62KwrWwU1/OwA1npPV/0ee62aYsCq9k0RcL163i5Vrzq74v9tlz

-hu4PL/KjJ4+7+Pjp+zlvl5983N9NBHry7m2b9c8clEcRhgbiHjvGSJFzmFa+uGaz

-j0Nmiwr16tBzSoc45M3MMdaj0YSHDTgjd9tgFW9GK2B8bv2rS9dBPOGcOQdUvE1+

-abWmYsSaJ6Fv5dIZ6z1zuCn/A/EKQ4mNA9cBfo5q/qVdc+g0PYwncE9Ft3gYOzdO

-EIdz83zh4cO4L7b2X/g+r8o76EF9pVOMgoyMjIxwMdne7J4ljwfjzlcw7ZByVQZf

-LxfjGDNkeFoqMzaPgtVHMIw1rwkVTQZxKu1gQV22BUQvC63D0jmIUdTwxdB/vSZ7

-nYmwv1lyxCMhnKAxQYAWsZXkn5493+X7u9oe3dZ05TlAqPj5bzEBlU0xXrPRpJms

-E1F5G2eNIwOcu1oLFPBuSmDERqjWeVUjlSesdUmIiPV7jbnxoypKk6CL9ZHGnrCo

-bNKMLOFLqrt33/zI8gOPiyXeB1a10aGVR6EANVPCkvThinstuDoTMJ4ghO9EilQB

-tE7hPKRwxcAdt4xyl6VyuYILLCH7lto61nW4OHo+hos5NxYYwe5JBogRaSFcTEZG

-RkZGuPhQs/5K7ff3LsZ7OyIv4cZhpUUcZg2SNw1ImCHFTd6SVdNhnUoKnkccx5G7

-lik0N7eBcGVTG/RsdlLZUhV2qVoECfZa1ff8qPf6PpgJe3zR1j4q+Hv5wg/s/9QF

-H3nZGfODjd/e9RAg994umxwmhpTo0t00omCyUWLGUy5Hkq/wAPaKWlVEqTwDdDsp

-7kaKEyL6lMFFLWKCkbEdYxZ+d8Tdj0EB3rc+9ZEpo4cdsPNPJXXtHdCBYCOaLSsm

-Vd5TteHWHe10qFmBVRlsTmcyTgvKqI4aKVddqV5Ir2V37OrbA+1CKpUqfr8vDC3O

-umUejzcwqJ8lo4fee9jmkXzxYWcrX3pt7UrM2qXT0ZqRseReRNxJ7rEUb7nEkyuk

-0VNwHZpw0mkXmRIFvGbaRowqYLJOlpkOFANXXMVlnxSx9YTOngs25O5E3NhzuP68

-848/Kvg7s334AZm9M+cASXnuLKgPXr3iaVUSLemuwvZ0ot71JcUodDlD2GlDehY3

-o8I4vpDraz9iVuDEcsz42e3mk8gwMTVqn1lfbd5Lor315Ve//drG4O8DT6/7ykWn

-HWBfbLTdsI6slgCKuUAVidB+0tVJOAfvai6eyby5mc3EcEoOBZI2vs7ax2AQzi28

-tYXp7qKeV9O+2C6Didc2cW7XNtleVxxIqW6KUZCRkZFRjILs/bGf33wnK/Uba/kw

-xZQIeGNrfuNljDd8yLSiJuZSnGwTR8XhVDrT1gZpuvbRowG+5AsVZB319cP+VKpV

-mayTpU3YViHEUPsSSDCIoLy56arT5sJXOweGJptDIHzleYATVz/9PHNwVeEllbHx

-Oknd2ON4LVwIcKPiPTedSruQ3qy5aV/iZUy08mpZzpKHD4XnxQFaDPmGcxJVP7M4

-Io6XEPoMFZR+c++jX/oQ/F7nXRTA4TFsnhghiEiCOtHnyNMsg0zt1hY2ARiHrGN7

-MBRfW58fNxYejm1P7+yAYAUyuMugSOzX/95YyKI+2sSH0GCEcDEZGRkZGeHiQ8Q2

-7uoKxkeWLLOKsmIcnxAXKzCg+3dEIpmJ2kAaCIejCnqiskTLcCkx0dLWOmMaCDtk

-shDRK5XK1TIi4goAlmqAi6UsoS9HRWwauoikwi1KFhKGmRPHXHjsge8z/+mzQELz

-e/81sm/3LnzCLseIx4ltiGUGh9W/utE/aFws47oO5ykUmkhnc/14Zck5yeVyteIA

-vKyiqyDUXNlhYl6HweO7FBM5MlJ/AXhEJPz08y8u3/AWA1GOKQcUCpvrKlG3n+Ea

-Rxi7GfLP5KrLUWQ+iYuzaSXcOuHEYMhfMoaNRG2jza/xDExdBsPKvghWFFwvvOoC

-vlxwEZ378on6CUtGzuSLyYZoN9+/JBg7N2/WjWpYgyiEeSaaG+Yl5MR9sXmBccWZ

-dVF3uJbKpfEymD51ymiMTvTsAV2VcqUqGaAqZVfz5Lpb5liExSfeJ1VfWaAM49Wn

-z2vOpg/4TE4YDiGXy84+9fo/3AKP01KRJ0Y1NRR64mkfm6mtHa/1Ip239PHNzZmU

-L+DK6kP93EKukEWfIaM6gvs+N9fdZshIWDGKumPf8Kam01Oid89/3f0I+uJrDsSy

-WQevHO1PE03Y6+yoTNmo23Qd3Vkqpd7Sg/1MZWvaMWPZnm2w0dMjvyWFhynjpzx1

-s3eYaqEk7IMjWB0zKCral+noYDTBB8UoyMjIyMgIFx9KtqdcuXXxUtiqFFkmZWEP

-HkPH3LilmmuzQZN11pLTcZFBzJHBFiC7USNAqXLq5MkDyB0uY1ACCqJ0dALW+Z5n

-tJ5MUoscHMjZi8cmTBJ+4uRj3r0p/fTZJ950FzC1K+U+HRkwV/rcUOQxYxJcdz/R

-sRRTHQK6rEVkKVDDUXEbv7UAgZ0BLCMs+6IF4z+ptGxlX7OXKeGSnyenqERSuKCx

-PMXi1c+FMa7po/ePHaiQbFotJqquhd/joJjHAxqOKYqiYxTyH2tV1gFCK6y/X72l

-fwBP/T61NlBVeS7HXKtcSfjcWoiERysek9AsOxeBsOOGeiAu4WIyMjIyMsLFh5qt

-fPGVZ57AxvLZTFTfYSLcWBEHq5PKtHJ3yck6JfUdwAYpd4maCcFLp0+FtE8un+/q

-gVKoKlZAVSsVHSlG3QmvprN2Eh379TBpCOjYYRX4kAsXAiKe9Y6U44dop84+as6c

-WcHG2pUopJnWgDdBN0NYQNhxDJicDEZlLs73hVQKDSYqj68sYPi7v1RpaYIZTmPa

-KphJX4ktWOqR0cENE1C+CTNZXFgutueyvi3lvv0aqMs/sPL5YPzqR87aP6iGPQzz

-eVVqJHX0w2RjvIcztysxbKVWh2vgJ7XfqqyvL8LFwbxJ3fdg7SXLZHgIbKV+hSTG

-uWoJ0qB2I5arTkkplQDU5/CHyLoS8sVkQ7df3nafX8Ilm8saUCuZfbrHCurs3F09

-+1jV5mLpqpvimD+RvXCGDWudgEzPwOfKoIQKTdRq2gsrFyzsulIxxKImW7cy1QSB

-kStPmsN0S553ydpyqcvOhJT92rXP41dX4zePiEHMk91usonQDTrBDKAvDmbMQ3ps

-C178fcVyESe3gB6hXCp5eH918MW+qOM2x5SURYO5i1d0m81Z2G/vXxaMX7rojLS7

-P2tfODqsuYkhl4Zh8hZ2zLenjA8ao4jtvHxTcBaZ1AioVBTqedutOsa5CoEkQyE6

-OuOE1faJY6kjwyJ19MUZhqcZKxzUvphiFGRkZGSEi8lse7MDwgKLH13CXG7CHGO5

-5yQgXFbXv8NSxawLWRgCFE467aez4VdNHD+urRUyaTt37ZL6LFUNh2U4QgUlfJBt

-CXEOqlCIwWBwvPOekiGfOhFUCC6eN/M9mNurzz05GP/lOmC2lbp2N0qN7QURW63k

-QzimmvupKarVSiVIezYjEM6m06UKzGETwuR0Ol1D1Oyp6IdvweEoRhF7yGLqnbZu

-hrnWgHjC02tfCMYVr2464wNT92POUKSp5RmWxzwb5nIxmJAYIqjDxXFFHxVMUYN8

-XgLhSK9Vf7jqdqCgtepmAyeaY511cVzMNC52ZMQGYyxZ1jYKP+VEwsVkZGRkZISL

-Dx37/T0PB2P321vimlgxgMltslp9+HgwYTb1LgfFw5xcoYpSnLkcZJamTZksgXCx

-VJSR4lo1xMVGB52wuIANLvzYYP8V655feSoIULS8CyUe9TYdxSQvOu2kYLz9jnv1

-yqMxlmeJIowJWTzVZ14IGc0MZqpchqkrYLvoplymcw9kqKoMfmY2ly2XSggNUa0i

-ANUiVuuh4bAwjrUwa0DqJ9aIekuMifmGX931yBkf+MJ+zBkKWuZGsbatsIFqlqDL

-XvWS10CNAsesXtBVMN8A16JB93FXnavc12qc5su50cLQVLhzdFmKTDk2F9hImRYe

-S76YbO/WU4Sr987Fj+CFVNTlYSLugpPFMGNt7uyXOXYjj2DdJ6MTuJjlmbzsWDYa

-lWTbR47cgwnuYrFUqVbCGAUU2knihFBNRa17Ba93arEebsK6eeCYbip89oy57/E8

-f+586NF5+92LVZsPPqjCp2Bx/2iqBrPYGlnIGAUPZgqzc9LnNjW19eCEF/Gu1pLJ

-ptBH1PA1wMGQIY56HoUTyQSbWjvWnoT86FAT2ciJPbLq2Td39wYbU0e27sfieQ4b

-/iZs7O6GsVJWX+HzQcM7sfLOmCvWQS3hG7cz826tg28iUl+CFwseBWhEWANdl9+W

-hGKEF2xEE2s66eD3ABSjICMjIyNcTKbtyeeg//nTkv2aSRnd3e2SueQKOlb34qSX

-2XRjJwuZpZqblsEKSSt2OB8YgOVtWRfahVQ22anXNwmeGguJeL0a2wspDHNZF50x

-e9bY4e/xPC+aDXnCY+fOfnHNM7iMdTU6E0mwXsQpbsLskme9WOim9CCYhJNWKQEJ

-LF+o5bMA0PrxYYCLM1lJNIaHtbBrW4xOJ+wkXqzkjzNbXV0Y841nDpbMbd345h2P

-wRn1Py87bz/mbCprRX3LYZ24aCvpTh/eYPOxotIAACAASURBVOGd+CwNej6YgkeJ

-qilKmYPbVZEN1jPB6Z3B6EQLil20T2bObPLFZEO16+8DMSDR14sOgkeNbXjjszzq

-i1EXi0gUAwqDtbJ5Ug7Fdn0xHNVzJowdx7DiuYgr60o5LO6oKF8s9XSEbi2ZmEXf

-e8cg3ECBmKtOmfPey2eNaoY70EdPm//isy9EMQpRH06x190xKbW4C7F8Q7CQdpAe

-oII8lbIkVPQVsb2mJ7JZmHl3AGgJXs2LBNtigsVWEyaePMWDl0T7tRsefSr4+2dY

-9JFLv7PrvRXCFODUoOMG6y8q8oOkaPuizp/GBJd5UgSj7uwQidjDRhuOU9dmJSke

-EvzMAswwG42RmdaTGBt+8HsAilGQkZGRES4mQ9u0u/eue+8NASPzq8Z9Pqk3XWLu

-jjlGiMLmFxs10FD0jGJAIpWXK9rJEybAeq4ZFnS7OjpKiIvLlbLExVXsZO75niQU

-q7RNyKNIVK5phIuDHajB+4+eNTEYzz12+vs14Z8899Qf3wwT3i9FjUMNoHrwFtcG

-imFV66VSZpdzLvt6yEhFuVRqQiCcxZTdQKWaz6PMsczg1aoCBSFhJrmXsI4RWkIo

-MXfXsCQadzuTXrV6bfB39eubGQhpvmN5aFzjt7yKK4t+hsRzNiADFZ5dEl3Xxy+x

-9W3UEqV+/SespZ6plSzqZ97+LkmfyGXZCOjNyMYfhR+y4JBwAoSLycjIyAgXk6Fd

-d/dD/Tt2SDxTByi5hTBimpk8RoZNKnmywTV3XScH5flVxG65fHbKpAlMc9cGikWJ

-i1ELCLN2iIt9zxeWLMs+9hILg4aoW/iRBSAGNKYl/35N+NxJo0874dhg46FHllpT

-FO8jpzuPRPQ1M5UnEtEZ0IxFVKNYKVeakL7WjHC4o7dSweKxLAaRQbwCw69c+PVa

-NwYQFnViniwBVwq7MtD3WA2O5s/uQIH5b33xnU4YKjnw42Fs72SlSrRiCLalrI9S

-0jdnL+HXDOVcid4cP+FFHfvbXiDKpiFtrWxCO2woKluBfDHZ3q27BMu92x9YzKoo

-vCL7xos67S6WGKNw6vjFQyh6dlMiA07Qw2+ZMGqU7C7ah/07SsWSpk9UJQFW0oqh

-0kNXPzPLGYshXFcRtdnB1fo1Z89732f+ixefjb74MbUW9pIow1yrpYmwY4Wwfp1V

-Es2iUgSp3IZOqqZLovNNrXiEnRLWSrSi4I6bSjlYEuL7juJh8ERGBzeakLKEDF54

-OHgswAJ7/shTaxhU2H9i6qj9IBqzozGM1sfGF1V0As7gXhWyCO7lwojqiAbOmA/N

-QTu64YuJRYKjYFV+a8zhuErmuwmJExNGsVFn4z8sPIRcAcUoyMjIyAgXH/H2+Bpg

-Vj3/7PMKEbM6WnGclxaDGI1qnRP4xVJB1snmPCeNIBXCBdOmTJJf3I+04lK5FPbv

-kGtnTysUG80U9iVAYe6IJz54AsjNzBk/8n2f+fOOh8TOzNkgavzaunVGG3fRGLDZ

-bTcj4UpuouYwp6lKor2aJhrDfBaymT582IwL6kw2K4nGPuearG1z16LSZxMhxghw

-ZpAk1hEOXrBzy9vBePOSp7555YX7MWfyuxawfA/CT18ttrqRiFmGUkIFZq14ghgU

-ACdlJs11CbdVmy3KsqPUf9IphplnNhY1gCbMZ87Zh5wrIFxMRkZGRrj4iLebH1oK

-0KlzF5P6OJ6w7pJxAYpG8eI6GYpYIw8lQJFCXFyQveGHt0Dj54njx5VQI1yWeGC5

-HVLZAlhcizp3+KgezywlhiFEijmzRD65+7mzTjhIZn5EE6TOPnba/GD8wXMvsqyj

-liWxsGxIKWNGS7p4AU6M1OWrIDO+IJi5sOgjGJvy+T1FnGo81tlM1sXj4octBLlN

-BRN2s4pY3Z2KqxrpRGG+TKjoLSZm73ji6a9+9FyA5PsrxoQHsQkzHBO0Znz3HobF

-LMzD8LGvv9q3e5Oz2PLPbjMYvsaxVwPCTmBipSgw2GSyrqWJjUNEPBbFV53TyBeT

-7YO9uRMqSm+9C2nF2YxqLRM5MifZtcU1YWM9lmKaWFbuzkGdYj+dk5fx5ElA8i0U

-Crt3gzqtpk9UaphKqgWeGGMUwrfyUXUCcntb1cpdwmzVzKMnn3PM1IPqKFx5Noga

-/+L2h/Z07Exe41vrbBGvu4utrLntwOUtC0qisQkphiaasnlNNMaQRS6TRrp3rVq1

-7qwxvx8FIWx+sV9fEm0rGsujhjXBT618ZtWGt4KNc+fup2C0lD0DlSWWb2ETn8Wv

-2ME6MXYhZY6rNZXc442Ky83TxJxAO5rhmNlsrhjEsotoNsvaoGSUjRvNRslssFQo

-HnsoOgSKUZCRkZERLj6C7fcPPQ4YYtcODQf8BJjAnKhnh/WQWSELx7H+lbnRC+Q/

-I45wkU9W4U4OtWlkuV2A2gYQyJQxUlEFWjHgYohQKDYbomMhhNgHPGzoT8gCKtiB

-SxYcM7bt4CJ7LpwBkzDvmJmPLcMCvJSj2LKhVGVMnoLZdXcx1Czf5Kjlue7lJnxE

-iOUyrDzytWoBtRy7UNS4IlJpJLdBHzwHZTwVf85nwlzcxPKEPK4NFJt5EQOiOJZL

-v7pv2YHAxdKG4Xg6y8git2dYE2QIWUcXjH39EddNhSwM7WEgqyWh/nBKo5avRuov

-AMVSkljKTQxvZWOQR1xYxNgph7pDIFxMRkZGRrj4SLWiJ268/U7YkokOl9VFHhM7

-OocAzbHhs3xOZ1EiwTalAiGF2QTi4gCmjcHijjHtMPb29pZMXFyt1CSVzfNUoZ2I

-ahj2GRhr+JZphbjepxbNPdgOhJzBz1109mPLVyk4zP04UjPNImjZdXdCt52PleMJ

-D5s9Y0Q4mOfiQA6LPmRPtmLNb8kALk6lU1K/QihpeYc5BkVMNNBpi4lJMpZcgyPl

-KVzn/sdXBH83f/mTwThpRPMBmsXjcE9a2fD1sNG8EcauXawX+4AMyPBxVQHkmkzo

-ecxLImuGOQ9Hw0TVuQ49VT7LWnBdJft0tExnzrH4otmHgU8gX/z+2ANPrtnw4svR

-tSTqGhPEqBGxIui4y67vsGAUPTuujE54LtKKuTsFs3aygTkUPaMXVrTimhcVPftG

-h8d9KHo2XYYj19SnoirNwmljDs7DcenJc8ZMAoneHZvfShauZGEe3+bMmnV3jFmk

-i6heXGkGyWYflXI5V4CHOcynFcuVZszdpTOZKh4C3w89vf1d5leHSUSf2SGLut5L

-VqGa6NkJMbHrFy8Pxm9/8sIDOotTGIOAD0vPgLF9AxuOIYsBGbLoUywLWT9dq6rM

-nudbP8fRFCCZnQtcsKR8SPpwcytrGo8/RLrgWYylDxufQDEKMjIyMsLFR55JmHLL

-Q0uqnZgskrd9v2bhXOZEIYtGDGJmC1CwGPvYFKBwGeLimqQVtzZPngj4RXZjK5VK

-lbIqtGOGDIXnqwZ3ETreJwGKcAfwl33x3INat3BEU/6q8xYFGz/+5UaWQUQm5Stj

-v5rzKBxhIdcQsfoWxJFTxwOkKxto+rjyCP6H5DZUBekvlStS3jKbKyPvWCb6POEo

-sjm3icZ28CdBSz72jBVOEQyh952PQ0DmLy49p012hDvA/kQmBieyNOal296AsXU3

-q+3GYAVkLIOTj3k1FawwcXGw87h6Y9iMEc5bFzOEKSkGf5SC3qyJfDHZ/trrW8EF

-37d4iVIzSeylxHWYLK4N1MA11/+r4aPdTAY4xdo1TJk0MZ8HL9CJtOLAI5crMlIs

-e4zWVMWBEEK8o19oFT3706dD66bzj5t+kB+Xy7Do4xe3P1Dq6rAjLYOW8MY8dVRh

-YcUuuCIPoGBQzatiUKjQCqHPbModwJnPZbNa0Rh7knqe4DzB75u1D8zswBT6a7tZ

-aowujT2lVj3zfDA+te61Dy149yKtOYxaMDXyIktvxwgG3G9YoaJbNNWfZK7hmtLg

-0w9T50sxCjIyMjLCxUe83bIU+o91v/WGEgPyqglw0kK4Q+jr4dT9q4xOIKvXyear

-iDWyOUUrlsi3H+kTEKPQIpmwO1CIq4qebR6FGBKFIpIrwj2p+h9ZAOI776NU8RDt

-pKMnB+OCY2Ysf1wTjetDMqK+wV1Mg0kXidlNNwSLpIKgJBqJtwUMTDXlsl19oMpU

-y6UV0RhRs+84XNgl0WZxNreZzrxe19jW3FFP+uqEGQCGw+8eXflu4uKYBSfANLr8

-CReTkZGRES4mQysjs/Lam25VN0ERE6DgdfCY7UUzM/auOiacg/FHkSlI2fiJWKQ0

-etSo/j6ARYpWXIEOHkz39fA8Tyqgi1hHsqHTiuU+YGw0P2LYJw8+TnEybMNA6lXn

-n7l81XO4/7J1BY/rb1gZM5vxxkwFehNNW1MY4GK5BKlgmD6fa+rG1xerfmsWwvqp

-9ACTBDjfFslkpkoRs7t+GH3kLBZyA3kKbKt4++LHNn/hCgZE41a6PMkXH0F2H17k

-r73yqrpWYrnveFLOSXheK65Fpc9xHoW85lwuYxQZuLY9J+3gC6YgfSKVcrVUsUzZ

-VWWJgad7jIb0CaPKY2heWP4uqaGFb5s3c+Ip08cdQsfoytNO+NtRUEfQu3NHwmGy

-/Kuc9qE0DtJsDJm7474UXZI8lrZ8Ux5L0kuVSnMBYhQZLP0IbpFcHVZFxmBmKi90

-96G/jsUoIjaFXSGi2OJwux3o6rpuMUTM/u4AE43JKEZBRkZGRriYbBALcMjN9zwI

-wLND0opdpXaYEHYwlpS8/nmzaVgDilsAg10lVQwIS/DhKC0oe4z2FwdCqWKmRDIV

-oZiplJ0NCIdEKw5/hGPS7L507kKHH0qHaUxr4ZMfPCPY+NW1N+Ba/p3ufYwIZ7XF

-EzI7qgjd1XJzDoDwQLBOwVMigxm8VLHo40pFCQ7FunA2UtSMHw5eh+sNgZ5q6fYl

-TwZ//5/LP9iSdukiJVxMRkZGRriY7D2xVzZvf+hRbDmclrQnP46J4/DXSUK+NjiK

-S8s7WhvIcTNSNj4rQdAklMfM54BY1rF7dygbj+gsgMWIiDG1KDzdWl2IfetqF+45

-/rIx4yFP+OETZhxyR+oTZ0DRx7W3gsZ/tbinAfIcIl4OtSMiNBpMr4PxYrkcKZfK

-+VY4LqlUaqCiij7gNMmkZYpPaG2gBn3wYhWAjZ63+2LIvHHafQFFUZaufemSk46j

-i5R88RFhdzy2ovPN1+UFAKMXK3qOMSIcQ6F4iEXPUUMjx3U5ZuSr+DCbzU6bMpnp

-LqLFgQEdnZD0iaqKUeD16QejH2rv7lMLD62hjFVkV50G9In2lsIhd6ROOQbuHwuO

-nxOMKx5brkqifT/JCdfxJRxhuzwrsSZvbtz3fTxqnhY1ziPHvDmX6UaisYdl8Zls

-VhGNZXeV4BZp3Ya5HQYxUnYiFrswPHjdHaTaC21Db1yyinwxxSjIyMjIyAgXv/tW

-wgjAtX+8U5VyqeiEGExowoxCWCKZPPkhs1Az9BjNFBDMARoaN6Z91AiQVpG04qIu

-tKtiQ0yvVguzdsyWodinEEXIe82PhO+6bOExh+jxakYg/LHTQcxoxcpnYHURTXhd

-v7s4Y4zb8NOOUajnNFkQpx3aqGC/j6Zcc49UMcUTpiWTS7kIkznKU3AuVFGfZ4Fy

-wRsET+y8YWKgJdgNxOB3PvrEG58HovG09mF0wRIuJiMjIyNcTPau2eI164Jxw7p1

-GozYkceGuhOxjaSXhaUfauSyxMPN5D03g3daeNnkiRNS2BahT5d4yECkDBPXdKGd

-kqEIUdtQ1eNDYC7lNcT8mSCstWjmhEP6qF39QWhy/M/X3ab6Q3P72JnQ0lzExJsc

-h6IQdvs5KTSBSTnf90rYH7o136yKPsqAxJuaMml8qAXmHdVVmidpZiaAXhsgR7IV

-ZhWlqgjs391xw7LVwca3rzyfLljyxYehycXktX+8Hf70dmsGRf3VEnNqdmdyPpRQ

-hnLcHGnFPFuQyrfDhrVKXzwgvbDupVQ1ip4hRKG7i0rnoq75fau504WCafdPkIeQ

-dg/tJdfEYdB/6MNnnHzTrXfJ+1zoR5OOHYtHKizVYB5/mSG65NU8GSyqVUtN6HwH

-0DVXPJHFBKwUNQ5umLI5iKFibNRbC1FXPZ907GKsZNgT2VyD//6+R4K///PSc4Ox

-kCGuMcUoyMjIyAgXkx1Ye3nTtmBctnKNuusJYWElbmhLxmIRzNkbic2JhzLgEyNa

-scRcE8eBFkRTodDR0cG0AEWlXJG4WMpQ+CBAIZfMKnfnDxkMGwhLZRGHjxx+xcJZ

-h80R/PwFi266C6ollVRQpEgZYk+zB50Bh+OiEKb2iMLFctoZ92vIAqyUSoVWAMLp

-FMDSYrWWQ5isBearwolyvyJsMhCLVIT7ENHpzMPkGy1I5BNCxrhefe2t4O8Dz0Ak

-7fJT5tLFS7iYjIyMjHAx2QG1u5dCsf/uVzbAg4yrGt8amNJGmbH6uli/Z5bwvB0+

-5q7rYF+7KnNyKHEwYxq0t6nWakqYTZbbVath1o6ZAhRhUmefBCjCgDV+5lWnHz+6

-OX/YHMFTZ02dfwIUQTyzchVeLra8Q4zSxkUdSk2U0FQVjYrnFixEVNFHOe9JdXlA

-x919/dUcIOJ0TgnM+5iAiHJ3rK7THTPzh4l76NSlH1X4uNrTGfz945KVwXjZyXM5

-p8uXfPHhYqVa7brb7sU5dvRiUDR2vo5Nq3CMKudYUIJZDw0ehZNKc0UrZmNGj4aI

-wTCgiw4MKDGgkFYss3bSBUBOCMuWlQaNEEOWAeLR0kqwbDPID1158jGH00FszWcu

-PW0e+OJVz8h4QvwVZpEbM/yjpeMjDNFh+ZwIJ1z4XBKNa0A0xp6keejt1tvPS1V4

-QQsKn7qpAR89tfAd/V5edyzqna8do/D9SO/Y3M9gB7D74n3LVgTja5+/7Kixo+gS

-phgFGRkZGeFisgNki595ecNza0PQyvyqDYedOhKSYz107CRejMYbfRRGJ1C+3c3m

-atjP3BF82uRJwUYW0z4dHR2hPKYMWWjZeEko9lTreH+ffp+9n1V/4eypsKifOekw

-O45XnnVSMP7oxrshbrB9m8aVfoNIk6+OmtUH2taOCCvlZN7MFbLrCve8UqmIYBwW

-N7lsplSG49XcBBm8TDZbQ+pbdGLIbvbcJtvF+t3FYk0xCU2zPhA/p3cHtGq++bFn

-/vYTF9AlTL74MLHf3HQbw9pWpRdTfwXEIr/mv3KeTCiO84sVq9dxkRCaK2DRBhs+

-vHXCeGBQyDBxsVgs6xYeLLno2a5EeAeWyVxxMsRVc6nDbaV1zPiRwXj6vGOD8Z77

-d4RR3oTJgiW/Y81iFB8Q9suiY43RYxmsCJwtHqAqHKzmXEYSjcuenOBs2S0yzX7h

-LJRt46YzjRx91HspqdajviRa3l3Q0V93z+K/uuy8YKNAosYUoyAjIyMjXEy2X7Zu

-M7RKW75itSpqEna+O8zRNWpwx2y6cfLLVMqOY3mbizrFIqVoxRPGjW1ugvzPTk0r

-1lk7bCQR4GKVtZMxiqiRx9CAsZ1UxIfDRgy7etGcw/iYfuWScwAXP7iMOYgfPd/G

-v2F8QMcoeGyZYYBTR1hMFY2Lfc+pYXauhIV2+dacIhojEM5mMilNNLbQdLhCiigc

-dp7QpHb4woLJJsBXZGc4pq+/ufn+NS8FG1ecQkKahIvJyMjICBeT7Y/d9tCSYOx4

-/TWWkh2RQ5FDMzsX0zbkdoeOBiKZdTBZZu0cbNhR4Y5UMJg+dWoV0VMR48XlUlnJ

-xle1AIUnI8U2iW1facVyH1D54opTjzucaMX1duYcEJg/avbRr0qNp3hBXX0ST9hw

-2IzSWmoVIpKn8GUsuFKBMHHOqxSw7q6nH5UzM7mMkgoqIYjmgnPrM2MYPB4vDpG7

-aLDUifbQ7+666eEngo2PYQ7AJa4x+eJD0fpKlZseWIKntYhYnKbzSg5K2A8dJ4xC

-DFL0HIwOrltZJo/Xpxg7GhJNI0cML2pJNqa6i2JSyJNFz74vF8WaPiGGmrDjVoxF

-UjiwEuHqRYf5YrY1B37wU+ee8r3n0Bdn7ArjyP/qpJiIddMwk2W2AB5UnSu6sepJ

-KgNKpXIhh0RjXLwWa6IZicYOZvC443FJNJa5RO7H7/GiXsi4viRaxEui5amQTj34

-FPCpX3kbNOqOmdhO1zXFKMjIyMgIF5Ptuy17bv26lSskuGC1agxTJsQookc8KYIx

-aNGz40oxIEkr5syZPgWKnlOu29ffz3TRc7lS1lk7SSvWYkDhGnnf+trpPcSIxykn

-zA7GhdPHHQkH95JF8358M/zSnh3bQpyZCIsjZrEZshA2/yzM3ekNWYDnqZ6kpeY8

-LHey2HqjVK21FLAkOoORimrFFlMN4yH2LsVKov0Ym43HD7rExS7v3fJ28PeW5YCO

-//6TH6LrmnAxGRkZGeFisn23X9x0B/NkhzTfxiSDstMS+nckPm/EkSF0mOIYUpQM

-q2HDW8eOaZdweABl40MqmxSgCKlsWpVcw7GhAmK7zCQNAO2KkwAXNyN2O+xt/rTx

-pxz3gWDjwe2Ii11HUcHCMjyRFCBOmF6zbE/Ih/BW1ekDo8bBogqPWhPObTFY3eC/

-KoH5UknKifCwRYhIOkyxWg9HfYX+ZmFl9sLXBfAcqzyuvQcE5r95xQXZFIE28sWH

-jr309q5gfGz5k0Z30cQohL5guP3PjVou8STehSy3S6f9VCb8pgljx7a0QDeKXbs6

-yjI6ocvtVNGz9MVAKBaMDT1lxxJ2gLERo6HH6MdPnn1ErSI/c+EZ4IuXLMcjXNNe

-tc7MuY3025gKI3AjIMBj/UxV7ChwtWUkVOSbcxh3cooYFMqmpahxysOSaMmmELIQ

-j9XVQPNBG2U1olUwVdO3ceObwXjP0+uIaEwxCjIyMjLCxWT7Yjfd+3Aw9mzepG5w

-vs9YIvJ1bITLEkIWWmgCb5YJsQvHkWJAhQoewSzmc6ZMnFBGBYP+uEhmLWSz4XpW

-cqjC3N0+msoC8Q/PB0Q8ZUTLEXWUP7oQfvWEqZOD8e03NtpyPyJJ6IHF5C2juju7

-BA5zeJGSdICLK7isKTT7GKnI9g6gHgUy2zLZnFz0SFFszrmIN/IIU3mmZmbsS01K

-sq2YIfekry8Yfnf/0ssRFxPPmHAxGRkZGeFisr1Z1wCA0DseXoo4pWogX2YjXxMI

-x6o2Yv+qQbSjJTdD1OyqSDHAl0xeakmMHA6a8SOGD+tHKtvAwEDJFo+XbDbZ79kP

-qzsiJpvYOxIO491Y6cfc1BfOnncEHusWLPr49PmnB+P3f/oqy8hj7dXNpJ22NTGl

-qEeYYQ1I1AfP833VrhvV/ppz+T14mpUwUVvIZFOpNMJnXPFouXpAx5ZuPbeyc06Y

-NdSoOVb0EeYeZc4DD/WyNS88/ybkKo+fOo4udvLFB7U98dzLwfj8U0grzqSZX4tH

-J+of8ljrnQaamTGBTYdLV+ikYaHqwdUIz09FteKUm+pXRc8l5YVxRDEgK0ZhE4qH

-TCtWUsXgd06eP+uk6UfulXn5ohOC8T9vbu/fvavOpcq/POHY7s1sySBf5lplGjbw

-xVlsvVGswKEsFNKSaCxFjX3uC25HG2LBEqUNFCuJriMac/v2jKGwrk2b73xqLfli

-ilGQkZGRES4mG4L9+lbsa6fatjcSoLCZwiyuLFFHN45tqBe7klmMYkBVwVqagV88

-fuwYgEh+LSSx1ZQMkKIV+14kHo86FHI9O8S+dvadGx9etnB2IXPknjzzZ0wMxlOO

-O/qRh5FonHaSFxhDQsRW8g43FGVYHjW5xPFr1eY81Fh2dO+BJ/1MJos9SbEVCPdM

-eQpDVJ7Xa8knrsZEHEcr3Sguf91194HEyt9cAc0+8hlyGuSLD0rbsH334keXRO4y

-UmVr4NV4LPwaa/ysV5TJwmyugytTgTGKwJlOHDeW6R6jnV2d8roNOz17UqFYt3qW

-ztfXccmYK9j7bqMrbx8P3/jxk+ccyQc9g1H7K89d9Mhy7A9dqzB7zZ9MHo9NehjS

-jfckVQdLluTIqHG5VM43AWUllcJIRbU2DAkV6bSMVFQZr+sIk3hwG3aJ5glhK9Xs

-w9m44dXg771rIBb38VOJa0wxCjIyMjLCxWSJ9rs7Hyju3IGbRmFxQoxi0JBF9K9O

-/KHBo3Ac7mQhOuFhBi+dTk2eOCGEMUWtU+zVPKujna/LnONFz2KQFbOBsORDV/6+

-s2aDku+M0a106D9xxvy/HwPRoV1b30ZgI4wGrraWptBVcNZDHZowy/DgVVLL1Pe5

-7PehMniFAvQklaLGewaKtawkGsPDSrks/LBLS1IfvDAMYoUseLz6OTwxLLlXjyEP

-57d3P0y4mHAxGRkZGeFisiTr6IdE2R2PLGNV7PecTlnAsl4GkyfR1CIicdKLo7Ay

-4uJUhmcBHNXwS8YOHzZx/PhgY0ArZFaQ4VQNO9oJ3wA5GuvwodHYYsKPDmcu/MCv

-nH8iHXppwwvZKz8I8hT/+Zvfw+OMK7ucJM2voZnJY2uQuliyr9YhYb8POOK1iuz3

-0ZSDE6B3oFiuIdEY0bGbKnpSoBXWW77xqdxWtecNVUgGWyqpJ5989sVgXPvG1nnT

-xtPRJ198ENkTzzwfjC+ufprJ5hq+F3ey8SiEsXqNEyR0TUc06hpofIZL+kQ2p6WK

-waZOmuS6EKyQqmylkFYMuTspBqSqBnxL0parZhAinju3XYPQ+yBpxf5xc6Dwd9HM

-CXToQ/v0OQuD8de33AOBgoE+PWN+PDsX87Xy0CfPP8Y6pJoxRoW4J0WNPUU0xptx

-LpORROMmFDXOZDOSSw4v5o7x2b511gm/4S+xirm5cug6aBKggOBv99tbAXw8/vS8

-aR+lQ08xCjIyMjLCxWSGXXvXQ/Cn2M9SSYowdX1CNT+XW1jJTNmZKMUJC+1gw8H4

-gJPNVxC5NDcBrXjSxIlSmFipFZcrutCuKmMUMoMXdn0XifQ1EXtc/1D1GP3s6ccH

-f/OobPvemET3xXIp+GkMuXpMlRFGLTRHjAAAIABJREFUsRfHceTiIJ1SMklZJN7m

-sRHfu23zZsBa4ZQFc4PxsYeXsayrYPEggQDhRHgzKUYRhQtkHzw5/SAVJInGMDbn

-Mrt6YEOKGqehJBp7kvo1UfOtY2ihb0eVa8eOcsirc8LXOlF0Iqyrxh/3h8VPfP3j

-FwYbbYUsOQHCxWRkZGSEi494e3X77mC876HFDPGYIUDB4kIw5vOmWjyL5e5iINoA

-LCprh2JA6ZyEKpMmQMHFsLbW7u5uZva1q6lyO4mItWa8RWIT9Ttm4zHjd0hIBjhr

-9ISxH54/612d1Y2btmzctDnYWP/qqy+9tD7Y2IIBym07tnd0wIR3dcGP7evv96Rc

-pCwjTKdz2BeurQ1odiNGjByDVYjjx02YNhW6/82dA504ZkyePH0KFMsNbz2QIp8F

-rLi7/HTIZz62fLVRexnjtJlrINFgIRK+zOrKLNSaxq9idq6Cxzrf3JrGXhsDWGA5

-PJ1NYeq4WnU5x0OfWOsRVneECQNu74nKLvo2605/EC7OXlv38iPPvwK/mgTmyRcf

-BNGJB+G879qNZ6pvd3vk8X5IUY7OiFE4Vrek6GG89NmVUsUOZs9r3E3jJTd54kS8

-UsSAFAPSpc+qx6hd9OxrZ5ycKucNYhThPuAbzpw9/ZhxIw7UBBZL4LOefuHFx59c

-GWwsWf5kML6y4ZWdHR1wa9ndwZAzYCgicXuuDE9RLZcqKGDWA556x1tvvSyV5OCf

-cQOd78jRo9pHjQ42zjj1pGBctHD+WadA2m0qlhHup11x5oJg/N617Z2SaBzMm5kl

-E8xmENf19QgFerhBAw99c0g3xmNawmOda/IKGIqRosa1TC6DBZmVUtnHo8Yx+SZi

-ZXhRBaCjfG60PpZf6ltBiahyWvdewse/vHMx+WKKUZCRkZERLiZjrLtYvvMBKEBi

-cqUcrFLF3jUdjNAFT36NSXEzAhoOpqS4LLfzWftw6DI3fuxYXK0PDGAjD4mLK5Wo

-x6gnK+5ErOt7IjBO3FcD4CP++vy5C/anrUMN9+e5l9bfdT9AqgceAQWPZ559tran

-F/9ZB3lQ5wHGpry1wwlrbWMh4hj5z2AZgQQs5uocI7K/d2/etHvTW8HGy2tB/vGX

-mezYSSA0ehbC5Es/9MGzESaPGz3yHfy6icOgzeAlZ5583Q236YPII5iZcD4YWbtI

-zlgknzk60OQb8hTVcrkJTwklalzzCpksRhGKNWx9K3y9prHIapp9HJPCqE87J58q

-6m3L1wLReA2KGi8gIU3CxWRkZGSEi49cW7xi7frnX8DJk7wfPxlOxlrYxYs7eDya

-bHbDc6ISDwfluDxZ4iH4JBSgyGTgYVd3t+T/h1S2MEyslSgUOt6XpnZGjhHB1NFT

-APhcMGfqO5irAJ7fs3hpsHHdzbcG4+NPPNGxaVMEGFOuAgP1PDmrRI0PKj4ZmzpX

-hZVjPdxcO17PvO2b3gj+3PT6azDedd/s2ccEG1defOGnL/0w/uqJ+/pjP3f+qdfd

-otVTuaE5GQfCvt4TYaH+qCgu3O3oQ+CAKnkKWEOUSqUW1E3N4plQrFbzOdhIZ9JV

-2R/ake91BDc/07OhN0/eiGQrbNqjbg7St3178PfWR6F5woJrLiOfQL74vTbp0254

-cIm3pxs9CM5eWNPm1HXxsJ6IEYrrpILiFwn6YjclxYDKSEptbi5MnwKEVkk1HRgY

-KJclg0L1GNW9lHzNoNBX0lCjE3YUBRkU15x7InrLoS6hZNjk/kcfC8af/dd1jy5Z

-Bl/cv0d5H9eJFmTJSjp1wo+cD6YEHP5rKKLkOJbvsBbp4bHUDUGzWDNZ6n9p9erg

-73efefZn198YbFz9sUuC8S8++8kZk4Za73vizEknLwQK9sonntL3aa/eFUc3iVhJ

-tBDxCj3jrAOPKqQCqhQ1LntVRTQOxo7esiSep3N5V9KQFZHGj/OL1Zw3OBN4eFzs

-qbNmUsibxB+XgS/+qysvHN1SIOdAMQoyMjIywsVHmL2+HRhX9977IEP+EPOrFtQV

-IQHLSUK+9UGJxn09dIzCTadFJh9GGyaMGysr7np6e5kSoKhKRMxUQRriYs/X0YlQ

-xnMoiNjeT08Max8V/L34hKOGPkXLVjz9///Hz4ONBx+EHJ3f26PiD6mQHieSgJi5

-sDCqELnuJMKdQWMUNi7mdk6sUf7Mws5c7SdnOzHF96Mf/hiW4fc++MU/+USw8aVP

-fiwYx44cjNXXnE1ffjqQ21YuX63iD1FzOZsixmI6lvqHhCw3E7mqpqJS6ElrjNRq

-ckmUQ4F5100VsQ9hPpNNozqKj2TkiFru68+MsdrDiJCaK9+O7oTCm/aSAleEryEH

-fNnzr378tOPJORAuJiMjIyNcfITZtfc8GoyVzl1SSSv5vsaNPklW42duVSgw+yFn

-scyeKvHI5mtYuZDCJmNTJk10EP3VC1DA6KlyOxQUjzDfPpvqGexfgIh49vhRe33H

-9o7d//qTn8EU/f7Gni2YnZPB9HR9gDI2JyyCtObzzHzelhvl9Xtr42KN35TyAx/0

-Z0bfq3vNyedxwje9sv47//SvwcbdD8Kh/19/+eVLzz0DEXzyh1562vxg/P6k8R1b

-Nhtf0UifQuPkqNzO7k1nvkp3xpIrHsDFmLbN5qTAfFqS26rZlOyDV9GybVz1btLl

-dqJuJcfMPk+xar1Yu2h7MYHkuV/e/SjhYvLF7531lOC0u+VuzJJ7NeuMDK8bYWsA

-MTsoUR8KiAsWGxdD4IoVrbjJw9Xl+HZJKx7Th1LFRay2KpfLMmkuu9v5nqc62sGf

-2PU0ZBccPmoqXHnKXDNykGh3Lgam8He//6O1jz8Oj11HerG6vGEDHVHW+GFCjKKB

-L47XN+rltiIzuMyKWezN1J57KrSCG6uffCoYP7Xh1S9eDSGLv/vzayBkMWp47K2z

-xkIQ48z5x922ZSveHmSzV24fA9shRiyFumf0L4lCFXrHfJ9XMTxVk6LG2XzfALy3

-XBNNqGicwrs1iBqrsIOdOm50l+Z2yCK6N9gNEmXEA9Owy1aveW4T9LU5fvIYchQU

-oyAjIyMjXHwE2H3Lnw7GV1/egHPGLbWBhM51zN7QL3MS6caODe5cZtOK5adMRFpx

-NpPt7OwKNqQCA4gBqaydVI73fE/TioUBwPYOjM3WD64E+NPGtV8yb0ajN/QVSz/8

-xW+CjX/7AeS4+rs6oKuFRKMxzMVdOzLjDAkXW7IJdUWJ5l7HcndWr2ND+HHvuLhB

-WEcVH8KVUt7T8x8/h1+96rl1wfiDb/9VAIHrP+hLF5992wPYGlxld/04rkyUp2gI

-V7kJpuVH+VxIorGMVLTkC1lcjpSq1UIBEstSniJYNgkVtsJIheDJsaC4NlB9oSO3

-QhZGPrTS1XX9g8BfPP5LV5KjIF/87lrVE7c+BJeW341iQNl08jXDG7RHigUlogBx

-w+W546akGFBZsOZmIE5MmwwFu6VyqYjXXqUk9XwrSpgNL0sPaMU2cWKfaMWhR6vC

-h3zunAXZVIJU8RtboPL1W//8bzffcCPOTkUtV8M54Tzhao/fcvbDF/N6DaMkDWju

-70u8XISNWevuJcaiXsdrVqOY0ae+tv173/gfwcbnP3YRM4LIZ8+ZNnsOaNq99Ozz

-6hOsIo4GJdGhIk9UcGE4aG7fLTSvQqYKAr/cJInGPdWqVDSWvZdKRb9mygDFvmJo

-7bYadmaSUWPv7ifWBH+/8cmLx7YS0ZhiFGRkZGSEiw9ve33bznsfekQhYjZo0TOL

-aWY2eD7hXx2z352TTvvpHKIfMQHVeFubQX2mp3dPWYoBYcamBoV2mLWT2pi+amxX

-j+32EqCwEjWidQSkpK5Y+IHY657fAOXCX/mbvw3GFcuWqQ4RbtjhrQGktSIVPN7l

-L7nXia2KyZzkNYT6x1i0Z+/aoBask2MYWvH9eLDC2jf9JFYeb31r01/+478FG1t2

-APH8H/7ss/Ifc+nUp845Odj4+6efxRc7NmVYWPg4rABkvsWIDr5RnmiOfq+I2nwg

-LEZcjIzyWrlcQKJxynWKGLbK4R6m05kaaglxXzbBE3FZpRAgm9WJMRnVqCTanliZ

-wUunXl0HROOlz758FWqHkhEuJiMjIyNcfPja9Q8sLe1AipLLIzjAGqiwm2Q1HpPx

-HqSRh3rIY7TidEo2p+AI+vr7+ktYbaX7PQeoSLHZmNIAEhp3NWoO3wAah3tS8c5f

-AIh41jhLPXLlsy/86df+OtjYsGYNnjiuofRo/hzHDosPHi929Ifo/F6jOLL1LtcW

-yXQU6HbkGFJlHUszKFyXqL0OA8Symq2mhNKDDfmMr2nRfmwmjXel3IHuzuDvP/7g

-p8HY2bPn377+FVw+pSTR+Mc3w7Hr2PwWc2NHw9ajEDaNN1Y3mIjmtU6FPPTlcjlb

-gLxCUy4j1eWrKGOSzmSknqqUp8AQeow2F/a7MxUn6k9s+1+t/iNCePAVv7lvGeFi

-8sXvlvVjFuvG2+/Sa0dPnYw8sYijrvQ5sei5USMPGZ2wacXjRoxoHwk+sQ/7dxTL

-pVCqmBldOMMYRZjY2YcYRbhjkjNaKHz85DnhfSew1S+8FIxXfvlrm19+KVyeR6o3

-Me/pOHXpuMF9caMEpj2ljhN5WzfwxWm1wbDxjxQslv8KMymdckq9ANtTgcqSG6Ui

-A98k0IsxnElWLaskZOBWVP4TWeTBaySdXB16P+6a5Y5h1cNPfvFbeSD+9zf/4riJ

-7cHGyXOgWOZekKaT81Czoh9RqCIpJ9nQLDljLWpcqeH+F7JZrWgMzzdnc5Jo7EtR

-Y8cRQsTvvipGEav+YNGuhlnoMEYRK4nGk3bJiqdf2Lwz2DhuUju5DopRkJGRkREu

-PuzszsdWBePGV16Nrw9jkDBeTZtIveJJypDRyHGh7Ya0YkQokydMyBdgsdm9HUqb

-SqWS7mhn9RiV4GhfhYrrVGthnDpxTCgGtOaFl4Pxqi9/LRg3v/iCRsQhO4olLw5i

-q4TBog1OwyWFVdbsMpRvlggXxhRqM6WwJ3wun8W0lVTJyTe3NLcOCzZaRwxvGw5V

-cM0trfiqpjQWB8sicmD/IS6ulEHMs7935y6c4W2bdm3fDOXLorsDAW9JAWSkjsEo

-YbJcFvg2cZh5P/3ltbBfKfff//rPgo0vXHIO4OIlT7Ba+Z2cf9xGz8zAqrqyUgYf

-PM8rlQD/NrflssgsLlVgP5sK6ZBoLPeQc5NozI0qZ7vKPF4SLezdsunSuEteb+9v

-7lsKy4KvfIJcB+FiMjIyMsLFh5dVBbsFm7Ox7i6WlUVlsXKGGIoJCxM0uLD0KOo7

-PVsJKI7kMKUcz7jUxpw6ZVKpCOG/YlEJUMisnSQqeVG/Z0uGQgg2dBWKaB/wHZ9Y

-dHwL1pi9+taWa77+LVgWrIPmZsDn830L1FsRYUfXQTi2giWPF2I4jSchpLg5jh0g

-zrA0AmHk+bFCS344dHSePG16MI6fPHU4NnjOYJ+LdDaXwTIHJ5WWi4YSaqsHY7mC

-GU6k4rmpVFMT4OVJqKIwbtyCkSOxTsFjO16Hfh8vvgIdnVc9ufat9fDzvR4s86kW

-o7AyHIaKjib7JpL937/+XTvyAr/+uauCccaMqa+v31AHdA2YyXl8oWKtw+y2GlEV

-nha7wDNBnhiipos+erEayGdyNeBKeQrHkUw4hY7rOW08Vmain7S4biIk1uGTQuc/

-/fueAD3+v70aZPhHN+fJh5AvPjC2/s23H1yCejcZ1+brxjJLjuFKDGcUY8U6g8vi

-OG4arhmRlmrFYvw48BFtrS1dsui5pOgTKkYRFj37IXEiQRx4L6tfbnnVVBM4o2vO

-PqG7B5btf/mdf35+5Uo8RxzlbsygRCxHFz50nEFlmhvEKBzNPnY0I8IMSmSyLAN3

-ptwYKASfNWfu8fOApSBdcKVS6+zpCTY6u6HZyp5tO/qRSDAwUCyW5A1MyScpceeI

-OIwK0fgVuWyhbTi45nFjW6dPhs4pR80DgvDCsxd07gK3u2YlMIWfX7Vi60YMWMkI

-Rq0sG5tC6o9J0SghH/7zzyBYMX0S7PA1F5/3ty/ItKcShm7geWORAGF5QGF7ci3Q

-4yOZgfu+hydGuVxURGOp51fxhqMvTmOkoubVZEl0GGeKAiDCjp6Jxq7ZjGyo3caP

-S7uvrYfJeWDlc8H4mfNOIR9CMQoyMjIywsWHi938yPIBKcUbwJlQJ5PtTQ83JADF

-4xgN6MZSgMJxHVxZ1xAYpt3UdKQVBwC5X0cnNC6OBCh8LUAhIrmDfaIVa4iKvK6P

-nQMKmTNHt339n6CW7IF77lU1dWGdoSVcyaPYi4VwQ4Ds7h0Xx0C0m4rgcFrm5QAO

-p9tGTv0ASPDMX7gwGCdMnNTZA21NXtoAKGznzl2yy0mIgmUtYk03YNW1iIIxswdg

-tN4Oxl7WtXPHFojMbHCWu8/ANxdgldA+pn3GjJkAk+ccHYzHzDtxK2b2XlwDWlEb

-nlld2wWhDFYpIhwe0Oocoh9B+t/95FcQqfjKNSOnwNHc/fZm/WP9QY9LTNc43FNh

-PZQSFZJlHOBimYoslbN5mLQCwuE9xWItl8PQDYoal8s+TrUIxX2SqWzv8JIRWA76

-u0egD96nzz3ZHSpLj4xwMRkZGRnh4oPWSlhAcf2td0BbCiYJTIMKojeqX0iOnGpI

-aApQpFyeBTjjIZRrbx/RPgpKPAZKpTBSDMALKu1Qkk31e/Yk9BOhDMUQf6H6Hbo3

-MELyq04DXHzbfQ/+9D9/hc/7daw1484dQVpdCxdBXf2M+S6nES7W9RpwMmYUWS1b

-cNqgmUj7pKnBeNIpp06ZOo2hIGQwPvfiS9u2gVZcN4aJSwESxrWCCgeHcJgxUzjU

-DnCy+FRF5Re+h/yzfsx9vdHb88broMLx2DKEyWPHHjULCH9nXHRxMF50+QWrloJg

-2/JHoOuHt3UTS8nwcYm58P0yfvqHO+87Zgo0k35i69tq2v3Yt8ciyDpK6xj/ymNM

-MnW0ua4eVBS9akX3h4ZjuqdUVEUfGczgpdyalG3zHX0C1BV9WAA5pLglqfjHGJTB

-+glZj48+AWmGFzftOH7KWHIm5Iv3y25dBungt159hcVa5CQ2T4oxbRtEIereFfo4

-LHrO5Hw3E7rHqZMmFvKQxNu6bbv0xTJGAb5YiQGpNJQwdYrZvjpjvCBr4oS54Ona

-Xfjkz/3zD6rFfjw1HHvxxONiRjxWiOwk+2InobwwStnJoISkSWTyrAXoB4VR4+ed

-eGKwcfxx0LzHSWc2vQ016JuggI117N7dj81NKqqzlK9pJL6eA3ln4nE3y0RS7KiR

-f9FTKqvzin3BuGXja1veejPYWLMazpC5xx9/yRUXBBsfueTMYPzv/7rzxWXglFm5

-l5UHwqlbuWbtcQsgupJtg/RgeU+Pjgw06oqaFKOICfRoCU15BgjdZNSr1UKiMURa

-0ukiBqCaCuCLM5ms7AbiO5IfXS9TzK15iNKGSdpAYWbPuJPBEemDkNGv7l32069+

-kpwJxSjIyMjICBcfsiZv8DfedR/82bOHpU38wgaX9TEAY7geZ0mQ0KLQOpJWnCuU

-8bulcvzECeMHJK24VKpoRMyQyhauxJmRu+OqzR0bWtrF3uFM+swPQCjguuuvZ8Am

-flm1DQXo7Qz6Mxvh4iQGcSQWIV8mgxIpFZTAHB1rGz12GkYAFi2aNh24w9t3AnXs

-rQ2v7Ni5K9jowaDEQLlYrUjtfCT2+Sop50drA40kY+sVxutWBsmPbDxtvwy/tLcT

-6MZPPPros88BWe3SC4AA951/vOa+O6ATyrW/+SPrwKyvqyJLGzYAv5gX2tRvF1Ur

-IBBH5bHmGhrOW1g1BKeqIanP1Skh29EKFKBoymWKPbBRkayzbM5F1OxjjMILjoUv

-kmIUIp7TS6w49fU/RdlFP3ztvY+v+IfPXsqAaJwjx0K+eJ/tmdfeguDgkyvVmiHe

-4kGPVp9QntzbOIqN2pGNsOgZPZ2bUbRi+VXjxwCteMSwts4uSMSXSiVJj9W+uGr6

-YhbFKPYpNBE+gh1oHtbWMgCe7he33m2FJuoY0EYTIzMWEcaLbba1E3uoZX1k7CIt

-xX3SvBnqlXkb/Oqj5sw+47TTYC2fzb+Mdedvb4W4cGdn1wBKI0nV5kq16llRcnsS

-eNTrOF49HHfFfO+35Ub/oBXK+pB98fvfb4eTZ/3Gb/0pNPg4dsb07/77f8Hd/DXs

-65GqSspzAcnj4ItDpaHBvoLbq9YGum2qDWhIqPBqGD0v47280NyaQkUkKWqczaTT

-6Ux4OnHN6BARZZhbU8eS4sXC5hebzUFU9xPY7zc3vnXncmCkfPHCReRYKEZBRkZG

-Rrj4ELQ7l0Lr9d5NbyJ2c5hnK0OGWaz44j3x4eAVaI5UdJQ9RmvcTWNzuenTpuC6

-21dIEEgC1QgXx4qefbPome1DXzu5DwjLjp8w8u4774Lv6tujoKtcaXLXhM9GFk5O

-RSgirEMQ9cEKNQmuhYvNZF3TcHcEpNpnH3tsMJ560sJ+XAS8uvHNXbsgOrEHd2mg

-WJIZp6rkkHiKKaGQoKhTcuSJcYc6lSLFItFZqVDOWDX4iE1pjEggLDCDMYeXV635

-2hbY7e984eL//P7fBBvf+O5PgnHHc8/IYz1QhGPKs3nh6D6tKgKmsXYsrxgWGbP6

-3nTWDiCrQq4VuCIaY6QiJ7wCNqPZgxngWjYnpYLKqIItPF/E1nYhHDbTzLGSP15P

-fA7L8wy8PNB3yzJYX8oCvGyKYB/hYjIyMjLCxYeQ9Zer1912D85KPa04JuBgIi+e

-HD5OoL5Z4ddQNl4C4THtoMDdPgp4taWi6vcc4GKpdigFKHxbgELsA4ktBhilAAV8

-tdi1af1L6xC06io73qgviZ17jPOL7RRlKHcpN1yt8oPJOt4K7Gln2Jjj5kJB3Ynz

-5wXj7p7ezVuAgbt79+5+XBaUovYlMk2H6Snsd20CRDO2iVjSbrUXHjurA4Du+lHT

-EpQoqdOSz7QgSTafgR3OuKp2rIqU82Kl1o/9BntQr93vG1DimXLqHNb79sbg7zd/

-eMP/+jKkrX7yQ0DHX/36v+9+ca38MjytPGvqBglMm8k93iheLNclqioPNeZhl6qy

-I2Kl3JxHonFRCcw3I5dcCswHs8p9LRJk9vvgbNB4sV6B+LaYRbh3Eu/n0osfB1y8

-bhME/edPn0AehnzxUO2eFc9ueumlaN1ar+ESXcxmUi5cXjiWaw4/R/kma43MHTeF

-WTtPrtkFnzJpIpzASNHfsXNnWPRcMYqekUobLc+F/057KaEvGNsE3ufNF1ZWBvpl

-1EF/UhiUMCIzTiwy49o8CjfGDzGkh6UXlsXNGd4CmsJ8GCTrZs8+ZsG8E4KNDkxU

-btny9u5OaFkUOGLFp5Zkak/UFJ9aXulCE1tjRRwNOt6HdyCTGxC4YFy8z50OQZKT

-po87+2hwFtNHD5s0Atq8SpmxbEoFauRXd/QVt3YB0XjjLtjhFa+9vXw9hLPWbIRb

-SLl3j3TKfu+u/+8Xtwcbf//VK4Pxx9/72p//zY/AIW58QX6YNUWBN4/RFUxdnoa/

-S9+CYp1JfeWLZU/ScqnchMp/shVpqVJtKsBBD0WNfa6LPqygRH12rrEwofAT7iLy

-d2KI6drFUA4z/ytXkoehGAUZGRkZ4eJDx3578+2qXMoNV7s2pIqz1hxrtRunsjk2

-mrAAI6gVI6m2hpiopblp4oTxTCdVBkJgWK16WF3mRTEKmaKJp5aGGJ6QO+Ai+vY6

-gI+1e8smtcSWnxmBeieebLQ4bVxX1oVw2LViF5H6paQSAy5zmof5bSB0OXMG0IdP

-nHeCpO5teRtwZWdnV38foM4yaiDhIlpxZn1bktkXPAmI1SNiUzqZy3BErgWqmS+a

-O/PqU48JNs5EOLxXDqxcIbS35IP/BxsnTIZfcfmCo3qLEEVZuwk4bTcsf/7Wp0Ds

-uGNXl98LSbx/+RWg4//zN5/717/+QrDxF9/5PnxK13a1w47mcYfQMl5oZxy7MDMW

-pddEdJbySB9KUv18XFIEZ1EBz59CFoDw7mBi8askLi6VXE+ejcGbuZEnjL40pBsz

-C7CrDbtuMEYA9RX8v2XxsmD8x89cOgIhORnhYjIyMjLCxQe3rX4VqqSeenqtFbBj

-dTKY4ZOxBneNROLjz0e5LzedkV0q5FeNHztm5HCQYujYvZupEg/V71kKUOi+dkJY

-CHFfc3datx57uPFd8KsrpZINKM1FQIN6QmYEiKNUXqyyTov+yDbMeRA4Z8PaR42G

-FOV8TNnt6e/XiBjCxH19xmrALC8UVlC8oYRCo9WAjPWmUufPA/XLb3wIpCE+eMwk

-50AoOrbmAeudNWuyHL9yLsho/MeDK/7wGCTritth5fHtX9zxu+9dzUA881PB+MMf

-/ZrVBiJA6Tka4fpJPDzWUEKTJchTME1uk1NXq1VLmKbLFyAI7jpOsQoTm0VJ0lQq

-LRvECFV7YgJgM20rbMAe1t1JJGdWpZqXjwLy2zAfe9OyVX9+0enkasgX78XufBT6

-d/S+9abuYVGzLwbeuEVmkh6bE3Ne1hpf9r50soUauuY0simmTZ4sfa7RS0kW2tUU

-g6JmFT3rpDnbx6JnVX88QkAkZMeWt5QblZdi7Oc4PM4UdhpLD1u5O0N6zU1zvOx5

-K/BDMoWWE4+fiy+H12zZvKUbdX4HpNZPpaykh4PfrGV5maoujN38Er1wnW/F7Ouo

-kVB5/M1LF335DPjqtvy7uFKeNxUygT//0kc/PA/0jr9zA/ToWvfKum/+DGoaf/WN

-y4Pxmc1bl95wB06OnMmKLsOrS9ap2EWoqSYs56s2LPQANAoZWMCp82q1Cka9stjB

-Np/JSB6Ih6z2TDYr/1Vwx3OMiAeLlURzW5aIN1AOiuW6dVAFM8N3LFt1zQVYVOmS

-qDHFKMjIyMgIFx+c1o1CAX+460G8MYn6tpA2EGZJi/f6ci+b0Mqth1xJ9OYl9JNN

-KseMGS0JxXKsQLWdpBVXfZkQCFqDAAAgAElEQVS/UlQ2nwkLguwdEZsbuAPBQtXb

-tQWxdrVuz82Uo2NJa0aT4Fqo37FjFE7Ys06l7JwWoBL7OYhRHDNzRvtoAMhbUIC4

-q6tLql8qzY1gLSB5xJ7uV6LBXjLwjRWJxSJInph79KTg7w+u+mAwnj9n8nt3UTnO

-5SfNDjbmTISAzDd/98Bdy9cEGz/Fosp//MwlV78IK5K3X5ZqFTVV3im8GCy2fmfY

-HjT2METHOnUXFRCiPIXKgiJTuymb69dE42AsZDIpFAZBojFOeET7E9aJIZJkleoJ

-cMLuCyL/Ip3ukSdXr0Wxl1NmTSW3S7iYjIyMjHDxQWkPrQYS0hsvPIuT4bIQKrJY

-4VxivDjWq6JOhsLmhHFHCrMBLhZuRqKGqdh1OJfJ7ujuYVozvhxGTqHVs2rhgehY

-+GKwPFYDcGxB2pE5XuzciTjMVx8S09OIKbE5zqBAOBYvDklsMDq5Jh+FIkeMAD22

-mTOm7e6Cttad2Nw6AMXy99ZwEeBFaht+XSw81GSQEVIDQ9QXpGF6auGx03/9Bei+

-MXfi6Pfr7Jo1HhYBv/6zy76OQerf3bM0GM89ceq3v3ZFsPGX34bFgde1QzWTDqUw

-BpeniPek86OZYarwLjo/fN3vA3FxPltIIxAu4tlVyCtcXK1UhSPFV0N0HOuDl9QI

-L0Zxi2h24b/64Rni9XTfuHQ14WLyxQ3tVzdjFkW6YEcYOizMIkjEiBMsiUcRo0+w

-mJZm4Itd6Z7A2wreoqSKx6HzrYRiQAyJBLLHqFfzNJcgLK8aug+OVww6qMjD+7pq

-/b0qngCf5VjXm5mZjPeOSnwYZvY0oRg3uCsJxcN9LC+cNWMaugZvVwcQb3t7sT1S

-qSjFdhVXRLOnmfDjQRjTF8SrwuwIRk3Mw6v92i9dMnv8yIPhHBvd2vR/vnAJHNza

-ncH4/RueuP5bUCF93sUgsPnQzTeyMk6d2d82+Q6UFKJxQvZxwlcbJdHIMhZeM94V

-OvfAyVYRPIsl0dCTVH47t4uew4m1ysxjMQqTfWwXUqubhaQ0u7+/fwmEaFDUeFie

-uMYUoyAjIyMjXHxQ2Zo3tj21apUBQPxYi9G67JyWoYiLYZrv4ondRaHaTUYnUlkJ

-WMahbPxw7IHW2dVdktGJGK04hIp+SGUbIjCO6eDAPjQhGGmvlXb0yY52kvwUKyPk

-ceTrJIn+1NfX2YV2Th4IrV4mP3o4RCfGjASI2rG7s1c2DMUMUgCKa6q+TupO6JSd

-L0R8TWxEe0C9yLUDNbJxH7x33LhRP/rM+cHGQQKKpQ1DStkPPwtA+LO/vPf3a4DZ

-/SeXLgjGZ9e+sPO5p3D/K3YsItzQ5W0miY05lkCPYxa/RX3wJMcNVx5IkayUC1ko

-O+zBQ1yq1iTR2E0rojHXPUmFrKkLqWzmujBMG/phjMLuPBKLoug96dgG1Yl/wEjF

-Vy86jZwv4WIyMjIywsUHk918zwP9mzbDVkayoJJAZQwRsyQBCpakGc8sWM0dx0HF

-rBpiulQqNWUiCFBIKbL+/n5ZH1VR8dOqgoqAFf0Q/Yihk9k0JlH7iaB1LEox9Gzc

-rrTTwn+1ND+dSJ6tUU6S1YePeZjE41ILtICFdm562kQQfJAZyO7u7iKGxWWJQYCL

-NSJWKTsNoWxyYZgdEhqsWUUQCnk5iMe/c9mZZ82adHCebxOx6uSfLj/9Hx4GOcA5

-cz4UjKefc/pdb6yHg76rX4pq1rVbDlN5LH5a7v34C7nUkHWMpVKpNQ/nQB7lKQbK

-ZVn0kc1kq7ggkwdC1FfTJCpq1oeJY0Uf5kkYjNhf/I8PPxGMX7pwUdqhog/yxYzt

-wtzFrQ8/pvRNVP4qxmM1km9O7DJIEiZm9aXDkS92UmmO7c6kEmd7W9uYdsjvD/TD

-ngwMDJS0SCbD3J0qtwONTFOwuO5CHcq6RzfXWDAW4gY33reVSSnIsNwrJnXE7Mq6

-eN2dO5hrdhwXbzl+BsbWlqbhw1qlF2YWcUJVFSovrAi2IjnSEktMxQq9ghEDOJef

-AXXVXz5n3kF+7p02a/LHNgONZN3LUBx81jnHrXliTrDxVud2yQCJ98GLcndDdF7R

-CYPJO9UHT51XeII1ZyE00VcslzxJNM6m8A7qITIIjgcXnDUqN4/nThs9X9csNQ1n

-zopnQDj0qZc3njlnBvlfilGQkZGRES4+CGzZWuhk8fratar/fEgnSmSn8UYqOXZQ

-wqlrSo8bilacznqYJ5GgZ+L4cSlcU3cNYL/ncrli9nvW4jhhb7cIA+6bAIWqQDt6

-BgQKmvyS/pDB6dJ1LewsXByKxBsw2Q2pbClHdiqRXObhbXJCexAXl4oDlUqEi32T

-UMzCfFMdLo76SsSkavCra/6I0aBP/42LT4Wd5f+Xve+As6I625+Z2+/d3gsLLFV6

-7woIQsTeolFjTdQU0/+mfeZLvi/tS2ISY9QkmtgLFlQQBKSD0ntdYGFZ6va+t8/M

-/7zvOTN3Zu7dZVFYdvG8v/2dO7fsvTNnzrzzvO15u4Hle/tYoAz9+15I76uoE0aN

-n0A2ju/4VKWJxkKiZN6zguL4AjwNGONUK3Taw2iXeJJhKboctmAIVr7Pa+oPrZKz

-oqomH4Vo4SESY/DdSE9h7rBitmYUukKCdcB+9c7arRwXc10M8s+5NK04xNoiWNZ9

-fB5FYv5iwfxunB6UqKeYVj14QqhQPNjzpqhHIdU8oaDev4PVAQusxyj244GUAjWx

-muqIUL0ZlW8aB1y9pZ8uh6fEELYJbdxyzGnFYtt3IClxfrFkdwpu8Eja0OZNT05u

-xMSJFqx1DkIX0VhCMVzySsw7YS7vMCTVxup9ddIcY02EePsk8E5M6NttuvjkpIEz

-fVIWzMm8k7W+dCgJyS0sqjhQF7v5Jaj8Tthcw+xNVk0V4bFp1biWKEG22wvnKMnj

-qm1CVibV6cREY/quHAW+KFS2YgLfnSomfmrhNhLj7ib0iLB51RtLVv/yqzeQjSzk

-g+bCfRRcuHDhwnHxxZDd2ILhk0/X451INHXr0iGh3rlOsFAPJyTJbMNloZNkYpmp

-6vDQKEpebjYa72ktjCiSuSbkCOtoJ9D0CUVnoY2xAakdtFz1fcD/SsrMmNQHqvuW

-vl6uGY+SCTu3VdJtAcJSAgpQKyOo06GgHeB00A6ejqbmJuqdQNQfko0JxYqis2IK

-1sMzkzGJZv5oetKQfdHp8941ZVh3XIrjCyGquayiZkcNmA4FvftVHN4fw5WKEMcS

-ZE5fUOMnyvC6npuM3UUVkS0nWs8Z0UqiJeo3iERT0EdhR7JpcJGxfh8K8zVYODN1

-t0Ni2G7pqRp/coW6M6ff+RQonr959WSuhTku5sKFCxeOiy+SvDp/CRlDtdUMNZgT

-WU2PRjexKQO37UYe5ndF2sIDK51kyW5DDNIL820JAPFj7VkIiQIgh42y/7AOb2rM

-I6okYo+MYQ4zb4ChXZ2GrYSxA3sPzIJ42qnaBnzHlvgwE/BRmPvFCWLb1gBjPpKc

-ngj+tAdb3BOERXniQ8gFGo2whGKVjhoHUJtp02qi2B3ZpnzkmAE2dXTx5V01obh9

-ycJ079Hp9iV7IJw1efjQfRuAsSGETf8wCpdoWlTLajUTVFrphARjWzywt3Dm6elI

-cXu92Ay7NRT2IW2IC3PdwmFGT2Gg0EwUTrT2gW4jJTGW6BYj8yTn7tVFK8jjg7Mm

-wu/aOCj8guniqhb/wpVrcSmE8Ogl03K3Mg6LbXbusHxMEhMa7xLGrwTMt5UVNQMz

-bYt69BCApzgQpPUOjKc4yhInYhkFLEtUMdabtndp0riNFv429An9+syxDTSAhnFC

-yHkwXsbWPAqpQ3kUNittG7V2RbuDXsAu9FGEiTEcjCVOxJjYaE2B6Z6T6HI2cxsZ

-bgb4OUx+mT64WBS6cdXAkEx3AEvSczOLinsBwXHJvn3sME2TE++pUE0OAStTj9aT

-1KAByWKiyyyC61+OhHx4y2wNhkLYmNXjpL2X7DTRWFRYQ1LVmkFvvl+KcRvsU0YO

-OdXk2ZCkHQdKyeOn+4+SccawflwX89sRFy5cuHBc3LmyatPOkq1bYQt7DSToaye0

-VUFnQWttf0yDmQQW27C7qGJzUphShPSYXje8WF1TGwrECu1ife1omzJVVRPmEanx

-oNhSkabBYfz/zFzgx7ll7MBFqz4lG8FwhCFZE3SS2ujmJ7WR0xZHKEp9FJguTUeY

-YCzti0KlF0PE6JqQVVZip7cpSeijiIfJ5np0GbMDk8HOmDmsT7dek4NzU3NccJyn

-65vunD2VbPxyF1SmCY72cZJqdk8ZPBeWAmVDoaaqsoVFFxuxzLyYaOyw2wNouHjd

-cF04HE4a3FMS5nSqYhud9+Jqo61ODMOqk8RgVSV5fG/dFo6LOS7mwoULF46LL4b8

-54MlgozMhDbBBMcSsq7oNR06BpQSsqrHM81jPpDNRsmAQjSW5XEX9+opaGUOgUAg

-FDbiYr3QTmb4xdTqPB6EJNph4+tYT3XnlBHw0zaxugHJ4ykuFqWYW9mIf4W49s8m

-f7EY4wxiR23T50QUyeFSngoWGKRVhYos0yMSWF8SUx9rS3O2WOdjUf+AYD0j+F2U

-KqkoEyomCpFwp/uK22HrnQLg9OiZmu9dC52q/5oH9lNDdYUpk8y0BowwU2EnMfam

-wdQQTd1AyPRTT72MuDgSCileWCdJbmddC7YywI85XC4bBvfYalTkBAtMB3KKkPhd

-wZz0ZqGnIN+JRR9vfwwt2H9x9/W5qUlcF38hZM8JMIhWr1nDaHHkiPnyPluMzph3

-LApWMp1Eebg2u0NFXUzTivNzc9LTgMmX9u8IBgMhQ9FzRCt6Zj1GFUVTWWbr3dJw

-wRrX1nZYUV0YJ7x57CD6TiMyEAl4BWLEUkl0acU7aoyuGCmmrI2ODnxR1Y5atDFq

-IRuNjKsyi+Bb+pLEolLGAJS2V4pqOkBVMBvFIs2gyMOrNxPbo3RrKUqHdbJh98lB

-PaFX6VUT4Q767nunBBddq+aepJYqOFEr0ovF7iz+rBhVkKhNuBqjCsKSaJeX1o4H

-wqCa050u2nspKtOSaFacys6LjjwsTy3lkXpWj77bJsTC9rMaiRLf27Drm1d/0RmN

-uY+CCxcuXDgu7ix54b1FAARqaxlJppDI+LUAwfjYnfV1wQqfqblOs7tcHlm0I0CG

-G17voh60FK2G4uJQiOYVRSOsxyhlNdTYJ2JlVe0W2sUFFTUyoPHY823KAJZ4GwiG

-YwjLYRfUtr+kLVgstkMNigdN05bJFovNiBruNQV01LiGookO0mxoWz6gMo9HJubn

-0gzZbi09UgHa1zUH3Ghz3DoNqILeX/aJHGqNrSswGhK6pOIcF0ZaH9WUhqzH7qin

-KBqN0gYrSS63B6PZAbTVoi6XE3vQhFkETxYZuBZNjjJJ6wujX0TGHGdLkajFu6Ya

-HFOC8OKHy78+GwrwvsikxhwXc+HChQvHxRdeKpE2ftGK1QgMw4zpMRa1s7DCW/zF

-cRQNQrsEFAJWPWAUS3R6sQGbkJUBrtuC/LxWRMQB7N8BFJnom6N9PWQo9dAJKGLJ

-XqoqdJQkUzBE2+y2mycOJY8uO7vXRikpqKJ09KsSmQmmD8TVxYiIaCQtiCTRmJ58

-ruT3bYglYIlzlXSp9BJO90KaYzAS9aMf/MYJQK/Ro6ig/HCpaYkmpD3TCe1iblkD

-0b5oyRdUVEZPQc+OHEF/sRIOU/PCT5suyqoHC/BsuFZlci6VWPs7VS801TkzBQtX

-nA6TDeZjPD2FouhXza6S0nX7y8jGjKF9uC6+ZGXpp5BQfHgv1jJZw1ZxqcFWk99s

-+wvi2a11QbQh/aDicNK12KMQein5vN6aWih1DWKEOhyK0Io7Sy8lgwruoCSg60zL

-SL33chNdjiRJiQ6wI98ZP1ftukcSVIR/BlWsduR9h812aSxRB8aTJVGUMRqW7IKr

-8o6rrvjjoSPsFtvOfVTXyJaS6Fg9njkjxUyhSRONQ6GgOwkr7nBKg+GoF+9zDict

-ZA8rkp5ZbCxJ179ZTOSjUNs79Xq+B34mXF01F3svTR/a5wtrqnMfBRcuXLhwXHyB

-heCMuUvRO9GKfCsOMwGFJLRBox7vo0jEUyGZySRpUpfdLmGrt5AqetyANfpgWnEk

-GtG9EwJGRWiicVRrbKGRZLIMJPWcTHt9xyLwJbdNHpHpcxvfdyPAYS1H44OBYiIk

-29ZRCwnq7tBFIQmmthrs9XMki+jA8WqAKxiOXhqr1I953x6HTTJEru6ePvbJ19+D

-pdLSxNYkM+l0h4ABnOqhMb0oTh9VyTx5+CUKxaUijRhHIxFKHk9dE01+f1SFBePE

-p6FgUKLp4XRxQjqagWjC2p/UYDNZu4Goho+pJlxvt83/BOzX/77nxh7dPGGc42Iu

-XLhw4bi4q8qBExVLli6FLZr5pJd4CGKiW1Fc86TY7T0RcrQiRASGdqfqZCUe+djp

-mZZ4tPr9AfQUh0KsuCMSiVVAIWGZsX1vB4/PvCeqYMPeOXfHcasne7GTDeWNE2QT

-bBHie+QkSmprHybrsTswDuT4/ft8YslsY225aQFLrLih20pVMxhMKR6nzXAgg4ry

-rpo0hmx8tBAXsNOeiI3E4LpV44J4grkZnfEU6xysWnIbJdJLQrKUFr9Io4ipSDDv

-cDjkKK3YVExnldXdiXFNmLRtxfJiIv8x3T2breoIELYt2LznW3Mu57r4EpTn31+s

-NjUalpFiVkP6gtJDW5b6OjNdZOxdm0Flsaesx6jLHcXGFjZR6tWrCBUgvOv3+1nU

-TmvkQYuaZM1HQcvzVMVSkNYBdax7S8LyhFHF5HFscb7lQ2nJWGBKPRWRYCyf2uiK

-kcxZItYaaOlsySR4+PBfSG+EB2KXpA6pWTWRI8Joj5vq7pj2rWlsRoM6kOrr3j3T

-ymvhQLJ9bpthuhyScNvUsWRj8UrgdVKjAWt/ucSESqK5VaA5YKuld6uilm5Muahk

-OYwMrl4MO7uczhDlOEUKTYfTSRctjTOjs8SYWazGbs9Gva/qCci6E8WY+KzGzqaA

-CeN47C98uOKbqIu/gGnG3EfBhQsXLhwXXzCpboU7+fwlywSaWmtLBBMSdHQ2WnKS

-1fqVNN4GC0sONc/RAyC6vLSfeWZ6akFengAJxUEcA7QdukYeH1EMBBQ4tleF1g4m

-jonLdesESCtOiitFy0R6CocH8GMkGhaM1U1S24C3PQZ9yz6wfCabTRLxAzQm6dZ6

-iKha3ZeZJFOH/4oZ/8Z9TFXM8wJPT1dDjmBtU2t3x8WlldBvpTDNZzdXnc0ZB1RB

-RWhdHT98OEaNZJwKSx/oswNKw8Rim3GGixH5epFFNsnjrA6zRGMBA3qhICYaR224

-VjVMa018FmONVxIuZGPis3VPWTx2576SVfuQXX5IH66LLxFZtHYDrOBDhxn0txh0

-CVMF4j2kgvljVs+A3tcDzXNkK5btLK24qKAgBWlrKqugn1MwGAqFY2RAUY3AjLkm

-YhxA5+ovjoWq0zNTvzJpSMLP5WWlk9HnA29yQ2uLgQaIemAE060lofKNTY75p7W5

-ortslyRqaFMjN8lpMxnUqmrySlh0rv4ulLoIbIN9TDGfRCT8PXWGjCXHT/XJz+q+

-C7WysXXnCVghd08ZallkeSlwj7n+cvBUPFN6RLP9FZOai6VRiB1SxRatzDxjCq3F

-DyFu8PiSae42pQryeJwOdBxHMN+DYAgxVvRhTmhWjUtCc2LEvMSWih1zXTut3m9o

-fOWj1V9MXcx9FFy4cOHCcfGFkYgqvLN0JdzDm+u1Fh6WomfJ5LJoq6mo2FbYykj4

-y4qeKVtxWJVo547inkWUFTPAeoyGNHpMlj5hKnpWFHPF3VmBsV6IjPuAmQvXjh1c

-kJqYQLIwG5Cj1wfvNog2k49CzxLRW+SJ5teFRK1I41AztVsddol29KA9VcVkrwbm

-WG033RBioxp7Cgevvd4OLtbyi+VmCHkt37rnmgkjuu9a/fTg8foG4ADqk52S8AP3

-I2nOM2/OFyKBdi2ks3smBEk1B0VZHgVZhDQuF6YUmsSAcgEQbmoN4NVEYDGWRGPw

-WZEl2UhMHM+ZqfsijATHlpJovS8JC+hpp1gSVmzZRR7LqsFvU5ydxnExFy5cuHDh

-uPjzyd6jx5cth/bmArm9m7oSmEkVJKmdWjIz9Ev4OoPJNvSmqU6koVDVXEwrzshI

-a21ltPGAE4Ekk0XtBEwPUvSebwbHaQfEmKLEwoY2xP4PThvV1v/kIT9Rnx7AjHG6

-/KQ50VO0+IENs2Gam/YIRfV0JlX1YrVhAAOViJVoxZXJQax199D73cnGd/GUmfGy

-IptwsaBhcYKLN+1oeuBWspHi7WYRPGoSLdx52O6BGRtakJnwYyN6QYbi9EljVlN+

-K2a+yG0uDAtANuWZmWgrAJpq9BR0Z6hHmKBjmmjc5Mewc1ROwWxIRjAfjYqU31U0

-U2hae86IZn+xal11gmraW60A7+QhYERatHE3GR+9firXxd1bXluyNlJXA1s2c+tD

-0WxYteOUsLwrWbrWxzpciJIk0aid5MAflGgvJZvNRonZQiFW9BzB8IismIueYyUe

-ase8E+b9D8O3jRl9GRnH9Slo/59GDIB4yCfrtwpiTJdZalUSdDNpP61C+y56IOQY

-k1KS8DIGG9MfDtspMZ4WIxIS+ihYYa6uiy2+C8XgxKCKO6Zv9hw4tHQTWLVfvnJi

-91qlR05Dr5mPdpb2zIZ8m75ZiX0UDpzAr0wbt3rlJ7jq6FxJbS4VU62HEEdtrMY/

-VbXVSD0VkWDQiw43NybkEBCh4gp3MFLjkKJI9JQLLFVZTOSjEOJ6RJlb0iTmb1MF

-JBf8z0fgY/z2dVPFL0ymMfdRcOHChQvHxedbGrHn5lvvz9fuurL5nhzPydsuZ6aV

-FVO77esuDjLY7KIbcsWiCBOyM1Pzc3PQNREMIhlQ0IKLo1qhnbG9pvrZcoqh5Sd5

-uG3iYAHSis9yNkf0L2Y3YGueX6LctXijoZ2SaC05j4CmNHSY0H53zf6AG/llRD0f

-S7Uw1yg6aja4LPRgne7KMDyNsUfih0PhF+ZDlfB1U6BimPan6B7W28pNZKysbbp2

-BGQiZvtc7Xx4zvjhPfuDWQNpmjC/kjW5TZ8S0dLpw7DMLF0z1FgfPBpTpTnvoUjY

-E6Ul0bBLNcFwkCUaI89yICAjrRWrZTV68BJmjlq65poT0hOURONO7tyzn4yr9x+9

-8guT3MZxMRcuXLhwXHy+5d0V4FM7U35Mq0cyp7JZsZ5khX6SmYFBastVigQUlIHB

-6VJsiGgwR6ewMD8FyR+qqqqDQVpoh6ls0ShtrkFLPGRZ0dK8zgkYi7ECDfzn9NwM

-wMVYbndWmTR0ABl96amtLc34JWaXYnybEou/WE96M8FkDRbj4YRDIQUhVWoSTEJz

-q9+TDGDKjkWJ2HTPnJ1mqfWwAGGrv1gH0cbSD3XlpwAwF6zZSMY7Zl3R9VdpSfkp

-Mr64ahsZncnpY3vlChqFfFvSMzNlxlgow3vp8BHTWVPN5JOiGY7GiN4FNveSmdmD

-cllqMy/jPEcj0TAuXQ+eRHLuAmjSedxgczicTkokpErYBgHifwmaKuhXRGx3RHNb

-6ATgmZ56tGX9kOf3wqJVXxxcfOno4iiezXcWr4D10VAv0JWtqm27HcwWU/y7opC4

-kYf2lPoHRLc3gq97sFNO7549KRNbACrtYmRAMqhi6p2gPUYVYyrxuXS9MBKsiLOH

-DySPxZnJHfnPfoUQIxo6qP+mjaAFgH5GMJTPtuWjsDYnNb+ohcXpzSQSjdC8kYw0

-yAqob2qOIn+uxwNunEBrq/nasxCwqYk24p6KZtUsCuFmoH/64wtvknHm+BFZqSld

-eaESxffHNxeSjRM1mFY8dsiYosyO/OODc6aBLv7wY3gS9J9l0VhYg2OvJ6qF0/Nb

-NKqgUBgL8FRISPe6nI0YhY6ooItdLhclElJkGzvzsRVhrIFWz9LSxVISbdl1fH3F

-5p2HK+rIRv+8DO6j4MKFCxcuHBd3WLYfBEqRT9YBwSCSvSpWQBwPi8H6TtjSQvuf

-2H8ZG3loZECYViw43BTi5mVBbVt2RkZzSwvDxUYCCoKLERHLjIBCo8s5V3Bs9BvY

-bF+bMbrjU+TGuNblwwdt2rQDv8Qm6E4DI+qXEuYXi+2QHahacp4sKy14+Nk5YHen

-p6Y2IUxO8QFytzc2yNGwGe+qiV0Wptfb+phm1eIOb9+ynYy/fPblvz72TVwCXXRt

-v7hwxUtL15ONpP7gc8hL8Q3J61B12eUDIVdyzJBBZNy2ZRs7TbIYD7wN5osaa3zH

-oJcaB55jfCi0c4ciRyO4dCn+9bk9zTTRGEtGUxxkajHRGBe2KIva96oGrxc+KKLp

-AjRBcnN+sWpITlYYyxQ4G4+ULdwAa/UHN8/kuJgLFy5cuHBc3GF5Bym3WytOIy6W

-hKiFNt7iDLWwxZ+tusGU7iZRT7ENC+2iooN2WS7u3ZN+h99Py+1C1FMc1mJ3SlSj

-nqAkmVb2yLPgYW0PcQNdzyOH9pvUr+BcJ+qaiaOeeXcx7GEzNlLTaC2tuWuSZA3F

-tC8awwGtbWlpAWdoz4LcvTTW5IbaAa/XF0GoJYuyhpU69tWJQ3zmwhCMSv37rfeG

-9u1FNr55+w1dbYmu276HjL96fq7qBY92OhpSw/LSijOSOmQR4Xm4bzZQrW/buJV1

-L7TEqGNtTtRE8NPSgy5GLS+qsSYcqiLRCDM9lQQXu5ygKIKMe8/t1Io+EETLrIpS

-Z5yw9LsTzKyeeq9o1biw1ZipJBrKf0Tx9RVgQ3zr+ulkdNltXBd3dWkKRl599wP0

-GODZ0otohTbKlwWzF0JoI4U2sQaXJBujKga1oqpZ2EUpPy8Xl2+Y9hglKzUcZt4J

-gZIBqSxqZ7QKz1FEo8l515RhvnNPpx0zsHgoJhpv3bZbOygzHW1CglChjdcsGauq

-SkOUDQ1Qd5eTl9ezENG2lJEAACAASURBVO4WZyqgxiwlLYOmcLCePWfT7NqYsIGF

-rpoVo2oONzb84omnyUZGSvIdV1/ZRdbnzhKo6/3W7/9OxhPVTTljhqEVDqvo8j7Z

-4rnUll0zAf739/36nDlSyjxmmh+nzZNlmrmEJdGxpkvsJKIuptrWG40kYZV2ALFF

-SFZpzrgN17ksRUXaydTKmamata3FR9F2SbSx34fdvm3rTvK4/mA5GS/tnAruo+DC

-hQsXjovPl4Ni1cbK8nITVorhyHZofcQ4H0Ub6caGvGOAxUghqNgxrVgReiLnTnIS

-hKeqq1laMYHFjAYIcbGiyMw7QcMjOhVAR9va6fzc8A9ZBYDBrx098DPMVarPc/O0

-CYCLdx2A5xbKDkFsExBbO67G0o1VDU2T44oiF2gAHTV1tbV9egMGr2sAf0hEDqeg

-DVGLKVOYkqwkgm9q4qQ3a+wuUfaxJNZWVJDHb//q/yI481+9btbFXZwbdu799m+e

-JBt7D50Ak3/IGE8qUPtnecCGmzag8Jy+rTgH/nfGqMGvI4eOYDMn8xp9AoK1+M5K

-T6FntcfYSnEgQBfjzNSkC4dCHi94URwYDg1Eol4P+CiopyIaCSv0uiBwOlaJF6OF

-iu2AyT0ixjaMrpVYPwF8l8DzKCyV5+YvR1z8MNfFXVciePbnLlgktKD3U8+ZbVOd

-iHFqJc48t5ZEm16X7A7JDWo3jFaFz+vq3RO64NB8CX8gEKL9aYCwGJYy7TYkY9Wz

-YOj03GEXhclVTf9tGhprg/M/Y9LlLdjU8sl3wGtcXVUdMxs74h6x9qPSLVB2XAq6

-YqiXvKa2JjsXbhsjMfq/ZefuJMw7xkRjobWpgXWxPNdWk2qi7GP9RSSXqT156luP

-/5ZslJaDBnzswbt9HlcnL843P1xCxsf/8o+jZ+pBbRbDJGT17NOEh//lEeDXLkpP

-PqfvpDfAu2df8ebStaA3A82aIo7r9CHEVVRYNbVocfxovaRVWtFOYUQoFHRjf3Ef

-uiYaWvwRL2y4kQ47HA4zXiEyWtKQ1PYTjBOuc7MDSpBpMsbyTZAkc7iyvn9uOvdR

-cOHChQsXjovbkG0HIUy/cdNWwSaZEVO7NJjW3m5t9O/QE4pp0bME02X3+AQkA1Kw

-1K+goKCwAHwUdfX1CCJCIdZjNGIselb0omfFUvR8VjRqgDBkTzC18+szxn6eSbus

-BxTgXTcFvuTFtxcKtCudlWsmrtzO4t4x0x7rR8UgFRq5AX/g5AmApaPHwG+NGDpk

-737gfElDlshwKBjGyREkHOWO9800Zx9bhLos7FJzHfSR+58/PUXGnXv3/9e3v0Y2

-xg0ddKHX5PEzFU8+/zLZeP71d8jYIktCPjhqMnr1BcspLAsYBLtj/MDP/BNXDe83

-sA/k7RzYu4+dFEaDpVq9EO2URMcCaKqJ1xiKQkXNiURTgGAlp2C/xOZAMIjWaHYS

-ZINEwmHKtAkfZiyaAltO1naoZurttjgzjcgdqIJgcdYch1U0f92W/3fbbI6LuXDh

-woULx8VtyDwkA2o5dQJyihGPJUR1ceDO/DTWPs7CHISAUbKLiEYdXnCQuVMzohi1

-y0iBpxPGjU1NTRUwaicwbkyWykZDH5SHELFGzMt5DvlsRnChCAP79iCPV17W8/NP

-3bdvhFqmeas3NtXWMtDNgEkbhKLGyVFFUzNpA7ahR0lxMZkNmtxWegTMl9Gjx9B4

-WtlReJqVX1hx/BgcVlhh2NqafGrCTG1MjTltUTWwzFCJQPBn/rz567eCz/Frd9xC

-xvtvvWFgcc/zuxSr6+rfXvAR2fjHy2/sQ8pHAZGjkNPTU4BspU7AldVVVfdPh2rJ

-Mb3zPvNvOSTxgWsgY+/Hu/bidSyezZjQl725GbOF0FJPbcNpVDQiTcoZlIlEHyFF

-aMVsNocPnua4XDQc3drcFKUREVnPThPPego7+r4M19Tcleu/cT0cdZLLwXVxF5J6

-rMt8/YNFuMrtghJNcEqtlrVgeqrnF0va0jS+S4wjzAAVHE6HB+LIqTl5OBZk5uSj

-3Q3saFPG9zt5GkxOWgBCli1VN2SUtaidgOkPirW2Q+2YIja4TSLKA9OhkZLLfh4M

-muF9QK3fduXEF975KKbLjL1HRQNrnSAZEydiTLiWlktagw8RL8ioJAewYeWZM2fI

-eOTokbGjRggaxd3xsqOZeeDPqTl9WmBsYR2ofFHjVLHpdW3/FdXkdXFI1SeOk8f/

-+yOkNLwxb8GcGdC/5+ar4YY0dtiQzLRzZhQKRaLbd4MqXLoawmjvf7h4N/UYkKNI

-xrBqOiwYR14vVyo8ra+D21Kax/nIzFHCOccrrXLjREg0/k0eLMWmqjPsNOnkznol

-tDFdVzXfsURjhYhq0NsS/R6V9hDR/isrE+Ku/QcNbmoOCKyjh+CAOh64x5QfLW1u

-qNe/XLEkw8TfXxOfZdHAKWeICWMe/bZtuzcdhJv3zOH9uY+CCxcuXLhwXGyQD9Zt

-BcBVeijBbVY0Zr+ac8KMTyVRuxvpecTolNDgsGCHDEp3ckp+T7Ax+w8GIDx67Jhh

-Q6FzR58UB/1VfxhcFr6kVMSvkox+Ehm4gGLBOlUvDzunvnY6VEeckpGXfc3I84YI

-aCO17948i85kHfpYTCXRomFyREs6oBDHL6pBKDw0hcaJFIUyyLS2AmFQWVlZcjLA

-z2lXTCHjFp/v4D4aI4IP1505qRUlSoIqmdCcCT+ILMqn2zrG3VHlxPhLh374T8cP

-lfyrBNKrX3rjLTL2KMifPBaw6pCB/fr3hlSzAmzOkpGeakO82dgM+3+msrrsxEmy

-sf8grLqNW7eXHoYk32bq5CE778NqZk+qkAb/7ijsBwsjr5c/iG1n0bT/8oxRE/sU

-fP7T1y8PSqivxW4mb749X3Alqg+OBeW0k2VkDlKNq9EQSiOnw/Blot3mQu9cZjYc

-1MTJY/v0gAXvwJDdyTrl0FHgxd66MX3/bqiRa6iFhaQAJxR1V6lm35fZg2GpOYzl

-5rHeM6ZC6nDwXx+u5riYCxcuXLhwXGyWqCq8/Pb7sIVcM3HHYUgFiy/cEIy+UYNL

-VHcQ04I6pycpAxxkfQYMGjUOCtUGD4W2coVFnjQf3u8puhSErHQJUQN82O1hneFl

-hcBi2viA9ZM/RwIKczYb5s9dObzfsMKs8zuTI/r0+NbNUJn2mxfeMQN2czVHgh0T

-EsBSAyCjB01LXYQQAMPGxob9mNPmwVmaeeX0nBwow9v06RY8CVLNaUhdUsNBM3GS

-bGBWFMywLu6H2+H1NFbr2USKQ0INQFV+pK76yO4d2i+q7dktRo+2KrBMSgztCi6f

-gKQ/QlqeuxcsldQiKMlpbA2E0WneqweUvfy/ayadHxiFR3rL1HFkfHvpGpkWfYBb

-VmlzIkQzhaYFdQrWaj0RjSSn25ORmQ0rHOMlLo/L5oJPpMHaFwq8wuAevQGn981Z

-gc7rLeuxt86J8nCgNfadirkRn2q5Hg1eYtESXTSsBFFYvgF6uByruYOMvbNSuC6+

-+LK5pGzb7j2xdaO3c9fP71maKlmcEngt2Z2CAxtlYiwiM69o0IiRZGPkmHE90W71

-+uDDTc1CC+r/OtS6aV4BSayE7BxYGSlpmXbHSbawTY2BzrHoWTDrQQ9wwt05ZcSF

-mMxvXgex6Q83AlXQrt0H2PHE70PCmbQyQ5suZzhqmm6MGjkYCNEs7N174NyJNvv0

-KyGjIDcXas+WLt6gooKsqzih+FtNutjaSd4wv8CTa3RoiImbpVq4q3WXkWQ+TEW1

-/krCW6MeUKUsyQ5cCr5UIR2Ukbf3oJQekEpM6+uCRBHjevvenIlkHHBeW1RcOwbS

-pYt7FZbuL9E0tDGfRLSm6yY+a5L5FLMNG95jkpLTMrF40ostl1r9avkZeLcGrhIh

-PUnIwmtoXKG34MvAIVfUCyZh2ZKVpfvhLAex64oQDVsyOFjrUkXzRSiK2Ueh3y0M

-51qy1SPJ1BvLgZTx51+Zw30UXLhw4cKF42JBmPfxqpbyY2gYUpJMPa04PmRnySA2

-9sWwM0SMXD8E3TiTkf2yN5iWI8aM7z9oMELdtBY/pF7VNWAEJsoKilxuwKpp6a6M

-DNgHD/ZUz8rJoUQqkq3OVGCnnlNTOwOZJ0ax+hWBeXjDqL4XYjILMiHq+NsHIfH2

-9t/809/cLJhMVn2XEgTrEpnCohHCshQ32tRSjgawzUcVxgm3bdsaRN/FzKsgAHXP

-velLloItvH/H9rqTcHJDTZgjFSVfiByblPVYFswEGnE9DBMjWSGOpNGQO2V0PrRn

-uYgxdxY1pNwYrEtCkoTMwtTel8HCyMipb2pC/1mQuquunTCEPH5j5ujzfu48aMTc

-/aXp/3PgMO6YwmJlelDOSAphSXFLcPKYSSGis46G7FIzM5NS4Lqg/MUVldXUd2FD

-m8DjcaWlw0WUn27PR6R88zRYpcU9cxcthgzuLZ+uI2N99Rk1TGdDZLYO2wWN75S1

-05Xb7oOHR4Eli++t3UzGb990Var70kk05riYCxcuXDguPnepbwEyxrmLPhYc9hgi

-VtU2isQkq5eT4hq7FqNzALYV3NjvNiO77yDAL5cNBbdsbkFBCGnRT5w6FcKcJFrE

-oWp8VLTPvLcyKRujdimpCCKIZABKqqqq0Bqea7D4nAgo9DQ7bDJ27zSAVA7pAt47

-Z48Gz+ND107/22sL0EqwxaUJJnYQm2GyaD5IBjNp1hqkuOEcUrr9mpraXbsgC6oZ

-z+lVs8Y+cj+wDay/rHjNWgjRHD0Agb7GiuMsQqtE2MyIEcOvRs3EmxKbcUlz/up7

-ZHaNaq5hzddM51bWu9ZbSjEthhQuG0+ykAyhVGcuAMD04oEKJkHWNTTSTD4hDAeb

-nZv5y5uvgI87LtTldscVo373ArJDtDSaYb5g5W0zFuzELzwaEJRsEgZOPFg36EtJ

-owV1NTV1gsHUoxT4kmRzuWA2jiQn5+WBgdU7D7zng4uT8h78EtnoWQwlRcs/+vj4

-kYMwwYEWtk5kc4yUhrjFtrLutFOGRR87tu0i4+YDR2aNuozr4osmH26Aq/c0uUop

-c2s0YdGzGFfWrF1LeLUITg8dRazjzCwA0st+g4f2LIaEUAdyA54+U9EaABUQBvYT

-Y0sOvcsHPDjsjpoasLizMPvS5XGnYfaFJym5EUl7Bdpt85wkZkCrKajobxt/wRlt

-HFg3+Ot7rt977BTZWLF+h4mAVBTiUlCExB6MRF0q6NUrI70xzmSEKmhjL5+m5qbL

-ka7oyssHzpwIJ2LVJxCPWrtp5/5tkAHtrzmDmiIksG7wqO9kyapzdJ4i0RDTAw1u

-3F9N+cYMenqD1RJrJc2XxVJrWJ9ZSgsleEHpSGk5vnwI6iZlQ7TKH4k214FTBare

-UdG7fLDM/nz3rHHF+Rf03A0szL52KqT6fPDeQkYG8NnWG4tpO5wYvvYmY8q8zdbQ

-2IRnrUnQCqONN2mJBfrsx8rgvw6kAxbp1TOvfz/496vnAL7pUVSw+MNlZGPXlo1w

-M26s09YJPYmqtW7Q0uYj5lrBKtYQ3MufX7zmUtLF3EfBhQsXLhwXn7s8P/c9vH9G

-mdc/cV87zdoCXGPIWiOmJU0/QqeEPTUjH2kMe/eHwqHktIy6RjDxWluxeWgoSMng

-gVkbb9dxfckQTUm2+oZGapkCxM7KpN3wklJSHa4ahNVoX7N05A4gFIYu8TYZlmcM

-A4TYLyetc6Y32eP609dvJRu31zSUlh5HMCjFmb1x1XeiGNeoVBQMoFT7AuayUGVG

-8KjEuAuEyLGjLS1gwB45PmjaRLADbp0NkGr25CE7Dk8mG4s+hojNzk2bWmqgc4cQ

-wrw3OSpEKZqjCEvWNiQW6xO1JDaWRKWwhWFMOZRUgyvG1pYXS/Cm2DBM58qAGKMz

-JUNFW74GTz3tY88E18CjcyCV+M6JF9ymIcd/6xXgxZq/ZJUaDbS3rtogzYoZjtBU

-1+nyJePRw9G1BgLNyP2iat3wzBeBqp15ScKLzo7sIuXHjh0ogYBzv37go+jTJ+uO

-eyA4nFcAfUw+Wb2i5iQ24hGCbNppC0RRK49kF7e5d6p+vvDsLFm36VjNncKlkmjM

-cTEXLly4cFx8LrIBKZq278D6KEGJK+4QDLhYMjiIXQwRU3TjgRu+Lwvu2AXF/bLy

-gBkgiv984tRpP8aUKOklNkXqUB6ahK6uJkxjampuTkFqQafb60Z2An/AryHBjkBj

-DV3SX/b5vjJluKBxR3SOjEL+tr88/OV7nwBC9Ab0gaKdocTsEFUwsY/GI+V4C4I2

-72GNplh3NUVAywMBpayq1BBpbm4+cRzqZTZfBlbL5WMGTB0FfCB03FZ61cqVENnb

-ug1KCU4fO6I01OD/hxjsRZ4EsJwodR99qrfFU2QN45sz9vRkNeoatrspEHakQ3TO

-i0DYnZKu4rtB7PDdGgpH/I0mi4HOiazeNhVI1B6/AeC8XeqMczdnLPxiv/7Fh/cg

-V5xN6w/QITo40Vj0ZHd77ZivGUZClXBTC2VAPfvVYAgT2upsFZXg3y8rKxPAX1x4

-2WVg4U2aDlQkOQWFK5dCi6+yEthbubWRXbDRsCAbLhNRtTZqMuTkNVfXvLoMij5+

-ceccros7VeYu/BhU2+lTuOMiu6isyth8RRETklqXLsz5TUlPzQHlm9MDAt8ub1JN

-PdAY+rFRJsboFIMV1vGOdPDTAQz0EW1Ov83ldruwIZijGZZ1NBJRFYMuS/DlxjXH

-rt4+hdlzhve9KLN9/djBf37oNrLx7affBO3T2qKRZyqJbx6iZHZOWGwvRp1L51Yr

-kdPqw/EupWrOiqgsU4bcashFEUpKSvv2Ay6YUcPg3A0uyPzBw9eQjdpGGPfsL9m0

-G672fTtBNVccPxaihV7hICW9ZRqZrBbVSlrKbttUc+E9W/Qlp+B9Oj0Xom2e1HQR

-7+I0o6axsakJk6+pO0KNrUBtErBUfeqogX/76lUC1GR2Xoe9TExvv2bSmL8dOBhz

-DqlCXEm0JbOYJk5IVAtLmGhvd3toAWSrP0A9SOdav8+uCvzuxkaYseqaqrIywFLF

-feCG2rdfvzk3w+rauhHmedfmjf7aKg1F0TuzyO6jorlo2xjLC4feX72ePH73ppmp

-2A6V+yi4cOHChcsXAxdXNjR/uGKd4YavWiEJM7K0giiXlzklkK7FkQY2Znp+jyRk

-9Q5ibmN9VTXt2Uz73QIoU+PNoY4YeDFrPRQOh9CA9fqSJJFRqwjYTFe22shtQmzM

-voTHOy8flXLxKosenDlOt8cffXauinPF5tnCbCAaCQ0sHQXbtGUVjQhGopwV6F/A

-18ORaCzXraWlpeIMhIP27IZzl5OfV9wL6BEG9QZfyuAJl02aBIlNLc2QzXq0rrH0

-IKDp8rIjlWdgo6EWTJ/W5mYKZmmbFbJjdgdMrAf9SGmZ2blFYCqRR+qwqqmFXNrT

-Zypqqmuo2wQAezRiBtdmdBlWJg4HM/zVh68vwGTzzpeHrpn61FxID1dDfsSVylk4

-620aSazTibjYTT0VoQi9IiKCoVfLObWjiYVxxRC1F+kc1iCj5tGysn79wdYZOgqy

-GNMzs7dtBG9DZfkRgTIKRULsa+j1Yrlq6KXksO/eA8Sna/ccvH78MK6LO0mWbt5V

-tgs9xQ5bzAko6PkSNlMSvuYXFpLSvZmQ9puEo83pbmhp1S/yaDSqGiy4z2SIWcXQ

-10N2o9PNRu0+p1uOGtZTvL/SzDPrQ6fzXZOHXPSZ/9acyXS/HntuHlxUyHfDruEE

-PpY4FjdRbMuzqKtzBf0ekioyxmeIpdOaaRlnMhpENUqzLCoqT5fsh4ldi1Q16enp

-hfngVSjqCR6MvHzfgOG9QUeP6ifLdvQdifi/oVb8d7+f8vWEqG86SttrynIzMhQf

-OFpeXQ3GciOmRgSDQSXhvdOSloCuiSmjBrz+yPVko2dG0sU6WYN7ZM+cDNpt+ccr

-8TSJZp+MhR1NihVz44UjYloIHE0kYnQMfP4Lg5zpSESkYAXvbS1VVaCU8/PhrPUu

-7j1+GjRYKdmTRT3IUVr+HvYzpRzV3GOqwUUmqrIfztpryzdcArqY+yi4cOHChePi

-Dstzb3+gJR5qN2kW+NbKolw0cZjC4TQpGYvfMnLcSfBKCO+m4cYmCrVoGE39TKZX

-+6Ioiog7pqgBWlRGbWGCjiVqIzOcpcT9qsHYj8izxoDdPTA3o4vM/7eunuxGM/ax

-fwNtdB0x4R22eKBobTDYJoeQmWBTwe4eklZVpZBTjXV+Es0+VlhMDw0LMRymnDvN

-GKOrqjxz5DDQ4jhcsHsut9eNK8HldjuxQ6XT4UTDiYHuMHpaCC6mIVY6BoIEeYfR

-3JJZjofaBnmmkTMTnFqwcfVEOFn/fuDqwjTfxT1NZOfuvnI84OLl6NATLLEvwWRN

-GkLcEoYuVYn1bFTjHErnZd+o5Ui9gtQuaUEzq6KqsrAHeJx6DxjkS4EM7iMHgMG1

-ufKUEERni4hJ09EIq4PXe0fixbVw9fryh4HRuFdWKsfFXLhw4cLlksbFGw9B9deW

-zVtMUTudKEAvi/JhZRqO9rQsV2o63vidrcjKSLlaFHPXBvUC7C3k3eKdn/wWhRd2

-3GEgJUKAFvM/Gh2R5owjm8dz23ig67RJYtc5EQ/OAEdkbho4Qx97ccGB0hM4/2bY

-1WYB3lkmjX2U5boxi4UWymEg01BjCc9lA9oSQxgdEgISvtkoaoFEBrq1PVEMCFdV

-GNZWVb1BsoaC2+pjIhg4V+mZdbq+PgOq3X59C3CoZ/ncXeE0zR4DMYa+mMx7ZL9G

-22LJgKb97AiopJl8TjcNtygmHvrzfIGYwiNYzCogjaqAOYLNmJ5fmZlJPcgDRkLc

-+MTR9JoTkLCoNDegYesXItRBr+WM4676a2tfXArNRH5197VcF19AeX0B5ISHa2oh

-p1g3fiU7c0rQGJ0vXUwBp4Sdjh5vFI3caDCkqDGTU71ACjjhmlMUqlmiaPxKdruI

-y120604S6nJRTBc5Jnj06pF77agu2l3x2tFgj/fITPt/Ly8EW3jDbry0RdZtyEoh

-1Iapamm9IZqnTjU06aChI0U1qmrz16nmcmsxLgM6gS5QhTb0bfwtxHI7RC6qlFRY

-df99y9RvXQmVOBeOgO0zSAHeLGdh6ccRyDVWTcclMo5BHF0s1m13qehYU9VO2knV

-vCnLUTUIE1tVUdGIPEQZWVBik92jlxursSvKj4ASqK8WGM0buixkLa1FluethDSM

-798KPH9p3ZPUmPsouHDhwoXj4nblZC3cIRet+hSfySxrjQbrXF7mlEiG6JaUkmn3

-odsePxOWCe6MGtGwcCGMrrPe/Bl1L8YJozKN6YnYQ0yVtRpuVUvOY3gfYMstE4al

-de06ohG98j74yX1k43/fXkHGZ5eub6lHglCn4yxzbcLLlvamoqWQWrVgVGvHTCGR

-raPGuRbEczn58d1AYk4J8mT8kN7k4Xe3TSXjzMuKuuwJun8O7OHzHyyVW5tNMywZ

-u+u6aUcbFTIUL7I3jNmvsuBvgR0OYv+XxuSU9HSwdAv6g8uu9szJ5krINBdaGzWX

-RYg6s/YdOkoeV2yHdONbJw/nuJgLFy5cuFxyuHj5ZijuKNu3F574fCxY59I6jGHW

-mpSMMTq3R8b7isJI39XE6Kyz7/2x6JCqyFquFxyF6FBUYzxKYcEjmxec4PdP7QY3

-dh9mjP3hnqvJOGNEv/9+E5jCNx8qZ4E1WkQA3C5KIlAqmU+J7jVOyDckWs+imuic

-qvFPxQ6f9DbgsMA8+KnoIH5oxsjvXwXBuoueu3ZWGd8XqCnHDhu0aePmmDUpCrTT

-OXMTO1jIDkqlukiQWLtyFYzONTc2+JETIzkFSp+Ss/MdSC/TiOhYbqoVQug+jkZU

-zI17F/vg3TRpuE0Uup10aV38wofLcd3g6nF7GMsPOiXIaMOonYomf1TnQGmrlfrF

-X2RA1oteFJX5Uoy7SvQXlhrTRkeD8jO71zL60vB+o4oh/P3cyq1PL4bGDZUVtew9

-m82sTo36UUrcjaXN0yeew1kVxTYVrlHvWz4PDHk0Uo+5zB737DHAzfTY1RDWnzmw

-sLucEXpsD187fdP6rXgR2dkNkna0oXFvopfZLbOrqi5FkdEL0VAHy6nVH/BhsWVa

-ERAMtdYlBeuQUSjQSvOp3l+3jYzlD97SJydD6G7CfRRcuHDhwnFx27Kl9OSnO5GJ

-NT0HcXGSkATBOhFjdKLTo4ixzp5x6ZPCBUwhPldwEgPG+EC7cNokVvLEPhMRXYBQ

-7p4MqUhSN7SwcpKBjOnxG6feNAag/b9WABx7a92u6ioEyA4Nf4nt4FwLKYcRsbbv

-bbDEA8Wz+B9MCN0cNpRZKdfEywB5fW/26BtH9iEbHrutO17eM0YOzOsHuL7ixElE

-x94YIhaQEkjsemhMTOS1QKs3EmhtxPYfbi+YyJ7MHLsHYHKgvkZGIukQduR5ZfWO

-X90+k+NiLly4cOFyCeHi/yxep0h4D8ewiehNEd0YtcM0dWycZq5YE8z8/+cQt+ms

-G72hEYZKsC+WrtAceyEqDOwP/tarhvXp7ktqaA+gJ/37fdBq4ZGZY59fCS68eZvA

-xDlVWUf9sIxLhBgHluYgbflw2z+RZoo7ayRQSAS69d7vMltFdoyaTh1YdP/lYJpc

-j2Rvad2cobxXVtr1UyDY+Pw7QIoGmaAUF1ObDILhlqumq4JkvRoI6/QCrRCyi0aj

-XmSbSUtKDjYhMyq6ld/auO9HN1xBNpLd3en0dUVdXFYDmaoL95QJaeidwGpm1eFS

-jRePXrdm9Eh0UdH3jUYXKa0MOQxcKJSr0JNyy6QRZCM32XMp3eqJXv7bvZBo8X3s

-wrlwx6F3N0MG6K4yiIM3NjSza8xus/qXREt+hdThy1aMc0ronUdoqwg8C1FVwAu1

-XyEEeWYO7X3LGCh0vHJAoaM7eojanpLbp0LU8cW10PQkSo6dRsJZyK4bmcXmFsP4

-LBIOU2qntIyMnxSO1wAAIABJREFUXgOh8tuGpzgaDn96DOinr74sj/souHDhwoVL

-N8fFp+rBABk9bMiEMVryI9ojEcq5I7PcNbVLY+Gz4DdRstkQDHowCpGVkX7/5L6X

-8DorzoaI63dmj3tw2kiyseckmMzL9hxddxAIhjYfQZjc3Ko1/JBZDpyodWMzujLi

-E7AsdXdqzAiJ4Q2bjTJmDOoJLpSJfQpmDelFNib1BejUOyP5Up35aYPgMKeMAcfL

-htLTlDhJVhlnv9oVQtzneOkImr9JkmwOhPlOp6sA27KMHtWbjOlJQk0EWFUDIQj0

-eVzdg56iK+riSX2hHeH7j94oJiSNUi+JSyTmBxOFNlsRXYJCK0Qm9i2gI6WyO1EP

-Za+bj57ZfQJ09K7yyqPV0NahMQjXUnMw3BoGL6GMI3icZSNtmyTYUd0iQY/b6Ujy

-wPWZ6nFlYWrHMPRfjyzKGVEEdDOjUBf7nPYvxnyzDuKvPXwdGaubA9pFpF4CV5Ko

-3ZglSXJg9ovbhYzhErmbw/m1d6vsF+6j4MKFCxeOixOJlbRXtCJJLpeM0HPdOzOF

-jrePG0hfbwhAtVVlE0RmaloCDa1hhMlhaniGDJXudkmilJVeZEpM87oyfRD/zE72

-5GMDUBtfMILQI9Wrj1w4LubChQsXLt0HF3PhkoY+XzoOzE3nE8KF42IuXLhw4cJ1

-MRcuXLhwXcyFCxcuXLgu5sKFCxeui7lw4cKFC9fFXLhw4cJ1MRcuXLhw4bqYCxcu

-XLgu5sKFCxcuXBdz4cKFC9fFXLhw4cKF62IuXLhw4bqYCxcuXLhwXcyFCxcuXBdz

-4cKFCxeui7lw4cKF62IuXLhw4cJ1MRcuXLhwXcyFCxcuXLgu5sKFCxeui7lw4cKF

-C9fFXLhw4cJ1MRcuXLhw4bqYCxcuXLgu5sKFCxcuF03sfAouGalr9lfVN5INWZbp

-Ky63i4x9crMkSeTzw4ULx8VcuHDhwoXj4ktdXl/2KRn/9NoHu0pK4Xk4LNic5NGR

-kUHGfz329QdmTeKzxIUL18VcLohU1Df95qV3ycbzby0EDexvEVygggW3U7DDRqSl

-hYzvrN32lWljyYbH6eCTxoVL1xTuo+DChQsXjou5fCZZvfMAGX/+j9c2bNgKz1UM

-1jls2h3WJoh4l7VByK68sqayoZls9M7J4FPHhQvHxVy4cOHChePi7i/+UOTv85aQ

-jT+89BYZ6yurBEmJvS2K1E0s2ByChHdZRSVDSyDoD0b47HHhwnVxd1J2ZNxeWk5G

-j8s5sk8RaLYukJx74EQFGX/47BtL1qyH54FW1LmiQFWxhOfR4RKcbnzqENgbMMqK

-GlVkfnK5cOnKwn0UXLhw4cJxcVeSD9ZtfeaDZWTjk32Qpetxu79z6xyy8Yu7rrHb

-LtpN64UVm8n4y1cWkPHksXLwPxBxe2CUo4Kg4mnEF10ewY64WFUIGMb/xndFVeRl

-d1y4cF3cZYUoqsUbd5KNJ9+cT8aVW3bK/iAqNdBoQdH2xFzI250x8rJpw/p18r7V

-NPvJ+F9zlz+3BJ0SQdyx5DQhEoKNKPqFZVmgWtaBT0ERo/INBwRV5YubCxfuo+DC

-hQsXLhwXn03W7z1Mxqfe+vCtxSsQdQIIFWx2wU4nRKZP/fX15HHD/iOdhospmv1o

-T9lP3oAd23fouGAHfh8hCUclKjgQIEfpU4XlS9CQndMrtAI3EMPO+tehn4KvdS5c

-OC7mwoULFy4cF2uyu+wkwcJk4+1FK8nYXFXBatUYalTMGFWhuHLhhu0PX3MF2chI

-9l7oPdx3uo6Mdzy3xB8Mk40hQ/qmuCAuV3qmhozV1bUsg5juMdlDms3mTobRkySE

-EODHQnXca8zFJC2VR2CZffB/YGtl9Rxy6y/4nHBd3Ely+HQ1Gf/8LpRIvLFwefPp

-06ijwuzoidUPygvtA710mGk6lWrn3UePlVXUdo4uLkr3kfHXN00eUpBJNsYX56S5

-QfluLjtDxm++sGj7/iMmn4Ok7Tl5yWZTqWrmHonPIf4IeKj2n4Kb37AeWS677RI4

-KBXXecmq17Z98Hey0VRZBvdur9eZDhn0/Wfcz88791Fw4cKFC5cvAC5+8r3lZPzX

-K+/js5BAUY6MxrusMARJjXqbXbDZYk9V5rJobWhes7uEbIzpX3Sh9zbVA0G5H8wc

-YXl9fHE+Gf/7pivuOnoCsFszRudEVctdg9Ht9gZsdhPAFxXurDgnafAHf/b6x2Tj

-7Q3AvvTbe6/+xvQR3fqIAg1Qsbnm5V+Sce/a98OYeG53gIUXaImse+O3sPBdvj5T

-vszPPsfFXLhw4cJx8SUtjf7g2t0H8UAR6iqiCQgT/Ej9rTQgZncxOMnApkIdr0pL

-y4pt+8jGozfOIKPz4jkQh/XIyU4FRFPeUI9AXmTgHUePxx3E/VdFDoTPWbaWgsHx

-4xfnr9oGCya7Rx4Zp/TN79YHdXrvmpUvPU42yg7sglXv8NgwRVLC5WGzOf0tQKa6

-4dX/oou650SOjrkuvjDy8fb9pcdPodqivGUSyyCWqD4VBWrU07o1sk05dKLIagYk

-Z6jRJHFX6VHyuK8c4n6j+hZdrMPxuOw5KRDcK1cUdkehGzhGImGV3lqIRjZUPYv6

-wCVOkMlO+M/iNf/9InixKmqbaWrKnZOGws2vKKebHtfhlS+Q8ZO5f6quqSIbbl8y

-wgjRh4lDbgddFKKqwlO7Eih5B1S2Wg2emdwxN7uy+sD7Th9fIdxHwYULFy4cF18K

-eAcAz5Kt+4LNLTGnhN0pSFixJiIutjsEhzvmo1CjQhC5KBmxjsycFZJ0qhzA9Srs

-pnERcXGKx12QnhLzopCRAnkcA34/O0xRNOJgRVFlReFr3SJ1zXCuf/XSPDI+/c5i

-NYzGkDdJCEG+Y7KzW6ayyaGW0o/+QjZ2L30RDDx/MD05iWy4EAhnOUP5mbDgFQGS

-1oNRJRxVKT52SZD01rD+X/Atx1YU3vo3uCwKRvJ1wnExFy5cuHBc3P3lWBUUsK3Z

-dVCgTPCUalKUGL0D5Zx0eimTg+QBb5rS2MD8qtRfLEdYHzmVuRXnrd5Exu/ceJXD

-fnHuYV6XPTcVXXg0ZAd7hXsiw35GozILRcJRiOx4BaElGG7yh/haN8qO0uPf+cvz

-ZOPTTTsQk4gsZhDxUzKSnQcPdzNE3ArlSCc/fLxy6yLA9R64tH0usmRgDWT4YAH3

-GjQhJQo1LLVVUDrUGrEHaL8XRbZj+mNS3jD48LQf2nIG8kXCdfH5kU0lx8hYXlHN

-UoZ1hl93EupirKCDxAmYAW8GFLlNuWrsqnc/IhthOcI0coR6ABgFz5a9EGFfvbtk

-1ujBF+WgREHMYbpYZTcJQ/8OdueIv0oVVZa5j4LJq8s+JePPn375JMZjBeaLkIQo

-nUiJ3t4WrwKq0nfXXn7b1HHd4riUAKTWKGd2pXthSSejL84pCSluOMDsVAzZFfWI

-HmsStC61LlWy4WGLqpw0cDbZSJ3+Y8AtGcV8nXAfBRcuXLhwXHypCEGNy3ZAnC0a

-DAlOdEq4EAh7UwW3LwaTAV2CLe9vBLDgV7zDJ19JNrYu/oCBaFlzViDwjCCF5vML

-V80cNQjt2ouQKOZxUGeLGIPDscPWiDXM1EAQyfvCp7Q1tPp/9yr0RnnqDchdCzXW

-CTSvK+aG0qKgaHMoQZjb7/zxH+k+cGfNHDO0ix+gIwtoXXOmfsOxHErpVHTNuew2

-n8tGN2Ah71sSjGDKPMbubGrI4YQN35gHvBO/CUvFlcx1IsfFXLhw4cJx8aUlJ2rq

-Nx0oY5iQImIXuok9KQwm0xwvNUrRkAKN44QtG3dcc81kslFxtD8ZTx7Yx+Az+Qz9

-PGKN1Vv37D4KKW4j+/bo/EPzIW2bFqPTAbJIN1WGizUkLOqf+uIC46oGKC27/dfP

-rlm/BZ6HkVaU4ETGN4KXgF27EGQZuwiy6GhF+bE7fgIw8xcP30PGR26a5UYg2WXF

-N+ouoRa4UyJ73wXka1PtuFSiGDCQVYeKDmKbHICDTs31TgUHsXPgddx04rr4gsia

-PaUl5Sdhy+2hiRO+LChpjTg94XBIv9LANGUmKpilwYbaVWu20jUK+iv5tKrQ5nIR

-5qzAZV198tS8tZsvli5OTwIfi83pRN9JyFRVR45C0iJRhgRjVVUjsvwFXNwBTBl+

-9J/vwJLYsEOgdb4SZpQr2lxRllFy06UrIRQQQrgRoRpZrT0FC+n7v/0rGT9Y9cmP

-7rmVbMwaP1I3/LuYoWv3Tv85rI1kCEcrpR9J/ko4DrwDiarqcGABXs8pME78rpgz

-hCtB7qPgwoULFy6XKC6mAHDFzhKFpqN53ZITfBRTZ0PKzs49+86cQLysaLci6nyg

-sFeQ6iuBeN6bkQ3PUjOFALaPCwdYYIdmktnE1z9eRx5/cud1ZEyiToPOktx0wDUe

-DCi1NEaMpiXZOxGRO43bIF6Gp+FotKap5Qu4uFfvAz/V+5uA10lIStHOOg1o2ljK

-uQN9Vk4367Qt1bMkyADOGLE8VJpyDu+uXvPp+h17yMbsyyeS8bF7bpk6YlBXO2rR

-Ce44+6QfwZOBN6i1yI0VbGBvJxfCZwrG4lHzSB3XxRdMjpyBjPcFm3bpHEDphT3h

-9bJyMlaeOiminirKTiPj8coapoujUZNt2wQLV0pKkb2puI5btQ9QS18tKztOHuZ/

-up2Md8+c2JkHmJOShDcA0CAtDWpMDTMto7mPmY5W6ZtfzPTi9YeBei0awclJSmWT

-Q13twFXt1HWxZHcWj+4NLoqa0yd378bXsRrI3wReCzjz2AhGUcK4NhZ+BBzHKzdu

-u+UqaL710M1Xk3HikAHOrua1yOgvZvTnao77KLhw4cKFyxcSFy/bAUHkxsYWhot9

-yXV+wDW1e/cgrpEdbgjdvHj/TDJ+85Vlhw43IXyU2Yj9PtQw/K9iTxGT0uFpaz3r

-ch/VPhaE7/zn/GVk/PK0cZ2JhrKRM9PncjI4rMY4M4EEKNaXxBQW/2IGyXvnZsGD

-N5mhDjY5Oi6msTsbrgvRjVM0aPKUgr7Dyca2DasBDVedJFYS2kbosgiHBEXnUxX8

-DXWvzYVs5bcWryLjtPEjv/KlaWTjlukTaYiVCxeOi7lw4cKF4+KLIeEoYMMl2yFQ

-o4TCQgpl/0mivDlCBCMzwfD14y4jjzMGQjrazaP6/aEESQkEjYKSshJE0DkYCake

-Sl6RpHFpMqchZabfuAtK+5bv2H/NuGGddpj5GLtL8TjZntCbKcP1ZAYSIHTxouYX

-n6iGYsUSJB0VJXFkv15kIwu93hdavjwBAmtvb4WSuY83HRCcNDVbc6mz5i0yxST7

-9h0ijwdLTxT37wsr5EbocHHy5JGjO8GiCp3CdPVQsxBuZQBZwJAvTmykGZzIy5cu

-X74WWCx+WZj/1WuuIhu3XXU5GYf06enpMlnJUTShXl+xkYzz1m6VcDamjxh8/+xJ

-ZCMt6bx1Oo9E5Y0H4OIKRcCSGDugOC3J0znHeLKm4QCuNxUPdmDvwl7ZGVwXd54c

-OAk9FveUQesN4NxywYkXHS4VI+ACLgiH03bTqL76v9wypv9THwFTTKC+jl6XrCep

-CDpXjQRFNyg+1Zcm+BtjCl1hHUujTfDi2ys3zkFd3DnazoYXj6TXQDOFYvBU6LcW

-bZ8URQ1HIp18Oig78NPvLn1zKRj7JSWl1D8wfix4AH79yF1knD32whYWp2CKy6sP

-XUvGb3m987fDPkRZvgR2btWnSo3S7OOoGjlcAm6uwwfgRnv55DGF10MGTmMNeCp2

-rV8frgGGM6EZe1xF/JBjA/+GN2nyDbhx6tixPzz1HNl44qW3yDhryrirp4wnGzdN

-nUDGXnlZF+++WPfYs6+DU+XD5cx1hUTe8z9avW4fTM5/fngvaGTf51KaZRVABff4

-v99+Y8lavG/B2pt+xYR//OA+snFZj9wLcWh+ZJ3++/vgNnxlwfL9B49o6EoYMLD/

-0499HU7ERaL04j4KLly4cOE+ik6XdXvhxn7yNFQZASjGtGLItKVkxOh26FfUY9bQ

-GB/guOK8Sf0g3XLlpjoNRaoxuzUcVp00STlZcGEoJoTls7LMImZI07Pwky0nHoRa

-rJ6daAe5nXjioHjMDIQT+CcEWVEaWgOdtm+rkJXpsb+/TMZtW3ew3G0XW2mb1wMH

-9K1HIcXwie9//ZHrr7zQ+5OTAivhzYfnrD0MduuzqyBlbd2hk9W1Tcy2oAhRoraF

-lg6IbqhPVm5MzYH0x/xekBl54713lO0DwFVVDg6N44eOCkE0mPxNzGyivgslQr9N

-boXy6yWLli5Z+QnZ+EMBdDKdPWUc9V1MHDIA3DWpnZHk+/46KCj92TMvH9yH6cYu

-yjBlY30gRfsHn8AH7pkFnoqbJg7/bL+yYD2QQf/46VfA27OvRKARZoyRrl694Rv4

-mcW//wEZz6/T5nhV3feefIlsfIBGGETa6QFi/uKhg4e++utnwE/155+RcUSfHl1T

-g3FczIULFy4cF58nCUXkBRuh67hK+/qCv9jLMCwFuYh1rhs1IC/VZwSNP7sBEMrK

-LfsZumQpYlE6imHwLUIEz4td5mh6E7nrKjEG99ozlW+s2EA2fvqVazvteJOx1iMR

-GjbTZeqvqRd8l2hLvWcXrPzFMwCLGisr2L2exsposQzZtMPTlip490d/+gd986Hr

-Ljg6dtikmZdBo0I6bjlW+f4OiCx9uAvMqYNn6iKBINtDik/oKfY5G5vA8d24G1ZI

-yZ6DkzA2MHwEIMcpY0Z9tBleD9ZBuWaoWkuAC7Sw0AL1I9uIcQZ4+UwZ/OLLx469

-/A6wd04YA6QWt82eegP6kQf0yDvvR13X3PoUtkf432fhpKiBVkbKQY+OIFbWOFxU

-QrDDu46e+Ay4uMkP//vE3A//9OLbMBuNjXTGWUiZXitO+5oN28jjf5ZChObR66ef

-lwM8chpm/sHfP7N29Xo8IqrVRFOhrMNedRyO609vwVS8/NOHbF0yx/MS0cV7yk+v

-2X0ITzmaRU4Po1gL+WkehcsLacX3Th1h+cfJA+DKnDQMAnobduxn80E1lxxV6bVE

-FDTVxc1e9p2KHFvQivrqUohRUHM73efthOPNpOmroqEJKdtv7Sl7XY/pXVhlTK7G

-x7Gn/dNzF6jUk0PvFjD59GrXOo8omk9AEFrra37wxD/xs040kKd02oIZ1zuX/IFS

-uBL0zsajFe/tAKW84cjpo1i6KUS1QKjNUK0nihvWAdmbPQnyQPrlpOb3BJeX2gs6

-2FedKWqthXtMuLZSaKqO3bxDAaqLBUlLd1FgXW1aD7fwTdt2PDMXvuTWWdMeunEW

-2RjYM//zH+Dy7XCT+K9/vrZ56w7DXUFb3Kz40BEjk8Lzcqa2kbm+Oqys9hw7+bNn

-XyUbi5atMVJoYUl+rNEXRErRgTNvLUzgI9dMddg+r1G+vbT8a7/+O9nYuWuP5mKi

-q8sea8JLJxw3Pt68Ez585MSYfj25j4ILFy5cuFyKuJjiv2c+XBNuQTiWhJEQl1fE

-N9RohLZYv24C2IMD8jMt/+7FINhXJoPhuXHPYZV6J0QNVOJTMRJWaZc8mm4caKYZ

-cswEk8T9+6FP5VurgEjzG9dN74Sjdjh0nuI2J8aAi1XpgmXclWGP1x8+/94H2EdO

-sDtZxSNj6dTQpZ7lzYz3CN3/1uoqcFb8GTLACjPTZ3R61lFBGlgYt4zuS/7IxuGq

-hg93QSrxot3gT9hRXlXf1BrbfwIik1wImmH/S07XiBW1iPzgdGTm5HqzC2CZZBcE

-0GsRbYCjU2pOC8FmBMitzMdFD59C0kjo2EHIovtz6ZH3loGB9ehdN4Lf5sZZyR73

-uR5OfYv/qQ8gX+3JNz4kY8OpE4JEgbC2AChHKGXxtru0/HRmB1CuZ1lRpHZBq4qr

-642VEIb91XNvlh4oYVeNMZJM5sSGvyVqOe9OeHvbQZzY0hPjB/b67HbwUWD4uudX

-T+7fvoupMTVmb8HIYpIaQkfjpvoUWC1rdx3kuJgLFy5cuFyiuLjkFCSxLd26l90J

-nW46qtRDFw073eA4vmMSIN+2iCO+NBx6heXnZp0+hZn8Ns3NhBEn8lUisnapPqRt

-a6ln4C6ixQcwYW7easDF982e0glFVvkZqQx6MD+wyOCIarYX6KhEg+Hwed+HTUcA

-m3z7+fkAdvYdFdIyNGNCiUFyvcMI9bAHWoRWDOwISO8gR+lZq0a+9kf+8I/Ff/kF

-2ehXmHOxllP/nLQfzhpFNh6cAgh958maJXsh/W7NQQj+bDtWFaGlInSebaLKgJdM

-j8LmArxpdzh8mXAI0VSck9wezaeB2I85kVsbwLSiAJkibmqHidGyQwAwf/QH+K01

-2/c98d0HYJc6VhyxYjcYZ7+du2TVxu3MBAEz0ccwOG1WQhaMAy8QF63msEGRCztZ

-oo4j25e6Fv8f3l5CNv72JkDvUGM9y12TIwKdDuqDJj8U6ypJGx3ATzSjS7qssuaz

-4eKdR2Am7/rV38h4YO8B1rRQ61Ko9QewMfjPRDPOcBFu2F/67RuvRG1g57r4fMr7

-n4I//sypKoGGszCtGNYUzfQMhYdeBqd8+pDe7XzJwALwXVw9asALZyp1zYYRMNQg

-0aiK1c+iByJ4kFZBw1N0lZMzjYvsk11Qfr310LErhl5wlkJauhoXYVE1V4QUI8/E

-/a9saDq/OzBv68HvvbSYbJw6DUVWQnIau4HJirFVCl7vhvYZKbJQj4WRjfjhQCuL

-9qBGLt134Ft//jfZeO+3P0ryuC7uukrzwg5MH1BI/shGbSuotg1HK5buA9X80S4w

-tI/XNUXxdYG6jOyijHdlORoJY1qCHQk53T6fqwfc7CMtUHGnNtSojbjMaPFeqJVF

-9oi6pPctdGUs+HDx0ZOADN747WNkHFacOCu2BCONf1n4ydvr4EJorKllXEhRJ1P3

-dIZZkzA7805Q7mbyVkRr+ML6w7SnjLcegQTtH780f9UWZNqS8X/Iz1FuAFkjnrU7

-TQ6QiPldlDN1jZ/hpJyornvw//4FWnjPfjrhQlQLD9JrwaH9NDvAqKaLWUIFeJ/W

-76hEV0xRVjr3UXDhwoULl0sFF7cEAU28igEESGakDRo8PoZYKRwQhdnof8hOPnuq

-2deuHPPiSki4UemdXFBiXT+oxUcz29wpgqMxZmNCthB8LNgIBDGvfvxJJ+BiVTcG

-KfqktqWi2WgEmLBEIvppkaVdfz4JIWXo31dCtORnb6224y/kFUNSYD05GZhkKthV

-ZhIyT4XWVo6aq16PiNYx2xu1mgW16Ift0rKV0DDld6/1/d1Dd3SpxZbpA9P+umG9

-yR9gw9ljyLjy4Im3N0MZ2/L9AJbDLQEWjrNJdMIjaD9FQgGbw8HMdnJOMgsFdHap

-DYiOyUj9NmG/1l9GpbOxF2mJ7vjFX8i45C+P98yJFXYer2t5fSPUN/5rFSTtlh89

-zeySlHTmHaKLk6xb1gbBnHdPXUbkd2PmE3yAZgrLsmJJOJu3BX7r0X+DU6Kispbu

-v+AKs/UfNYSyBa1Vis3O9oElgMraWYfdO1XbcE7zTz//wB/+vWMHdmlxaU2BKQYn

-B0DjhPSn4UU15p0g+J1aaXiw/pbmk9UNHBdz4cKFC5dLCxfP3wSooQR9+YLLxSgj

-qJ8o2EKTkJKTk26d0NFOt2P7FFw/Dj68YO1W/CrtdipH2Z2fQoykNKEV+SsYPUVE

-Sx2DX1yyYUfpaSjA61dwAQNQLBghaqVNLINNc8kR+EO9tDLFy+eHMpMm0FW3AHT6

-xS1T5yBC9GA4tKbF//HeY2Tj+TW7ajDLjblQ9bpH6luMRkQPUt/l9GLvsu7LOJMq

-I8B74uV3xg2CDLObLx/bNddeUQZkN943adDtY8EG2lQGCPfVT/fP3wYwuba+Ge0D

-zaGvCjLtLS1p1owbwWk2ZlaRCanBHoxkUVHGegYzFUp4cgDR8feffuWdX30XMTdy

-LFQ2/Pz9DTiHsBZ69O3lwu+uaWptrEPI6dQahEs0TROfutxCEoJrygELPf0k44IK

-IqearBH+US/5z99f//wKiAeq9bh7Ti8LNlLnbMSAi+mqc3qYEUAd4mGdCyVGjNfY

-YYIUSsD2yF+B3mTFJ5sFt0P/EowMa50B6M7Q0L1kZz+qaGW0auz3yeEt3baXPE4a

-VMx18XmQ1mD4r++t0NciWCV0feteBVxV118xckTPjnL0Oe3SLai4l2wBO4iGX5iS

-ReNRRZtLdHlVDOIxRhhio8mxrOQTx0/MRbfJ41+9/sIdfkaSFqIUDIEyLRoOS1PE

-M6vSThaqJJ0HZexEr8TvbpqoawSDpNMY1y2j+33ndTgvG/cgSSZUoyrsfgZ7EqJK

-weYDwh0ls4Clu9C07nCI3tUijQ0/fPIFuDsOgHq2opyuSz7rwXAQPXYyfgdzMJ5d

-sfOtzWDUNzW0sEmgQmv5RE1nUf2YlM4cOLUulmjBNHKUORCc8OH3F69+bhxUjX4T

-yzsv75f/61ugTNHnBcV3x5i+6ci+tPtE1aOvQC++rQeOaLdQ0XgbENFlpDpirD3U

-i0UVFbtpa/t74AzcVp9bva9XIZQCXnXlKNwddfNhCMBuK0FOZz0bQRHZF1K/gTeZ

-KUS/XfODKLpCbGhuUQXjTyWWQDj89b9C9faiNVvwO73MF0FHonNp8jI5C/RHaR2A

-6BCaqjT/Id7bxGhMFyvRdbRGt4sJ91Fw4cKFC8fFn1WWbN23cz8iL0pAQQwimjjJ

-Mn8jbgy2fHniEMe5NKObNQzMlgG9AAXsLTmqJRqrDNZhTE91e7CpMKRK4osBLYuL

-Yp/ou2sAFz9y3ZXZaReqe0WK181QhanfnZZlqaf40FutTPBF9Hz9dBwiNvt5eucu

-+j4wiD78ImS8zVuzg1ZbsSmKKAruMG2qoaZkM2M5EjL5gmziMeQC//7TYJm+9avv

-2aWLAxqisvIRkgc9tQIilo9eNdrYiyBeRvaArLXn7rvqvsshPflPiwHNzd96kFpp

-DCArKrObeDAZAAAgAElEQVQDRM1l4cJ1ktuLodcmXLGBZo3WivUN+Ou7S8nDnTPA

-LknzeR6fMyZ+Byb0yX/qq9BS5IY/QD5cTVULWyEs01yhrS5ETDFU9X7hWn/EMIZn

-o1rb8AnFQFf08kNfGoXcHcNyU5nvogUA7w9eAwD+6rKNMUeZwRVAvlqlDkOK+slh

-KrEAWmNrQMGntnYttp++OP/NZRvRekhmLgiHISdPEvVcPAqQbYiL8wsLGiBFW2ih

-q8se1jpVUvNRPFUNV249HkV6Z3UbuQR1MXVmvbpyk0wziFNwfbi9zNoJM108bgho

-1RnD+pzTlxekwSm/YxLwxewtPcFaLmm+YJpHKZLfxVPOPBUhv+Yvoy5CoaQMXNhr

-9xy89YoxF2gSVJ0MyMgBpBo4gIzcKIpchcZyBK+xz8/Jchb/iQ+ulhe+dg2Yp+Hw

-4k/3oqeStRgh6ji2/06PkJzJ9A7VyLLm4MOdfG/pGjL+Y+SQ79wyu5OX2caDkBrx

-67eX0VRiuxfO+Ldnjurgv0/pC8XQUx6FauaX1+//+VxoTnq6uo7eadhyYqapxDiD

-iKLJKjL4NTGzQn9qsx8+Dp6B99fDXeGBWRPb+ukxvUGBThsEzuh5p04x3y7V8ops

-rRUWLfce1MWav5gulXsnDLD8RCbqr1/eMpWMa/YcOo47xoqtNY8T+U/F5UY/mUYl

-rMQcIIFwRME1YGvDS/G7d6BDx1ML1jLcQ4tTXF6mi/UfYhemTG9sMlbijOiRXofr

-bUMFZqo4guzmJzPKxppG8C4ex9ORnlTIfRRcuHDhwqXb4uKdR6H4Z+mm3YIb7XQ7

-3icJUA1rdi68aLtpLPSdTHF/lvKtG8YOJONfF31SV1uv2deq/uVqJMjCtZQqyO9i

-MQqVZTSHmgDlvb1684XDxRo8VgyIGI1fQx5lIhzdeUK7oz73wDU3YKe4HQcxzmMz

-7DndYVoGRvNVA03MWaFGmdmLNubvX3l32kgw+Yd3SkeG38yFAt8n3l2OpnSInuvZ

-QyHx4+bR/T7DF943efDoXsjP+TJ889pdpRojD6XJFgUbzQiWRJp3HMFoM+TnqDrM

-BNyHjFTrMSjXDi6mhf4DcjM0wEhXiMQWMAJJlUXtDAtFNcLlDkV6e2VBAPay/Ozj

-x06YfBR4mShyWLXRCKHGECTFHAXBcKStNfkC5vj/7zsr8X/dYno2oNccyEpqbAnI

-RlouOCgte5rOEvpelm07NHMOUEL7DoF/qfV0qyCFDOaj0NgMBgftyzeimONiLly4

-cOHSfXHxvz5ai4DJDwkugpbMCKghRsaYn5VOy+0+mwwvgpvwzeMH/2cBlIEJDh3H

-RdhPUK+0D/3FTW5GtiBraaEi3LRXb9+z7TA4jsf0v/AEfarpoetIj/SkJ+/7Etm4

-6U/Qfri+rp65LymasWvkFYywJkkIakQfdMIRKpwpP/HTf71JNhb87kdo81wQAFFZ

-D/j9e/+Y+9bHGCyiVpfHS0/uo7PGfZ4vH1YIbvF5372FjF/9x4Klm9GHLjIYyQ5W

-EN0ShCtchb3J2BBsZvnsNPlak9IzgOb8obCXMvK0a5dgtwEKBrUotGrofi0aFxC8

-5Mda1mZ/MKMDraDtGHYbkJ/5MQteqCzDEiGqKssiJvypLAtN9xfDGIrK4UhUiKPr

-WrG79KevgvWAWcVCVp9+d9wGoYKVO8FrX7djH8tbp7E4vZpUVY05/pHWluMHwYXd

-/zJQAjurK7QO7sxNHw2AIXsQO8cTZMx18TnLMSwimI/9DbF5j4GYDYhx0QzBgPVV

-Q/vEUxWfq9w5edi8T4BvpaG+jq1a1jUgxMK4NKMZiEhwPYVFZj3hGq06debD9dsv

-mC42x+7OpoWli9dUZupAiEc9Ohua0v/6tUWayawYTWaWUeDyCC56NkOMLofVRquL

-sYPOy0vhS752zbTzvpNHz1Tf9Vsgndm0c7/gxaIhWrWsqEV5YImP7H0eem1kYcjr

-mftmzz4DecRHj53Cc6N3YwnReo28IlgwDaePM75jGnEi6wr9DM0BmJnGQKh9XZyd

-mkT1pRBOuEK02medRA1XSLMflFRds79Xdkfrg/uAM4QlaWixYsX0VNKphGO5PU2t

-wSbU+zoJVMlpyAh+9IUF1U3wemoxqNGfPHDtqp3gZzh1GHxcP5wzZsZAcCk0+OEz

-v1+4cd/hcnZXM6SLqKGITYYP9BsCSS87N2xlrjDKYUR2DDX9MfRRdB3hPgouXLhw

-4bj4XOSV5RsQb6Jl4dbob2hpTThITTkvmmZ3TRnuPJe04oQyZWCvy5Fvc+HaSkaO

-rGqmnQ1NHmp8EWBO6W8YdlZ1pr4XP4JMpq9gQuhlRXmdMUei/mDCQSF03SjqRXNi

-/Bh7vK7Yunv9Dsp2qBWeGX0UdoeAPNGCPcDmUNVoZfDk/vaVeWScNmLQeSQ4Pomk

-M7f/7zPbtiEPpM+nnU2cykh0GNIHZ6actzaGfXPSf3f7DLJxz9/egl8AfxfLCm88

-A2t7/HAIOwsD+5VsqWbTgp4MauOLuOzPaucosrZWaWVaYmZiQ6datPcl9ew5vxYp

-zk2LfYlqNtoEQ2Kl/msUQ6uqYuCrqm5qefhZ6JdYcrLBnglXynAsMvxgW2l2EHxH

-G38K7p1B+aYKzMl982568l2ysbukTEOViI6d9j17AU1HvWAc5/TpU7UfjWk2FYzk

-trwSsozDUfnz6wqOi7lw4cKF4+LOlZqmlnmUsocmrygOxmcSxHwyOSy0gnNt8mAg

-lPjSqAGf/xfdDts9V0DRx5INW6OUm0IHF2GKiGn+nJPVwlOvMSBQxgtz/BjE7t5a

-BbGgX95708WYNhaxqW5sRZCHLbE7BQVQlpnK+iaaObQDKZxaGxuZI5guPN2HaDeT

-ioS18hlZC8ggkCk7BOlcT7y18NnvQ8OLz0myEcA9fOyfc8m4bftu1pwCKi+oDaTQ

-s5mXCrvktJ3PSbtxDCRNzh4N46K12yjjBDECVD+sqMG5YBxEIkklEno5HVpPFoz1

-Sbgn0tlQVGEWpMcleT0tTbIJnBr7QItaXxhFoTZfAIPSrcFQx48lzes2Al59A0rh

-8ASpomRGx7DR0NxKOW+pqfZfb69edwhsAjEzJzkDwG/JPmhT8vUxPf/nXoj9OhLN

-f3FW6l/vnkk2bvrjm81YviHYNNSNHPl2jCXayKIyXqFyREBmlf3lEN+ra27NS0/h

-uvgcZOnWfbvxUmTuAkHjyaX++DCxakEpNzdARvDPn38rBfs2up12Wkrkw0Tj7NQU

-umDoUgyGotUNrAm5wFifsFd8MIJjuBr7TjrkSJRGtFkHFymWHisg9xXlhA21MJ+J

-rLVeR//Jax9D4sf9V0/t1QkcNzEj0aCnRJF6Jy5olvGhk1DjtLW0fNshULuH0ZW0

-+2h5LZb8tbRqvFk0Jkb3Tu+FQ709nmT2NBxi3V3DtKpKSzdGI/21RSu/PB3cPjM/

-X6PSF5ZCs9S5S9cxnwldV/o1L7PWRE7p/Ic9yW2ejF+9HO70y7ftD2FYH9Yfsrtt

-rQKFeLpZpX0oAHYY1OX/b+86oOuozvTMvF701HuxLRdZ7r0LXOWGjQHTIQkYsgkJ

-IQRIIWwIISFLSM4e2MUkwdkFUhZMNyR2jOMI22Bcwb3INkK2rGqVV6TXZmbv/987

-8+aBLEuyZIn4foczHomnNzN37tz5/vb9qR4IyqVeSI+bTniT2RKXbA5zMmJwCplj

-SyRefTMm3ja0+Dt/LU6bzYw5J9Fgq3EWqqoiqsZ0DdEYZw6GQrRM7+UP9pPtmm1H

-hGQoH5fM5nArHP3BhdAs+EeLJ3ec7Dy3eCD4JEvG/O7t92O/Ja9wDNYd3LefeRGp

-rDl9QuHhh6utxCnqDbT1k7WY+yg4ODg4OC/uBKgAxZr1WwTaQNOs9U8zxlhE1upt

-xz4IDe3Y9TEL/ihyzGTS/1b/mXyzLMdb9GKM/4Ioqo0xXyoMaNJaVNAfkV1b3MkR

-fJOzPFBC6OQg4yCYv3XiOKRGvvb+zgeuX9T7o9U+843SUqgePVJbCBjWtiOQbPTa

-9n3//Bj6ZpafrmHMS9QakdGRt7u0EYuTcGTGIyaJi1a7Jwsq63xKVGFd2igdbtXa

-tcHVBc7VP/o/a8nO+KHQCC4lwdWNkz9Z3fDrV/7GOLiA7eIZQ7fERKvRR6Gqci/d

-qllFkLuWm5506lM/m5woHlRTB+a2j5jw1IaIaLMRh3RwTrrQifAaVY+yWixxEwMm

-vKF1CPlOJrok0dlBcx+7lACZ6LRnJoM/pKqqVasnZAOosiRxEzuioR+uWVRf2QYd

-SZ4v24fPCrM1lXDbg6VTKSMWOl0B+M35k17cDJ1/gz4/O1YUTkVBMS+JzC6msWky

-ektUdFL5u+KQ4byYg4ODg/PivsaG3UB1tx84xt7htM7C5hDMSIjsen2RgdJazAZe

-bOAFX2SNotAOL9abBZi1NmWUIFu1blpUBAOZVGJKijkReEHNXuxaZtek5QkBYSJS

-QJN/99bG66+EUoWCHvEat5u/r7uDVcHIQYjR4G8DguDDbmaJF9diOYjlUm/uOLR2

-OxSP/WM/JA9Bo3VKPRJSTKaY0aDEEp3EOHIkxDz0+kiqUTkjExLIcjPSDpdtYLaF

-gJltES1LH2/xB7uBTL38DwiK3rNiXjeu4i9luyoqsdSC1nGJJjavyA6trqT8MRpu

-awv20sSmamcTBuWcqjjDLlaBk7EhmTXDJYv64EBUCn8/qXOlQxkeeDocVnOs8aCA

-MvayQd9VNy5NkiDHtOS71AYmyenIToZywarTVUyplU77SFiloVeTFqc1fG0wGPnF

-KyC5GRJwNiZ4hABQ2lULJj68dGpXz2FwRvKkQhDG27YHMyZNursfW0BAwxFrbCQF

-SRemIDhUWT1hSAFfiy+AED72/4sxlpA/wKSKWbWbc+wICEOfaoPP+OrMgiMRJxvW

-X0bDAo2HhMOCalinOr7BWvURm1J2m4RKiaLFKrOonebiYAY4/OhtbJw7B8QDDzbC

-s33mxHHBilZPUGHiL/ht5UfLV78NcjO/vOv6rk61Dpdkw5qrGsxAVlbLfmxFLUHa

-2CYvNbF7B9t2tALO/+1tZPv3Y2dl2o7eBAtKSnFeQhJ8rTMx1YNSsw0NkBtbdbYq

-2NpqOEMl1onSeJ5sNNRTR8HRMW7K1Nwx0+HP90DYU3DKrDsn9X6AfwS+c/WboOd7

-1YzxXXq9NeMgbNh5QIjQNBj9vWtlN4u2qafHUiKVNXAhreiQcdosPTi9HVb4tjEF

-ma/prydcNxMSYNa1ylpnIDrrVDUjFS5zwehOdbalis+gE60aXFO6mJSe+StpSQ54

-C2QMR0flLrhlktx2OqN2kxOWtARegXY2UmLkiWzpgkh9EZIpRLucOPH/hsLzJg6H

-2bWyhLaP6RLcdut0fEVt23mA3URZia3F5MQslphnzMhaBGHH0VO3z53KfRQcHBwc

-HP2eF+9APe9Ne7ELt9nMpCcE2I4eP3LZHPDuP/32DvydS3MswDbB7cnNAZslOz2J

-arywN+KFeDHNUgsG4WPVtU01dZD14vf5Y+0gBdQHYFVh8GM44Dt1HKz1UVNAIfNs

-TYOitFHzljEsZhBF/rAO5LFvnAP5WOMv1izSaaYSYyK6lrz+e2afKjJyQKrG0j08

-8+7WJ9YBI64N0IljTxsMRYl3zofco7zhBafr4KpPnawu/wxy2urrQF4g2BpkijCK

-1vqBZZsKzPlAwZwPgoz5rQf37FmwGEQnEsNAhw/v2S048ANUch46sQP/OnQISPSa

-v5b97I5rO38h5WeB535K2C7lX5LmB9B70BlUZsgpHfoUJuE5L1jQzvSe7+LuAZeR

-xlLR8qtrBN0Vn98fp+cQFJZPG0X+zUlJ6MzXpieCj8JNiLyRF2uJcUyWCPwGGi9G

-ShtCo6G22df587eZTdRHYVDq0Z41WY15/GzOuB40ZoumEQHjPKww9znUkErrbpeN

-nBRPbKzIISTDTSQcWYr5zVDVnk48+Mz+U2f4WnxhvLoVijtamrCvLbEy0EubUwgN

-O+YtnPmffwGTP+CnbVRMRuMjFIk0Ye53VIlarEa3cMcJtkw4iy68Xm8ggA5WSEJg

-Mlef8wzQOyoexyaMdT5Y6Rz5AwKn/NRfptm5rAdww2m466vfghX5+QdXXczIiPrV

-Gv3CivaS0B85LXWiGePL1Y2wtI0f3FkV4CY/uAIe+AMUp/7vpl2s0zZ24hhXmP3E

-7fDwLB4IJbDkc00J+DDn5QeC4POt9cFTfbrJfxj7V350Ct5q5bVNtTUoCS1pbZJV

-MTaSMlupQ/6WbVtADOjBq2aAbzfcdvjQQf25hUoQQzeT37658eZ54NAoLuiUfM/R

-M7AW15HlhibD0PWOWNBmLY3X2FRbVetr4fOfYK1Kfi+sxYlOB3sfkAUDm9Q04rrv

-a2zQpHbgfDwZyd9eNK0LBi/+rXqBAEl7bjrsxNSlS7CZte6ixpdHIHLlfEgA9+Pi

-u2fzR6w3B3vvsiRfF6ZLP33bgqGZFzW2g7PAgWNDebkQlH2pBgYgs+pnFskQjcUp

-51p8nemCyn0UHBwcHNxH0aeorG9av2Nf7P1FmAvmqJrTQTTvjff2ByhfpuVSIVmL

-yMPrLRyO1GJBXa3Wuauz0r5iHLXQIhtCrFTU6AqQtQAUfqy5HqifMzFFSEhHozIg

-hNpif6VldPzfhjKy/crCK0o6F4RpF1E9S8TYnlLnxYRmisa8EZUmM3RJG6jRF7ju

-cZCRLNuFPiK3ix5rdBYQmVfuLh2WpYvCCE5owY4GSAITchwd/21hDNQcPHvu9T1Q

-2/qn7RDvrqyqZ2RAjO/GJknNdaDb8swm0CydeMX0w6eqqZ8HPxZhglDomak/e/a/

-3oKI/LPf+Wpn2E0NGuByOMKIMCvCtrDYnT5hFO0WYxTojxuhPG/ZtJ7XunXZrSJG

-lsg0sjsgLu3G2F1zzVl2MWjp3zl/8tiCzK5+OQQbO4hai8a9WBp+V+PKSbQIkFyF

-aMhlslplWYxNfJNJUI0qRcwkun8xmD6Lxgy+yGHMSgQ/STKy7Bq/T+swonXD0zOg

-BBpyjzlqgqFQI1YbXrCUkfNiDg4ODs6L+w6vb91zkuZdsmo3K+2KVoO9XcMtTfQd

-noweouK8DBXfK4oo9IrzB8mFFTn46XNNFai9EEvPUkT9oEGf14yV9dG2FtYHT9Gd

-oVg2VgtBrV/+6a2pv/ie8IW+Bp1ETaOX0uO4nLYYERbZW1bjKa0+8KqfbWzuJCMm

-2xsfX122bS8yYjc7BDZHuHMWqC8Ny+paljRNVJpQkE7+Izt3l0AY6vfv739uM4gZ

-NqMjO9YgWQu21FWAekt1QfaCa6HPfNnadQJ0s47GmRpydB2qL31zOXxm9MALtC8L

-6dIiZuqq1vzFVKJB0eI8oubIRoK8EdsCfHCofObIoT07s9rCUTp1BZtDxXNoPNfI

-7mUUDl0wEPz73100vTuPt+lS6EClIpEXHHbWiIS6ZV3u7UegD55Ky2XJgItSbI5G

-lMWzwHaizaQvHtkpsDhkYR/3mjNntc6KtIlMhLUhN2vyT4Ko8+ImX6C8Ch7J1OED

-+Vr8hYUGu928+N4H7NZa9XbcMFPDXgz+REP0gfy3K2GO/nzl7Cjakr0q0EslXbYc

-P73811CD29IUYpayEvP+K2T9xZ6kYlKGSuP+NO0clFOouCrMyPX/2PISln7c1a0u

-FXIsumKwKsmWPnuKFCsNF2huu4qumwvnUQQj0Zuf+D3Z2VS2Q8A6WhbFioTo6ac6

-eiDHdmAaRL2fuG7WdZNgabvnJQjD7jxwkq2P5EislSSc9r5dB+bMg7FyDyyEh+dU

-mPkoqAvILFSdrCD//vcbkG68+rt3dFwfbKKCO5KFRcxY2EwzEK12lq7TatJcFnDZ

-LbXgJFn9xsbJRYXdfoO2iwby5mMFF5bEVIiL1lejQyYSdTqwD8gdSwRo9NmdrPA0

-j14gHq8prIrteeX0X4ldXIvBurdZrSHa+ggDZZLFbsaYXqhVq0s2hCJTs9Ke+epi

-oec6ZmVg3kgG7WaixEvGyVH93uPpmY1vBW8gWFkPL79pfb0Wcx8FBwcHB/dRtIc3

-PoSIzf7jFZoiD77NrE6tthLZUCRixmy1KYWQyUSokEm6ROL8JUPzbkXzavW6LYxG

-GHunR8KqGRVJEpLkAAbxqKciorE5WhEkRh/9PfTTLJ0EX9XVwmgWXRHjs4gIKWYK

-rbpwEi3ZYvGocPTCvPhXazds3PwhGiImTcNXSwxCHcvtB4+R7e1zp/TIYE7EZvV/

-f2Al2X7rpY1/2bwHL0Qw5iSpwdbtH0Csr3DEeHBo1NaqUdpnNsyG3Q5/8NI70MX9

-7qvmTRo2oIMj5qBAosntkimt1keS+j2IEWZHbmVBt0lIq+DCcX5lw+bZKNR599I5

-F3/t1JI7cKaO5qFnFQ2y2SDEFAkyCc1Hb4SjXDWu+110U9xOzdmixk0YvTBdm0na

-x9DPFo506SiJ6Ce0Wy0hWi+Oc08ymenlhBStXx8rBYVD/OLG+UMyezJBkPoP3dSS

-w3pDzayh1YaqfmKQ/0p3kD7LkSitR+1zcF7MwcHBwXnxFxAIht/EEg81GBQctPsZ

-5qM4XIxgUjYUiWSiB23uiEvt5RFF8Z55QNBeKAMS1+rThLcVxo5VLB4TrHZzCrRl

-i1KvMeHFSqxjOcHZkyCN//3n/kS2Lz58j83SrXshSrEXvskKvjD4UdYKjTRbAU/N

-1xbu4Ju2HYbzeeLFN1khBiEyMu1wocmsoEDPH99cT7YLJxRfPWtSTw1pkhNu8f/c

-tYRm3b1ctlc7BzqkQpsXmoPggAm27PxgGAt8aOdv2iyZsLkWYLK//PPbax+9Vzi/

-quTIPGinlpGaVH02FDMxYg5GWXBjrp4fwxJBveQS7p3s9z7yXy8I0L0QrLGSMcMv

-5qorGyCUuv7jEwlJcMSrFk3ftBUsQgE7Pf9wZcn3l1ysToIhi1GPK8A9tTudaKFF

-I/r8MdQGRZWuqau6UKbDQvgmHUx0pktWW5h2w9G1R9DAWnElPDt3zh7fG8/m6AFw

-c9+wWw2iYHBoypNVmsVIHhMmL8MiwGcamvha3A427zu2df9RXMu0slQmfSuyFh6s

-+050ZC54ABKZVXJJQQ9970J4VJ58ZRMkAOiuADIJ0BWghttEB0R1xST4sBrysfZC

-YS01GK2qV9+B3NgJQwd9/5Zl3XgtGHXOyCwrGgHNpQL19Wcaa2PuHZF5UcTzLE8R

-TMP8zetQEBhq8TLpMnI5khoz9DQfi/8cBJ2//vjTwiPfITtXl0zuqVG1mU3P3wnx

-nDON3m17cQ7QMyFvLzzxsB/eataERG1IUXWInDwdWJws7+385KMjsGbPHNm+aT8I

-TePctNTqsw0xy1AbIphdeNcEN1rQ5D1K0wCibXTJrjsNuQG3PPIUeEUee2DO+O73

-Fvntpl1kW1vrLb0GKhjzHGIFvg6/tQzq6x67ekZPkYfYZcJ8gL1pMyGPpfboqSO1

-mKpEFinF8E4Su2YuZyW5cUW2NtDD4FcNLRpWWVEBrzPqGVOExFR45Txx0wK4saZe

-sciLUNzZbLVE2+gblJVE21CGKYoviajZyp4Lul5Hlcq6Jlyx1R5S7OI+Cg4ODg7u

-o7h40Dyt17bsDlGr325nKZ82TXlEN3aQDV2HUil9iPsXAy9+9+PyQ8cqcCy1IAkK

-4CqhoIjRRSkJPBUyYVgRgzwF4ZisVg5++eNnX0jHBMmvLSwROq+oCbwY7yAV3bDY

-XR7YifhMzLFDc9rAnlA64DtHTgOJ3rgD9QbB3qQRDxNT+Yhqsj4GRZW6zypufPBn

-ZOehO28i23tWLslO7XIohljQUvyVutHaXbNqaQmmfNY3NDJih9xKwY5qss1hTQFT

-NORrYaw5GHNo+Ooan10HQbxpxYUmqZ3rparB88cO3U3vmq5PpGq99TAFSkyCoCJk

-JVJPCLXJlDDNhDtzAlSbb/3Rk7958Otk58Z5MwRNAqIzWPshDPXqTZCzbM7M9OSD

-n23N+r3fWQh1fU/fMrfnHGq64IaZ8V8s7SsvB5GNQGOA/iiERabaLBolTDt/EE31

-29C9MMGTZBYNslCy8t2lMErFOWm990gOyYKkQIfF4muLqyB0ucC2pvWNDc0NrAyP

-5eZHqpshibY1HHHZrJwXc3BwcHBe3D+wD8Xr1u86wISfzTZbImR6JQ7MJ9tztfWy

-sVWaKg5F31AfIhMT6X+0fOZtz1TF3v/Ai5mOtYKS5xa8CtmTKdBcJfo2DgY0RiYh

-S45886k1AvRRBnfkilmTslGfe3BmKlUc/wIh1kIudDRo2xGXe+9uUHuAIggnhj1D

-lBdLlO+IpvZv93bUJm1FVTb4KiaBr7c1oTQ5qrdGphMnhEU3P3/6ebJdt3nrrctK

-yc6i6ZOy04AgJ7mAcEE8R6Dy5PAlraFIE+YPfVIJtPfFj46WjoLSiW9cGSdfUZSV

-/Mg1YB/c97u38Uw0YTw8AaU1MAzbCJwTgavWlIcY/aFmh0V8ewvEfg/etHTsoPPW

-4F07efhv34MOac2NVDdOz4KSqVtcdIE1pqbkCjQSS686qPVRRnZcXVmx6pEnyc6W

-vVCO8a2VS0cOyuvArGkLwTe/8M89j74FWYMBbGmRnJ6xeye0K752cNKvVs7s6Ukq

-aolclBc7aCVLFUoGwjxhOrRk0pp1o0ftYnooDTubyWzBu5w3CJQUvd6mlqZGasKS

-TeGA7FW9E6+Ls6uwy4+JmImSFLMGTFbam1GiFS7EZKTlYyyf0dSEzuXWYLhveXG/

-WItpr/hn1pWBWVrbBA1XcN7kDimGW1sEuiFbq6q13ADYmtwW2nW8z3Hz9JEvboPz

-fO8jbABulnQFSxUTD6y4XTRnygcfwr0/dxpnCZkN1PgVWOZjCJVTaM7ymvf3WfEh

-+eH1C368ouSLB21p1RI5qXfC6mQzT9SWd5pZbNElUWC2ecPt92vYW4GFXnYHs1JV

-K61hE0gAABBFSURBVPN7WPA3esdVpnWL5dewQsm6ab//4337j8Jr4HFPYlEhLK9D

-B4FAs8fjVvFMWrGct8bbdqQOkgfqWuGvokElEwulqHvKmPlw15Ugi/wqSghB4xyb

-pPtY5La2bCcmA2SDp6KGTAz6ugqz8FprBFaEh/+yYd2P7sCvbcf4m1yYc8sscAis

-fmcbW+7ZWqyyZRdDdq6MnNYo7Q0hsxMIogONrchCmxcu57cvvAxn+/eypVdA2G1s

-0ZAhmGiR5Ia3dXNr8GgV+AQ2HQBt1feO1woumOESpuVKcuTr48Af8oPSCZLU03Yq

-lGJSL5ad3WL6flU1JSB6T8GjZdFdMXIXzWV62hJ57+KoTBsB90W02w9vDegM4KGr

-ZuR3t6FM5+FxwGXmpiU2ozQYVFfC02FrDdGUG9yS86RvIKZ4bmsMwh0PhCN9S+64

-j4KDg4OD+ygMNvLbNHZESLETU8HcyXVoO5xBWRbgLdTOigJrS0lNTHY7+8PJS6L4

-85Wzyc6uo3AVzV4vI6eKIpiAoAUwE+tMXaOaiFELFOgTwi4qtaM1fJN0UQL4n4op

-HAQiVtUcaPeg52ivOWIi2HAQqEo3+QZdS55xTNrUXbFh1lF2SlK73+YwKgpKWsSD

-/IhfLuHtsGYUBCvLqcWHFMMv0OxR6rgwM+PO7/Pv2Q9kds/hE5SSCFbaIhaZCNmn

-VB23dy2e8otrZgrt5QI7ker++zUgHHN1eWUw2KabEMQk3vTxiZgF6kli2hEmnfHB

-t/1tT/nL20Ht89aZo9u96vsXA4ddvx/SyD6trNGkMFiIUgkDhyK/GzAOkvYaT8Ag

-eE8dZmGfNsqOw1pfFbwpDedeev2vdDTsyeCYcqGF51fEEM3UduH4J6bSC/FY4c9+

-WjrmHnTRSFIvJFRJWhSXWk5gm4uxuwZpi9TjxwQtRxSDP3DK0PwuHYTqtLiJnYqm

-VcAKTqqgt4VGXEvGQZ7lHWjo9DaoMkZxXtahU7SxLOXFVkY6da+gnuuJd/FsAM6z

-NRzt45WEv444ODg4OC8GrN4AoYzmAL6rE5KoN020ufxedPpQvyqhEvS9hbxs3OA8

-qszUH0A1Me5fPotsH/3jBlYiofE4Ff2te498xtya2FsanLCUIep9ean3Cv2qVrfz

-e0tBf+4HS6edh+7gjQNRMYdOMw1pZ0yAnDLHBZOH3FsKNXKlIwe2+21Ti7D5HnOu

-mWNZUOhbVDFhPjs3p3gKlJm9v3k78MLGOqUNHceU3UcjWsm/RjqoS45sKXOn/krg

-/vBt9y+D9KYnb5zTcc7/fDzh5ZNHrMUSR5ZjJwqsuEbU+ATTCNdyCnEMB+ZldBxR

-oHoIj6wA6n3X8+vUsBaUU2NSGC31dVRUYeQsuLkt+RmHd+KZONG4CQWEcMhwE/XU

-MWtQhFMK0jpHYrW4qPmCMzYYzEPF0aduAIm+myYP68WpSSYVnRt0npgsxquDfYy2

-eRIT754NvPXeBdCzcUBqQpcOwpL5RMmTDsQ/NwuSOF9/97CEdVjfXgCGhc18KeRi

-7BhFLMxOY9YbnXVQjyrEXTXjoPjhQdmrsBSwoPfd2f19LX5v34k3dx+HPTcGNBJS

-TGjpRCJRppkZYb0epmHM/SZcEa6ZMDTRYRP6E74xbwLZvrrj8MHySpwH8YKtZq3j

-oe6UiMtqYK3gBxbAPH7qlvkrJxV1dDA9IGMxRCFASZnWyEWHYfO3+xbCY3Dr9BGJ

-jo4CxCXDQUwnF3Vyq87Wa5JMrDGlipmn1adPW1UIMaUVjSHbhtrq1nOQlazStRgU

-NeXY829YldjSjLPfbDHdvwTeLj+/7gqhE8VX1Gy/a+6Ev+4FQaJAWJMeFox6N1p0

-ka0y4nWzIfH88ZVXFGenXvCu3VECl7P7s9rn3v2QvUsMzfQEUak7A5ktrZgSk5KS

-ZM6Hcr5oK7KEYBvLslC1h1y/dvp6MGn5tvT3eIunFA949vZ5ZGfSgMxen5QmLU5F

-V2SQQNK8WPjCXjIZ1KgfWjp1dlFetw9iQx+Fx+XMCMN9mWiHMVlTU7sAVY2WjB18

-iZ9EUAplKUA25spjUlO0tFK222BMVs2F1899pZOGZiT1C28nNw04ODg4LmsfRQtq

-oPzsra2tPmBezgKwlBNSUmurUUshHDbb4fTmjQLWdtu04sWjwWJNddn751BmYNzg

-kRUlNz39WoyVCIYOEUzOW2NzNFgXYV2iV2C/jCeuB7v1woRO58VmQ/ZxKCJa4Fh3

-Lpj0g6VQE9jJF34e9jP/LjLWh17YqImsawwRzzsYDB07DnzfRMdfNAkePMkIFQKN

-GgiXQdBfZHxftMIJP37D7IcWTRHOL9zTLmYXD7hiNDCs9TuOoX9A86IwRURVwGZ6

-7gSwrB+7tuQbc4DvOK2dmtv0m566YXaDH9jcq2Ufaw4QTfgcf/Q3QRqyv8Un2qhS

-FaZdWl1aUVmsIjFm6OhelEiUVnx9sxRs4YevmpqLodRLAZMljqGTscJ4eFoKjNUD

-iybeOxdOiYr7dP8gOJNdNmvykByyU4vmjl1U7ygZffFf3g1AnxG7M3bVolY7ilnG

-IwZlP7YCPE4rJw3lazHDH94HVapt+z/LHAMPz/CRkKX7wc49Odi/ct6oYV+bDr+Z

-WgimnMtqEb4MuGFq8fsYoH/ubzs0OSit2aJgaP5NVjpcpHIyU6kz4dsLwMXh7KRa

-G/tmM/ty9HUWD8z42XI49MqJ3Zlk95eCQ6PWF/z1uzvYSheX7ipTd60c0lI4xFhn

-KfikSGPTegqzSk+M1nY/dQtY5V+d0R0lHYtJouXm7x2FlktRIb5IV1avHAvX+yiK

-6cwZnt+NQ5D14g93LAIvhMv+u7/vwtOn1yXG94qRtY5B2kIuGV+3Wk2Kqrk40GE8

-dlj+T1dAusiK8ZfaWlcFLb+Ynmc4fMUYKMR4aiUsRlMGZfbQUdiKPGYsrMUnA3Dt

-w3LSS0cP6pNnMCfF48bGYH7q3pQVO07dryyEqMnDSycPQPLR38B9FBwcHByXKy8+

-3Qgpt/+xAfpOFk6d+pWbQQylphI0DK9wjlgxHnwRE/LTv4wDSgjST5YDQTt5zreR

-ViRTdgman3LMspZMK0vAKfFjFEgc18WLFTEg5szOtWLOxjXDgeA8tmxyfnJCt8+c

-1qf98rqSvGRgsj956wNvsz+OA4qxtu1x+rCUG+n0kdqDGCeZUlTwn7cCI54xOOdi

-RnXWEKhmnjkM4kvvH6ig8ph2VD3+3pLJDy2E6D8VQe42EuwwpM/eNn8oJjk88S70

-M21s8NIkcUG3V5iEULypI2jepyjrM+tJBl52N9L5++ZPyE9x98lstDmdg8YCGZQx

-IfqGYckPL4axSnb2ZNxbRSPAmZQ0NR0izxsOQm7v8slFqS5H3/DiZHdWBuTyn0YT

-LsMsP7YEXDFfRTtb6lNhTM6LOTg4ODgvjkdjIPSNP5eRndQcoDlPfm3O/Axs85UF

-5C7RkvtlH9MsTHz+06olP0mHVNx3Pj5Ftk2haAJ2gB6LFPg7c8fSUGRX39Iq0upB

-RZDx9pPFGTPQSTsz1S70UOGWWZLumw/u+9JRA36zESoetxwDHZnPGn1hb4ARZEEQ

-TJ+nRowSmk156AG/fQZwkIcWTe4RCubAQNxNs+DEDgTMwz1w+McWw4/zi/N78N6Z

-JPGBUmCOC0eBr/PJ9bs2H4ZyyrNoyQmhKO0AIOhDrTAFV9haLQMygVPPLs6/D73/

-4/vOtlPwxIaNLl5UBOoQxeg5HeXplSRfGZPZC4cOGFkAt/5AJST8zSvos2tPdifc

-fC1YY/l5YCbOEtTiFEf/Xzf6YC3+9Jy3dBQsQ9dhiCnPo+VFWMzCvxDSE+zP3Qq9

-I+/Dhkxnmv3pbrjSMblpQpcVYg3PGPoIrhwEk35WTi+mWBdnJa/5CkzoWi+k1u6s

-qNvzGYirVTTAk3astjmKCxBNHXBYTMMwZ2NcQXrpCMh7GZ6V3OOntGIiZFOMHDNk

-PE4Zd29WD4zKgVX1j6sWHqmBDIqyY2B3H6pqKK+Hy6dJF+QVlOmBeP3QdIgFjcxN

-mzcccoEGp/d9aIj6TsanuqY7YMIkOHpxsEz4fpowMEPFJ3heEZCqSel9pnnmtpuX

-5YNTaFKyXdBLgvo9uI+Cg4OD47LkxePz0yYWpF8+Qzw8K0nf9ogRDdQj59LVf1Pq

-t2zMQPKf/kt/KKK1tVTRPSK5rL0+l7Ksse0lQzES/GKN5ofQFRNmvU5EWnJmNfU7

-TkPnSSkx0g2JlL0EmkF8dX4iHRRzLkxOc9/R0WS7eZLV9CVixJwXc3BwcFzGvLjf

-5pR8mdDXY+i2WS7PgacaN5dG6ebLNU8sotB/5oQoffkWGc6LOTg4OPhazMHBwcHB

-12IODg4OvhZzcHBwcPC1mIODg4OvxRwcHBwcfC3m4ODg6C+4UH6xqjejgHw9ReGp

-wRwcHBxdhPq5f7u+FkejEdoDKByM4NYquPlyzMHBwdGlpVgVaHPa83+G+yg4ODg4

-+h4d8GJQQ2xpbmlqhBW9sb6GbOsFh5CWwUeNg4ODo1PAnrwqKmkpHfooOC/m4ODg

-6M+8GPt6nS4/cSwTiPDho0fJNiE3URg5l48aBwcHxxfh8XhUNZ77RkKC1mYlEmU7

-7bqNz78WN1WTzcmd/3Qo8F0Vn0KjoGiK4yXVqx9AkKOs97jK7wIHB8dliLi1z+v1

-WixxcnUmXz3ZSjKsvqE2sl5iLoTazsLLfRQcHBwcfY/z8+LmWrJpPPrJETMs8/5m

-6PpVsavqby/8Hv6vv4nybz6CHBwcHDo+x4sT7NCHxuWCXiehsKwoyvn+kPNiDg4O

-jv7Mi9EPEvFk+BobyE401Ea2cltAkNA/gm2+hAjnxRwcHBwxRIyrYnJe0dxl5N/C

-ggSyPd2syhFYcsWuxe4ofI2RgcXkX0+wEdbiYFuY+p7N+IeRMIvdMYiXoNEhBwcH

-R9+DLagiC9/RhTEaIbwVdjIGAWUdPm3JknlkZ5wDPhwURb8NXBFSe/4I7qPg4ODg

-6HucnxeLuEw310o1J8m/9oxMsnUPHN4iOQR4EcD/VVVZZOlyIm5EnR9zcHBw/AuC

-LXiiINFFT6JLJfUIKC0N6mcH9TUw1S6oCqyxPvy/BXahzQ47NoHzYg4ODo4vGS+2

-QRKGYHeFWsBTXBsOk61JEs20jCQSFqjsEHo+tK1JY8ScGHNwcPxLwRhwI3RYNMHi

-KZlM1B+gREF3IhIKKTaH/ulAc9Nbr70GPzncZFs6fUChdF5ebFiLjaV7NqfgToQd

-i1WRwScdbvWzA6jx+XEy/qgwhi7yRZiDg+MyWJkFKaz5KETdeaEqimDIIG71ecsP

-fUJ23lm7FpfV2zLGZ5OdTO6j4ODg4OjvPgpfxEB4Jbsg4zIdllU5iK8BqR36/AUS

-z3UpODg4LhdqTF0Fcd4AVY/uwTYUCcjw47FD+8h2w18znI4lZOfWwalkm2KROC/m

-4ODg6K+8eFvZPwW9aMRkZuu6KLXvAlbP+57g4ODguOwI8ucXR7p+okOZcF4sjrPZ

-He4EJ9lxS2JHa/G40SP5oHJwcHD0CbiPgoODg4OvxRwcHBwcfC3m4ODg6A/4f6/q

-U4DSmMraAAAAAElFTkSuQmCC" xlink:actuate="onLoad" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.wmf
deleted file mode 100644
index e3e4c11..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/document2.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.emf
deleted file mode 100644
index 8e24c5d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.svg
deleted file mode 100644
index 2d65bd3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejb-jar.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="240" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="360" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,239,239)" stroke="rgb(255,239,239)">

-      <path d="M25 36 L30 23 L50 15 L78 9 L128 3 L175 3 L197 12 L201 19 L194 52 L166 60 L65 73 L21 61 L25 36 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M22 34 L33 42 L71 47 L111 43 L124 48 L166 42 L183 37 L190 53 L155 67 L112 76 L75 81 L38 82 L15 70 L22 34 Z" stroke="none" />

-      <path fill="black" d="M177 63 L182 76 L192 85 L215 97 L227 108 L235 139 L239 235 L235 306 L230 318 L225 322 L228 305 L226 256 L222 150 L217 119 L219 112 L206 98 L194 94 L175 87 L167 78 L173 69 L177 63 Z" stroke="none" />

-      <path fill="black" d="M32 33 L40 40 L70 44 L124 39 L181 28 L166 36 L131 44 L99 51 L90 68 L83 53 L73 71 L62 55 L58 72 L46 53 L42 72 L30 52 L27 74 L15 70 L10 35 L16 26 L30 18 L56 9 L98 3 L142 0 L179 0 L202 10 L205 22 L201 55 L184 62 L145 71 L124 71 L166 60 L191 50 L194 21 L195 16 L177 7 L140 5 L85 11 L36 23 L32 33 Z" stroke="none" />

-      <path fill="black" d="M33 79 L51 80 L104 76 L90 83 L78 98 L66 104 L44 108 L28 112 L19 119 L12 128 L8 153 L12 243 L17 326 L24 337 L86 346 L148 341 L201 328 L206 319 L184 314 L142 307 L92 309 L50 318 L61 309 L94 302 L140 299 L186 301 L214 311 L219 322 L215 331 L182 344 L118 357 L60 358 L16 350 L9 335 L0 148 L2 122 L8 114 L18 107 L28 101 L36 90 L33 79 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M70 28 L62 29 L56 31 L53 36 L71 33 L70 28 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M115 23 L107 24 L102 26 L98 31 L116 28 L115 23 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M93 15 L85 16 L79 19 L76 23 L94 21 L93 15 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M155 13 L147 14 L142 16 L139 21 L157 18 L155 13 Z" stroke="none" />

-      <path fill="black" d="M53 36 L62 37 L71 36 L83 32 L80 29 L70 28 L65 32 L56 34 L53 36 Z" stroke="none" />

-      <path fill="black" d="M98 32 L107 33 L116 32 L128 28 L125 25 L115 24 L110 28 L101 30 L98 32 Z" stroke="none" />

-      <path fill="black" d="M139 20 L148 22 L158 21 L169 17 L166 14 L156 12 L152 17 L142 19 L139 20 Z" stroke="none" />

-      <path fill="black" d="M75 23 L84 24 L94 23 L106 20 L102 16 L92 15 L88 20 L78 21 L75 23 Z" stroke="none" />

-      <path fill="black" d="M144 218 L145 218 L146 218 L147 218 L148 218 L150 218 L151 218 L153 217 L155 217 L157 216 L159 216 L161 215 L163 215 L166 214 L168 213 L170 212 L173 211 L175 210 L177 209 L179 208 L181 206 L183 205 L185 204 L188 202 L190 201 L192 199 L194 197 L196 195 L197 193 L200 191 L202 189 L204 186 L205 184 L207 181 L208 178 L210 175 L211 172 L212 169 L213 164 L214 161 L215 157 L216 151 L216 145 L217 138 L217 131 L216 130 L216 129 L216 128 L215 127 L214 126 L213 125 L212 125 L211 124 L210 123 L209 123 L208 123 L207 122 L206 122 L205 123 L203 124 L202 126 L200 128 L197 129 L195 131 L192 133 L190 135 L187 138 L185 140 L182 142 L180 145 L177 148 L174 151 L171 154 L168 157 L165 160 L163 163 L160 166 L157 169 L154 173 L152 176 L149 181 L147 184 L144 188 L142 191 L140 195 L138 199 L136 202 L134 206 L132 210 L131 214 L132 215 L134 216 L135 217 L137 217 L139 218 L141 218 L143 218 L144 218 Z" stroke="none" />

-      <path fill="olive" d="M205 120 L203 121 L202 122 L200 124 L197 125 L195 127 L193 129 L191 131 L189 133 L186 135 L184 138 L181 140 L178 143 L175 146 L173 149 L170 152 L167 154 L164 158 L161 161 L159 164 L156 167 L153 172 L150 175 L148 179 L145 182 L143 186 L140 190 L138 193 L136 197 L134 201 L133 204 L131 208 L130 212 L127 207 L124 202 L123 197 L122 192 L121 187 L121 182 L122 178 L123 173 L124 169 L125 166 L127 163 L128 161 L130 158 L131 155 L133 153 L135 150 L137 148 L140 145 L142 143 L144 141 L147 139 L149 137 L151 135 L154 133 L156 131 L159 129 L161 127 L164 126 L166 124 L169 123 L171 122 L174 120 L176 119 L178 118 L180 117 L182 117 L184 116 L186 115 L187 115 L189 115 L191 114 L193 114 L195 114 L196 114 L198 114 L200 115 L200 115 L202 116 L203 116 L203 117 L204 117 L204 118 L205 118 L205 119 L205 120 Z" stroke="none" />

-      <path fill="black" d="M120 296 L119 296 L119 297 L118 297 L116 298 L115 298 L114 299 L112 299 L110 300 L108 300 L106 301 L104 301 L102 301 L99 302 L97 302 L94 302 L91 302 L89 302 L87 302 L84 302 L82 302 L78 302 L76 301 L73 301 L71 300 L68 299 L66 299 L63 298 L60 297 L58 295 L55 294 L53 293 L50 291 L49 290 L47 289 L46 288 L45 287 L44 286 L42 285 L41 284 L40 283 L39 282 L37 281 L36 279 L35 278 L34 277 L33 275 L31 274 L30 272 L29 270 L27 267 L25 265 L24 262 L22 259 L21 256 L19 253 L18 250 L17 249 L17 248 L17 246 L17 245 L17 244 L18 243 L18 242 L19 241 L20 240 L20 239 L21 239 L22 238 L22 237 L23 237 L25 238 L27 238 L29 238 L31 239 L34 240 L37 241 L39 241 L42 242 L46 243 L49 244 L53 245 L56 247 L60 248 L64 249 L67 250 L71 252 L75 254 L79 255 L84 257 L88 259 L92 261 L96 262 L100 265 L103 267 L107 269 L111 271 L114 273 L118 276 L121 278 L124 281 L127 284 L130 286 L130 288 L129 289 L127 291 L126 292 L124 294 L123 295 L121 296 L120 296 Z" stroke="none" />

-      <path fill="olive" d="M23 235 L25 235 L27 236 L29 236 L31 237 L34 237 L37 238 L39 239 L42 240 L46 241 L49 242 L53 243 L56 244 L60 245 L64 247 L67 248 L71 250 L75 251 L79 253 L84 255 L88 256 L92 258 L96 260 L100 262 L104 264 L107 266 L111 269 L115 271 L118 274 L121 276 L125 279 L128 281 L131 284 L131 279 L131 274 L131 269 L130 265 L128 260 L126 257 L124 253 L122 249 L119 246 L116 243 L113 241 L109 238 L106 236 L102 233 L98 232 L94 230 L90 228 L85 227 L81 226 L76 225 L71 224 L67 223 L63 223 L59 222 L55 222 L51 222 L48 222 L45 222 L41 222 L39 222 L36 223 L34 223 L30 224 L27 226 L25 228 L24 229 L23 231 L23 232 L23 234 L23 235 Z" stroke="none" />

-      <path d="M25 36 L30 23 L50 15 L78 9 L128 3 L175 3 L197 12 L201 19 L194 52 L166 60 L65 73 L21 61 L25 36 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M22 34 L33 42 L71 47 L111 43 L124 48 L166 42 L183 37 L190 53 L155 67 L112 76 L75 81 L38 82 L15 70 L22 34 Z" stroke="none" />

-      <path fill="black" d="M177 63 L182 76 L192 85 L215 97 L227 108 L235 139 L239 235 L235 306 L230 318 L225 322 L228 305 L226 256 L222 150 L217 119 L219 112 L206 98 L194 94 L175 87 L167 78 L173 69 L177 63 Z" stroke="none" />

-      <path fill="black" d="M32 33 L40 40 L70 44 L124 39 L181 28 L166 36 L131 44 L99 51 L90 68 L83 53 L73 71 L62 55 L58 72 L46 53 L42 72 L30 52 L27 74 L15 70 L10 35 L16 26 L30 18 L56 9 L98 3 L142 0 L179 0 L202 10 L205 22 L201 55 L184 62 L145 71 L124 71 L166 60 L191 50 L194 21 L195 16 L177 7 L140 5 L85 11 L36 23 L32 33 Z" stroke="none" />

-      <path fill="black" d="M33 79 L51 80 L104 76 L90 83 L78 98 L66 104 L44 108 L28 112 L19 119 L12 128 L8 153 L12 243 L17 326 L24 337 L86 346 L148 341 L201 328 L206 319 L184 314 L142 307 L92 309 L50 318 L61 309 L94 302 L140 299 L186 301 L214 311 L219 322 L215 331 L182 344 L118 357 L60 358 L16 350 L9 335 L0 148 L2 122 L8 114 L18 107 L28 101 L36 90 L33 79 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M70 28 L62 29 L56 31 L53 36 L71 33 L70 28 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M115 23 L107 24 L102 26 L98 31 L116 28 L115 23 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M93 15 L85 16 L79 19 L76 23 L94 21 L93 15 Z" stroke="none" />

-      <path fill="rgb(209,186,186)" d="M155 13 L147 14 L142 16 L139 21 L157 18 L155 13 Z" stroke="none" />

-      <path fill="black" d="M53 36 L62 37 L71 36 L83 32 L80 29 L70 28 L65 32 L56 34 L53 36 Z" stroke="none" />

-      <path fill="black" d="M98 32 L107 33 L116 32 L128 28 L125 25 L115 24 L110 28 L101 30 L98 32 Z" stroke="none" />

-      <path fill="black" d="M139 20 L148 22 L158 21 L169 17 L166 14 L156 12 L152 17 L142 19 L139 20 Z" stroke="none" />

-      <path fill="black" d="M75 23 L84 24 L94 23 L106 20 L102 16 L92 15 L88 20 L78 21 L75 23 Z" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.emf
deleted file mode 100644
index 5ff6c18..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.svg
deleted file mode 100644
index 3218d84..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbentity.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="184" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="133" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g>

-      <path d="M157 124 L156 124 L155 125 L153 126 L151 126 L149 127 L147 128 L144 128 L142 128 L139 129 L135 129 L132 130 L128 131 L125 131 L121 131 L117 132 L112 132 L109 132 L106 132 L102 132 L98 131 L94 131 L91 130 L87 130 L83 129 L78 128 L74 128 L71 126 L67 125 L62 123 L58 122 L55 120 L51 117 L49 117 L47 116 L45 114 L42 113 L40 112 L38 111 L37 109 L35 107 L33 106 L31 105 L29 103 L27 101 L25 100 L23 98 L21 95 L20 94 L18 90 L15 88 L12 84 L10 81 L7 78 L5 74 L2 70 L1 66 L0 64 L0 63 L0 61 L0 59 L1 58 L1 57 L2 55 L3 54 L4 53 L5 52 L6 52 L7 51 L7 50 L8 50 L8 49 L9 49 L11 50 L15 51 L18 51 L21 52 L25 52 L30 54 L35 55 L39 56 L44 57 L49 58 L55 60 L60 61 L66 63 L72 64 L77 66 L83 68 L90 70 L95 72 L101 74 L108 77 L113 79 L120 81 L126 84 L131 87 L137 90 L143 92 L148 95 L153 98 L159 101 L163 105 L168 108 L173 112 L172 114 L170 116 L168 117 L166 119 L163 121 L161 123 L159 123 L157 124 Z" stroke="none" />

-      <path fill="olive" d="M9 46 L12 46 L15 47 L18 48 L22 49 L25 50 L30 50 L34 51 L39 52 L44 54 L49 55 L55 56 L60 58 L66 60 L72 61 L77 63 L83 65 L90 66 L95 69 L102 71 L108 73 L114 76 L120 78 L126 81 L131 83 L137 86 L143 89 L148 92 L154 95 L159 99 L164 102 L168 105 L173 109 L174 102 L174 95 L173 89 L172 84 L169 78 L167 73 L164 69 L160 65 L156 61 L151 56 L147 53 L141 50 L135 47 L129 44 L123 42 L116 39 L110 38 L103 36 L97 34 L91 33 L84 32 L77 31 L71 30 L64 30 L58 29 L53 29 L47 29 L42 29 L38 29 L33 30 L29 30 L26 31 L20 33 L16 35 L12 37 L10 39 L9 41 L8 43 L9 44 L9 46 Z" stroke="none" />

-      <text x="150" font-size="62" y="63" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">E</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.emf
deleted file mode 100644
index 3d8f388..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.svg
deleted file mode 100644
index 51ae0f2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbhomeinterface.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="73" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="38" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="13.5" cx="57.5" cy="22.5" />

-      <text x="6" font-size="17" y="17" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">Home</text>

-      <line y2="22" fill="none" x1="-1" x2="44" y1="22" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.emf
deleted file mode 100644
index ed32e40..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.svg
deleted file mode 100644
index 1e97672..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalhomeinterface.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="109" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="36" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="13.5" cx="93.5" cy="20.5" />

-      <text x="2" font-size="17" y="17" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">Local Home</text>

-      <line y2="20" fill="none" x1="0" x2="80" y1="20" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.emf
deleted file mode 100644
index 7e6464e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.svg
deleted file mode 100644
index 916df78..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejblocalinterface.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="66" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="37" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="13" fill="none" ry="13.5" cx="51" cy="21.5" />

-      <text x="1" font-size="17" y="18" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">Local</text>

-      <line y2="21" fill="none" x1="-1" x2="37" y1="21" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.emf
deleted file mode 100644
index 4c3e5fd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.svg
deleted file mode 100644
index 9041da2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbmessage.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="191" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="137" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="green" stroke="green">

-      <path d="M157 128 L156 128 L155 129 L153 129 L151 129 L149 130 L147 131 L145 131 L142 132 L139 133 L135 133 L132 134 L129 134 L125 134 L121 134 L117 135 L112 135 L110 135 L106 135 L102 135 L98 134 L94 134 L91 134 L87 134 L83 133 L78 132 L75 131 L71 129 L67 129 L62 127 L58 125 L55 123 L51 121 L49 120 L47 119 L45 118 L42 117 L40 115 L39 114 L37 112 L35 111 L33 109 L31 108 L29 107 L27 105 L25 103 L23 101 L22 99 L20 97 L18 94 L15 91 L12 88 L10 85 L7 81 L5 77 L3 74 L1 69 L1 68 L1 66 L1 64 L1 63 L1 62 L1 60 L2 58 L4 57 L5 57 L5 56 L6 55 L7 54 L7 53 L8 53 L8 52 L9 52 L11 53 L15 54 L18 54 L22 55 L25 56 L30 57 L35 58 L40 59 L44 60 L49 62 L55 63 L60 64 L66 66 L72 68 L77 69 L83 72 L90 74 L95 75 L101 78 L108 80 L113 82 L120 85 L126 87 L131 90 L137 93 L143 96 L148 99 L153 101 L159 105 L164 108 L168 112 L173 115 L172 118 L170 119 L168 121 L166 123 L164 124 L161 126 L159 127 L157 128 Z" stroke="none" />

-      <path fill="olive" d="M8 50 L11 50 L14 51 L17 51 L21 52 L24 53 L29 54 L33 55 L38 56 L43 57 L48 58 L54 60 L59 62 L65 63 L71 65 L77 67 L82 68 L89 70 L94 73 L101 74 L107 77 L113 79 L119 82 L125 84 L130 87 L136 90 L142 93 L148 95 L153 99 L158 102 L163 106 L167 109 L172 112 L173 106 L173 99 L172 93 L171 88 L168 82 L166 77 L163 73 L159 68 L155 64 L150 60 L146 57 L140 53 L134 51 L128 48 L122 46 L115 43 L109 41 L102 40 L96 38 L90 37 L83 35 L77 35 L70 34 L63 34 L58 33 L52 33 L46 33 L42 33 L37 33 L32 34 L28 34 L25 35 L19 36 L15 39 L11 40 L9 42 L8 45 L7 46 L8 48 L8 50 Z" stroke="none" />

-    </g>

-    <g font-size="62" font-family="&apos;Arial Narrow&apos;">

-      <text xml:space="preserve" x="148" y="62" stroke="none">M</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.emf
deleted file mode 100644
index cc336da..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.svg
deleted file mode 100644
index f78f419..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbremoteinterface.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="38" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="13" fill="none" ry="13.5" cx="64" cy="22.5" />

-      <text x="2" font-size="17" y="17" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">Remote</text>

-      <line y2="21" fill="none" x1="2" x2="50" y1="21" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.emf
deleted file mode 100644
index 4ad020e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.svg
deleted file mode 100644
index d31f5b4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/ejbsession.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="149" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="168" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g>

-      <path d="M38 166 L39 166 L41 166 L43 166 L44 166 L46 166 L48 166 L51 166 L54 165 L57 165 L61 164 L64 163 L67 162 L70 161 L74 160 L78 158 L82 157 L85 156 L88 154 L91 153 L95 151 L98 149 L101 147 L105 145 L107 143 L110 141 L113 138 L117 135 L120 133 L123 130 L125 126 L127 123 L130 120 L132 116 L135 113 L137 108 L139 104 L141 100 L143 95 L144 91 L145 85 L147 78 L147 69 L147 60 L147 51 L147 49 L147 48 L146 46 L145 45 L144 44 L142 43 L141 42 L139 41 L138 40 L136 40 L135 39 L134 39 L133 38 L132 38 L131 38 L129 40 L127 42 L125 44 L122 46 L118 49 L115 50 L111 53 L107 57 L104 59 L100 62 L96 66 L92 70 L87 73 L84 77 L79 81 L75 85 L70 89 L66 93 L62 98 L58 102 L53 107 L49 112 L45 116 L42 121 L38 125 L34 131 L31 135 L28 141 L24 145 L23 150 L20 156 L18 160 L20 162 L22 164 L24 165 L27 166 L30 166 L33 166 L36 166 L38 166 Z" stroke="none" />

-      <path fill="olive" d="M130 36 L128 38 L125 39 L122 41 L120 43 L116 46 L113 48 L109 50 L106 53 L103 57 L98 60 L94 63 L90 67 L86 71 L82 74 L77 78 L73 82 L68 86 L64 91 L60 95 L56 100 L51 104 L47 109 L44 113 L40 118 L36 124 L32 128 L29 133 L26 138 L23 143 L20 148 L18 153 L16 158 L11 152 L7 145 L5 138 L4 131 L3 124 L3 118 L4 112 L6 106 L7 102 L9 98 L11 94 L13 91 L16 87 L18 83 L22 80 L25 77 L27 73 L31 71 L34 67 L38 64 L42 61 L46 59 L49 56 L53 53 L57 50 L61 48 L65 46 L68 44 L72 41 L76 39 L79 38 L83 37 L87 35 L89 34 L93 32 L96 31 L99 30 L102 29 L104 28 L107 28 L109 28 L113 28 L115 28 L118 28 L120 28 L122 28 L124 29 L125 29 L127 30 L127 31 L128 32 L129 33 L129 34 L130 35 L130 36 Z" stroke="none" />

-      <text x="-1" font-size="74" y="70" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">S</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.emf
deleted file mode 100644
index 3deceb0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.svg
deleted file mode 100644
index 4a4a36a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/entity.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="75" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="51" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M-371 553 ZM61 25 C61 38 50 49 37 49 C24 49 14 38 14 25 C14 12 24 1 37 1 C50 1 61 12 61 25 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M-371 553 ZM61 25 C61 38 50 49 37 49 C24 49 14 38 14 25 C14 12 24 1 37 1 C50 1 61 12 61 25 Z" />

-      <path fill="rgb(255,255,153)" d="M1 49 L73 49 L1 49 Z" stroke="none" />

-      <path fill="none" d="M1 49 L73 49" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.emf
deleted file mode 100644
index ab29eea..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.svg
deleted file mode 100644
index 09e0779..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/executable.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="93" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="74" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M90 72 L6 72 L6 9 L90 9 L90 72 Z" stroke="none" />

-      <path fill="none" d="M90 72 L6 72 L6 9 L90 9 L90 72 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="blue" stroke-miterlimit="4" stroke-linecap="butt" stroke="blue">

-      <path d="M85 65 L1 65 L1 2 L85 2 L85 65 Z" stroke="none" />

-      <path fill="none" d="M85 65 L1 65 L1 2 L85 2 L85 65 Z" stroke="black" />

-      <path fill="white" d="M84 64 L2 64 L2 12 L84 12 L84 64 Z" stroke="none" />

-      <path fill="none" d="M84 64 L2 64 L2 12 L84 12 L84 64 Z" stroke="rgb(153,153,153)" />

-      <path fill="rgb(153,153,153)" d="M-363 564 ZM18 34 C17 34 17 34 17 34 C17 27 17 27 17 27 C17 27 16 28 16 28 C15 28 15 28 15 28 C15 27 15 27 15 27 C15 27 16 27 16 26 C17 26 17 25 17 25 C18 25 18 25 18 25 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M18 25 ZM21 30 C21 29 21 28 22 27 C22 26 22 26 23 25 C23 25 24 25 24 25 C25 25 25 25 26 25 C26 25 26 26 27 26 C27 26 27 27 27 27 C27 28 27 29 27 30 C27 31 27 32 27 32 C27 33 26 34 26 34 C26 34 25 35 24 35 C23 35 23 34 22 34 C22 33 21 32 21 30 ZM22 30 C22 31 23 32 23 33 C23 33 24 34 24 34 C25 34 25 33 26 33 C26 32 26 31 26 30 C26 28 26 27 26 27 C25 26 25 26 24 26 C24 26 23 26 23 27 C23 27 22 28 22 30 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M22 30 ZM33 34 C32 34 32 34 32 34 C32 27 32 27 32 27 C32 27 31 28 31 28 C30 28 30 28 29 28 C29 27 29 27 29 27 C30 27 31 27 31 26 C32 26 32 25 32 25 C33 25 33 25 33 25 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M33 25 ZM36 30 C36 29 36 28 36 27 C37 26 37 26 37 25 C38 25 38 25 39 25 C40 25 40 25 40 25 C41 25 41 26 41 26 C42 26 42 27 42 27 C42 28 42 29 42 30 C42 31 42 32 42 32 C42 33 41 34 41 34 C40 34 40 35 39 35 C38 35 37 34 37 34 C36 33 36 32 36 30 ZM37 30 C37 31 37 32 38 33 C38 33 39 34 39 34 C40 34 40 33 40 33 C41 32 41 31 41 30 C41 28 41 27 40 27 C40 26 40 26 39 26 C39 26 38 26 38 27 C37 27 37 28 37 30 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M37 30 ZM43 30 C43 29 44 28 44 27 C44 26 44 26 45 25 C45 25 46 25 47 25 C47 25 48 25 48 25 C48 25 49 26 49 26 C49 26 49 27 49 27 C50 28 50 29 50 30 C50 31 50 32 49 32 C49 33 49 34 48 34 C48 34 47 35 47 35 C46 35 45 34 44 34 C44 33 43 32 43 30 ZM45 30 C45 31 45 32 45 33 C46 33 46 34 47 34 C47 34 48 33 48 33 C48 32 48 31 48 30 C48 28 48 27 48 27 C48 26 47 26 47 26 C46 26 46 26 45 27 C45 27 45 28 45 30 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M45 30 ZM51 30 C51 29 51 28 51 27 C51 26 52 26 52 25 C53 25 53 25 54 25 C54 25 55 25 55 25 C56 25 56 26 56 26 C57 26 57 27 57 27 C57 28 57 29 57 30 C57 31 57 32 57 32 C56 33 56 34 56 34 C55 34 55 35 54 35 C53 35 52 34 52 34 C51 33 51 32 51 30 ZM52 30 C52 31 52 32 53 33 C53 33 53 34 54 34 C54 34 55 33 55 33 C56 32 56 31 56 30 C56 28 56 27 55 27 C55 26 54 26 54 26 C53 26 53 26 53 27 C52 27 52 28 52 30 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M52 30 ZM63 34 C62 34 62 34 62 34 C62 27 62 27 62 27 C61 27 61 28 60 28 C60 28 60 28 59 28 C59 27 59 27 59 27 C60 27 60 27 61 26 C61 26 62 25 62 25 C63 25 63 25 63 25 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M63 25 ZM66 30 C66 29 66 28 66 27 C66 26 67 26 67 25 C68 25 68 25 69 25 C69 25 70 25 70 25 C71 25 71 26 71 26 C71 26 72 27 72 27 C72 28 72 29 72 30 C72 31 72 32 72 32 C71 33 71 34 71 34 C70 34 69 35 69 35 C68 35 67 34 67 34 C66 33 66 32 66 30 ZM67 30 C67 31 67 32 67 33 C68 33 68 34 69 34 C69 34 70 33 70 33 C71 32 71 31 71 30 C71 28 71 27 70 27 C70 26 69 26 69 26 C68 26 68 26 67 27 C67 27 67 28 67 30 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M67 30 ZM15 48 C15 47 15 46 15 46 C16 45 16 44 17 44 C17 44 18 44 18 44 C19 44 19 44 20 44 C20 44 20 44 21 45 C21 45 21 46 21 46 C21 47 21 47 21 48 C21 50 21 50 21 51 C21 52 20 52 20 53 C20 53 19 53 18 53 C17 53 17 53 16 52 C15 51 15 50 15 48 ZM16 48 C16 50 17 51 17 52 C17 52 18 52 18 52 C19 52 19 52 20 52 C20 51 20 50 20 48 C20 47 20 46 20 45 C19 45 19 44 18 44 C18 44 17 45 17 45 C17 46 16 47 16 48 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M16 48 ZM27 53 C26 53 26 53 26 53 C26 46 26 46 26 46 C25 46 25 46 25 46 C24 47 24 47 23 47 C23 46 23 46 23 46 C24 46 25 45 25 45 C26 44 26 44 26 44 C27 44 27 44 27 44 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M27 44 ZM33 53 C32 53 32 53 32 53 C32 46 32 46 32 46 C32 46 32 46 31 46 C31 47 30 47 30 47 C30 46 30 46 30 46 C30 46 31 45 32 45 C32 44 32 44 33 44 C33 44 33 44 33 44 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M33 44 ZM36 48 C36 47 36 46 37 46 C37 45 37 44 38 44 C38 44 39 44 39 44 C40 44 40 44 41 44 C41 44 42 44 42 45 C42 45 42 46 42 46 C43 47 43 47 43 48 C43 50 42 50 42 51 C42 52 42 52 41 53 C41 53 40 53 39 53 C39 53 38 53 37 52 C37 51 36 50 36 48 ZM38 48 C38 50 38 51 38 52 C38 52 39 52 39 52 C40 52 40 52 41 52 C41 51 41 50 41 48 C41 47 41 46 41 45 C40 45 40 44 39 44 C39 44 39 45 38 45 C38 46 38 47 38 48 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M38 48 ZM48 53 C47 53 47 53 47 53 C47 46 47 46 47 46 C47 46 46 46 46 46 C45 47 45 47 45 47 C45 46 45 46 45 46 C45 46 46 45 46 45 C47 44 47 44 47 44 C48 44 48 44 48 44 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M48 44 ZM51 48 C51 47 51 46 52 46 C52 45 52 44 53 44 C53 44 54 44 54 44 C55 44 55 44 56 44 C56 44 56 44 57 45 C57 45 57 46 57 46 C57 47 57 47 57 48 C57 50 57 50 57 51 C57 52 57 52 56 53 C56 53 55 53 54 53 C53 53 53 53 52 52 C52 51 51 50 51 48 ZM52 48 C52 50 53 51 53 52 C53 52 54 52 54 52 C55 52 55 52 56 52 C56 51 56 50 56 48 C56 47 56 46 56 45 C55 45 55 44 54 44 C54 44 53 45 53 45 C53 46 52 47 52 48 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M52 48 ZM63 53 C62 53 62 53 62 53 C62 46 62 46 62 46 C62 46 61 46 61 46 C60 47 60 47 60 47 C60 46 60 46 60 46 C60 46 61 45 61 45 C62 44 62 44 62 44 C63 44 63 44 63 44 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M63 44 ZM66 48 C66 47 66 46 66 46 C67 45 67 44 67 44 C68 44 68 44 69 44 C70 44 70 44 70 44 C71 44 71 44 71 45 C72 45 72 46 72 46 C72 47 72 47 72 48 C72 50 72 50 72 51 C72 52 71 52 71 53 C70 53 70 53 69 53 C68 53 68 53 67 52 C66 51 66 50 66 48 ZM67 48 C67 50 67 51 68 52 C68 52 69 52 69 52 C70 52 70 52 70 52 C71 51 71 50 71 48 C71 47 71 46 70 45 C70 45 70 44 69 44 C69 44 68 45 68 45 C67 46 67 47 67 48 Z" stroke="none" />

-      <path fill="aqua" d="M82 9 L78 9 L78 6 L82 6 L82 9 Z" stroke="none" />

-      <path fill="aqua" d="M76 9 L72 9 L72 6 L76 6 L76 9 Z" stroke="none" />

-      <path fill="rgb(153,153,153)" d="M84 16 L2 16 L2 12 L84 12 L84 16 Z" stroke="none" />

-      <path fill="none" d="M83 4 L3 4 L3 8" stroke="rgb(0,127,255)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.svg
deleted file mode 100644
index a1a9cb6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="261" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="261" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M2 2 L257 2 L257 257 L2 257 L2 2 Z" />

-      </clipPath>

-    </defs>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="75" clip-path="url(#clipPath1)" cx="179" cy="129" />

-      <circle fill="none" r="75" clip-path="url(#clipPath1)" cx="79" cy="179" />

-      <circle fill="none" r="75" clip-path="url(#clipPath1)" cx="79" cy="79" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.wmf
deleted file mode 100644
index 8fb8bd3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/exigenceTransverse.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.emf
deleted file mode 100644
index 4de11aa..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.svg
deleted file mode 100644
index 08e877a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/file.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="75" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M72 25 L55 8 L7 8 L7 87 L72 87 L72 26 L72 25 L72 25 Z" stroke="none" />

-      <path fill="none" d="M72 25 L55 8 L7 8 L7 87 L72 87 L72 26 L72 25 L72 25 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-      <path d="M72 26 L55 8 L72 26 L72 26 L72 26 Z" stroke-miterlimit="4" stroke-linecap="butt" stroke="none" />

-      <path fill="none" d="M72 26 L55 8 L72 26 L72 26 L72 26 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="white" stroke-miterlimit="4" stroke-linecap="butt" stroke="white">

-      <path d="M49 2 L1 2 L1 81 L66 81 L66 19 L66 19 L49 2 L49 2 Z" stroke="none" />

-      <path d="M66 19 L49 19 L49 2 L66 19 Z" stroke="none" />

-      <path fill="none" d="M49 2 L1 2 L1 81 L66 81 L66 19 L66 19 L49 2" stroke="black" />

-      <path fill="none" d="M66 19 L49 19 L49 2" stroke="black" />

-      <path d="M49 19 L66 19 L66 19 L49 2 L49 19 L49 19 Z" stroke="none" />

-      <path fill="none" d="M49 19 L66 19 L66 19 L49 2 L49 19 L49 19 Z" stroke-linejoin="bevel" stroke="black" />

-      <path fill="none" d="M6 75 L6 7 L44 7" stroke-linejoin="bevel" />

-      <path fill="none" d="M11 25 L54 25" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 32 L54 32" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 38 L54 38" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 45 L54 45" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 52 L54 52" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 59 L54 59" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M11 66 L54 66" stroke-width="2" stroke="rgb(42,31,170)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.svg
deleted file mode 100644
index 871394c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1383" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1023" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="silver" stroke="silver">

-      <path d="M83 77 L83 1024 L1384 1024 L1384 77 L83 77 Z" stroke="none" />

-      <path fill="white" d="M12 6 L12 952 L1312 952 L1312 6 L12 6 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M12 6 L12 952 L1312 952 L1312 6 L12 6 Z" />

-      <path fill="none" d="M12 12 L626 484 L1311 12" stroke-width="6" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.wmf
deleted file mode 100644
index 7684468..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fluxInformation.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.svg
deleted file mode 100644
index 7dd7dbd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="161" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="311" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M2 2 L157 2 L157 307 L2 307 L2 2 Z" />

-      </clipPath>

-    </defs>

-    <g fill="gray" stroke="gray">

-      <rect x="4" y="4" clip-path="url(#clipPath1)" width="150" height="150" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect x="4" y="4" clip-path="url(#clipPath1)" fill="none" width="150" height="150" />

-      <rect x="4" y="154" clip-path="url(#clipPath1)" fill="none" width="150" height="150" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.wmf
deleted file mode 100644
index bdef508..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/fonctionSupport.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.emf
deleted file mode 100644
index 53c06db..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.svg
deleted file mode 100644
index 96eefa1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/form.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="235" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="235" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAICAIAAAB/FOjAAAAAJklEQVR42mN+9uwZ

-Ly/vsmXLiCQZGxoaGEgBTGlpaUCKeHJE2gAAULc0RmUxoQEAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <path d="M4 230 L230 230 L230 4 L4 4 L4 230 Z" stroke="none" />

-    </g>

-    <g stroke-width="6" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M4 230 L230 230 L230 4 L4 4 L4 230 Z" />

-      <path fill="navy" d="M4 18 L230 18 L230 4 L4 4 L4 18 Z" stroke="none" />

-      <path fill="none" d="M4 18 L230 18 L230 4 L4 4 L4 18 Z" stroke="navy" />

-      <path fill="white" d="M18 60 L20 53 L25 48 L32 46 L39 48 L44 53 L46 60 L44 67 L39 72 L32 74 L25 72 L20 67 L18 60 Z" stroke="none" />

-      <path fill="none" d="M18 60 L20 53 L25 48 L32 46 L39 48 L44 53 L46 60 L44 67 L39 72 L32 74 L25 72 L20 67 L18 60 Z" stroke-width="2" />

-      <path fill="white" d="M18 102 L20 95 L25 90 L32 88 L39 90 L44 95 L46 102 L44 109 L39 115 L32 118 L25 115 L20 109 L18 102 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M18 102 L20 95 L25 90 L32 88 L39 90 L44 95 L46 102 L44 109 L39 115 L32 118 L25 115 L20 109 L18 102 Z" stroke-width="2" />

-      <path fill="white" d="M60 74 L202 74 L202 46 L60 46 L60 74 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M60 74 L202 74 L202 46 L60 46 L60 74 Z" stroke-width="2" />

-      <path fill="white" d="M60 118 L202 118 L202 88 L60 88 L60 118 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M60 118 L202 118 L202 88 L60 88 L60 118 Z" stroke-width="2" />

-      <path fill="white" d="M18 174 L46 174 L46 146 L18 146 L18 174 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M18 174 L46 174 L46 146 L18 146 L18 174 Z" stroke-width="2" />

-      <path fill="none" d="M18 146 L45 174" stroke-width="2" />

-      <path fill="none" d="M46 146 L18 173" stroke-width="2" />

-      <path d="M25 60 L26 56 L30 54 L34 54 L38 56 L39 60 L38 64 L34 67 L30 67 L26 64 L25 60 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M25 60 L26 56 L30 54 L34 54 L38 56 L39 60 L38 64 L34 67 L30 67 L26 64 L25 60 Z" />

-      <path d="M25 102 L26 98 L30 96 L34 96 L38 98 L39 102 L38 107 L34 109 L30 109 L26 107 L25 102 Z" stroke="none" />

-      <path fill="none" d="M25 102 L26 98 L30 96 L34 96 L38 98 L39 102 L38 107 L34 109 L30 109 L26 107 L25 102 Z" />

-      <path fill="none" d="M71 50 L71 71" stroke-width="2" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.emf
deleted file mode 100644
index 04251f2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.svg
deleted file mode 100644
index bab4a06..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/genericservlet.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="123" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAANUlEQVR42m3OAQoA

-QAQEwLMf3/XzU0qCEhmJSSL5ViCm7n5A5GnIsg3VDUPf6oZxugz7n7QPgAcYDZ9s

-nhQAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern2" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAANUlEQVR42m3OAQoA

-QAQEwLMf3/XzU0qCEhmJSSL5ViCm7n5A5GnIsg3VDUPf6oZxugz7n7QPgAcYDZ9s

-nhQAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="blue" stroke="blue">

-      <ellipse rx="48" ry="45" cx="70" cy="76" stroke="none" />

-      <path fill="green" d="M34 54 L36 57 L53 56 L53 56 L54 56 L55 56 L56 56 L57 56 L58 56 L58 56 L59 56 L60 56 L60 56 L61 57 L61 58 L62 58 L62 59 L62 60 L63 60 L64 60 L64 60 L65 60 L65 61 L65 62 L65 63 L65 63 L64 64 L64 65 L63 65 L62 66 L62 67 L61 67 L60 68 L60 68 L59 69 L58 70 L58 70 L57 70 L57 71 L56 72 L56 72 L55 72 L55 73 L54 74 L54 75 L53 75 L53 75 L53 76 L52 77 L51 77 L51 77 L50 77 L49 78 L49 78 L48 79 L46 79 L46 79 L45 79 L44 79 L44 79 L43 79 L42 79 L41 79 L40 80 L39 80 L39 80 L38 80 L38 81 L37 81 L37 82 L36 82 L36 82 L35 83 L34 83 L34 84 L33 84 L33 84 L32 84 L32 84 L31 85 L30 85 L30 86 L29 86 L29 86 L28 86 L28 87 L27 88 L27 90 L27 91 L27 91 L26 91 L26 90 L26 89 L26 88 L26 87 L26 86 L26 85 L26 84 L26 84 L26 83 L26 82 L26 82 L27 81 L27 80 L27 80 L27 79 L27 78 L27 77 L27 77 L27 76 L27 75 L27 75 L27 74 L27 73 L27 72 L27 71 L27 70 L27 70 L27 69 L27 68 L27 68 L27 67 L27 66 L27 66 L27 65 L27 64 L27 63 L27 63 L27 62 L25 61 L25 60 L31 52 L30 53 Z" stroke="none" />

-      <path fill="green" d="M55 35 L54 35 L60 41 L60 40 L61 40 L61 39 L61 38 L61 38 L61 37 L61 36 L61 35 L61 35 L62 35 L63 35 L63 34 L65 34 L65 33 L65 33 L65 33 L66 33 L67 33 L67 33 L68 33 L69 33 L70 33 L70 32 L72 32 L72 32 L73 32 L74 32 L75 32 L76 32 L77 32 L77 32 L78 32 L79 33 L79 33 L80 33 L80 33 L81 33 L81 34 L82 35 L82 35 L82 35 L82 36 L82 37 L83 37 L83 38 L83 38 L84 38 L84 39 L84 39 L84 39 L84 40 L85 41 L86 41 L86 42 L87 42 L87 42 L88 42 L88 43 L89 44 L89 44 L89 44 L72 49 L72 54 L71 54 L68 54 Z" stroke="none" />

-      <path fill="green" d="M52 117 L63 121 L63 121 L65 121 L65 121 L66 121 L67 121 L67 121 L68 121 L69 121 L70 121 L71 121 L72 121 L72 121 L74 121 L74 121 L75 121 L76 120 L77 120 L78 120 L79 120 L79 120 L80 119 L81 119 L82 118 L82 118 L84 117 L84 117 L85 116 L86 116 L87 115 L87 115 L88 115 L87 114 L87 113 L86 113 L86 113 L85 113 L85 112 L85 112 L84 111 L83 111 L82 110 L82 110 L81 110 L80 110 L79 110 L79 110 L79 109 L78 109 L77 109 L77 109 L76 109 L75 109 L73 109 L72 109 L72 109 L71 109 L70 109 L70 109 L68 109 L68 109 L66 109 L65 109 L65 109 L64 109 L63 109 L63 109 L62 109 L61 110 L61 110 L60 110 L59 110 L58 110 L58 110 L57 111 L56 111 L56 111 L55 111 L54 111 L54 111 L53 111 L52 111 L51 111 L51 111 L50 112 L49 112 L49 112 L48 112 L47 112 L46 112 L46 112 L44 112 L44 113 L44 113 Z" stroke="none" />

-      <path fill="green" d="M89 82 L103 89 L104 90 L104 90 L105 90 L106 90 L107 90 L107 89 L107 88 L107 88 L108 87 L108 86 L109 86 L109 86 L109 86 L109 85 L110 85 L110 84 L111 84 L112 83 L112 83 L113 83 L114 83 L114 83 L115 83 L116 82 L117 81 L117 81 L117 80 L117 79 L117 78 L117 77 L117 76 L117 76 L117 75 L117 74 L116 74 L116 73 L116 72 L115 71 L115 70 L115 69 L115 69 L115 68 L115 67 L114 67 L114 66 L113 66 L113 65 L113 65 L112 64 L112 63 L112 62 L112 62 L112 62 L111 61 L111 60 L110 60 L110 60 L109 60 L109 59 L108 58 L107 58 L106 57 L105 56 L105 56 L104 56 L103 56 L102 55 L102 55 L101 55 L100 55 L100 55 L99 55 L98 55 L98 55 L97 55 L96 55 L95 55 L95 55 L94 55 L93 56 L93 57 L92 57 L91 57 L91 58 L90 59 L89 59 L88 60 L88 60 L88 60 L88 61 L88 62 L88 62 L88 63 L88 64 L88 64 L87 65 L86 66 L86 67 L86 67 L86 67 L85 67 L85 68 L85 69 L84 69 L84 69 L84 69 L84 70 L83 71 L83 72 L82 72 L82 72 L82 73 L82 74 L82 74 L82 75 L82 76 L82 76 L82 77 L82 78 L82 78 L82 79 L83 80 L83 81 L83 81 L84 81 L85 82 L86 83 L86 83 L86 83 L87 83 L88 84 L88 85 L88 85 L88 86 L89 86 L89 87 L90 88 L90 88 L90 89 L91 90 L92 91 L93 91 L93 92 L93 92 L94 93 L95 94 L95 95 L95 95 L95 96 L95 97 L95 97 L95 98 L95 99 L95 99 L95 100 L95 101 L95 102 L95 102 L95 102 L95 103 L95 104 L95 104 L95 105 L96 105 L97 105 L97 105 L97 105 L98 105 L99 105 L100 105 L101 106 L102 106 L102 106 L103 107 L103 106 L104 106 L104 106 L104 105 L105 105 L105 105 L106 105 L106 104 L107 103 L107 102 L107 102 L107 101 L107 100 L107 100 L107 99 L107 98 L106 97 L106 97 L106 96 L106 96 L105 96 L105 95 L105 94 L105 94 L105 93 L104 93 L104 93 L103 92 L103 91 L103 91 L103 90 L104 90 L104 89 L104 88 L104 89 L104 90 L103 90 L102 90 L103 90 L103 89 Z" stroke="none" />

-      <path d="M153 98 L153 98 L153 98 Z" stroke="none" />

-      <path d="M91 77 L94 76 L94 76 Z" stroke="none" />

-      <rect x="89" y="94" fill="gray" width="66" height="26" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect fill="none" width="66" x="89" height="26" y="94" />

-      <rect x="97" y="105" fill="url(#pattern1)" width="18" height="4" stroke="none" />

-      <rect fill="none" width="18" x="97" height="4" y="105" />

-      <rect x="130" y="105" fill="url(#pattern2)" width="17" height="4" stroke="none" />

-      <rect fill="none" width="17" x="130" height="4" y="105" />

-      <text x="108" font-size="62" y="63" font-family="&apos;Arial Narrow&apos;" stroke="none" xml:space="preserve">G S</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.emf
deleted file mode 100644
index d01a2f3..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.svg
deleted file mode 100644
index d93b8a5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_306090triange.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="77" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="52" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-1 -1 L76 51 L-1 51 L-1 40 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 -1 L76 51 L-1 51 L-1 40 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.emf
deleted file mode 100644
index 1007354..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.svg
deleted file mode 100644
index 970e1ba..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_3drectangle.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="70" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="64" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <rect width="59" x="0" height="53" y="0" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect fill="none" width="59" x="0" height="53" y="0" />

-      <path fill="white" d="M9 63 L-1 52 L59 52 L69 63 Z" stroke="none" />

-      <path fill="none" d="M9 63 L-1 52 L59 52 L69 63 Z" />

-      <path fill="white" d="M69 10 L69 63 L59 52 L59 -1 Z" stroke="none" />

-      <path fill="none" d="M69 10 L69 63 L59 52 L59 -1 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.emf
deleted file mode 100644
index cee9c0a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.svg
deleted file mode 100644
index 4bc6df7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_circle.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="83" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <ellipse rx="39" ry="41" cx="38" cy="40" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="39" fill="none" ry="41" cx="38" cy="40" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.emf
deleted file mode 100644
index 116edae..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.svg
deleted file mode 100644
index b3a3873..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_diamond.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="83" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 41 L39 82 L78 41 L39 0 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 41 L39 82 L78 41 L39 0 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.emf
deleted file mode 100644
index 46d3301..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.svg
deleted file mode 100644
index fffd98e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_ellipse.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="80" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="63" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <ellipse rx="39.5" ry="31" cx="38.5" cy="30" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="39.5" fill="none" ry="31" cx="38.5" cy="30" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.emf
deleted file mode 100644
index 1c17340..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.svg
deleted file mode 100644
index 6d40f78..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_hexagon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="72" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="62" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-1 30 L17 60 L53 60 L71 30 L53 -1 L17 -1 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 30 L17 60 L53 60 L71 30 L53 -1 L17 -1 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.emf
deleted file mode 100644
index 31da66c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.svg
deleted file mode 100644
index a15b36e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_isotriangle.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="80" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="83" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 81 L78 81 L39 0 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 81 L78 81 L39 0 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.emf
deleted file mode 100644
index 831b625..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.svg
deleted file mode 100644
index 5f11814..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_octagon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="80" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="84" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 58 L0 24 L23 0 L55 0 L78 24 L78 58 L55 83 L23 83 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 58 L0 24 L23 0 L55 0 L78 24 L78 58 L55 83 L23 83 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.emf
deleted file mode 100644
index f8789c4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.svg
deleted file mode 100644
index 0cbcf9e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_pentagon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="83" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M0 32 L39 0 L78 32 L62 82 L15 82 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 32 L39 0 L78 32 L62 82 L15 82 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.emf
deleted file mode 100644
index 5169a72..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.svg
deleted file mode 100644
index 77a52cc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_rectangle.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="79" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="50" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M-1 -1 L38 -1 L77 -1 L77 48 L-1 48 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 -1 L38 -1 L77 -1 L77 48 L-1 48 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.emf
deleted file mode 100644
index 57c1400..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.svg
deleted file mode 100644
index 8acb9fe..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_roundedrectangle.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="80" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="68" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M3 -1 L1 0 L0 1 L-1 3 L-1 63 L0 65 L1 66 L3 67 L75 67 L77 66 L78 65 L79 63 L79 3 L78 1 L77 0 L75 -1 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M3 -1 L1 0 L0 1 L-1 3 L-1 63 L0 65 L1 66 L3 67 L75 67 L77 66 L78 65 L79 63 L79 3 L78 1 L77 0 L75 -1 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.emf
deleted file mode 100644
index eefe528..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.svg
deleted file mode 100644
index e90d496..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_shadowedrectangle.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="70" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="54" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <rect width="64" x="4" height="48" y="4" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect fill="none" width="64" x="4" height="48" y="4" />

-      <rect x="-1" y="-1" fill="white" width="65" height="49" stroke="none" />

-      <rect fill="none" width="65" x="-1" height="49" y="-1" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.emf
deleted file mode 100644
index 2a6c07e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.svg
deleted file mode 100644
index 7be8f18..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/geom_square.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="77" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="82" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <rect width="75" x="0" height="81" y="0" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect fill="none" width="75" x="0" height="81" y="0" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.svg
deleted file mode 100644
index 93a6e99..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.svg
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="530" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="358" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(155,200,153)" stroke="rgb(155,200,153)">

-      <path d="M37 1 L492 1 L494 1 L496 1 L498 1 L500 2 L501 2 L503 3 L505 3 L506 4 L508 5 L509 5 L511 6 L512 7 L514 8 L515 9 L516 10 L518 11 L519 13 L520 14 L521 15 L522 17 L523 18 L524 20 L524 21 L525 23 L526 24 L526 26 L527 28 L527 29 L528 31 L528 33 L528 35 L528 36 L528 321 L528 322 L528 324 L528 326 L527 328 L527 329 L526 331 L526 333 L525 334 L524 336 L524 337 L523 339 L522 340 L521 342 L520 343 L519 344 L518 346 L516 347 L515 348 L514 349 L512 350 L511 351 L509 352 L508 353 L506 353 L505 354 L503 354 L501 355 L500 355 L498 356 L496 356 L494 356 L492 356 L37 356 L35 356 L33 356 L31 356 L29 355 L28 355 L26 354 L24 354 L23 353 L21 353 L20 352 L18 351 L17 350 L15 349 L14 348 L13 347 L11 346 L10 344 L9 343 L8 342 L7 340 L6 339 L5 337 L5 336 L4 334 L3 333 L3 331 L2 329 L2 328 L1 326 L1 324 L1 322 L1 321 L1 36 L1 35 L1 33 L1 31 L2 29 L2 28 L3 26 L3 24 L4 23 L5 21 L5 20 L6 18 L7 17 L8 15 L9 14 L10 13 L11 11 L13 10 L14 9 L15 8 L17 7 L18 6 L20 5 L21 5 L23 4 L24 3 L26 3 L28 2 L29 2 L31 1 L33 1 L35 1 L37 1 Z" stroke="none" />

-      <path fill="white" d="M37 1 L492 1 L494 1 L496 1 L498 1 L500 2 L501 2 L503 3 L505 3 L506 4 L508 5 L509 5 L511 6 L512 7 L514 8 L515 9 L516 10 L518 11 L519 13 L520 14 L521 15 L522 17 L523 18 L524 20 L524 21 L525 23 L526 24 L526 26 L527 28 L527 29 L528 31 L528 33 L528 35 L528 36 L528 321 L528 322 L528 324 L528 326 L527 328 L527 329 L526 331 L526 333 L525 334 L524 336 L524 337 L523 339 L522 340 L521 342 L520 343 L519 344 L518 346 L516 347 L515 348 L514 349 L512 350 L511 351 L509 352 L508 353 L506 353 L505 354 L503 354 L501 355 L500 355 L498 356 L496 356 L494 356 L492 356 L37 356 L35 356 L33 356 L31 356 L29 355 L28 355 L26 354 L24 354 L23 353 L21 353 L20 352 L18 351 L17 350 L15 349 L14 348 L13 347 L11 346 L10 344 L9 343 L8 342 L7 340 L6 339 L5 337 L5 336 L4 334 L3 333 L3 331 L2 329 L2 328 L1 326 L1 324 L1 322 L1 321 L1 36 L1 35 L1 33 L1 31 L2 29 L2 28 L3 26 L3 24 L4 23 L5 21 L5 20 L6 18 L7 17 L8 15 L9 14 L10 13 L11 11 L13 10 L14 9 L15 8 L17 7 L18 6 L20 5 L21 5 L23 4 L24 3 L26 3 L28 2 L29 2 L31 1 L33 1 L35 1 L37 1 Z" stroke="none" />

-    </g>

-    <g fill="rgb(41,49,54)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(41,49,54)">

-      <path fill="none" d="M37 1 L40 1" />

-      <path fill="none" d="M43 1 L46 1" />

-      <path fill="none" d="M49 1 L52 1" />

-      <path fill="none" d="M55 1 L58 1" />

-      <path fill="none" d="M61 1 L64 1" />

-      <path fill="none" d="M67 1 L70 1" />

-      <path fill="none" d="M73 1 L76 1" />

-      <path fill="none" d="M79 1 L82 1" />

-      <path fill="none" d="M85 1 L88 1" />

-      <path fill="none" d="M91 1 L94 1" />

-      <path fill="none" d="M97 1 L100 1" />

-      <path fill="none" d="M103 1 L106 1" />

-      <path fill="none" d="M109 1 L112 1" />

-      <path fill="none" d="M115 1 L118 1" />

-      <path fill="none" d="M121 1 L124 1" />

-      <path fill="none" d="M127 1 L130 1" />

-      <path fill="none" d="M133 1 L136 1" />

-      <path fill="none" d="M139 1 L142 1" />

-      <path fill="none" d="M145 1 L148 1" />

-      <path fill="none" d="M151 1 L154 1" />

-      <path fill="none" d="M157 1 L160 1" />

-      <path fill="none" d="M163 1 L166 1" />

-      <path fill="none" d="M169 1 L172 1" />

-      <path fill="none" d="M175 1 L178 1" />

-      <path fill="none" d="M181 1 L184 1" />

-      <path fill="none" d="M187 1 L190 1" />

-      <path fill="none" d="M193 1 L196 1" />

-      <path fill="none" d="M199 1 L202 1" />

-      <path fill="none" d="M205 1 L208 1" />

-      <path fill="none" d="M211 1 L214 1" />

-      <path fill="none" d="M217 1 L220 1" />

-      <path fill="none" d="M223 1 L226 1" />

-      <path fill="none" d="M229 1 L232 1" />

-      <path fill="none" d="M235 1 L238 1" />

-      <path fill="none" d="M241 1 L244 1" />

-      <path fill="none" d="M247 1 L250 1" />

-      <path fill="none" d="M253 1 L256 1" />

-      <path fill="none" d="M259 1 L262 1" />

-      <path fill="none" d="M265 1 L268 1" />

-      <path fill="none" d="M271 1 L274 1" />

-      <path fill="none" d="M277 1 L280 1" />

-      <path fill="none" d="M283 1 L286 1" />

-      <path fill="none" d="M289 1 L292 1" />

-      <path fill="none" d="M295 1 L298 1" />

-      <path fill="none" d="M301 1 L304 1" />

-      <path fill="none" d="M307 1 L310 1" />

-      <path fill="none" d="M313 1 L316 1" />

-      <path fill="none" d="M319 1 L322 1" />

-      <path fill="none" d="M325 1 L328 1" />

-      <path fill="none" d="M331 1 L334 1" />

-      <path fill="none" d="M337 1 L340 1" />

-      <path fill="none" d="M343 1 L346 1" />

-      <path fill="none" d="M349 1 L352 1" />

-      <path fill="none" d="M355 1 L358 1" />

-      <path fill="none" d="M361 1 L364 1" />

-      <path fill="none" d="M367 1 L370 1" />

-      <path fill="none" d="M373 1 L376 1" />

-      <path fill="none" d="M379 1 L382 1" />

-      <path fill="none" d="M385 1 L388 1" />

-      <path fill="none" d="M391 1 L394 1" />

-      <path fill="none" d="M397 1 L400 1" />

-      <path fill="none" d="M403 1 L406 1" />

-      <path fill="none" d="M409 1 L412 1" />

-      <path fill="none" d="M415 1 L418 1" />

-      <path fill="none" d="M421 1 L424 1" />

-      <path fill="none" d="M427 1 L430 1" />

-      <path fill="none" d="M433 1 L436 1" />

-      <path fill="none" d="M439 1 L442 1" />

-      <path fill="none" d="M445 1 L448 1" />

-      <path fill="none" d="M451 1 L454 1" />

-      <path fill="none" d="M457 1 L460 1" />

-      <path fill="none" d="M463 1 L466 1" />

-      <path fill="none" d="M469 1 L472 1" />

-      <path fill="none" d="M475 1 L478 1" />

-      <path fill="none" d="M481 1 L484 1" />

-      <path fill="none" d="M487 1 L490 1" />

-      <path fill="none" d="M493 1 L494 1 L494 1 L496 1 L496 1 L496 1" />

-      <path fill="none" d="M499 2 L500 2 L500 2 L501 2 L501 2 L502 2" />

-      <path fill="none" d="M505 3 L506 4 L506 4 L508 5 L508 5 L508 5" />

-      <path fill="none" d="M510 6 L511 6 L511 6 L512 7 L512 7 L513 8" />

-      <path fill="none" d="M515 9 L516 10 L516 10 L518 11 L518 11 L518 11" />

-      <path fill="none" d="M520 14 L520 14 L520 14 L521 15 L521 15 L521 16" />

-      <path fill="none" d="M523 19 L524 20 L524 20 L524 21 L524 21 L524 21" />

-      <path fill="none" d="M526 24 L526 24 L526 24 L526 26 L526 26 L527 27" />

-      <path fill="none" d="M527 30 L528 31 L528 31 L528 33" />

-      <path fill="none" d="M528 36 L528 36 L528 36 L528 39" />

-      <path fill="none" d="M528 42 L528 45" />

-      <path fill="none" d="M528 48 L528 51" />

-      <path fill="none" d="M528 54 L528 57" />

-      <path fill="none" d="M528 60 L528 63" />

-      <path fill="none" d="M528 66 L528 69" />

-      <path fill="none" d="M528 72 L528 75" />

-      <path fill="none" d="M528 78 L528 81" />

-      <path fill="none" d="M528 84 L528 87" />

-      <path fill="none" d="M528 90 L528 93" />

-      <path fill="none" d="M528 96 L528 99" />

-      <path fill="none" d="M528 102 L528 105" />

-      <path fill="none" d="M528 108 L528 111" />

-      <path fill="none" d="M528 114 L528 117" />

-      <path fill="none" d="M528 120 L528 123" />

-      <path fill="none" d="M528 126 L528 129" />

-      <path fill="none" d="M528 132 L528 135" />

-      <path fill="none" d="M528 138 L528 141" />

-      <path fill="none" d="M528 144 L528 147" />

-      <path fill="none" d="M528 150 L528 153" />

-      <path fill="none" d="M528 156 L528 159" />

-      <path fill="none" d="M528 162 L528 165" />

-      <path fill="none" d="M528 168 L528 171" />

-      <path fill="none" d="M528 174 L528 177" />

-      <path fill="none" d="M528 180 L528 183" />

-      <path fill="none" d="M528 186 L528 189" />

-      <path fill="none" d="M528 192 L528 195" />

-      <path fill="none" d="M528 198 L528 201" />

-      <path fill="none" d="M528 204 L528 207" />

-      <path fill="none" d="M528 210 L528 213" />

-      <path fill="none" d="M528 216 L528 219" />

-      <path fill="none" d="M528 222 L528 225" />

-      <path fill="none" d="M528 228 L528 231" />

-      <path fill="none" d="M528 234 L528 237" />

-      <path fill="none" d="M528 240 L528 243" />

-      <path fill="none" d="M528 246 L528 249" />

-      <path fill="none" d="M528 252 L528 255" />

-      <path fill="none" d="M528 258 L528 261" />

-      <path fill="none" d="M528 264 L528 267" />

-      <path fill="none" d="M528 270 L528 273" />

-      <path fill="none" d="M528 276 L528 279" />

-      <path fill="none" d="M528 282 L528 285" />

-      <path fill="none" d="M528 288 L528 291" />

-      <path fill="none" d="M528 294 L528 297" />

-      <path fill="none" d="M528 300 L528 303" />

-      <path fill="none" d="M528 306 L528 309" />

-      <path fill="none" d="M528 312 L528 315" />

-      <path fill="none" d="M528 318 L528 321 L528 321 L528 321" />

-      <path fill="none" d="M528 324 L528 324 L528 324 L528 326 L528 326 L527 327" />

-      <path fill="none" d="M527 330 L526 331 L526 331 L526 333" />

-      <path fill="none" d="M525 335 L524 336 L524 336 L524 337 L524 337 L523 338" />

-      <path fill="none" d="M522 341 L521 342 L521 342 L520 343 L520 343 L520 343" />

-      <path fill="none" d="M518 345 L518 346 L518 346 L516 347 L516 347 L516 347" />

-      <path fill="none" d="M513 349 L512 350 L512 350 L511 351 L511 351 L511 351" />

-      <path fill="none" d="M508 352 L508 353 L508 353 L506 353 L506 353 L505 354" />

-      <path fill="none" d="M503 355 L501 355 L501 355 L500 355" />

-      <path fill="none" d="M497 356 L496 356 L496 356 L494 356 L494 356 L494 356" />

-      <path fill="none" d="M491 356 L488 356" />

-      <path fill="none" d="M485 356 L482 356" />

-      <path fill="none" d="M479 356 L476 356" />

-      <path fill="none" d="M473 356 L470 356" />

-      <path fill="none" d="M467 356 L464 356" />

-      <path fill="none" d="M461 356 L458 356" />

-      <path fill="none" d="M455 356 L452 356" />

-      <path fill="none" d="M449 356 L446 356" />

-      <path fill="none" d="M443 356 L440 356" />

-      <path fill="none" d="M437 356 L434 356" />

-      <path fill="none" d="M431 356 L428 356" />

-      <path fill="none" d="M425 356 L422 356" />

-      <path fill="none" d="M419 356 L416 356" />

-      <path fill="none" d="M413 356 L410 356" />

-      <path fill="none" d="M407 356 L404 356" />

-      <path fill="none" d="M401 356 L398 356" />

-      <path fill="none" d="M395 356 L392 356" />

-      <path fill="none" d="M389 356 L386 356" />

-      <path fill="none" d="M383 356 L380 356" />

-      <path fill="none" d="M376 356 L373 356" />

-      <path fill="none" d="M371 356 L367 356" />

-      <path fill="none" d="M364 356 L361 356" />

-      <path fill="none" d="M358 356 L355 356" />

-      <path fill="none" d="M352 356 L349 356" />

-      <path fill="none" d="M346 356 L343 356" />

-      <path fill="none" d="M340 356 L337 356" />

-      <path fill="none" d="M334 356 L331 356" />

-      <path fill="none" d="M328 356 L325 356" />

-      <path fill="none" d="M322 356 L319 356" />

-      <path fill="none" d="M316 356 L313 356" />

-      <path fill="none" d="M310 356 L307 356" />

-      <path fill="none" d="M304 356 L301 356" />

-      <path fill="none" d="M298 356 L295 356" />

-      <path fill="none" d="M292 356 L289 356" />

-      <path fill="none" d="M286 356 L283 356" />

-      <path fill="none" d="M280 356 L277 356" />

-      <path fill="none" d="M274 356 L271 356" />

-      <path fill="none" d="M268 356 L265 356" />

-      <path fill="none" d="M262 356 L259 356" />

-      <path fill="none" d="M256 356 L253 356" />

-      <path fill="none" d="M250 356 L247 356" />

-      <path fill="none" d="M244 356 L241 356" />

-      <path fill="none" d="M238 356 L235 356" />

-      <path fill="none" d="M232 356 L229 356" />

-      <path fill="none" d="M226 356 L223 356" />

-      <path fill="none" d="M220 356 L217 356" />

-      <path fill="none" d="M214 356 L211 356" />

-      <path fill="none" d="M208 356 L205 356" />

-      <path fill="none" d="M202 356 L199 356" />

-      <path fill="none" d="M196 356 L193 356" />

-      <path fill="none" d="M190 356 L187 356" />

-      <path fill="none" d="M184 356 L181 356" />

-      <path fill="none" d="M178 356 L175 356" />

-      <path fill="none" d="M172 356 L169 356" />

-      <path fill="none" d="M166 356 L163 356" />

-      <path fill="none" d="M160 356 L157 356" />

-      <path fill="none" d="M154 356 L151 356" />

-      <path fill="none" d="M148 356 L145 356" />

-      <path fill="none" d="M142 356 L139 356" />

-      <path fill="none" d="M136 356 L133 356" />

-      <path fill="none" d="M130 356 L127 356" />

-      <path fill="none" d="M124 356 L121 356" />

-      <path fill="none" d="M118 356 L115 356" />

-      <path fill="none" d="M112 356 L109 356" />

-      <path fill="none" d="M106 356 L103 356" />

-      <path fill="none" d="M100 356 L97 356" />

-      <path fill="none" d="M94 356 L91 356" />

-      <path fill="none" d="M88 356 L85 356" />

-      <path fill="none" d="M82 356 L79 356" />

-      <path fill="none" d="M76 356 L73 356" />

-      <path fill="none" d="M70 356 L67 356" />

-      <path fill="none" d="M64 356 L61 356" />

-      <path fill="none" d="M58 356 L55 356" />

-      <path fill="none" d="M52 356 L49 356" />

-      <path fill="none" d="M46 356 L43 356" />

-      <path fill="none" d="M40 356 L37 356" />

-      <path fill="none" d="M34 356 L33 356 L33 356 L31 356 L31 356 L31 356" />

-      <path fill="none" d="M28 355 L28 355 L28 355 L26 354 L26 354 L25 354" />

-      <path fill="none" d="M22 353 L21 353 L21 353 L20 352 L20 352 L20 352" />

-      <path fill="none" d="M17 350 L17 350 L17 350 L15 349 L15 349 L15 348" />

-      <path fill="none" d="M12 346 L11 346 L11 346 L10 344 L10 344 L10 344" />

-      <path fill="none" d="M8 342 L8 342 L8 342 L7 340 L7 340 L7 340" />

-      <path fill="none" d="M5 337 L5 336 L5 336 L4 334 L4 334 L4 334" />

-      <path fill="none" d="M3 331 L3 331 L3 331 L2 329 L2 329 L2 328" />

-      <path fill="none" d="M1 326 L1 324 L1 324 L1 323" />

-      <path fill="none" d="M1 320 L1 317" />

-      <path fill="none" d="M1 314 L1 311" />

-      <path fill="none" d="M1 308 L1 305" />

-      <path fill="none" d="M1 302 L1 299" />

-      <path fill="none" d="M1 296 L1 293" />

-      <path fill="none" d="M1 290 L1 286" />

-      <path fill="none" d="M1 284 L1 281" />

-      <path fill="none" d="M1 277 L1 275" />

-      <path fill="none" d="M1 272 L1 268" />

-      <path fill="none" d="M1 265 L1 263" />

-      <path fill="none" d="M1 259 L1 256" />

-      <path fill="none" d="M1 253 L1 250" />

-      <path fill="none" d="M1 247 L1 244" />

-      <path fill="none" d="M1 241 L1 238" />

-      <path fill="none" d="M1 235 L1 232" />

-      <path fill="none" d="M1 229 L1 226" />

-      <path fill="none" d="M1 223 L1 220" />

-      <path fill="none" d="M1 217 L1 214" />

-      <path fill="none" d="M1 211 L1 208" />

-      <path fill="none" d="M1 205 L1 202" />

-      <path fill="none" d="M1 199 L1 196" />

-      <path fill="none" d="M1 193 L1 190" />

-      <path fill="none" d="M1 187 L1 184" />

-      <path fill="none" d="M1 181 L1 178" />

-      <path fill="none" d="M1 175 L1 172" />

-      <path fill="none" d="M1 169 L1 166" />

-      <path fill="none" d="M1 163 L1 160" />

-      <path fill="none" d="M1 157 L1 154" />

-      <path fill="none" d="M1 151 L1 148" />

-      <path fill="none" d="M1 145 L1 142" />

-      <path fill="none" d="M1 139 L1 136" />

-      <path fill="none" d="M1 133 L1 130" />

-      <path fill="none" d="M1 127 L1 124" />

-      <path fill="none" d="M1 121 L1 118" />

-      <path fill="none" d="M1 115 L1 112" />

-      <path fill="none" d="M1 109 L1 106" />

-      <path fill="none" d="M1 103 L1 100" />

-      <path fill="none" d="M1 97 L1 94" />

-      <path fill="none" d="M1 91 L1 88" />

-      <path fill="none" d="M1 85 L1 82" />

-      <path fill="none" d="M1 79 L1 76" />

-      <path fill="none" d="M1 73 L1 70" />

-      <path fill="none" d="M1 67 L1 64" />

-      <path fill="none" d="M1 61 L1 58" />

-      <path fill="none" d="M1 55 L1 52" />

-      <path fill="none" d="M1 49 L1 46" />

-      <path fill="none" d="M1 43 L1 40" />

-      <path fill="none" d="M1 37 L1 36 L1 36 L1 35 L1 35 L1 34" />

-      <path fill="none" d="M1 31 L1 31 L1 31 L2 29 L2 29 L2 28" />

-      <path fill="none" d="M3 26 L3 24 L3 24 L4 23 L4 23 L4 23" />

-      <path fill="none" d="M5 20 L5 20 L5 20 L6 18 L6 18 L7 17" />

-      <path fill="none" d="M8 15 L9 14 L9 14 L10 13 L10 13 L10 13" />

-      <path fill="none" d="M12 11 L13 10 L13 10 L14 9 L14 9 L15 9" />

-      <path fill="none" d="M17 7 L18 6 L18 6 L20 5 L20 5 L20 5" />

-      <path fill="none" d="M22 4 L23 4 L23 4 L24 3 L24 3 L25 3" />

-      <path fill="none" d="M28 2 L29 2 L29 2 L31 1" />

-      <path fill="none" d="M34 1 L35 1 L35 1 L37 1" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.wmf
deleted file mode 100644
index 4714f18..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/grouping.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.emf
deleted file mode 100644
index 2506e2d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.svg
deleted file mode 100644
index cdb3ec1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/httpservlet.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="200" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="124" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAANUlEQVR42m3OAQoA

-QAQEwLMf3/XzU0qCEhmJSSL5ViCm7n5A5GnIsg3VDUPf6oZxugz7n7QPgAcYDZ9s

-nhQAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern2" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAANUlEQVR42m3OAQoA

-QAQEwLMf3/XzU0qCEhmJSSL5ViCm7n5A5GnIsg3VDUPf6oZxugz7n7QPgAcYDZ9s

-nhQAAAAASUVORK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g font-size="62" font-family="&apos;Arial Narrow&apos;">

-      <text xml:space="preserve" x="114" y="62" stroke="none">H S</text>

-      <ellipse fill="blue" rx="48" cx="70" ry="45" cy="77" stroke="none" />

-      <path fill="green" d="M34 55 L36 58 L53 57 L53 57 L54 57 L55 57 L56 57 L57 57 L58 57 L58 57 L59 57 L60 57 L60 57 L61 58 L61 59 L62 59 L62 60 L62 61 L63 61 L64 61 L64 61 L65 61 L65 62 L65 63 L65 64 L65 64 L64 65 L64 66 L63 66 L62 67 L62 68 L61 68 L60 69 L60 69 L59 70 L58 71 L58 71 L57 71 L57 72 L56 73 L56 73 L55 73 L55 74 L54 75 L54 76 L53 76 L53 76 L53 77 L52 78 L51 78 L51 78 L50 78 L49 79 L49 79 L48 80 L46 80 L46 80 L45 80 L44 80 L44 80 L43 80 L42 80 L41 80 L40 81 L39 81 L39 81 L38 81 L38 82 L37 82 L37 83 L36 83 L36 83 L35 84 L34 84 L34 85 L33 85 L33 85 L32 85 L32 85 L31 86 L30 86 L30 87 L29 87 L29 87 L28 87 L28 88 L27 89 L27 91 L27 92 L27 92 L26 92 L26 91 L26 90 L26 89 L26 88 L26 87 L26 86 L26 85 L26 85 L26 84 L26 83 L26 83 L27 82 L27 81 L27 81 L27 80 L27 79 L27 78 L27 78 L27 77 L27 76 L27 76 L27 75 L27 74 L27 73 L27 72 L27 71 L27 71 L27 70 L27 69 L27 69 L27 68 L27 67 L27 67 L27 66 L27 65 L27 64 L27 64 L27 63 L25 62 L25 61 L31 53 L30 54 Z" stroke="none" />

-      <path fill="green" d="M55 36 L54 36 L60 42 L60 41 L61 41 L61 40 L61 39 L61 39 L61 38 L61 37 L61 36 L61 36 L62 36 L63 36 L63 35 L65 35 L65 34 L65 34 L65 34 L66 34 L67 34 L67 34 L68 34 L69 34 L70 34 L70 33 L72 33 L72 33 L73 33 L74 33 L75 33 L76 33 L77 33 L77 33 L78 33 L79 34 L79 34 L80 34 L80 34 L81 34 L81 35 L82 36 L82 36 L82 36 L82 37 L82 38 L83 38 L83 39 L83 39 L84 39 L84 40 L84 40 L84 40 L84 41 L85 42 L86 42 L86 43 L87 43 L87 43 L88 43 L88 44 L89 45 L89 45 L89 45 L72 50 L72 55 L71 55 L68 55 Z" stroke="none" />

-      <path fill="green" d="M52 118 L63 122 L63 122 L65 122 L65 122 L66 122 L67 122 L67 122 L68 122 L69 122 L70 122 L71 122 L72 122 L72 122 L74 122 L74 122 L75 122 L76 121 L77 121 L78 121 L79 121 L79 121 L80 120 L81 120 L82 119 L82 119 L84 118 L84 118 L85 117 L86 117 L87 116 L87 116 L88 116 L87 115 L87 114 L86 114 L86 114 L85 114 L85 113 L85 113 L84 112 L83 112 L82 111 L82 111 L81 111 L80 111 L79 111 L79 111 L79 110 L78 110 L77 110 L77 110 L76 110 L75 110 L73 110 L72 110 L72 110 L71 110 L70 110 L70 110 L68 110 L68 110 L66 110 L65 110 L65 110 L64 110 L63 110 L63 110 L62 110 L61 111 L61 111 L60 111 L59 111 L58 111 L58 111 L57 112 L56 112 L56 112 L55 112 L54 112 L54 112 L53 112 L52 112 L51 112 L51 112 L50 113 L49 113 L49 113 L48 113 L47 113 L46 113 L46 113 L44 113 L44 114 L44 114 Z" stroke="none" />

-      <path fill="green" d="M89 83 L103 90 L104 91 L104 91 L105 91 L106 91 L107 91 L107 90 L107 89 L107 89 L108 88 L108 87 L109 87 L109 87 L109 87 L109 86 L110 86 L110 85 L111 85 L112 84 L112 84 L113 84 L114 84 L114 84 L115 84 L116 83 L117 82 L117 82 L117 81 L117 80 L117 79 L117 78 L117 77 L117 77 L117 76 L117 75 L116 75 L116 74 L116 73 L115 72 L115 71 L115 70 L115 70 L115 69 L115 68 L114 68 L114 67 L113 67 L113 66 L113 66 L112 65 L112 64 L112 63 L112 63 L112 63 L111 62 L111 61 L110 61 L110 61 L109 61 L109 60 L108 59 L107 59 L106 58 L105 57 L105 57 L104 57 L103 57 L102 56 L102 56 L101 56 L100 56 L100 56 L99 56 L98 56 L98 56 L97 56 L96 56 L95 56 L95 56 L94 56 L93 57 L93 58 L92 58 L91 58 L91 59 L90 60 L89 60 L88 61 L88 61 L88 61 L88 62 L88 63 L88 63 L88 64 L88 65 L88 65 L87 66 L86 67 L86 68 L86 68 L86 68 L85 68 L85 69 L85 70 L84 70 L84 70 L84 70 L84 71 L83 72 L83 73 L82 73 L82 73 L82 74 L82 75 L82 75 L82 76 L82 77 L82 77 L82 78 L82 79 L82 79 L82 80 L83 81 L83 82 L83 82 L84 82 L85 83 L86 84 L86 84 L86 84 L87 84 L88 85 L88 86 L88 86 L88 87 L89 87 L89 88 L90 89 L90 89 L90 90 L91 91 L92 92 L93 92 L93 93 L93 93 L94 94 L95 95 L95 96 L95 96 L95 97 L95 98 L95 98 L95 99 L95 100 L95 100 L95 101 L95 102 L95 103 L95 103 L95 103 L95 104 L95 105 L95 105 L95 106 L96 106 L97 106 L97 106 L97 106 L98 106 L99 106 L100 106 L101 107 L102 107 L102 107 L103 108 L103 107 L104 107 L104 107 L104 106 L105 106 L105 106 L106 106 L106 105 L107 104 L107 103 L107 103 L107 102 L107 101 L107 101 L107 100 L107 99 L106 98 L106 98 L106 97 L106 97 L105 97 L105 96 L105 95 L105 95 L105 94 L104 94 L104 94 L103 93 L103 92 L103 92 L103 91 L104 91 L104 90 L104 89 L104 90 L104 91 L103 91 L102 91 L103 91 L103 90 Z" stroke="none" />

-      <path fill="blue" d="M153 99 L153 99 L153 99 Z" stroke="none" />

-      <path fill="blue" d="M91 78 L94 77 L94 77 Z" stroke="none" />

-      <rect x="89" y="95" fill="gray" width="66" height="26" stroke="none" />

-      <rect stroke-linecap="round" x="89" y="95" fill="none" width="66" stroke-linejoin="round" height="26" />

-    </g>

-    <g stroke-linecap="round" font-size="62" fill="url(#pattern1)" font-family="&apos;Arial Narrow&apos;" stroke-linejoin="round" stroke="url(#pattern1)">

-      <rect width="18" x="97" height="4" y="106" stroke="none" />

-      <rect x="97" y="106" fill="none" width="18" height="4" stroke="black" />

-      <rect x="130" y="106" fill="url(#pattern2)" width="17" height="4" stroke="none" />

-      <rect x="130" y="106" fill="none" width="17" height="4" stroke="black" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.emf
deleted file mode 100644
index 016120f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.svg
deleted file mode 100644
index 556f39b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_model.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="95" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M40 82 L59 57" />

-      <path fill="none" d="M71 28 L76 43" />

-      <path fill="none" d="M36 29 L50 16" />

-      <path fill="none" d="M57 30 L37 59" />

-      <path fill="rgb(255,255,153)" d="M42 87 L12 87 L12 59 L42 59 L42 87 L42 87 Z" stroke="none" />

-      <path fill="none" d="M42 87 L12 87 L12 59 L42 59 L42 87 L42 87 Z" />

-      <path fill="rgb(255,255,153)" d="M18 67 L6 67 L6 62 L18 62 L18 67 L18 67 Z" stroke="none" />

-      <path fill="none" d="M18 67 L6 67 L6 62 L18 62 L18 67 L18 67 Z" />

-      <path fill="rgb(255,255,153)" d="M18 76 L6 76 L6 70 L18 70 L18 76 L18 76 Z" stroke="none" />

-      <path fill="none" d="M18 76 L6 76 L6 70 L18 70 L18 76 L18 76 Z" />

-      <path fill="rgb(255,255,153)" d="M18 84 L6 84 L6 79 L18 79 L18 84 L18 84 Z" stroke="none" />

-      <path fill="none" d="M18 84 L6 84 L6 79 L18 79 L18 84 L18 84 Z" />

-      <path fill="rgb(255,255,153)" d="M84 31 L53 31 L53 2 L84 2 L84 31 L84 31 Z" stroke="none" />

-      <path fill="none" d="M84 31 L53 31 L53 2 L84 2 L84 31 L84 31 Z" />

-      <path fill="rgb(255,255,153)" d="M60 11 L48 11 L48 5 L60 5 L60 11 L60 11 Z" stroke="none" />

-      <path fill="none" d="M60 11 L48 11 L48 5 L60 5 L60 11 L60 11 Z" />

-      <path fill="rgb(255,255,153)" d="M60 19 L48 19 L48 14 L60 14 L60 19 L60 19 Z" stroke="none" />

-      <path fill="none" d="M60 19 L48 19 L48 14 L60 14 L60 19 L60 19 Z" />

-      <path fill="rgb(255,255,153)" d="M60 28 L48 28 L48 22 L60 22 L60 28 L60 28 Z" stroke="none" />

-      <path fill="none" d="M60 28 L48 28 L48 22 L60 22 L60 28 L60 28 Z" />

-      <path fill="rgb(255,255,153)" d="M92 72 L62 72 L62 43 L92 43 L92 72 L92 72 Z" stroke="none" />

-      <path fill="none" d="M92 72 L62 72 L62 43 L92 43 L92 72 L92 72 Z" />

-      <path fill="rgb(255,255,153)" d="M68 52 L56 52 L56 46 L68 46 L68 52 L68 52 Z" stroke="none" />

-      <path fill="none" d="M68 52 L56 52 L56 46 L68 46 L68 52 L68 52 Z" />

-      <path fill="rgb(255,255,153)" d="M68 60 L56 60 L56 55 L68 55 L68 60 L68 60 Z" stroke="none" />

-      <path fill="none" d="M68 60 L56 60 L56 55 L68 55 L68 60 L68 60 Z" />

-      <path fill="rgb(255,255,153)" d="M68 69 L56 69 L56 63 L68 63 L68 69 L68 69 Z" stroke="none" />

-      <path fill="none" d="M68 69 L56 69 L56 63 L68 63 L68 69 L68 69 Z" />

-      <path fill="rgb(255,255,153)" d="M37 43 L6 43 L6 15 L37 15 L37 43 L37 43 Z" stroke="none" />

-      <path fill="none" d="M37 43 L6 43 L6 15 L37 15 L37 43 L37 43 Z" />

-      <path fill="rgb(255,255,153)" d="M13 23 L1 23 L1 18 L13 18 L13 23 L13 23 Z" stroke="none" />

-      <path fill="none" d="M13 23 L1 23 L1 18 L13 18 L13 23 L13 23 Z" />

-      <path fill="rgb(255,255,153)" d="M13 32 L1 32 L1 26 L13 26 L13 32 L13 32 Z" stroke="none" />

-      <path fill="none" d="M13 32 L1 32 L1 26 L13 26 L13 32 L13 32 Z" />

-      <path fill="rgb(255,255,153)" d="M13 40 L1 40 L1 35 L13 35 L13 40 L13 40 Z" stroke="none" />

-      <path fill="none" d="M13 40 L1 40 L1 35 L13 35 L13 40 L13 40 Z" />

-      <path fill="none" d="M15 42 L25 59" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.emf
deleted file mode 100644
index 2c20960..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.svg
deleted file mode 100644
index e496cfc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_subsystem.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="59" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 57 L1 57 L1 9 L69 9 L69 57 L69 57 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 57 L1 57 L1 9 L69 9 L69 57 L69 57 Z" />

-      <path fill="rgb(255,255,153)" d="M24 1 L1 1 L1 9 L24 9 L24 1 L24 1 Z" stroke="none" />

-      <path fill="none" d="M24 1 L1 1 L1 9 L24 9 L24 1 L24 1 Z" />

-      <path fill="rgb(255,255,153)" d="M55 47 L24 47 L24 19 L55 19 L55 47 L55 47 Z" stroke="none" />

-      <path fill="none" d="M55 47 L24 47 L24 19 L55 19 L55 47 L55 47 Z" />

-      <path fill="rgb(255,255,153)" d="M30 27 L19 27 L19 22 L30 22 L30 27 L30 27 Z" stroke="none" />

-      <path fill="none" d="M30 27 L19 27 L19 22 L30 22 L30 27 L30 27 Z" />

-      <path fill="rgb(255,255,153)" d="M30 36 L19 36 L19 30 L30 30 L30 36 L30 36 Z" stroke="none" />

-      <path fill="none" d="M30 36 L19 36 L19 30 L30 30 L30 36 L30 36 Z" />

-      <path fill="rgb(255,255,153)" d="M30 44 L19 44 L19 39 L30 39 L30 44 L30 44 Z" stroke="none" />

-      <path fill="none" d="M30 44 L19 44 L19 39 L30 39 L30 44 L30 44 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.emf
deleted file mode 100644
index 34f6f20..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.svg
deleted file mode 100644
index 6191421..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/implementation_system.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="81" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="69" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M33 11 L33 2 L9 2 L9 11 L9 11 L9 58 L78 58 L78 11 L33 11 L33 11 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M33 11 L33 2 L9 2 L9 11 L9 11 L9 58 L78 58 L78 11 L33 11 L33 11 Z" />

-      <path fill="rgb(255,255,153)" d="M69 67 L1 67 L1 19 L69 19 L69 67 L69 67 Z" stroke="none" />

-      <path fill="none" d="M69 67 L1 67 L1 19 L69 19 L69 67 L69 67 Z" />

-      <path fill="rgb(255,255,153)" d="M24 11 L1 11 L1 19 L24 19 L24 11 L24 11 Z" stroke="none" />

-      <path fill="none" d="M24 11 L1 11 L1 19 L24 19 L24 11 L24 11 Z" />

-      <path fill="rgb(255,255,153)" d="M55 57 L24 57 L24 29 L55 29 L55 57 L55 57 Z" stroke="none" />

-      <path fill="none" d="M55 57 L24 57 L24 29 L55 29 L55 57 L55 57 Z" />

-      <path fill="rgb(255,255,153)" d="M30 37 L19 37 L19 32 L30 32 L30 37 L30 37 Z" stroke="none" />

-      <path fill="none" d="M30 37 L19 37 L19 32 L30 32 L30 37 L30 37 Z" />

-      <path fill="rgb(255,255,153)" d="M30 46 L19 46 L19 40 L30 40 L30 46 L30 46 Z" stroke="none" />

-      <path fill="none" d="M30 46 L19 46 L19 40 L30 40 L30 46 L30 46 Z" />

-      <path fill="rgb(255,255,153)" d="M30 54 L19 54 L19 49 L30 49 L30 54 L30 54 Z" stroke="none" />

-      <path fill="none" d="M30 54 L19 54 L19 49 L30 49 L30 54 L30 54 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.svg
deleted file mode 100644
index 875d11e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="163" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="263" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M2 2 L159 2 L159 259 L2 259 L2 2 Z" />

-      </clipPath>

-    </defs>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <rect x="5" y="5" clip-path="url(#clipPath1)" fill="none" width="150" height="250" />

-      <path fill="none" d="M5 105 L155 105" clip-path="url(#clipPath1)" />

-      <path fill="none" d="M55 5 L55 255" clip-path="url(#clipPath1)" />

-      <path fill="none" d="M105 5 L105 255" clip-path="url(#clipPath1)" />

-      <path fill="none" d="M5 205 L155 205" clip-path="url(#clipPath1)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.wmf
deleted file mode 100644
index 21cfc3e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/itemGlossaire.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.emf
deleted file mode 100644
index 8fe7b04..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.svg
deleted file mode 100644
index 1fbf1cd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/library.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="96" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="92" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M94 22 L72 22 L72 90 L94 90 L94 22 Z" stroke="none" />

-      <path fill="none" d="M94 22 L72 22 L72 90 L94 90 L94 22 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-      <path d="M31 20 L4 20 L4 90 L31 90 L31 20 Z" stroke-miterlimit="4" stroke-linecap="butt" stroke="none" />

-      <path fill="none" d="M31 20 L4 20 L4 90 L31 90 L31 20 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="rgb(0,127,170)" stroke-miterlimit="4" stroke-linecap="butt" stroke="rgb(0,127,170)">

-      <path d="M27 15 L1 15 L1 85 L27 85 L27 15 Z" stroke="none" />

-      <path fill="none" d="M27 15 L1 15 L1 85 L27 85 L27 15 Z" stroke="black" />

-      <path fill="rgb(204,204,204)" d="M69 6 L35 6 L35 90 L69 90 L69 6 Z" stroke="none" />

-      <path fill="none" d="M69 6 L35 6 L35 90 L69 90 L69 6 Z" stroke="rgb(204,204,204)" />

-      <path fill="rgb(0,159,170)" d="M89 18 L68 18 L68 86 L89 86 L89 18 Z" stroke="none" />

-      <path fill="none" d="M89 18 L68 18 L68 86 L89 86 L89 18 Z" stroke="rgb(42,0,0)" />

-      <path fill="rgb(212,223,170)" d="M64 2 L31 2 L31 86 L64 86 L64 2 Z" stroke="none" />

-      <path fill="none" d="M64 2 L31 2 L31 86 L64 86 L64 2 Z" stroke="black" />

-      <path fill="rgb(42,63,85)" d="M27 39 L4 39 L4 31 L27 31 L27 39 Z" stroke="none" />

-      <path fill="rgb(42,63,85)" d="M27 85 L25 85 L25 16 L27 16 L27 85 Z" stroke="none" />

-      <path fill="none" d="M22 19 L4 19 L4 81" stroke="rgb(204,204,255)" />

-      <path fill="rgb(212,159,85)" d="M63 16 L32 16 L32 23 L63 23 L63 16 Z" stroke="none" />

-      <path fill="rgb(170,95,0)" d="M64 2 L62 2 L62 85 L64 85 L64 2 Z" stroke="none" />

-      <path fill="none" d="M59 4 L34 4 L34 79" stroke="white" />

-      <path fill="rgb(0,127,85)" d="M87 26 L69 26 L69 33 L87 33 L87 26 Z" stroke="none" />

-      <path fill="rgb(0,127,85)" d="M87 64 L69 64 L69 71 L87 71 L87 64 Z" stroke="none" />

-      <path fill="none" d="M85 21 L70 21 L70 79" stroke="rgb(153,255,255)" />

-      <path fill="none" d="M38 40 L56 40" stroke="rgb(170,31,0)" />

-      <path fill="none" d="M38 44 L56 44" stroke="rgb(170,31,0)" />

-      <path fill="rgb(42,63,85)" d="M88 19 L86 19 L86 85 L88 85 L88 19 Z" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.emf
deleted file mode 100644
index e038f33..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.svg
deleted file mode 100644
index 85a9f1e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/lines.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="519" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="681" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="blue" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" stroke="blue">

-      <line y2="336" fill="none" x1="4" x2="504" y1="3" />

-      <line fill="none" x1="504" x2="504" y1="336" y2="3" stroke-dasharray="5,3" stroke="fuchsia" />

-      <line fill="none" x1="504" x2="4" y1="3" y2="3" stroke-dasharray="1,3" stroke="aqua" />

-      <line fill="none" x1="4" x2="4" y1="3" y2="336" stroke-dasharray="5,3,1,3" stroke="lime" />

-      <line fill="none" x1="4" x2="504" y1="336" y2="336" stroke-dasharray="5,3,1,3,1,3" stroke="yellow" />

-      <line fill="none" x1="504" x2="504" y1="336" y2="669" stroke="yellow" stroke-width="25" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.emf
deleted file mode 100644
index 6da8648..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.svg
deleted file mode 100644
index fdbb6c9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_implementation.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="193" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="172" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,128)" stroke="rgb(255,255,128)">

-      <path d="M-1 41 L-1 170 L156 170 L156 51 L40 51 L40 31 L-1 31 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M-1 41 L-1 170 L156 170 L156 51 L40 51 L40 31 L-1 31 Z" />

-      <path fill="fuchsia" d="M191 87 L135 0 L99 26 L154 112 Z" stroke="none" />

-      <path fill="none" d="M191 87 L135 0 L99 26 L154 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.emf
deleted file mode 100644
index 4407e35..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.svg
deleted file mode 100644
index 1b23dae..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_private.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="186" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="214" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-width="7" stroke-linecap="round" stroke-linejoin="round">

-      <ellipse rx="37" fill="none" ry="47" cx="57" cy="123" />

-      <ellipse fill="none" rx="46" cx="57" ry="53" cy="116" stroke="gray" stroke-width="19" />

-      <rect x="0" y="119" fill="silver" width="114" height="93" stroke="none" stroke-width="19" />

-      <rect x="0" y="119" fill="none" width="114" height="93" stroke-width="1" />

-      <rect x="1" y="120" fill="white" width="87" height="17" stroke="none" stroke-width="1" />

-      <rect x="1" y="120" fill="none" width="87" height="17" stroke-width="1" />

-      <rect x="40" y="153" width="33" height="34" stroke="none" stroke-width="1" />

-      <rect x="40" y="153" fill="none" width="33" height="34" stroke-width="1" />

-      <path fill="fuchsia" d="M184 87 L128 0 L92 26 L147 112 Z" stroke-width="1" stroke="none" />

-      <path fill="none" d="M184 87 L128 0 L92 26 L147 112 Z" stroke-width="1" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.emf
deleted file mode 100644
index 038f175..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.svg
deleted file mode 100644
index e6a33dd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_project.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="94" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="114" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="fuchsia" stroke="fuchsia">

-      <path d="M92 87 L36 0 L0 26 L55 112 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M92 87 L36 0 L0 26 L55 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.emf
deleted file mode 100644
index b8fccd9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.svg
deleted file mode 100644
index 79e05ca..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_protected.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="173" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="203" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="yellow" stroke="yellow">

-      <path d="M79 10 L43 1 L3 10 L-1 44 L3 69 L19 82 L19 185 L39 202 L59 185 L59 159 L67 143 L57 133 L66 117 L59 108 L59 82 L79 74 L87 44 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M79 10 L43 1 L3 10 L-1 44 L3 69 L19 82 L19 185 L39 202 L59 185 L59 159 L67 143 L57 133 L66 117 L59 108 L59 82 L79 74 L87 44 Z" />

-      <ellipse rx="14" ry="14.5" cx="47" cy="42.5" stroke="none" />

-      <ellipse rx="14" fill="none" ry="14.5" cx="47" cy="42.5" />

-      <line y2="193" fill="none" x1="39" x2="39" y1="78" />

-      <path fill="fuchsia" d="M171 87 L115 0 L79 26 L134 112 Z" stroke="none" />

-      <path fill="none" d="M171 87 L115 0 L79 26 L134 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.emf
deleted file mode 100644
index 6b5823f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.svg
deleted file mode 100644
index e6a33dd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/method_public.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="94" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="114" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="fuchsia" stroke="fuchsia">

-      <path d="M92 87 L36 0 L0 26 L55 112 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M92 87 L36 0 L0 26 L55 112 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.svg
deleted file mode 100644
index 403ee21..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="424" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="406" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(48,172,193)" stroke="rgb(48,172,193)">

-      <path d="M259 90 L259 5 L350 5 L350 90 L259 90 Z" stroke="none" />

-      <path d="M333 293 L333 208 L418 208 L418 293 L333 293 Z" stroke="none" />

-    </g>

-    <g fill="rgb(45,45,45)" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(45,45,45)">

-      <path fill="none" d="M333 293 L333 208 L418 208 L418 293 L333 293 Z" />

-      <path fill="rgb(48,172,193)" d="M121 400 L121 315 L206 315 L206 400 L121 400 Z" stroke="none" />

-      <path fill="none" d="M121 400 L121 315 L206 315 L206 400 L121 400 Z" />

-      <path fill="rgb(48,172,193)" d="M5 176 L5 90 L90 90 L90 176 L5 176 Z" stroke="none" />

-      <path fill="none" d="M5 176 L5 90 L90 90 L90 176 L5 176 Z" />

-      <path fill="none" d="M252 56 L92 137" />

-      <path fill="none" d="M329 244 L210 375" />

-      <path fill="none" d="M312 93 L193 309" />

-      <path fill="none" d="M37 180 L164 309" />

-      <path fill="none" d="M259 90 L259 5 L350 5 L350 90 L259 90 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.wmf
deleted file mode 100644
index 7841844..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.svg
deleted file mode 100644
index cbe0352..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="357" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="322" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(48,172,193)" stroke="rgb(48,172,193)">

-      <path d="M74 240 L74 5 L283 5 L283 240 L74 240 Z" stroke="none" />

-    </g>

-    <g fill="rgb(45,45,45)" stroke-width="10" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(45,45,45)">

-      <path fill="none" d="M67 117 L5 153" />

-      <path fill="none" d="M177 247 L176 316" />

-      <path fill="none" d="M289 116 L351 152" />

-      <path fill="none" d="M73 240 L73 5 L284 5 L284 240 L73 240 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.wmf
deleted file mode 100644
index 7518ea7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/model_element.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.svg
deleted file mode 100644
index ae1da94..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1087" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="707" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(195,195,194)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(195,195,194)">

-      <path fill="none" d="M244 221 L529 111" />

-      <path fill="none" d="M626 247 L568 526" />

-      <path fill="none" d="M225 383 L412 526" />

-      <path fill="none" d="M674 635 L891 533" />

-      <path d="M31 312 L199 312 L199 156 L31 156 L31 312 Z" stroke="none" />

-      <path fill="none" d="M31 312 L199 312 L199 156 L31 156 L31 312" stroke-width="1" stroke="rgb(194,193,193)" />

-      <path fill="none" d="M31 212 L199 212" />

-      <path fill="none" d="M31 247 L199 247" />

-      <path d="M917 600 L1085 600 L1085 444 L917 444 L917 600 Z" stroke="none" />

-      <path fill="none" d="M917 600 L1085 600 L1085 444 L917 444 L917 600" stroke-width="1" stroke="rgb(194,193,193)" />

-      <path fill="none" d="M917 501 L1085 501" />

-      <path fill="none" d="M917 535 L1085 535" />

-      <path d="M442 705 L610 705 L610 549 L442 549 L442 705 Z" stroke="none" />

-      <path fill="none" d="M442 705 L610 705 L610 549 L442 549 L442 705" stroke-width="1" stroke="rgb(194,193,193)" />

-      <path fill="none" d="M442 606 L611 606" />

-      <path fill="none" d="M442 640 L611 640" />

-      <path d="M564 188 L732 188 L732 33 L564 33 L564 188 Z" stroke="none" />

-      <path fill="none" d="M564 188 L732 188 L732 33 L564 33 L564 188" stroke-width="1" stroke="rgb(194,193,193)" />

-      <path fill="none" d="M564 89 L732 89" />

-      <path fill="none" d="M564 123 L732 123" />

-      <path fill="none" d="M214 189 L499 79" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M596 215 L538 494" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M195 351 L383 494" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M644 604 L861 501" stroke="rgb(31,26,23)" />

-      <path fill="rgb(243,239,111)" d="M1 280 L169 280 L169 124 L1 124 L1 280 Z" stroke="none" />

-      <path fill="none" d="M1 280 L169 280 L169 124 L1 124 L1 280" stroke-width="1" stroke="rgb(37,34,30)" />

-      <path fill="none" d="M1 181 L169 181" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M1 215 L169 215" stroke="rgb(31,26,23)" />

-      <path fill="rgb(243,239,111)" d="M887 568 L1055 568 L1055 413 L887 413 L887 568 Z" stroke="none" />

-      <path fill="none" d="M887 568 L1055 568 L1055 413 L887 413 L887 568" stroke-width="1" stroke="rgb(37,34,30)" />

-      <path fill="none" d="M887 469 L1055 469" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M887 503 L1055 503" stroke="rgb(31,26,23)" />

-      <path fill="rgb(243,239,111)" d="M412 673 L580 673 L580 518 L412 518 L412 673 Z" stroke="none" />

-      <path fill="none" d="M412 673 L580 673 L580 518 L412 518 L412 673" stroke-width="1" stroke="rgb(37,34,30)" />

-      <path fill="none" d="M412 574 L581 574" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M412 608 L581 608" stroke="rgb(31,26,23)" />

-      <path fill="rgb(243,239,111)" d="M534 157 L702 157 L702 1 L534 1 L534 157 Z" stroke="none" />

-      <path fill="none" d="M534 157 L702 157 L702 1 L534 1 L534 157" stroke-width="1" stroke="rgb(37,34,30)" />

-      <path fill="none" d="M534 57 L702 57" stroke="rgb(31,26,23)" />

-      <path fill="none" d="M534 92 L702 92" stroke="rgb(31,26,23)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.wmf
deleted file mode 100644
index 45eaa3d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/object_anamod.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.emf
deleted file mode 100644
index defee11..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.svg
deleted file mode 100644
index 80ed8aa..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/path.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="600" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="414" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAGUlEQVR42mNgoAv4

-//8/GgOLCjQ5JoZBCwCyLAv33hLt2gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <path d="M0 0 ZM100 100 L199 100 L199 199 L100 199 L100 100 ZM200 212.5 L200 286.5 C200 293.4036 211.1929 299 225 299 L274 299 C287.8071 299 299 293.4036 299 286.5 L299 212.5 C299 205.5964 287.8071 200 274 200 L225 200 C211.1929 200 200 205.5964 200 212.5 ZM299 299.5 C299 354.4523 254.4523 399 199.5 399 C144.5477 399 100 354.4523 100 299.5 C100 244.5477 144.5477 200 199.5 200 C254.4523 200 299 244.5477 299 299.5 ZM200.752 140.9044 C196.6089 164.401 209.8166 187.5096 232.1647 195.8653 C254.5129 204.2209 279.6414 195.4456 291.9298 174.9944 ZM0 0 L300.752 140.9044 C296.6089 164.401 309.8166 187.5096 332.1647 195.8653 C354.5129 204.2209 379.6414 195.4456 391.9298 174.9944 ZM400.752 140.9044 C396.6089 164.401 409.8166 187.5096 432.1647 195.8653 C454.5129 204.2209 479.6414 195.4456 491.9298 174.9944 L449.5 149.5 ZM598.248 140.9044 C594.0908 117.3276 573.6563 100.1049 549.716 100.0005 C525.7757 99.896 505.1917 116.9397 500.8289 140.4793 C496.4661 164.019 509.575 187.3073 531.9626 195.7892 C554.3502 204.2711 579.5995 195.5154 591.9298 174.9944 ZM391 174 L535.3553 264.6447 C547.9866 277.2759 552.9197 295.6863 548.2963 312.9409 L535.3553 364.6447 C547.9866 377.2759 552.9197 395.6863 548.2963 412.9409 Z" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.svg
deleted file mode 100644
index 1698b62..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1000" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1000" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="10" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="10" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAGUlEQVR42mNgoAv4

-//8/GgOLCjQ5JoZBCwCyLAv33hLt2gAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="10" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <circle r="100" cx="100" cy="100" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <circle fill="none" r="100" cx="100" cy="100" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.wmf
deleted file mode 100644
index cb6dfa1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/patternbrush.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.svg
deleted file mode 100644
index 159e13d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1000" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1000" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="blue" stroke-linecap="round" stroke-linejoin="round" stroke="blue">

-      <line y2="100" fill="none" x1="0" x2="0" y1="0" />

-      <line fill="none" x1="100" x2="100" y1="0" y2="100" stroke="lime" />

-      <line fill="none" x1="200" x2="200" y1="0" y2="100" stroke="red" />

-      <line fill="none" x1="300" x2="300" y1="0" y2="100" stroke="fuchsia" />

-      <line fill="none" x1="400" x2="400" y1="0" y2="100" stroke="aqua" />

-      <line y2="200" fill="none" x1="0" x2="0" y1="100" />

-      <line fill="none" x1="100" x2="100" y1="100" y2="200" stroke="lime" />

-      <line fill="none" x1="300" x2="300" y1="100" y2="200" stroke="fuchsia" />

-      <line fill="none" x1="400" x2="400" y1="100" y2="200" stroke="aqua" />

-      <line fill="none" x1="500" x2="500" y1="100" y2="200" stroke="yellow" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.wmf
deleted file mode 100644
index f2b9b4d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/pens.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.emf
deleted file mode 100644
index fe0686a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.svg
deleted file mode 100644
index 4661af7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polydraw.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="519" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="469" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,127,0)" stroke-width="10" stroke-linejoin="bevel" stroke="rgb(255,127,0)">

-      <path fill="none" d="M9 9 L209 309 L509 109 C309 59 109 259 259 109 C309 409 109 109 209 409 ZM400 150 L329 459 L329 109 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.emf
deleted file mode 100644
index 2913bfb..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.svg
deleted file mode 100644
index bb6dc0f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolygon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="1006" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1006" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="lime" stroke="lime">

-      <path d="M3 3 L503 3 L503 503 L3 503 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" fill="blue" stroke-linejoin="round" stroke-dasharray="5,3" stroke="blue" stroke-width="3">

-      <path fill="none" d="M3 3 L503 3 L503 503 L3 503 Z" />

-      <path fill="lime" d="M503 503 L1002 503 L1002 1002 L503 1002 Z" stroke="none" />

-      <path fill="none" d="M503 503 L1002 503 L1002 1002 L503 1002 Z" />

-      <path fill="lime" d="M253 253 L753 253 L753 753 L253 753 Z" stroke="none" />

-      <path fill="none" d="M253 253 L753 253 L753 753 L253 753 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.emf
deleted file mode 100644
index 85b0568..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.svg
deleted file mode 100644
index 16b64c2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/polypolyline.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="379" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="379" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="red" stroke-dasharray="5,3,1,3,1,3" stroke-linecap="round" stroke-linejoin="round" stroke="red">

-      <path fill="none" d="M0 0 L188 0 L188 188 L0 188" />

-      <path fill="none" d="M188 188 L377 188 L377 377 L188 377" />

-      <path fill="none" d="M94 94 L283 94 L283 283 L94 283" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.svg
deleted file mode 100644
index 024182d..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="452" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="459" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(195,195,194)" stroke="rgb(195,195,194)">

-      <path d="M90 239 L282 239 L214 455 L22 455 L90 239 Z" stroke="none" />

-      <path fill="none" d="M90 239 L282 239 L214 455 L22 455 L90 239 Z" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" />

-    </g>

-    <g fill="rgb(245,197,146)" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(245,197,146)">

-      <path d="M73 223 L265 223 L196 439 L4 439 L73 223 Z" stroke="none" />

-      <path fill="none" d="M73 223 L265 223 L196 439 L4 439 L73 223 Z" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M174 198 L178 198 L181 198 L184 197 L188 197 L191 196 L194 195 L197 194 L200 193 L203 191 L206 190 L208 188 L211 187 L213 185 L216 183 L218 181 L221 179 L223 177 L225 174 L227 172 L229 169 L230 167 L232 164 L233 161 L235 158 L236 156 L237 153 L238 149 L238 146 L239 143 L239 140 L240 137 L240 133 L240 130 L239 127 L239 124 L238 120 L238 117 L237 114 L236 111 L235 108 L233 105 L232 103 L230 100 L229 97 L227 95 L225 92 L223 90 L221 88 L218 86 L216 84 L213 82 L211 80 L208 78 L206 77 L203 75 L200 74 L197 73 L194 72 L191 71 L188 70 L184 70 L181 69 L178 69 L174 69 L171 69 L168 69 L165 70 L161 70 L158 71 L155 72 L152 73 L149 74 L146 75 L143 77 L141 78 L138 80 L135 82 L133 84 L131 86 L128 88 L126 90 L124 92 L122 95 L120 97 L119 100 L117 103 L116 105 L114 108 L113 111 L112 114 L111 117 L110 120 L110 124 L109 127 L109 130 L109 133 L109 137 L109 140 L110 143 L110 146 L111 149 L112 153 L113 156 L114 158 L116 161 L117 164 L119 167 L120 169 L122 172 L124 174 L126 177 L128 179 L131 181 L133 183 L135 185 L138 187 L141 188 L143 190 L146 191 L149 193 L152 194 L155 195 L158 196 L161 197 L165 197 L168 198 L171 198 L174 198 Z" stroke="none" />

-      <path fill="none" d="M174 198 L178 198 L181 198 L184 197 L188 197 L191 196 L194 195 L197 194 L200 193 L203 191 L206 190 L208 188 L211 187 L213 185 L216 183 L218 181 L221 179 L223 177 L225 174 L227 172 L229 169 L230 167 L232 164 L233 161 L235 158 L236 156 L237 153 L238 149 L238 146 L239 143 L239 140 L240 137 L240 133 L240 130 L239 127 L239 124 L238 120 L238 117 L237 114 L236 111 L235 108 L233 105 L232 103 L230 100 L229 97 L227 95 L225 92 L223 90 L221 88 L218 86 L216 84 L213 82 L211 80 L208 78 L206 77 L203 75 L200 74 L197 73 L194 72 L191 71 L188 70 L184 70 L181 69 L178 69 L174 69 L171 69 L168 69 L165 70 L161 70 L158 71 L155 72 L152 73 L149 74 L146 75 L143 77 L141 78 L138 80 L135 82 L133 84 L131 86 L128 88 L126 90 L124 92 L122 95 L120 97 L119 100 L117 103 L116 105 L114 108 L113 111 L112 114 L111 117 L110 120 L110 124 L109 127 L109 130 L109 133 L109 137 L109 140 L110 143 L110 146 L111 149 L112 153 L113 156 L114 158 L116 161 L117 164 L119 167 L120 169 L122 172 L124 174 L126 177 L128 179 L131 181 L133 183 L135 185 L138 187 L141 188 L143 190 L146 191 L149 193 L152 194 L155 195 L158 196 L161 197 L165 197 L168 198 L171 198 L174 198" stroke="rgb(195,195,194)" />

-      <path d="M162 194 L165 194 L169 194 L172 194 L175 193 L178 192 L181 191 L184 190 L187 189 L190 188 L193 186 L196 185 L199 183 L201 181 L204 180 L206 177 L208 175 L210 173 L212 171 L214 168 L216 166 L218 163 L219 160 L221 158 L222 155 L223 152 L224 149 L225 146 L226 143 L227 140 L227 136 L227 133 L227 130 L227 126 L227 123 L227 120 L226 117 L225 114 L224 111 L223 108 L222 105 L221 102 L219 99 L218 96 L216 94 L214 91 L212 89 L210 86 L208 84 L206 82 L204 80 L201 78 L199 76 L196 75 L193 73 L190 72 L187 70 L184 69 L181 68 L178 67 L175 67 L172 66 L169 66 L165 65 L162 65 L159 65 L155 66 L152 66 L149 67 L146 67 L143 68 L140 69 L137 70 L134 72 L131 73 L128 75 L126 76 L123 78 L121 80 L118 82 L116 84 L114 86 L112 89 L110 91 L108 94 L106 96 L105 99 L103 102 L102 105 L101 108 L100 111 L99 114 L98 117 L98 120 L97 123 L97 126 L97 130 L97 133 L97 136 L98 140 L98 143 L99 146 L100 149 L101 152 L102 155 L103 158 L105 160 L106 163 L108 166 L110 168 L112 171 L114 173 L116 175 L118 177 L121 180 L123 181 L126 183 L128 185 L131 186 L134 188 L137 189 L140 190 L143 191 L146 192 L149 193 L152 194 L155 194 L159 194 L162 194 Z" stroke="none" />

-      <path fill="none" d="M162 194 L165 194 L169 194 L172 194 L175 193 L178 192 L181 191 L184 190 L187 189 L190 188 L193 186 L196 185 L199 183 L201 181 L204 180 L206 177 L208 175 L210 173 L212 171 L214 168 L216 166 L218 163 L219 160 L221 158 L222 155 L223 152 L224 149 L225 146 L226 143 L227 140 L227 136 L227 133 L227 130 L227 126 L227 123 L227 120 L226 117 L225 114 L224 111 L223 108 L222 105 L221 102 L219 99 L218 96 L216 94 L214 91 L212 89 L210 86 L208 84 L206 82 L204 80 L201 78 L199 76 L196 75 L193 73 L190 72 L187 70 L184 69 L181 68 L178 67 L175 67 L172 66 L169 66 L165 65 L162 65 L159 65 L155 66 L152 66 L149 67 L146 67 L143 68 L140 69 L137 70 L134 72 L131 73 L128 75 L126 76 L123 78 L121 80 L118 82 L116 84 L114 86 L112 89 L110 91 L108 94 L106 96 L105 99 L103 102 L102 105 L101 108 L100 111 L99 114 L98 117 L98 120 L97 123 L97 126 L97 130 L97 133 L97 136 L98 140 L98 143 L99 146 L100 149 L101 152 L102 155 L103 158 L105 160 L106 163 L108 166 L110 168 L112 171 L114 173 L116 175 L118 177 L121 180 L123 181 L126 183 L128 185 L131 186 L134 188 L137 189 L140 190 L143 191 L146 192 L149 193 L152 194 L155 194 L159 194 L162 194" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M176 211 L367 211 L299 427 L107 427 L176 211 Z" stroke="none" />

-      <path fill="none" d="M176 211 L367 211 L299 427 L107 427 L176 211 Z" stroke="rgb(195,195,194)" />

-      <path d="M158 194 L350 194 L281 410 L89 410 L158 194 Z" stroke="none" />

-      <path fill="none" d="M158 194 L350 194 L281 410 L89 410 L158 194 Z" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M259 170 L263 169 L266 169 L269 169 L273 168 L276 168 L279 167 L282 166 L285 164 L288 163 L291 162 L293 160 L296 159 L298 157 L301 155 L303 153 L306 151 L308 148 L310 146 L312 144 L314 141 L315 138 L317 136 L318 133 L320 130 L321 127 L322 124 L323 121 L323 118 L324 115 L324 112 L325 108 L325 105 L325 102 L324 99 L324 95 L323 92 L323 89 L322 86 L321 83 L320 80 L318 77 L317 74 L315 72 L314 69 L312 67 L310 64 L308 62 L306 59 L303 57 L301 55 L298 53 L296 52 L293 50 L291 48 L288 47 L285 46 L282 45 L279 43 L276 43 L273 42 L269 41 L266 41 L263 41 L259 41 L256 41 L253 41 L250 41 L246 42 L243 43 L240 43 L237 45 L234 46 L231 47 L228 48 L226 50 L223 52 L220 53 L218 55 L216 57 L213 59 L211 62 L209 64 L207 67 L205 69 L204 72 L202 74 L201 77 L199 80 L198 83 L197 86 L196 89 L196 92 L195 95 L195 99 L194 102 L194 105 L194 108 L195 112 L195 115 L196 118 L196 121 L197 124 L198 127 L199 130 L201 133 L202 136 L204 138 L205 141 L207 144 L209 146 L211 148 L213 151 L216 153 L218 155 L220 157 L223 159 L226 160 L228 162 L231 163 L234 164 L237 166 L240 167 L243 168 L246 168 L250 169 L253 169 L256 169 L259 170 Z" stroke="none" />

-      <path fill="none" d="M259 170 L263 169 L266 169 L269 169 L273 168 L276 168 L279 167 L282 166 L285 164 L288 163 L291 162 L293 160 L296 159 L298 157 L301 155 L303 153 L306 151 L308 148 L310 146 L312 144 L314 141 L315 138 L317 136 L318 133 L320 130 L321 127 L322 124 L323 121 L323 118 L324 115 L324 112 L325 108 L325 105 L325 102 L324 99 L324 95 L323 92 L323 89 L322 86 L321 83 L320 80 L318 77 L317 74 L315 72 L314 69 L312 67 L310 64 L308 62 L306 59 L303 57 L301 55 L298 53 L296 52 L293 50 L291 48 L288 47 L285 46 L282 45 L279 43 L276 43 L273 42 L269 41 L266 41 L263 41 L259 41 L256 41 L253 41 L250 41 L246 42 L243 43 L240 43 L237 45 L234 46 L231 47 L228 48 L226 50 L223 52 L220 53 L218 55 L216 57 L213 59 L211 62 L209 64 L207 67 L205 69 L204 72 L202 74 L201 77 L199 80 L198 83 L197 86 L196 89 L196 92 L195 95 L195 99 L194 102 L194 105 L194 108 L195 112 L195 115 L196 118 L196 121 L197 124 L198 127 L199 130 L201 133 L202 136 L204 138 L205 141 L207 144 L209 146 L211 148 L213 151 L216 153 L218 155 L220 157 L223 159 L226 160 L228 162 L231 163 L234 164 L237 166 L240 167 L243 168 L246 168 L250 169 L253 169 L256 169 L259 170" stroke="rgb(195,195,194)" />

-      <path d="M247 166 L250 166 L254 166 L257 165 L260 165 L263 164 L267 163 L270 162 L273 161 L275 160 L278 158 L281 157 L284 155 L286 153 L289 151 L291 149 L293 147 L295 145 L297 142 L299 140 L301 137 L303 135 L305 132 L306 129 L307 127 L308 124 L309 121 L310 118 L311 114 L312 111 L312 108 L312 105 L312 101 L312 98 L312 95 L312 92 L311 89 L310 85 L309 82 L308 79 L307 76 L306 74 L305 71 L303 68 L301 65 L299 63 L297 60 L295 58 L293 56 L291 54 L289 52 L286 50 L284 48 L281 46 L278 45 L275 43 L273 42 L270 41 L267 40 L263 39 L260 38 L257 38 L254 37 L250 37 L247 37 L244 37 L240 37 L237 38 L234 38 L231 39 L228 40 L225 41 L222 42 L219 43 L216 45 L213 46 L211 48 L208 50 L206 52 L203 54 L201 56 L199 58 L197 60 L195 63 L193 65 L191 68 L190 71 L188 74 L187 76 L186 79 L185 82 L184 85 L183 89 L183 92 L182 95 L182 98 L182 101 L182 105 L182 108 L183 111 L183 114 L184 118 L185 121 L186 124 L187 127 L188 129 L190 132 L191 135 L193 137 L195 140 L197 142 L199 145 L201 147 L203 149 L206 151 L208 153 L211 155 L213 157 L216 158 L219 160 L222 161 L225 162 L228 163 L231 164 L234 165 L237 165 L240 166 L244 166 L247 166 Z" stroke="none" />

-      <path fill="none" d="M247 166 L250 166 L254 166 L257 165 L260 165 L263 164 L267 163 L270 162 L273 161 L275 160 L278 158 L281 157 L284 155 L286 153 L289 151 L291 149 L293 147 L295 145 L297 142 L299 140 L301 137 L303 135 L305 132 L306 129 L307 127 L308 124 L309 121 L310 118 L311 114 L312 111 L312 108 L312 105 L312 101 L312 98 L312 95 L312 92 L311 89 L310 85 L309 82 L308 79 L307 76 L306 74 L305 71 L303 68 L301 65 L299 63 L297 60 L295 58 L293 56 L291 54 L289 52 L286 50 L284 48 L281 46 L278 45 L275 43 L273 42 L270 41 L267 40 L263 39 L260 38 L257 38 L254 37 L250 37 L247 37 L244 37 L240 37 L237 38 L234 38 L231 39 L228 40 L225 41 L222 42 L219 43 L216 45 L213 46 L211 48 L208 50 L206 52 L203 54 L201 56 L199 58 L197 60 L195 63 L193 65 L191 68 L190 71 L188 74 L187 76 L186 79 L185 82 L184 85 L183 89 L183 92 L182 95 L182 98 L182 101 L182 105 L182 108 L183 111 L183 114 L184 118 L185 121 L186 124 L187 127 L188 129 L190 132 L191 135 L193 137 L195 140 L197 142 L199 145 L201 147 L203 149 L206 151 L208 153 L211 155 L213 157 L216 158 L219 160 L222 161 L225 162 L228 163 L231 164 L234 165 L237 165 L240 166 L244 166 L247 166" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M255 177 L447 177 L378 393 L186 393 L255 177 Z" stroke="none" />

-      <path fill="none" d="M255 177 L447 177 L378 393 L186 393 L255 177 Z" stroke="rgb(195,195,194)" />

-      <path d="M237 161 L429 161 L361 376 L169 376 L237 161 Z" stroke="none" />

-      <path fill="none" d="M237 161 L429 161 L361 376 L169 376 L237 161 Z" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M339 136 L342 136 L346 135 L349 135 L352 134 L355 134 L358 133 L361 132 L364 131 L367 129 L370 128 L373 126 L375 125 L378 123 L380 121 L383 119 L385 117 L387 114 L389 112 L391 110 L393 107 L395 105 L396 102 L398 99 L399 96 L400 93 L401 90 L402 87 L403 84 L403 81 L404 78 L404 74 L404 71 L404 68 L404 65 L403 61 L403 58 L402 55 L401 52 L400 49 L399 46 L398 43 L396 40 L395 38 L393 35 L391 33 L389 30 L387 28 L385 26 L383 23 L380 21 L378 19 L375 18 L373 16 L370 14 L367 13 L364 12 L361 11 L358 10 L355 9 L352 8 L349 7 L346 7 L342 7 L339 7 L336 7 L332 7 L329 7 L326 8 L323 9 L319 10 L316 11 L313 12 L311 13 L308 14 L305 16 L302 18 L300 19 L297 21 L295 23 L293 26 L291 28 L288 30 L287 33 L285 35 L283 38 L281 40 L280 43 L279 46 L278 49 L277 52 L276 55 L275 58 L274 61 L274 65 L274 68 L274 71 L274 74 L274 78 L274 81 L275 84 L276 87 L277 90 L278 93 L279 96 L280 99 L281 102 L283 105 L285 107 L287 110 L288 112 L291 114 L293 117 L295 119 L297 121 L300 123 L302 125 L305 126 L308 128 L311 129 L313 131 L316 132 L319 133 L323 134 L326 134 L329 135 L332 135 L336 136 L339 136 Z" stroke="none" />

-      <path fill="none" d="M339 136 L342 136 L346 135 L349 135 L352 134 L355 134 L358 133 L361 132 L364 131 L367 129 L370 128 L373 126 L375 125 L378 123 L380 121 L383 119 L385 117 L387 114 L389 112 L391 110 L393 107 L395 105 L396 102 L398 99 L399 96 L400 93 L401 90 L402 87 L403 84 L403 81 L404 78 L404 74 L404 71 L404 68 L404 65 L403 61 L403 58 L402 55 L401 52 L400 49 L399 46 L398 43 L396 40 L395 38 L393 35 L391 33 L389 30 L387 28 L385 26 L383 23 L380 21 L378 19 L375 18 L373 16 L370 14 L367 13 L364 12 L361 11 L358 10 L355 9 L352 8 L349 7 L346 7 L342 7 L339 7 L336 7 L332 7 L329 7 L326 8 L323 9 L319 10 L316 11 L313 12 L311 13 L308 14 L305 16 L302 18 L300 19 L297 21 L295 23 L293 26 L291 28 L288 30 L287 33 L285 35 L283 38 L281 40 L280 43 L279 46 L278 49 L277 52 L276 55 L275 58 L274 61 L274 65 L274 68 L274 71 L274 74 L274 78 L274 81 L275 84 L276 87 L277 90 L278 93 L279 96 L280 99 L281 102 L283 105 L285 107 L287 110 L288 112 L291 114 L293 117 L295 119 L297 121 L300 123 L302 125 L305 126 L308 128 L311 129 L313 131 L316 132 L319 133 L323 134 L326 134 L329 135 L332 135 L336 136 L339 136" stroke="rgb(195,195,194)" />

-      <path d="M327 132 L330 132 L333 132 L336 131 L340 131 L343 130 L346 129 L349 128 L352 127 L355 126 L358 124 L360 123 L363 121 L366 119 L368 117 L370 115 L373 113 L375 111 L377 109 L379 106 L381 104 L382 101 L384 98 L385 95 L387 93 L388 90 L389 87 L390 84 L390 80 L391 77 L391 74 L392 71 L392 68 L392 64 L391 61 L391 58 L390 55 L390 51 L389 48 L388 45 L387 42 L385 40 L384 37 L382 34 L381 32 L379 29 L377 27 L375 24 L373 22 L370 20 L368 18 L366 16 L363 14 L360 12 L358 11 L355 9 L352 8 L349 7 L346 6 L343 5 L340 4 L336 4 L333 3 L330 3 L327 3 L323 3 L320 3 L317 4 L313 4 L310 5 L307 6 L304 7 L301 8 L298 9 L295 11 L293 12 L290 14 L287 16 L285 18 L283 20 L280 22 L278 24 L276 27 L274 29 L272 32 L271 34 L269 37 L268 40 L266 42 L265 45 L264 48 L263 51 L263 55 L262 58 L262 61 L261 64 L261 68 L261 71 L262 74 L262 77 L263 80 L263 84 L264 87 L265 90 L266 93 L268 95 L269 98 L271 101 L272 104 L274 106 L276 109 L278 111 L280 113 L283 115 L285 117 L287 119 L290 121 L293 123 L295 124 L298 126 L301 127 L304 128 L307 129 L310 130 L313 131 L317 131 L320 132 L323 132 L327 132 Z" stroke="none" />

-      <path fill="none" d="M327 132 L330 132 L333 132 L336 131 L340 131 L343 130 L346 129 L349 128 L352 127 L355 126 L358 124 L360 123 L363 121 L366 119 L368 117 L370 115 L373 113 L375 111 L377 109 L379 106 L381 104 L382 101 L384 98 L385 95 L387 93 L388 90 L389 87 L390 84 L390 80 L391 77 L391 74 L392 71 L392 68 L392 64 L391 61 L391 58 L390 55 L390 51 L389 48 L388 45 L387 42 L385 40 L384 37 L382 34 L381 32 L379 29 L377 27 L375 24 L373 22 L370 20 L368 18 L366 16 L363 14 L360 12 L358 11 L355 9 L352 8 L349 7 L346 6 L343 5 L340 4 L336 4 L333 3 L330 3 L327 3 L323 3 L320 3 L317 4 L313 4 L310 5 L307 6 L304 7 L301 8 L298 9 L295 11 L293 12 L290 14 L287 16 L285 18 L283 20 L280 22 L278 24 L276 27 L274 29 L272 32 L271 34 L269 37 L268 40 L266 42 L265 45 L264 48 L263 51 L263 55 L262 58 L262 61 L261 64 L261 68 L261 71 L262 74 L262 77 L263 80 L263 84 L264 87 L265 90 L266 93 L268 95 L269 98 L271 101 L272 104 L274 106 L276 109 L278 111 L280 113 L283 115 L285 117 L287 119 L290 121 L293 123 L295 124 L298 126 L301 127 L304 128 L307 129 L310 130 L313 131 L317 131 L320 132 L323 132 L327 132" stroke="rgb(31,26,23)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.wmf
deleted file mode 100644
index fbc5b3b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/process_role.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.svg
deleted file mode 100644
index b2342e5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="447" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="240" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M6 6 L443 6 L443 235 L6 235 L6 6 Z" />

-      </clipPath>

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">

-        <path d="M3 3 L445 3 L445 238 L3 238 L3 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" stroke="white">

-      <ellipse clip-path="url(#clipPath1)" rx="215.5" cx="224.5" ry="112" cy="120" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <ellipse clip-path="url(#clipPath1)" fill="none" rx="215.5" cx="224.5" ry="112" cy="120" />

-      <path fill="none" d="M436 100 L313 222" clip-path="url(#clipPath1)" />

-    </g>

-    <g font-size="100" font-family="&apos;Arial&apos;" stroke-linecap="round" stroke-linejoin="round">

-      <text xml:space="preserve" x="100" y="156" clip-path="url(#clipPath2)" stroke="none">A</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.wmf
deleted file mode 100644
index a1720ae..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusAppui.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.svg
deleted file mode 100644
index d58829c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="460" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="252" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="white" stroke="white">

-      <path d="M446 126 L444 112 L438 97 L429 83 L417 70 L401 58 L383 47 L361 37 L338 29 L313 23 L286 18 L258 15 L230 14 L202 15 L175 18 L148 23 L123 29 L99 37 L78 47 L59 58 L44 70 L31 83 L22 97 L17 112 L15 126 L17 141 L22 155 L31 169 L44 182 L59 194 L78 205 L99 215 L123 223 L148 230 L175 234 L202 237 L230 238 L258 237 L286 234 L313 230 L338 223 L361 215 L383 205 L401 194 L417 182 L429 169 L438 155 L444 141 L446 126 Z" stroke="none" />

-    </g>

-    <g fill="rgb(26,26,26)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(26,26,26)">

-      <path fill="none" d="M446 126 L444 112 L438 97 L429 83 L417 70 L401 58 L383 47 L361 37 L338 29 L313 23 L286 18 L258 15 L230 14 L202 15 L175 18 L148 23 L123 29 L99 37 L78 47 L59 58 L44 70 L31 83 L22 97 L17 112 L15 126 L17 141 L22 155 L31 169 L44 182 L59 194 L78 205 L99 215 L123 223 L148 230 L175 234 L202 237 L230 238 L258 237 L286 234 L313 230 L338 223 L361 215 L383 205 L401 194 L417 182 L429 169 L438 155 L444 141 L446 126 Z" />

-      <path fill="none" d="M441 106 L319 228" />

-      <path fill="none" d="M423 69 L253 238" />

-    </g>

-    <g font-size="100" font-family="&apos;Arial&apos;" stroke-linecap="round" stroke-linejoin="round">

-      <text xml:space="preserve" x="107" y="162" stroke="none">E</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.wmf
deleted file mode 100644
index 27121da..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusEntreprise.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.svg
deleted file mode 100644
index 2a781dc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="442" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="234" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M3 3 L440 3 L440 232 L3 232 L3 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" stroke="white">

-      <ellipse clip-path="url(#clipPath1)" rx="215.5" cx="221.5" ry="112" cy="117" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <ellipse clip-path="url(#clipPath1)" fill="none" rx="215.5" cx="221.5" ry="112" cy="117" />

-      <path fill="none" d="M433 97 L310 219" clip-path="url(#clipPath1)" />

-    </g>

-    <g font-size="100" font-family="&apos;Arial&apos;" stroke-linecap="round" stroke-linejoin="round">

-      <text xml:space="preserve" x="89" y="148" clip-path="url(#clipPath1)" stroke="none">M</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.wmf
deleted file mode 100644
index 30c36c2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusMetier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.svg
deleted file mode 100644
index 1bcc08a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="442" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="234" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M3 3 L440 3 L440 232 L3 232 L3 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="white" stroke="white">

-      <ellipse clip-path="url(#clipPath1)" rx="215.5" cx="221.5" ry="112" cy="117" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <ellipse clip-path="url(#clipPath1)" fill="none" rx="215.5" cx="221.5" ry="112" cy="117" />

-      <path fill="none" d="M433 97 L310 219" clip-path="url(#clipPath1)" />

-    </g>

-    <g font-size="83" font-family="&apos;Arial&apos;" stroke-linecap="round" stroke-linejoin="round">

-      <text xml:space="preserve" x="60" y="148" clip-path="url(#clipPath1)" stroke="none">PSM</text>

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.wmf
deleted file mode 100644
index 036d948..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/processusSupportMetier.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.svg
deleted file mode 100644
index e590af2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="277" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="224" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M2 3 L273 3 L273 222 L2 222 L2 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="rgb(0,204,153)" stroke="rgb(0,204,153)">

-      <path d="M138 33 L138 6 L269 6 L269 108 L257 108 L257 109 L256 110 L256 111 L256 114 L257 115 L257 117 L258 118 L258 120 L258 122 L258 123 L258 125 L258 126 L257 127 L256 129 L255 130 L254 131 L253 132 L252 133 L250 133 L248 134 L246 134 L245 134 L243 134 L242 134 L240 134 L239 133 L238 133 L237 132 L234 131 L233 130 L232 129 L231 128 L230 126 L230 125 L229 123 L229 121 L230 119 L230 118 L231 116 L231 114 L231 111 L231 111 L231 110 L231 109 L209 109 L209 105 L209 103 L209 101 L209 99 L209 98 L208 97 L207 96 L206 95 L205 94 L204 94 L203 94 L201 94 L199 94 L197 94 L194 94 L193 94 L190 94 L188 94 L186 94 L183 93 L182 93 L180 91 L179 90 L178 89 L178 86 L178 85 L178 82 L178 81 L178 79 L177 77 L177 76 L176 75 L176 74 L175 74 L173 73 L172 72 L170 72 L168 71 L166 71 L163 70 L161 70 L159 69 L157 69 L156 68 L155 66 L154 65 L153 63 L152 61 L152 60 L152 58 L152 57 L153 55 L153 53 L153 51 L154 49 L154 47 L154 45 L153 43 L153 42 L152 40 L151 38 L150 37 L149 36 L148 35 L147 34 L146 34 L145 33 L143 33 L141 33 L140 33 L138 33 Z" clip-path="url(#clipPath1)" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M138 33 L138 6 L269 6 L269 108 L257 108 L257 109 L256 110 L256 111 L256 114 L257 115 L257 117 L258 118 L258 120 L258 122 L258 123 L258 125 L258 126 L257 127 L256 129 L255 130 L254 131 L253 132 L252 133 L250 133 L248 134 L246 134 L245 134 L243 134 L242 134 L240 134 L239 133 L238 133 L237 132 L234 131 L233 130 L232 129 L231 128 L230 126 L230 125 L229 123 L229 121 L230 119 L230 118 L231 116 L231 114 L231 111 L231 111 L231 110 L231 109 L209 109 L209 105 L209 103 L209 101 L209 99 L209 98 L208 97 L207 96 L206 95 L205 94 L204 94 L203 94 L201 94 L199 94 L197 94 L194 94 L193 94 L190 94 L188 94 L186 94 L183 93 L182 93 L180 91 L179 90 L178 89 L178 86 L178 85 L178 82 L178 81 L178 79 L177 77 L177 76 L176 75 L176 74 L175 74 L173 73 L172 72 L170 72 L168 71 L166 71 L163 70 L161 70 L159 69 L157 69 L156 68 L155 66 L154 65 L153 63 L152 61 L152 60 L152 58 L152 57 L153 55 L153 53 L153 51 L154 49 L154 47 L154 45 L153 43 L153 42 L152 40 L151 38 L150 37 L149 36 L148 35 L147 34 L146 34 L145 33 L143 33 L141 33 L140 33 L138 33 Z" clip-path="url(#clipPath1)" />

-      <path fill="rgb(153,204,255)" d="M136 194 L136 217 L269 217 L269 108 L257 108 L256 110 L256 111 L256 114 L257 116 L258 119 L258 121 L258 123 L258 125 L257 127 L256 128 L255 130 L253 131 L251 132 L249 133 L247 134 L245 134 L242 134 L240 133 L238 133 L235 132 L233 130 L232 129 L231 127 L230 125 L230 124 L230 122 L230 120 L230 118 L231 116 L231 115 L232 113 L232 110 L231 108 L209 108 L209 113 L209 116 L209 118 L209 120 L209 122 L208 124 L208 125 L207 126 L206 127 L205 128 L203 128 L201 129 L200 129 L198 129 L196 128 L195 128 L193 128 L191 128 L189 128 L186 128 L184 128 L182 129 L181 130 L179 131 L178 132 L177 134 L177 135 L177 138 L177 139 L177 141 L177 143 L177 144 L176 146 L175 147 L175 148 L173 149 L171 150 L170 151 L168 151 L166 152 L164 152 L161 152 L159 153 L158 153 L156 154 L155 155 L154 156 L153 157 L152 159 L151 161 L151 163 L151 165 L151 167 L152 169 L153 171 L153 173 L153 175 L153 176 L153 178 L152 180 L152 182 L151 183 L150 186 L149 188 L148 190 L147 191 L145 192 L144 193 L143 193 L141 194 L139 194 L136 194 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M136 194 L136 217 L269 217 L269 108 L257 108 L256 110 L256 111 L256 114 L257 116 L258 119 L258 121 L258 123 L258 125 L257 127 L256 128 L255 130 L253 131 L251 132 L249 133 L247 134 L245 134 L242 134 L240 133 L238 133 L235 132 L233 130 L232 129 L231 127 L230 125 L230 124 L230 122 L230 120 L230 118 L231 116 L231 115 L232 113 L232 110 L231 108 L209 108 L209 113 L209 116 L209 118 L209 120 L209 122 L208 124 L208 125 L207 126 L206 127 L205 128 L203 128 L201 129 L200 129 L198 129 L196 128 L195 128 L193 128 L191 128 L189 128 L186 128 L184 128 L182 129 L181 130 L179 131 L178 132 L177 134 L177 135 L177 138 L177 139 L177 141 L177 143 L177 144 L176 146 L175 147 L175 148 L173 149 L171 150 L170 151 L168 151 L166 152 L164 152 L161 152 L159 153 L158 153 L156 154 L155 155 L154 156 L153 157 L152 159 L151 161 L151 163 L151 165 L151 167 L152 169 L153 171 L153 173 L153 175 L153 176 L153 178 L152 180 L152 182 L151 183 L150 186 L149 188 L148 190 L147 191 L145 192 L144 193 L143 193 L141 194 L139 194 L136 194 Z" clip-path="url(#clipPath1)" />

-      <path fill="rgb(255,204,153)" d="M136 194 L136 217 L5 217 L5 114 L17 114 L17 113 L18 111 L18 110 L18 109 L17 107 L17 105 L16 104 L16 102 L16 101 L16 99 L16 98 L16 96 L17 95 L18 94 L19 92 L20 91 L21 90 L22 89 L24 89 L26 87 L28 87 L29 87 L31 87 L32 87 L34 87 L35 89 L36 89 L37 90 L40 91 L41 92 L42 93 L43 94 L44 96 L44 97 L45 99 L45 101 L44 103 L44 105 L43 106 L43 108 L42 110 L42 111 L43 111 L43 113 L65 113 L63 117 L63 120 L63 122 L63 124 L65 126 L65 128 L66 129 L66 130 L67 131 L69 132 L70 132 L72 133 L73 133 L75 133 L77 133 L78 132 L80 132 L82 132 L84 132 L86 132 L89 133 L91 133 L92 134 L94 135 L95 137 L96 139 L96 140 L96 142 L96 143 L96 145 L96 147 L96 149 L97 150 L98 151 L98 152 L100 153 L101 154 L103 155 L105 155 L107 156 L109 156 L111 156 L114 157 L115 157 L117 158 L118 159 L119 161 L120 162 L121 164 L122 165 L122 167 L122 169 L121 171 L121 173 L120 175 L120 177 L120 179 L120 180 L120 182 L120 184 L121 187 L122 188 L123 189 L124 191 L126 192 L127 193 L129 193 L130 194 L132 194 L134 194 L136 194 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M136 194 L136 217 L5 217 L5 114 L17 114 L17 113 L18 111 L18 110 L18 109 L17 107 L17 105 L16 104 L16 102 L16 101 L16 99 L16 98 L16 96 L17 95 L18 94 L19 92 L20 91 L21 90 L22 89 L24 89 L26 87 L28 87 L29 87 L31 87 L32 87 L34 87 L35 89 L36 89 L37 90 L40 91 L41 92 L42 93 L43 94 L44 96 L44 97 L45 99 L45 101 L44 103 L44 105 L43 106 L43 108 L42 110 L42 111 L43 111 L43 113 L65 113 L63 117 L63 120 L63 122 L63 124 L65 126 L65 128 L66 129 L66 130 L67 131 L69 132 L70 132 L72 133 L73 133 L75 133 L77 133 L78 132 L80 132 L82 132 L84 132 L86 132 L89 133 L91 133 L92 134 L94 135 L95 137 L96 139 L96 140 L96 142 L96 143 L96 145 L96 147 L96 149 L97 150 L98 151 L98 152 L100 153 L101 154 L103 155 L105 155 L107 156 L109 156 L111 156 L114 157 L115 157 L117 158 L118 159 L119 161 L120 162 L121 164 L122 165 L122 167 L122 169 L121 171 L121 173 L120 175 L120 177 L120 179 L120 180 L120 182 L120 184 L121 187 L122 188 L123 189 L124 191 L126 192 L127 193 L129 193 L130 194 L132 194 L134 194 L136 194 Z" clip-path="url(#clipPath1)" />

-      <path fill="rgb(204,153,255)" d="M138 33 L138 6 L5 6 L5 114 L17 114 L18 111 L18 110 L18 108 L17 106 L16 103 L16 101 L16 99 L16 97 L17 96 L18 94 L19 92 L21 91 L23 90 L25 89 L27 89 L29 87 L32 89 L34 89 L36 89 L38 90 L41 92 L42 94 L43 95 L44 97 L44 99 L44 101 L44 102 L44 104 L43 106 L43 108 L42 109 L42 111 L43 114 L65 114 L65 109 L65 106 L65 104 L65 103 L65 101 L66 99 L66 97 L67 96 L68 95 L69 94 L71 94 L73 94 L74 94 L76 94 L78 94 L79 94 L81 94 L83 94 L85 94 L87 94 L90 94 L92 93 L93 92 L95 91 L96 90 L97 89 L97 86 L97 85 L97 83 L97 81 L97 79 L97 78 L98 76 L99 75 L99 74 L101 73 L103 72 L104 72 L106 71 L108 71 L110 70 L112 70 L115 70 L116 69 L118 68 L119 67 L120 67 L121 65 L122 63 L123 61 L123 59 L123 58 L123 56 L122 54 L121 52 L121 50 L121 48 L121 46 L121 44 L122 43 L122 41 L123 40 L124 37 L125 36 L127 35 L128 34 L130 33 L131 33 L133 33 L135 33 L138 33 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M138 33 L138 6 L5 6 L5 114 L17 114 L18 111 L18 110 L18 108 L17 106 L16 103 L16 101 L16 99 L16 97 L17 96 L18 94 L19 92 L21 91 L23 90 L25 89 L27 89 L29 87 L32 89 L34 89 L36 89 L38 90 L41 92 L42 94 L43 95 L44 97 L44 99 L44 101 L44 102 L44 104 L43 106 L43 108 L42 109 L42 111 L43 114 L65 114 L65 109 L65 106 L65 104 L65 103 L65 101 L66 99 L66 97 L67 96 L68 95 L69 94 L71 94 L73 94 L74 94 L76 94 L78 94 L79 94 L81 94 L83 94 L85 94 L87 94 L90 94 L92 93 L93 92 L95 91 L96 90 L97 89 L97 86 L97 85 L97 83 L97 81 L97 79 L97 78 L98 76 L99 75 L99 74 L101 73 L103 72 L104 72 L106 71 L108 71 L110 70 L112 70 L115 70 L116 69 L118 68 L119 67 L120 67 L121 65 L122 63 L123 61 L123 59 L123 58 L123 56 L122 54 L121 52 L121 50 L121 48 L121 46 L121 44 L122 43 L122 41 L123 40 L124 37 L125 36 L127 35 L128 34 L130 33 L131 33 L133 33 L135 33 L138 33 Z" clip-path="url(#clipPath1)" />

-      <path fill="rgb(255,255,153)" d="M119 67 L121 65 L122 63 L122 61 L122 59 L122 56 L121 53 L120 51 L120 48 L120 46 L121 43 L122 41 L124 38 L125 36 L127 34 L130 33 L132 33 L135 33 L141 33 L144 33 L146 34 L147 35 L149 36 L150 37 L152 40 L153 42 L153 44 L154 46 L154 49 L153 51 L153 53 L152 55 L152 58 L151 60 L152 62 L152 63 L154 66 L155 68 L157 69 L159 70 L163 70 L165 71 L168 71 L170 72 L172 73 L174 73 L175 74 L176 75 L176 76 L177 78 L177 79 L177 80 L177 82 L177 84 L177 85 L177 87 L178 90 L179 91 L180 92 L182 93 L183 94 L185 94 L188 94 L190 94 L192 94 L194 94 L196 94 L198 94 L200 94 L202 94 L203 94 L204 94 L205 95 L207 96 L208 97 L208 99 L209 100 L209 102 L209 105 L209 109 L209 114 L209 118 L208 121 L208 124 L208 125 L207 127 L206 128 L204 128 L203 129 L201 129 L199 129 L196 129 L194 129 L193 129 L191 129 L189 129 L186 129 L185 129 L183 129 L182 130 L181 130 L179 131 L179 132 L178 133 L177 134 L177 137 L177 138 L177 139 L177 142 L177 144 L176 146 L176 148 L175 149 L173 150 L172 150 L170 151 L168 151 L166 152 L164 152 L161 152 L159 153 L158 154 L156 154 L155 155 L153 157 L152 158 L151 161 L151 163 L151 165 L152 166 L152 168 L153 170 L153 172 L153 175 L153 177 L153 179 L152 181 L152 183 L151 186 L150 188 L148 190 L147 191 L146 192 L144 193 L143 193 L142 194 L139 194 L136 194 L133 194 L131 194 L129 194 L127 193 L126 192 L125 191 L124 190 L123 189 L122 187 L121 186 L120 183 L120 181 L120 180 L120 178 L120 176 L120 175 L121 172 L121 171 L122 169 L122 167 L122 166 L121 164 L120 163 L120 162 L118 161 L117 159 L116 158 L114 157 L112 157 L110 156 L108 156 L106 156 L105 155 L103 155 L101 154 L99 153 L98 152 L97 151 L97 149 L96 147 L96 145 L96 143 L96 142 L96 140 L95 139 L94 137 L93 135 L92 134 L91 133 L89 133 L86 133 L84 132 L82 132 L81 133 L79 133 L77 133 L76 133 L73 133 L71 133 L69 133 L68 132 L67 131 L66 130 L65 128 L63 126 L63 123 L63 121 L63 117 L63 114 L63 110 L63 108 L65 105 L65 103 L65 100 L66 98 L66 97 L67 96 L68 95 L70 94 L71 94 L72 94 L74 94 L76 94 L79 94 L81 94 L82 94 L85 94 L87 94 L90 94 L92 93 L94 92 L95 91 L96 89 L97 87 L97 85 L97 84 L97 82 L97 79 L97 78 L98 76 L98 75 L100 74 L102 73 L104 72 L106 72 L107 71 L110 71 L112 70 L115 70 L117 69 L119 67 Z" clip-path="url(#clipPath1)" stroke="none" />

-      <path fill="none" d="M119 67 L121 65 L122 63 L122 61 L122 59 L122 56 L121 53 L120 51 L120 48 L120 46 L121 43 L122 41 L124 38 L125 36 L127 34 L130 33 L132 33 L135 33 L141 33 L144 33 L146 34 L147 35 L149 36 L150 37 L152 40 L153 42 L153 44 L154 46 L154 49 L153 51 L153 53 L152 55 L152 58 L151 60 L152 62 L152 63 L154 66 L155 68 L157 69 L159 70 L163 70 L165 71 L168 71 L170 72 L172 73 L174 73 L175 74 L176 75 L176 76 L177 78 L177 79 L177 80 L177 82 L177 84 L177 85 L177 87 L178 90 L179 91 L180 92 L182 93 L183 94 L185 94 L188 94 L190 94 L192 94 L194 94 L196 94 L198 94 L200 94 L202 94 L203 94 L204 94 L205 95 L207 96 L208 97 L208 99 L209 100 L209 102 L209 105 L209 109 L209 114 L209 118 L208 121 L208 124 L208 125 L207 127 L206 128 L204 128 L203 129 L201 129 L199 129 L196 129 L194 129 L193 129 L191 129 L189 129 L186 129 L185 129 L183 129 L182 130 L181 130 L179 131 L179 132 L178 133 L177 134 L177 137 L177 138 L177 139 L177 142 L177 144 L176 146 L176 148 L175 149 L173 150 L172 150 L170 151 L168 151 L166 152 L164 152 L161 152 L159 153 L158 154 L156 154 L155 155 L153 157 L152 158 L151 161 L151 163 L151 165 L152 166 L152 168 L153 170 L153 172 L153 175 L153 177 L153 179 L152 181 L152 183 L151 186 L150 188 L148 190 L147 191 L146 192 L144 193 L143 193 L142 194 L139 194 L136 194 L133 194 L131 194 L129 194 L127 193 L126 192 L125 191 L124 190 L123 189 L122 187 L121 186 L120 183 L120 181 L120 180 L120 178 L120 176 L120 175 L121 172 L121 171 L122 169 L122 167 L122 166 L121 164 L120 163 L120 162 L118 161 L117 159 L116 158 L114 157 L112 157 L110 156 L108 156 L106 156 L105 155 L103 155 L101 154 L99 153 L98 152 L97 151 L97 149 L96 147 L96 145 L96 143 L96 142 L96 140 L95 139 L94 137 L93 135 L92 134 L91 133 L89 133 L86 133 L84 132 L82 132 L81 133 L79 133 L77 133 L76 133 L73 133 L71 133 L69 133 L68 132 L67 131 L66 130 L65 128 L63 126 L63 123 L63 121 L63 117 L63 114 L63 110 L63 108 L65 105 L65 103 L65 100 L66 98 L66 97 L67 96 L68 95 L70 94 L71 94 L72 94 L74 94 L76 94 L79 94 L81 94 L82 94 L85 94 L87 94 L90 94 L92 93 L94 92 L95 91 L96 89 L97 87 L97 85 L97 84 L97 82 L97 79 L97 78 L98 76 L98 75 L100 74 L102 73 L104 72 L106 72 L107 71 L110 71 L112 70 L115 70 L117 69 L119 67 Z" clip-path="url(#clipPath1)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.wmf
deleted file mode 100644
index 0fe5ef6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/projet.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.emf
deleted file mode 100644
index f779bf1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.svg
deleted file mode 100644
index c41e650..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/sequence.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="85" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="78" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAJ0lEQVR42mNgwAZU

-gFAbCBmwkCCgBYQwgBDFpwNTHyE7kPVqEbQDALo+B5oGRrEQAAAAAElFTkSuQmCC

-" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <rect width="84" x="0" height="77" y="0" stroke="none" />

-    </g>

-    <g fill="rgb(37,34,30)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(37,34,30)">

-      <rect fill="none" width="84" x="0" height="77" y="0" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.emf
deleted file mode 100644
index 32e9a19..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.svg
deleted file mode 100644
index d069c5e..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serverpage.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="197" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="197" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAICAIAAAB/FOjAAAAAJElEQVR42mN+fn0b

-r+jS5dOJJRkbGhhIAkzp4duAFPHkiLQBAMzePUZro5TqAAAAAElFTkSuQmCC" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <path d="M98 4 L98 27 L125 33 L134 11 L164 31 L148 48 L163 70 L184 62 L192 98 L168 98 L163 125 L184 135 L163 165 L147 148 L124 163 L134 184 L98 192 L98 168 L70 163 L60 184 L31 164 L47 147 L32 125 L11 135 L4 98 L27 99 L33 70 L10 61 L31 32 L47 48 L69 32 L60 11 L98 4 Z" stroke="none" />

-    </g>

-    <g stroke-width="6" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M98 4 L98 27 L125 33 L134 11 L164 31 L148 48 L163 70 L184 62 L192 98 L168 98 L163 125 L184 135 L163 165 L147 148 L124 163 L134 184 L98 192 L98 168 L70 163 L60 184 L31 164 L47 147 L32 125 L11 135 L4 98 L27 99 L33 70 L10 61 L31 32 L47 48 L69 32 L60 11 L98 4 Z" />

-      <path fill="white" d="M56 98 L58 86 L63 76 L71 67 L80 61 L92 57 L103 57 L115 61 L124 67 L132 76 L137 86 L139 98 L137 110 L132 120 L124 129 L115 135 L103 139 L92 139 L80 135 L71 129 L63 120 L58 110 L56 98 Z" stroke="none" />

-      <path fill="none" d="M56 98 L58 86 L63 76 L71 67 L80 61 L92 57 L103 57 L115 61 L124 67 L132 76 L137 86 L139 98 L137 110 L132 120 L124 129 L115 135 L103 139 L92 139 L80 135 L71 129 L63 120 L58 110 L56 98 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.svg
deleted file mode 100644
index 973644b..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="426" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="218" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="8" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAIklEQVR42mPcpynH

-AAOO1x7C2UwMOADpEizI5u7XkqeFHQBZqwYPH92bggAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-      <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-        <path d="M2 3 L421 3 L421 216 L2 216 L2 3 Z" />

-      </clipPath>

-    </defs>

-    <g fill="url(#pattern1)" stroke="url(#pattern1)">

-      <ellipse clip-path="url(#clipPath1)" rx="208" cx="211" ry="105" cy="109" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.wmf
deleted file mode 100644
index 7ed7be5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/serviceSysteme.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.emf
deleted file mode 100644
index c148bb2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.svg
deleted file mode 100644
index 6e77412..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/shapes.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="600" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="414" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="blue" stroke="blue">

-      <rect width="99" x="100" height="99" y="100" stroke="none" />

-      <rect stroke-linecap="round" x="100" y="100" fill="none" width="99" stroke-linejoin="round" height="99" />

-      <rect stroke-linecap="round" x="200" y="200" width="99" stroke-linejoin="round" rx="25" ry="12.5" height="99" stroke="none" />

-      <rect stroke-linecap="round" x="200" y="200" fill="none" width="99" stroke-linejoin="round" rx="25" ry="12.5" height="99" />

-      <circle stroke-linecap="round" stroke-linejoin="round" r="99.5" cx="199.5" cy="299.5" stroke="none" />

-      <circle stroke-linecap="round" fill="none" stroke-linejoin="round" r="99.5" cx="199.5" cy="299.5" />

-      <path fill="none" d="M200.752 140.9044 A49.5 49.5 0 0 0 291.9298 174.9944" stroke-linecap="round" stroke-linejoin="round" />

-      <line stroke-linecap="round" fill="none" x1="0" x2="300" y1="0" y2="140" stroke-linejoin="round" />

-      <path fill="none" d="M300.752 140.9044 A49.5 49.5 0 0 0 391.9298 174.9944" stroke-linecap="round" stroke-linejoin="round" />

-      <path d="M400.752 140.9044 A49.5 49.5 0 0 0 491.9298 174.9944L 449.5 149.5 Z" stroke-linecap="round" stroke-linejoin="round" stroke="none" />

-      <path fill="none" d="M400.752 140.9044 A49.5 49.5 0 0 0 491.9298 174.9944L 449.5 149.5 Z" stroke-linecap="round" stroke-linejoin="round" />

-      <path d="M598.248 140.9044 A49.5 49.5 0 1 0 591.9298 174.9944Z" stroke-linecap="round" stroke-linejoin="round" stroke="none" />

-      <path fill="none" d="M598.248 140.9044 A49.5 49.5 0 1 0 591.9298 174.9944Z" stroke-linecap="round" stroke-linejoin="round" />

-      <line stroke-linecap="round" fill="none" x1="391" x2="535" y1="174" y2="264" stroke-linejoin="round" />

-      <path fill="none" d="M535.3553 264.6447 A50 50 0 0 1 548.2963 312.941" stroke-linecap="round" stroke-linejoin="round" />

-      <line stroke-linecap="round" fill="none" x1="548" x2="535" y1="312" y2="364" stroke-linejoin="round" />

-      <path fill="none" d="M535.3553 364.6447 A50 50 0 0 1 548.2963 412.941" stroke-linecap="round" stroke-linejoin="round" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.svg
deleted file mode 100644
index 87cbb15..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="2244" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1122" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(128,255,128)" stroke="rgb(128,255,128)">

-      <path d="M0 -1 L2200 0 L1402 548 L2200 1100 L0 1100 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 -1 L2200 0 L1402 548 L2200 1100 L0 1100 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.wmf
deleted file mode 100644
index c4ada46..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalreceipt.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.svg
deleted file mode 100644
index 73c3da6..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="2244" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="1122" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(128,255,128)" stroke="rgb(128,255,128)">

-      <path d="M0 0 L1501 0 L2199 548 L1500 1100 L0 1100 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M0 0 L1501 0 L2199 548 L1500 1100 L0 1100 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.wmf
deleted file mode 100644
index c9594eb..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/signalsend.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.emf
deleted file mode 100644
index 9406ea5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.svg
deleted file mode 100644
index 6f2eecf..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/source.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="75" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M72 25 L55 8 L7 8 L7 87 L72 87 L72 26 L72 25 L72 25 Z" stroke="none" />

-      <path fill="none" d="M72 25 L55 8 L7 8 L7 87 L72 87 L72 26 L72 25 L72 25 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-      <path d="M72 26 L55 8 L72 26 L72 26 L72 26 Z" stroke-miterlimit="4" stroke-linecap="butt" stroke="none" />

-      <path fill="none" d="M72 26 L55 8 L72 26 L72 26 L72 26 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="white" stroke-miterlimit="4" stroke-linecap="butt" stroke="white">

-      <path d="M49 2 L1 2 L1 81 L66 81 L66 19 L66 19 L49 2 L49 2 Z" stroke="none" />

-      <path d="M66 19 L49 19 L49 2 L66 19 Z" stroke="none" />

-      <path fill="none" d="M49 2 L1 2 L1 81 L66 81 L66 19 L66 19 L49 2" stroke="black" />

-      <path fill="none" d="M66 19 L49 19 L49 2" stroke="black" />

-      <path d="M49 19 L66 19 L66 19 L49 2 L49 19 L49 19 Z" stroke="none" />

-      <path fill="none" d="M49 19 L66 19 L66 19 L49 2 L49 19 L49 19 Z" stroke-linejoin="bevel" stroke="black" />

-      <path fill="none" d="M6 75 L6 7 L44 7" stroke-linejoin="bevel" />

-      <path fill="none" d="M19 25 L56 25" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M19 31 L56 31" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M19 38 L56 38" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="none" d="M19 44 L56 44" stroke-width="2" stroke="rgb(42,31,170)" />

-      <path fill="rgb(42,31,170)" d="M-371 572 ZM8 24 C9 24 11 23 11 21 C11 16 11 16 11 16 C11 14 12 12 14 12 C16 12 16 12 16 12 C16 14 16 14 16 14 C14 14 14 14 14 14 C13 14 13 15 13 16 C13 21 13 21 13 21 C13 24 11 25 10 25 C10 25 10 25 10 25 C11 25 13 26 13 29 C13 34 13 34 13 34 C13 35 13 36 14 36 C16 36 16 36 16 36 C16 38 16 38 16 38 C14 38 14 38 14 38 C12 38 11 36 11 34 C11 29 11 29 11 29 C11 27 9 26 8 26 Z" stroke-width="2" stroke="none" />

-      <path fill="rgb(42,31,170)" d="M8 26 ZM17 73 C18 73 18 73 18 73 C19 73 20 72 20 71 C20 66 20 66 20 66 C20 63 21 63 22 62 C22 62 22 62 22 62 C21 62 20 61 20 59 C20 54 20 54 20 54 C20 53 19 51 18 51 C17 51 17 51 17 51 C17 50 17 50 17 50 C19 50 19 50 19 50 C20 50 22 51 22 53 C22 58 22 58 22 58 C22 60 23 61 24 61 C24 63 24 63 24 63 C23 63 22 65 22 67 C22 71 22 71 22 71 C22 74 20 75 19 75 C17 75 17 75 17 75 Z" stroke-width="2" stroke="none" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.emf
deleted file mode 100644
index 4186f95..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.svg
deleted file mode 100644
index af7ab5f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/table.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="93" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="73" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(204,204,204)" stroke="rgb(204,204,204)">

-      <path d="M90 71 L6 71 L6 8 L90 8 L90 71 Z" stroke="none" />

-      <path fill="none" d="M90 71 L6 71 L6 8 L90 8 L90 71 Z" stroke-miterlimit="4" stroke-linecap="butt" />

-    </g>

-    <g fill="blue" stroke-miterlimit="4" stroke-linecap="butt" stroke="blue">

-      <path d="M85 64 L1 64 L1 1 L85 1 L85 64 Z" stroke="none" />

-      <path fill="none" d="M85 64 L1 64 L1 1 L85 1 L85 64 Z" stroke="black" />

-      <path fill="white" d="M57 47 L29 47 L29 27 L57 27 L57 47 Z" stroke="none" />

-      <path fill="rgb(102,255,255)" d="M29 47 L1 47 L1 27 L29 27 L29 47 Z" stroke="none" />

-      <path fill="white" d="M85 47 L57 47 L57 27 L85 27 L85 47 Z" stroke="none" />

-      <path fill="rgb(204,255,255)" d="M57 66 L29 66 L29 47 L57 47 L57 66 Z" stroke="none" />

-      <path fill="white" d="M29 66 L1 66 L1 47 L29 47 L29 66 Z" stroke="none" />

-      <path fill="white" d="M85 66 L57 66 L57 47 L85 47 L85 66 Z" stroke="none" />

-      <path fill="white" d="M57 27 L29 27 L29 8 L57 8 L57 27 Z" stroke="none" />

-      <path fill="white" d="M29 27 L1 27 L1 8 L29 8 L29 27 Z" stroke="none" />

-      <path fill="rgb(102,255,255)" d="M85 27 L57 27 L57 8 L85 8 L85 27 Z" stroke="none" />

-      <path fill="none" d="M85 66 L1 66 L1 8 L85 8 L85 66 Z" stroke="black" />

-      <path fill="none" d="M29 8 L29 66" stroke="black" />

-      <path fill="none" d="M57 8 L57 66" stroke="black" />

-      <path fill="none" d="M1 27 L85 27" stroke="black" />

-      <path fill="none" d="M1 47 L85 47" stroke="black" />

-      <path fill="none" d="M83 3 L2 3 L2 7" stroke="rgb(0,127,255)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.svg
deleted file mode 100644
index 8466543..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.svg
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="391" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="500" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(122,138,147)" stroke="rgb(122,138,147)">

-      <path d="M169 11 L173 12 L172 16 L176 17 L175 21 L179 22 L179 26 L183 27 L182 31 L186 32 L185 35 L189 37 L188 40 L192 42 L191 45 L195 47 L194 50 L198 51 L198 55 L201 56 L201 60 L205 61 L204 65 L208 66 L207 69 L208 70 L209 70 L209 70 L210 70 L210 70 L211 71 L211 71 L212 71 L212 71 L212 71 L212 72 L212 72 L212 72 L212 73 L212 73 L212 73 L212 74 L212 74 L211 74 L211 75 L211 75 L211 75 L210 76 L210 76 L209 77 L208 78 L207 78 L205 79 L204 80 L201 82 L198 84 L194 86 L190 89 L186 92 L181 95 L176 98 L170 102 L165 105 L160 108 L155 112 L150 115 L145 117 L141 120 L138 122 L136 123 L135 124 L133 126 L131 127 L130 129 L128 130 L127 132 L126 134 L124 135 L123 137 L121 139 L120 141 L119 143 L118 145 L117 148 L115 150 L114 152 L113 154 L112 157 L111 159 L110 161 L110 163 L109 166 L108 168 L107 170 L106 172 L106 175 L105 177 L104 179 L104 181 L103 183 L103 185 L102 187 L102 190 L101 192 L101 195 L100 198 L100 201 L99 204 L99 207 L98 211 L98 214 L97 218 L97 222 L95 230 L94 238 L93 247 L92 256 L91 265 L90 275 L89 284 L88 294 L88 299 L87 303 L87 308 L86 313 L86 322 L85 331 L85 339 L84 347 L84 355 L83 362 L83 368 L83 375 L83 380 L83 386 L82 390 L82 395 L82 399 L82 402 L82 405 L82 408 L82 410 L82 413 L82 415 L82 418 L82 421 L82 423 L82 426 L82 429 L83 431 L83 434 L83 436 L83 438 L83 440 L83 442 L84 443 L84 445 L84 446 L84 447 L84 449 L84 450 L84 451 L84 453 L85 454 L85 456 L85 458 L85 459 L85 461 L85 463 L85 465 L84 468 L84 470 L84 473 L84 474 L84 475 L84 477 L84 478 L84 479 L84 479 L84 480 L84 481 L85 482 L85 482 L85 483 L85 483 L85 483 L86 483 L86 484 L86 484 L87 484 L87 484 L87 483 L88 483 L88 483 L88 483 L89 482 L89 482 L89 481 L90 480 L90 480 L90 479 L91 478 L91 477 L91 476 L91 475 L91 474 L92 473 L92 471 L92 470 L92 468 L93 465 L93 462 L93 460 L93 457 L93 454 L93 451 L93 449 L93 446 L93 443 L93 441 L93 439 L93 437 L93 435 L93 433 L93 430 L93 426 L94 421 L94 415 L94 408 L94 405 L95 401 L95 397 L95 393 L95 388 L96 384 L96 379 L96 374 L97 369 L97 364 L98 359 L98 354 L99 348 L100 343 L100 337 L101 331 L102 326 L102 320 L103 314 L104 308 L105 302 L106 296 L107 290 L108 284 L109 279 L110 274 L110 269 L111 264 L112 259 L113 255 L114 250 L115 246 L116 242 L117 238 L117 235 L118 231 L119 228 L120 224 L121 221 L121 218 L123 213 L124 209 L125 205 L126 201 L127 199 L127 196 L128 196 L128 195 L128 194 L129 193 L129 192 L130 191 L130 190 L131 189 L131 188 L132 186 L133 185 L133 184 L134 183 L135 182 L136 181 L136 180 L137 179 L138 178 L139 177 L139 176 L140 175 L141 174 L142 173 L142 172 L143 172 L144 171 L145 170 L145 170 L146 169 L147 168 L148 168 L148 168 L150 166 L153 165 L157 162 L161 159 L166 156 L172 153 L178 149 L184 145 L190 141 L197 137 L203 133 L208 129 L214 126 L219 123 L223 120 L226 118 L227 117 L229 116 L230 116 L231 115 L233 114 L234 113 L235 112 L236 111 L237 110 L238 109 L239 108 L239 107 L240 106 L241 105 L242 104 L242 103 L243 102 L244 101 L244 100 L245 99 L246 98 L247 96 L247 95 L248 94 L248 92 L249 92 L249 91 L250 89 L250 88 L251 86 L251 85 L251 84 L251 83 L252 82 L252 80 L252 79 L252 78 L252 76 L252 75 L252 74 L252 72 L253 71 L252 69 L252 68 L252 66 L252 65 L252 63 L251 61 L251 60 L251 58 L250 56 L250 55 L249 53 L248 51 L247 50 L246 48 L246 46 L245 45 L244 43 L243 42 L242 41 L241 39 L240 38 L239 37 L239 36 L238 35 L237 34 L236 33 L235 32 L234 31 L233 30 L232 29 L231 28 L230 27 L229 27 L229 26 L228 25 L227 25 L225 23 L223 22 L221 21 L220 20 L219 19 L218 19 L217 18 L216 17 L214 16 L212 15 L209 14 L207 13 L205 12 L203 11 L200 10 L198 10 L196 9 L194 8 L192 7 L190 6 L188 6 L186 5 L186 5 L185 5 L184 4 L183 4 L182 4 L181 4 L181 4 L180 3 L178 3 L176 3 L175 3 L173 3 L172 3 L170 3 L169 3 L168 3 L167 3 L166 3 L166 4 L166 4 L165 4 L165 4 L165 4 L165 4 L165 4 L165 4 L165 5 L165 5 L165 5 L165 5 L165 6 L165 6 L166 7 L166 7 L167 8 L168 9 L168 10 L169 10 L169 11 L169 11 Z" stroke="none" />

-    </g>

-    <g fill="rgb(31,26,23)" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(31,26,23)">

-      <path fill="none" d="M169 11 L173 12 L172 16 L176 17 L175 21 L179 22 L179 26 L183 27 L182 31 L186 32 L185 35 L189 37 L188 40 L192 42 L191 45 L195 47 L194 50 L198 51 L198 55 L201 56 L201 60 L205 61 L204 65 L208 66 L207 69 L208 70 L209 70 L209 70 L210 70 L210 70 L211 71 L211 71 L212 71 L212 71 L212 71 L212 72 L212 72 L212 72 L212 73 L212 73 L212 73 L212 74 L212 74 L211 74 L211 75 L211 75 L211 75 L210 76 L210 76 L209 77 L208 78 L207 78 L205 79 L204 80 L201 82 L198 84 L194 86 L190 89 L186 92 L181 95 L176 98 L170 102 L165 105 L160 108 L155 112 L150 115 L145 117 L141 120 L138 122 L136 123 L135 124 L133 126 L131 127 L130 129 L128 130 L127 132 L126 134 L124 135 L123 137 L121 139 L120 141 L119 143 L118 145 L117 148 L115 150 L114 152 L113 154 L112 157 L111 159 L110 161 L110 163 L109 166 L108 168 L107 170 L106 172 L106 175 L105 177 L104 179 L104 181 L103 183 L103 185 L102 187 L102 190 L101 192 L101 195 L100 198 L100 201 L99 204 L99 207 L98 211 L98 214 L97 218 L97 222 L95 230 L94 238 L93 247 L92 256 L91 265 L90 275 L89 284 L88 294 L88 299 L87 303 L87 308 L86 313 L86 322 L85 331 L85 339 L84 347 L84 355 L83 362 L83 368 L83 375 L83 380 L83 386 L82 390 L82 395 L82 399 L82 402 L82 405 L82 408 L82 410 L82 413 L82 415 L82 418 L82 421 L82 423 L82 426 L82 429 L83 431 L83 434 L83 436 L83 438 L83 440 L83 442 L84 443 L84 445 L84 446 L84 447 L84 449 L84 450 L84 451 L84 453 L85 454 L85 456 L85 458 L85 459 L85 461 L85 463 L85 465 L84 468 L84 470 L84 473 L84 474 L84 475 L84 477 L84 478 L84 479 L84 479 L84 480 L84 481 L85 482 L85 482 L85 483 L85 483 L85 483 L86 483 L86 484 L86 484 L87 484 L87 484 L87 483 L88 483 L88 483 L88 483 L89 482 L89 482 L89 481 L90 480 L90 480 L90 479 L91 478 L91 477 L91 476 L91 475 L91 474 L92 473 L92 471 L92 470 L92 468 L93 465 L93 462 L93 460 L93 457 L93 454 L93 451 L93 449 L93 446 L93 443 L93 441 L93 439 L93 437 L93 435 L93 433 L93 430 L93 426 L94 421 L94 415 L94 408 L94 405 L95 401 L95 397 L95 393 L95 388 L96 384 L96 379 L96 374 L97 369 L97 364 L98 359 L98 354 L99 348 L100 343 L100 337 L101 331 L102 326 L102 320 L103 314 L104 308 L105 302 L106 296 L107 290 L108 284 L109 279 L110 274 L110 269 L111 264 L112 259 L113 255 L114 250 L115 246 L116 242 L117 238 L117 235 L118 231 L119 228 L120 224 L121 221 L121 218 L123 213 L124 209 L125 205 L126 201 L127 199 L127 196 L128 196 L128 195 L128 194 L129 193 L129 192 L130 191 L130 190 L131 189 L131 188 L132 186 L133 185 L133 184 L134 183 L135 182 L136 181 L136 180 L137 179 L138 178 L139 177 L139 176 L140 175 L141 174 L142 173 L142 172 L143 172 L144 171 L145 170 L145 170 L146 169 L147 168 L148 168 L148 168 L150 166 L153 165 L157 162 L161 159 L166 156 L172 153 L178 149 L184 145 L190 141 L197 137 L203 133 L208 129 L214 126 L219 123 L223 120 L226 118 L227 117 L229 116 L230 116 L231 115 L233 114 L234 113 L235 112 L236 111 L237 110 L238 109 L239 108 L239 107 L240 106 L241 105 L242 104 L242 103 L243 102 L244 101 L244 100 L245 99 L246 98 L247 96 L247 95 L248 94 L248 92 L249 92 L249 91 L250 89 L250 88 L251 86 L251 85 L251 84 L251 83 L252 82 L252 80 L252 79 L252 78 L252 76 L252 75 L252 74 L252 72 L253 71 L252 69 L252 68 L252 66 L252 65 L252 63 L251 61 L251 60 L251 58 L250 56 L250 55 L249 53 L248 51 L247 50 L246 48 L246 46 L245 45 L244 43 L243 42 L242 41 L241 39 L240 38 L239 37 L239 36 L238 35 L237 34 L236 33 L235 32 L234 31 L233 30 L232 29 L231 28 L230 27 L229 27 L229 26 L228 25 L227 25 L225 23 L223 22 L221 21 L220 20 L219 19 L218 19 L217 18 L216 17 L214 16 L212 15 L209 14 L207 13 L205 12 L203 11 L200 10 L198 10 L196 9 L194 8 L192 7 L190 6 L188 6 L186 5 L186 5 L185 5 L184 4 L183 4 L182 4 L181 4 L181 4 L180 3 L178 3 L176 3 L175 3 L173 3 L172 3 L170 3 L169 3 L168 3 L167 3 L166 3 L166 4 L166 4 L165 4 L165 4 L165 4 L165 4 L165 4 L165 4 L165 5 L165 5 L165 5 L165 5 L165 6 L165 6 L166 7 L166 7 L167 8 L168 9 L168 10 L169 10 L169 11 L169 11" />

-      <path fill="rgb(122,138,147)" d="M178 97 L179 97 L180 98 L181 99 L182 99 L183 100 L185 101 L186 101 L187 102 L188 103 L189 103 L189 104 L190 105 L191 105 L191 106 L192 106 L193 107 L193 108 L194 108 L194 109 L195 110 L195 111 L196 113 L197 114 L198 116 L198 117 L199 118 L199 120 L200 121 L200 123 L201 124 L201 125 L201 127 L201 128 L202 130 L202 131 L202 132 L204 131 L204 131 L204 130 L204 130 L204 129 L204 128 L204 126 L204 125 L203 123 L203 122 L202 120 L202 119 L202 118 L201 117 L201 116 L201 115 L200 114 L200 113 L199 112 L199 111 L198 111 L198 110 L197 109 L196 108 L196 107 L195 106 L194 106 L194 105 L193 104 L192 104 L192 103 L191 102 L190 102 L190 101 L189 101 L187 100 L186 99 L185 98 L184 97 L183 97 L182 97 L181 96 L180 96 L178 97 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M185 93 L185 93 L186 94 L187 94 L188 95 L189 95 L191 96 L192 97 L193 98 L195 99 L196 100 L196 100 L197 101 L198 101 L198 102 L199 103 L199 103 L200 104 L200 104 L201 106 L202 107 L203 109 L204 110 L204 111 L205 113 L206 114 L206 116 L207 117 L207 119 L207 120 L208 122 L208 124 L208 125 L209 127 L209 128 L207 130 L207 129 L207 129 L207 128 L207 127 L206 126 L206 124 L206 122 L205 121 L205 119 L204 117 L204 116 L204 115 L203 114 L203 113 L202 112 L202 111 L202 110 L201 109 L201 108 L200 107 L200 107 L199 106 L198 105 L198 105 L197 104 L197 103 L196 103 L195 102 L195 102 L194 101 L193 100 L191 99 L190 98 L189 97 L187 97 L186 96 L185 96 L184 95 L183 95 L183 94 L185 93 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M151 139 L150 139 L149 140 L146 142 L144 143 L141 145 L138 147 L135 148 L133 150 L133 150 L132 150 L131 151 L131 151 L131 152 L130 153 L130 153 L130 154 L129 154 L129 155 L129 155 L129 156 L129 156 L129 157 L129 157 L130 158 L130 158 L130 159 L130 159 L131 159 L131 160 L132 160 L132 160 L133 160 L133 160 L134 160 L135 160 L135 160 L136 160 L137 160 L137 159 L138 159 L141 157 L144 156 L146 154 L149 152 L151 151 L153 150 L154 149 L154 149 L151 139 Z" stroke="none" />

-      <path fill="none" d="M151 139 L150 139 L149 140 L146 142 L144 143 L141 145 L138 147 L135 148 L133 150 L133 150 L132 150 L131 151 L131 151 L131 152 L130 153 L130 153 L130 154 L129 154 L129 155 L129 155 L129 156 L129 156 L129 157 L129 157 L130 158 L130 158 L130 159 L130 159 L131 159 L131 160 L132 160 L132 160 L133 160 L133 160 L134 160 L135 160 L135 160 L136 160 L137 160 L137 159 L138 159 L141 157 L144 156 L146 154 L149 152 L151 151 L153 150 L154 149 L154 149 L151 139 Z" />

-      <path fill="rgb(122,138,147)" d="M178 87 L178 87 L178 87 L177 87 L177 88 L177 88 L177 89 L176 89 L176 89 L176 90 L176 90 L176 91 L176 91 L176 92 L176 92 L176 93 L176 93 L176 94 L177 94 L177 95 L177 95 L178 96 L179 96 L179 97 L180 97 L181 98 L182 98 L183 99 L185 99 L186 99 L187 100 L188 100 L189 101 L190 101 L191 102 L192 103 L193 103 L195 104 L196 105 L197 106 L198 107 L199 108 L200 109 L201 110 L201 111 L202 112 L203 113 L204 115 L205 116 L205 117 L206 118 L207 120 L207 121 L208 122 L208 124 L209 125 L209 127 L209 128 L210 130 L210 131 L210 133 L210 136 L210 139 L210 143 L210 147 L211 151 L211 156 L211 161 L211 165 L211 170 L212 175 L212 180 L212 185 L212 190 L213 195 L213 199 L213 204 L213 209 L214 215 L214 222 L215 230 L216 239 L216 248 L217 258 L218 268 L218 278 L219 288 L220 298 L221 308 L221 317 L222 326 L222 334 L223 342 L223 349 L223 356 L224 363 L224 371 L224 378 L224 386 L224 393 L224 400 L224 407 L224 414 L224 420 L224 425 L223 431 L223 435 L223 437 L223 439 L223 441 L223 442 L222 445 L222 447 L222 450 L221 452 L221 455 L220 457 L220 460 L219 462 L219 465 L218 467 L218 468 L218 470 L218 471 L218 472 L218 473 L218 475 L218 476 L218 477 L218 478 L218 480 L218 481 L218 482 L218 483 L218 485 L218 486 L218 486 L218 487 L218 488 L218 489 L218 489 L217 490 L217 490 L217 491 L217 491 L217 491 L216 491 L216 491 L216 491 L215 491 L215 491 L215 491 L214 490 L214 490 L214 489 L213 489 L213 488 L213 488 L212 487 L212 487 L212 486 L212 485 L211 484 L211 483 L211 483 L210 482 L210 481 L210 480 L210 479 L210 478 L209 477 L209 476 L209 475 L209 474 L209 473 L209 472 L209 471 L209 469 L209 467 L209 466 L209 464 L209 462 L209 460 L209 458 L209 457 L210 455 L210 453 L210 452 L210 450 L211 448 L211 446 L211 444 L212 442 L212 440 L212 437 L212 434 L212 430 L212 427 L213 423 L213 418 L213 413 L213 408 L213 402 L213 399 L213 396 L212 393 L212 390 L212 387 L212 383 L212 380 L212 377 L211 373 L211 370 L211 366 L210 363 L210 359 L210 355 L209 352 L209 348 L209 344 L208 340 L208 336 L207 332 L206 324 L205 316 L204 307 L202 298 L201 289 L199 280 L197 271 L196 262 L194 253 L192 245 L191 237 L189 229 L188 222 L186 216 L185 209 L183 204 L182 199 L181 194 L180 190 L179 187 L178 185 L178 183 L177 181 L177 180 L176 178 L175 176 L175 175 L174 173 L173 172 L173 171 L172 170 L172 169 L171 169 L171 168 L170 167 L169 166 L169 165 L168 165 L167 164 L167 163 L166 162 L165 162 L165 161 L164 160 L163 160 L162 159 L161 158 L161 158 L160 157 L159 157 L158 156 L157 156 L156 155 L156 154 L155 154 L154 153 L154 152 L153 152 L153 151 L152 150 L152 150 L151 149 L151 148 L150 147 L150 147 L150 146 L149 145 L149 144 L149 143 L148 142 L148 141 L148 140 L148 139 L148 138 L148 137 L148 136 L147 135 L147 134 L147 133 L147 131 L147 131 L148 130 L148 129 L148 128 L148 127 L148 126 L148 125 L148 124 L148 122 L148 120 L148 118 L148 115 L148 112 L148 109 L147 105 L147 100 L147 98 L146 95 L146 93 L146 91 L145 88 L145 86 L144 84 L144 82 L143 80 L143 77 L142 75 L142 73 L141 69 L140 66 L139 62 L138 58 L137 55 L136 52 L135 50 L135 49 L134 47 L134 46 L134 45 L133 43 L133 42 L133 41 L133 40 L133 39 L133 37 L133 36 L132 35 L132 35 L132 34 L132 33 L132 32 L133 31 L133 31 L133 30 L133 29 L133 29 L133 28 L133 28 L133 27 L134 27 L134 26 L134 26 L134 25 L134 25 L135 24 L135 24 L135 24 L135 23 L136 23 L136 23 L136 23 L136 23 L137 23 L137 23 L137 23 L137 23 L137 23 L137 23 L138 23 L138 24 L138 25 L139 26 L140 27 L140 28 L139 32 L143 33 L143 37 L146 37 L146 42 L150 42 L149 46 L153 47 L152 51 L156 52 L156 56 L159 57 L159 61 L162 62 L162 66 L166 67 L165 71 L169 72 L168 76 L172 77 L172 81 L175 81 L175 86 L178 87 Z" stroke="none" />

-      <path fill="none" d="M178 87 L178 87 L178 87 L177 87 L177 88 L177 88 L177 89 L176 89 L176 89 L176 90 L176 90 L176 91 L176 91 L176 92 L176 92 L176 93 L176 93 L176 94 L177 94 L177 95 L177 95 L178 96 L179 96 L179 97 L180 97 L181 98 L182 98 L183 99 L185 99 L186 99 L187 100 L188 100 L189 101 L190 101 L191 102 L192 103 L193 103 L195 104 L196 105 L197 106 L198 107 L199 108 L200 109 L201 110 L201 111 L202 112 L203 113 L204 115 L205 116 L205 117 L206 118 L207 120 L207 121 L208 122 L208 124 L209 125 L209 127 L209 128 L210 130 L210 131 L210 133 L210 136 L210 139 L210 143 L210 147 L211 151 L211 156 L211 161 L211 165 L211 170 L212 175 L212 180 L212 185 L212 190 L213 195 L213 199 L213 204 L213 209 L214 215 L214 222 L215 230 L216 239 L216 248 L217 258 L218 268 L218 278 L219 288 L220 298 L221 308 L221 317 L222 326 L222 334 L223 342 L223 349 L223 356 L224 363 L224 371 L224 378 L224 386 L224 393 L224 400 L224 407 L224 414 L224 420 L224 425 L223 431 L223 435 L223 437 L223 439 L223 441 L223 442 L222 445 L222 447 L222 450 L221 452 L221 455 L220 457 L220 460 L219 462 L219 465 L218 467 L218 468 L218 470 L218 471 L218 472 L218 473 L218 475 L218 476 L218 477 L218 478 L218 480 L218 481 L218 482 L218 483 L218 485 L218 486 L218 486 L218 487 L218 488 L218 489 L218 489 L217 490 L217 490 L217 491 L217 491 L217 491 L216 491 L216 491 L216 491 L215 491 L215 491 L215 491 L214 490 L214 490 L214 489 L213 489 L213 488 L213 488 L212 487 L212 487 L212 486 L212 485 L211 484 L211 483 L211 483 L210 482 L210 481 L210 480 L210 479 L210 478 L209 477 L209 476 L209 475 L209 474 L209 473 L209 472 L209 471 L209 469 L209 467 L209 466 L209 464 L209 462 L209 460 L209 458 L209 457 L210 455 L210 453 L210 452 L210 450 L211 448 L211 446 L211 444 L212 442 L212 440 L212 437 L212 434 L212 430 L212 427 L213 423 L213 418 L213 413 L213 408 L213 402 L213 399 L213 396 L212 393 L212 390 L212 387 L212 383 L212 380 L212 377 L211 373 L211 370 L211 366 L210 363 L210 359 L210 355 L209 352 L209 348 L209 344 L208 340 L208 336 L207 332 L206 324 L205 316 L204 307 L202 298 L201 289 L199 280 L197 271 L196 262 L194 253 L192 245 L191 237 L189 229 L188 222 L186 216 L185 209 L183 204 L182 199 L181 194 L180 190 L179 187 L178 185 L178 183 L177 181 L177 180 L176 178 L175 176 L175 175 L174 173 L173 172 L173 171 L172 170 L172 169 L171 169 L171 168 L170 167 L169 166 L169 165 L168 165 L167 164 L167 163 L166 162 L165 162 L165 161 L164 160 L163 160 L162 159 L161 158 L161 158 L160 157 L159 157 L158 156 L157 156 L156 155 L156 154 L155 154 L154 153 L154 152 L153 152 L153 151 L152 150 L152 150 L151 149 L151 148 L150 147 L150 147 L150 146 L149 145 L149 144 L149 143 L148 142 L148 141 L148 140 L148 139 L148 138 L148 137 L148 136 L147 135 L147 134 L147 133 L147 131 L147 131 L148 130 L148 129 L148 128 L148 127 L148 126 L148 125 L148 124 L148 122 L148 120 L148 118 L148 115 L148 112 L148 109 L147 105 L147 100 L147 98 L146 95 L146 93 L146 91 L145 88 L145 86 L144 84 L144 82 L143 80 L143 77 L142 75 L142 73 L141 69 L140 66 L139 62 L138 58 L137 55 L136 52 L135 50 L135 49 L134 47 L134 46 L134 45 L133 43 L133 42 L133 41 L133 40 L133 39 L133 37 L133 36 L132 35 L132 35 L132 34 L132 33 L132 32 L133 31 L133 31 L133 30 L133 29 L133 29 L133 28 L133 28 L133 27 L134 27 L134 26 L134 26 L134 25 L134 25 L135 24 L135 24 L135 24 L135 23 L136 23 L136 23 L136 23 L136 23 L137 23 L137 23 L137 23 L137 23 L137 23 L137 23 L138 23 L138 24 L138 25 L139 26 L140 27 L140 28 L139 32 L143 33 L143 37 L146 37 L146 42 L150 42 L149 46 L153 47 L152 51 L156 52 L156 56 L159 57 L159 61 L162 62 L162 66 L166 67 L165 71 L169 72 L168 76 L172 77 L172 81 L175 81 L175 86 L178 87 Z" />

-      <path fill="rgb(122,138,147)" d="M208 78 L209 78 L210 78 L211 78 L213 78 L215 78 L218 79 L221 79 L224 79 L226 79 L227 80 L229 80 L231 80 L232 81 L234 81 L236 81 L237 82 L239 82 L241 82 L242 83 L244 83 L246 84 L247 85 L248 85 L250 86 L251 83 L251 83 L250 83 L250 83 L249 82 L248 82 L246 81 L246 81 L245 81 L244 80 L243 80 L242 80 L240 79 L239 79 L237 79 L236 78 L234 78 L232 78 L231 78 L229 77 L226 77 L224 77 L222 77 L219 76 L217 76 L214 76 L211 76 L208 78 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M202 82 L203 82 L204 83 L205 84 L206 84 L207 85 L209 86 L210 87 L211 87 L213 89 L214 90 L215 90 L215 91 L216 91 L217 92 L217 93 L218 93 L218 94 L219 95 L220 96 L221 98 L221 99 L222 101 L223 102 L223 104 L224 105 L224 106 L224 108 L225 109 L225 111 L225 112 L226 113 L226 115 L226 116 L226 117 L228 116 L228 116 L228 115 L228 115 L228 114 L228 113 L228 111 L228 110 L227 108 L227 107 L226 105 L226 104 L226 103 L225 102 L225 101 L225 100 L224 99 L224 98 L223 97 L223 96 L222 96 L222 95 L221 94 L220 93 L220 92 L219 91 L218 91 L218 90 L217 89 L216 88 L216 88 L215 87 L214 87 L214 86 L213 86 L212 85 L210 84 L209 83 L208 82 L207 82 L206 81 L205 81 L204 81 L202 82 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M194 87 L195 87 L196 88 L197 89 L198 89 L199 90 L201 91 L202 91 L203 92 L204 93 L205 93 L205 94 L206 95 L207 95 L207 96 L208 96 L208 97 L209 98 L210 98 L210 99 L211 100 L212 101 L212 103 L213 104 L214 106 L214 107 L215 108 L216 110 L216 111 L216 113 L217 114 L217 115 L217 117 L217 118 L218 120 L218 121 L218 122 L220 121 L220 121 L220 120 L220 120 L220 119 L220 118 L220 116 L220 115 L219 113 L219 112 L218 110 L218 109 L218 108 L217 107 L217 106 L217 105 L216 104 L216 103 L215 102 L215 101 L214 101 L214 100 L213 99 L212 98 L212 97 L211 96 L210 96 L210 95 L209 94 L208 93 L208 93 L207 92 L206 92 L206 91 L205 91 L204 90 L202 89 L201 88 L200 87 L199 87 L198 86 L197 86 L196 86 L194 87 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M186 92 L187 92 L188 93 L189 94 L190 94 L191 95 L193 96 L194 97 L195 97 L196 98 L197 99 L197 99 L198 100 L199 100 L199 101 L200 101 L200 102 L201 103 L202 103 L202 104 L203 105 L204 106 L204 108 L205 109 L206 111 L207 112 L207 114 L208 115 L208 116 L208 118 L209 119 L209 121 L209 122 L209 123 L210 125 L210 126 L210 127 L212 126 L212 126 L212 125 L212 125 L212 124 L212 123 L212 121 L212 120 L211 118 L211 117 L210 115 L210 114 L210 113 L209 112 L209 111 L209 110 L208 109 L208 108 L207 107 L207 106 L206 106 L206 105 L205 104 L204 103 L204 102 L203 101 L202 101 L202 100 L201 99 L200 98 L200 98 L199 97 L198 97 L198 96 L197 96 L196 95 L194 94 L193 93 L192 92 L191 92 L190 91 L189 91 L188 91 L186 92 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M201 83 L201 83 L202 84 L203 84 L204 85 L205 85 L207 86 L208 87 L209 88 L210 89 L212 90 L212 90 L213 91 L214 91 L214 92 L215 92 L215 93 L216 94 L216 94 L217 95 L217 96 L218 96 L218 97 L219 98 L219 98 L219 99 L220 100 L220 101 L221 103 L222 104 L222 106 L223 107 L223 109 L223 110 L224 112 L224 114 L224 115 L225 117 L225 118 L223 119 L223 119 L223 119 L223 118 L223 117 L223 116 L222 114 L222 112 L221 111 L221 109 L220 107 L220 106 L220 105 L219 104 L219 103 L219 102 L218 101 L218 100 L217 99 L217 98 L216 98 L216 97 L215 96 L214 95 L214 95 L213 94 L213 93 L212 93 L211 92 L211 92 L210 91 L209 90 L207 89 L206 88 L205 87 L203 87 L202 86 L201 86 L200 85 L199 84 L199 84 L201 83 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M193 88 L193 88 L194 89 L195 89 L196 90 L197 90 L199 91 L200 92 L201 93 L203 94 L204 95 L205 95 L205 96 L206 96 L206 97 L207 97 L207 98 L208 99 L208 99 L209 101 L210 102 L211 104 L212 105 L213 107 L213 108 L214 109 L214 111 L215 112 L215 114 L215 115 L216 117 L216 119 L216 120 L217 122 L217 123 L215 125 L215 124 L215 124 L215 123 L215 122 L214 121 L214 119 L214 117 L213 116 L213 114 L212 112 L212 111 L212 110 L211 109 L211 108 L211 107 L210 106 L210 105 L209 104 L209 103 L208 103 L208 102 L207 101 L206 100 L206 100 L205 99 L205 98 L204 98 L203 97 L203 97 L202 96 L201 95 L199 94 L198 93 L197 92 L195 92 L194 91 L193 91 L192 90 L191 90 L191 89 L193 88 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M108 195 L106 195 L105 195 L105 195 L104 196 L104 196 L103 196 L103 196 L103 196 L102 196 L102 196 L102 197 L102 197 L102 197 L102 197 L101 198 L101 200 L101 202 L100 203 L100 204 L100 205 L100 206 L100 207 L100 208 L100 208 L100 208 L100 209 L100 209 L100 209 L100 209 L101 210 L102 210 L102 211 L103 211 L103 212 L104 212 L104 212 L105 213 L106 213 L106 214 L107 214 L108 214 L109 214 L109 215 L110 215 L111 215 L112 215 L113 215 L114 216 L115 216 L115 216 L116 215 L117 215 L118 215 L119 215 L120 214 L122 214 L122 213 L122 212 L122 211 L123 208 L124 206 L124 204 L125 202 L125 201 L125 201 L125 200 L125 200 L125 200 L125 200 L124 199 L124 199 L123 199 L123 199 L122 198 L122 198 L121 198 L120 197 L119 197 L117 197 L116 196 L114 196 L113 196 L111 196 L110 195 L109 195 L108 195 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M170 140 L171 140 L171 140 L171 141 L171 141 L172 141 L172 141 L172 142 L173 142 L173 142 L173 142 L174 142 L174 142 L174 143 L175 143 L175 143 L176 143 L176 143 L176 143 L177 143 L177 143 L178 143 L178 143 L179 143 L179 143 L179 143 L180 143 L180 143 L181 143 L181 143 L181 143 L182 142 L182 142 L183 142 L184 141 L184 141 L185 140 L185 140 L186 139 L186 139 L187 138 L187 138 L187 137 L187 137 L188 137 L188 136 L188 136 L188 135 L188 135 L188 135 L188 134 L188 134 L188 133 L188 133 L188 133 L188 132 L188 132 L187 131 L187 130 L186 129 L186 128 L186 127 L185 126 L185 126 L184 125 L183 123 L182 122 L182 121 L181 120 L180 119 L180 119 L179 119 L179 118 L178 118 L177 118 L177 118 L176 117 L175 117 L174 117 L174 117 L173 117 L173 117 L172 117 L172 117 L171 117 L171 117 L170 118 L170 118 L169 118 L169 118 L169 118 L168 119 L168 119 L167 119 L167 120 L167 120 L166 120 L166 121 L166 121 L166 121 L165 122 L165 122 L165 122 L165 123 L165 123 L164 123 L164 124 L164 124 L164 125 L164 126 L164 126 L164 127 L164 128 L164 128 L164 129 L164 129 L165 130 L165 131 L165 131 L166 132 L166 133 L167 134 L167 135 L168 136 L169 138 L170 139 L170 140 Z" stroke="none" />

-      <path fill="none" d="M170 140 L171 140 L171 140 L171 141 L171 141 L172 141 L172 141 L172 142 L173 142 L173 142 L173 142 L174 142 L174 142 L174 143 L175 143 L175 143 L176 143 L176 143 L176 143 L177 143 L177 143 L178 143 L178 143 L179 143 L179 143 L179 143 L180 143 L180 143 L181 143 L181 143 L181 143 L182 142 L182 142 L183 142 L184 141 L184 141 L185 140 L185 140 L186 139 L186 139 L187 138 L187 138 L187 137 L187 137 L188 137 L188 136 L188 136 L188 135 L188 135 L188 135 L188 134 L188 134 L188 133 L188 133 L188 133 L188 132 L188 132 L187 131 L187 130 L186 129 L186 128 L186 127 L185 126 L185 126 L184 125 L183 123 L182 122 L182 121 L181 120 L180 119 L180 119 L179 119 L179 118 L178 118 L177 118 L177 118 L176 117 L175 117 L174 117 L174 117 L173 117 L173 117 L172 117 L172 117 L171 117 L171 117 L170 118 L170 118 L169 118 L169 118 L169 118 L168 119 L168 119 L167 119 L167 120 L167 120 L166 120 L166 121 L166 121 L166 121 L165 122 L165 122 L165 122 L165 123 L165 123 L164 123 L164 124 L164 124 L164 125 L164 126 L164 126 L164 127 L164 128 L164 128 L164 129 L164 129 L165 130 L165 131 L165 131 L166 132 L166 133 L167 134 L167 135 L168 136 L169 138 L170 139 L170 140 Z" stroke="rgb(91,98,102)" />

-      <path fill="rgb(122,138,147)" d="M184 141 L184 140 L184 140 L185 140 L185 139 L186 139 L186 138 L186 138 L187 137 L187 137 L187 137 L187 136 L187 136 L187 136 L187 135 L187 135 L188 134 L187 134 L187 133 L187 133 L187 133 L187 132 L186 131 L186 130 L186 129 L185 128 L185 127 L184 126 L184 125 L183 123 L182 122 L181 121 L181 121 L180 120 L180 120 L180 120 L179 120 L179 119 L179 119 L178 119 L178 119 L178 118 L177 118 L177 118 L176 118 L176 118 L175 118 L175 118 L174 118 L173 118 L173 118 L173 118 L174 118 L175 119 L175 119 L176 119 L176 119 L176 120 L177 120 L177 120 L177 120 L177 120 L177 121 L177 121 L177 121 L177 121 L177 121 L177 121 L177 121 L176 121 L176 121 L175 121 L175 121 L174 121 L174 121 L177 123 L178 123 L178 124 L179 124 L179 125 L180 126 L180 127 L181 127 L181 128 L181 129 L182 129 L182 130 L182 130 L182 131 L182 131 L182 132 L182 132 L183 133 L183 133 L183 134 L182 134 L182 135 L182 135 L182 135 L182 135 L182 136 L182 136 L182 136 L181 136 L181 137 L181 137 L181 137 L181 137 L181 137 L182 137 L182 137 L182 137 L183 137 L183 137 L183 137 L183 137 L183 136 L184 136 L184 136 L183 137 L183 138 L183 138 L183 138 L183 139 L182 139 L182 139 L182 139 L182 139 L183 139 L183 139 L183 139 L183 139 L184 139 L184 139 L184 138 L184 138 L184 138 L185 138 L185 138 L185 139 L185 139 L185 139 L184 139 L184 139 L184 140 L184 140 L184 140 L184 141 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M176 123 L176 123 L175 123 L175 124 L175 124 L174 124 L173 124 L173 124 L172 125 L172 125 L172 125 L171 125 L171 125 L171 126 L171 126 L171 126 L170 126 L170 127 L170 127 L170 127 L170 128 L170 128 L170 128 L169 129 L169 129 L169 129 L169 130 L169 130 L169 130 L169 131 L169 131 L169 131 L169 132 L169 132 L170 132 L170 133 L170 133 L170 133 L170 133 L170 134 L170 134 L171 134 L171 135 L171 135 L171 135 L171 135 L172 135 L172 136 L172 136 L172 136 L173 136 L173 136 L173 136 L174 137 L174 137 L174 137 L175 137 L175 137 L175 137 L176 137 L176 137 L176 137 L177 137 L177 137 L177 137 L178 137 L178 137 L178 137 L179 136 L179 136 L179 136 L180 136 L180 136 L180 136 L180 135 L181 135 L181 135 L181 135 L181 135 L181 134 L182 134 L182 133 L182 133 L182 133 L182 132 L183 132 L183 132 L183 131 L183 131 L183 131 L183 130 L183 130 L183 130 L183 129 L183 129 L182 128 L182 128 L182 127 L182 126 L181 126 L181 125 L180 125 L180 125 L179 124 L179 124 L178 124 L177 124 L177 124 L177 123 L176 123 L176 123 Z" stroke="none" />

-      <path fill="none" d="M176 123 L176 123 L175 123 L175 124 L175 124 L174 124 L173 124 L173 124 L172 125 L172 125 L172 125 L171 125 L171 125 L171 126 L171 126 L171 126 L170 126 L170 127 L170 127 L170 127 L170 128 L170 128 L170 128 L169 129 L169 129 L169 129 L169 130 L169 130 L169 130 L169 131 L169 131 L169 131 L169 132 L169 132 L170 132 L170 133 L170 133 L170 133 L170 133 L170 134 L170 134 L171 134 L171 135 L171 135 L171 135 L171 135 L172 135 L172 136 L172 136 L172 136 L173 136 L173 136 L173 136 L174 137 L174 137 L174 137 L175 137 L175 137 L175 137 L176 137 L176 137 L176 137 L177 137 L177 137 L177 137 L178 137 L178 137 L178 137 L179 136 L179 136 L179 136 L180 136 L180 136 L180 136 L180 135 L181 135 L181 135 L181 135 L181 135 L181 134 L182 134 L182 133 L182 133 L182 133 L182 132 L183 132 L183 132 L183 131 L183 131 L183 131 L183 130 L183 130 L183 130 L183 129 L183 129 L182 128 L182 128 L182 127 L182 126 L181 126 L181 125 L180 125 L180 125 L179 124 L179 124 L178 124 L177 124 L177 124 L177 123 L176 123 L176 123 Z" stroke="rgb(91,98,102)" />

-      <path fill="rgb(122,138,147)" d="M166 5 L167 5 L168 5 L169 4 L170 4 L171 4 L172 4 L173 4 L174 4 L175 4 L175 4 L176 4 L177 4 L178 4 L179 4 L180 5 L181 5 L182 5 L183 5 L184 6 L185 6 L187 7 L188 7 L190 8 L193 9 L195 10 L198 11 L201 12 L204 14 L206 14 L208 15 L209 16 L211 17 L212 17 L214 18 L216 19 L217 20 L219 21 L221 22 L222 23 L224 24 L225 25 L227 26 L228 27 L230 28 L231 30 L233 31 L234 32 L235 34 L235 33 L233 33 L232 33 L231 33 L230 32 L229 32 L228 32 L227 32 L227 32 L226 32 L225 32 L224 32 L224 32 L223 32 L222 32 L221 32 L220 32 L220 33 L219 33 L218 33 L217 34 L216 34 L216 34 L215 35 L214 35 L214 35 L213 36 L213 36 L213 36 L213 37 L212 37 L212 37 L212 37 L212 38 L212 38 L212 38 L212 38 L212 39 L213 39 L213 39 L213 40 L213 40 L213 40 L213 40 L213 40 L213 41 L212 41 L212 41 L212 41 L212 42 L211 42 L211 42 L210 42 L210 43 L209 43 L208 43 L208 43 L207 43 L206 43 L205 44 L204 44 L202 44 L201 44 L199 44 L198 44 L197 45 L195 45 L194 45 L193 45 L192 45 L193 41 L189 40 L190 37 L186 35 L187 32 L183 30 L184 27 L180 25 L180 22 L177 20 L177 17 L173 15 L174 12 L170 10 L170 10 L169 10 L169 9 L168 8 L168 8 L167 7 L167 7 L167 6 L167 6 L166 6 L166 6 L166 5 L166 5 L166 5 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M238 38 L238 37 L236 37 L235 37 L234 37 L233 37 L232 37 L230 36 L229 36 L228 36 L228 36 L227 36 L226 36 L226 36 L225 37 L224 37 L224 37 L223 37 L223 37 L222 37 L221 38 L221 38 L221 38 L220 38 L220 39 L220 39 L220 39 L219 39 L219 39 L219 40 L219 40 L219 40 L219 40 L219 40 L219 41 L219 41 L219 41 L220 41 L220 42 L220 42 L221 43 L221 43 L221 43 L222 44 L222 44 L222 44 L222 44 L222 45 L222 45 L222 45 L222 45 L222 46 L222 46 L222 46 L222 46 L222 46 L221 46 L221 47 L221 47 L221 47 L220 47 L220 47 L220 47 L219 47 L218 48 L217 48 L216 48 L215 48 L214 48 L213 48 L211 48 L210 48 L209 48 L207 48 L206 48 L204 48 L203 48 L202 48 L201 49 L199 49 L197 49 L196 50 L196 50 L200 51 L199 55 L199 55 L199 54 L200 54 L200 54 L201 54 L202 53 L203 53 L203 53 L204 53 L205 53 L206 53 L207 53 L208 52 L209 52 L211 52 L213 52 L214 52 L216 52 L218 52 L220 52 L222 51 L223 51 L225 51 L226 51 L227 51 L228 50 L229 50 L229 50 L229 50 L230 50 L230 50 L230 49 L230 49 L230 49 L230 49 L230 49 L230 48 L230 48 L230 48 L230 48 L230 47 L229 47 L229 47 L229 46 L228 46 L228 45 L227 44 L226 43 L226 43 L225 43 L225 42 L225 42 L225 42 L224 41 L224 41 L224 41 L224 41 L224 41 L224 41 L224 40 L224 40 L224 40 L225 40 L225 40 L225 40 L225 40 L225 40 L226 40 L226 40 L227 40 L228 40 L230 40 L233 40 L235 40 L236 41 L237 41 L238 41 L239 41 L240 42 L241 42 L241 42 L242 43 L242 42 L242 42 L241 41 L241 40 L240 40 L239 39 L239 38 L238 38 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M202 57 L202 60 L206 61 L205 65 L209 66 L208 69 L209 69 L210 69 L211 70 L211 70 L211 70 L212 70 L212 70 L212 71 L212 71 L213 71 L213 72 L213 72 L213 72 L213 73 L213 73 L213 74 L212 75 L212 75 L212 75 L213 75 L215 75 L216 75 L218 75 L221 76 L223 76 L226 76 L228 76 L229 76 L231 77 L232 77 L234 77 L235 77 L237 78 L239 78 L240 78 L242 79 L243 79 L245 80 L246 80 L248 81 L249 81 L250 82 L250 82 L250 81 L251 81 L251 80 L251 79 L251 78 L251 76 L252 75 L252 73 L252 71 L252 70 L252 69 L252 68 L252 67 L252 66 L251 65 L251 64 L251 63 L251 62 L251 61 L250 60 L250 59 L250 57 L249 56 L248 54 L248 53 L247 52 L247 51 L246 50 L246 49 L245 48 L245 47 L244 46 L244 46 L244 46 L243 46 L242 46 L240 45 L238 45 L237 45 L236 45 L235 45 L235 45 L234 45 L234 45 L234 45 L233 45 L233 45 L233 45 L233 45 L232 46 L232 46 L232 46 L232 46 L232 47 L233 47 L233 47 L233 48 L233 48 L234 49 L234 49 L234 50 L235 50 L235 51 L235 51 L235 51 L235 51 L235 52 L235 52 L235 52 L235 52 L235 52 L235 53 L235 53 L234 53 L234 53 L234 53 L234 54 L233 54 L233 54 L232 54 L232 54 L231 54 L231 54 L230 54 L229 54 L228 54 L227 54 L226 54 L224 54 L222 54 L220 54 L218 55 L216 55 L214 55 L213 55 L211 55 L209 55 L208 56 L206 56 L205 56 L204 57 L204 57 L203 57 L203 57 L202 57 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M139 28 L139 32 L143 33 L142 37 L146 38 L145 42 L149 43 L148 47 L152 48 L152 52 L155 53 L155 57 L159 58 L158 62 L162 62 L161 66 L165 67 L165 71 L168 72 L168 76 L171 77 L171 81 L174 82 L174 86 L177 87 L177 87 L176 88 L176 89 L175 90 L175 90 L175 91 L174 91 L174 92 L174 92 L173 93 L173 93 L172 94 L172 94 L172 94 L171 94 L171 94 L171 94 L170 94 L170 95 L169 95 L168 95 L167 95 L165 95 L164 95 L163 95 L163 95 L162 95 L161 96 L161 96 L160 96 L159 97 L159 97 L158 97 L158 98 L157 98 L157 99 L156 99 L156 100 L155 101 L155 102 L154 104 L154 105 L153 107 L153 109 L152 111 L152 113 L151 114 L151 116 L150 119 L150 121 L149 122 L149 123 L149 123 L149 122 L149 121 L149 119 L149 117 L149 114 L149 112 L149 109 L149 106 L148 102 L148 99 L148 95 L147 93 L147 92 L147 90 L146 88 L146 86 L146 85 L145 83 L145 81 L144 78 L143 75 L142 71 L141 68 L141 65 L140 62 L139 59 L138 56 L137 54 L137 51 L136 49 L135 46 L135 44 L134 42 L134 42 L134 41 L134 40 L134 40 L134 38 L134 37 L133 36 L133 35 L133 34 L133 33 L133 32 L133 31 L133 31 L134 30 L134 29 L134 28 L134 28 L134 27 L135 26 L135 26 L135 25 L135 25 L136 24 L136 24 L136 24 L136 24 L136 24 L137 24 L137 24 L137 24 L137 24 L137 24 L137 24 L138 25 L138 26 L139 27 L139 28 L139 28 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M100 210 L100 210 L101 211 L101 212 L102 212 L102 213 L103 214 L103 215 L104 215 L104 216 L105 217 L105 217 L106 218 L106 218 L107 218 L107 219 L107 219 L108 219 L108 220 L109 220 L110 221 L111 221 L111 222 L111 222 L111 222 L112 222 L112 223 L112 223 L112 223 L112 224 L112 224 L112 224 L112 224 L112 225 L112 225 L112 226 L112 227 L112 228 L111 229 L111 230 L111 231 L111 232 L110 232 L110 233 L110 234 L109 237 L109 239 L108 242 L108 245 L107 248 L107 251 L106 254 L106 256 L106 259 L105 262 L105 264 L105 266 L104 267 L104 269 L104 271 L104 273 L104 274 L104 275 L103 276 L103 277 L103 278 L103 279 L103 280 L102 281 L102 282 L102 283 L101 284 L101 285 L100 286 L100 286 L100 287 L100 289 L100 290 L99 292 L99 293 L99 295 L98 300 L98 304 L97 310 L96 315 L96 321 L95 327 L95 333 L94 339 L93 345 L93 351 L92 357 L92 362 L92 367 L91 372 L91 377 L90 382 L90 387 L90 392 L90 397 L89 401 L89 406 L89 410 L89 414 L89 417 L89 421 L89 424 L89 427 L89 430 L89 433 L89 435 L89 438 L89 441 L89 443 L90 446 L90 449 L90 452 L90 454 L90 457 L90 459 L90 462 L90 464 L90 466 L90 467 L90 468 L90 468 L90 469 L89 471 L89 472 L89 473 L89 475 L88 477 L88 479 L87 480 L87 480 L87 481 L87 481 L87 482 L87 482 L87 482 L87 482 L87 482 L87 482 L87 482 L88 482 L88 481 L88 481 L89 481 L89 480 L89 480 L89 479 L90 479 L90 478 L90 478 L90 477 L90 477 L91 476 L91 475 L91 474 L91 473 L91 472 L92 471 L92 470 L92 469 L92 467 L92 466 L92 464 L92 463 L92 461 L93 459 L93 457 L93 455 L93 452 L93 452 L93 452 L93 451 L93 450 L93 448 L93 447 L93 445 L93 443 L93 441 L93 439 L93 437 L93 435 L93 432 L93 430 L93 428 L93 426 L93 424 L93 422 L93 419 L93 416 L93 414 L94 411 L94 407 L94 404 L94 401 L94 397 L94 393 L95 390 L95 386 L95 382 L96 378 L96 375 L96 371 L97 367 L97 363 L97 359 L98 355 L98 351 L99 347 L99 343 L100 339 L100 334 L101 330 L101 326 L102 322 L102 317 L103 313 L103 309 L104 307 L104 304 L104 301 L105 298 L105 295 L106 291 L107 288 L107 284 L108 280 L109 276 L109 273 L110 269 L111 266 L111 262 L112 259 L112 257 L113 254 L113 251 L114 249 L115 246 L115 243 L116 240 L116 237 L117 234 L118 232 L118 229 L119 226 L120 224 L120 221 L121 219 L121 217 L122 215 L122 215 L121 215 L121 215 L120 215 L120 216 L119 216 L119 216 L118 216 L117 216 L117 216 L116 216 L115 216 L115 216 L114 216 L113 216 L112 216 L111 216 L110 216 L110 215 L109 215 L108 215 L107 214 L106 214 L105 213 L104 212 L102 212 L101 211 L100 210 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M180 135 L180 135 L180 135 L181 134 L181 134 L181 134 L182 133 L182 133 L182 133 L182 132 L182 132 L182 132 L182 131 L182 131 L182 131 L182 130 L182 130 L182 130 L182 129 L182 129 L182 128 L182 128 L181 127 L181 127 L181 127 L181 126 L180 126 L180 126 L180 125 L179 125 L179 125 L179 125 L179 125 L178 125 L178 124 L177 124 L177 124 L176 124 L176 124 L175 124 L175 124 L174 124 L174 124 L174 124 L175 125 L175 125 L175 125 L176 125 L176 125 L176 125 L176 125 L176 126 L176 126 L176 126 L176 126 L176 127 L176 127 L176 127 L176 127 L176 127 L176 128 L176 128 L176 128 L176 128 L177 128 L177 128 L177 128 L177 128 L177 128 L178 129 L178 129 L178 129 L179 129 L179 129 L179 129 L179 129 L179 129 L179 129 L179 130 L179 130 L179 130 L179 130 L179 131 L179 131 L179 131 L179 132 L179 132 L179 132 L179 132 L179 132 L179 132 L179 132 L179 132 L180 132 L180 132 L180 133 L180 133 L180 133 L180 133 L180 133 L180 133 L180 134 L180 134 L180 135 L180 135 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M186 139 L186 139 L186 138 L186 138 L186 138 L187 137 L187 137 L187 137 L187 136 L187 135 L187 135 L187 134 L187 134 L187 134 L187 133 L187 133 L187 132 L187 132 L187 132 L186 131 L186 130 L185 129 L185 128 L184 127 L184 126 L183 125 L183 125 L182 123 L181 122 L180 121 L180 121 L180 120 L179 120 L178 119 L178 119 L177 119 L177 118 L176 118 L176 118 L175 118 L175 118 L174 118 L174 118 L174 118 L174 118 L175 118 L176 119 L176 119 L177 119 L177 119 L178 120 L178 120 L178 120 L178 120 L178 120 L178 121 L178 121 L178 121 L178 121 L178 121 L178 121 L178 122 L178 122 L178 122 L179 122 L179 122 L179 122 L179 122 L179 122 L180 123 L180 123 L180 123 L181 123 L181 124 L181 124 L182 125 L182 125 L183 126 L183 127 L183 127 L184 128 L184 129 L185 130 L185 130 L185 131 L185 131 L185 132 L185 132 L185 132 L185 133 L185 133 L185 134 L185 134 L185 134 L185 135 L185 135 L185 135 L185 135 L185 135 L185 135 L185 136 L186 136 L186 136 L186 136 L186 136 L186 137 L186 137 L186 138 L186 139 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M181 134 L181 134 L181 133 L182 133 L182 133 L182 133 L182 132 L182 132 L182 131 L182 131 L182 130 L182 130 L182 129 L182 129 L182 128 L182 128 L182 128 L181 127 L181 127 L181 126 L180 126 L180 125 L179 125 L179 125 L178 125 L178 124 L178 124 L177 124 L177 124 L177 124 L177 124 L177 124 L178 125 L178 125 L179 126 L179 126 L179 126 L179 126 L179 127 L180 127 L180 127 L180 127 L180 128 L180 128 L180 128 L180 128 L180 128 L180 129 L180 129 L180 129 L180 129 L181 129 L181 129 L181 130 L181 130 L181 130 L181 130 L181 131 L181 132 L181 132 L181 133 L181 133 L181 134 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M122 215 L121 215 L121 216 L121 217 L121 218 L120 220 L120 222 L119 224 L118 227 L118 230 L117 233 L116 237 L115 241 L114 245 L113 249 L113 254 L112 259 L111 264 L110 269 L109 274 L108 279 L107 283 L106 288 L106 292 L105 297 L105 300 L104 304 L104 307 L103 310 L103 312 L103 313 L103 314 L103 315 L103 314 L103 313 L103 310 L104 308 L104 304 L104 300 L105 296 L105 291 L106 286 L107 281 L107 276 L108 272 L109 267 L109 263 L109 261 L110 260 L110 258 L110 257 L111 254 L112 252 L112 249 L113 246 L113 244 L114 241 L114 239 L115 236 L115 234 L116 232 L116 230 L116 228 L117 227 L117 226 L117 225 L117 225 L117 225 L117 224 L116 223 L116 222 L116 221 L116 221 L116 221 L116 221 L116 221 L116 220 L116 220 L116 220 L116 220 L116 219 L116 219 L116 219 L116 219 L116 219 L116 219 L116 219 L116 218 L115 218 L115 218 L114 218 L113 218 L113 217 L112 217 L111 217 L111 217 L110 217 L110 216 L110 216 L109 216 L109 216 L108 215 L108 215 L108 215 L109 215 L110 216 L111 216 L112 216 L113 216 L114 216 L115 216 L115 216 L116 216 L117 216 L117 216 L118 216 L118 216 L119 216 L119 216 L120 216 L120 216 L121 215 L122 215 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M189 230 L189 230 L189 230 L188 231 L187 231 L187 231 L187 232 L186 232 L186 232 L186 232 L186 232 L186 233 L186 233 L186 233 L186 233 L186 233 L186 234 L186 236 L187 240 L188 245 L189 250 L190 257 L192 264 L193 271 L195 280 L196 288 L198 297 L200 306 L201 315 L202 319 L203 324 L203 328 L204 333 L204 337 L205 341 L206 346 L206 350 L207 357 L208 364 L208 368 L208 371 L208 374 L209 377 L209 380 L209 382 L209 385 L209 388 L209 390 L210 393 L210 395 L210 397 L210 400 L210 402 L210 404 L210 406 L210 411 L209 415 L209 419 L209 423 L209 428 L208 432 L208 435 L208 437 L208 439 L208 441 L207 444 L207 448 L207 451 L206 453 L206 456 L205 458 L205 460 L205 461 L205 462 L205 463 L205 464 L205 465 L205 466 L205 467 L205 468 L205 469 L205 470 L205 472 L205 473 L206 474 L206 475 L206 477 L206 478 L207 479 L207 480 L207 482 L208 483 L208 484 L209 485 L209 486 L209 487 L210 488 L210 489 L211 490 L211 491 L212 491 L212 492 L212 493 L213 493 L213 494 L214 494 L214 495 L215 495 L215 495 L216 496 L216 496 L216 496 L217 496 L217 496 L218 496 L218 496 L218 496 L219 495 L219 495 L219 495 L219 494 L220 494 L220 493 L220 493 L220 492 L220 492 L221 491 L221 490 L221 489 L221 488 L221 486 L221 484 L221 481 L221 479 L221 477 L221 476 L221 474 L221 473 L221 472 L222 471 L222 470 L222 468 L223 466 L223 463 L223 461 L224 458 L224 455 L225 452 L225 449 L226 445 L226 442 L226 440 L226 438 L227 436 L227 434 L227 433 L227 431 L227 429 L227 427 L227 422 L227 417 L227 412 L227 405 L227 398 L227 391 L227 383 L227 374 L227 365 L226 355 L226 351 L226 346 L226 341 L226 335 L225 330 L225 325 L225 320 L224 314 L224 309 L224 304 L223 298 L223 293 L222 284 L222 277 L221 270 L221 263 L220 257 L220 252 L219 247 L219 242 L219 238 L219 234 L219 231 L218 229 L218 226 L218 224 L218 223 L218 221 L218 221 L218 221 L218 221 L218 221 L218 220 L218 220 L218 220 L218 220 L217 220 L217 220 L217 220 L216 220 L216 220 L215 220 L215 220 L214 220 L189 230 Z" stroke="none" />

-      <path fill="none" d="M189 230 L189 230 L189 230 L188 231 L187 231 L187 231 L187 232 L186 232 L186 232 L186 232 L186 232 L186 233 L186 233 L186 233 L186 233 L186 233 L186 234 L186 236 L187 240 L188 245 L189 250 L190 257 L192 264 L193 271 L195 280 L196 288 L198 297 L200 306 L201 315 L202 319 L203 324 L203 328 L204 333 L204 337 L205 341 L206 346 L206 350 L207 357 L208 364 L208 368 L208 371 L208 374 L209 377 L209 380 L209 382 L209 385 L209 388 L209 390 L210 393 L210 395 L210 397 L210 400 L210 402 L210 404 L210 406 L210 411 L209 415 L209 419 L209 423 L209 428 L208 432 L208 435 L208 437 L208 439 L208 441 L207 444 L207 448 L207 451 L206 453 L206 456 L205 458 L205 460 L205 461 L205 462 L205 463 L205 464 L205 465 L205 466 L205 467 L205 468 L205 469 L205 470 L205 472 L205 473 L206 474 L206 475 L206 477 L206 478 L207 479 L207 480 L207 482 L208 483 L208 484 L209 485 L209 486 L209 487 L210 488 L210 489 L211 490 L211 491 L212 491 L212 492 L212 493 L213 493 L213 494 L214 494 L214 495 L215 495 L215 495 L216 496 L216 496 L216 496 L217 496 L217 496 L218 496 L218 496 L218 496 L219 495 L219 495 L219 495 L219 494 L220 494 L220 493 L220 493 L220 492 L220 492 L221 491 L221 490 L221 489 L221 488 L221 486 L221 484 L221 481 L221 479 L221 477 L221 476 L221 474 L221 473 L221 472 L222 471 L222 470 L222 468 L223 466 L223 463 L223 461 L224 458 L224 455 L225 452 L225 449 L226 445 L226 442 L226 440 L226 438 L227 436 L227 434 L227 433 L227 431 L227 429 L227 427 L227 422 L227 417 L227 412 L227 405 L227 398 L227 391 L227 383 L227 374 L227 365 L226 355 L226 351 L226 346 L226 341 L226 335 L225 330 L225 325 L225 320 L224 314 L224 309 L224 304 L223 298 L223 293 L222 284 L222 277 L221 270 L221 263 L220 257 L220 252 L219 247 L219 242 L219 238 L219 234 L219 231 L218 229 L218 226 L218 224 L218 223 L218 221 L218 221 L218 221 L218 221 L218 221 L218 220 L218 220 L218 220 L218 220 L217 220 L217 220 L217 220 L216 220 L216 220 L215 220 L215 220 L214 220 L189 230" />

-      <path fill="rgb(122,138,147)" d="M94 231 L94 231 L93 231 L93 231 L93 231 L93 231 L92 231 L92 231 L92 232 L92 232 L92 232 L92 235 L91 239 L90 244 L90 250 L89 258 L88 266 L87 271 L87 275 L86 280 L86 285 L85 290 L85 296 L84 301 L84 307 L83 313 L83 319 L82 325 L82 331 L81 337 L81 344 L81 350 L80 356 L80 363 L80 369 L80 376 L80 383 L79 387 L79 392 L79 396 L79 400 L79 408 L79 415 L80 421 L80 427 L80 432 L80 437 L80 442 L80 446 L81 450 L81 454 L81 457 L81 461 L81 464 L81 467 L81 470 L81 472 L81 475 L81 477 L81 478 L81 479 L82 480 L82 481 L82 481 L82 482 L82 483 L82 483 L82 484 L82 484 L83 485 L83 485 L83 486 L83 486 L84 486 L84 487 L84 487 L84 487 L85 487 L85 488 L85 488 L86 488 L86 488 L87 488 L87 488 L88 488 L88 488 L88 487 L89 487 L89 487 L90 487 L90 486 L91 486 L91 485 L91 485 L92 484 L92 484 L92 483 L93 482 L93 482 L93 481 L94 480 L94 479 L94 478 L94 477 L95 476 L95 475 L95 474 L95 473 L96 472 L96 471 L96 469 L96 468 L96 467 L96 465 L96 464 L96 460 L97 456 L97 452 L97 447 L97 442 L97 436 L97 430 L97 423 L98 417 L98 411 L98 404 L98 397 L99 394 L99 391 L99 388 L99 385 L99 382 L100 379 L100 376 L100 373 L101 367 L102 360 L102 353 L103 345 L104 337 L105 328 L106 319 L108 310 L109 301 L110 292 L111 287 L111 283 L112 278 L113 274 L113 270 L114 266 L115 262 L115 258 L116 255 L117 252 L118 248 L118 245 L118 245 L118 245 L118 245 L118 244 L118 244 L118 244 L118 244 L118 244 L118 243 L118 243 L117 243 L117 243 L94 231 Z" stroke="none" />

-      <path fill="none" d="M94 231 L94 231 L93 231 L93 231 L93 231 L93 231 L92 231 L92 231 L92 232 L92 232 L92 232 L92 235 L91 239 L90 244 L90 250 L89 258 L88 266 L87 271 L87 275 L86 280 L86 285 L85 290 L85 296 L84 301 L84 307 L83 313 L83 319 L82 325 L82 331 L81 337 L81 344 L81 350 L80 356 L80 363 L80 369 L80 376 L80 383 L79 387 L79 392 L79 396 L79 400 L79 408 L79 415 L80 421 L80 427 L80 432 L80 437 L80 442 L80 446 L81 450 L81 454 L81 457 L81 461 L81 464 L81 467 L81 470 L81 472 L81 475 L81 477 L81 478 L81 479 L82 480 L82 481 L82 481 L82 482 L82 483 L82 483 L82 484 L82 484 L83 485 L83 485 L83 486 L83 486 L84 486 L84 487 L84 487 L84 487 L85 487 L85 488 L85 488 L86 488 L86 488 L87 488 L87 488 L88 488 L88 488 L88 487 L89 487 L89 487 L90 487 L90 486 L91 486 L91 485 L91 485 L92 484 L92 484 L92 483 L93 482 L93 482 L93 481 L94 480 L94 479 L94 478 L94 477 L95 476 L95 475 L95 474 L95 473 L96 472 L96 471 L96 469 L96 468 L96 467 L96 465 L96 464 L96 460 L97 456 L97 452 L97 447 L97 442 L97 436 L97 430 L97 423 L98 417 L98 411 L98 404 L98 397 L99 394 L99 391 L99 388 L99 385 L99 382 L100 379 L100 376 L100 373 L101 367 L102 360 L102 353 L103 345 L104 337 L105 328 L106 319 L108 310 L109 301 L110 292 L111 287 L111 283 L112 278 L113 274 L113 270 L114 266 L115 262 L115 258 L116 255 L117 252 L118 248 L118 245 L118 245 L118 245 L118 245 L118 244 L118 244 L118 244 L118 244 L118 244 L118 243 L118 243 L117 243 L117 243 L94 231 Z" />

-      <path fill="rgb(122,138,147)" d="M112 242 L117 244 L117 245 L116 246 L116 248 L115 251 L115 254 L114 258 L113 263 L112 269 L111 274 L110 281 L109 287 L108 294 L107 298 L107 302 L106 306 L106 309 L105 313 L105 317 L104 321 L104 325 L103 333 L102 340 L101 347 L101 353 L100 359 L99 365 L99 368 L98 371 L98 375 L98 378 L97 381 L97 384 L97 387 L97 391 L96 394 L96 398 L96 402 L96 406 L96 410 L96 414 L95 419 L95 424 L95 429 L95 434 L95 439 L95 445 L95 449 L95 452 L95 455 L95 458 L95 461 L95 463 L95 466 L94 468 L94 470 L94 471 L94 472 L94 473 L94 474 L93 475 L93 476 L93 477 L93 478 L92 479 L92 480 L92 480 L91 481 L91 482 L91 482 L90 483 L90 484 L89 485 L89 485 L88 485 L88 485 L88 486 L88 486 L88 486 L88 486 L87 486 L87 485 L87 485 L87 485 L87 485 L87 485 L87 484 L87 484 L87 484 L87 483 L88 482 L88 481 L88 480 L89 479 L89 478 L89 477 L90 476 L90 476 L90 475 L90 474 L90 473 L90 472 L91 471 L91 469 L91 467 L91 464 L91 462 L91 459 L91 456 L91 453 L91 451 L91 448 L91 445 L91 443 L91 440 L91 439 L91 437 L91 436 L91 434 L91 430 L91 426 L92 421 L92 415 L92 410 L92 404 L93 397 L93 390 L94 384 L94 376 L95 369 L96 362 L96 354 L97 347 L98 343 L98 339 L98 335 L99 330 L100 322 L101 313 L102 304 L103 296 L105 287 L106 279 L107 271 L108 264 L109 258 L110 253 L111 248 L111 245 L111 243 L112 242 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M208 224 L214 222 L215 223 L215 226 L215 231 L216 237 L216 244 L217 253 L218 262 L219 271 L219 281 L220 291 L221 301 L222 311 L222 320 L223 328 L223 335 L224 341 L224 346 L224 351 L224 358 L224 364 L224 371 L224 377 L224 384 L225 391 L224 397 L224 404 L224 410 L224 416 L224 421 L224 425 L224 429 L224 433 L224 436 L224 439 L224 441 L223 444 L223 447 L223 450 L222 452 L222 455 L222 457 L221 459 L221 461 L221 463 L220 465 L220 467 L220 469 L220 471 L220 472 L219 474 L219 475 L219 477 L219 480 L219 484 L219 485 L219 486 L219 488 L219 489 L219 489 L219 490 L218 490 L218 491 L218 491 L218 491 L218 492 L218 492 L217 492 L217 492 L217 492 L217 492 L217 492 L217 492 L217 492 L216 492 L216 491 L216 491 L216 491 L216 490 L216 490 L216 489 L216 489 L216 488 L216 487 L216 486 L216 484 L216 482 L216 480 L216 478 L216 476 L216 473 L216 471 L217 468 L217 466 L217 463 L217 461 L218 459 L218 457 L218 455 L218 453 L219 451 L219 450 L219 448 L219 446 L219 445 L220 444 L220 442 L220 441 L220 440 L220 438 L220 437 L220 435 L221 433 L221 431 L221 429 L221 427 L221 425 L221 423 L221 421 L221 419 L221 417 L221 415 L221 413 L221 410 L221 407 L221 403 L221 399 L220 394 L220 388 L220 383 L220 376 L220 370 L220 364 L220 357 L219 351 L219 345 L219 339 L218 333 L218 328 L218 322 L217 316 L216 308 L216 300 L215 292 L214 283 L213 274 L213 266 L212 258 L211 250 L210 243 L210 237 L209 231 L209 228 L209 225 L208 224 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M95 233 L98 235 L98 235 L98 236 L98 238 L97 241 L97 244 L96 248 L95 253 L95 258 L94 264 L93 271 L93 274 L92 278 L92 282 L91 286 L91 291 L90 295 L90 300 L90 304 L89 309 L89 314 L88 319 L88 325 L87 335 L87 345 L86 355 L86 364 L85 372 L85 380 L85 387 L85 393 L84 399 L84 405 L84 410 L84 415 L84 419 L84 423 L85 427 L85 430 L85 433 L85 436 L85 439 L85 442 L86 446 L86 449 L86 453 L86 456 L86 459 L86 462 L86 466 L86 468 L86 471 L86 474 L86 475 L85 476 L85 477 L85 478 L85 479 L85 480 L84 481 L84 481 L84 481 L84 481 L84 481 L84 481 L84 481 L84 481 L84 481 L84 481 L84 480 L84 480 L83 479 L83 478 L83 476 L83 475 L83 474 L83 472 L83 471 L84 469 L84 468 L84 466 L84 465 L84 463 L84 461 L84 460 L84 458 L84 456 L84 454 L84 453 L84 451 L84 449 L84 447 L83 445 L83 444 L83 442 L83 440 L83 438 L83 436 L83 433 L82 431 L82 428 L82 425 L82 422 L82 418 L82 415 L82 412 L82 409 L82 406 L82 403 L82 400 L82 397 L82 394 L82 390 L82 386 L82 381 L82 375 L82 369 L82 363 L83 357 L83 351 L83 344 L84 338 L84 332 L84 327 L85 322 L85 317 L85 314 L85 310 L86 306 L86 301 L87 296 L87 291 L88 285 L88 280 L89 274 L90 268 L90 263 L91 257 L92 252 L92 249 L92 247 L93 244 L93 242 L94 239 L94 237 L94 235 L95 233 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M189 232 L193 230 L193 231 L194 234 L195 239 L196 244 L197 252 L199 260 L200 269 L202 279 L204 289 L205 300 L206 305 L207 310 L208 316 L209 321 L209 326 L210 331 L211 336 L211 340 L212 345 L212 349 L213 353 L213 357 L213 365 L214 372 L214 379 L214 385 L215 391 L215 397 L215 403 L215 408 L215 413 L215 418 L215 422 L215 426 L215 430 L214 433 L214 436 L214 439 L214 441 L214 444 L213 446 L213 448 L213 450 L212 453 L212 455 L212 457 L211 459 L211 460 L211 462 L211 464 L211 465 L211 467 L211 467 L211 468 L211 469 L211 469 L211 472 L212 474 L212 476 L212 477 L212 478 L212 479 L212 480 L212 480 L212 481 L212 481 L212 481 L212 481 L212 481 L212 482 L212 482 L212 482 L211 482 L211 482 L211 482 L211 482 L211 481 L211 481 L210 481 L210 480 L210 480 L210 480 L210 479 L209 479 L209 478 L209 477 L209 477 L209 476 L208 475 L208 475 L208 474 L208 473 L208 472 L208 471 L208 470 L208 469 L208 468 L208 467 L208 466 L208 465 L208 464 L208 463 L208 462 L208 461 L208 459 L209 457 L209 454 L209 452 L209 449 L210 447 L210 444 L210 441 L211 439 L211 436 L211 433 L211 431 L211 429 L211 426 L212 424 L212 422 L212 420 L212 417 L212 414 L212 410 L212 406 L212 402 L211 398 L211 393 L211 388 L211 384 L211 379 L211 374 L210 369 L210 365 L210 360 L209 356 L209 354 L209 351 L208 348 L208 345 L207 337 L205 328 L204 318 L202 307 L200 297 L198 286 L196 276 L195 266 L193 256 L192 248 L191 241 L190 236 L189 233 L189 232 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M202 231 L202 230 L201 230 L201 229 L201 229 L201 228 L200 228 L200 227 L200 227 L200 226 L199 226 L199 225 L199 225 L198 225 L198 224 L197 224 L197 224 L196 223 L196 223 L196 223 L195 223 L195 223 L194 222 L194 222 L193 222 L193 222 L192 222 L192 222 L191 222 L190 222 L190 222 L189 222 L189 222 L188 222 L188 222 L187 223 L187 223 L186 223 L186 223 L186 223 L185 224 L185 224 L184 224 L184 224 L183 225 L183 225 L183 225 L182 226 L182 226 L182 227 L181 227 L181 227 L181 228 L181 228 L180 229 L180 229 L180 230 L180 231 L180 231 L180 232 L180 232 L180 233 L180 234 L180 234 L180 235 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M216 314 L216 314 L215 310 L214 304 L213 298 L212 292 L211 285 L210 278 L209 271 L207 264 L206 258 L205 252 L204 246 L203 241 L203 237 L202 234 L202 232 L202 231 L180 235 L180 236 L181 238 L181 241 L182 245 L183 250 L184 255 L185 262 L186 268 L187 275 L188 282 L189 289 L190 296 L192 302 L193 308 L193 313 L194 318 L194 318 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M223 392 L223 392 L223 388 L223 385 L223 382 L223 379 L223 376 L223 373 L223 370 L222 367 L222 364 L222 362 L222 359 L221 357 L221 352 L220 347 L220 343 L219 339 L219 334 L218 330 L218 326 L217 323 L216 319 L216 314 L194 318 L195 322 L195 326 L196 330 L196 334 L197 338 L198 342 L198 346 L199 350 L199 354 L200 359 L200 361 L200 363 L200 366 L200 369 L201 371 L201 374 L201 377 L201 380 L201 382 L201 386 L201 389 L202 392 L202 392 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M222 450 L222 450 L222 448 L222 447 L222 445 L223 443 L223 440 L223 438 L223 435 L223 432 L223 428 L224 424 L224 420 L224 415 L224 410 L224 404 L224 398 L223 392 L202 392 L202 399 L202 405 L202 410 L202 415 L202 419 L202 424 L201 427 L201 431 L201 434 L201 436 L201 439 L201 441 L201 443 L200 445 L200 446 L200 448 L200 448 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M221 474 L221 474 L220 473 L220 472 L220 472 L220 471 L220 471 L220 470 L220 469 L220 469 L220 468 L220 467 L220 466 L220 466 L220 465 L220 464 L220 463 L220 462 L220 460 L221 459 L221 457 L221 455 L221 454 L222 452 L222 450 L200 448 L200 449 L200 450 L199 452 L199 454 L199 455 L199 457 L198 459 L198 461 L198 462 L198 464 L198 465 L198 466 L198 467 L198 468 L198 470 L198 471 L198 472 L198 473 L198 475 L199 476 L199 477 L199 479 L200 480 L200 481 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M200 481 L200 482 L201 483 L201 483 L201 484 L201 484 L202 485 L202 485 L203 486 L203 486 L203 486 L204 487 L204 487 L205 487 L205 488 L206 488 L206 488 L206 488 L207 488 L207 489 L208 489 L208 489 L209 489 L209 489 L210 489 L210 489 L211 489 L211 489 L212 489 L213 489 L213 488 L214 488 L214 488 L214 488 L215 488 L215 488 L216 487 L216 487 L217 487 L217 487 L218 486 L218 486 L218 486 L219 485 L219 485 L219 484 L220 484 L220 484 L220 483 L221 483 L221 482 L221 482 L221 481 L221 481 L221 480 L221 480 L222 479 L222 478 L222 478 L221 477 L221 477 L221 476 L221 475 L221 475 L221 474 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M73 475 L73 476 L73 476 L73 477 L74 478 L74 478 L74 479 L74 479 L74 480 L74 480 L75 481 L75 481 L75 482 L76 482 L76 483 L76 483 L77 483 L77 484 L77 484 L78 484 L78 485 L79 485 L79 485 L80 485 L80 486 L81 486 L81 486 L82 486 L82 486 L83 486 L83 486 L84 486 L84 486 L85 486 L85 486 L86 486 L86 486 L87 486 L87 486 L88 486 L88 486 L89 486 L89 485 L90 485 L90 485 L91 485 L91 484 L91 484 L92 484 L92 483 L92 483 L93 483 L93 482 L93 482 L94 481 L94 481 L94 480 L94 480 L95 479 L95 479 L95 478 L95 477 L95 477 L95 476 L95 475 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M73 442 L73 442 L73 444 L73 446 L73 449 L73 452 L73 454 L73 457 L73 460 L73 463 L73 465 L73 468 L73 470 L73 472 L73 473 L73 474 L73 475 L73 475 L95 475 L95 475 L95 474 L95 473 L95 472 L95 470 L95 468 L95 465 L95 463 L95 460 L95 457 L95 454 L95 451 L95 448 L95 446 L95 443 L95 441 L95 440 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M72 370 L72 370 L72 372 L72 374 L72 376 L72 378 L72 383 L72 388 L72 393 L72 398 L72 403 L72 409 L72 414 L72 419 L72 424 L72 428 L73 432 L73 436 L73 439 L73 442 L95 440 L95 438 L95 435 L94 432 L94 427 L94 423 L94 418 L94 413 L94 408 L94 403 L94 398 L94 393 L94 388 L94 383 L94 379 L94 377 L94 375 L94 373 L94 371 L94 371 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M79 277 L79 277 L79 280 L78 283 L78 286 L78 290 L77 296 L76 303 L76 309 L75 316 L75 322 L75 329 L74 335 L74 341 L73 347 L73 352 L73 357 L73 362 L72 366 L72 370 L94 371 L94 367 L95 363 L95 359 L95 353 L95 348 L96 342 L96 336 L96 330 L97 324 L97 318 L98 311 L98 305 L99 298 L99 292 L100 289 L100 286 L100 283 L101 280 L101 280 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M85 234 L85 234 L85 234 L85 235 L85 236 L85 237 L84 239 L84 241 L84 243 L83 246 L83 249 L82 253 L82 257 L81 261 L80 266 L80 271 L79 277 L101 280 L102 274 L102 269 L103 264 L103 260 L104 256 L104 252 L105 249 L105 247 L106 244 L106 243 L106 241 L106 240 L107 239 L107 238 L107 238 L107 238 Z" stroke="none" />

-      <path fill="rgb(197,222,244)" d="M107 238 L107 237 L107 236 L107 236 L107 235 L107 235 L107 234 L107 233 L107 233 L106 232 L106 232 L106 231 L106 231 L106 230 L105 230 L105 230 L105 229 L104 229 L104 228 L104 228 L103 228 L103 227 L103 227 L102 227 L102 226 L101 226 L101 226 L100 226 L100 226 L99 225 L99 225 L98 225 L98 225 L97 225 L97 225 L96 225 L96 225 L95 225 L95 225 L94 225 L94 225 L93 225 L93 225 L92 225 L92 225 L91 226 L91 226 L90 226 L90 226 L90 227 L89 227 L89 227 L88 228 L88 228 L88 228 L87 229 L87 229 L87 230 L86 230 L86 231 L86 231 L86 232 L85 232 L85 233 L85 234 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M180 97 L180 97 L180 97 L181 97 L182 98 L183 98 L185 99 L186 99 L188 100 L189 100 L189 100 L190 101 L191 101 L191 101 L192 102 L192 102 L193 102 L194 103 L195 104 L196 105 L197 106 L198 107 L199 108 L200 109 L201 110 L202 111 L203 113 L204 114 L205 115 L205 116 L206 117 L206 118 L207 119 L207 120 L208 122 L208 123 L208 124 L209 125 L209 127 L210 128 L210 128 L213 126 L213 125 L213 125 L213 124 L212 123 L212 122 L211 121 L211 119 L210 117 L210 117 L209 116 L209 115 L208 114 L208 113 L207 112 L207 111 L206 110 L205 109 L205 108 L204 107 L203 107 L202 106 L202 105 L201 104 L200 103 L199 103 L198 102 L197 101 L196 101 L196 100 L195 100 L194 99 L193 99 L192 98 L190 97 L189 97 L188 96 L187 96 L186 95 L185 95 L184 95 L183 94 L183 94 L180 97 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M92 152 L92 152 L92 151 L93 151 L93 151 L93 151 L93 150 L94 150 L94 149 L95 149 L95 149 L96 148 L97 148 L98 148 L98 147 L99 147 L100 147 L102 147 L103 147 L104 147 L105 147 L107 147 L108 147 L110 148 L112 148 L113 149 L115 149 L117 150 L119 151 L122 152 L124 154 L124 154 L124 154 L125 154 L126 155 L127 156 L128 157 L130 158 L131 159 L132 160 L133 160 L133 161 L134 162 L135 163 L136 164 L137 165 L137 166 L138 167 L139 168 L140 169 L140 171 L141 172 L142 173 L142 174 L143 176 L143 176 L143 177 L144 178 L144 179 L145 180 L146 181 L146 182 L147 183 L147 183 L147 183 L148 184 L148 184 L149 185 L149 186 L150 188 L151 189 L151 191 L152 192 L153 193 L153 194 L153 195 L154 196 L154 197 L154 198 L154 199 L155 201 L155 202 L155 203 L155 204 L156 205 L156 206 L156 206 L156 208 L156 209 L157 210 L157 210 L157 211 L157 212 L158 212 L158 212 L158 213 L158 213 L158 213 L159 213 L159 214 L159 214 L245 275 L302 315 L302 315 L303 316 L303 316 L304 317 L304 317 L305 318 L305 319 L305 319 L306 320 L306 321 L307 322 L307 323 L307 323 L307 324 L307 324 L307 325 L309 333 L309 333 L309 334 L309 334 L309 334 L310 335 L310 335 L310 335 L310 335 L311 335 L311 336 L312 336 L312 336 L313 336 L313 336 L313 336 L314 336 L315 336 L316 336 L317 336 L318 336 L319 336 L320 336 L320 336 L321 336 L322 336 L323 336 L324 336 L325 336 L326 336 L328 337 L329 337 L330 337 L332 338 L333 339 L335 339 L336 340 L338 341 L339 342 L341 343 L343 344 L343 344 L344 345 L345 346 L346 347 L348 348 L350 350 L351 351 L352 352 L353 353 L354 354 L355 355 L356 356 L357 357 L358 358 L359 360 L360 361 L360 362 L361 364 L362 365 L362 366 L363 368 L363 369 L363 371 L363 372 L363 373 L363 375 L363 375 L363 375 L363 376 L363 377 L362 378 L362 378 L362 379 L362 380 L361 380 L361 381 L360 382 L360 383 L352 392 L352 392 L351 392 L351 393 L350 393 L349 394 L348 394 L348 394 L347 395 L347 395 L346 395 L346 395 L345 395 L344 395 L343 396 L343 396 L342 396 L341 396 L340 396 L339 396 L338 396 L337 396 L336 396 L336 396 L335 395 L335 395 L333 395 L333 395 L332 395 L331 394 L330 394 L329 394 L328 394 L327 393 L326 393 L325 392 L323 392 L322 391 L321 390 L320 390 L318 389 L317 388 L316 387 L314 386 L313 385 L312 384 L310 382 L309 381 L308 380 L306 378 L305 377 L305 376 L305 376 L304 375 L304 375 L303 374 L302 372 L301 371 L300 369 L300 368 L300 367 L299 367 L299 366 L298 365 L298 364 L297 363 L297 362 L297 360 L296 359 L296 358 L296 357 L295 356 L295 355 L295 354 L295 352 L295 352 L295 350 L294 348 L294 346 L294 345 L294 343 L293 342 L293 341 L293 340 L293 340 L293 339 L293 339 L292 339 L292 338 L292 338 L292 338 L292 338 L292 337 L291 337 L291 337 L291 336 L291 336 L290 335 L289 335 L289 334 L288 333 L287 332 L285 331 L284 330 L282 329 L241 300 L172 252 L151 237 L150 237 L150 236 L149 236 L149 235 L149 235 L148 234 L148 233 L147 233 L147 232 L146 231 L146 230 L145 229 L145 229 L145 228 L145 228 L145 227 L145 227 L144 225 L144 223 L143 220 L142 217 L142 215 L141 213 L141 213 L141 212 L141 212 L140 212 L140 211 L140 211 L139 210 L139 209 L139 209 L138 208 L137 207 L137 206 L136 206 L136 206 L135 205 L135 205 L134 204 L134 204 L133 204 L132 203 L132 203 L131 203 L130 202 L130 202 L129 202 L128 202 L127 202 L116 201 L116 201 L115 201 L114 200 L112 200 L111 199 L110 199 L108 198 L107 198 L106 197 L104 197 L103 196 L102 195 L100 194 L99 193 L97 192 L96 191 L94 190 L93 188 L92 187 L90 185 L89 184 L88 182 L87 180 L86 179 L85 177 L84 175 L84 172 L83 170 L83 170 L83 169 L83 168 L83 168 L83 167 L83 166 L83 166 L83 165 L84 165 L84 164 L84 164 L84 163 L85 163 L85 162 L92 152 Z" stroke="none" />

-      <path fill="none" d="M92 152 L92 152 L92 151 L93 151 L93 151 L93 151 L93 150 L94 150 L94 149 L95 149 L95 149 L96 148 L97 148 L98 148 L98 147 L99 147 L100 147 L102 147 L103 147 L104 147 L105 147 L107 147 L108 147 L110 148 L112 148 L113 149 L115 149 L117 150 L119 151 L122 152 L124 154 L124 154 L124 154 L125 154 L126 155 L127 156 L128 157 L130 158 L131 159 L132 160 L133 160 L133 161 L134 162 L135 163 L136 164 L137 165 L137 166 L138 167 L139 168 L140 169 L140 171 L141 172 L142 173 L142 174 L143 176 L143 176 L143 177 L144 178 L144 179 L145 180 L146 181 L146 182 L147 183 L147 183 L147 183 L148 184 L148 184 L149 185 L149 186 L150 188 L151 189 L151 191 L152 192 L153 193 L153 194 L153 195 L154 196 L154 197 L154 198 L154 199 L155 201 L155 202 L155 203 L155 204 L156 205 L156 206 L156 206 L156 208 L156 209 L157 210 L157 210 L157 211 L157 212 L158 212 L158 212 L158 213 L158 213 L158 213 L159 213 L159 214 L159 214 L245 275 L302 315 L302 315 L303 316 L303 316 L304 317 L304 317 L305 318 L305 319 L305 319 L306 320 L306 321 L307 322 L307 323 L307 323 L307 324 L307 324 L307 325 L309 333 L309 333 L309 334 L309 334 L309 334 L310 335 L310 335 L310 335 L310 335 L311 335 L311 336 L312 336 L312 336 L313 336 L313 336 L313 336 L314 336 L315 336 L316 336 L317 336 L318 336 L319 336 L320 336 L320 336 L321 336 L322 336 L323 336 L324 336 L325 336 L326 336 L328 337 L329 337 L330 337 L332 338 L333 339 L335 339 L336 340 L338 341 L339 342 L341 343 L343 344 L343 344 L344 345 L345 346 L346 347 L348 348 L350 350 L351 351 L352 352 L353 353 L354 354 L355 355 L356 356 L357 357 L358 358 L359 360 L360 361 L360 362 L361 364 L362 365 L362 366 L363 368 L363 369 L363 371 L363 372 L363 373 L363 375 L363 375 L363 375 L363 376 L363 377 L362 378 L362 378 L362 379 L362 380 L361 380 L361 381 L360 382 L360 383 L352 392 L352 392 L351 392 L351 393 L350 393 L349 394 L348 394 L348 394 L347 395 L347 395 L346 395 L346 395 L345 395 L344 395 L343 396 L343 396 L342 396 L341 396 L340 396 L339 396 L338 396 L337 396 L336 396 L336 396 L335 395 L335 395 L333 395 L333 395 L332 395 L331 394 L330 394 L329 394 L328 394 L327 393 L326 393 L325 392 L323 392 L322 391 L321 390 L320 390 L318 389 L317 388 L316 387 L314 386 L313 385 L312 384 L310 382 L309 381 L308 380 L306 378 L305 377 L305 376 L305 376 L304 375 L304 375 L303 374 L302 372 L301 371 L300 369 L300 368 L300 367 L299 367 L299 366 L298 365 L298 364 L297 363 L297 362 L297 360 L296 359 L296 358 L296 357 L295 356 L295 355 L295 354 L295 352 L295 352 L295 350 L294 348 L294 346 L294 345 L294 343 L293 342 L293 341 L293 340 L293 340 L293 339 L293 339 L292 339 L292 338 L292 338 L292 338 L292 338 L292 337 L291 337 L291 337 L291 336 L291 336 L290 335 L289 335 L289 334 L288 333 L287 332 L285 331 L284 330 L282 329 L241 300 L172 252 L151 237 L150 237 L150 236 L149 236 L149 235 L149 235 L148 234 L148 233 L147 233 L147 232 L146 231 L146 230 L145 229 L145 229 L145 228 L145 228 L145 227 L145 227 L144 225 L144 223 L143 220 L142 217 L142 215 L141 213 L141 213 L141 212 L141 212 L140 212 L140 211 L140 211 L139 210 L139 209 L139 209 L138 208 L137 207 L137 206 L136 206 L136 206 L135 205 L135 205 L134 204 L134 204 L133 204 L132 203 L132 203 L131 203 L130 202 L130 202 L129 202 L128 202 L127 202 L116 201 L116 201 L115 201 L114 200 L112 200 L111 199 L110 199 L108 198 L107 198 L106 197 L104 197 L103 196 L102 195 L100 194 L99 193 L97 192 L96 191 L94 190 L93 188 L92 187 L90 185 L89 184 L88 182 L87 180 L86 179 L85 177 L84 175 L84 172 L83 170 L83 170 L83 169 L83 168 L83 168 L83 167 L83 166 L83 166 L83 165 L84 165 L84 164 L84 164 L84 163 L85 163 L85 162 L92 152" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M318 375 L320 376 L321 377 L322 378 L324 379 L325 380 L326 381 L328 382 L329 382 L331 383 L332 384 L333 384 L335 385 L336 385 L338 386 L339 386 L341 386 L342 387 L344 387 L345 387 L346 387 L348 387 L349 387 L350 387 L351 386 L353 386 L354 386 L355 385 L356 385 L357 384 L358 383 L359 382 L360 382 L360 381 L361 380 L361 379 L362 378 L362 377 L362 376 L363 375 L363 374 L363 372 L363 371 L363 370 L362 369 L362 368 L362 367 L361 366 L361 364 L360 363 L359 362 L359 361 L358 360 L357 359 L356 357 L355 356 L354 355 L353 354 L352 353 L351 351 L349 350 L348 349 L347 348 L345 347 L344 346 L343 345 L342 344 L340 343 L339 342 L338 342 L337 341 L335 340 L334 340 L333 339 L331 339 L330 338 L328 338 L327 337 L326 337 L324 337 L323 337 L321 337 L320 336 L319 336 L317 337 L316 337 L315 337 L314 337 L313 338 L311 339 L310 339 L309 340 L309 341 L308 342 L307 343 L306 344 L306 346 L305 347 L305 348 L305 349 L305 350 L305 351 L305 352 L305 353 L305 354 L305 355 L305 356 L305 357 L306 358 L306 359 L307 360 L307 361 L307 362 L308 363 L309 364 L309 365 L310 366 L310 367 L311 368 L312 369 L312 369 L313 370 L314 371 L315 372 L315 373 L316 373 L317 374 L318 375 L318 375 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M318 375 L320 376 L321 377 L322 378 L324 379 L325 380 L326 381 L328 382 L329 382 L331 383 L332 384 L333 384 L335 385 L336 385 L338 386 L339 386 L341 386 L342 387 L344 387 L345 387 L346 387 L348 387 L349 387 L350 387 L351 386 L353 386 L354 386 L355 385 L356 385 L357 384 L358 383 L359 382 L360 382 L360 381 L361 380 L361 379 L362 378 L362 377 L362 376 L363 375 L363 374 L363 372 L363 371 L363 370 L362 369 L362 368 L362 367 L361 366 L361 364 L360 363 L359 362 L359 361 L358 360 L357 359 L356 357 L355 356 L354 355 L353 354 L352 353 L351 351 L349 350 L348 349 L347 348 L345 347 L344 346 L343 345 L342 344 L340 343 L339 342 L338 342 L337 341 L335 340 L334 340 L333 339 L331 339 L330 338 L328 338 L327 337 L326 337 L324 337 L323 337 L321 337 L320 336 L319 336 L317 337 L316 337 L315 337 L314 337 L313 338 L311 339 L310 339 L309 340 L309 341 L308 342 L307 343 L306 344 L306 346 L305 347 L305 348 L305 349 L305 350 L305 351 L305 352 L305 353 L305 354 L305 355 L305 356 L305 357 L306 358 L306 359 L307 360 L307 361 L307 362 L308 363 L309 364 L309 365 L310 366 L310 367 L311 368 L312 369 L312 369 L313 370 L314 371 L315 372 L315 373 L316 373 L317 374 L318 375 L318 375" stroke-width="5" stroke="rgb(165,174,180)" />

-      <path fill="rgb(122,138,147)" d="M104 184 L105 185 L106 186 L108 187 L109 188 L110 189 L112 189 L113 190 L114 191 L116 191 L117 192 L118 192 L120 193 L121 193 L122 194 L124 194 L125 194 L126 195 L127 195 L129 195 L130 195 L131 195 L132 195 L133 194 L134 194 L135 194 L136 193 L137 193 L138 192 L139 192 L140 191 L141 190 L141 190 L142 189 L142 188 L143 187 L143 186 L143 185 L143 184 L143 183 L143 182 L143 181 L143 180 L143 179 L142 178 L142 177 L142 176 L141 174 L141 173 L140 172 L140 171 L139 170 L138 169 L138 167 L137 166 L136 165 L135 164 L134 163 L134 162 L133 161 L132 160 L131 159 L130 158 L129 158 L128 157 L126 156 L125 155 L124 154 L123 154 L122 153 L120 152 L119 152 L118 151 L117 151 L115 150 L114 150 L113 149 L112 149 L111 149 L110 148 L108 148 L107 148 L106 148 L105 148 L104 148 L103 148 L102 148 L101 148 L100 148 L99 148 L98 148 L97 149 L96 149 L96 149 L95 150 L94 151 L93 151 L93 152 L92 153 L91 154 L91 154 L91 155 L90 156 L90 157 L90 158 L90 159 L90 160 L90 161 L90 162 L90 163 L90 164 L90 165 L91 167 L91 168 L92 169 L92 170 L93 171 L93 172 L94 173 L95 174 L96 175 L97 177 L98 178 L98 179 L99 180 L101 181 L102 182 L103 183 L104 184 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M104 184 L105 185 L106 186 L108 187 L109 188 L110 189 L112 189 L113 190 L114 191 L116 191 L117 192 L118 192 L120 193 L121 193 L122 194 L124 194 L125 194 L126 195 L127 195 L129 195 L130 195 L131 195 L132 195 L133 194 L134 194 L135 194 L136 193 L137 193 L138 192 L139 192 L140 191 L141 190 L141 190 L142 189 L142 188 L143 187 L143 186 L143 185 L143 184 L143 183 L143 182 L143 181 L143 180 L143 179 L142 178 L142 177 L142 176 L141 174 L141 173 L140 172 L140 171 L139 170 L138 169 L138 167 L137 166 L136 165 L135 164 L134 163 L134 162 L133 161 L132 160 L131 159 L130 158 L129 158 L128 157 L126 156 L125 155 L124 154 L123 154 L122 153 L120 152 L119 152 L118 151 L117 151 L115 150 L114 150 L113 149 L112 149 L111 149 L110 148 L108 148 L107 148 L106 148 L105 148 L104 148 L103 148 L102 148 L101 148 L100 148 L99 148 L98 148 L97 149 L96 149 L96 149 L95 150 L94 151 L93 151 L93 152 L92 153 L91 154 L91 154 L91 155 L90 156 L90 157 L90 158 L90 159 L90 160 L90 161 L90 162 L90 163 L90 164 L90 165 L91 167 L91 168 L92 169 L92 170 L93 171 L93 172 L94 173 L95 174 L96 175 L97 177 L98 178 L98 179 L99 180 L101 181 L102 182 L103 183 L104 184" stroke-width="5" stroke="rgb(165,174,180)" />

-      <path fill="rgb(122,138,147)" d="M122 159 L102 153 L96 162 L111 181 L132 186 L137 176 L122 159 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M122 159 L102 153 L96 162 L111 181 L132 186 L137 176 L122 159 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M97 160 L117 167 L122 159 L102 153 L97 160 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M97 160 L117 167 L122 159 L102 153 L97 160 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 184 L117 167 L122 159 L137 176 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M137 176 L131 184 L117 167 L122 159 L137 176 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M129 195 L130 195 L131 195 L131 196 L132 196 L133 196 L134 197 L135 197 L136 197 L136 197 L137 198 L137 198 L138 198 L139 199 L139 199 L140 200 L141 200 L141 201 L142 201 L143 202 L143 203 L144 203 L145 204 L145 204 L146 204 L147 204 L147 204 L148 203 L148 203 L149 203 L149 203 L149 202 L150 202 L150 202 L150 202 L151 201 L151 201 L151 200 L152 200 L152 199 L152 199 L152 198 L152 198 L152 197 L152 196 L152 195 L152 195 L152 194 L152 193 L152 192 L151 192 L151 191 L150 189 L150 188 L149 187 L148 186 L147 184 L147 182 L145 181 L144 179 L143 178 L143 178 L143 178 L144 179 L144 180 L144 181 L144 182 L144 183 L144 183 L144 184 L144 185 L144 186 L144 187 L144 188 L143 188 L143 189 L142 190 L142 191 L141 192 L141 192 L140 193 L139 193 L138 194 L137 194 L136 195 L134 195 L133 195 L131 195 L129 195 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M151 192 L152 193 L152 194 L153 195 L153 197 L154 199 L154 201 L155 202 L155 202 L155 203 L155 203 L155 204 L155 205 L155 206 L156 208 L156 208 L156 209 L156 210 L157 211 L157 212 L157 212 L157 213 L157 213 L158 213 L158 213 L160 216 L154 229 L154 229 L153 229 L153 229 L153 229 L153 229 L153 228 L153 228 L152 227 L152 226 L152 226 L152 225 L151 223 L151 222 L151 221 L150 220 L150 218 L150 217 L150 216 L149 214 L149 213 L148 211 L148 210 L147 209 L147 208 L147 208 L146 207 L146 206 L146 205 L145 205 L145 204 L144 204 L144 203 L143 203 L143 202 L143 202 L145 202 L145 202 L146 202 L147 201 L147 201 L148 201 L148 201 L149 200 L149 200 L149 200 L150 200 L150 199 L151 199 L151 198 L151 198 L151 197 L152 197 L152 196 L152 195 L152 195 L152 194 L152 193 L151 192 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M305 320 L305 321 L306 321 L306 322 L306 322 L306 323 L307 324 L307 324 L307 325 L307 326 L307 327 L307 328 L307 329 L307 330 L307 330 L307 331 L307 332 L307 333 L308 333 L308 334 L308 334 L308 334 L308 334 L308 335 L308 335 L308 335 L308 335 L309 335 L309 335 L308 335 L308 336 L307 336 L306 337 L306 337 L306 338 L306 338 L305 339 L305 339 L305 340 L304 340 L304 341 L304 342 L303 343 L303 343 L303 344 L303 345 L303 346 L303 347 L303 348 L303 349 L303 350 L303 351 L303 353 L303 353 L303 353 L303 354 L303 354 L303 353 L303 352 L302 351 L302 348 L302 347 L302 345 L302 344 L302 343 L302 342 L301 341 L301 340 L301 339 L301 339 L301 338 L301 337 L300 337 L300 336 L300 335 L300 335 L299 334 L299 334 L299 333 L298 333 L298 333 L297 332 L297 332 L296 332 L296 332 L296 332 L296 331 L296 331 L296 331 L296 330 L296 330 L297 329 L297 329 L297 328 L298 328 L299 327 L300 326 L301 325 L302 324 L303 323 L303 322 L305 321 L305 320 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M160 215 L160 215 L159 216 L159 216 L158 216 L157 217 L157 217 L157 218 L156 218 L156 218 L156 219 L155 219 L155 220 L155 220 L154 221 L154 221 L154 222 L153 222 L153 223 L153 224 L153 224 L153 225 L152 226 L152 226 L152 226 L152 227 L152 227 L152 228 L153 228 L153 229 L153 229 L153 230 L153 230 L153 230 L154 231 L154 231 L154 231 L155 232 L155 232 L155 233 L156 233 L156 234 L156 234 L298 332 L298 332 L299 332 L299 332 L299 333 L299 333 L300 332 L300 332 L300 332 L301 332 L301 332 L302 332 L302 331 L302 331 L303 330 L303 330 L303 329 L304 328 L304 327 L305 326 L305 325 L305 325 L305 324 L306 323 L306 323 L306 322 L306 322 L306 321 L306 321 L306 321 L306 320 L305 320 L305 320 L305 319 L305 319 L304 319 L303 317 L303 317 L302 316 L302 316 L301 315 L301 315 L301 315 L266 290 L230 264 L184 232 L160 215 Z" stroke="none" />

-      <path fill="none" d="M160 215 L160 215 L159 216 L159 216 L158 216 L157 217 L157 217 L157 218 L156 218 L156 218 L156 219 L155 219 L155 220 L155 220 L154 221 L154 221 L154 222 L153 222 L153 223 L153 224 L153 224 L153 225 L152 226 L152 226 L152 226 L152 227 L152 227 L152 228 L153 228 L153 229 L153 229 L153 230 L153 230 L153 230 L154 231 L154 231 L154 231 L155 232 L155 232 L155 233 L156 233 L156 234 L156 234 L298 332 L298 332 L299 332 L299 332 L299 333 L299 333 L300 332 L300 332 L300 332 L301 332 L301 332 L302 332 L302 331 L302 331 L303 330 L303 330 L303 329 L304 328 L304 327 L305 326 L305 325 L305 325 L305 324 L306 323 L306 323 L306 322 L306 322 L306 321 L306 321 L306 321 L306 320 L305 320 L305 320 L305 319 L305 319 L304 319 L303 317 L303 317 L302 316 L302 316 L301 315 L301 315 L301 315 L266 290 L230 264 L184 232 L160 215 Z" stroke-width="5" stroke="rgb(149,158,164)" />

-      <path fill="rgb(122,138,147)" d="M143 191 L143 192 L142 192 L142 193 L142 193 L141 193 L141 194 L141 194 L140 194 L139 195 L139 195 L138 195 L137 195 L137 195 L136 196 L135 196 L135 196 L135 196 L134 196 L133 196 L132 196 L131 196 L130 195 L129 195 L128 195 L127 195 L125 194 L124 194 L124 194 L125 194 L126 194 L127 194 L128 194 L129 194 L130 194 L131 194 L132 194 L132 194 L133 194 L134 194 L135 194 L135 193 L136 193 L136 193 L137 193 L137 192 L138 192 L138 192 L139 191 L139 191 L140 190 L141 190 L141 189 L141 189 L142 188 L142 188 L142 187 L142 186 L142 186 L143 185 L143 185 L143 184 L143 183 L143 183 L143 182 L143 181 L143 180 L143 179 L143 179 L143 178 L142 177 L142 176 L142 176 L143 177 L143 178 L143 178 L143 179 L144 180 L144 180 L144 181 L144 182 L144 182 L144 183 L144 184 L144 184 L144 185 L144 185 L144 186 L144 186 L144 187 L144 188 L144 189 L144 190 L144 191 L143 191 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M90 160 L90 163 L91 165 L91 167 L92 169 L93 171 L94 172 L95 174 L96 176 L98 177 L99 179 L100 180 L101 181 L103 182 L104 183 L105 185 L107 185 L108 186 L109 187 L110 188 L112 189 L113 189 L114 190 L115 190 L116 191 L118 192 L119 192 L120 192 L120 192 L121 193 L121 193 L121 193 L121 193 L121 193 L121 193 L121 193 L121 193 L120 193 L120 193 L118 192 L115 191 L113 191 L111 190 L109 189 L107 187 L106 186 L104 185 L103 184 L101 183 L100 182 L99 180 L98 179 L97 178 L96 177 L95 175 L94 174 L93 173 L93 172 L92 171 L92 170 L91 169 L91 168 L91 167 L90 166 L90 166 L90 165 L90 165 L90 164 L90 164 L90 162 L89 161 L89 161 L89 161 L89 160 L89 160 L90 160 L90 160 L90 160 L90 160 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M156 233 L181 250 L209 269 L252 299 L285 322 L298 333 L298 333 L299 333 L299 334 L300 334 L300 335 L300 335 L300 336 L301 337 L301 337 L301 338 L301 339 L301 340 L302 352 L302 352 L303 353 L303 354 L303 354 L303 354 L303 354 L303 354 L303 354 L302 352 L301 350 L301 349 L301 348 L301 346 L300 343 L300 342 L300 341 L300 340 L299 338 L299 338 L299 337 L299 337 L298 336 L298 336 L298 336 L298 335 L297 335 L297 335 L297 334 L296 333 L295 332 L294 331 L293 331 L292 330 L290 329 L289 328 L287 326 L285 325 L284 324 L250 300 L204 269 L162 239 L161 239 L160 238 L160 238 L159 237 L158 236 L157 235 L156 234 L155 234 L155 233 L154 233 L154 232 L154 232 L154 231 L153 231 L153 231 L153 230 L153 230 L153 229 L153 229 L153 229 L153 229 L153 229 L153 230 L154 231 L154 231 L155 232 L155 232 L155 232 L156 233 L156 233 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 184 L118 169 L124 161 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 184 L119 170 L125 162 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 184 L120 171 L126 163 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L121 172 L127 165 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L122 174 L128 166 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L124 175 L129 167 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L125 176 L131 169 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L126 178 L132 170 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 183 L127 179 L133 171 L137 176 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M312 337 L312 337 L311 337 L311 338 L310 338 L310 338 L309 339 L309 339 L308 340 L308 341 L307 341 L307 342 L307 342 L306 342 L306 343 L306 343 L306 344 L305 344 L305 345 L305 344 L306 344 L306 343 L306 343 L306 342 L307 341 L307 341 L307 340 L308 339 L308 339 L309 338 L309 338 L309 338 L310 338 L310 337 L310 337 L311 337 L311 336 L311 337 L311 337 L312 337 L312 337 L312 337 L312 337 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M304 353 L304 353 L304 353 L304 354 L304 355 L304 356 L304 356 L304 357 L304 357 L304 357 L304 357 L304 357 L304 357 L304 357 L304 357 L304 356 L303 356 L303 356 L304 357 L304 357 L304 358 L305 359 L305 360 L305 361 L305 361 L306 362 L306 362 L306 362 L306 362 L306 362 L307 362 L307 363 L307 363 L307 362 L307 362 L307 362 L307 362 L307 362 L306 361 L306 361 L306 360 L306 359 L305 359 L305 358 L305 357 L305 357 L305 356 L304 355 L304 354 L304 353 L304 353 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M339 386 L333 394 L332 394 L332 394 L331 394 L331 394 L330 394 L329 394 L336 386 L336 386 L337 386 L338 386 L338 386 L338 386 L339 386 L339 386 L339 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M332 394 L332 394 L332 394 L331 394 L329 394 L336 386 L336 386 L337 386 L338 386 L338 386 L338 386 L338 386 L339 386 L339 386 L332 394 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M332 394 L332 394 L332 394 L331 394 L330 394 L336 386 L336 386 L337 386 L338 386 L338 386 L338 386 L338 386 L338 386 L339 386 L332 394 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M332 394 L332 394 L332 394 L331 394 L330 394 L336 386 L336 386 L337 386 L337 386 L338 386 L338 386 L338 386 L338 386 L338 386 L332 394 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M332 394 L332 394 L332 394 L331 394 L330 394 L336 386 L337 386 L337 386 L337 386 L338 387 L338 387 L338 386 L338 386 L338 386 L332 394 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M338 386 L332 394 L332 394 L332 394 L331 394 L331 394 L337 386 L337 386 L337 386 L337 386 L338 387 L338 387 L338 386 L338 386 L338 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M338 385 L339 386 L340 386 L340 386 L341 386 L342 386 L343 386 L343 387 L344 387 L344 387 L344 387 L344 387 L344 387 L344 387 L344 387 L344 387 L343 387 L343 387 L341 387 L340 387 L338 387 L337 386 L336 386 L335 386 L334 386 L333 385 L332 385 L331 385 L330 384 L329 384 L328 383 L327 383 L326 382 L325 382 L325 381 L324 381 L323 380 L322 380 L322 379 L321 379 L321 378 L319 378 L319 377 L318 376 L317 375 L317 375 L317 375 L316 374 L316 374 L316 374 L316 374 L316 374 L316 374 L317 374 L317 374 L317 374 L317 374 L318 375 L319 376 L320 376 L321 377 L322 378 L322 378 L323 379 L324 379 L325 380 L326 380 L327 381 L328 381 L329 382 L329 382 L330 383 L331 383 L332 384 L334 384 L335 385 L336 385 L338 385 L338 385 Z" stroke="none" />

-      <path fill="none" d="M137 176 L123 160" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M119 201 L118 201 L118 201 L117 200 L117 200 L116 200 L116 200 L115 200 L114 199 L119 194 L124 195 L119 201 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M115 200 L120 194 L123 195 L119 200 L118 200 L118 200 L117 200 L117 200 L116 200 L116 200 L115 200 L115 200 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M115 200 L120 194 L123 194 L118 200 L118 200 L117 200 L116 200 L116 200 L115 200 L115 200 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M115 200 L120 194 L123 194 L118 200 L117 200 L117 200 L117 200 L116 200 L115 200 L115 200 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M116 200 L121 194 L123 194 L118 200 L117 200 L117 200 L117 200 L116 200 L116 200 L116 200 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M122 194 L117 200 L116 200 L121 194 L122 194 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M341 350 L356 369 L350 381 L326 372 L312 353 L319 343 L341 350 L356 369 L341 350 Z" stroke="none" />

-      <path fill="none" d="M341 350 L356 369 L350 381 L326 372 L312 353 L319 343 L341 350 L356 369 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M313 352 L334 358 L341 350 L319 343 L313 352 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M313 352 L334 358 L341 350 L319 343 L313 352 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M356 369 L348 378 L334 358 L341 350 L356 369 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M356 369 L348 378 L334 358 L341 350 L356 369 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M356 369 L348 378 L348 380 L350 381 L356 369 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M356 369 L348 378 L348 380 L350 381 L356 369 Z" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M335 360 L342 352 L356 369 L348 378 L335 360 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M337 362 L344 353 L356 369 L348 378 L337 362 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M338 363 L345 355 L356 369 L348 378 L338 363 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M339 365 L346 356 L356 369 L348 378 L339 365 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M340 366 L347 358 L356 369 L348 378 L340 366 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M341 368 L348 359 L356 369 L348 378 L341 368 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M342 369 L349 361 L356 369 L348 378 L342 369 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M344 371 L351 363 L356 369 L348 378 L344 371 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M356 369 L348 378 L345 373 L352 364 L356 369 Z" stroke="none" />

-      <path fill="none" d="M334 358 L348 378 L356 369" stroke-width="5" />

-      <path fill="none" d="M356 369 L341 350" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M90 155 L89 158 L84 166 L84 166 L84 165 L84 165 L84 164 L84 164 L85 163 L85 162 L86 161 L87 160 L88 159 L89 157 L89 156 L90 155 L90 155 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 158 L84 166 L84 166 L84 165 L84 165 L84 165 L84 164 L85 163 L85 163 L86 162 L86 161 L87 159 L88 158 L89 157 L90 156 L90 156 L89 158 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 159 L84 167 L84 166 L84 166 L84 165 L84 165 L84 164 L84 164 L85 163 L85 162 L86 161 L87 160 L88 158 L89 157 L90 156 L90 156 L89 159 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 159 L84 167 L84 167 L84 166 L84 166 L84 165 L84 165 L84 164 L85 164 L85 163 L86 162 L87 160 L88 159 L89 158 L90 157 L90 157 L89 159 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 160 L84 167 L84 167 L84 166 L84 166 L84 166 L84 165 L84 165 L84 165 L84 165 L84 164 L85 163 L86 162 L87 161 L88 159 L89 158 L89 157 L90 157 L89 160 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 160 L84 168 L84 167 L84 167 L84 166 L84 166 L84 166 L84 166 L84 165 L84 165 L84 165 L85 164 L86 163 L87 161 L88 160 L89 159 L89 158 L90 157 L89 160 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 161 L84 168 L84 168 L84 167 L84 167 L84 166 L84 166 L84 166 L84 166 L84 166 L84 165 L85 164 L86 163 L87 162 L88 160 L89 159 L89 158 L89 158 L89 161 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 158 L89 161 L84 168 L84 168 L84 167 L84 167 L84 167 L84 166 L84 166 L84 166 L85 165 L86 163 L87 162 L88 161 L88 159 L89 159 L89 158 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M118 192 L119 192 L120 192 L120 193 L120 193 L120 193 L120 193 L119 193 L119 192 L119 192 L119 192 L116 192 L114 191 L112 190 L110 189 L109 188 L107 187 L105 186 L104 185 L102 184 L101 183 L100 182 L99 180 L98 179 L97 178 L96 177 L95 176 L95 175 L94 174 L93 173 L93 172 L92 171 L92 170 L92 169 L91 168 L91 168 L91 167 L91 167 L91 166 L90 166 L90 165 L90 164 L90 163 L90 163 L90 163 L90 163 L90 162 L90 162 L90 162 L90 162 L90 162 L90 163 L90 163 L91 165 L92 166 L92 168 L93 170 L94 172 L95 173 L96 175 L97 176 L98 178 L99 179 L100 180 L101 181 L103 182 L104 183 L105 184 L106 185 L108 186 L109 187 L110 188 L111 188 L112 189 L113 189 L114 190 L115 190 L116 191 L117 191 L118 192 L118 192 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M117 191 L118 192 L118 192 L118 192 L118 192 L118 192 L118 192 L118 192 L118 192 L117 192 L117 192 L115 191 L113 190 L111 189 L110 189 L108 188 L106 187 L105 186 L104 185 L102 184 L101 183 L100 182 L99 181 L98 179 L97 178 L96 177 L96 176 L95 175 L94 175 L94 174 L93 173 L93 172 L92 171 L92 170 L92 170 L91 168 L91 168 L91 167 L91 167 L91 166 L91 165 L91 165 L91 165 L91 164 L91 164 L91 164 L91 164 L91 164 L91 165 L91 165 L91 165 L92 167 L92 168 L93 170 L94 171 L94 173 L95 174 L96 176 L97 177 L98 178 L99 179 L100 181 L102 182 L103 183 L104 184 L105 184 L106 185 L107 186 L108 187 L109 187 L110 188 L111 189 L112 189 L113 189 L114 190 L115 190 L116 191 L117 191 L117 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M115 191 L116 191 L117 191 L117 191 L117 191 L117 191 L117 191 L116 191 L116 191 L116 191 L116 191 L114 190 L112 190 L110 189 L109 188 L107 187 L106 186 L105 185 L103 184 L102 183 L101 183 L100 182 L99 181 L98 180 L98 179 L97 178 L96 177 L95 176 L95 175 L94 174 L94 174 L93 173 L93 172 L93 171 L92 171 L92 170 L92 169 L92 169 L92 168 L91 167 L91 167 L91 166 L91 166 L91 166 L91 166 L91 166 L92 167 L92 167 L92 167 L92 168 L93 170 L94 171 L94 173 L95 174 L96 175 L97 177 L98 178 L99 179 L100 180 L101 181 L102 182 L103 183 L104 184 L105 184 L106 185 L107 186 L108 186 L109 187 L109 188 L110 188 L111 189 L112 189 L112 189 L114 190 L115 190 L115 191 L115 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M114 190 L115 190 L115 191 L115 191 L115 191 L115 191 L115 191 L115 191 L114 191 L114 191 L114 191 L113 190 L111 189 L110 188 L108 187 L107 187 L106 186 L104 185 L103 184 L102 183 L101 182 L100 182 L99 181 L99 180 L98 179 L97 178 L97 177 L96 177 L95 176 L95 175 L94 174 L94 174 L94 173 L93 173 L93 172 L93 171 L92 171 L92 170 L92 170 L92 169 L92 169 L92 169 L92 168 L92 168 L92 168 L92 168 L92 168 L92 168 L92 169 L92 169 L92 169 L93 170 L94 172 L94 173 L95 174 L96 175 L97 176 L97 177 L98 178 L99 179 L100 180 L101 181 L102 182 L103 183 L104 184 L105 184 L105 185 L106 186 L107 186 L108 187 L109 187 L109 188 L110 188 L111 188 L111 189 L113 190 L114 190 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M93 171 L94 172 L94 173 L95 174 L96 175 L96 176 L97 177 L98 178 L99 179 L100 180 L100 181 L101 182 L102 182 L103 183 L104 184 L104 184 L105 185 L106 185 L107 186 L107 186 L108 187 L109 188 L110 188 L112 189 L112 189 L113 190 L114 190 L114 190 L114 190 L114 190 L114 190 L113 190 L113 190 L113 190 L113 190 L111 189 L110 188 L109 188 L107 187 L106 186 L105 185 L104 185 L103 184 L102 183 L101 182 L100 182 L100 181 L99 180 L98 179 L98 179 L97 178 L96 177 L96 177 L95 176 L95 175 L94 174 L94 173 L93 172 L93 171 L93 171 L92 170 L92 170 L92 170 L93 170 L93 170 L93 170 L93 171 L93 171 L93 171 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 191 L143 192 L142 192 L142 193 L142 193 L141 193 L141 194 L140 194 L140 194 L139 194 L139 195 L138 195 L138 195 L137 195 L136 195 L135 196 L134 196 L134 196 L133 196 L132 195 L131 195 L130 195 L129 195 L127 195 L126 195 L125 194 L125 194 L126 194 L127 194 L128 195 L129 195 L130 195 L131 194 L131 194 L132 194 L133 194 L134 194 L134 194 L135 194 L136 193 L136 193 L137 193 L137 193 L138 192 L138 192 L139 192 L139 192 L140 191 L140 191 L141 190 L141 190 L141 189 L142 189 L142 188 L142 187 L142 187 L142 186 L143 186 L143 185 L143 185 L143 184 L143 183 L143 183 L143 182 L143 181 L143 180 L143 179 L143 179 L143 178 L142 177 L142 177 L143 178 L143 178 L143 179 L144 180 L144 180 L144 181 L144 182 L144 182 L144 183 L144 183 L144 184 L144 185 L144 186 L144 187 L144 188 L144 188 L144 189 L144 190 L143 191 L143 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 191 L143 192 L142 192 L142 193 L142 193 L141 193 L141 193 L140 194 L140 194 L139 194 L139 195 L138 195 L138 195 L137 195 L136 195 L136 195 L135 195 L134 195 L133 195 L132 195 L131 195 L131 195 L130 195 L128 195 L127 195 L126 194 L126 194 L127 194 L128 195 L129 195 L130 195 L131 195 L131 194 L132 194 L133 194 L133 194 L134 194 L135 194 L135 194 L136 193 L136 193 L137 193 L137 193 L138 192 L138 192 L139 192 L139 192 L140 191 L140 191 L141 190 L141 190 L141 189 L142 189 L142 188 L142 188 L142 187 L142 187 L143 186 L143 186 L143 185 L143 184 L143 183 L143 182 L143 181 L143 180 L143 179 L143 179 L143 178 L143 178 L143 178 L143 179 L143 180 L144 180 L144 181 L144 182 L144 182 L144 183 L144 183 L144 184 L144 184 L144 185 L144 186 L144 187 L144 188 L144 189 L144 189 L143 190 L143 191 L143 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 191 L142 192 L142 192 L142 192 L141 193 L141 193 L141 193 L140 194 L140 194 L140 194 L139 194 L138 195 L138 195 L137 195 L137 195 L136 195 L135 195 L134 195 L134 195 L133 195 L132 195 L131 195 L131 195 L129 195 L128 195 L127 195 L127 194 L128 195 L129 195 L130 195 L130 195 L131 195 L132 194 L133 194 L133 194 L134 194 L135 194 L135 194 L136 194 L136 193 L137 193 L137 193 L138 193 L139 192 L139 192 L140 191 L140 191 L141 190 L141 190 L141 190 L142 189 L142 189 L142 188 L142 188 L143 187 L143 187 L143 186 L143 185 L143 184 L143 183 L143 182 L143 181 L143 181 L143 180 L143 179 L143 179 L143 178 L143 179 L143 180 L144 180 L144 181 L144 181 L144 182 L144 183 L144 183 L144 184 L144 184 L144 185 L144 185 L144 186 L144 187 L144 188 L144 189 L143 189 L143 190 L143 191 L143 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 191 L142 192 L142 192 L142 192 L141 193 L141 193 L141 193 L140 193 L140 194 L140 194 L139 194 L139 194 L138 195 L138 195 L137 195 L136 195 L136 195 L135 195 L134 195 L133 195 L133 195 L132 195 L131 195 L130 195 L129 195 L128 195 L128 195 L129 195 L130 195 L130 195 L131 195 L132 195 L133 195 L133 194 L134 194 L134 194 L135 194 L136 194 L136 194 L137 193 L137 193 L138 193 L138 193 L139 192 L139 192 L140 191 L140 191 L141 190 L141 190 L142 190 L142 189 L142 189 L142 188 L142 188 L143 187 L143 187 L143 187 L143 186 L143 185 L143 184 L143 183 L143 182 L143 181 L143 181 L143 180 L143 179 L143 179 L143 180 L143 180 L144 181 L144 181 L144 182 L144 183 L144 183 L144 184 L144 185 L144 186 L144 187 L144 187 L144 188 L143 189 L143 190 L143 190 L143 191 L143 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 191 L142 192 L142 192 L141 192 L141 193 L141 193 L141 193 L140 193 L140 194 L140 194 L139 194 L139 194 L138 194 L138 195 L137 195 L137 195 L136 195 L135 195 L135 195 L134 195 L133 195 L133 195 L132 195 L131 195 L130 195 L129 195 L129 195 L130 195 L131 195 L131 195 L132 195 L133 195 L133 195 L134 194 L134 194 L135 194 L136 194 L136 194 L137 194 L137 193 L138 193 L139 192 L140 192 L140 191 L141 191 L141 191 L141 190 L142 190 L142 190 L142 189 L142 189 L143 188 L143 188 L143 187 L143 187 L143 186 L143 185 L143 184 L144 184 L144 183 L144 182 L144 181 L144 181 L143 180 L143 180 L144 180 L144 181 L144 182 L144 182 L144 183 L144 184 L144 185 L144 186 L144 187 L144 188 L143 188 L143 189 L143 190 L143 190 L143 191 L143 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M142 191 L142 192 L141 192 L141 192 L141 193 L141 193 L140 193 L140 193 L140 193 L140 194 L139 194 L139 194 L138 194 L138 194 L137 195 L137 195 L136 195 L136 195 L135 195 L134 195 L134 195 L133 195 L133 195 L132 195 L131 195 L130 195 L130 195 L131 195 L132 195 L132 195 L133 195 L133 195 L134 195 L134 194 L135 194 L135 194 L136 194 L136 194 L137 194 L138 193 L138 193 L139 192 L140 192 L140 192 L141 191 L141 191 L141 191 L142 190 L142 190 L142 189 L142 189 L143 189 L143 188 L143 188 L143 188 L143 187 L143 186 L144 185 L144 184 L144 184 L144 183 L144 182 L144 182 L144 181 L144 181 L144 181 L144 182 L144 182 L144 183 L144 184 L144 185 L144 186 L144 187 L144 187 L143 188 L143 189 L143 189 L143 190 L143 190 L142 191 L142 191 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M142 191 L142 192 L141 192 L141 193 L140 193 L140 193 L139 194 L139 194 L138 194 L138 194 L138 194 L137 194 L137 195 L136 195 L135 195 L134 195 L133 195 L133 195 L132 195 L131 195 L131 195 L132 195 L132 195 L133 195 L133 195 L134 195 L135 195 L135 194 L135 194 L136 194 L137 194 L138 193 L139 193 L139 192 L140 192 L140 192 L141 191 L141 191 L141 191 L142 190 L142 190 L142 190 L142 189 L143 189 L143 189 L143 188 L143 188 L143 187 L143 186 L144 186 L144 185 L144 184 L144 184 L144 183 L144 182 L144 182 L144 181 L144 182 L144 182 L144 183 L144 183 L144 184 L144 185 L144 186 L144 187 L143 188 L143 188 L143 189 L143 189 L143 190 L142 190 L142 191 L142 191 Z" stroke="none" />

-      <path fill="none" d="M340 396 L341 396 L341 396 L342 396 L343 396 L343 396 L344 395 L345 395 L346 395 L347 395 L348 394 L348 394 L349 394 L349 394 L350 393 L350 393 L351 393 L351 393 L351 392 L353 390 L360 382" stroke-width="5" />

-      <path fill="none" d="M355 355 L355 354 L354 354 L353 353 L352 352 L350 350 L349 349 L348 348 L348 348 L347 347 L347 347" stroke-width="5" />

-      <path fill="none" d="M339 342 L339 342 L340 342 L341 343 L343 344 L344 345 L346 346 L346 347 L347 347 L348 348 L349 348" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M153 197 L153 198 L153 199 L153 200 L153 200 L153 201 L153 201 L153 202 L153 202 L153 202 L152 203 L152 203 L152 204 L152 204 L151 204 L151 205 L151 205 L150 205 L150 206 L149 206 L149 206 L148 206 L147 206 L147 206 L146 206 L144 204 L145 204 L146 203 L146 203 L147 203 L148 203 L148 203 L148 203 L149 202 L149 202 L150 202 L150 202 L150 201 L151 201 L151 201 L151 200 L152 200 L152 199 L152 199 L152 198 L152 198 L152 197 L153 197 L152 196 L152 195 L153 197 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M144 203 L144 203 L145 203 L146 203 L147 202 L147 202 L148 202 L148 202 L148 202 L149 202 L149 201 L150 201 L150 201 L150 200 L151 200 L151 200 L151 199 L152 199 L152 198 L152 198 L152 197 L152 197 L152 196 L152 195 L152 195 L153 197 L153 197 L153 198 L153 199 L153 200 L153 200 L153 200 L153 201 L153 201 L152 202 L152 202 L152 202 L152 203 L151 203 L151 204 L151 204 L150 204 L150 205 L150 205 L149 205 L148 205 L148 206 L147 206 L146 206 L146 206 L144 203 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 203 L144 203 L145 202 L145 202 L146 202 L147 202 L147 202 L148 201 L148 201 L149 201 L149 201 L149 200 L150 200 L150 200 L151 199 L151 199 L151 199 L151 198 L152 198 L152 197 L152 196 L152 196 L152 195 L152 195 L152 194 L153 196 L153 196 L153 197 L153 198 L153 199 L153 199 L153 199 L153 200 L152 200 L152 201 L152 201 L152 202 L152 202 L151 202 L151 203 L151 203 L150 204 L150 204 L149 204 L149 204 L148 205 L148 205 L147 205 L146 205 L145 205 L143 203 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M143 202 L143 202 L144 202 L145 202 L146 201 L146 201 L147 201 L147 201 L148 201 L148 200 L149 200 L149 200 L150 199 L150 199 L150 199 L151 198 L151 198 L151 197 L151 197 L152 196 L152 196 L152 195 L152 194 L152 194 L151 193 L152 195 L152 196 L153 197 L153 197 L153 198 L153 198 L152 199 L152 199 L152 200 L152 200 L152 200 L152 201 L152 201 L151 202 L151 202 L151 202 L150 203 L150 203 L149 203 L149 204 L148 204 L147 204 L147 204 L146 205 L145 205 L143 202 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M142 202 L143 201 L144 201 L145 201 L146 201 L146 201 L146 200 L147 200 L147 200 L148 200 L148 199 L149 199 L149 199 L150 198 L150 198 L150 198 L151 197 L151 197 L151 196 L151 196 L151 195 L151 194 L151 194 L151 193 L151 192 L152 194 L152 195 L152 196 L152 196 L152 197 L152 198 L152 198 L152 198 L152 199 L152 199 L152 200 L152 200 L151 200 L151 201 L151 201 L150 202 L150 202 L149 202 L149 203 L148 203 L148 203 L147 204 L146 204 L145 204 L145 204 L142 202 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M141 201 L142 201 L143 201 L144 201 L145 200 L146 200 L146 200 L147 200 L147 199 L148 199 L148 199 L149 199 L149 198 L149 198 L150 197 L150 197 L150 197 L151 196 L151 195 L151 195 L151 194 L151 194 L151 193 L151 192 L151 191 L152 194 L152 194 L152 195 L152 196 L152 196 L152 197 L152 197 L152 197 L152 198 L152 198 L152 199 L151 199 L151 200 L151 200 L151 200 L150 201 L150 201 L149 202 L149 202 L148 202 L148 203 L147 203 L146 203 L145 203 L144 204 L141 201 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M152 193 L152 193 L152 194 L152 195 L152 195 L152 196 L152 196 L152 197 L152 197 L152 197 L152 198 L151 198 L151 199 L151 199 L151 200 L150 200 L150 200 L149 201 L149 201 L148 202 L147 202 L147 202 L146 202 L145 203 L144 203 L141 201 L141 200 L143 200 L144 200 L145 200 L145 200 L146 199 L146 199 L147 199 L147 199 L148 198 L148 198 L149 198 L149 197 L150 197 L150 196 L150 196 L151 195 L151 195 L151 194 L151 194 L151 193 L151 192 L151 192 L151 191 L152 193 Z" stroke="none" />

-      <path fill="none" d="M131 184 L117 168" stroke-width="5" />

-      <path fill="rgb(122,138,147)" d="M161 238 L161 238 L161 238 L160 237 L160 237 L160 237 L160 237 L160 237 L160 236 L160 236 L160 236 L160 236 L160 236 L160 236 L160 237 L162 238 L166 240 L173 245 L181 251 L191 258 L203 266 L215 274 L227 283 L240 292 L252 300 L263 308 L273 315 L282 321 L289 326 L291 328 L293 329 L295 330 L295 331 L295 331 L296 331 L296 332 L297 332 L297 332 L298 333 L298 333 L299 334 L299 334 L300 335 L300 335 L300 335 L300 336 L300 336 L300 337 L300 337 L300 337 L300 338 L300 338 L301 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 337 L299 337 L299 337 L299 336 L298 335 L297 334 L297 334 L296 333 L296 333 L295 332 L294 332 L294 331 L293 330 L292 330 L292 330 L291 329 L289 327 L286 325 L283 323 L279 321 L276 318 L272 315 L268 312 L264 309 L260 307 L256 304 L253 302 L250 300 L248 298 L246 297 L161 238 Z" stroke-width="5" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 337 L299 337 L299 336 L299 336 L298 335 L297 334 L296 333 L295 332 L295 332 L294 331 L293 331 L292 330 L292 330 L291 329 L289 327 L286 326 L283 324 L280 321 L276 318 L273 316 L269 313 L265 310 L261 308 L258 305 L255 303 L252 301 L250 300 L248 299 L166 241 L165 241 L165 241 L165 241 L164 240 L164 240 L164 240 L164 240 L164 240 L164 240 L164 240 L164 240 L164 240 L164 240 L165 240 L166 241 L170 244 L177 248 L185 254 L195 261 L206 268 L217 276 L229 285 L242 293 L253 301 L264 309 L274 316 L283 322 L289 327 L292 328 L293 330 L295 331 L295 331 L295 331 L296 331 L296 332 L297 332 L297 332 L298 333 L298 333 L299 334 L299 334 L299 335 L300 335 L300 335 L300 336 L300 336 L300 337 L300 337 L300 337 L300 338 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L299 337 L299 336 L299 336 L299 336 L298 335 L297 334 L296 333 L295 332 L295 332 L294 331 L293 331 L293 330 L292 330 L291 329 L289 328 L287 326 L284 324 L281 321 L277 319 L273 316 L270 314 L266 311 L262 308 L259 306 L256 304 L253 302 L251 301 L250 300 L170 244 L170 244 L170 244 L169 244 L169 243 L169 243 L169 243 L169 243 L169 243 L169 243 L169 243 L169 243 L169 243 L171 244 L175 247 L181 251 L189 256 L198 263 L209 270 L220 278 L232 286 L243 294 L255 302 L265 310 L275 317 L283 322 L289 327 L292 328 L294 330 L295 331 L295 331 L295 331 L296 331 L296 332 L297 332 L297 332 L298 333 L298 333 L298 334 L299 334 L299 335 L299 335 L300 335 L300 336 L300 336 L300 336 L300 337 L300 337 L300 338 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M300 337 L300 337 L300 337 L300 338 L300 338 L300 338 L300 338 L300 338 L300 338 L300 337 L300 337 L299 337 L299 336 L299 336 L299 336 L298 335 L297 334 L296 333 L295 332 L295 332 L294 331 L293 331 L293 330 L292 330 L291 329 L289 328 L287 326 L284 324 L281 322 L278 319 L274 317 L271 314 L267 312 L264 309 L260 307 L258 305 L255 303 L253 302 L252 301 L175 248 L175 248 L174 247 L174 247 L174 247 L173 246 L173 246 L173 246 L173 246 L173 246 L173 246 L174 246 L174 246 L175 247 L179 250 L185 254 L193 259 L202 266 L212 273 L223 280 L234 288 L245 296 L256 304 L266 311 L276 317 L283 323 L290 327 L292 329 L294 330 L295 331 L295 331 L295 331 L296 332 L296 332 L297 332 L297 332 L297 333 L298 333 L298 334 L299 334 L299 335 L299 335 L300 336 L300 336 L300 337 L300 337 L300 337 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L299 337 L299 336 L299 336 L299 336 L298 335 L297 334 L296 333 L295 332 L295 332 L294 331 L294 331 L293 330 L293 330 L291 329 L290 328 L288 326 L285 324 L282 322 L279 320 L275 317 L272 315 L268 312 L265 310 L262 308 L259 306 L257 304 L255 303 L253 302 L179 251 L179 250 L178 250 L178 250 L178 249 L178 249 L178 249 L178 249 L178 249 L178 249 L178 249 L180 250 L183 253 L189 257 L196 262 L205 268 L215 275 L225 282 L236 290 L247 297 L258 305 L268 312 L276 318 L284 323 L290 327 L292 329 L294 330 L295 331 L295 331 L295 331 L296 332 L297 332 L297 333 L298 333 L298 334 L299 334 L299 335 L299 335 L300 336 L300 336 L300 336 L300 337 L300 337 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L299 336 L299 336 L299 336 L299 335 L298 335 L297 334 L297 333 L296 332 L295 332 L294 331 L294 331 L293 330 L293 330 L292 329 L290 328 L288 327 L285 325 L282 323 L279 320 L276 318 L273 316 L269 313 L266 311 L263 309 L261 307 L258 305 L256 304 L255 303 L184 254 L183 254 L183 253 L183 253 L182 253 L182 253 L182 252 L182 252 L182 252 L183 253 L183 253 L184 254 L188 256 L193 260 L200 265 L209 271 L218 277 L228 284 L239 291 L249 299 L259 306 L269 312 L277 318 L284 323 L290 327 L292 329 L294 330 L295 331 L295 331 L295 331 L296 332 L296 332 L297 333 L298 333 L298 334 L298 334 L299 335 L299 335 L299 336 L300 336 L300 337 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M188 257 L188 257 L187 256 L187 256 L187 256 L187 256 L187 256 L187 256 L188 256 L189 257 L192 259 L197 263 L204 267 L212 273 L221 279 L231 286 L241 293 L251 300 L261 307 L270 313 L278 319 L285 324 L290 328 L292 329 L294 330 L295 331 L295 331 L295 331 L296 332 L296 332 L297 333 L298 333 L298 334 L298 334 L299 334 L299 335 L299 336 L300 336 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L300 337 L299 336 L299 336 L299 335 L299 335 L298 335 L297 334 L297 333 L296 332 L295 332 L295 331 L294 331 L293 330 L293 330 L292 329 L290 328 L288 327 L286 325 L283 323 L280 321 L277 318 L274 316 L271 314 L268 312 L265 310 L262 308 L260 306 L258 305 L257 304 L188 257 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M338 386 L336 386 L335 386 L334 386 L333 386 L333 385 L332 385 L331 385 L330 384 L329 384 L328 383 L327 383 L326 382 L326 382 L325 381 L324 381 L323 381 L323 380 L322 380 L321 379 L321 379 L320 378 L319 377 L318 376 L318 376 L317 375 L317 375 L317 375 L317 375 L317 375 L317 374 L317 374 L317 374 L317 374 L317 374 L318 374 L318 375 L318 375 L319 376 L320 377 L321 377 L322 378 L323 379 L324 379 L324 380 L325 380 L326 381 L327 381 L328 382 L329 382 L329 382 L330 383 L331 383 L332 384 L334 384 L335 385 L336 385 L337 385 L338 385 L338 386 L339 386 L340 386 L341 386 L341 386 L342 386 L343 387 L343 387 L343 387 L343 387 L343 387 L343 387 L343 387 L343 387 L343 387 L343 387 L342 387 L341 387 L339 387 L338 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M337 386 L336 386 L335 386 L334 386 L333 385 L332 385 L331 385 L331 384 L330 384 L329 384 L328 383 L327 383 L326 382 L326 382 L325 382 L324 381 L324 381 L323 380 L322 380 L322 379 L321 379 L320 378 L320 377 L319 377 L318 376 L318 376 L318 375 L318 375 L318 375 L317 375 L317 375 L318 375 L318 375 L318 375 L318 375 L318 375 L318 375 L319 376 L320 376 L321 377 L321 378 L322 378 L323 379 L324 380 L325 380 L325 381 L326 381 L327 381 L328 382 L329 382 L329 383 L330 383 L331 383 L332 384 L333 384 L335 385 L335 385 L337 385 L337 385 L339 386 L340 386 L342 386 L342 387 L343 387 L343 387 L343 387 L343 387 L343 387 L342 387 L341 387 L340 387 L339 386 L337 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M337 386 L336 386 L335 386 L334 386 L333 385 L332 385 L331 385 L330 384 L330 384 L329 384 L328 383 L327 383 L327 382 L326 382 L325 382 L325 381 L324 381 L323 380 L322 379 L321 378 L320 378 L319 377 L319 377 L318 376 L318 376 L318 376 L318 376 L318 375 L318 375 L318 375 L318 375 L318 375 L318 375 L319 376 L319 376 L320 376 L320 377 L321 378 L322 378 L323 379 L323 379 L324 380 L325 380 L326 381 L326 381 L327 382 L328 382 L329 383 L331 383 L332 384 L333 384 L334 385 L335 385 L336 385 L337 385 L338 386 L340 386 L341 386 L342 387 L342 387 L342 387 L342 387 L342 387 L342 387 L341 387 L341 387 L340 387 L338 386 L337 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M336 386 L335 386 L334 386 L334 385 L333 385 L332 385 L331 385 L330 384 L330 384 L329 384 L328 383 L327 383 L327 382 L326 382 L325 382 L325 381 L324 381 L323 380 L322 379 L321 379 L320 378 L320 377 L319 377 L319 377 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L319 376 L320 377 L321 377 L321 378 L322 379 L323 379 L324 380 L324 380 L325 381 L326 381 L327 382 L327 382 L328 382 L329 383 L329 383 L330 383 L331 383 L332 384 L333 384 L334 385 L335 385 L336 385 L336 385 L338 386 L339 386 L340 386 L341 387 L341 387 L341 387 L341 387 L341 387 L340 387 L339 386 L338 386 L336 386 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M336 385 L337 386 L338 386 L339 386 L340 386 L340 386 L340 386 L340 386 L340 386 L338 386 L336 386 L335 386 L334 385 L333 385 L332 385 L332 385 L331 384 L330 384 L330 384 L329 384 L328 383 L327 383 L327 383 L326 382 L324 381 L323 380 L322 380 L322 379 L321 378 L320 378 L320 377 L320 377 L319 377 L319 376 L319 376 L319 376 L319 376 L320 377 L320 377 L321 377 L321 378 L322 379 L323 379 L323 380 L324 380 L325 381 L325 381 L326 381 L327 382 L327 382 L328 382 L329 383 L329 383 L330 383 L331 384 L332 384 L333 384 L334 385 L334 385 L336 385 L336 385 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M137 176 L131 184 L130 186 L132 186 L137 176 Z" stroke="none" />

-      <path fill="none" d="M137 176 L131 184 L130 186 L132 186 L137 176 Z" stroke-width="5" />

-      <path fill="rgb(153,176,191)" d="M30 222 L30 222 L29 221 L29 220 L27 219 L26 217 L24 215 L23 214 L22 212 L21 211 L20 210 L19 208 L18 207 L17 205 L16 204 L15 202 L14 200 L13 199 L12 197 L11 195 L11 193 L10 192 L9 190 L8 188 L8 186 L7 184 L6 182 L6 181 L5 179 L5 177 L5 176 L4 174 L4 173 L4 171 L4 170 L4 169 L3 168 L3 167 L3 166 L3 165 L3 164 L3 163 L3 163 L3 161 L3 160 L3 159 L3 159 L3 158 L3 158 L4 158 L4 158 L36 181 L51 176 L53 195 L30 222 Z" stroke-width="5" stroke="none" />

-      <path fill="none" d="M30 222 L30 222 L29 221 L29 220 L27 219 L26 217 L24 215 L23 214 L22 212 L21 211 L20 210 L19 208 L18 207 L17 205 L16 204 L15 202 L14 200 L13 199 L12 197 L11 195 L11 193 L10 192 L9 190 L8 188 L8 186 L7 184 L6 182 L6 181 L5 179 L5 177 L5 176 L4 174 L4 173 L4 171 L4 170 L4 169 L3 168 L3 167 L3 166 L3 165 L3 164 L3 163 L3 163 L3 161 L3 160 L3 159 L3 159 L3 158 L3 158 L4 158 L4 158 L36 181 L51 176 L53 195 L30 222 Z" />

-      <path fill="rgb(153,176,191)" d="M27 218 L35 207 L36 182 L36 182 L35 181 L33 180 L31 179 L29 177 L26 175 L23 173 L21 171 L18 169 L15 167 L12 165 L10 164 L8 162 L6 161 L6 161 L5 161 L5 160 L5 160 L5 161 L4 161 L4 161 L4 162 L4 162 L4 163 L4 164 L4 165 L4 166 L5 167 L5 169 L5 170 L5 172 L6 174 L6 175 L6 177 L7 179 L8 181 L8 184 L9 186 L10 188 L11 190 L12 193 L13 195 L15 198 L16 201 L18 203 L19 206 L21 209 L23 212 L25 215 L27 218 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M37 242 L88 178 L88 179 L88 180 L88 182 L88 184 L88 186 L88 187 L88 188 L88 190 L88 191 L88 192 L87 194 L87 195 L87 196 L87 197 L86 199 L86 201 L86 202 L86 204 L86 206 L85 208 L85 210 L85 212 L85 215 L85 217 L85 219 L86 221 L86 223 L86 224 L86 225 L86 226 L86 228 L87 231 L87 233 L87 235 L88 238 L88 241 L89 242 L89 243 L89 245 L90 246 L90 248 L91 249 L91 251 L92 253 L92 254 L93 256 L93 258 L94 259 L95 261 L95 263 L96 265 L97 267 L98 269 L99 271 L100 273 L101 276 L103 281 L107 288 L111 297 L116 307 L122 318 L128 330 L134 342 L140 354 L146 366 L152 378 L157 388 L162 398 L167 407 L170 414 L173 419 L174 423 L176 425 L177 427 L177 428 L178 430 L178 431 L179 432 L179 434 L180 435 L180 436 L181 438 L181 439 L181 441 L181 442 L181 443 L181 445 L181 446 L181 448 L181 449 L181 451 L180 452 L180 453 L179 455 L178 456 L177 457 L176 458 L175 460 L174 461 L172 462 L170 463 L169 464 L167 465 L165 466 L163 466 L161 467 L160 467 L158 467 L156 467 L155 467 L153 467 L152 467 L151 466 L149 466 L148 465 L147 465 L146 464 L145 463 L144 463 L143 462 L142 461 L141 460 L140 459 L139 458 L139 457 L138 456 L137 456 L137 455 L136 454 L136 453 L135 452 L135 451 L135 450 L134 450 L133 447 L130 440 L127 432 L122 421 L117 408 L111 393 L104 378 L98 363 L91 347 L85 332 L79 318 L74 305 L69 294 L65 285 L63 279 L62 276 L61 275 L60 274 L60 272 L59 270 L58 269 L57 267 L56 266 L56 264 L55 263 L54 262 L54 261 L53 260 L52 259 L51 258 L50 256 L50 255 L49 254 L47 253 L46 251 L45 250 L44 249 L43 247 L41 246 L40 244 L38 243 L37 242 Z" stroke="none" />

-      <path fill="none" d="M37 242 L88 178 L88 179 L88 180 L88 182 L88 184 L88 186 L88 187 L88 188 L88 190 L88 191 L88 192 L87 194 L87 195 L87 196 L87 197 L86 199 L86 201 L86 202 L86 204 L86 206 L85 208 L85 210 L85 212 L85 215 L85 217 L85 219 L86 221 L86 223 L86 224 L86 225 L86 226 L86 228 L87 231 L87 233 L87 235 L88 238 L88 241 L89 242 L89 243 L89 245 L90 246 L90 248 L91 249 L91 251 L92 253 L92 254 L93 256 L93 258 L94 259 L95 261 L95 263 L96 265 L97 267 L98 269 L99 271 L100 273 L101 276 L103 281 L107 288 L111 297 L116 307 L122 318 L128 330 L134 342 L140 354 L146 366 L152 378 L157 388 L162 398 L167 407 L170 414 L173 419 L174 423 L176 425 L177 427 L177 428 L178 430 L178 431 L179 432 L179 434 L180 435 L180 436 L181 438 L181 439 L181 441 L181 442 L181 443 L181 445 L181 446 L181 448 L181 449 L181 451 L180 452 L180 453 L179 455 L178 456 L177 457 L176 458 L175 460 L174 461 L172 462 L170 463 L169 464 L167 465 L165 466 L163 466 L161 467 L160 467 L158 467 L156 467 L155 467 L153 467 L152 467 L151 466 L149 466 L148 465 L147 465 L146 464 L145 463 L144 463 L143 462 L142 461 L141 460 L140 459 L139 458 L139 457 L138 456 L137 456 L137 455 L136 454 L136 453 L135 452 L135 451 L135 450 L134 450 L133 447 L130 440 L127 432 L122 421 L117 408 L111 393 L104 378 L98 363 L91 347 L85 332 L79 318 L74 305 L69 294 L65 285 L63 279 L62 276 L61 275 L60 274 L60 272 L59 270 L58 269 L57 267 L56 266 L56 264 L55 263 L54 262 L54 261 L53 260 L52 259 L51 258 L50 256 L50 255 L49 254 L47 253 L46 251 L45 250 L44 249 L43 247 L41 246 L40 244 L38 243 L37 242 Z" />

-      <path fill="rgb(153,176,191)" d="M88 183 L39 243 L17 236 L17 234 L48 194 L49 167 L18 144 L18 144 L19 143 L20 143 L21 143 L22 142 L24 142 L26 141 L29 141 L30 141 L31 140 L33 140 L34 140 L35 140 L37 140 L38 140 L40 140 L41 140 L43 140 L45 140 L46 140 L48 140 L49 140 L51 141 L52 141 L54 141 L56 142 L57 142 L59 143 L60 144 L62 144 L64 145 L65 146 L67 147 L68 148 L70 149 L71 150 L73 151 L74 152 L75 153 L77 154 L78 156 L79 157 L80 159 L81 160 L82 162 L83 163 L84 165 L85 167 L86 168 L86 170 L87 172 L87 174 L87 176 L88 178 L88 181 L88 183 Z" stroke="none" />

-      <path fill="none" d="M88 183 L39 243 L17 236 L17 234 L48 194 L49 167 L18 144 L18 144 L19 143 L20 143 L21 143 L22 142 L24 142 L26 141 L29 141 L30 141 L31 140 L33 140 L34 140 L35 140 L37 140 L38 140 L40 140 L41 140 L43 140 L45 140 L46 140 L48 140 L49 140 L51 141 L52 141 L54 141 L56 142 L57 142 L59 143 L60 144 L62 144 L64 145 L65 146 L67 147 L68 148 L70 149 L71 150 L73 151 L74 152 L75 153 L77 154 L78 156 L79 157 L80 159 L81 160 L82 162 L83 163 L84 165 L85 167 L86 168 L86 170 L87 172 L87 174 L87 176 L88 178 L88 181 L88 183" />

-      <path fill="rgb(153,176,191)" d="M165 418 L165 418 L164 418 L163 418 L161 418 L161 418 L160 417 L159 417 L158 417 L157 417 L156 417 L155 418 L153 418 L152 418 L151 418 L150 419 L148 419 L147 419 L146 420 L144 421 L143 421 L142 422 L141 423 L139 424 L138 425 L137 426 L136 428 L135 429 L133 431 L133 429 L131 425 L128 418 L124 409 L120 398 L115 386 L109 373 L103 360 L98 346 L92 333 L87 321 L82 309 L78 300 L75 292 L72 286 L71 283 L70 281 L70 280 L70 278 L69 276 L69 275 L69 273 L70 272 L70 271 L70 269 L71 268 L71 267 L72 266 L73 265 L74 264 L74 264 L75 263 L76 263 L77 262 L78 262 L79 262 L81 262 L82 262 L83 262 L84 263 L85 263 L86 264 L87 265 L88 265 L89 267 L90 268 L91 269 L92 271 L95 276 L99 284 L103 293 L108 303 L114 315 L120 327 L126 340 L133 353 L139 366 L145 378 L150 389 L155 398 L159 407 L162 413 L164 417 L165 418 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M163 417 L163 417 L163 417 L162 417 L161 417 L160 417 L159 417 L158 417 L158 417 L157 417 L156 417 L155 417 L154 417 L153 417 L152 417 L151 417 L149 418 L148 418 L147 418 L146 419 L145 420 L144 420 L142 421 L141 422 L140 423 L139 424 L138 425 L136 426 L135 427 L135 428 L134 428 L134 429 L134 429 L133 427 L131 423 L128 416 L124 407 L119 396 L114 384 L109 371 L103 358 L98 345 L92 332 L87 319 L82 308 L78 299 L75 291 L73 285 L72 283 L71 281 L71 279 L70 278 L70 276 L70 275 L70 274 L70 272 L70 271 L71 270 L71 269 L72 268 L72 267 L73 266 L73 265 L74 265 L75 264 L76 264 L77 263 L78 263 L79 263 L80 263 L81 263 L82 263 L83 263 L84 263 L85 264 L86 264 L87 265 L88 266 L89 267 L90 268 L90 269 L91 270 L91 271 L92 271 L92 272 L95 277 L98 285 L103 294 L108 305 L114 316 L120 328 L126 341 L132 353 L138 366 L144 378 L149 388 L154 398 L158 406 L161 412 L163 416 L163 417 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M162 417 L162 416 L161 416 L160 416 L159 416 L159 416 L158 416 L157 416 L156 416 L156 416 L155 416 L154 416 L153 416 L152 416 L151 416 L150 417 L149 417 L148 417 L146 418 L145 418 L144 419 L143 420 L142 420 L141 421 L139 422 L138 423 L137 424 L136 426 L135 427 L134 427 L134 428 L134 428 L134 428 L133 426 L131 421 L127 413 L124 404 L119 393 L114 382 L109 369 L103 356 L98 343 L92 330 L87 318 L83 307 L79 298 L76 290 L73 285 L72 282 L72 281 L71 279 L71 277 L71 276 L71 275 L71 273 L71 272 L71 271 L71 270 L72 269 L72 268 L73 267 L73 266 L74 265 L75 265 L76 264 L77 264 L78 264 L78 263 L79 263 L80 263 L81 263 L82 264 L83 264 L84 264 L85 265 L86 266 L87 267 L88 267 L89 269 L90 270 L91 271 L91 272 L91 272 L92 273 L92 273 L94 279 L98 286 L103 295 L108 306 L113 317 L119 329 L125 341 L131 354 L137 366 L143 377 L148 388 L153 398 L156 405 L159 411 L161 415 L162 417 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M160 416 L160 416 L160 416 L159 415 L158 415 L157 415 L157 415 L156 415 L155 415 L155 415 L154 415 L153 415 L152 415 L151 416 L150 416 L149 416 L148 416 L147 417 L146 417 L145 418 L143 419 L142 419 L141 420 L140 421 L139 422 L137 423 L136 424 L135 425 L134 427 L133 425 L131 421 L128 414 L125 405 L120 395 L115 383 L110 370 L104 357 L99 343 L93 330 L88 318 L83 307 L79 298 L76 290 L74 284 L73 282 L72 280 L72 279 L71 277 L71 276 L71 274 L71 273 L71 272 L72 271 L72 270 L72 269 L73 268 L73 267 L74 266 L75 266 L76 265 L76 265 L77 264 L78 264 L79 264 L80 264 L81 264 L82 264 L83 265 L84 265 L85 266 L86 266 L87 267 L88 268 L89 269 L89 270 L90 271 L91 273 L93 278 L97 285 L101 294 L106 304 L111 315 L117 327 L123 340 L129 352 L135 364 L141 376 L146 387 L151 396 L155 404 L158 410 L160 414 L160 416 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M174 435 L175 436 L175 437 L175 438 L176 439 L176 439 L176 440 L176 441 L176 442 L176 443 L176 444 L176 445 L176 446 L176 447 L176 447 L176 448 L175 449 L175 450 L175 451 L174 452 L174 452 L173 453 L173 454 L172 455 L172 455 L171 456 L171 457 L170 457 L169 458 L168 458 L168 459 L167 459 L166 460 L165 460 L164 461 L163 461 L163 461 L162 461 L161 462 L160 462 L159 462 L158 462 L157 462 L156 462 L155 462 L155 462 L154 461 L153 461 L152 461 L151 461 L150 460 L149 460 L149 459 L148 459 L147 459 L146 458 L146 457 L145 457 L144 456 L144 456 L143 455 L143 454 L142 453 L142 452 L141 452 L141 451 L140 450 L140 449 L140 448 L140 447 L139 446 L139 445 L139 445 L139 444 L139 443 L139 442 L139 441 L139 440 L140 439 L140 438 L140 437 L140 437 L141 436 L141 435 L142 434 L142 433 L143 433 L143 432 L144 431 L144 431 L145 430 L146 429 L146 429 L147 428 L148 428 L149 427 L149 427 L150 426 L151 426 L152 426 L153 425 L154 425 L155 425 L156 425 L157 425 L157 425 L158 425 L159 425 L160 425 L161 425 L162 425 L163 425 L164 426 L164 426 L165 426 L166 427 L167 427 L168 428 L168 428 L169 429 L170 429 L170 430 L171 430 L172 431 L172 432 L173 433 L173 433 L174 434 L174 435 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M174 435 L174 436 L174 437 L175 438 L175 439 L175 440 L175 440 L176 441 L176 442 L176 443 L176 444 L176 445 L175 446 L175 446 L175 447 L175 448 L175 449 L174 450 L174 451 L174 451 L173 452 L173 453 L172 454 L172 454 L171 455 L171 456 L170 456 L170 457 L169 457 L168 458 L167 458 L167 459 L166 459 L165 460 L164 460 L163 460 L162 461 L162 461 L161 461 L160 461 L159 461 L158 461 L157 461 L156 461 L155 461 L155 461 L154 461 L153 461 L152 460 L151 460 L151 460 L150 459 L149 459 L148 459 L147 458 L147 458 L146 457 L145 456 L145 456 L144 455 L144 454 L143 454 L143 453 L142 452 L142 451 L141 451 L141 450 L141 449 L140 448 L140 447 L140 446 L140 445 L140 445 L140 444 L140 443 L140 442 L140 441 L140 440 L140 439 L140 439 L141 438 L141 437 L141 436 L142 435 L142 435 L143 434 L143 433 L144 432 L144 432 L145 431 L145 430 L146 430 L147 429 L147 429 L148 428 L149 428 L150 427 L151 427 L151 427 L152 426 L153 426 L154 426 L155 426 L156 426 L157 425 L157 425 L158 425 L159 425 L160 426 L161 426 L162 426 L163 426 L163 426 L164 427 L165 427 L166 427 L167 428 L167 428 L168 429 L169 429 L169 430 L170 430 L171 431 L171 432 L172 432 L172 433 L173 434 L173 434 L174 435 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M173 436 L174 436 L174 437 L174 438 L174 439 L175 440 L175 441 L175 441 L175 442 L175 443 L175 444 L175 445 L175 446 L175 446 L175 447 L174 448 L174 449 L174 450 L174 450 L173 451 L173 452 L172 453 L172 453 L171 454 L171 455 L170 455 L170 456 L169 456 L168 457 L168 457 L167 458 L166 458 L165 459 L165 459 L164 460 L163 460 L162 460 L161 460 L161 460 L160 461 L159 461 L158 461 L157 461 L156 461 L156 461 L155 460 L154 460 L153 460 L152 460 L152 460 L151 459 L150 459 L149 458 L149 458 L148 458 L147 457 L147 457 L146 456 L145 455 L145 455 L144 454 L144 453 L143 453 L143 452 L142 451 L142 450 L142 449 L141 449 L141 448 L141 447 L141 446 L141 445 L140 444 L140 444 L140 443 L140 442 L141 441 L141 440 L141 440 L141 439 L141 438 L142 437 L142 436 L142 436 L143 435 L143 434 L144 433 L144 433 L145 432 L145 432 L146 431 L146 430 L147 430 L148 429 L148 429 L149 428 L150 428 L151 428 L152 427 L152 427 L153 427 L154 426 L155 426 L156 426 L157 426 L157 426 L158 426 L159 426 L160 426 L161 426 L162 427 L162 427 L163 427 L164 427 L165 428 L165 428 L166 428 L167 429 L168 429 L168 430 L169 430 L170 431 L170 431 L171 432 L171 433 L172 433 L172 434 L173 435 L173 436 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M173 436 L173 437 L173 438 L174 438 L174 439 L174 440 L174 441 L174 442 L174 442 L174 443 L174 444 L174 445 L174 446 L174 446 L174 447 L174 448 L174 449 L173 449 L173 450 L173 451 L172 452 L172 452 L171 453 L171 454 L170 454 L170 455 L169 455 L169 456 L168 456 L167 457 L167 457 L166 458 L165 458 L164 459 L164 459 L163 459 L162 460 L161 460 L160 460 L160 460 L159 460 L158 460 L157 460 L156 460 L156 460 L155 460 L154 460 L153 459 L153 459 L152 459 L151 459 L150 458 L150 458 L149 458 L148 457 L148 457 L147 456 L146 456 L146 455 L145 454 L145 454 L144 453 L144 452 L143 452 L143 451 L142 450 L142 449 L142 449 L142 448 L141 447 L141 446 L141 445 L141 445 L141 444 L141 443 L141 442 L141 441 L141 441 L141 440 L142 439 L142 438 L142 437 L142 437 L143 436 L143 435 L144 435 L144 434 L145 433 L145 433 L146 432 L146 431 L147 431 L147 430 L148 430 L149 429 L150 429 L150 429 L151 428 L152 428 L153 428 L153 427 L154 427 L155 427 L156 427 L157 427 L157 427 L158 427 L159 427 L160 427 L161 427 L161 427 L162 427 L163 428 L164 428 L164 428 L165 429 L166 429 L167 429 L167 430 L168 430 L169 431 L169 431 L170 432 L170 432 L171 433 L171 434 L172 434 L172 435 L173 436 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M172 436 L172 437 L173 438 L173 439 L173 439 L173 440 L173 441 L174 442 L174 442 L174 443 L174 444 L174 445 L174 445 L173 446 L173 447 L173 448 L173 448 L173 449 L172 450 L172 451 L172 451 L171 452 L171 453 L170 453 L170 454 L169 454 L169 455 L168 455 L168 456 L167 456 L166 457 L166 457 L165 458 L164 458 L163 458 L163 459 L162 459 L161 459 L160 459 L160 459 L159 459 L158 459 L157 459 L156 459 L156 459 L155 459 L154 459 L153 459 L153 459 L152 458 L151 458 L151 458 L150 457 L149 457 L149 457 L148 456 L147 456 L147 455 L146 455 L146 454 L145 453 L145 453 L144 452 L144 451 L143 451 L143 450 L143 449 L142 448 L142 448 L142 447 L142 446 L142 445 L142 444 L142 444 L142 443 L142 442 L142 441 L142 441 L142 440 L142 439 L142 438 L143 438 L143 437 L143 436 L144 436 L144 435 L145 434 L145 434 L145 433 L146 432 L147 432 L147 431 L148 431 L148 430 L149 430 L150 430 L151 429 L151 429 L152 428 L153 428 L154 428 L154 428 L155 428 L156 428 L157 427 L157 427 L158 427 L159 427 L160 428 L161 428 L161 428 L162 428 L163 428 L163 428 L164 429 L165 429 L166 429 L166 430 L167 430 L167 431 L168 431 L169 432 L169 432 L170 433 L170 434 L171 434 L171 435 L172 436 L172 436 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M172 436 L172 437 L173 438 L173 439 L173 439 L173 440 L173 441 L174 442 L174 442 L174 443 L174 444 L174 445 L174 445 L173 446 L173 447 L173 448 L173 448 L173 449 L172 450 L172 451 L172 451 L171 452 L171 453 L170 453 L170 454 L169 454 L169 455 L168 455 L168 456 L167 456 L166 457 L166 457 L165 458 L164 458 L163 458 L163 459 L162 459 L161 459 L160 459 L160 459 L159 459 L158 459 L157 459 L156 459 L156 459 L155 459 L154 459 L153 459 L153 459 L152 458 L151 458 L151 458 L150 457 L149 457 L149 457 L148 456 L147 456 L147 455 L146 455 L146 454 L145 453 L145 453 L144 452 L144 451 L143 451 L143 450 L143 449 L142 448 L142 448 L142 447 L142 446 L142 445 L142 444 L142 444 L142 443 L142 442 L142 441 L142 441 L142 440 L142 439 L143 438 L143 438 L143 437 L143 436 L144 436 L144 435 L145 434 L145 434 L146 433 L146 432 L147 432 L147 431 L148 431 L148 430 L149 430 L150 430 L151 429 L151 429 L152 428 L153 428 L154 428 L154 428 L155 428 L156 428 L157 427 L157 427 L158 427 L159 427 L160 428 L160 428 L161 428 L162 428 L163 428 L163 429 L164 429 L165 429 L166 429 L166 430 L167 430 L167 431 L168 431 L169 432 L169 432 L170 433 L170 434 L171 434 L171 435 L172 436 L172 436 Z" stroke="none" />

-      <path fill="none" d="M172 436 L172 437 L173 438 L173 439 L173 439 L173 440 L173 441 L174 442 L174 442 L174 443 L174 444 L174 445 L174 445 L173 446 L173 447 L173 448 L173 448 L173 449 L172 450 L172 451 L172 451 L171 452 L171 453 L170 453 L170 454 L169 454 L169 455 L168 455 L168 456 L167 456 L166 457 L166 457 L165 458 L164 458 L163 458 L163 459 L162 459 L161 459 L160 459 L160 459 L159 459 L158 459 L157 459 L156 459 L156 459 L155 459 L154 459 L153 459 L153 459 L152 458 L151 458 L151 458 L150 457 L149 457 L149 457 L148 456 L147 456 L147 455 L146 455 L146 454 L145 453 L145 453 L144 452 L144 451 L143 451 L143 450 L143 449 L142 448 L142 448 L142 447 L142 446 L142 445 L142 444 L142 444 L142 443 L142 442 L142 441 L142 441 L142 440 L142 439 L143 438 L143 438 L143 437 L143 436 L144 436 L144 435 L145 434 L145 434 L146 433 L146 432 L147 432 L147 431 L148 431 L148 430 L149 430 L150 430 L151 429 L151 429 L152 428 L153 428 L154 428 L154 428 L155 428 L156 428 L157 427 L157 427 L158 427 L159 427 L160 428 L160 428 L161 428 L162 428 L163 428 L163 429 L164 429 L165 429 L166 429 L166 430 L167 430 L167 431 L168 431 L169 432 L169 432 L170 433 L170 434 L171 434 L171 435 L172 436 L172 436" />

-      <path fill="rgb(153,176,191)" d="M159 415 L159 415 L158 414 L158 414 L157 414 L156 414 L156 414 L155 414 L154 414 L154 414 L153 414 L152 414 L151 414 L150 414 L149 415 L148 415 L147 415 L146 416 L145 416 L144 417 L143 417 L142 418 L141 419 L140 419 L138 420 L137 421 L136 423 L135 424 L134 425 L133 424 L131 419 L128 412 L125 404 L120 393 L115 381 L110 369 L105 356 L99 342 L94 330 L89 317 L84 306 L80 297 L77 289 L75 284 L74 281 L73 280 L73 278 L72 277 L72 276 L72 274 L72 273 L72 272 L72 271 L73 270 L73 269 L74 268 L74 268 L75 267 L75 266 L76 266 L77 265 L78 265 L78 265 L79 265 L80 265 L81 265 L82 265 L83 265 L84 266 L85 266 L86 267 L87 268 L87 269 L88 270 L89 271 L90 272 L90 273 L93 278 L96 285 L100 294 L105 304 L110 315 L116 327 L122 339 L128 351 L134 364 L140 375 L145 386 L150 395 L153 403 L156 409 L158 413 L159 415 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M79 227 L62 247 L44 233 L61 212 L79 227 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M74 222 L56 244 L47 237 L65 215 L74 222 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M73 221 L55 243 L47 237 L65 215 L73 221 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M72 221 L55 243 L47 237 L65 215 L72 221 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M72 220 L54 242 L48 237 L65 215 L72 220 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M71 220 L54 242 L48 237 L65 215 L71 220 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M70 219 L53 241 L48 237 L65 215 L70 219 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M70 219 L52 241 L48 237 L65 216 L70 219 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M69 218 L52 240 L48 237 L65 216 L69 218 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M69 218 L51 240 L48 237 L65 216 L69 218 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M68 218 L51 239 L48 237 L65 216 L68 218 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M72 223 L72 224 L72 224 L72 224 L71 224 L71 224 L71 224 L71 224 L71 224 L70 224 L70 224 L70 223 L69 223 L68 223 L67 222 L65 221 L64 221 L63 220 L62 220 L62 220 L61 220 L58 219 L58 219 L59 220 L60 220 L61 221 L62 221 L63 222 L64 222 L65 223 L66 224 L67 224 L69 225 L70 226 L70 226 L71 227 L72 227 L72 227 L73 227 L73 227 L73 227 L73 227 L74 227 L74 227 L74 227 L74 227 L74 227 L74 227 L74 227 L74 227 L74 227 L74 226 L74 226 L74 226 L73 225 L73 225 L73 224 L72 223 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M74 227 L72 229 L72 229 L72 229 L71 229 L71 229 L70 229 L69 228 L69 228 L68 228 L68 227 L67 227 L66 227 L66 226 L65 225 L64 225 L63 224 L62 224 L61 223 L60 223 L59 222 L58 222 L58 222 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 220 L58 220 L58 219 L58 219 L59 220 L60 220 L61 221 L62 221 L63 222 L64 222 L64 223 L65 223 L66 224 L67 224 L68 225 L70 226 L71 227 L71 227 L72 227 L72 227 L72 227 L73 227 L73 227 L73 227 L73 227 L74 227 L74 227 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M59 222 L59 222 L58 222 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 221 L57 222 L57 222 L57 222 L58 223 L58 223 L59 222 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M68 228 L68 228 L68 228 L68 228 L68 228 L68 228 L68 228 L67 228 L67 228 L67 228 L67 228 L66 228 L66 228 L64 227 L63 227 L62 226 L60 225 L59 225 L59 225 L58 224 L57 224 L54 224 L55 224 L55 224 L56 225 L57 225 L58 226 L59 226 L61 227 L62 228 L63 228 L64 229 L65 230 L66 230 L67 231 L67 231 L68 231 L69 232 L69 232 L69 232 L70 232 L70 232 L70 232 L70 232 L70 232 L70 232 L70 232 L70 231 L70 231 L70 231 L70 231 L70 231 L70 230 L70 230 L70 230 L69 229 L69 229 L68 228 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M70 232 L68 234 L68 234 L68 234 L68 234 L67 234 L67 233 L66 233 L65 233 L65 232 L64 232 L63 231 L63 231 L62 230 L61 230 L60 229 L59 229 L58 228 L57 228 L57 227 L56 227 L55 226 L54 226 L54 226 L53 226 L53 226 L53 226 L53 226 L53 226 L53 226 L53 226 L53 225 L53 225 L54 225 L54 224 L54 224 L55 224 L55 224 L56 225 L57 225 L58 226 L59 226 L60 227 L61 227 L61 227 L62 228 L63 229 L65 230 L66 230 L67 231 L68 231 L68 232 L68 232 L69 232 L69 232 L69 232 L70 232 L70 232 L70 232 L70 232 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M55 227 L55 226 L54 226 L53 226 L53 226 L53 226 L53 226 L53 226 L53 226 L53 226 L54 227 L54 227 L54 228 L55 227 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M65 232 L65 233 L65 233 L64 233 L64 233 L64 233 L64 233 L64 233 L63 233 L63 233 L63 233 L62 232 L62 232 L61 232 L59 231 L58 230 L56 230 L56 230 L55 229 L54 229 L54 229 L51 228 L51 228 L51 229 L52 229 L53 230 L54 230 L56 231 L57 231 L58 232 L59 233 L60 233 L61 234 L63 235 L63 235 L64 236 L64 236 L65 236 L65 236 L66 236 L66 236 L66 236 L66 236 L66 236 L67 236 L67 236 L67 236 L67 236 L67 236 L67 236 L67 236 L67 235 L66 235 L66 235 L66 234 L66 234 L65 233 L65 232 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M67 236 L65 238 L65 238 L65 238 L64 238 L64 238 L63 238 L63 238 L63 238 L62 237 L62 237 L61 237 L60 236 L60 236 L59 236 L58 235 L57 234 L56 234 L55 233 L54 233 L54 232 L53 232 L52 231 L51 231 L50 231 L50 230 L50 230 L49 230 L49 230 L49 230 L49 230 L49 230 L49 230 L49 230 L50 230 L50 229 L50 229 L51 228 L51 228 L51 229 L52 229 L53 230 L54 230 L55 231 L56 231 L57 232 L58 232 L59 233 L60 233 L61 234 L62 235 L64 236 L64 236 L64 236 L65 236 L65 236 L65 236 L66 236 L66 236 L66 236 L66 236 L67 236 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M51 231 L51 231 L51 231 L50 231 L50 230 L50 230 L49 230 L49 230 L49 230 L49 230 L49 230 L49 230 L49 231 L50 231 L50 231 L50 232 L51 232 L51 231 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M61 237 L61 237 L61 237 L61 237 L60 237 L60 237 L60 237 L60 237 L60 237 L60 237 L59 237 L59 237 L58 237 L57 236 L56 236 L54 235 L53 234 L52 234 L51 234 L51 234 L50 233 L47 233 L47 233 L48 233 L49 234 L50 234 L51 235 L52 235 L53 236 L54 237 L55 237 L56 238 L58 239 L59 239 L59 240 L60 240 L61 240 L61 241 L62 241 L62 241 L62 241 L62 241 L63 241 L63 241 L63 241 L63 241 L63 241 L63 241 L63 240 L63 240 L63 240 L63 240 L63 239 L63 239 L62 239 L62 238 L62 238 L61 237 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M63 241 L61 243 L61 243 L61 243 L61 243 L60 243 L59 242 L58 242 L58 242 L57 241 L57 241 L56 240 L55 240 L55 240 L54 239 L53 238 L52 238 L51 237 L50 237 L49 237 L48 236 L47 235 L47 235 L46 235 L46 235 L46 235 L46 235 L46 235 L46 235 L46 235 L46 235 L46 234 L46 234 L46 234 L47 233 L47 233 L47 233 L48 233 L49 234 L50 234 L51 235 L52 235 L53 236 L53 236 L54 236 L55 237 L56 238 L57 239 L59 239 L60 240 L60 240 L61 241 L61 241 L61 241 L62 241 L62 241 L62 241 L63 241 L63 241 L63 241 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M77 226 L80 226 L62 248 L61 245 L77 226 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M80 226 L65 214 L64 212 L61 210 L61 214 L77 226 L80 226 Z" stroke="none" />

-      <path fill="none" d="M62 241 L61 243" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M62 241 L60 243" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 241 L60 242" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 241 L60 242" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 240 L59 242" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 240 L59 242" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 240 L58 242" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 239 L57 241" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 239 L57 241" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M57 239 L56 240" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M57 238 L55 240" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M56 238 L55 239" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M55 237 L54 239" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M55 237 L53 239" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M54 237 L53 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M53 236 L52 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M53 236 L51 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M52 235 L51 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M51 235 L50 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M51 235 L49 236" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M50 234 L49 236" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M49 234 L48 236" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M49 234 L48 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M48 234 L47 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M48 233 L47 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M47 233 L46 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M47 233 L46 235" stroke="rgb(174,185,193)" />

-      <path fill="rgb(153,176,191)" d="M62 248 L46 236 L44 236 L42 234 L46 233 L61 245 L62 248 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M61 214 L46 233 L42 234 L61 210 L61 214 Z" stroke="none" />

-      <path fill="none" d="M73 227 L72 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M73 227 L71 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M72 227 L71 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M72 227 L71 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M71 227 L70 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M71 227 L70 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M70 226 L69 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M70 226 L69 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M69 226 L68 227" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M68 225 L67 227" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M68 225 L66 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M67 224 L66 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M66 224 L65 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M66 223 L64 225" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M65 223 L64 225" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M64 223 L63 224" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M64 222 L62 224" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M63 222 L62 224" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M62 222 L61 223" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M62 221 L60 223" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 221 L60 223" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 221 L59 222" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 220 L59 222" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 220 L58 222" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 220 L58 221" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 220 L57 221" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 219 L57 221" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M70 232 L68 234" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M69 232 L68 234" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M69 232 L67 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M68 232 L67 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M68 231 L66 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M67 231 L66 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M67 231 L65 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M66 230 L65 232" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M65 230 L64 232" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M65 230 L63 231" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M64 229 L63 231" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M63 229 L62 230" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M63 228 L61 230" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M62 228 L61 230" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 228 L60 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 227 L59 229" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 227 L59 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 226 L58 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 226 L57 228" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 226 L57 227" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M57 225 L56 227" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M57 225 L56 227" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M56 225 L55 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M56 225 L54 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M55 224 L54 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M55 224 L53 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M54 224 L53 226" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M66 236 L65 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M66 236 L64 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M65 236 L64 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M65 236 L63 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M64 236 L63 238" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M64 236 L62 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M63 235 L62 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M63 235 L61 237" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M62 235 L60 236" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M61 234 L60 236" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 234 L59 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M60 233 L58 235" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M59 233 L58 234" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 232 L57 234" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M58 232 L56 234" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M57 232 L56 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M56 231 L55 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M56 231 L54 233" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M55 231 L54 232" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M54 230 L53 232" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M54 230 L53 232" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M53 230 L52 231" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M53 229 L51 231" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M52 229 L51 231" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M51 229 L50 230" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M51 229 L50 230" stroke="rgb(174,185,193)" />

-      <path fill="none" d="M51 228 L49 230" stroke="rgb(174,185,193)" />

-      <path fill="rgb(153,176,191)" d="M58 219 L58 219 L58 219 L57 220 L57 220 L57 221 L56 221 L56 221 L57 222 L57 222 L57 222 L57 223 L57 223 L57 223 L57 223 L56 223 L56 224 L56 224 L56 224 L56 224 L56 224 L55 224 L55 224 L54 224 L54 224 L53 226 L53 226 L53 226 L53 226 L53 227 L53 227 L53 227 L53 228 L53 228 L53 228 L53 228 L53 228 L52 228 L52 228 L52 228 L52 228 L51 228 L51 228 L51 228 L49 230 L49 230 L49 231 L49 231 L50 231 L50 232 L50 232 L49 232 L49 232 L49 232 L49 233 L49 233 L49 233 L48 233 L48 233 L47 232 L47 232 L46 233 L46 233 L61 214 L63 215 L63 215 L63 216 L63 216 L63 216 L62 216 L62 216 L62 215 L62 215 L61 215 L61 215 L61 215 L61 216 L60 216 L60 216 L60 217 L60 217 L60 217 L60 217 L60 217 L60 218 L60 218 L60 218 L60 218 L60 218 L60 219 L60 219 L60 219 L60 219 L60 219 L60 219 L60 219 L59 219 L59 219 L59 219 L58 219 L58 219 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M77 226 L61 245 L46 233 L61 214 L77 226 Z" stroke="none" />

-      <path fill="none" d="M77 226 L61 245 L46 233 L61 214 L77 226 Z" />

-      <path fill="rgb(153,176,191)" d="M86 182 L86 182 L86 181 L86 181 L86 180 L86 178 L86 177 L86 175 L85 173 L85 172 L85 171 L84 170 L84 169 L84 168 L83 167 L83 166 L83 165 L82 164 L82 163 L81 162 L80 161 L80 160 L79 159 L78 158 L77 157 L76 156 L76 156 L75 155 L74 154 L73 153 L72 152 L71 152 L70 151 L69 150 L68 150 L68 149 L67 148 L66 148 L65 147 L64 147 L63 146 L62 146 L61 145 L60 145 L59 144 L59 144 L58 143 L57 143 L56 143 L55 143 L54 142 L53 142 L52 142 L52 142 L51 141 L50 141 L49 141 L48 141 L46 141 L45 141 L43 141 L42 141 L41 141 L40 141 L39 141 L38 141 L37 141 L36 141 L36 141 L36 141 L37 142 L38 142 L39 142 L40 142 L41 143 L42 143 L43 143 L44 144 L46 144 L46 145 L47 145 L47 145 L48 146 L48 146 L49 147 L49 147 L49 147 L50 148 L51 149 L51 150 L52 151 L52 151 L52 152 L53 153 L53 153 L53 155 L53 156 L54 157 L54 157 L54 158 L54 158 L55 158 L55 159 L55 159 L55 159 L56 160 L56 160 L56 160 L57 160 L57 161 L57 161 L58 161 L58 161 L58 161 L59 161 L60 162 L61 162 L62 162 L64 162 L65 162 L66 163 L66 163 L66 163 L67 163 L67 163 L67 163 L68 163 L68 164 L68 164 L68 164 L68 164 L69 164 L69 165 L69 165 L69 165 L69 166 L69 166 L69 166 L69 167 L69 167 L69 167 L68 168 L68 168 L68 168 L68 168 L68 169 L68 169 L68 169 L68 170 L69 170 L69 171 L69 172 L69 172 L69 172 L69 172 L69 172 L70 173 L70 173 L70 173 L70 173 L71 173 L71 174 L72 174 L72 174 L73 174 L74 175 L75 175 L76 175 L76 176 L77 176 L77 176 L77 176 L77 176 L77 177 L77 177 L77 177 L77 177 L77 178 L77 178 L78 178 L78 179 L78 180 L78 181 L78 181 L78 182 L78 182 L78 183 L78 183 L78 183 L78 184 L78 184 L78 184 L77 184 L77 185 L76 186 L76 186 L75 187 L75 188 L74 188 L74 189 L74 189 L74 190 L74 190 L73 190 L73 191 L73 191 L73 192 L73 192 L74 193 L74 194 L74 195 L74 195 L74 196 L74 196 L74 197 L74 198 L74 198 L73 199 L73 199 L73 199 L73 199 L86 182 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M28 216 L28 216 L29 215 L29 215 L30 214 L30 213 L31 213 L32 212 L32 211 L33 210 L33 210 L33 209 L33 209 L34 208 L34 207 L34 207 L34 206 L34 206 L35 205 L35 204 L35 204 L35 200 L35 196 L35 193 L35 190 L35 187 L35 185 L35 183 L35 183 L35 183 L35 184 L34 186 L34 188 L34 190 L33 192 L33 193 L33 195 L33 196 L32 196 L32 197 L32 198 L32 200 L32 202 L32 203 L32 204 L31 205 L31 206 L31 207 L31 208 L31 208 L30 208 L30 209 L30 209 L29 210 L29 211 L28 212 L27 212 L27 213 L27 213 L27 214 L27 214 L27 214 L27 214 L27 215 L27 215 L27 215 L27 215 L27 215 L27 215 L28 216 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M179 437 L179 437 L179 438 L179 439 L179 439 L180 440 L180 441 L180 441 L180 442 L180 443 L180 444 L180 445 L180 447 L180 448 L180 449 L179 450 L179 451 L179 452 L178 454 L177 455 L177 456 L176 457 L175 458 L174 459 L172 460 L171 461 L169 462 L168 463 L166 464 L164 465 L161 465 L162 465 L162 465 L163 465 L164 464 L165 464 L166 464 L167 463 L167 463 L168 462 L169 461 L170 461 L171 460 L172 459 L173 458 L174 457 L174 456 L175 455 L176 454 L177 453 L177 451 L178 450 L178 448 L179 447 L179 445 L179 443 L179 441 L179 439 L179 437 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M143 461 L143 461 L143 461 L142 460 L142 460 L141 459 L141 459 L140 458 L140 458 L140 457 L139 457 L139 456 L138 455 L138 455 L137 454 L137 453 L136 452 L136 451 L135 450 L135 449 L134 447 L134 446 L133 445 L131 440 L128 434 L124 424 L120 413 L115 401 L109 388 L103 374 L97 360 L92 346 L86 332 L81 320 L76 309 L72 299 L69 292 L67 288 L67 286 L67 286 L66 285 L66 283 L65 281 L64 279 L63 276 L62 275 L62 273 L61 272 L60 270 L59 268 L58 267 L57 265 L56 263 L55 261 L54 259 L53 258 L51 256 L50 254 L48 252 L47 250 L46 249 L44 247 L42 245 L41 244 L39 242 L39 242 L40 243 L40 243 L41 244 L43 245 L44 247 L45 247 L46 248 L47 249 L48 250 L49 251 L50 252 L51 253 L52 254 L53 256 L54 257 L55 258 L56 260 L57 261 L58 263 L59 264 L60 266 L61 268 L62 270 L62 272 L63 274 L66 279 L69 288 L73 298 L78 310 L84 323 L90 337 L96 352 L102 367 L108 382 L114 396 L119 408 L124 420 L128 430 L131 437 L133 442 L134 444 L135 445 L135 446 L135 447 L136 449 L137 450 L137 451 L138 452 L139 454 L140 455 L141 457 L142 459 L143 461 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M39 241 L39 241 L39 240 L39 239 L40 239 L40 238 L40 237 L40 237 L40 236 L40 235 L40 234 L40 234 L40 234 L39 233 L39 233 L39 233 L39 232 L39 232 L39 232 L38 231 L37 230 L36 230 L36 230 L35 229 L35 229 L35 228 L34 228 L34 228 L34 227 L34 227 L34 227 L34 227 L34 227 L34 226 L34 226 L34 226 L34 226 L34 225 L34 224 L35 223 L35 222 L36 221 L36 219 L36 219 L37 218 L37 217 L37 217 L37 217 L37 216 L37 215 L37 214 L37 212 L36 211 L36 211 L36 211 L36 211 L37 212 L38 213 L39 214 L39 215 L40 216 L40 217 L40 217 L40 218 L41 218 L41 218 L41 219 L41 219 L41 219 L41 220 L41 220 L40 221 L40 221 L40 222 L40 223 L40 223 L39 223 L39 223 L39 224 L39 224 L39 224 L40 224 L40 224 L40 224 L40 225 L41 225 L41 225 L41 225 L41 226 L41 226 L42 226 L42 226 L42 227 L42 227 L42 227 L42 228 L41 228 L41 228 L41 229 L41 229 L40 230 L40 230 L40 230 L40 231 L40 231 L40 231 L40 232 L40 232 L40 232 L41 233 L41 234 L41 234 L42 234 L42 235 L42 235 L42 236 L42 236 L42 236 L42 237 L42 237 L42 237 L42 238 L41 238 L41 238 L41 239 L41 239 L41 239 L40 240 L40 240 L40 241 L39 241 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M43 231 L43 231 L43 230 L43 230 L43 230 L43 230 L43 230 L43 229 L43 229 L43 229 L43 229 L44 228 L44 228 L44 227 L45 227 L45 226 L45 226 L45 226 L45 225 L45 225 L45 224 L45 224 L45 224 L45 223 L45 222 L45 221 L45 221 L45 220 L45 220 L45 220 L45 219 L45 219 L45 219 L45 218 L46 218 L46 217 L47 216 L47 216 L47 215 L48 215 L48 214 L48 214 L48 213 L48 212 L48 212 L48 211 L48 211 L48 210 L48 210 L48 210 L48 210 L47 209 L47 208 L47 207 L47 207 L46 207 L46 206 L46 206 L46 206 L46 205 L47 205 L47 205 L46 205 L46 204 L46 204 L46 204 L45 203 L45 203 L45 203 L45 203 L44 202 L44 202 L44 202 L44 202 L44 201 L44 201 L44 201 L44 200 L45 200 L45 199 L46 199 L46 198 L47 197 L47 197 L47 197 L47 196 L47 196 L48 196 L48 197 L48 198 L48 199 L49 200 L49 201 L49 202 L49 202 L49 203 L49 203 L49 204 L49 205 L49 206 L49 206 L49 207 L49 207 L49 208 L49 208 L49 208 L50 209 L50 209 L50 209 L50 209 L50 210 L50 210 L50 211 L50 211 L50 212 L50 212 L50 213 L50 214 L50 214 L50 215 L49 215 L49 216 L49 216 L49 216 L48 217 L48 217 L48 217 L48 218 L48 218 L48 218 L48 218 L48 219 L48 219 L48 220 L48 220 L48 221 L48 221 L48 221 L48 222 L48 223 L48 224 L48 225 L48 225 L43 231 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M74 198 L74 198 L74 197 L74 196 L75 195 L75 194 L75 193 L75 193 L75 192 L75 192 L76 192 L76 191 L76 191 L76 190 L76 190 L77 189 L78 188 L78 187 L79 186 L79 186 L80 185 L80 185 L80 184 L80 184 L80 183 L80 182 L80 182 L80 181 L80 180 L80 180 L80 179 L80 178 L80 178 L79 177 L79 177 L79 176 L78 176 L78 175 L77 175 L77 175 L77 174 L76 174 L76 174 L75 174 L74 173 L73 173 L72 173 L72 172 L71 172 L71 172 L71 171 L70 171 L70 171 L70 170 L70 170 L69 170 L69 170 L69 169 L69 169 L69 169 L69 169 L70 168 L70 167 L70 167 L70 166 L70 166 L70 165 L70 165 L70 164 L70 164 L70 163 L69 163 L69 163 L69 163 L68 162 L68 162 L67 162 L67 162 L66 162 L65 162 L64 161 L63 161 L62 161 L61 161 L60 161 L60 161 L59 161 L59 161 L59 161 L58 161 L58 160 L58 160 L58 160 L58 160 L58 160 L57 159 L57 159 L57 159 L57 158 L56 157 L56 157 L55 155 L54 153 L54 152 L54 151 L53 150 L53 149 L52 149 L52 148 L52 148 L51 147 L51 147 L51 147 L50 146 L50 146 L49 145 L48 144 L47 144 L46 144 L46 143 L45 143 L44 143 L43 142 L42 142 L41 142 L40 142 L39 141 L38 141 L37 141 L37 141 L38 142 L40 143 L42 144 L43 144 L44 145 L45 145 L46 146 L47 147 L47 147 L48 148 L48 148 L48 148 L48 149 L49 149 L49 150 L50 151 L50 151 L51 153 L52 154 L52 156 L53 157 L53 158 L54 158 L54 159 L54 159 L55 159 L55 160 L55 160 L56 160 L56 161 L57 161 L57 161 L58 161 L58 162 L59 162 L60 162 L60 162 L61 163 L62 163 L62 163 L63 163 L64 164 L64 164 L65 164 L65 164 L66 164 L66 165 L67 165 L67 165 L67 165 L68 166 L68 166 L68 166 L68 167 L68 167 L68 167 L68 167 L68 168 L68 168 L68 168 L68 169 L68 169 L68 170 L68 170 L68 171 L68 171 L68 172 L69 172 L69 173 L69 173 L69 173 L69 173 L70 173 L70 174 L70 174 L70 174 L71 174 L71 174 L72 175 L72 175 L73 175 L74 175 L75 176 L75 176 L76 176 L76 176 L76 177 L76 177 L76 177 L76 177 L76 177 L77 177 L77 178 L77 178 L77 178 L76 179 L76 179 L76 179 L76 180 L76 180 L76 181 L75 181 L75 181 L74 182 L74 183 L73 184 L73 184 L73 185 L73 185 L72 186 L72 186 L72 186 L72 187 L72 187 L72 188 L72 189 L72 189 L72 190 L72 191 L72 192 L72 193 L72 194 L72 194 L72 195 L72 196 L72 197 L72 198 L72 199 L72 199 L72 200 L72 200 L74 198 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M48 177 L44 178 L44 197 L27 218 L28 219 L48 194 L48 177 Z" stroke="none" />

-      <path fill="none" d="M73 223 L72 223 L72 224 L73 225 L73 225 L74 226 L74 226 L74 226 L74 227 L74 227 L74 227 L74 227 L74 227 L74 227 L73 228 L73 229 L72 229 L72 229 L72 229 L71 229 L71 229 L70 229 L70 228 L69 228 L69 228 L69 228 L68 228 L69 228 L70 230 L70 230 L70 231 L70 231 L70 231 L70 231 L70 232 L70 232 L70 232 L70 232 L69 233 L69 234 L69 234 L69 234 L68 234 L68 234 L68 234 L68 234 L67 234 L67 233 L67 233 L66 233 L66 233 L65 233 L65 232 L65 232 L65 233 L66 234 L66 235 L67 235 L67 236 L67 236 L67 236 L67 236 L67 236 L67 236 L66 237 L66 238 L65 238 L65 238 L65 238 L65 238 L65 238 L64 238 L64 238 L64 238 L63 238 L63 238 L63 238 L62 237 L62 237 L61 237 L61 237 L62 237 L62 239 L63 239 L63 239 L63 240 L63 240 L63 240 L63 240 L63 241 L63 241 L63 241 L63 241 L62 241 L62 242 L61 243 L61 243 L61 243 L61 243 L61 243 L60 243 L60 243 L59 242 L59 242 L58 242 L58 242 L58 241 L57 242" />

-      <path fill="none" d="M64 216 L61 220 L60 220 L60 219 L59 219 L59 219 L58 219 L58 219 L57 221 L57 221 L57 222 L57 222 L58 223 L58 223 L58 223 L57 224 L57 224 L56 224 L55 224 L54 224 L53 226 L53 226 L53 226 L54 227 L54 227 L54 227 L54 228 L54 229 L53 229 L52 228 L52 228 L51 228 L51 228 L51 228 L49 230 L49 230 L50 231 L50 231 L50 231 L50 232 L51 232 L50 233 L49 233 L49 233 L48 233 L47 233 L47 233 L46 234" />

-      <path fill="rgb(153,176,191)" d="M27 216 L27 216 L27 216 L27 215 L27 215 L27 215 L27 214 L27 214 L27 214 L27 214 L27 214 L28 213 L28 213 L28 212 L29 212 L29 211 L29 211 L29 210 L30 210 L30 209 L30 208 L31 208 L31 207 L31 207 L31 207 L31 206 L31 206 L31 206 L31 206 L31 205 L31 205 L32 204 L32 203 L32 203 L32 202 L32 201 L32 201 L32 201 L32 200 L32 200 L32 200 L32 199 L32 199 L33 198 L33 197 L33 196 L33 195 L33 194 L33 194 L33 193 L33 192 L34 190 L34 189 L34 188 L34 187 L34 186 L35 186 L35 183 L33 181 L33 181 L33 182 L33 183 L33 185 L33 185 L33 186 L33 187 L33 188 L32 188 L32 188 L32 189 L32 189 L32 189 L32 189 L32 190 L31 190 L31 190 L31 190 L31 190 L31 190 L31 191 L30 191 L30 191 L30 191 L30 192 L30 192 L30 192 L30 192 L30 193 L30 193 L30 193 L31 193 L31 194 L31 194 L31 194 L31 194 L31 195 L31 196 L31 197 L31 197 L31 198 L31 198 L31 198 L31 199 L31 199 L30 200 L30 200 L29 201 L29 202 L29 202 L29 203 L28 203 L28 203 L28 203 L28 204 L28 204 L28 204 L28 205 L28 205 L28 206 L28 207 L29 208 L28 208 L28 209 L28 209 L28 210 L28 210 L28 210 L28 211 L27 211 L27 212 L27 212 L26 212 L26 213 L26 213 L26 213 L26 213 L26 214 L26 214 L26 214 L26 214 L26 215 L26 215 L26 215 L26 215 L26 216 L27 216 L27 216 L27 216 L27 216 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M46 236 L40 244 L38 243 L44 236 L46 236 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M65 214 L64 212 L88 183 L88 186 L65 214 Z" stroke="none" />

-      <path fill="rgb(153,176,191)" d="M152 426 L152 426 L151 426 L150 426 L149 427 L149 427 L148 428 L148 428 L147 429 L146 429 L146 430 L145 431 L144 431 L144 432 L143 433 L142 434 L142 435 L141 436 L141 437 L141 438 L140 440 L140 441 L140 442 L140 444 L140 445 L140 447 L140 448 L141 450 L141 452 L141 452 L141 451 L141 451 L140 450 L140 450 L140 449 L140 449 L139 448 L139 447 L139 446 L139 445 L138 445 L138 444 L138 443 L138 442 L138 441 L138 439 L139 438 L139 437 L139 436 L140 435 L141 434 L142 433 L143 432 L144 431 L145 430 L146 429 L148 428 L150 427 L152 426 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M89 484 L88 483 L86 482 L85 482 L84 481 L83 480 L82 480 L81 479 L80 478 L79 477 L78 477 L77 476 L76 475 L76 474 L75 473 L74 473 L74 472 L74 471 L73 470 L73 469 L73 468 L73 467 L73 466 L73 465 L73 464 L74 463 L74 462 L74 461 L75 459 L76 458 L77 457 L78 456 L79 454 L80 453 L81 452 L82 450 L83 449 L84 447 L85 445 L87 443 L88 441 L91 436 L94 431 L97 426 L100 421 L103 416 L106 411 L109 406 L112 401 L114 397 L116 394 L118 390 L119 388 L121 385 L123 380 L127 373 L131 365 L135 356 L140 346 L143 341 L145 336 L148 330 L151 325 L154 320 L157 314 L160 309 L162 304 L165 299 L168 294 L171 290 L173 286 L176 282 L179 278 L181 275 L183 272 L185 270 L187 268 L189 266 L191 265 L192 265 L193 264 L194 264 L194 264 L195 264 L195 264 L195 264 L195 264 L196 264 L196 264 L196 264 L196 264 L197 265 L198 265 L198 266 L199 266 L200 267 L201 268 L203 268 L205 269 L209 272 L210 272 L212 273 L213 273 L214 274 L215 274 L216 275 L217 275 L218 275 L218 275 L218 276 L218 276 L218 276 L219 276 L219 276 L219 277 L219 277 L219 277 L219 278 L219 278 L220 279 L220 280 L220 281 L220 283 L219 285 L219 288 L218 291 L216 295 L215 298 L213 302 L211 307 L209 311 L207 316 L205 321 L202 326 L199 331 L197 337 L194 342 L191 347 L188 352 L185 358 L182 363 L179 368 L174 377 L169 386 L165 394 L161 400 L158 405 L156 408 L155 410 L153 414 L151 417 L149 422 L147 426 L144 431 L141 437 L139 442 L136 448 L134 453 L132 455 L131 458 L130 461 L129 463 L128 465 L127 468 L126 470 L125 472 L124 474 L124 475 L123 477 L123 478 L122 480 L122 481 L121 483 L121 484 L120 485 L119 486 L119 487 L118 488 L117 489 L116 490 L116 490 L115 491 L114 491 L113 491 L112 492 L111 492 L110 492 L109 492 L108 492 L107 492 L106 491 L105 491 L104 491 L103 490 L101 490 L100 490 L99 489 L98 488 L97 488 L95 487 L94 487 L93 486 L89 484 Z" stroke="none" />

-      <path fill="none" d="M89 484 L88 483 L86 482 L85 482 L84 481 L83 480 L82 480 L81 479 L80 478 L79 477 L78 477 L77 476 L76 475 L76 474 L75 473 L74 473 L74 472 L74 471 L73 470 L73 469 L73 468 L73 467 L73 466 L73 465 L73 464 L74 463 L74 462 L74 461 L75 459 L76 458 L77 457 L78 456 L79 454 L80 453 L81 452 L82 450 L83 449 L84 447 L85 445 L87 443 L88 441 L91 436 L94 431 L97 426 L100 421 L103 416 L106 411 L109 406 L112 401 L114 397 L116 394 L118 390 L119 388 L121 385 L123 380 L127 373 L131 365 L135 356 L140 346 L143 341 L145 336 L148 330 L151 325 L154 320 L157 314 L160 309 L162 304 L165 299 L168 294 L171 290 L173 286 L176 282 L179 278 L181 275 L183 272 L185 270 L187 268 L189 266 L191 265 L192 265 L193 264 L194 264 L194 264 L195 264 L195 264 L195 264 L195 264 L196 264 L196 264 L196 264 L196 264 L197 265 L198 265 L198 266 L199 266 L200 267 L201 268 L203 268 L205 269 L209 272 L210 272 L212 273 L213 273 L214 274 L215 274 L216 275 L217 275 L218 275 L218 275 L218 276 L218 276 L218 276 L219 276 L219 276 L219 277 L219 277 L219 277 L219 278 L219 278 L220 279 L220 280 L220 281 L220 283 L219 285 L219 288 L218 291 L216 295 L215 298 L213 302 L211 307 L209 311 L207 316 L205 321 L202 326 L199 331 L197 337 L194 342 L191 347 L188 352 L185 358 L182 363 L179 368 L174 377 L169 386 L165 394 L161 400 L158 405 L156 408 L155 410 L153 414 L151 417 L149 422 L147 426 L144 431 L141 437 L139 442 L136 448 L134 453 L132 455 L131 458 L130 461 L129 463 L128 465 L127 468 L126 470 L125 472 L124 474 L124 475 L123 477 L123 478 L122 480 L122 481 L121 483 L121 484 L120 485 L119 486 L119 487 L118 488 L117 489 L116 490 L116 490 L115 491 L114 491 L113 491 L112 492 L111 492 L110 492 L109 492 L108 492 L107 492 L106 491 L105 491 L104 491 L103 490 L101 490 L100 490 L99 489 L98 488 L97 488 L95 487 L94 487 L93 486 L89 484 Z" stroke-width="2" />

-      <path fill="rgb(122,138,147)" d="M217 275 L215 274 L214 274 L213 273 L211 273 L210 272 L208 271 L207 271 L205 270 L204 269 L203 268 L201 267 L200 267 L199 266 L198 265 L197 265 L196 264 L266 134 L267 134 L268 135 L270 135 L271 136 L273 136 L274 137 L276 138 L277 139 L279 140 L280 140 L281 141 L283 142 L284 143 L285 144 L285 144 L286 145 L286 145 L286 146 L217 275 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M217 275 L215 274 L214 274 L213 273 L211 273 L210 272 L208 271 L207 271 L205 270 L204 269 L203 268 L201 267 L200 267 L199 266 L198 265 L197 265 L196 264 L266 134 L267 134 L268 135 L270 135 L271 136 L273 136 L274 137 L276 138 L277 139 L279 140 L280 140 L281 141 L283 142 L284 143 L285 144 L285 144 L286 145 L286 145 L286 146 L217 275 Z" stroke-width="2" />

-      <path fill="rgb(122,138,147)" d="M266 133 L270 124 L272 124 L273 125 L275 125 L276 126 L278 126 L279 127 L281 128 L282 128 L284 129 L285 130 L287 131 L288 132 L289 133 L289 133 L290 134 L291 134 L291 135 L292 135 L292 136 L293 136 L288 145 L288 145 L288 145 L288 145 L288 146 L287 146 L287 146 L287 146 L287 146 L287 146 L287 146 L287 146 L286 145 L286 145 L286 145 L286 145 L286 145 L285 144 L285 144 L285 144 L284 143 L283 143 L282 142 L281 141 L280 140 L278 139 L277 139 L275 138 L274 137 L272 136 L271 136 L270 135 L269 135 L268 135 L268 135 L267 135 L267 134 L267 134 L266 134 L266 134 L266 134 L266 134 L266 134 L266 134 L266 134 L266 134 L265 134 L265 134 L265 133 L266 133 L266 133 Z" stroke-width="2" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M270 124 L272 124 L273 125 L275 125 L276 126 L277 126 L279 127 L280 128 L282 128 L283 129 L285 130 L286 131 L288 132 L288 132 L289 133 L290 133 L290 134 L291 134 L291 135 L292 135 L292 136 L294 135 L295 133 L296 132 L297 131 L298 130 L299 129 L300 128 L301 127 L303 126 L304 125 L306 124 L307 123 L309 122 L310 121 L312 121 L314 120 L316 119 L317 119 L319 119 L321 119 L323 119 L325 119 L327 119 L329 120 L331 121 L333 122 L335 123 L337 125 L339 127 L341 129 L345 133 L348 138 L351 141 L354 145 L357 148 L359 151 L361 153 L362 155 L364 157 L365 159 L366 160 L367 161 L367 162 L368 163 L368 163 L368 163 L372 165 L382 165 L381 164 L381 162 L380 161 L380 160 L379 158 L379 156 L378 154 L377 152 L376 149 L375 147 L374 144 L372 141 L371 138 L369 135 L368 132 L366 129 L364 125 L362 122 L360 119 L357 115 L355 112 L352 108 L349 105 L347 102 L344 99 L340 95 L337 92 L334 89 L330 86 L326 84 L323 81 L320 79 L317 77 L314 75 L312 74 L309 72 L307 71 L305 69 L303 68 L301 67 L300 67 L299 66 L298 66 L297 66 L297 65 L296 65 L295 65 L295 65 L294 65 L294 64 L293 64 L293 64 L291 65 L289 65 L288 65 L287 65 L286 65 L286 65 L285 65 L285 65 L284 65 L284 64 L283 64 L282 64 L281 63 L280 63 L278 62 L277 61 L275 60 L273 59 L271 58 L269 57 L267 56 L265 55 L264 54 L262 53 L260 52 L258 51 L258 50 L257 50 L256 49 L256 49 L255 48 L254 48 L254 47 L253 47 L253 46 L253 46 L252 45 L252 45 L237 37 L236 37 L235 38 L234 39 L234 40 L233 41 L232 42 L231 42 L231 43 L230 44 L229 45 L229 46 L228 47 L228 47 L227 48 L226 49 L226 50 L225 51 L225 52 L224 53 L224 54 L224 55 L223 56 L223 57 L222 58 L222 59 L222 60 L221 61 L221 62 L221 63 L220 64 L220 65 L220 66 L236 75 L237 75 L238 75 L239 75 L239 75 L240 74 L241 74 L242 74 L244 75 L245 75 L246 75 L247 75 L248 75 L250 76 L251 76 L252 77 L253 77 L255 78 L256 78 L257 79 L259 79 L260 80 L261 81 L262 82 L263 82 L264 83 L266 84 L266 85 L267 86 L268 87 L269 88 L270 89 L270 90 L271 91 L272 92 L272 93 L273 94 L273 95 L273 97 L274 98 L274 99 L274 100 L275 101 L275 102 L275 102 L275 103 L275 104 L275 105 L276 106 L275 107 L275 108 L275 109 L275 110 L275 111 L275 112 L275 113 L274 114 L274 116 L274 117 L273 118 L273 119 L272 120 L272 121 L271 123 L270 124 Z" stroke="none" />

-      <path d="M287 131 L298 131 L297 130 L296 130 L296 129 L295 129 L294 128 L293 127 L293 127 L292 126 L290 125 L289 124 L287 123 L285 122 L284 121 L282 120 L280 120 L278 119 L277 118 L275 118 L273 118 L272 117 L269 131 L270 131 L271 131 L272 132 L274 132 L275 133 L276 133 L277 134 L279 134 L280 135 L281 136 L283 137 L284 138 L284 138 L285 138 L285 139 L286 139 L286 139 L286 140 L287 140 L287 141 L297 141 L287 141 L292 146 L297 141 Z" stroke="none" />

-      <path d="M346 124 L346 124 L345 123 L344 122 L343 121 L341 120 L340 119 L339 118 L338 117 L336 116 L335 115 L334 115 L333 114 L331 113 L330 113 L329 113 L327 112 L326 112 L325 112 L323 112 L322 112 L321 112 L320 112 L319 112 L317 112 L316 112 L315 112 L314 113 L313 113 L312 113 L311 114 L309 114 L308 114 L307 115 L306 115 L305 116 L305 116 L304 117 L303 118 L302 118 L301 119 L300 119 L299 120 L297 122 L296 123 L294 124 L293 125 L292 126 L291 127 L290 128 L288 130 L287 131 L297 141 L299 139 L300 138 L301 137 L302 136 L303 135 L304 134 L305 133 L306 132 L307 132 L308 131 L309 130 L310 130 L310 129 L311 129 L311 129 L312 128 L313 128 L313 128 L314 127 L315 127 L315 127 L316 127 L317 126 L317 126 L318 126 L319 126 L319 126 L320 126 L321 126 L321 126 L322 126 L322 126 L323 126 L324 126 L324 126 L325 126 L326 126 L326 127 L327 127 L328 127 L328 128 L329 128 L330 128 L331 129 L331 130 L332 130 L333 131 L334 132 L335 133 L336 133 L336 133 Z" stroke="none" />

-      <path d="M371 157 L374 160 L374 160 L374 159 L373 159 L372 158 L372 156 L371 155 L370 153 L368 151 L366 149 L364 146 L362 144 L360 140 L357 137 L353 133 L350 129 L346 124 L336 133 L339 138 L343 142 L346 146 L349 149 L351 152 L353 155 L355 157 L357 160 L358 161 L359 163 L360 164 L361 165 L361 166 L362 167 L362 167 L362 167 L365 169 Z" stroke="none" />

-      <path d="M372 172 L375 159 L371 157 L365 169 L368 172 L372 172 Z" stroke="none" />

-      <path d="M388 163 L381 158 L371 158 L372 172 L382 172 L388 163 L382 172 L391 171 L388 163 Z" stroke="none" />

-      <path d="M322 89 L322 89 L324 91 L326 92 L328 93 L329 95 L331 96 L332 97 L334 99 L336 100 L337 102 L339 103 L340 105 L341 106 L343 108 L344 110 L345 111 L347 113 L348 114 L349 116 L350 118 L352 119 L353 121 L354 122 L355 124 L356 126 L357 127 L358 129 L359 130 L360 132 L361 135 L363 138 L365 141 L366 144 L367 147 L368 149 L370 152 L371 154 L371 157 L372 159 L373 160 L373 162 L374 163 L374 165 L375 166 L375 167 L388 163 L388 162 L388 160 L387 159 L387 157 L386 156 L385 154 L384 151 L383 149 L382 147 L381 144 L380 141 L379 138 L377 135 L375 132 L374 128 L372 125 L371 123 L370 122 L369 120 L368 118 L367 116 L365 115 L364 113 L363 111 L362 109 L360 108 L359 106 L358 104 L356 102 L355 101 L353 99 L352 97 L350 95 L349 94 L347 92 L345 90 L344 89 L342 87 L340 85 L338 84 L336 82 L334 81 L332 79 L330 78 L330 78 Z" stroke="none" />

-      <path d="M294 71 L294 71 L293 71 L293 71 L293 71 L293 71 L293 71 L294 72 L294 72 L295 72 L295 72 L296 73 L297 73 L297 73 L299 74 L301 75 L303 77 L305 78 L308 80 L310 81 L313 83 L316 85 L319 87 L322 89 L330 78 L327 76 L324 74 L321 72 L318 70 L315 68 L313 66 L310 65 L308 63 L306 62 L304 61 L303 60 L302 60 L301 60 L300 59 L299 59 L298 58 L297 58 L297 58 L296 58 L295 57 L294 57 L292 57 L292 57 Z" stroke="none" />

-      <path d="M274 68 L274 68 L275 68 L277 69 L278 70 L280 70 L281 71 L282 71 L283 71 L284 71 L284 72 L285 72 L286 72 L287 72 L288 72 L290 72 L292 72 L294 71 L292 57 L290 58 L289 58 L288 58 L287 58 L287 58 L286 58 L286 58 L286 58 L286 58 L286 58 L285 57 L284 57 L284 57 L283 57 L282 56 L280 55 L280 55 Z" stroke="none" />

-      <path d="M249 51 L246 48 L246 49 L247 50 L248 51 L248 52 L249 52 L250 53 L250 54 L251 54 L252 55 L253 56 L254 56 L255 57 L256 58 L258 59 L260 60 L262 61 L264 62 L266 63 L268 65 L270 66 L272 67 L274 68 L280 55 L278 54 L276 53 L275 52 L273 51 L271 50 L269 49 L267 48 L265 47 L264 46 L262 45 L262 45 L261 44 L261 44 L260 44 L260 43 L259 43 L259 43 L259 42 L258 42 L258 42 L258 42 L258 42 L255 39 L258 42 L257 40 L255 39 Z" stroke="none" />

-      <path d="M232 32 L233 43 L249 51 L255 39 L240 31 L232 32 L240 31 L236 28 L232 32 Z" stroke="none" />

-      <path d="M223 60 L227 68 L227 67 L227 66 L227 65 L228 64 L228 63 L228 62 L229 61 L229 60 L229 59 L230 59 L230 58 L230 57 L231 56 L231 55 L231 54 L232 54 L232 53 L233 52 L233 51 L234 51 L234 50 L235 49 L235 48 L236 48 L237 47 L237 46 L238 45 L239 45 L239 44 L240 43 L241 43 L241 42 L232 32 L231 32 L230 33 L229 34 L228 35 L228 36 L227 37 L226 38 L225 39 L224 40 L224 41 L223 42 L222 43 L222 44 L221 45 L220 46 L220 47 L219 48 L219 49 L218 50 L218 51 L217 52 L217 53 L216 54 L216 55 L215 57 L215 58 L215 59 L214 60 L214 61 L214 63 L213 64 L213 65 L217 73 L213 65 L212 70 L217 73 Z" stroke="none" />

-      <path d="M240 81 L240 69 L223 60 L217 73 L233 81 L240 81 L233 81 L236 83 L240 81 Z" stroke="none" />

-      <path d="M276 87 L276 87 L276 86 L276 85 L275 84 L275 84 L274 83 L274 82 L273 82 L272 81 L271 80 L270 79 L269 78 L267 77 L266 76 L265 75 L263 74 L262 73 L260 73 L259 72 L257 71 L256 71 L254 70 L253 70 L252 69 L250 69 L249 68 L247 68 L246 68 L244 68 L243 68 L241 67 L240 67 L239 68 L238 68 L237 68 L237 68 L236 68 L235 68 L235 68 L234 69 L233 69 L240 81 L240 82 L239 82 L239 82 L240 82 L240 82 L240 82 L240 81 L240 81 L241 81 L241 81 L242 81 L243 82 L244 82 L245 82 L246 82 L247 82 L248 83 L249 83 L250 83 L251 84 L252 84 L253 85 L254 85 L255 86 L256 86 L257 87 L258 87 L259 88 L260 89 L261 89 L262 90 L262 91 L263 91 L263 91 L263 92 L263 92 L264 92 L264 93 L264 93 L264 93 L264 93 Z" stroke="none" />

-      <path d="M272 117 L277 127 L277 126 L278 124 L279 123 L279 122 L280 120 L280 119 L281 118 L281 116 L281 115 L282 114 L282 113 L282 111 L282 110 L282 109 L282 108 L282 106 L282 105 L282 104 L282 103 L282 101 L282 100 L282 99 L281 98 L281 96 L280 95 L280 94 L279 93 L279 92 L278 90 L278 89 L277 88 L276 87 L264 93 L265 94 L265 95 L266 96 L266 97 L267 98 L267 99 L267 100 L268 101 L268 101 L268 102 L268 103 L268 104 L268 104 L268 105 L268 106 L269 106 L268 107 L268 108 L268 109 L268 109 L268 110 L268 111 L268 112 L268 112 L267 113 L267 114 L267 115 L266 116 L266 117 L265 119 L265 120 L264 121 L269 131 L264 121 L260 129 L269 131 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M237 37 L236 37 L235 38 L234 39 L234 40 L233 41 L232 42 L231 42 L231 43 L230 44 L229 45 L229 46 L228 47 L228 47 L227 48 L226 49 L226 50 L225 51 L225 52 L224 53 L224 54 L224 55 L223 56 L223 57 L222 58 L222 59 L222 60 L221 61 L221 62 L221 63 L220 64 L220 65 L220 66 L220 66 L221 66 L222 65 L222 64 L223 64 L223 63 L224 62 L225 61 L225 60 L226 59 L227 58 L228 57 L229 54 L230 52 L232 49 L233 47 L234 45 L235 42 L235 41 L236 41 L236 40 L236 39 L236 38 L237 38 L237 37 L237 37 Z" stroke="none" />

-      <path fill="none" d="M237 37 L236 37 L235 38 L234 39 L234 40 L233 41 L232 42 L231 42 L231 43 L230 44 L229 45 L229 46 L228 47 L228 47 L227 48 L226 49 L226 50 L225 51 L225 52 L224 53 L224 54 L224 55 L223 56 L223 57 L222 58 L222 59 L222 60 L221 61 L221 62 L221 63 L220 64 L220 65 L220 66 L220 66 L221 66 L222 65 L222 64 L223 64 L223 63 L224 62 L225 61 L225 60 L226 59 L227 58 L228 57 L229 54 L230 52 L232 49 L233 47 L234 45 L235 42 L235 41 L236 41 L236 40 L236 39 L236 38 L237 38 L237 37 L237 37 Z" />

-      <path fill="none" d="M381 164 L375 160 L375 160 L374 160 L374 159 L373 157 L372 156 L370 154 L369 152 L367 150 L366 148 L364 146 L362 144 L361 142 L359 140 L358 138 L357 137 L356 135 L355 134 L354 133 L353 132 L352 131 L351 130 L349 128 L348 127 L347 126 L345 125 L344 124 L343 122 L341 121 L340 120 L338 119 L336 118 L335 117 L333 116 L331 115 L330 115 L328 114 L326 114 L324 113 L323 113 L321 113 L319 113 L317 113 L315 113 L314 113 L312 114 L310 115 L308 116 L306 117" stroke-width="2" />

-      <path fill="rgb(122,138,147)" d="M376 165 L372 162 L376 165 Z" stroke-width="2" stroke="none" />

-      <path fill="none" d="M279 81 L278 81 L278 80 L278 80 L278 79 L278 79 L278 79 L278 78 L278 78 L278 77 L278 77 L278 77 L278 76 L278 76 L278 75 L279 75 L279 75 L279 74 L279 74 L280 74 L280 73 L280 73 L280 73 L281 72 L281 72 L281 72 L282 72 L282 72 L282 71 L283 71 L283 71 L283 71 L284 71" stroke-width="2" />

-      <path fill="rgb(122,138,147)" d="M288 132 L282 142 L285 144 L286 145 L292 135 L288 132 Z" stroke-width="2" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M281 128 L275 138 L279 140 L284 130 L281 128 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M273 125 L268 135 L272 136 L278 126 L273 125 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M99 488 L100 488 L100 488 L101 488 L102 488 L102 488 L103 487 L103 487 L104 486 L104 486 L105 485 L105 485 L106 484 L106 484 L107 483 L107 482 L108 481 L108 480 L109 479 L109 478 L110 477 L110 475 L111 473 L112 471 L113 468 L114 466 L115 463 L116 461 L117 459 L118 457 L119 454 L120 452 L121 449 L123 446 L124 443 L125 440 L127 437 L129 434 L130 430 L133 424 L137 417 L140 410 L144 403 L146 400 L148 397 L149 394 L151 390 L153 387 L154 384 L156 382 L158 379 L159 376 L161 374 L162 372 L163 370 L165 368 L166 365 L168 363 L169 360 L171 357 L173 354 L175 350 L177 347 L179 343 L182 340 L184 336 L186 332 L188 328 L190 324 L192 320 L194 316 L196 312 L198 308 L200 305 L202 301 L203 297 L205 294 L206 291 L207 288 L208 285 L209 282 L210 280 L210 278 L210 276 L210 274 L209 273 L209 272 L208 272 L208 272 L208 271 L207 271 L207 271 L207 271 L207 271 L206 271 L206 270 L206 270 L205 270 L205 269 L204 269 L203 270 L202 270 L201 271 L199 272 L198 273 L197 275 L195 276 L194 278 L192 280 L191 283 L189 285 L188 287 L186 290 L185 292 L183 295 L182 297 L180 300 L179 303 L177 306 L176 308 L174 311 L173 314 L172 316 L171 318 L169 321 L168 323 L167 325 L167 327 L166 329 L165 330 L165 332 L164 333 L163 335 L162 337 L161 340 L160 343 L158 346 L156 349 L155 353 L152 357 L150 361 L148 365 L146 369 L141 378 L135 387 L130 397 L125 406 L120 415 L115 424 L110 431 L106 438 L103 444 L100 449 L99 450 L99 451 L98 452 L97 453 L95 456 L93 458 L92 461 L90 463 L88 465 L87 468 L86 469 L85 470 L85 471 L84 472 L84 473 L83 474 L83 475 L83 476 L82 476 L82 477 L82 478 L83 479 L83 479 L83 480 L84 481 L84 481 L85 482 L86 482 L87 483 L89 484 L90 484 L91 485 L92 485 L94 486 L96 487 L98 488 L99 488 L99 488 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M95 484 L95 484 L96 484 L97 483 L97 483 L98 483 L98 483 L99 482 L99 482 L100 481 L100 481 L101 480 L101 480 L102 479 L102 478 L103 477 L103 477 L104 476 L104 475 L105 474 L105 473 L106 471 L107 468 L108 466 L109 464 L110 461 L111 458 L112 456 L113 454 L114 452 L115 450 L116 447 L117 444 L118 441 L120 438 L123 432 L126 426 L129 419 L133 412 L136 405 L140 399 L142 395 L143 392 L145 389 L147 386 L148 383 L150 380 L152 377 L153 374 L155 372 L156 369 L158 367 L159 365 L160 363 L162 361 L163 358 L165 355 L167 352 L169 349 L171 346 L173 343 L175 339 L177 335 L179 332 L181 328 L184 324 L186 320 L188 316 L190 312 L192 309 L194 305 L195 301 L197 298 L199 294 L200 291 L201 288 L202 285 L203 282 L204 279 L205 277 L205 275 L205 273 L205 271 L204 270 L204 269 L203 269 L203 269 L203 269 L202 269 L202 268 L202 268 L201 268 L201 268 L201 267 L200 267 L200 267 L200 266 L200 266 L199 266 L198 266 L197 266 L196 267 L195 268 L194 269 L193 270 L191 271 L190 273 L189 275 L187 277 L186 279 L184 281 L183 283 L181 286 L180 288 L178 291 L177 293 L175 296 L174 299 L172 301 L171 304 L170 307 L168 309 L167 312 L166 314 L165 316 L164 318 L163 321 L162 322 L162 324 L161 326 L160 327 L160 329 L159 330 L158 333 L157 335 L155 338 L154 341 L152 345 L150 348 L148 352 L146 356 L144 360 L141 365 L136 374 L131 383 L126 392 L121 402 L115 410 L111 419 L106 427 L102 434 L98 440 L96 444 L95 445 L94 446 L93 448 L93 449 L91 451 L89 454 L87 456 L86 458 L84 461 L82 463 L82 464 L81 465 L80 466 L80 467 L79 468 L79 469 L79 470 L78 471 L78 472 L78 473 L78 473 L78 474 L78 475 L79 475 L79 476 L80 476 L81 477 L82 478 L83 478 L84 479 L85 480 L87 480 L88 481 L89 481 L91 482 L93 483 L94 484 L95 484 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M96 485 L97 485 L98 485 L98 485 L99 485 L99 485 L100 484 L100 484 L101 483 L101 483 L102 482 L102 482 L103 481 L103 480 L104 480 L104 479 L105 478 L105 477 L106 476 L106 475 L107 474 L108 472 L108 470 L109 468 L110 465 L111 462 L112 460 L113 458 L114 456 L115 453 L116 451 L117 448 L118 446 L120 443 L121 440 L123 437 L124 434 L126 431 L127 427 L131 421 L134 414 L138 407 L141 400 L143 397 L145 394 L146 390 L148 387 L150 384 L152 381 L153 379 L155 376 L156 373 L158 371 L159 369 L160 367 L162 365 L163 362 L165 360 L167 357 L168 354 L170 351 L172 347 L174 344 L176 340 L179 337 L181 333 L183 329 L185 325 L187 321 L189 318 L191 314 L193 310 L195 306 L197 302 L199 299 L200 295 L202 292 L203 289 L204 286 L205 283 L206 280 L206 278 L206 276 L207 274 L206 272 L206 271 L205 270 L205 270 L205 270 L204 270 L204 269 L204 269 L203 269 L203 269 L203 269 L202 268 L202 268 L202 268 L201 268 L201 267 L201 267 L200 267 L199 267 L198 268 L197 269 L196 270 L194 271 L193 272 L192 274 L190 276 L189 278 L187 280 L186 282 L184 285 L183 287 L181 290 L180 292 L178 295 L177 297 L175 300 L174 303 L173 305 L171 308 L170 311 L169 313 L168 315 L166 318 L165 320 L165 322 L164 324 L163 326 L162 327 L162 329 L161 330 L161 332 L160 334 L158 337 L157 340 L155 343 L154 346 L152 350 L150 354 L147 358 L145 362 L143 366 L138 375 L133 384 L127 394 L122 403 L117 412 L112 420 L107 428 L103 435 L100 441 L97 446 L96 447 L96 448 L95 449 L94 450 L92 453 L91 455 L89 458 L87 460 L86 461 L85 462 L85 463 L84 465 L83 466 L82 467 L82 468 L81 469 L81 470 L80 471 L80 472 L80 473 L80 473 L80 474 L80 475 L80 476 L80 476 L80 477 L81 477 L81 478 L82 479 L83 479 L84 480 L86 481 L87 481 L88 482 L89 482 L91 483 L93 484 L95 485 L96 485 L96 485 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M98 487 L98 487 L99 487 L100 487 L100 486 L101 486 L101 486 L102 485 L102 485 L103 484 L103 484 L104 483 L104 483 L105 482 L105 481 L106 480 L106 480 L107 479 L107 478 L108 477 L108 476 L109 474 L110 472 L111 469 L112 467 L113 464 L114 461 L115 459 L115 457 L116 455 L117 453 L119 450 L120 447 L121 444 L123 442 L126 435 L129 429 L132 422 L136 415 L139 409 L143 402 L144 398 L146 395 L148 392 L150 389 L151 386 L153 383 L155 380 L156 377 L158 375 L159 373 L161 370 L162 368 L163 366 L165 364 L166 361 L168 358 L170 355 L172 352 L174 349 L176 345 L178 342 L180 338 L182 334 L184 331 L187 327 L189 323 L191 319 L193 315 L195 311 L197 307 L199 304 L200 300 L202 296 L203 293 L205 290 L206 287 L207 284 L207 281 L208 279 L208 277 L208 275 L208 273 L208 272 L207 271 L207 271 L206 271 L206 271 L206 271 L205 270 L205 270 L205 270 L205 270 L204 270 L204 269 L203 269 L203 269 L202 268 L201 269 L200 269 L199 270 L197 271 L196 272 L195 274 L193 275 L192 277 L190 279 L189 281 L187 284 L186 286 L184 289 L183 291 L181 294 L180 296 L178 299 L177 302 L175 304 L174 307 L173 310 L171 312 L170 315 L169 317 L168 319 L167 322 L166 324 L165 326 L164 327 L164 329 L163 330 L163 332 L162 333 L161 336 L160 338 L158 341 L157 344 L155 348 L153 351 L151 355 L149 359 L147 363 L144 368 L139 377 L134 386 L129 395 L123 405 L118 414 L113 422 L109 430 L105 437 L101 443 L99 447 L98 448 L97 450 L96 451 L95 452 L94 454 L92 457 L90 459 L88 461 L87 464 L85 466 L85 467 L84 468 L83 469 L83 470 L82 471 L82 472 L81 473 L81 474 L81 475 L81 476 L81 476 L81 477 L81 478 L82 478 L82 479 L83 479 L84 480 L85 481 L86 481 L87 482 L88 483 L90 483 L91 484 L92 484 L94 485 L96 486 L97 487 L98 487 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M107 492 L107 492 L108 492 L109 492 L109 491 L110 491 L110 491 L111 490 L111 490 L112 489 L112 489 L113 488 L113 488 L114 487 L114 486 L115 486 L115 485 L115 484 L116 483 L116 482 L117 481 L118 479 L118 477 L119 475 L120 472 L121 469 L122 467 L123 465 L124 463 L125 460 L126 458 L127 455 L128 453 L130 450 L131 447 L132 444 L134 441 L136 438 L137 434 L141 428 L144 421 L148 414 L151 407 L153 404 L155 401 L156 397 L158 394 L160 391 L161 388 L163 386 L165 383 L166 380 L168 378 L169 376 L170 374 L172 372 L173 369 L175 367 L177 364 L178 361 L180 357 L182 354 L184 351 L187 347 L189 343 L191 339 L193 335 L195 331 L197 327 L199 323 L202 320 L204 316 L205 312 L207 308 L209 304 L211 301 L212 297 L213 294 L214 291 L215 288 L216 285 L217 283 L217 280 L217 278 L217 277 L217 276 L216 275 L215 274 L214 274 L212 273 L212 273 L211 273 L210 273 L209 274 L208 275 L206 276 L205 277 L204 279 L202 280 L201 282 L199 284 L198 286 L196 289 L195 291 L193 293 L192 296 L190 299 L189 301 L187 304 L186 307 L184 309 L183 312 L181 315 L180 317 L179 320 L178 322 L177 325 L175 327 L175 329 L174 331 L173 333 L172 334 L172 336 L171 337 L171 339 L169 341 L168 344 L167 346 L165 350 L163 353 L162 357 L160 360 L157 365 L155 369 L153 373 L148 382 L143 391 L137 401 L132 410 L127 419 L122 427 L117 435 L113 442 L110 448 L107 453 L106 454 L106 455 L105 456 L104 457 L102 460 L100 462 L99 465 L97 467 L96 468 L95 469 L94 470 L94 472 L93 473 L92 474 L92 475 L91 476 L91 477 L90 478 L90 479 L90 480 L89 480 L89 481 L89 482 L90 483 L90 483 L90 484 L91 484 L91 485 L92 485 L93 486 L95 487 L96 487 L97 488 L98 488 L100 489 L101 490 L103 490 L105 491 L106 492 L107 492 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M104 491 L105 491 L106 491 L106 491 L107 491 L107 490 L108 490 L109 490 L109 489 L110 489 L110 488 L111 488 L111 487 L112 486 L112 486 L113 485 L113 484 L113 483 L114 482 L114 481 L115 480 L116 478 L117 476 L118 474 L119 471 L120 468 L121 466 L121 464 L122 462 L123 459 L124 457 L125 454 L127 452 L128 449 L129 446 L131 443 L132 440 L134 437 L135 433 L139 427 L142 420 L146 413 L149 406 L151 403 L153 400 L155 396 L156 393 L158 390 L160 387 L161 385 L163 382 L164 379 L166 377 L167 375 L169 373 L170 371 L171 368 L173 366 L175 363 L177 360 L179 357 L181 353 L183 350 L185 346 L187 342 L189 338 L191 335 L193 331 L196 327 L198 323 L200 319 L202 315 L204 311 L205 307 L207 303 L209 300 L210 296 L211 293 L213 290 L214 287 L214 284 L215 282 L215 280 L215 278 L215 276 L215 275 L214 274 L214 274 L213 274 L213 274 L213 274 L212 274 L212 274 L212 273 L212 273 L211 273 L210 272 L209 272 L208 273 L207 273 L206 274 L205 275 L203 276 L202 278 L201 279 L199 281 L198 283 L196 285 L195 288 L193 290 L192 293 L190 295 L188 298 L187 300 L185 303 L184 306 L182 308 L181 311 L180 314 L178 316 L177 319 L176 321 L175 324 L174 326 L173 328 L172 330 L171 332 L171 333 L170 335 L170 336 L169 338 L168 340 L167 343 L165 346 L163 349 L162 352 L160 356 L158 360 L156 364 L153 368 L151 372 L146 381 L141 390 L135 400 L130 409 L125 418 L120 426 L116 434 L112 441 L108 447 L105 452 L105 453 L104 454 L103 455 L102 456 L101 459 L99 461 L97 464 L95 466 L94 467 L94 468 L93 469 L92 471 L91 472 L91 473 L90 474 L89 475 L89 476 L89 477 L88 478 L88 479 L88 479 L88 480 L88 481 L88 482 L88 482 L88 483 L89 483 L89 484 L90 485 L92 485 L93 486 L94 487 L95 487 L96 488 L98 488 L99 489 L101 490 L103 491 L104 491 L104 491 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M103 490 L103 490 L104 490 L105 490 L105 490 L106 490 L106 489 L107 489 L107 488 L108 488 L108 487 L109 487 L109 486 L110 485 L110 485 L111 484 L111 483 L112 482 L112 481 L113 480 L113 479 L114 477 L115 475 L116 473 L117 470 L118 467 L119 465 L120 463 L120 461 L121 458 L122 456 L124 453 L125 451 L126 448 L128 445 L130 439 L134 432 L137 426 L140 419 L144 412 L148 405 L149 402 L151 399 L153 395 L155 392 L156 389 L158 386 L160 384 L161 381 L163 378 L164 376 L166 374 L167 372 L168 370 L170 367 L171 365 L173 362 L175 359 L177 356 L179 352 L181 349 L183 345 L185 341 L187 338 L189 334 L192 330 L194 326 L196 322 L198 318 L200 314 L202 310 L204 307 L205 303 L207 299 L208 296 L210 293 L211 290 L212 287 L212 284 L213 282 L213 279 L213 278 L213 276 L213 275 L212 274 L212 274 L211 273 L211 273 L211 273 L211 273 L210 273 L210 273 L210 273 L210 272 L209 272 L209 272 L208 271 L207 271 L206 272 L205 272 L204 273 L203 274 L202 275 L200 277 L199 278 L197 280 L196 282 L194 284 L193 287 L191 289 L190 292 L188 294 L187 297 L185 299 L184 302 L182 305 L181 308 L179 310 L178 313 L177 315 L175 318 L174 320 L173 323 L172 325 L171 327 L170 329 L169 331 L169 332 L168 334 L168 335 L167 337 L166 339 L165 342 L163 345 L162 348 L160 351 L158 355 L156 359 L154 363 L152 367 L149 371 L144 380 L139 389 L134 399 L128 408 L123 417 L118 426 L114 433 L110 440 L106 446 L104 451 L103 452 L102 453 L101 454 L100 455 L99 458 L97 460 L95 463 L93 465 L93 466 L92 467 L91 468 L90 470 L90 471 L89 472 L88 473 L88 474 L87 475 L87 476 L86 477 L86 478 L86 478 L86 479 L86 480 L86 481 L86 481 L87 482 L87 482 L88 483 L89 484 L90 484 L91 485 L92 486 L93 486 L95 487 L96 487 L97 488 L99 489 L101 490 L102 490 L103 490 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M101 490 L101 490 L102 489 L102 489 L103 489 L104 489 L104 488 L105 488 L105 488 L106 487 L106 487 L107 486 L107 485 L108 485 L108 484 L109 483 L109 482 L110 481 L110 480 L111 479 L111 478 L112 476 L113 474 L114 472 L115 469 L116 467 L117 464 L118 462 L119 460 L120 458 L121 455 L122 453 L123 450 L124 447 L126 444 L129 438 L132 431 L135 425 L139 418 L142 411 L146 404 L148 401 L149 398 L151 395 L153 391 L155 388 L156 385 L158 383 L159 380 L161 377 L162 375 L164 373 L165 371 L166 369 L168 366 L170 364 L171 361 L173 358 L175 355 L177 351 L179 348 L181 344 L183 340 L186 337 L188 333 L190 329 L192 325 L194 321 L196 317 L198 313 L200 309 L202 306 L204 302 L205 298 L207 295 L208 292 L209 289 L210 286 L211 283 L211 281 L212 278 L212 277 L212 275 L211 274 L210 273 L210 273 L210 273 L209 272 L209 272 L209 272 L209 272 L208 272 L208 272 L208 271 L207 271 L207 271 L206 270 L205 270 L204 271 L203 271 L202 272 L201 273 L200 274 L198 276 L197 277 L196 279 L194 281 L193 283 L191 286 L189 288 L188 291 L186 293 L185 296 L183 298 L182 301 L180 304 L179 307 L177 309 L176 312 L175 314 L173 317 L172 319 L171 322 L170 324 L169 326 L168 328 L168 330 L167 331 L167 333 L166 334 L165 336 L164 338 L163 341 L162 344 L160 347 L158 350 L156 354 L154 358 L152 362 L150 366 L147 370 L142 379 L137 388 L132 398 L127 407 L122 416 L117 425 L112 432 L108 439 L105 445 L102 450 L101 451 L100 452 L99 453 L99 454 L97 457 L95 459 L93 462 L92 464 L90 466 L88 469 L88 470 L87 471 L86 472 L86 473 L85 474 L85 475 L85 476 L84 477 L84 477 L84 478 L84 479 L84 480 L85 480 L85 481 L85 481 L86 482 L87 483 L88 483 L89 484 L90 485 L92 485 L93 486 L94 486 L95 487 L97 488 L99 489 L100 489 L101 490 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M281 141 L281 142 L280 143 L280 145 L279 148 L278 151 L276 154 L274 158 L272 163 L270 167 L267 172 L265 178 L262 183 L259 189 L256 195 L253 201 L250 206 L244 218 L238 230 L232 241 L227 250 L222 259 L218 266 L215 271 L214 273 L215 272 L217 269 L219 266 L221 263 L223 260 L225 256 L227 251 L230 247 L233 242 L235 237 L238 231 L241 226 L247 215 L253 204 L259 193 L264 182 L270 172 L274 163 L278 156 L281 150 L284 146 L285 144 L283 143 L283 142 L282 142 L281 141 L281 141 L281 141 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M279 140 L278 139 L278 139 L277 139 L275 138 L275 139 L275 141 L274 144 L273 147 L271 150 L270 154 L268 158 L266 163 L263 168 L261 173 L258 179 L255 184 L252 190 L249 196 L246 202 L243 208 L237 220 L231 231 L225 242 L220 252 L215 260 L212 266 L210 270 L209 272 L210 272 L212 269 L214 264 L218 257 L223 248 L228 238 L234 226 L240 215 L246 203 L252 191 L258 179 L264 169 L269 159 L273 151 L276 145 L278 141 L279 140 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M272 136 L272 136 L271 136 L270 135 L269 135 L268 136 L268 137 L267 139 L265 142 L264 145 L262 149 L260 153 L257 158 L252 168 L246 179 L240 191 L233 203 L227 214 L221 226 L215 237 L210 246 L206 254 L202 261 L200 265 L199 266 L200 267 L201 265 L203 261 L206 255 L211 247 L216 238 L221 227 L227 216 L234 204 L240 192 L247 180 L250 175 L253 169 L255 164 L258 159 L261 155 L263 151 L265 147 L267 144 L269 141 L270 139 L271 137 L272 136 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M276 126 L277 124 L278 121 L279 120 L279 118 L280 116 L281 114 L281 112 L281 111 L282 109 L282 107 L282 106 L283 104 L283 103 L283 102 L283 100 L283 99 L283 98 L283 96 L283 95 L282 94 L282 92 L282 91 L282 90 L281 88 L281 87 L281 86 L280 85 L280 83 L279 80 L278 77 L277 77 L277 77 L275 76 L274 75 L272 74 L270 73 L268 72 L265 71 L263 69 L260 68 L258 67 L255 65 L253 64 L251 63 L249 62 L248 61 L247 62 L247 64 L246 65 L245 66 L244 67 L244 68 L243 69 L242 70 L241 71 L240 72 L239 73 L239 74 L238 74 L237 75 L237 75 L237 75 L237 75 L236 75 L237 75 L238 74 L239 73 L240 73 L241 72 L241 72 L242 72 L242 72 L243 71 L244 71 L244 71 L245 71 L246 71 L247 71 L248 71 L249 71 L250 71 L251 71 L252 71 L253 71 L254 72 L255 72 L257 73 L258 73 L259 74 L261 75 L262 75 L264 76 L266 77 L267 78 L269 80 L270 81 L272 82 L273 83 L274 84 L275 86 L276 87 L277 88 L278 90 L278 91 L279 92 L279 94 L280 95 L280 97 L280 98 L280 100 L280 102 L280 103 L280 105 L280 107 L280 108 L279 110 L279 112 L279 114 L278 116 L278 117 L277 119 L276 121 L276 123 L275 125 L276 126 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M288 132 L289 131 L290 129 L291 128 L292 127 L293 126 L294 125 L295 124 L297 123 L298 122 L299 121 L301 120 L302 119 L304 118 L306 117 L308 116 L310 115 L311 114 L312 114 L313 114 L314 113 L315 113 L317 113 L318 113 L319 113 L320 113 L321 113 L322 113 L324 113 L325 113 L326 113 L327 114 L329 114 L330 115 L331 115 L332 116 L334 116 L335 117 L336 118 L337 119 L339 120 L340 121 L341 122 L342 123 L344 124 L345 125 L346 126 L347 128 L349 129 L350 131 L352 134 L354 136 L356 139 L358 142 L360 144 L362 147 L363 150 L365 152 L367 155 L368 157 L369 158 L370 160 L371 161 L372 162 L372 162 L372 162 L371 161 L370 159 L368 157 L366 155 L364 152 L361 149 L359 146 L356 143 L354 140 L351 137 L349 134 L347 131 L345 129 L344 128 L343 127 L342 126 L342 126 L346 132 L349 137 L352 141 L354 143 L355 145 L356 146 L356 147 L356 147 L355 146 L354 145 L353 143 L351 141 L349 139 L348 137 L346 135 L344 133 L342 131 L341 129 L339 127 L337 126 L337 125 L336 124 L335 123 L335 123 L334 122 L333 122 L333 122 L332 121 L331 121 L329 120 L327 120 L325 119 L324 119 L322 119 L321 119 L319 119 L318 119 L316 119 L315 119 L313 120 L312 120 L311 121 L310 121 L308 122 L307 123 L306 123 L305 124 L304 125 L303 126 L302 127 L301 128 L300 129 L298 130 L296 132 L294 134 L292 136 L292 135 L291 134 L290 134 L289 133 L288 132 L288 132 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M252 49 L252 50 L252 51 L252 51 L252 52 L251 52 L251 53 L251 54 L250 56 L252 57 L254 58 L256 59 L259 60 L261 62 L264 63 L266 65 L269 66 L270 67 L271 67 L273 68 L274 68 L275 69 L276 69 L277 70 L278 70 L279 70 L280 71 L281 71 L281 71 L282 71 L283 71 L283 71 L284 71 L284 71 L285 71 L286 70 L286 70 L287 70 L288 70 L288 70 L289 70 L290 70 L291 69 L291 69 L291 69 L292 69 L292 68 L293 68 L293 68 L294 67 L294 67 L295 67 L296 66 L296 66 L297 65 L295 66 L294 66 L292 67 L291 67 L290 67 L289 67 L289 67 L288 68 L288 68 L287 68 L287 68 L286 68 L286 68 L285 68 L285 68 L284 68 L284 68 L283 67 L283 67 L282 67 L282 67 L282 67 L281 67 L281 67 L280 66 L279 66 L277 64 L274 63 L271 61 L269 60 L266 59 L265 58 L263 57 L263 57 L262 56 L261 56 L260 55 L259 55 L258 54 L257 53 L256 53 L255 52 L255 52 L254 51 L254 51 L253 50 L253 50 L253 50 L252 49 L252 49 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M227 57 L245 66 L244 67 L244 68 L243 68 L243 69 L242 70 L241 71 L240 72 L239 73 L223 64 L223 63 L224 62 L225 61 L225 60 L226 59 L227 58 L227 57 L227 57 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M235 43 L234 44 L251 53 L252 52 L235 43 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M230 52 L229 53 L247 63 L248 61 L230 52 Z" stroke="none" />

-      <path fill="rgb(122,138,147)" d="M216 297 L215 297 L214 297 L213 297 L212 296 L211 296 L209 296 L208 296 L207 295 L206 295 L204 294 L203 294 L202 293 L200 293 L199 292 L197 291 L196 290 L195 290 L193 289 L192 288 L191 287 L189 287 L188 286 L187 285 L186 284 L185 283 L184 282 L183 281 L182 281 L181 280 L180 279 L180 278 L179 277 L179 278 L179 279 L180 280 L180 281 L181 282 L182 283 L183 283 L184 284 L185 285 L186 286 L188 287 L189 288 L190 288 L191 289 L193 290 L194 291 L196 292 L197 292 L198 293 L200 294 L201 294 L203 295 L204 295 L205 296 L207 296 L208 297 L209 297 L210 297 L211 298 L213 298 L214 298 L215 298 L215 298 L216 297 Z" stroke="none" />

-      <path fill="none" d="M216 297 L215 297 L214 297 L213 297 L212 296 L211 296 L209 296 L208 296 L207 295 L206 295 L204 294 L203 294 L202 293 L200 293 L199 292 L197 291 L196 290 L195 290 L193 289 L192 288 L191 287 L189 287 L188 286 L187 285 L186 284 L185 283 L184 282 L183 281 L182 281 L181 280 L180 279 L180 278 L179 277 L179 278 L179 279 L180 280 L180 281 L181 282 L182 283 L183 283 L184 284 L185 285 L186 286 L188 287 L189 288 L190 288 L191 289 L193 290 L194 291 L196 292 L197 292 L198 293 L200 294 L201 294 L203 295 L204 295 L205 296 L207 296 L208 297 L209 297 L210 297 L211 298 L213 298 L214 298 L215 298 L215 298 L216 297" stroke-width="9" />

-      <path fill="rgb(122,138,147)" d="M192 265 L193 265 L193 266 L194 267 L194 267 L195 268 L196 269 L197 270 L197 270 L198 271 L199 272 L200 272 L201 273 L202 274 L203 274 L204 275 L205 275 L206 276 L207 276 L208 277 L209 277 L210 277 L211 278 L212 278 L213 278 L214 279 L215 279 L216 279 L217 279 L218 279 L218 279 L219 279 L220 279 L219 278 L219 278 L218 278 L217 278 L217 278 L216 278 L215 278 L214 277 L213 277 L212 277 L211 277 L210 276 L209 276 L208 275 L207 275 L206 275 L205 274 L204 274 L203 273 L203 272 L202 272 L201 271 L200 271 L199 270 L198 269 L197 269 L197 268 L196 268 L195 267 L195 266 L194 265 L194 265 L193 264 L192 265 Z" stroke-width="9" stroke="none" />

-      <path fill="none" d="M192 265 L193 265 L193 266 L194 267 L194 267 L195 268 L196 269 L197 270 L197 270 L198 271 L199 272 L200 272 L201 273 L202 274 L203 274 L204 275 L205 275 L206 276 L207 276 L208 277 L209 277 L210 277 L211 278 L212 278 L213 278 L214 279 L215 279 L216 279 L217 279 L218 279 L218 279 L219 279 L220 279 L219 278 L219 278 L218 278 L217 278 L217 278 L216 278 L215 278 L214 277 L213 277 L212 277 L211 277 L210 276 L209 276 L208 275 L207 275 L206 275 L205 274 L204 274 L203 273 L203 272 L202 272 L201 271 L200 271 L199 270 L198 269 L197 269 L197 268 L196 268 L195 267 L195 266 L194 265 L194 265 L193 264 L192 265" stroke-width="9" />

-      <path fill="rgb(122,138,147)" d="M75 460 L75 461 L76 462 L77 463 L77 464 L78 465 L79 466 L80 467 L82 468 L83 469 L84 470 L86 471 L87 472 L89 473 L91 474 L92 475 L94 476 L96 477 L98 478 L99 479 L101 480 L103 480 L105 481 L106 482 L108 482 L110 483 L112 483 L113 484 L115 484 L117 484 L118 484 L119 484 L121 484 L120 485 L119 485 L118 485 L116 485 L114 485 L113 484 L111 484 L109 484 L108 483 L106 483 L104 482 L102 481 L101 481 L99 480 L97 479 L95 478 L94 477 L92 476 L90 475 L89 474 L87 473 L85 472 L84 471 L83 470 L81 469 L80 468 L79 467 L78 466 L77 465 L76 464 L75 463 L75 462 L74 461 L75 460 Z" stroke-width="9" stroke="none" />

-      <path fill="none" d="M75 460 L75 461 L76 462 L77 463 L77 464 L78 465 L79 466 L80 467 L82 468 L83 469 L84 470 L86 471 L87 472 L89 473 L91 474 L92 475 L94 476 L96 477 L98 478 L99 479 L101 480 L103 480 L105 481 L106 482 L108 482 L110 483 L112 483 L113 484 L115 484 L117 484 L118 484 L119 484 L121 484 L120 485 L119 485 L118 485 L116 485 L114 485 L113 484 L111 484 L109 484 L108 483 L106 483 L104 482 L102 481 L101 481 L99 480 L97 479 L95 478 L94 477 L92 476 L90 475 L89 474 L87 473 L85 472 L84 471 L83 470 L81 469 L80 468 L79 467 L78 466 L77 465 L76 464 L75 463 L75 462 L74 461 L75 460" stroke-width="9" />

-      <path fill="rgb(122,138,147)" d="M78 455 L79 456 L79 457 L80 458 L81 459 L82 460 L83 461 L84 462 L85 463 L86 464 L88 465 L89 466 L91 467 L92 468 L94 469 L95 470 L97 470 L99 471 L100 472 L102 473 L104 474 L105 474 L107 475 L109 476 L111 476 L112 476 L114 477 L116 477 L117 477 L119 477 L120 478 L122 477 L123 477 L123 478 L121 479 L120 479 L118 479 L117 478 L115 478 L114 478 L112 477 L110 477 L109 477 L107 476 L105 475 L103 475 L102 474 L100 473 L98 472 L97 471 L95 470 L93 469 L92 468 L90 468 L89 467 L87 465 L86 464 L85 463 L84 462 L82 461 L81 460 L80 459 L80 458 L79 457 L78 456 L78 455 L78 455 Z" stroke-width="9" stroke="none" />

-      <path fill="none" d="M78 455 L79 456 L79 457 L80 458 L81 459 L82 460 L83 461 L84 462 L85 463 L86 464 L88 465 L89 466 L91 467 L92 468 L94 469 L95 470 L97 470 L99 471 L100 472 L102 473 L104 474 L105 474 L107 475 L109 476 L111 476 L112 476 L114 477 L116 477 L117 477 L119 477 L120 478 L122 477 L123 477 L123 478 L121 479 L120 479 L118 479 L117 478 L115 478 L114 478 L112 477 L110 477 L109 477 L107 476 L105 475 L103 475 L102 474 L100 473 L98 472 L97 471 L95 470 L93 469 L92 468 L90 468 L89 467 L87 465 L86 464 L85 463 L84 462 L82 461 L81 460 L80 459 L80 458 L79 457 L78 456 L78 455 L78 455" stroke-width="9" />

-      <path fill="rgb(122,138,147)" d="M83 449 L83 450 L84 451 L85 452 L85 452 L86 453 L87 454 L88 455 L90 456 L91 457 L92 458 L94 459 L95 460 L97 461 L98 462 L100 463 L101 464 L103 465 L104 466 L106 466 L108 467 L109 468 L111 468 L113 469 L114 470 L116 470 L117 470 L119 471 L120 471 L122 471 L123 471 L124 471 L125 471 L125 472 L124 472 L123 472 L121 472 L120 472 L119 472 L117 471 L116 471 L114 471 L112 470 L111 469 L109 469 L107 468 L106 467 L104 467 L103 466 L101 465 L99 464 L98 463 L96 462 L95 461 L93 460 L92 459 L90 458 L89 457 L88 456 L87 455 L86 454 L85 453 L84 452 L83 452 L83 451 L82 450 L83 449 Z" stroke-width="9" stroke="none" />

-      <path fill="none" d="M83 449 L83 450 L84 451 L85 452 L85 452 L86 453 L87 454 L88 455 L90 456 L91 457 L92 458 L94 459 L95 460 L97 461 L98 462 L100 463 L101 464 L103 465 L104 466 L106 466 L108 467 L109 468 L111 468 L113 469 L114 470 L116 470 L117 470 L119 471 L120 471 L122 471 L123 471 L124 471 L125 471 L125 472 L124 472 L123 472 L121 472 L120 472 L119 472 L117 471 L116 471 L114 471 L112 470 L111 469 L109 469 L107 468 L106 467 L104 467 L103 466 L101 465 L99 464 L98 463 L96 462 L95 461 L93 460 L92 459 L90 458 L89 457 L88 456 L87 455 L86 454 L85 453 L84 452 L83 452 L83 451 L82 450 L83 449 Z" stroke-width="9" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.wmf
deleted file mode 100644
index 805b4e4..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/toolset.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.emf
deleted file mode 100644
index 60a4be2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.svg
deleted file mode 100644
index f53bedc..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_model.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="93" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="89" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M57 29 L32 69" />

-      <path fill="none" d="M32 81 L60 66" />

-      <path fill="rgb(255,255,153)" d="M66 31 L72 49 Z" stroke="none" />

-      <path fill="none" d="M66 31 L72 49" />

-      <path fill="rgb(255,255,153)" d="M-195 672 ZM37 74 C37 81 29 87 19 87 C9 87 1 81 1 74 C1 67 9 62 19 62 C29 62 37 67 37 74 Z" stroke="none" />

-      <path fill="none" d="M-195 672 ZM37 74 C37 81 29 87 19 87 C9 87 1 81 1 74 C1 67 9 62 19 62 C29 62 37 67 37 74 Z" />

-      <path fill="rgb(255,255,153)" d="M37 74 ZM90 62 C90 69 82 75 72 75 C62 75 54 69 54 62 C54 55 62 49 72 49 C82 49 90 55 90 62 Z" stroke="none" />

-      <path fill="none" d="M37 74 ZM90 62 C90 69 82 75 72 75 C62 75 54 69 54 62 C54 55 62 49 72 49 C82 49 90 55 90 62 Z" />

-      <path fill="rgb(255,255,153)" d="M90 62 ZM81 20 C81 27 73 33 63 33 C53 33 45 27 45 20 C45 14 53 8 63 8 C73 8 81 14 81 20 Z" stroke="none" />

-      <path fill="none" d="M90 62 ZM81 20 C81 27 73 33 63 33 C53 33 45 27 45 20 C45 14 53 8 63 8 C73 8 81 14 81 20 Z" />

-      <path fill="rgb(255,255,153)" d="M2 20 L35 20 Z" stroke="none" />

-      <path fill="none" d="M2 20 L35 20" />

-      <path fill="rgb(255,255,153)" d="M19 15 L19 32 Z" stroke="none" />

-      <path fill="none" d="M19 15 L19 32" />

-      <path fill="none" d="M27 48 L19 30 L11 48" />

-      <path fill="rgb(255,255,153)" d="M81 20 ZM26 8 C26 12 22 15 19 15 C15 15 12 12 12 8 C12 4 15 1 19 1 C22 1 26 4 26 8 Z" stroke="none" />

-      <path fill="none" d="M81 20 ZM26 8 C26 12 22 15 19 15 C15 15 12 12 12 8 C12 4 15 1 19 1 C22 1 26 4 26 8 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.emf
deleted file mode 100644
index 861d9b5..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.svg
deleted file mode 100644
index 2c008be..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_package.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="71" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="61" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M69 59 L1 59 L1 11 L69 11 L69 59 L69 59 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M69 59 L1 59 L1 11 L69 11 L69 59 L69 59 Z" />

-      <path fill="rgb(255,255,153)" d="M24 2 L1 2 L1 11 L24 11 L24 2 L24 2 Z" stroke="none" />

-      <path fill="none" d="M24 2 L1 2 L1 11 L24 11 L24 2 L24 2 Z" />

-      <path fill="rgb(255,255,153)" d="M-373 558 ZM57 35 C57 44 47 51 34 51 C22 51 12 44 12 35 C12 27 22 20 34 20 C47 20 57 27 57 35 Z" stroke="none" />

-      <path fill="none" d="M-373 558 ZM57 35 C57 44 47 51 34 51 C22 51 12 44 12 35 C12 27 22 20 34 20 C47 20 57 27 57 35 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.emf
deleted file mode 100644
index 6ce115f..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.svg
deleted file mode 100644
index 01cd17a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_storyboard.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="94" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="58" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M54 16 L38 29 L54 43" />

-      <path fill="rgb(255,255,153)" d="M-363 557 ZM91 13 C91 20 83 26 73 26 C62 26 54 20 54 13 C54 7 62 1 73 1 C83 1 91 7 91 13 Z" stroke="none" />

-      <path fill="none" d="M-363 557 ZM91 13 C91 20 83 26 73 26 C62 26 54 20 54 13 C54 7 62 1 73 1 C83 1 91 7 91 13 Z" />

-      <path fill="rgb(255,255,153)" d="M91 13 ZM91 44 C91 51 83 56 73 56 C62 56 54 51 54 44 C54 37 62 32 73 32 C83 32 91 37 91 44 Z" stroke="none" />

-      <path fill="none" d="M91 13 ZM91 44 C91 51 83 56 73 56 C62 56 54 51 54 44 C54 37 62 32 73 32 C83 32 91 37 91 44 Z" />

-      <path fill="rgb(255,255,153)" d="M91 44 ZM38 29 C38 35 30 41 20 41 C9 41 1 35 1 29 C1 22 9 17 20 17 C30 17 38 22 38 29 Z" stroke="none" />

-      <path fill="none" d="M91 44 ZM38 29 C38 35 30 41 20 41 C9 41 1 35 1 29 C1 22 9 17 20 17 C30 17 38 22 38 29 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.emf
deleted file mode 100644
index 1226688..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.svg
deleted file mode 100644
index b55c5b2..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/use_case_system.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="81" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="69" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(255,255,153)" stroke="rgb(255,255,153)">

-      <path d="M33 10 L33 1 L10 1 L10 10 L10 10 L10 58 L78 58 L78 10 L33 10 L33 10 Z" stroke="none" />

-    </g>

-    <g stroke-linecap="butt" stroke-miterlimit="4">

-      <path fill="none" d="M33 10 L33 1 L10 1 L10 10 L10 10 L10 58 L78 58 L78 10 L33 10 L33 10 Z" />

-      <path fill="rgb(255,255,153)" d="M69 67 L1 67 L1 19 L69 19 L69 67 L69 67 L69 67 Z" stroke="none" />

-      <path fill="none" d="M69 67 L1 67 L1 19 L69 19 L69 67 L69 67 L69 67 Z" />

-      <path fill="rgb(255,255,153)" d="M24 10 L1 10 L1 19 L24 19 L24 10 L24 10 L24 10 Z" stroke="none" />

-      <path fill="none" d="M24 10 L1 10 L1 19 L24 19 L24 10 L24 10 L24 10 Z" />

-      <path fill="rgb(255,255,153)" d="M-368 562 ZM57 43 C57 52 47 59 34 59 C22 59 12 52 12 43 C12 35 22 28 34 28 C47 28 57 35 57 43 Z" stroke="none" />

-      <path fill="none" d="M-368 562 ZM57 43 C57 52 47 59 34 59 C22 59 12 52 12 43 C12 35 22 28 34 28 C47 28 57 35 57 43 Z" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.emf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.emf
deleted file mode 100644
index bf1e95a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.emf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.svg
deleted file mode 100644
index 1ddbf79..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/virtualdirectory.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="605" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="455" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <defs id="defs1">

-      <pattern x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern1" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAICAIAAAB/FOjAAAAAFklEQVR42mNkYGhg

-IAUwMZAIRjUQAwDQSACQCjILvQAAAABJRU5ErkJggg==" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-      <pattern x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" patternUnits="userSpaceOnUse" xlink:type="simple" xlink:actuate="onLoad" id="pattern2" height="8" preserveAspectRatio="xMidYMid meet" xlink:show="other">

-        <image x="0" y="0" width="16" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAICAIAAAB/FOjAAAAALElEQVR42mNsaGhg

-QAVSUlJA8tmzZ1jFmRhIBCyYpiKbjSlOrg34TR3kfgAA3SUkXtCNiKcAAAAASUVO

-RK5CYII=" xlink:type="simple" xlink:actuate="onLoad" height="8" preserveAspectRatio="none" xlink:show="embed" />

-      </pattern>

-    </defs>

-    <g fill="white" stroke="white">

-      <path d="M2 452 L602 452 L602 114 L2 114 L2 452 Z" stroke="none" />

-    </g>

-    <g stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

-      <path fill="none" d="M2 452 L602 452 L602 114 L2 114 L2 452 Z" />

-      <path fill="white" d="M2 114 L302 114 L302 2 L2 2 L2 114 Z" stroke="none" />

-      <path fill="none" d="M2 114 L302 114 L302 2 L2 2 L2 114 Z" />

-      <path fill="url(#pattern1)" d="M208 58 L210 47 L215 36 L224 28 L234 23 L246 21 L257 23 L268 28 L276 36 L281 47 L283 58 L281 70 L276 80 L268 89 L257 94 L246 96 L234 94 L224 89 L215 80 L210 70 L208 58 Z" stroke="none" />

-      <path fill="none" d="M208 58 L210 47 L215 36 L224 28 L234 23 L246 21 L257 23 L268 28 L276 36 L281 47 L283 58 L281 70 L276 80 L268 89 L257 94 L246 96 L234 94 L224 89 L215 80 L210 70 L208 58 Z" stroke="navy" />

-      <path fill="none" d="M189 2 L189 114" />

-      <path fill="url(#pattern2)" d="M2 39 L189 39 L189 2 L2 2 L2 39 Z" stroke="none" />

-      <path fill="none" d="M2 39 L189 39 L189 2 L2 2 L2 39 Z" />

-      <path fill="none" d="M21 58 L161 58" />

-      <path fill="none" d="M21 77 L161 77" />

-      <path fill="none" d="M21 96 L161 96" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.svg
deleted file mode 100644
index 8f3efba..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="358" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="498" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(195,195,194)" stroke="rgb(195,195,194)">

-      <path d="M112 222 L353 222 L267 494 L26 494 L112 222 Z" stroke="none" />

-      <path fill="none" d="M112 222 L353 222 L267 494 L26 494 L112 222 Z" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" />

-    </g>

-    <g fill="rgb(245,197,146)" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(245,197,146)">

-      <path d="M90 201 L331 201 L245 473 L4 473 L90 201 Z" stroke="none" />

-      <path fill="none" d="M90 201 L331 201 L245 473 L4 473 L90 201 Z" stroke="rgb(31,26,23)" />

-      <path fill="rgb(195,195,194)" d="M218 170 L222 170 L226 170 L230 169 L234 168 L238 167 L242 166 L246 165 L249 164 L253 162 L256 160 L260 158 L263 156 L266 154 L270 151 L273 149 L275 146 L278 143 L281 140 L283 137 L285 134 L288 131 L289 127 L291 124 L293 120 L294 117 L296 113 L297 109 L298 105 L298 101 L299 97 L299 93 L299 89 L299 85 L299 81 L298 76 L298 72 L297 69 L296 65 L294 61 L293 57 L291 54 L289 50 L288 47 L285 43 L283 40 L281 37 L278 34 L275 31 L273 29 L270 26 L266 24 L263 21 L260 19 L256 17 L253 16 L249 14 L246 12 L242 11 L238 10 L234 9 L230 8 L226 8 L222 8 L218 8 L213 8 L209 8 L205 8 L201 9 L197 10 L193 11 L189 12 L186 14 L182 16 L179 17 L175 19 L172 21 L169 24 L166 26 L163 29 L160 31 L157 34 L154 37 L152 40 L150 43 L148 47 L146 50 L144 54 L142 57 L141 61 L139 65 L138 69 L137 72 L137 76 L136 81 L136 85 L136 89 L136 93 L136 97 L137 101 L137 105 L138 109 L139 113 L141 117 L142 120 L144 124 L146 127 L148 131 L150 134 L152 137 L154 140 L157 143 L160 146 L163 149 L166 151 L169 154 L172 156 L175 158 L179 160 L182 162 L186 164 L189 165 L193 166 L197 167 L201 168 L205 169 L209 170 L213 170 L218 170 Z" stroke="none" />

-      <path fill="none" d="M218 170 L222 170 L226 170 L230 169 L234 168 L238 167 L242 166 L246 165 L249 164 L253 162 L256 160 L260 158 L263 156 L266 154 L270 151 L273 149 L275 146 L278 143 L281 140 L283 137 L285 134 L288 131 L289 127 L291 124 L293 120 L294 117 L296 113 L297 109 L298 105 L298 101 L299 97 L299 93 L299 89 L299 85 L299 81 L298 76 L298 72 L297 69 L296 65 L294 61 L293 57 L291 54 L289 50 L288 47 L285 43 L283 40 L281 37 L278 34 L275 31 L273 29 L270 26 L266 24 L263 21 L260 19 L256 17 L253 16 L249 14 L246 12 L242 11 L238 10 L234 9 L230 8 L226 8 L222 8 L218 8 L213 8 L209 8 L205 8 L201 9 L197 10 L193 11 L189 12 L186 14 L182 16 L179 17 L175 19 L172 21 L169 24 L166 26 L163 29 L160 31 L157 34 L154 37 L152 40 L150 43 L148 47 L146 50 L144 54 L142 57 L141 61 L139 65 L138 69 L137 72 L137 76 L136 81 L136 85 L136 89 L136 93 L136 97 L137 101 L137 105 L138 109 L139 113 L141 117 L142 120 L144 124 L146 127 L148 131 L150 134 L152 137 L154 140 L157 143 L160 146 L163 149 L166 151 L169 154 L172 156 L175 158 L179 160 L182 162 L186 164 L189 165 L193 166 L197 167 L201 168 L205 169 L209 170 L213 170 L218 170 Z" stroke="rgb(195,195,194)" />

-      <path d="M202 166 L206 165 L210 165 L214 165 L219 164 L222 163 L226 162 L230 161 L234 159 L237 157 L241 156 L244 154 L248 152 L251 149 L254 147 L257 144 L260 142 L263 139 L265 136 L268 133 L270 130 L272 126 L274 123 L276 119 L277 116 L279 112 L280 108 L281 105 L282 101 L283 97 L283 93 L284 88 L284 84 L284 80 L283 76 L283 72 L282 68 L281 64 L280 60 L279 56 L277 53 L276 49 L274 46 L272 42 L270 39 L268 36 L265 33 L263 30 L260 27 L257 24 L254 22 L251 19 L248 17 L244 15 L241 13 L237 11 L234 9 L230 8 L226 7 L222 6 L219 5 L214 4 L210 3 L206 3 L202 3 L198 3 L194 3 L190 4 L186 5 L182 6 L178 7 L174 8 L170 9 L167 11 L163 13 L160 15 L156 17 L153 19 L150 22 L147 24 L144 27 L142 30 L139 33 L137 36 L134 39 L132 42 L130 46 L128 49 L127 53 L125 56 L124 60 L123 64 L122 68 L121 72 L121 76 L120 80 L120 84 L120 88 L121 93 L121 97 L122 101 L123 105 L124 108 L125 112 L127 116 L128 119 L130 123 L132 126 L134 130 L137 133 L139 136 L142 139 L144 142 L147 144 L150 147 L153 149 L156 152 L160 154 L163 156 L167 157 L170 159 L174 161 L178 162 L182 163 L186 164 L190 165 L194 165 L198 165 L202 166 Z" stroke="none" />

-      <path fill="none" d="M202 166 L206 165 L210 165 L214 165 L219 164 L222 163 L226 162 L230 161 L234 159 L237 157 L241 156 L244 154 L248 152 L251 149 L254 147 L257 144 L260 142 L263 139 L265 136 L268 133 L270 130 L272 126 L274 123 L276 119 L277 116 L279 112 L280 108 L281 105 L282 101 L283 97 L283 93 L284 88 L284 84 L284 80 L283 76 L283 72 L282 68 L281 64 L280 60 L279 56 L277 53 L276 49 L274 46 L272 42 L270 39 L268 36 L265 33 L263 30 L260 27 L257 24 L254 22 L251 19 L248 17 L244 15 L241 13 L237 11 L234 9 L230 8 L226 7 L222 6 L219 5 L214 4 L210 3 L206 3 L202 3 L198 3 L194 3 L190 4 L186 5 L182 6 L178 7 L174 8 L170 9 L167 11 L163 13 L160 15 L156 17 L153 19 L150 22 L147 24 L144 27 L142 30 L139 33 L137 36 L134 39 L132 42 L130 46 L128 49 L127 53 L125 56 L124 60 L123 64 L122 68 L121 72 L121 76 L120 80 L120 84 L120 88 L121 93 L121 97 L122 101 L123 105 L124 108 L125 112 L127 116 L128 119 L130 123 L132 126 L134 130 L137 133 L139 136 L142 139 L144 142 L147 144 L150 147 L153 149 L156 152 L160 154 L163 156 L167 157 L170 159 L174 161 L178 162 L182 163 L186 164 L190 165 L194 165 L198 165 L202 166 Z" stroke="rgb(31,26,23)" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.wmf
deleted file mode 100644
index 6c786fa..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/worker.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.svg
deleted file mode 100644
index 9d0ccc7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>

-<svg stroke-dasharray="none" shape-rendering="auto" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" width="566" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" fill="black" xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="395" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-  <!--Generated by the Batik Graphics2D SVG Generator-->

-  <defs id="genericDefs" />

-  <g>

-    <g fill="rgb(195,196,198)" stroke="rgb(195,196,198)">

-      <path d="M75 39 L530 39 L532 39 L534 39 L535 40 L537 40 L539 40 L541 41 L542 41 L544 42 L545 43 L547 44 L548 44 L550 45 L551 46 L553 47 L554 49 L555 50 L556 51 L557 52 L558 54 L559 55 L560 56 L561 58 L562 59 L563 61 L563 63 L564 64 L564 66 L565 68 L565 69 L565 71 L565 73 L566 75 L566 359 L565 361 L565 363 L565 364 L565 366 L564 368 L564 370 L563 371 L563 373 L562 374 L561 376 L560 377 L559 379 L558 380 L557 382 L556 383 L555 384 L554 385 L553 386 L551 387 L550 388 L548 389 L547 390 L545 391 L544 392 L542 392 L541 393 L539 393 L537 394 L535 394 L534 394 L532 394 L530 395 L75 395 L73 394 L71 394 L69 394 L68 394 L66 393 L64 393 L63 392 L61 392 L59 391 L58 390 L56 389 L55 388 L54 387 L52 386 L51 385 L50 384 L48 383 L47 382 L46 380 L45 379 L44 377 L44 376 L43 374 L42 373 L41 371 L41 370 L40 368 L40 366 L40 364 L39 363 L39 361 L39 359 L39 75 L39 73 L39 71 L40 69 L40 68 L40 66 L41 64 L41 63 L42 61 L43 59 L44 58 L44 56 L45 55 L46 54 L47 52 L48 51 L50 50 L51 49 L52 47 L54 46 L55 45 L56 44 L58 44 L59 43 L61 42 L63 41 L64 41 L66 40 L68 40 L69 40 L71 39 L73 39 L75 39 Z" stroke="none" />

-      <path fill="rgb(155,200,153)" d="M38 3 L493 3 L495 3 L497 3 L499 3 L500 3 L502 4 L504 4 L505 5 L507 5 L509 6 L510 7 L512 8 L513 9 L514 10 L516 11 L517 12 L518 13 L520 14 L521 16 L522 17 L523 18 L524 20 L524 21 L525 23 L526 24 L527 26 L527 28 L528 29 L528 31 L528 33 L529 34 L529 36 L529 38 L529 322 L529 324 L529 326 L528 328 L528 329 L528 331 L527 333 L527 334 L526 336 L525 338 L524 339 L524 341 L523 342 L522 343 L521 345 L520 346 L518 347 L517 348 L516 350 L514 351 L513 352 L512 353 L510 353 L509 354 L507 355 L505 356 L504 356 L502 357 L500 357 L499 357 L497 358 L495 358 L493 358 L38 358 L36 358 L34 358 L33 357 L31 357 L29 357 L27 356 L26 356 L24 355 L23 354 L21 353 L20 353 L18 352 L17 351 L15 350 L14 348 L13 347 L12 346 L11 345 L10 343 L9 342 L8 341 L7 339 L6 338 L5 336 L5 334 L4 333 L4 331 L3 329 L3 328 L3 326 L3 324 L3 322 L3 38 L3 36 L3 34 L3 33 L3 31 L4 29 L4 28 L5 26 L5 24 L6 23 L7 21 L8 20 L9 18 L10 17 L11 16 L12 14 L13 13 L14 12 L15 11 L17 10 L18 9 L20 8 L21 7 L23 6 L24 5 L26 5 L27 4 L29 4 L31 3 L33 3 L34 3 L36 3 L38 3 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M493 0 L493 0 L38 0 L38 6 L493 6 L493 0 L493 0 L493 0 L493 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M495 0 L495 0 L493 0 L493 6 L495 6 L495 0 L495 0 L495 0 L495 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M497 0 L497 0 L495 0 L495 6 L497 6 L497 0 L497 0 L497 0 L497 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M499 0 L499 0 L497 0 L497 6 L498 6 L499 0 L499 0 L499 0 L499 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M501 0 L501 0 L499 0 L498 6 L500 6 L501 0 L501 0 L501 0 L501 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M503 1 L503 1 L501 0 L500 6 L501 7 L503 1 L503 1 L503 1 L503 1 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M505 1 L505 1 L503 1 L501 7 L503 7 L505 1 L505 1 L505 1 L505 1 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M507 2 L506 2 L505 1 L503 7 L504 8 L507 2 L507 2 L506 2 L506 2 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M508 3 L508 3 L507 2 L504 8 L506 8 L508 3 L508 3 L508 3 L508 3 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M510 3 L510 3 L508 3 L506 8 L507 9 L510 3 L510 3 L510 3 L510 3 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M512 4 L512 4 L510 3 L507 9 L509 9 L512 4 L512 4 L512 4 L512 4 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M513 5 L513 5 L512 4 L509 9 L510 10 L513 5 L513 5 L513 5 L513 5 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M515 6 L515 6 L513 5 L510 10 L512 11 L515 6 L515 6 L515 6 L515 6 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M516 7 L516 7 L515 6 L511 11 L513 12 L516 7 L516 7 L516 7 L516 7 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M518 8 L518 8 L516 7 L513 12 L514 13 L518 8 L518 8 L518 8 L518 8 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M519 10 L519 10 L518 8 L514 13 L515 14 L519 10 L519 10 L519 10 L519 10 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M521 11 L520 11 L519 10 L515 14 L516 15 L521 11 L521 11 L521 11 L520 11 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M522 12 L522 12 L521 11 L516 15 L517 16 L522 12 L522 12 L522 12 L522 12 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M523 14 L523 14 L522 12 L517 16 L518 17 L523 14 L523 14 L523 14 L523 14 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M524 15 L524 15 L523 14 L518 17 L519 19 L524 15 L524 15 L524 15 L524 15 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M525 17 L525 16 L524 15 L519 19 L520 20 L525 17 L525 17 L525 17 L525 16 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M526 18 L526 18 L525 17 L520 20 L521 21 L526 18 L526 18 L526 18 L526 18 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M527 20 L527 20 L526 18 L521 21 L522 23 L527 20 L527 20 L527 20 L527 20 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M528 21 L528 21 L527 20 L522 22 L523 24 L528 21 L528 21 L528 21 L528 21 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M529 23 L529 23 L528 21 L523 24 L523 26 L529 23 L529 23 L529 23 L529 23 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M529 25 L529 25 L529 23 L523 25 L524 27 L529 25 L529 25 L529 25 L529 25 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M530 27 L530 27 L529 25 L524 27 L524 28 L530 27 L530 27 L530 27 L530 27 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 28 L531 28 L530 27 L524 28 L525 30 L531 28 L531 28 L531 28 L531 28 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 30 L531 30 L531 28 L525 30 L525 32 L531 30 L531 30 L531 30 L531 30 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 32 L531 32 L531 30 L525 31 L525 33 L531 32 L531 32 L531 32 L531 32 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 34 L532 34 L531 32 L525 33 L526 35 L532 34 L532 34 L532 34 L532 34 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 36 L532 36 L532 34 L526 35 L526 36 L532 36 L532 36 L532 36 L532 36 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 38 L532 38 L532 36 L526 36 L526 38 L532 38 L532 38 L532 38 L532 38 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 322 L532 322 L532 38 L526 38 L526 322 L532 322 L532 322 L532 322 L532 322 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 324 L532 324 L532 322 L526 322 L526 324 L532 324 L532 324 L532 324 L532 324 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M532 326 L532 326 L532 324 L526 324 L526 326 L532 326 L532 326 L532 326 L532 326 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 328 L531 328 L532 326 L526 325 L525 327 L531 328 L531 328 L531 328 L531 328 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 330 L531 330 L531 328 L525 327 L525 329 L531 330 L531 330 L531 330 L531 330 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M531 332 L531 332 L531 330 L525 329 L525 330 L531 332 L531 332 L531 332 L531 332 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M530 334 L530 334 L531 332 L525 330 L524 332 L530 334 L530 334 L530 334 L530 334 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M529 336 L529 335 L530 334 L524 332 L524 333 L529 336 L529 336 L529 335 L529 335 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M529 337 L529 337 L529 336 L524 333 L523 335 L529 337 L529 337 L529 337 L529 337 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M528 339 L528 339 L529 337 L523 335 L523 336 L528 339 L528 339 L528 339 L528 339 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M527 341 L527 341 L528 339 L523 336 L522 338 L527 341 L527 341 L527 341 L527 341 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M526 342 L526 342 L527 341 L522 338 L521 339 L526 342 L526 342 L526 342 L526 342 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M525 344 L525 344 L526 342 L521 339 L520 340 L525 344 L525 344 L525 344 L525 344 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M524 345 L524 345 L525 344 L520 340 L519 342 L524 345 L524 345 L524 345 L524 345 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M523 347 L523 347 L524 345 L519 342 L518 343 L523 347 L523 347 L523 347 L523 347 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M522 348 L522 348 L523 347 L518 343 L517 344 L522 348 L522 348 L522 348 L522 348 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M520 349 L521 349 L522 348 L517 344 L516 345 L520 349 L520 349 L521 349 L521 349 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M519 351 L519 351 L520 349 L516 345 L515 346 L519 351 L519 351 L519 351 L519 351 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M518 352 L518 352 L519 351 L515 346 L514 347 L518 352 L518 352 L518 352 L518 352 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M516 353 L516 353 L518 352 L514 347 L513 348 L516 353 L516 353 L516 353 L516 353 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M515 354 L515 354 L516 353 L513 348 L511 349 L515 354 L515 354 L515 354 L515 354 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M513 355 L513 355 L515 354 L511 349 L510 350 L513 355 L513 355 L513 355 L513 355 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M512 356 L512 356 L513 355 L510 350 L509 351 L512 356 L512 356 L512 356 L512 356 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M510 357 L510 357 L512 356 L509 351 L507 352 L510 357 L510 357 L510 357 L510 357 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M508 358 L508 358 L510 357 L507 352 L506 352 L508 358 L508 358 L508 358 L508 358 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M506 358 L507 358 L508 358 L506 352 L504 353 L506 358 L506 358 L506 358 L507 358 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M505 359 L505 359 L506 358 L504 353 L503 353 L505 359 L505 359 L505 359 L505 359 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M503 360 L503 360 L505 359 L503 353 L501 354 L503 360 L503 360 L503 360 L503 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M501 360 L501 360 L503 360 L502 354 L500 354 L501 360 L501 360 L501 360 L501 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M499 360 L499 360 L501 360 L500 354 L498 354 L499 360 L499 360 L499 360 L499 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M497 361 L497 361 L499 360 L498 354 L497 355 L497 361 L497 361 L497 361 L497 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M495 361 L495 361 L497 361 L497 355 L495 355 L495 361 L495 361 L495 361 L495 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M493 361 L493 361 L495 361 L495 355 L493 355 L493 361 L493 361 L493 361 L493 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M38 361 L38 361 L493 361 L493 355 L38 355 L38 361 L38 361 L38 361 L38 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M36 361 L36 361 L38 361 L38 355 L36 355 L36 361 L36 361 L36 361 L36 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M34 361 L34 361 L36 361 L36 355 L35 355 L34 361 L34 361 L34 361 L34 361 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M32 360 L32 360 L34 361 L35 355 L33 354 L32 360 L32 360 L32 360 L32 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M30 360 L30 360 L32 360 L33 354 L31 354 L30 360 L30 360 L30 360 L30 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M28 360 L29 360 L30 360 L32 354 L30 354 L28 360 L28 360 L28 360 L29 360 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M27 359 L27 359 L28 360 L30 354 L28 353 L27 359 L27 359 L27 359 L27 359 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M25 358 L25 358 L27 359 L28 353 L27 353 L25 358 L25 358 L25 358 L25 358 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M23 358 L23 358 L25 358 L27 353 L25 352 L23 358 L23 358 L23 358 L23 358 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M21 357 L21 357 L23 358 L25 352 L24 352 L21 357 L21 357 L21 357 L21 357 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M20 356 L20 356 L21 357 L24 352 L22 351 L20 356 L20 356 L20 356 L20 356 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M18 355 L18 355 L20 356 L23 351 L21 350 L18 355 L18 355 L18 355 L18 355 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M16 354 L17 354 L18 355 L21 350 L20 349 L16 354 L16 354 L17 354 L17 354 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M15 353 L15 353 L16 354 L20 349 L18 348 L15 353 L15 353 L15 353 L15 353 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M13 352 L14 352 L15 353 L19 348 L17 347 L13 352 L13 352 L14 352 L14 352 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M12 351 L12 351 L13 352 L17 347 L16 346 L12 351 L12 351 L12 351 L12 351 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M11 349 L11 349 L12 351 L16 346 L15 345 L11 349 L11 349 L11 349 L11 349 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M9 348 L10 348 L11 349 L15 345 L14 344 L9 348 L9 348 L10 348 L10 348 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M8 347 L8 347 L9 348 L14 344 L13 343 L8 347 L8 347 L8 347 L8 347 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M7 345 L7 345 L8 347 L13 343 L12 342 L7 345 L7 345 L7 345 L7 345 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M6 344 L6 344 L7 345 L12 342 L11 340 L6 344 L6 344 L6 344 L6 344 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M5 342 L5 342 L6 344 L11 340 L10 339 L5 342 L5 342 L5 342 L5 342 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M4 341 L4 341 L5 342 L10 339 L9 338 L4 341 L4 341 L4 341 L4 341 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M3 339 L3 339 L4 341 L9 338 L9 336 L3 339 L3 339 L3 339 L3 339 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M3 337 L3 337 L3 339 L9 336 L8 335 L3 337 L3 337 L3 337 L3 337 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M2 335 L2 336 L3 337 L8 335 L7 333 L2 335 L2 335 L2 335 L2 336 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M1 334 L1 334 L2 335 L8 333 L7 332 L1 334 L1 334 L1 334 L1 334 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M1 332 L1 332 L1 334 L7 332 L7 330 L1 332 L1 332 L1 332 L1 332 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 330 L0 330 L1 332 L7 330 L6 329 L0 330 L0 330 L0 330 L0 330 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 328 L0 328 L0 330 L6 329 L6 327 L0 328 L0 328 L0 328 L0 328 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 326 L0 326 L0 328 L6 327 L6 325 L0 326 L0 326 L0 326 L0 326 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 324 L0 324 L0 326 L6 326 L6 324 L0 324 L0 324 L0 324 L0 324 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 322 L0 322 L0 324 L6 324 L6 322 L0 322 L0 322 L0 322 L0 322 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 38 L0 38 L0 322 L6 322 L6 38 L0 38 L0 38 L0 38 L0 38 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 36 L0 36 L0 38 L6 38 L6 36 L0 36 L0 36 L0 36 L0 36 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 34 L0 34 L0 36 L6 36 L6 35 L0 34 L0 34 L0 34 L0 34 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 32 L0 32 L0 34 L6 35 L6 33 L0 32 L0 32 L0 32 L0 32 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M0 30 L0 30 L0 32 L6 33 L6 31 L0 30 L0 30 L0 30 L0 30 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M1 28 L1 29 L0 30 L6 32 L7 30 L1 28 L1 28 L1 28 L1 29 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M1 27 L1 27 L1 28 L7 30 L7 28 L1 27 L1 27 L1 27 L1 27 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M2 25 L2 25 L1 27 L7 28 L8 27 L2 25 L2 25 L2 25 L2 25 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M3 23 L3 23 L2 25 L7 27 L8 25 L3 23 L3 23 L3 23 L3 23 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M3 21 L3 21 L3 23 L8 25 L9 24 L3 21 L3 21 L3 21 L3 21 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M4 20 L4 20 L3 21 L9 24 L9 22 L4 20 L4 20 L4 20 L4 20 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M5 18 L5 18 L4 20 L9 23 L10 21 L5 18 L5 18 L5 18 L5 18 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M6 16 L6 17 L5 18 L10 21 L11 20 L6 16 L6 16 L6 17 L6 17 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M7 15 L7 15 L6 16 L11 20 L12 19 L7 15 L7 15 L7 15 L7 15 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M8 14 L8 14 L7 15 L12 19 L13 17 L8 14 L8 14 L8 14 L8 14 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M10 12 L9 12 L8 14 L13 17 L14 16 L10 12 L10 12 L10 12 L9 12 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M11 11 L11 11 L10 12 L14 16 L15 15 L11 11 L11 11 L11 11 L11 11 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M12 10 L12 10 L11 11 L15 15 L16 14 L12 10 L12 10 L12 10 L12 10 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M14 8 L13 8 L12 10 L16 14 L17 13 L14 8 L14 8 L14 8 L13 8 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M15 7 L15 7 L14 8 L17 13 L19 12 L15 7 L15 7 L15 7 L15 7 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M17 6 L16 6 L15 7 L18 12 L20 11 L17 6 L17 6 L17 6 L16 6 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M18 5 L18 5 L17 6 L20 11 L21 10 L18 5 L18 5 L18 5 L18 5 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M20 4 L20 4 L18 5 L21 10 L23 9 L20 4 L20 4 L20 4 L20 4 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M21 3 L21 3 L20 4 L23 9 L24 9 L21 3 L21 3 L21 3 L21 3 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M23 3 L23 3 L21 3 L24 9 L25 8 L23 3 L23 3 L23 3 L23 3 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M25 2 L25 2 L23 3 L25 8 L27 8 L25 2 L25 2 L25 2 L25 2 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M27 1 L26 1 L25 2 L27 8 L28 7 L27 1 L27 1 L27 1 L26 1 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M28 1 L28 1 L27 1 L28 7 L30 7 L28 1 L28 1 L28 1 L28 1 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M30 0 L30 0 L28 1 L30 7 L32 6 L30 0 L30 0 L30 0 L30 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M32 0 L32 0 L30 0 L31 6 L33 6 L32 0 L32 0 L32 0 L32 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M34 0 L34 0 L32 0 L33 6 L35 6 L34 0 L34 0 L34 0 L34 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M36 0 L36 0 L34 0 L35 6 L36 6 L36 0 L36 0 L36 0 L36 0 Z" stroke="none" />

-      <path fill="rgb(30,34,37)" d="M38 0 L38 0 L36 0 L36 6 L38 6 L38 0 L38 0 L38 0 L38 0 Z" stroke="none" />

-      <path fill="rgb(237,195,146)" d="M166 132 L168 132 L170 132 L172 132 L174 132 L176 131 L178 131 L180 130 L182 129 L184 128 L186 127 L187 126 L189 125 L191 124 L192 123 L194 122 L195 120 L196 119 L198 117 L199 116 L200 114 L201 113 L202 111 L203 109 L204 107 L205 105 L205 103 L206 101 L206 100 L207 98 L207 95 L207 93 L207 91 L207 89 L207 87 L207 85 L206 83 L206 81 L205 79 L205 77 L204 75 L203 73 L202 72 L201 70 L200 68 L199 67 L198 65 L196 64 L195 62 L194 61 L192 59 L191 58 L189 57 L187 56 L186 55 L184 54 L182 53 L180 53 L178 52 L176 51 L174 51 L172 50 L170 50 L168 50 L166 50 L164 50 L162 50 L160 50 L158 51 L156 51 L154 52 L152 53 L150 53 L148 54 L146 55 L145 56 L143 57 L141 58 L140 59 L138 61 L137 62 L136 64 L134 65 L133 67 L132 68 L131 70 L130 72 L129 73 L128 75 L127 77 L127 79 L126 81 L126 83 L125 85 L125 87 L125 89 L125 91 L125 93 L125 95 L125 98 L126 100 L126 101 L127 103 L127 105 L128 107 L129 109 L130 111 L131 113 L132 114 L133 116 L134 117 L136 119 L137 120 L138 122 L140 123 L141 124 L143 125 L145 126 L146 127 L148 128 L150 129 L152 130 L154 131 L156 131 L158 132 L160 132 L162 132 L164 132 L166 132 Z" stroke="none" />

-    </g>

-    <g fill="rgb(41,49,54)" stroke-linecap="round" stroke-linejoin="round" stroke="rgb(41,49,54)">

-      <path fill="none" d="M166 132 L168 132 L170 132 L172 132 L174 132 L176 131 L178 131 L180 130 L182 129 L184 128 L186 127 L187 126 L189 125 L191 124 L192 123 L194 122 L195 120 L196 119 L198 117 L199 116 L200 114 L201 113 L202 111 L203 109 L204 107 L205 105 L205 103 L206 101 L206 100 L207 98 L207 95 L207 93 L207 91 L207 89 L207 87 L207 85 L206 83 L206 81 L205 79 L205 77 L204 75 L203 73 L202 72 L201 70 L200 68 L199 67 L198 65 L196 64 L195 62 L194 61 L192 59 L191 58 L189 57 L187 56 L186 55 L184 54 L182 53 L180 53 L178 52 L176 51 L174 51 L172 50 L170 50 L168 50 L166 50 L164 50 L162 50 L160 50 L158 51 L156 51 L154 52 L152 53 L150 53 L148 54 L146 55 L145 56 L143 57 L141 58 L140 59 L138 61 L137 62 L136 64 L134 65 L133 67 L132 68 L131 70 L130 72 L129 73 L128 75 L127 77 L127 79 L126 81 L126 83 L125 85 L125 87 L125 89 L125 91 L125 93 L125 95 L125 98 L126 100 L126 101 L127 103 L127 105 L128 107 L129 109 L130 111 L131 113 L132 114 L133 116 L134 117 L136 119 L137 120 L138 122 L140 123 L141 124 L143 125 L145 126 L146 127 L148 128 L150 129 L152 130 L154 131 L156 131 L158 132 L160 132 L162 132 L164 132 L166 132" />

-      <path fill="rgb(237,195,146)" d="M110 151 L230 151 L189 277 L69 277 L110 151 Z" stroke="none" />

-      <path fill="none" d="M110 151 L230 151 L189 277 L69 277 L110 151" />

-      <path fill="rgb(232,150,105)" d="M202 38 L202 194 L321 194 L321 64 L295 38 L202 38 Z" stroke="none" />

-      <path fill="none" d="M202 38 L202 194 L321 194 L321 64 L295 38 L202 38" />

-      <path fill="none" d="M293 38 L293 64 L320 64" />

-      <path fill="rgb(246,244,203)" d="M256 154 L412 154 L484 225 L412 297 L256 297 L256 154 Z" stroke="none" />

-      <path fill="none" d="M256 154 L412 154 L484 225 L412 297 L256 297 L256 154" />

-    </g>

-  </g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.wmf b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.wmf
deleted file mode 100644
index 11650b7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/metafiles/workflow_detail.wmf
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/blackwhite.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/blackwhite.svg
deleted file mode 100644
index 9a81740..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/blackwhite.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'sansserif'" width="103" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 103 177" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="177" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-<!--Generated by the Batik Graphics2D SVG Generator-->

-<defs id="genericDefs"/>

-<g>

-<defs id="defs1">

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-<path d="M9 9 L94 9 L94 59 L9 59 L9 9 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">

-<path d="M-1 -1 L59 -1 L59 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">

-<path d="M19 12 L79 12 L79 31 L19 31 L19 12 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">

-<path d="M9 31 L89 31 L89 45 L9 45 L9 31 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">

-<path d="M9 42 L89 42 L89 56 L9 56 L9 42 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">

-<path d="M-1 -46 L84 -46 L84 4 L-1 4 L-1 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">

-<path d="M-5 -46 L80 -46 L80 4 L-5 4 L-5 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">

-<path d="M-79 -46 L6 -46 L6 4 L-79 4 L-79 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">

-<path d="M-79 -3 L6 -3 L6 47 L-79 47 L-79 -3 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">

-<path d="M-79 -1 L6 -1 L6 49 L-79 49 L-79 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">

-<path d="M9 118 L93 118 L93 168 L9 168 L9 118 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">

-<path d="M-1 -1 L58 -1 L58 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">

-<path d="M19 121 L78 121 L78 140 L19 140 L19 121 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">

-<path d="M9 140 L89 140 L89 154 L9 154 L9 140 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">

-<path d="M9 151 L89 151 L89 165 L9 165 L9 151 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">

-<path d="M-1 -46 L83 -46 L83 4 L-1 4 L-1 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">

-<path d="M-5 -46 L79 -46 L79 4 L-5 4 L-5 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">

-<path d="M-78 -46 L6 -46 L6 4 L-78 4 L-78 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">

-<path d="M-78 -3 L6 -3 L6 47 L-78 47 L-78 -3 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">

-<path d="M-78 -1 L6 -1 L6 49 L-78 49 L-78 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">

-<path d="M-1 -1 L104 -1 L104 178 L-1 178 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">

-<path d="M43 54 L56 54 L56 67 L43 67 L43 54 Z"/>

-</clipPath>

-</defs>

-<g fill="white" stroke-miterlimit="0" font-family="'Tahoma'" stroke-linejoin="round" stroke="white">

-<rect x="10" y="10" clip-path="url(#clipPath1)" width="78" height="45" stroke="none"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(1,0,0,1,20,13)" width="16" xlink:show="replace" xlink:type="simple" clip-path="url(#clipPath2)" preserveAspectRatio="none" font-weight="bold" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABzElEQVR42sVTPUjD&#13;&#10;UBD+1Ai2WEhAoRk7KKSi0A6CEQWfoJDBoYqLm6OOummhRd100+JiQdHBod10sw6i&#13;&#10;AQUzaYYOFRzilkxtBqG+e9rQUp0UvFKOd/fd33cX4JfS8Z3x6um2XrAucWmVApuR&#13;&#10;YJhPGJgeGu/4MUG1Wq2vF3dwbd8hEdOgyirknh54vg/Hc2BVbExpOnZTGwiHwyK2&#13;&#10;qzmBqyFjVizMDI+iX1YgScA7/5FWeiOI9au4KVuw38p4KN5kWxJQ27nrY0wMjKBb&#13;&#10;6sXcCMPiaAqzg9Ngg5OIRvpgvZa5jvAO73F+eJY5yeWznY0ENHOUt+z5NaSSDHpM&#13;&#10;F/aL5xLcmou4GseyviT8hCM8idRIQITFopTAC4L3Lg5gvlgomjKYxuD4b8IP+AHB&#13;&#10;UjMHRJamasHb8Tw4Lv/Dg+Xkv12j1PqsgUhsiCrLn1qRsZ/ahsvbXy+keSG3PQHt&#13;&#10;mYJpbSU+N4szrLFVGElDrFMNKXxNlS90iON15GAiIJGOxOcVQiEZR2ZBkMdxSHLy&#13;&#10;KPix8ojN4q7wE47wbYe0crpRpyMa0zRRpV34iLYtut1bSIvYzmY3XRhdGoGoisLH&#13;&#10;IR5I05vs5N8y1v7uW/h/+QAOt8JZGPNVkgAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="39" y="25" clip-path="url(#clipPath3)" fill="black" stroke="none" font-weight="bold" xml:space="preserve">Class4</text>

-<line clip-path="url(#clipPath4)" fill="none" x1="10" x2="87" y1="32" y2="32" stroke="black"/>

-<line clip-path="url(#clipPath5)" fill="none" x1="10" x2="87" y1="43" y2="43" stroke="black"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,10,55)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath6)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAF0lEQVR42mNkgIBC&#13;&#10;IGYDMRgZEMAWRAAADYQAt3eDxE4AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,14,55)" width="76" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath7)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAACCAYAAADyxTo3AAAAHElEQVR42mNkYGAo&#13;&#10;ZxgFxIBOEMECxMdGw4J4AACyDAHM9bfkCQAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,88,55)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath8)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAGklEQVR42mNmYGAo&#13;&#10;B2ImIH4ExAzMUA4DTAAAJtECRinzbq0AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,88,12)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath9)" preserveAspectRatio="none" height="43" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAArCAYAAABfCymdAAAAHUlEQVR42mNmYGAo&#13;&#10;B2ImIH7EAGWggFGBUYEhKQAAVesBs4WVmAcAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,88,10)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath10)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAF0lEQVR42mNggAA2&#13;&#10;KM3ABMTlQMwIEwAABvQAgQmnwjgAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<rect x="10" y="10" clip-path="url(#clipPath1)" fill="none" width="78" height="45" stroke="black"/>

-<rect x="10" y="119" clip-path="url(#clipPath11)" width="77" height="45" stroke="none"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(1,0,0,1,20,122)" width="16" xlink:show="replace" xlink:type="simple" clip-path="url(#clipPath12)" preserveAspectRatio="none" font-weight="bold" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABzElEQVR42sVTPUjD&#13;&#10;UBD+1Ai2WEhAoRk7KKSi0A6CEQWfoJDBoYqLm6OOummhRd100+JiQdHBod10sw6i&#13;&#10;AQUzaYYOFRzilkxtBqG+e9rQUp0UvFKOd/fd33cX4JfS8Z3x6um2XrAucWmVApuR&#13;&#10;YJhPGJgeGu/4MUG1Wq2vF3dwbd8hEdOgyirknh54vg/Hc2BVbExpOnZTGwiHwyK2&#13;&#10;qzmBqyFjVizMDI+iX1YgScA7/5FWeiOI9au4KVuw38p4KN5kWxJQ27nrY0wMjKBb&#13;&#10;6sXcCMPiaAqzg9Ngg5OIRvpgvZa5jvAO73F+eJY5yeWznY0ENHOUt+z5NaSSDHpM&#13;&#10;F/aL5xLcmou4GseyviT8hCM8idRIQITFopTAC4L3Lg5gvlgomjKYxuD4b8IP+AHB&#13;&#10;UjMHRJamasHb8Tw4Lv/Dg+Xkv12j1PqsgUhsiCrLn1qRsZ/ahsvbXy+keSG3PQHt&#13;&#10;mYJpbSU+N4szrLFVGElDrFMNKXxNlS90iON15GAiIJGOxOcVQiEZR2ZBkMdxSHLy&#13;&#10;KPix8ojN4q7wE47wbYe0crpRpyMa0zRRpV34iLYtut1bSIvYzmY3XRhdGoGoisLH&#13;&#10;IR5I05vs5N8y1v7uW/h/+QAOt8JZGPNVkgAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="39" y="134" clip-path="url(#clipPath13)" fill="black" stroke="none" font-weight="bold" xml:space="preserve">Class5</text>

-<line clip-path="url(#clipPath14)" fill="none" x1="10" x2="86" y1="141" y2="141" stroke="black"/>

-<line clip-path="url(#clipPath15)" fill="none" x1="10" x2="86" y1="152" y2="152" stroke="black"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,10,164)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath16)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAF0lEQVR42mNkgIBC&#13;&#10;IGYDMRgZEMAWRAAADYQAt3eDxE4AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,14,164)" width="76" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath17)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAACCAYAAADyxTo3AAAAHElEQVR42mNkYGAo&#13;&#10;ZxgFxIBOEMECxMdGw4J4AACyDAHM9bfkCQAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,87,164)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath18)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAGklEQVR42mNmYGAo&#13;&#10;B2ImIH4ExAzMUA4DTAAAJtECRinzbq0AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,87,121)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath19)" preserveAspectRatio="none" height="43" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAArCAYAAABfCymdAAAAHUlEQVR42mNmYGAo&#13;&#10;B2ImIH7EAGWggFGBUYEhKQAAVesBs4WVmAcAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,87,119)" width="4" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath20)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAF0lEQVR42mNggAA2&#13;&#10;KM3ABMTlQMwIEwAABvQAgQmnwjgAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<rect x="10" y="119" clip-path="url(#clipPath11)" fill="none" width="78" height="45" stroke="black"/>

-<line clip-path="url(#clipPath21)" fill="none" x1="49" x2="49" y1="117" y2="55" stroke="black"/>

-<polygon clip-path="url(#clipPath22)" points=" 49 55 54 65 44 65" stroke="none"/>

-<polygon fill="none" clip-path="url(#clipPath22)" points=" 49 55 54 65 44 65" stroke="black"/>

-</g>

-</g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/presenter.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/presenter.svg
deleted file mode 100644
index 0d7fe34..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/presenter.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"    "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [

-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">

-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">

-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">

-]>

-<svg  xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"

-	 width="35.81445" height="91.60449" viewBox="0 0 35.81445 91.60449"

-	 overflow="visible" enable-background="new 0 0 35.81445 91.60449" xml:space="preserve">

-	<g id="Layer_1">

-		<path fill="#FFFFFF" d="M25.03809,7.40137c0,3.92578-3.18164,7.10156-7.10742,7.10156c-3.91992,0-7.10156-3.17578-7.10156-7.10156

-			s3.18164-7.10742,7.10156-7.10742C21.85645,0.29395,25.03809,3.47559,25.03809,7.40137z"/>

-		<path fill="#FFFFFF" d="M8.91895,18.72168c-4.76367,0-8.61914,3.86133-8.61914,8.61914V50.6084

-			c0,1.48828,1.20703,2.69531,2.70117,2.69531c1.48242,0,2.68945-1.20703,2.68945-2.69531V32.88965

-			c0-0.87891,0.70898-1.59375,1.59375-1.59375s1.59961,0.71484,1.59961,1.59375h0.00586v18.62109v35.51953

-			c0,2.37891,1.76367,4.30078,3.93164,4.30078c2.17383,0,3.94336-1.92188,3.94336-4.30078V55.58887h-0.01172

-			c0-0.65039,0.52734-1.17188,1.17773-1.17188c0.64453,0,1.16602,0.52148,1.16602,1.17188h0.01172h-0.04688H19.0498v31.44141

-			c0,2.37891,1.76953,4.30078,3.94336,4.30078c2.16797,0,3.93164-1.92188,3.93164-4.30078V51.51074V32.88965h0.00586

-			c0-0.87891,0.71484-1.59375,1.59961-1.59375s1.59375,0.71484,1.59375,1.59375V50.6084c0,1.48828,1.20703,2.69531,2.68945,2.69531

-			c1.49414,0,2.70117-1.20703,2.70117-2.69531V27.34082c0-4.75781-3.85547-8.61914-8.61914-8.61914H8.91895z"/>

-		

-			<linearGradient id="XMLID_1_" gradientUnits="userSpaceOnUse" x1="-589.09766" y1="14.52637" x2="-589.09766" y2="0.38696" gradientTransform="matrix(1 0 0 1 607.03125 0)">

-			<stop  offset="0" style="stop-color:#FFFFFF"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-			<a:midPointStop  offset="0" style="stop-color:#FFFFFF"/>

-			<a:midPointStop  offset="0.5" style="stop-color:#FFFFFF"/>

-			<a:midPointStop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path opacity="0.5" fill="url(#XMLID_1_)" enable-background="new    " d="M25.03809,7.40137

-			c0,3.92578-3.18164,7.10156-7.10742,7.10156c-3.91992,0-7.10156-3.17578-7.10156-7.10156s3.18164-7.10742,7.10156-7.10742

-			C21.85645,0.29395,25.03809,3.47559,25.03809,7.40137z"/>

-		

-			<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="-589.12402" y1="91.47168" x2="-589.12402" y2="19.21858" gradientTransform="matrix(1 0 0 1 607.03125 0)">

-			<stop  offset="0" style="stop-color:#FFFFFF"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-			<a:midPointStop  offset="0" style="stop-color:#FFFFFF"/>

-			<a:midPointStop  offset="0.5" style="stop-color:#FFFFFF"/>

-			<a:midPointStop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path opacity="0.5" fill="url(#XMLID_2_)" enable-background="new    " d="M8.91895,18.72168

-			c-4.76367,0-8.61914,3.86133-8.61914,8.61914V50.6084c0,1.48828,1.20703,2.69531,2.70117,2.69531

-			c1.48242,0,2.68945-1.20703,2.68945-2.69531V32.88965c0-0.87891,0.70898-1.59375,1.59375-1.59375s1.59961,0.71484,1.59961,1.59375

-			h0.00586v18.62109v35.51953c0,2.37891,1.76367,4.30078,3.93164,4.30078c2.17383,0,3.94336-1.92188,3.94336-4.30078V55.58887

-			h-0.01172c0-0.65039,0.52734-1.17188,1.17773-1.17188c0.64453,0,1.16602,0.52148,1.16602,1.17188h0.01172h-0.04688H19.0498

-			v31.44141c0,2.37891,1.76953,4.30078,3.94336,4.30078c2.16797,0,3.93164-1.92188,3.93164-4.30078V51.51074V32.88965h0.00586

-			c0-0.87891,0.71484-1.59375,1.59961-1.59375s1.59375,0.71484,1.59375,1.59375V50.6084c0,1.48828,1.20703,2.69531,2.68945,2.69531

-			c1.49414,0,2.70117-1.20703,2.70117-2.69531V27.34082c0-4.75781-3.85547-8.61914-8.61914-8.61914H8.91895z"/>

-		<path fill="none" stroke="#000000" stroke-width="0.6" d="M25.03809,7.40137c0,3.92578-3.18164,7.10156-7.10742,7.10156

-			c-3.91992,0-7.10156-3.17578-7.10156-7.10156s3.18164-7.10742,7.10156-7.10742

-			C21.85645,0.29395,25.03809,3.47559,25.03809,7.40137z"/>

-		<path fill="none" stroke="#000000" stroke-width="0.6" d="M8.91895,18.72168c-4.76367,0-8.61914,3.86133-8.61914,8.61914V50.6084

-			c0,1.48828,1.20703,2.69531,2.70117,2.69531c1.48242,0,2.68945-1.20703,2.68945-2.69531V32.88965

-			c0-0.87891,0.70898-1.59375,1.59375-1.59375s1.59961,0.71484,1.59961,1.59375h0.00586v18.62109v35.51953

-			c0,2.37891,1.76367,4.30078,3.93164,4.30078c2.17383,0,3.94336-1.92188,3.94336-4.30078V55.58887h-0.01172

-			c0-0.65039,0.52734-1.17188,1.17773-1.17188c0.64453,0,1.16602,0.52148,1.16602,1.17188h0.01172h-0.04688H19.0498v31.44141

-			c0,2.37891,1.76953,4.30078,3.94336,4.30078c2.16797,0,3.93164-1.92188,3.93164-4.30078V51.51074V32.88965h0.00586

-			c0-0.87891,0.71484-1.59375,1.59961-1.59375s1.59375,0.71484,1.59375,1.59375V50.6084c0,1.48828,1.20703,2.69531,2.68945,2.69531

-			c1.49414,0,2.70117-1.20703,2.70117-2.69531V27.34082c0-4.75781-3.85547-8.61914-8.61914-8.61914H8.91895z"/>

-	</g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/shapes.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/shapes.svg
deleted file mode 100644
index ca5468c..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/shapes.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" standalone="no"?>

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"

-	"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">

-

-<svg width="600" height="600" style="fill:none">

-

-  <defs>

-    <marker id="Triangle"

-		viewBox="0 0 10 10" refX="5" refY="5"

-		markerWidth="4" markerHeight="4"

-		orient="auto">

-	<path id = "mypath" d="M 0 0 L 10 5 L 0 10 z" style="fill:black; stroke:red; stroke-width:2; 

-                 stroke-dasharray:none; marker:url(#Circle);"/>

-    </marker>

-

-    <marker id="Circle"

-            viewBox="0 0 10 10" refX="5" refY="5"

-            markerWidth="5" markerHeight="5"

-            orient="auto">

-      <circle cx="5" cy="5" r="5" style="fill:none; stroke-width:2; stroke:blue; stroke-dasharray:none"/>

-    </marker>

-

-    <marker id="Square" viewBox="0 0 20 20" refX="10" refY="10"

-            markerWidth="3" markerHeight="3"

-            orient="auto">

-      <rect x ="0" y="0" width="20" height="20" style="fill:teal; stroke:none"/>

-    </marker>

-      

-    <linearGradient id="mygradient">

-	<stop offset="0" stop-color="red"/>

-	<stop offset="0.8" stop-color="blue"/>

-    </linearGradient>

-

-  </defs>

-

-  <title> Simple shapes </title>

-  

-  <rect x = "120" y="120" width="100" height="150" style="fill:blue; stroke:black; stroke-width:4; stroke-linejoin:round" />

-

-  <circle cx="300" cy="400" r="50" style="fill : url(#mygradient); stroke:navy; stroke-width:2; stroke-dasharray: 5 2 10; stroke-dashoffset:15"/>

-

-  <ellipse cx="450" cy="200" rx="50" ry="100" style="fill:#bc1203; stroke:none"/>

-

-  <polyline points="100 100 150 100 150 150 200 150 200 200 250 200 250 250 300 250 300 300 350 300 350 350 

-                    400 350 400 400 450 400 450 450 500 450 500 500" 

-            style="stroke:lime; stroke-width: 3; stroke-linejoin: round; stroke-linecap:round; stroke-opacity:0.5;

-                   marker-start:url(#Circle);marker-mid:url(#Square);marker-end:url(#Triangle)" />

-

-  <polygon points="50 100 100 50 500 50 550 100 550 500 500 550 100 550 50 500" 

-            style="stroke:aqua; stroke-width: 15; stroke-linejoin:round" />

-

-  <line x1="100" x2="500" y1="500" y2="100" 

-            style="stroke:rgb(255,255,0); stroke-width:8; stroke-dasharray: 5 5 10 5 15 5 10 5;

-                     marker-start:url(#Circle);marker-end:url(#Triangle)"   />

-

-</svg>
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/uml.svg b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/uml.svg
deleted file mode 100644
index 3dae986..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/resources/svg/uml.svg
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" stroke-dasharray="none" shape-rendering="auto" font-family="'sansserif'" width="362" text-rendering="auto" fill-opacity="1" contentScriptType="text/ecmascript" color-rendering="auto" color-interpolation="auto" preserveAspectRatio="xMidYMid meet" font-size="12" viewBox="0 0 362 295" fill="black" stroke="black" image-rendering="auto" stroke-miterlimit="10" zoomAndPan="magnify" version="1.0" stroke-linecap="square" stroke-linejoin="miter" contentStyleType="text/css" font-style="normal" height="295" stroke-width="1" stroke-dashoffset="0" font-weight="normal" stroke-opacity="1">

-<!--Generated by the Batik Graphics2D SVG Generator-->

-<defs id="genericDefs"/>

-<g>

-<defs id="defs1">

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath1">

-<path d="M90 9 L206 9 L206 101 L90 101 L90 9 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath2">

-<path d="M-1 -1 L58 -1 L58 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3">

-<path d="M116 12 L175 12 L175 31 L116 31 L116 12 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath4">

-<path d="M-1 -1 L78 -1 L78 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath5">

-<path d="M95 31 L174 31 L174 50 L95 50 L95 31 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath6">

-<path d="M95 47 L174 47 L174 66 L95 66 L95 47 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath7">

-<path d="M90 31 L201 31 L201 66 L90 66 L90 31 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath8">

-<path d="M-1 -1 L100 -1 L100 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath9">

-<path d="M95 63 L196 63 L196 82 L95 82 L95 63 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath10">

-<path d="M95 79 L196 79 L196 98 L95 98 L95 79 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath11">

-<path d="M90 63 L201 63 L201 98 L90 98 L90 63 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath12">

-<path d="M-1 -88 L115 -88 L115 4 L-1 4 L-1 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath13">

-<path d="M-5 -88 L111 -88 L111 4 L-5 4 L-5 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath14">

-<path d="M-110 -88 L6 -88 L6 4 L-110 4 L-110 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath15">

-<path d="M-110 -3 L6 -3 L6 89 L-110 89 L-110 -3 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">

-<path d="M-110 -1 L6 -1 L6 91 L-110 91 L-110 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath17">

-<path d="M236 194 L353 194 L353 286 L236 286 L236 194 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18">

-<path d="M-1 -1 L59 -1 L59 18 L-1 18 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath19">

-<path d="M262 197 L322 197 L322 216 L262 216 L262 197 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath20">

-<path d="M242 216 L321 216 L321 235 L242 235 L242 216 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath21">

-<path d="M242 232 L321 232 L321 251 L242 251 L242 232 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath22">

-<path d="M236 216 L348 216 L348 251 L236 251 L236 216 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath23">

-<path d="M242 248 L343 248 L343 267 L242 267 L242 248 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">

-<path d="M242 264 L343 264 L343 283 L242 283 L242 264 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath25">

-<path d="M236 248 L348 248 L348 283 L236 283 L236 248 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath26">

-<path d="M-1 -88 L116 -88 L116 4 L-1 4 L-1 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath27">

-<path d="M-5 -88 L112 -88 L112 4 L-5 4 L-5 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath28">

-<path d="M-111 -88 L6 -88 L6 4 L-111 4 L-111 -88 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath29">

-<path d="M-111 -3 L6 -3 L6 89 L-111 89 L-111 -3 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath30">

-<path d="M-111 -1 L6 -1 L6 91 L-111 91 L-111 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath31">

-<path d="M9 215 L93 215 L93 265 L9 265 L9 215 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath32">

-<path d="M19 218 L78 218 L78 237 L19 237 L19 218 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath33">

-<path d="M9 237 L89 237 L89 251 L9 251 L9 237 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath34">

-<path d="M9 248 L89 248 L89 262 L9 262 L9 248 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath35">

-<path d="M-1 -46 L83 -46 L83 4 L-1 4 L-1 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath36">

-<path d="M-5 -46 L79 -46 L79 4 L-5 4 L-5 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath37">

-<path d="M-78 -46 L6 -46 L6 4 L-78 4 L-78 -46 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath38">

-<path d="M-78 -3 L6 -3 L6 47 L-78 47 L-78 -3 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath39">

-<path d="M-78 -1 L6 -1 L6 49 L-78 49 L-78 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath40">

-<path d="M-1 -1 L363 -1 L363 296 L-1 296 L-1 -1 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath41">

-<path d="M200 81 L214 81 L214 93 L200 93 L200 81 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath42">

-<path d="M209 215 L219 215 L219 232 L209 232 L209 215 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath43">

-<path d="M193 245 L235 245 L235 262 L193 262 L193 245 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath44">

-<path d="M105 215 L115 215 L115 232 L105 232 L105 215 Z"/>

-</clipPath>

-<clipPath clipPathUnits="userSpaceOnUse" id="clipPath45">

-<path d="M89 245 L131 245 L131 262 L89 262 L89 245 Z"/>

-</clipPath>

-</defs>

-<g fill="white" stroke-miterlimit="0" font-family="'Tahoma'" stroke-linejoin="round" stroke="white">

-<rect x="91" y="10" clip-path="url(#clipPath1)" width="109" height="87" stroke="none"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(1,0,0,1,117,13)" width="16" xlink:show="replace" xlink:type="simple" clip-path="url(#clipPath2)" preserveAspectRatio="none" font-weight="bold" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABzElEQVR42sVTPUjD&#13;&#10;UBD+1Ai2WEhAoRk7KKSi0A6CEQWfoJDBoYqLm6OOummhRd100+JiQdHBod10sw6i&#13;&#10;AQUzaYYOFRzilkxtBqG+e9rQUp0UvFKOd/fd33cX4JfS8Z3x6um2XrAucWmVApuR&#13;&#10;YJhPGJgeGu/4MUG1Wq2vF3dwbd8hEdOgyirknh54vg/Hc2BVbExpOnZTGwiHwyK2&#13;&#10;qzmBqyFjVizMDI+iX1YgScA7/5FWeiOI9au4KVuw38p4KN5kWxJQ27nrY0wMjKBb&#13;&#10;6sXcCMPiaAqzg9Ngg5OIRvpgvZa5jvAO73F+eJY5yeWznY0ENHOUt+z5NaSSDHpM&#13;&#10;F/aL5xLcmou4GseyviT8hCM8idRIQITFopTAC4L3Lg5gvlgomjKYxuD4b8IP+AHB&#13;&#10;UjMHRJamasHb8Tw4Lv/Dg+Xkv12j1PqsgUhsiCrLn1qRsZ/ahsvbXy+keSG3PQHt&#13;&#10;mYJpbSU+N4szrLFVGElDrFMNKXxNlS90iON15GAiIJGOxOcVQiEZR2ZBkMdxSHLy&#13;&#10;KPix8ojN4q7wE47wbYe0crpRpyMa0zRRpV34iLYtut1bSIvYzmY3XRhdGoGoisLH&#13;&#10;IR5I05vs5N8y1v7uW/h/+QAOt8JZGPNVkgAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="135" y="25" clip-path="url(#clipPath3)" fill="black" stroke="none" font-weight="bold" xml:space="preserve">Class4</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,96,32)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath4)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAMUlEQVR42mNgGAUU&#13;&#10;A0ZcEmclNP+jixm/uM5ItMnoBmAzEASYKPUCxQawkOKNUTBYAQD1DQoxBCxI6gAA&#13;&#10;AABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="115" y="44" clip-path="url(#clipPath5)" fill="black" stroke="none" xml:space="preserve">Attribute1</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,96,48)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath4)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAMUlEQVR42mNgGAUU&#13;&#10;A0ZcEmclNP+jixm/uM5ItMnoBmAzEASYKPUCxQawkOKNUTBYAQD1DQoxBCxI6gAA&#13;&#10;AABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="115" y="60" clip-path="url(#clipPath6)" fill="black" stroke="none" xml:space="preserve">Attribute2</text>

-<line clip-path="url(#clipPath7)" fill="none" x1="91" x2="199" y1="32" y2="32" stroke="gray"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,96,64)" width="16" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath8)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8ElEQVR42mNgGPKA&#13;&#10;EZfE0WdX/889t43h/ocXDIoCEgzJRl4M1lLaGOqZsWluPrrkf+v+eQxukpIMbrKy&#13;&#10;DCx/fzA0Hl7FkF9d3rB/3rpGZLVMWG0+to4hW1OTgZPhB8OLD8/BNIgPEgfJI6tn&#13;&#10;QTcA5GwnSQmG+98/YLgMJA6Sx2sA2M9AG99/+IE1bEDyeL0ACjCQVg4ODgz8AyqP&#13;&#10;1wBQaB97/oFBkkMSA4PEQfIEoxEUC3OPbWMI1lRkkOAUYHgBDI+11+8zJFt5MdRa&#13;&#10;xzASjEZQVG1duKLh2PPHDKffvAA6X4ShxT2ZIUbbhZFhFGAAAMX4X0KnPLHEAAAA&#13;&#10;AElFTkSuQmCC" xlink:actuate="onRequest"/>

-<text x="115" y="76" clip-path="url(#clipPath9)" fill="black" stroke="none" xml:space="preserve">Operation1 ( )</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,96,80)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath8)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8ElEQVR42mNgGPKA&#13;&#10;EZfE0WdX/889t43h/ocXDIoCEgzJRl4M1lLaGOqZsWluPrrkf+v+eQxukpIMbrKy&#13;&#10;DCx/fzA0Hl7FkF9d3rB/3rpGZLVMWG0+to4hW1OTgZPhB8OLD8/BNIgPEgfJI6tn&#13;&#10;QTcA5GwnSQmG+98/YLgMJA6Sx2sA2M9AG99/+IE1bEDyeL0ACjCQVg4ODgz8AyqP&#13;&#10;1wBQaB97/oFBkkMSA4PEQfIEoxEUC3OPbWMI1lRkkOAUYHgBDI+11+8zJFt5MdRa&#13;&#10;xzASjEZQVG1duKLh2PPHDKffvAA6X4ShxT2ZIUbbhZFhFGAAAMX4X0KnPLHEAAAA&#13;&#10;AElFTkSuQmCC" xlink:actuate="onRequest"/>

-<text x="115" y="92" clip-path="url(#clipPath10)" fill="black" stroke="none" xml:space="preserve">Operation2 ( )</text>

-<line clip-path="url(#clipPath11)" fill="none" x1="91" x2="199" y1="64" y2="64" stroke="gray"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,91,97)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath12)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AIJCIGYDMVgYIKAfiG1BDABD3gLSI8+4zwAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,95,97)" width="108" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath13)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGwAAAACCAYAAAC9mDnnAAAAHUlEQVR42mNsbm4u&#13;&#10;ZxgFQwF0gggWID42GhZDBwAAA1UDVXJj9o8AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,200,97)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath14)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAGklEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgQnKgQMAbmQEU1h89OMAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,200,12)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath15)" preserveAspectRatio="none" height="85" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAABVCAYAAABuI0UsAAAAJklEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgYkBDYwKjAqMCowKjAoMmAAAxrQEM0pHlagAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,200,10)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath16)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AAI2IP4FYjABcTkQMzJAAQBNsgMF2tmFgAAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<rect x="91" y="10" clip-path="url(#clipPath1)" fill="none" width="109" height="87" stroke="gray"/>

-<rect x="237" y="195" clip-path="url(#clipPath17)" width="110" height="87" stroke="none"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(1,0,0,1,263,198)" width="16" xlink:show="replace" xlink:type="simple" clip-path="url(#clipPath18)" preserveAspectRatio="none" font-weight="bold" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABzElEQVR42sVTPUjD&#13;&#10;UBD+1Ai2WEhAoRk7KKSi0A6CEQWfoJDBoYqLm6OOummhRd100+JiQdHBod10sw6i&#13;&#10;AQUzaYYOFRzilkxtBqG+e9rQUp0UvFKOd/fd33cX4JfS8Z3x6um2XrAucWmVApuR&#13;&#10;YJhPGJgeGu/4MUG1Wq2vF3dwbd8hEdOgyirknh54vg/Hc2BVbExpOnZTGwiHwyK2&#13;&#10;qzmBqyFjVizMDI+iX1YgScA7/5FWeiOI9au4KVuw38p4KN5kWxJQ27nrY0wMjKBb&#13;&#10;6sXcCMPiaAqzg9Ngg5OIRvpgvZa5jvAO73F+eJY5yeWznY0ENHOUt+z5NaSSDHpM&#13;&#10;F/aL5xLcmou4GseyviT8hCM8idRIQITFopTAC4L3Lg5gvlgomjKYxuD4b8IP+AHB&#13;&#10;UjMHRJamasHb8Tw4Lv/Dg+Xkv12j1PqsgUhsiCrLn1qRsZ/ahsvbXy+keSG3PQHt&#13;&#10;mYJpbSU+N4szrLFVGElDrFMNKXxNlS90iON15GAiIJGOxOcVQiEZR2ZBkMdxSHLy&#13;&#10;KPix8ojN4q7wE47wbYe0crpRpyMa0zRRpV34iLYtut1bSIvYzmY3XRhdGoGoisLH&#13;&#10;IR5I05vs5N8y1v7uW/h/+QAOt8JZGPNVkgAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="282" y="210" clip-path="url(#clipPath19)" fill="black" stroke="none" font-weight="bold" xml:space="preserve">Class5</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,243,217)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath4)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAMUlEQVR42mNgGAUU&#13;&#10;A0ZcEmclNP+jixm/uM5ItMnoBmAzEASYKPUCxQawkOKNUTBYAQD1DQoxBCxI6gAA&#13;&#10;AABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="262" y="229" clip-path="url(#clipPath20)" fill="black" stroke="none" xml:space="preserve">Attribute1</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,243,233)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath4)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAMUlEQVR42mNgGAUU&#13;&#10;A0ZcEmclNP+jixm/uM5ItMnoBmAzEASYKPUCxQawkOKNUTBYAQD1DQoxBCxI6gAA&#13;&#10;AABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="262" y="245" clip-path="url(#clipPath21)" fill="black" stroke="none" xml:space="preserve">Attribute2</text>

-<line clip-path="url(#clipPath22)" fill="none" x1="237" x2="346" y1="217" y2="217" stroke="gray"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,243,249)" width="16" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath8)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8ElEQVR42mNgGPKA&#13;&#10;EZfE0WdX/889t43h/ocXDIoCEgzJRl4M1lLaGOqZsWluPrrkf+v+eQxukpIMbrKy&#13;&#10;DCx/fzA0Hl7FkF9d3rB/3rpGZLVMWG0+to4hW1OTgZPhB8OLD8/BNIgPEgfJI6tn&#13;&#10;QTcA5GwnSQmG+98/YLgMJA6Sx2sA2M9AG99/+IE1bEDyeL0ACjCQVg4ODgz8AyqP&#13;&#10;1wBQaB97/oFBkkMSA4PEQfIEoxEUC3OPbWMI1lRkkOAUYHgBDI+11+8zJFt5MdRa&#13;&#10;xzASjEZQVG1duKLh2PPHDKffvAA6X4ShxT2ZIUbbhZFhFGAAAMX4X0KnPLHEAAAA&#13;&#10;AElFTkSuQmCC" xlink:actuate="onRequest"/>

-<text x="262" y="261" clip-path="url(#clipPath23)" fill="black" stroke="none" xml:space="preserve">Operation1 ( )</text>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="black" transform="matrix(1,0,0,1,243,265)" width="16" xlink:show="replace" xlink:type="simple" fill="black" clip-path="url(#clipPath8)" preserveAspectRatio="none" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA8ElEQVR42mNgGPKA&#13;&#10;EZfE0WdX/889t43h/ocXDIoCEgzJRl4M1lLaGOqZsWluPrrkf+v+eQxukpIMbrKy&#13;&#10;DCx/fzA0Hl7FkF9d3rB/3rpGZLVMWG0+to4hW1OTgZPhB8OLD8/BNIgPEgfJI6tn&#13;&#10;QTcA5GwnSQmG+98/YLgMJA6Sx2sA2M9AG99/+IE1bEDyeL0ACjCQVg4ODgz8AyqP&#13;&#10;1wBQaB97/oFBkkMSA4PEQfIEoxEUC3OPbWMI1lRkkOAUYHgBDI+11+8zJFt5MdRa&#13;&#10;xzASjEZQVG1duKLh2PPHDKffvAA6X4ShxT2ZIUbbhZFhFGAAAMX4X0KnPLHEAAAA&#13;&#10;AElFTkSuQmCC" xlink:actuate="onRequest"/>

-<text x="262" y="277" clip-path="url(#clipPath24)" fill="black" stroke="none" xml:space="preserve">Operation2 ( )</text>

-<line clip-path="url(#clipPath25)" fill="none" x1="237" x2="346" y1="249" y2="249" stroke="gray"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,237,282)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath26)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AIJCIGYDMVgYIKAfiG1BDABD3gLSI8+4zwAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,241,282)" width="108" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath27)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGwAAAACCAYAAAC9mDnnAAAAHUlEQVR42mNsbm4u&#13;&#10;ZxgFQwF0gggWID42GhZDBwAAA1UDVXJj9o8AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,347,282)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath28)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAGklEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgQnKgQMAbmQEU1h89OMAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,347,197)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath29)" preserveAspectRatio="none" height="85" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAABVCAYAAABuI0UsAAAAJklEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgYkBDYwKjAqMCowKjAoMmAAAxrQEM0pHlagAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,347,195)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath30)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AAI2IP4FYjABcTkQMzJAAQBNsgMF2tmFgAAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<rect x="237" y="195" clip-path="url(#clipPath17)" fill="none" width="110" height="87" stroke="gray"/>

-<rect x="10" y="216" clip-path="url(#clipPath31)" width="77" height="45" stroke="none"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(1,0,0,1,20,219)" width="16" xlink:show="replace" xlink:type="simple" clip-path="url(#clipPath2)" preserveAspectRatio="none" font-weight="bold" height="16" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABzElEQVR42sVTPUjD&#13;&#10;UBD+1Ai2WEhAoRk7KKSi0A6CEQWfoJDBoYqLm6OOummhRd100+JiQdHBod10sw6i&#13;&#10;AQUzaYYOFRzilkxtBqG+e9rQUp0UvFKOd/fd33cX4JfS8Z3x6um2XrAucWmVApuR&#13;&#10;YJhPGJgeGu/4MUG1Wq2vF3dwbd8hEdOgyirknh54vg/Hc2BVbExpOnZTGwiHwyK2&#13;&#10;qzmBqyFjVizMDI+iX1YgScA7/5FWeiOI9au4KVuw38p4KN5kWxJQ27nrY0wMjKBb&#13;&#10;6sXcCMPiaAqzg9Ngg5OIRvpgvZa5jvAO73F+eJY5yeWznY0ENHOUt+z5NaSSDHpM&#13;&#10;F/aL5xLcmou4GseyviT8hCM8idRIQITFopTAC4L3Lg5gvlgomjKYxuD4b8IP+AHB&#13;&#10;UjMHRJamasHb8Tw4Lv/Dg+Xkv12j1PqsgUhsiCrLn1qRsZ/ahsvbXy+keSG3PQHt&#13;&#10;mYJpbSU+N4szrLFVGElDrFMNKXxNlS90iON15GAiIJGOxOcVQiEZR2ZBkMdxSHLy&#13;&#10;KPix8ojN4q7wE47wbYe0crpRpyMa0zRRpV34iLYtut1bSIvYzmY3XRhdGoGoisLH&#13;&#10;IR5I05vs5N8y1v7uW/h/+QAOt8JZGPNVkgAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<text x="39" y="231" clip-path="url(#clipPath32)" fill="black" stroke="none" font-weight="bold" xml:space="preserve">Class6</text>

-<line clip-path="url(#clipPath33)" fill="none" x1="10" x2="86" y1="238" y2="238" stroke="gray"/>

-<line clip-path="url(#clipPath34)" fill="none" x1="10" x2="86" y1="249" y2="249" stroke="gray"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,10,261)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath35)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AIJCIGYDMVgYIKAfiG1BDABD3gLSI8+4zwAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,14,261)" width="76" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath36)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAAACCAYAAADyxTo3AAAAHElEQVR42mNsbm4u&#13;&#10;ZxgFxIBOEMECxMdGw4J4AABXqANVoDt/WAAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,87,261)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath37)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAGklEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgQnKgQMAbmQEU1h89OMAAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,87,218)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath38)" preserveAspectRatio="none" height="43" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAArCAYAAABfCymdAAAAIElEQVR42mNsbm4u&#13;&#10;Z2BgOAbEh4GYgYkBDYwKjAoMSQEAgisD3+QRfl8AAAAASUVORK5CYII=" xlink:actuate="onRequest"/>

-<image xmlns:xlink="http://www.w3.org/1999/xlink" stroke="gray" transform="matrix(1,0,0,1,87,216)" width="4" xlink:show="replace" xlink:type="simple" fill="gray" clip-path="url(#clipPath39)" preserveAspectRatio="none" height="2" x="0" y="0" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAAHElEQVR42mNsbm5m&#13;&#10;AAI2IP4FYjABcTkQMzJAAQBNsgMF2tmFgAAAAABJRU5ErkJggg==" xlink:actuate="onRequest"/>

-<rect x="10" y="216" clip-path="url(#clipPath31)" fill="none" width="78" height="45" stroke="gray"/>

-<line clip-path="url(#clipPath40)" fill="none" x1="289" x2="289" y1="195" y2="130" stroke="gray"/>

-<line clip-path="url(#clipPath40)" fill="none" x1="289" x2="201" y1="130" y2="82" stroke="gray"/>

-<polygon clip-path="url(#clipPath41)" points=" 201 82 212 82 207 91" stroke="none"/>

-<polygon fill="none" clip-path="url(#clipPath41)" points=" 201 82 212 82 207 91" stroke="gray"/>

-<line clip-path="url(#clipPath40)" fill="none" x1="236" x2="88" y1="238" y2="238" stroke="gray"/>

-<text x="210" y="228" clip-path="url(#clipPath42)" fill="black" stroke="none" xml:space="preserve">1</text>

-<text x="194" y="258" clip-path="url(#clipPath43)" fill="black" stroke="none" xml:space="preserve">- class5</text>

-<text x="106" y="228" clip-path="url(#clipPath44)" fill="black" stroke="none" xml:space="preserve">1</text>

-<text x="90" y="258" clip-path="url(#clipPath45)" fill="black" stroke="none" xml:space="preserve">- class6</text>

-</g>

-</g>

-</svg>

diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/svg/metafile/Metafile2SvgTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/svg/metafile/Metafile2SvgTest.java
deleted file mode 100644
index 4f2c670..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/internal/svg/metafile/Metafile2SvgTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.svg.metafile;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.AbstractTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.EMFTranscoder;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.metafile.WMFTranscoder;
-import org.osgi.framework.Bundle;
-
-/**
- * @author dhabib
- */
-public class Metafile2SvgTest
-    extends TestCase {
-
-    /**
-     * Indicates whether or not we are re-generating the SVG files from the EMF
-     * files Check out .svg files to be updated so they are writable, flip this
-     * bit to 'true' and run the test to regenerate the svg files. If a .svg
-     * file is not writable, it is skipped.
-     */
-    private static final boolean GENERATE_SVG_FILES = false;
-
-    private Bundle bundle;
-
-    public Metafile2SvgTest(String name) {
-        super(name);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-    public static Test suite() {
-        return new TestSuite(Metafile2SvgTest.class);
-    }
-
-    protected void setUp()
-        throws Exception {
-        super.setUp();
-
-        // Initialize the path the the resources.
-        bundle = Platform
-            .getBundle("org.eclipse.gmf.tests.runtime.draw2d.ui.render");//$NON-NLS-1$
-    }
-
-    protected void tearDown()
-        throws Exception {
-        super.tearDown();
-    }
-
-    public void testEmf2Svg()
-        throws Exception {
-        // Enumerate all the *.emf files in the source directory.
-        String rootDir = "resources/metafiles/"; //$NON-NLS-1$
-        Enumeration enumFiles = bundle.getEntryPaths(rootDir);
-
-        Vector failures = new Vector();
-
-        while (enumFiles.hasMoreElements()) {
-            String metafileName = (String) enumFiles.nextElement();
-            IPath filePath = new Path(metafileName);
-            if (filePath != null && metafileName.endsWith("emf") || //$NON-NLS-1$
-                metafileName.endsWith("wmf")) { //$NON-NLS-1$
-                // Get the svg file to write/compare with.
-                String svgFilename = metafileName.substring(0, metafileName
-                    .length() - 3)
-                    + "svg"; //$NON-NLS-1$
-                URL url = FileLocator.find(bundle, filePath, null);
-                InputStream metafileInputStream = url.openStream();
-
-                try {
-                    if (GENERATE_SVG_FILES) {
-                        URL pluginURL = bundle.getEntry("/"); //$NON-NLS-1$ 
-                        String pluginPath = FileLocator.resolve( pluginURL ).getPath().substring(1);
-                        File svgFile = new File(pluginPath + svgFilename);
-
-                        if (svgFile.exists()) {
-                            if (!svgFile.canWrite()) {
-                                // File is read only, skip it (probably not
-                                // checked out)
-                                continue;
-                            }
-                            svgFile.delete();
-                        }
-
-                        svgFile.createNewFile();
-
-                        FileOutputStream svgOutputStream = new FileOutputStream(
-                            svgFile);
-
-                        // Translate the metafile to SVG.
-                        AbstractTranscoder tc;
-
-                        if (metafileName.endsWith(".emf")) //$NON-NLS-1$
-                        {
-                            tc = new EMFTranscoder();
-                        } else {
-                            tc = new WMFTranscoder();
-                        }
-
-                        tc.transcode(metafileInputStream, svgOutputStream, svgFile.getAbsolutePath());
-
-                        // Close the output stream.
-                        svgOutputStream.flush();
-                        svgOutputStream.close();
-                    } else {
-                        // Create an outputstream to hold the generated svg
-                        // data.
-                        ByteArrayOutputStream svgOutputStream = new ByteArrayOutputStream(
-                            10000);
-
-                        // Translate the metafile to SVG.
-                        AbstractTranscoder tc;
-
-                        if (metafileName.endsWith(".emf")) //$NON-NLS-1$
-                        {
-                            tc = new EMFTranscoder();
-                        } else {
-                            tc = new WMFTranscoder();
-                        }
-
-                        URL svgUrl = FileLocator.find(bundle, new Path(
-                                svgFilename), null);
-                        tc.transcode(metafileInputStream, svgOutputStream, svgUrl.toString());
-
-                        // Compare the generated SVG data to the file
-
-                        // read the svg file on the disk.
-                        InputStream svgInputStream = svgUrl.openStream();
-                        byte[] fileBytes = new byte[svgInputStream.available()];
-
-                        svgInputStream.read(fileBytes);
-                        svgInputStream.close();
-
-                        // Read the output stream.
-                        svgOutputStream.flush();
-                        svgOutputStream.close();
-                        byte[] generatedBytes = svgOutputStream.toByteArray();
-
-                        if (fileBytes.length != generatedBytes.length) {
-                            String errorMessage = "Data sizes are not equal: " + svgFilename + //$NON-NLS-1$
-                                " Expected: " + fileBytes.length + //$NON-NLS-1$
-                                " Received: " + generatedBytes.length + "\n"; //$NON-NLS-2$//$NON-NLS-1$
-                            failures.add(errorMessage);
-                            // Write the generated data out.
-                            writeErrorFile(svgFilename, generatedBytes);
-                            continue;
-                        }
-
-                        for (int i = 0; i < fileBytes.length; i++) {
-                            if (fileBytes[i] != generatedBytes[i]) {
-                                String errorMessage = "Data is different in file \'" + svgFilename + "\' at byte " + i + "\n"; //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-                                failures.add(errorMessage);
-                                // Write the generated data out.
-                                writeErrorFile(svgFilename, generatedBytes);
-                                break;
-                            }
-                        }
-                    }
-
-                    metafileInputStream.close();
-                } catch (Exception e) {
-                    String errorMessage = "Caught exception while processing file " + metafileName + //$NON-NLS-1$
-                        "\n" + e.toString(); //$NON-NLS-1$
-
-                    failures.add(errorMessage);
-                }
-            }
-        }
-
-        if (failures.size() > 0) {
-            String failureString = ""; //$NON-NLS-1$
-            for (int index = 0; index < failures.size(); index++) {
-                failureString = failureString + (String) failures.get(index);
-            }
-            Assert.assertEquals(
-                "Found failures:\n" + failureString, 0, failures.size()); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Writes out a svg error file based on the specified filename. Filename is
-     * appended with _failed.svg and the specified data is written to it.
-     * 
-     * @param svgFilename
-     * @param data
-     * @throws IOException
-     */
-    private void writeErrorFile(String svgFilename, byte[] data)
-        throws IOException {
-        String filename = svgFilename.substring(0, svgFilename.length() - 4)
-            + "_failed.svg"; //$NON-NLS-1$
-
-        File errorFile = new File(filename);
-
-        if (errorFile.exists()) {
-            if (!errorFile.canWrite()) {
-                return;
-            }
-            errorFile.delete();
-        }
-
-        errorFile.createNewFile();
-
-        FileOutputStream svgOutputStream = new FileOutputStream(errorFile);
-        svgOutputStream.write(data);
-        svgOutputStream.flush();
-        svgOutputStream.close();
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/Activator.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/Activator.java
deleted file mode 100644
index 9f3132a..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/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.render;
-
-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.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/AllTests.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/AllTests.java
deleted file mode 100644
index f5628e7..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/AllTests.java
+++ /dev/null
@@ -1,49 +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.render; 
-
-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.render.internal.svg.SVGTranscoderTest;
-
-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( RenderMultipleSVGTest.class );
-        //suite.addTestSuite( SVGImageTest.class );
-		//suite.addTestSuite( Metafile2SvgTest.class );
-		suite.addTestSuite( SVGTranscoderTest.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.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/RenderMultipleSVGTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/RenderMultipleSVGTest.java
deleted file mode 100644
index 0b4e592..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/RenderMultipleSVGTest.java
+++ /dev/null
@@ -1,175 +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.render.internal.svg;
-
-import java.awt.image.BufferedImage;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-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.factory.RenderedImageFactory;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Bundle;
-
-
-
-/**
- * @author sshaw
- */
-public class RenderMultipleSVGTest extends TestCase
-{
-	private Bundle bundle;
-	
-	public RenderMultipleSVGTest( String name )
-	{
-		super( name );
-	}
-
-	public static void main( String[] args ) 
-	{
-		TestRunner.run( suite() );
-	}
-
-	public static Test suite() 
-	{
-		return new TestSuite( RenderMultipleSVGTest.class );
-	}
-
-	protected void setUp() throws Exception 
-	{
-		super.setUp();
-		
-		// Initialize the path the the resources.
-        bundle = Platform.getBundle("org.eclipse.gmf.tests.runtime.draw2d.ui.render" );//$NON-NLS-1$
-	}
-	
-	protected void tearDown() throws Exception 
-	{
-		super.tearDown();
-	}
-	
-	public void testRenderFromSVG() throws Exception
-	{
-		// Enumerate all the *.emf files in the source directory.
-        String rootDir = "resources/metafiles/"; //$NON-NLS-1$
-		Enumeration enumFiles = bundle.getEntryPaths(rootDir);
-        
-        long startTime = System.currentTimeMillis();
-        Vector failures = new Vector();
-        
-        while (enumFiles.hasMoreElements()) {    
-		    String metafileName = (String)enumFiles.nextElement();
-            IPath filePath = new Path(metafileName);
-			if (filePath != null && (metafileName.endsWith("svg") ||    //$NON-NLS-1$
-                                    metafileName.endsWith("emf")  ||    //$NON-NLS-1$
-                                    metafileName.endsWith("wmf"))) {     //$NON-NLS-1$
-                try
-    			{
-                    URL url = FileLocator.find(bundle, filePath, null);
-                    RenderedImage directSWTRender = RenderedImageFactory.getInstance(url);	
-    					
-    				BufferedImage bufImg = (BufferedImage)directSWTRender.getAdapter(BufferedImage.class);
-    				Image swtImgOriginal = ImageConverter.convert(bufImg);
-                     if (swtImgOriginal == null)
-                         failures.add( metafileName );
-//    				ImageLoader imageLoader = new ImageLoader();
-//    				imageLoader.data = new ImageData[] {swtImgOriginal.getImageData()};
-//    				imageLoader.logicalScreenHeight = swtImgOriginal.getBounds().width;
-//    				imageLoader.logicalScreenHeight = swtImgOriginal.getBounds().height;
-//    					
-//    				String svgOrigFilename = metafileName.substring( 0, metafileName.length() - 4 ) + "ORIG" + ".bmp"; //$NON-NLS-1$ //$NON-NLS-2$
-//    					
-//    				imageLoader.save(svgOrigFilename, SWT.IMAGE_BMP);
-//    				swtImgOriginal.dispose();
-    			}
-    			catch( Exception e )
-    			{
-    				String errorMessage = "Caught exception while processing file " + metafileName +	//$NON-NLS-1$
-    										"\n" + e.toString();	//$NON-NLS-1$
-    					
-    				failures.add( errorMessage );
-    			}
-            }
-		}
-		
-		enumFiles = bundle.getEntryPaths(rootDir);
-     
-		long awtTime = System.currentTimeMillis() - startTime;
-		startTime = System.currentTimeMillis();
-			
-        while (enumFiles.hasMoreElements()) {
-            String metafileName = (String)enumFiles.nextElement();
-            IPath filePath = new Path(metafileName);
-            if (filePath != null && (metafileName.endsWith("svg") ||    //$NON-NLS-1$
-                    metafileName.endsWith("emf")  ||    //$NON-NLS-1$
-                    metafileName.endsWith("wmf"))) {     //$NON-NLS-1$
-    			try
-    			{
-                    URL url = FileLocator.find(bundle, filePath, null);
-                    RenderedImage directSWTRender = RenderedImageFactory.getInstance(url);	
-    				Image swtImgNew = directSWTRender.getSWTImage();
-                    
-                    if (swtImgNew == null)
-                        failures.add( metafileName );
-                    //assertTrue(swtImgNew != null);
-                    
-//    				ImageLoader imageLoader = new ImageLoader();
-//    				imageLoader.data = new ImageData[] {swtImgNew.getImageData()};
-//    				imageLoader.logicalScreenHeight = swtImgNew.getBounds().width;
-//    				imageLoader.logicalScreenHeight = swtImgNew.getBounds().height;
-//    
-//    				String svgNewFilename = metafileName.substring( 0, metafileName.length() - 4 ) + "NEW" + ".bmp"; //$NON-NLS-1$ //$NON-NLS-2$
-//    					
-//    				imageLoader.save(svgNewFilename, SWT.IMAGE_BMP);
-    			}
-    			catch( Exception e )
-    			{
-    				String errorMessage = "Caught exception while processing file " + metafileName +	//$NON-NLS-1$
-    										"\n" + e.toString();	//$NON-NLS-1$
-    					
-    				failures.add( errorMessage );
-    			}
-            }
-		}
-			
-		long swtTime = System.currentTimeMillis() - startTime;
-		System.out.println("AWT rendering time was: " + awtTime); //$NON-NLS-1$
-		System.out.println("SWT rendering time was: " + swtTime); //$NON-NLS-1$
-		System.out
-			.println("Percentage difference: " + (swtTime - awtTime) / (float) awtTime * 100 + "%"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		assertTrue(swtTime < awtTime);
-
-			
-		if( failures.size() > 0 )
-		{	
-			String failureString = "";	//$NON-NLS-1$
-			for( int index = 0; index < failures.size(); index++ )
-			{
-				failureString = failureString + (String) failures.get( index );
-			}
-			Assert.assertEquals( "Found failures:\n" + failureString, 0, failures.size() );	//$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGImageTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGImageTest.java
deleted file mode 100644
index b2ef9cd..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGImageTest.java
+++ /dev/null
@@ -1,574 +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.render.internal.svg;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Dimension;
-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.awt.internal.image.ImageConverter;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.ImageTranscoderEx;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.SVGImage;
-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.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.osgi.framework.Bundle;
-
-/**
- * @author sshaw
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class SVGImageTest
-	extends TestCase {
-
-	/**
-	 * The icons root directory.
-	 */
-	private static final String PREFIX_ROOT = "resources/svg/"; //$NON-NLS-1$
-
-	private static final String SVG_BLACKWHITE = PREFIX_ROOT + "blackwhite.svg"; //$NON-NLS-1$
-	private static final String SVG_SHAPES = PREFIX_ROOT + "shapes.svg";//$NON-NLS-1$
-	private static final String SVG_UMLSHAPES = PREFIX_ROOT + "uml.svg";//$NON-NLS-1$
-    private static final String SVG_TRANSPARENCY_TEST = PREFIX_ROOT + "presenter.svg";//$NON-NLS-1$
-
-	private final int WIDTH = 200;
-
-	private final int HEIGHT = 200;
-
-	private final int NEW_WIDTH = 120;
-
-	private final int NEW_HEIGHT = 140;
-
-	private final RGB NEW_FILL = new RGB(255, 0, 0);
-
-	private final RGB NEW_OUTLINE = new RGB(0, 255, 0);
-
-	private RenderedImage fixture1;
-
-	private RenderedImage fixture2;
-
-	private RenderedImage fixture3;
-    
-    private RenderedImage fixture4;
-
-	public SVGImageTest(String name) {
-		super(name);
-	}
-
-	private RenderedImage getFixture1() {
-		return fixture1;
-	}
-
-	private RenderedImage getFixture2() {
-		return fixture2;
-	}
-
-	private RenderedImage getFixture3() {
-		return fixture3;
-	}
-    
-    private RenderedImage getFixture4() {
-        return fixture4;
-    }
-
-	protected void setUp() {
-		try {
-
-			// Initialize the path the the resources.
-			Bundle bundle = Platform.getBundle("org.eclipse.gmf.tests.runtime.draw2d.ui.render" ); //$NON-NLS-1$
-			
-			URL url = FileLocator.find(bundle, new Path(SVG_UMLSHAPES), null);
-            fixture1 = RenderedImageFactory.getInstance(url); 
-            
-            assertNotNull("Fixture1 shouldn't be null", fixture1); //$NON-NLS-1$
-
-			RenderInfo info = RenderedImageFactory.createInfo(WIDTH, HEIGHT,
-				false, false, (RGB) null, (RGB) null);
-            url = FileLocator.find(bundle, new Path(SVG_SHAPES), null);
-            fixture2 = RenderedImageFactory.getInstance(url, info); 
-			assertNotNull("Fixture2 shouldn't be null", fixture2); //$NON-NLS-1$
-
-            url = FileLocator.find(bundle, new Path(SVG_BLACKWHITE), null);
-			fixture3 = RenderedImageFactory.getInstance(url);	
-			assertNotNull("Fixture3 shouldn't be null", fixture3); //$NON-NLS-1$
-            
-            url = FileLocator.find(bundle, new Path(SVG_TRANSPARENCY_TEST), null);
-            fixture4 = RenderedImageFactory.getInstance(url);   
-            assertNotNull("Fixture3 shouldn't be null", fixture4); //$NON-NLS-1$
-
-		} catch (Exception e) {
-			fail("The SVGImageTest.setUp method caught an exception - " + e); //$NON-NLS-1$
-		}
-	}
-
-	public void testGetRenderInfo() {
-
-		RenderInfo info = getFixture1().getRenderInfo();
-		assertTrue("getRenderInfo fixture 1 return null", info != null); //$NON-NLS-1$
-
-		info = getFixture2().getRenderInfo();
-		assertTrue("getRenderInfo fixture 2 return null", info != null); //$NON-NLS-1$
-		assertTrue("getRenderInfo fixture 2 width / height not correct", //$NON-NLS-1$
-			info.getWidth() == WIDTH && info.getHeight() == HEIGHT);
-	}
-
-	public void testGetNewRenderedImage() {
-
-		RenderInfo info = RenderedImageFactory.createInfo(NEW_WIDTH,
-			NEW_HEIGHT, true, true, NEW_FILL, NEW_OUTLINE);
-		assertTrue(info != null);
-		info = RenderedImageFactory.createInfo(NEW_WIDTH, NEW_HEIGHT, false, false, null,
-			NEW_OUTLINE);
-		assertTrue(info != null);
-	}
-
-	private void performBatikRendering(SVGImage svg1, int width, int height) {
-		InputStream in = new ByteArrayInputStream(svg1.getBuffer());
-		RenderInfo info = svg1.getRenderInfo();
-		ImageTranscoderEx transcoder = new ImageTranscoderEx();
-
-		if (width > 0)
-			transcoder.addTranscodingHint(ImageTranscoderEx.KEY_WIDTH,
-				new Float(width));
-		if (height > 0)
-			transcoder.addTranscodingHint(ImageTranscoderEx.KEY_HEIGHT,
-				new Float(height));
-
-		transcoder.addTranscodingHint(
-			ImageTranscoderEx.KEY_MAINTAIN_ASPECT_RATIO, Boolean.valueOf(info
-				.shouldMaintainAspectRatio()));
-
-		transcoder.addTranscodingHint(ImageTranscoderEx.KEY_ANTI_ALIASING,
-			Boolean.valueOf(info.shouldAntiAlias()));
-
-		if (info.getBackgroundColor() != null) {
-			transcoder
-				.addTranscodingHint(ImageTranscoderEx.KEY_FILL_COLOR, new RGB(
-					info.getBackgroundColor().red,
-					info.getBackgroundColor().green,
-					info.getBackgroundColor().blue));
-		}
-
-		if (info.getForegroundColor() != null) {
-			transcoder
-				.addTranscodingHint(ImageTranscoderEx.KEY_OUTLINE_COLOR,
-					new RGB(info.getForegroundColor().red, info
-						.getForegroundColor().green,
-						info.getForegroundColor().blue));
-		}
-
-		TranscoderInput input = new TranscoderInput(in);
-		TranscoderOutput output = new TranscoderOutput();
-
-		try {
-			transcoder.transcode(input, output);
-		} catch (TranscoderException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		BufferedImage bufImg = transcoder.getBufferedImage();
-		Image swtImage = ImageConverter.convert(bufImg);
-		assertNotNull("swtImage fixture 1 Image invalid", swtImage); //$NON-NLS-1$
-	}
-
-	private void performRenderedImageRendering(SVGImage svg1, int width,
-			int height) {
-		RenderInfo info = svg1.getRenderInfo();
-
-		info.setValues(width, height, true, true, info.getBackgroundColor(), info
-			.getForegroundColor());
-
-		RenderedImage ri = svg1.getNewRenderedImage(info);
-		Image img = ri.getSWTImage();
-		assertNotNull("getSWTImage fixture 1 Image invalid", img); //$NON-NLS-1$
-	}
-
-	final static int START_DIM = 100;
-
-	final static int END_DIM = 1000;
-
-	final static int INC_DIM = 10;
-
-	public void testRenderedImagePerformance() {
-
-		SVGImage svg1 = (SVGImage) getFixture1();
-
-		int width = START_DIM;
-		int height = START_DIM;
-		long batikTime = 0;
-		long renderTime = 0;
-
-		// do one rendering outside to initialize Batik;
-		performBatikRendering(svg1, width, height);
-
-		long startTime = System.currentTimeMillis();
-
-		while (width < END_DIM && height < END_DIM) {
-			performBatikRendering(svg1, width, height);
-			width += INC_DIM;
-			height += INC_DIM;
-		}
-
-		long endTime = System.currentTimeMillis();
-		batikTime = endTime - startTime;
-
-		startTime = System.currentTimeMillis();
-
-		width = START_DIM;
-		height = START_DIM;
-		while (width < END_DIM && height < END_DIM) {
-			performRenderedImageRendering(svg1, width, height);
-			width += INC_DIM;
-			height += INC_DIM;
-		}
-
-		endTime = System.currentTimeMillis();
-		renderTime = endTime - startTime;
-
-		System.out.println("Batik rendering time was: " + batikTime); //$NON-NLS-1$
-		System.out.println("RenderedImage rendering time was: " + renderTime); //$NON-NLS-1$
-		System.out
-			.println("Percentage difference: " + (renderTime - batikTime) / (float) batikTime * 100 + "%"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		assertTrue(renderTime < batikTime);
-	}
-
-	static private class RenderingListenerImpl
-		implements RenderingListener {
-
-		boolean done = false;
-
-		public RenderingListenerImpl() {
-			super();
-		}
-
-		boolean isDone() {
-			return done;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.internal.RenderingListener#paintFigureWhileRendering(org.eclipse.draw2d.Graphics)
-		 */
-		public void paintFigureWhileRendering(Graphics g) {
-			// do nothing
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.gmf.runtime.draw2d.ui.render.RenderingListener#imageRendered(org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage)
-		 */
-		synchronized public void imageRendered(RenderedImage rndImg) {
-			done = true;
-			assertTrue(rndImg.isRendered());
-			assertTrue(rndImg.getSWTImage() != null);
-		}
-	}
-
-	public void testRenderHelper() {
-
-		Display display = Display.getDefault();
-
-		Image image = new Image(display, new Rectangle(0, 0, 500, 500));
-		GC gc = new GC(image);
-		SWTGraphics swtG = new SWTGraphics(gc);
-
-		org.eclipse.draw2d.geometry.Rectangle target = new org.eclipse.draw2d.geometry.Rectangle(
-			50, 50, 94, 94);
-		RenderInfo info = getFixture1().getRenderInfo();
-		info.setValues(target.width, target.height, true, true, info.getBackgroundColor(),
-			info.getForegroundColor());
-
-		RenderedImage ri = getFixture1().getNewRenderedImage(info);
-
-		// first test with delay render turned off
-		RenderHelper renderHelper = RenderHelper.getInstance(1.0, false, false,
-			null);
-		RenderingListenerImpl listener = new RenderingListenerImpl();
-		RenderedImage retImage = renderHelper.drawRenderedImage(swtG, ri,
-			target, listener);
-		assertTrue(retImage.isRendered());
-		assertTrue(retImage.getSWTImage() != null);
-
-		// second test with delay render turned on
-		target.width -= 10;
-		target.height -= 10;
-		listener = new RenderingListenerImpl();
-		renderHelper = RenderHelper.getInstance(1.0, false, true, null);
-
-		retImage = renderHelper.drawRenderedImage(swtG, retImage, target,
-			listener);
-
-		int i = 0;
-		while (!retImage.isRendered() && i < 100) {
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-
-			i++;
-		}
-
-		assertTrue(retImage.isRendered() && i < 100);
-	}
-
-	static final private Dimension MAX_RENDER_SIZE = new Dimension(200, 200);
-
-	public void testRenderMaxSize() {
-		Display display = PlatformUI.getWorkbench().getDisplay();
-
-		Image image = new Image(display, new Rectangle(0, 0, 500, 500));
-		GC gc = new GC(image);
-		SWTGraphics swtG = new SWTGraphics(gc);
-
-		org.eclipse.draw2d.geometry.Rectangle target = new org.eclipse.draw2d.geometry.Rectangle(
-			0, 0, MAX_RENDER_SIZE.width * 2, MAX_RENDER_SIZE.height * 2);
-		RenderInfo info = getFixture1().getRenderInfo();
-		info.setValues(MAX_RENDER_SIZE.width * 2, MAX_RENDER_SIZE.height * 2,
-			false, true, info.getBackgroundColor(), info.getForegroundColor());
-
-		RenderedImage ri = getFixture1().getNewRenderedImage(info);
-
-		// first test with no maximum render size
-		RenderHelper renderHelper = RenderHelper.getInstance(1.0, false, false,
-			null);
-		RenderingListenerImpl listener = new RenderingListenerImpl();
-		RenderedImage retImage = renderHelper.drawRenderedImage(swtG, ri,
-			target, listener);
-		assertTrue(retImage.isRendered());
-		assertTrue(retImage.getSWTImage() != null);
-		assertTrue(Math.abs(retImage.getSWTImage().getBounds().width - (MAX_RENDER_SIZE.width * 2)) <= 5);
-		assertTrue(Math.abs(retImage.getSWTImage().getBounds().height - (MAX_RENDER_SIZE.height * 2)) <=5);
-		
-		// now test with maximum render size
-		renderHelper = RenderHelper.getInstance(1.0, false, false,
-			MAX_RENDER_SIZE);
-		retImage = renderHelper.drawRenderedImage(swtG, ri,
-			target, listener);
-		assertTrue(retImage.isRendered());
-		assertTrue(retImage.getSWTImage() != null);
-		assertTrue(retImage.getSWTImage().getBounds().width <= MAX_RENDER_SIZE.width);
-		assertTrue(retImage.getSWTImage().getBounds().height <= MAX_RENDER_SIZE.height);
-	}
-
-	private boolean findColor(Image srcImage, RGB colorToFind) {
-		BufferedImage bufImg = ImageConverter.convert(srcImage);
-
-		int width = bufImg.getWidth();
-		int height = bufImg.getHeight();
-
-		// loop over the imagedata and set each pixel in the BufferedImage to
-		// the appropriate color.
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				int color = bufImg.getRGB(x, y);
-				Color swtColor = integerToColor(color);
-				RGB checkColor = new RGB(swtColor.getRed(),
-					swtColor.getGreen(), swtColor.getBlue());
-				swtColor.dispose();
-				if (checkColor.equals(colorToFind))
-					return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method integerToColor. converts from an int (from BufferedImage) to a
-	 * Color representation
-	 * 
-	 * Note: Normally, colors should be instantiated using the
-	 * AbstractResourceManager.
-	 * 
-	 * @param i
-	 * @return Color
-	 */
-	private Color integerToColor(int color) {
-		return new Color(null, (color & 0x00FF0000) >> 16,
-			(color & 0x0000FF00) >> 8, (color & 0x000000FF));
-	}
-
-	private static RGB BLACK = new RGB(0, 0, 0);
-
-	private static RGB WHITE = new RGB(255, 255, 255);
-
-	private static RGB RED = new RGB(255, 0, 0);
-
-	private static RGB GREEN = new RGB(0, 255, 0);
-
-	public void testChangeColors() {
-		RenderedImage fixture = getFixture3();
-		RenderInfo info = fixture.getRenderInfo();
-		Image swtImg1 = fixture.getSWTImage();
-		assertTrue(findColor(swtImg1, BLACK));
-		assertTrue(findColor(swtImg1, WHITE));
-		assertFalse(findColor(swtImg1, RED));
-		assertFalse(findColor(swtImg1, GREEN));
-		
-//		ImageLoader imageLoader = new ImageLoader();
-//		imageLoader.data = new ImageData[] {swtImg1.getImageData()};
-//		imageLoader.logicalScreenHeight = swtImg1.getBounds().width;
-//		imageLoader.logicalScreenHeight = swtImg1.getBounds().height;
-//		imageLoader.save("C:\\originalImg.bmp", SWT.IMAGE_BMP);
-		
-		// set color first time - red fill, red outline
-		info.setValues(info.getWidth(), info.getHeight(), true, true, RED, RED);
-		RenderedImage colorImg1 = fixture.getNewRenderedImage(info);
-		Image swtImg2 = colorImg1.getSWTImage();
-		assertNotNull("getSWTImage colorImg1 Image invalid", swtImg1); //$NON-NLS-1$
-		
-//		imageLoader = new ImageLoader();
-//		imageLoader.data = new ImageData[] {swtImg2.getImageData()};
-//		imageLoader.logicalScreenHeight = swtImg2.getBounds().width;
-//		imageLoader.logicalScreenHeight = swtImg2.getBounds().height;
-//		imageLoader.save("C:\\redImg.bmp", SWT.IMAGE_BMP);
-		
-		assertTrue(findColor(swtImg2, RED));
-		assertFalse(findColor(swtImg2, GREEN));
-
-		// set color second time - green fill, green outline
-		info.setValues(info.getWidth(), info.getHeight(), true,
-			true, GREEN, GREEN);
-		RenderedImage colorImg2 = fixture.getNewRenderedImage(info);
-		Image swtImg3 = colorImg2.getSWTImage();
-		assertNotNull("getSWTImage colorImg1 Image invalid", swtImg1); //$NON-NLS-1$
-		assertNotNull("getSWTImage colorImg2 Image invalid", swtImg2); //$NON-NLS-1$
-		
-//		imageLoader = new ImageLoader();
-//		imageLoader.data = new ImageData[] {swtImg3.getImageData()};
-//		imageLoader.logicalScreenHeight = swtImg3.getBounds().width;
-//		imageLoader.logicalScreenHeight = swtImg3.getBounds().height;
-//		imageLoader.save("C:\\greenImg.bmp", SWT.IMAGE_BMP);
-		
-		assertTrue(colorImg1 != colorImg2);
-		assertTrue(findColor(swtImg3, GREEN));
-		assertFalse(findColor(swtImg3, RED));
-	}
-
-	// cropping not supported yet
-
-	// static final int SHRINK_EXT = 50;
-	// static final int CROPTEST_START_SIZE = 400;
-	//
-	// public void testCroppedImage() {
-	// org.eclipse.draw2d.geometry.Rectangle target = new
-	// org.eclipse.draw2d.geometry.Rectangle(0, 0, CROPTEST_START_SIZE,
-	// CROPTEST_START_SIZE);
-	// RenderInfo info = getFixture1().getRenderInfo();
-	// info.setValues(target.width, target.height, info.getBackgroundColor(),
-	// info.getForegroundColor(), false, true);
-	//		
-	// RenderedImage first = getFixture1().getNewRenderedImage(info);
-	// Image firstImage = first.getSWTImage();
-	// Rectangle firstBounds = firstImage.getBounds();
-	// assertTrue(firstBounds.width == CROPTEST_START_SIZE && firstBounds.height
-	// == CROPTEST_START_SIZE);
-	// ImageLoader imageLoader = new ImageLoader();
-	// imageLoader.data = new ImageData[] {firstImage.getImageData()};
-	// imageLoader.logicalScreenHeight = firstImage.getBounds().width;
-	// imageLoader.logicalScreenHeight = firstImage.getBounds().height;
-	// imageLoader.save("C:\\originalImg.bmp", SWT.IMAGE_BMP);
-	//		
-	// RenderedImage cropped = first.getCroppedImage(target.shrink(SHRINK_EXT,
-	// SHRINK_EXT));
-	//		
-	// Image croppedImage = cropped.getSWTImage();
-	// Rectangle croppedBounds = croppedImage.getBounds();
-	// //assertTrue(croppedBounds.width == CROPTEST_START_SIZE - (SHRINK_EXT *
-	// 2)
-	// // && croppedBounds.height == CROPTEST_START_SIZE - (SHRINK_EXT * 2));
-	//		
-	// imageLoader = new ImageLoader();
-	// imageLoader.data = new ImageData[] {croppedImage.getImageData()};
-	// imageLoader.logicalScreenHeight = croppedImage.getBounds().width;
-	// imageLoader.logicalScreenHeight = croppedImage.getBounds().height;
-	// imageLoader.save("C:\\croppedImg.bmp", SWT.IMAGE_BMP);
-	// }
-
-	public void testGetSWTImage() {
-		Image img = getFixture1().getSWTImage();
-		assertNotNull("getSWTImage fixture 1 Image invalid", img); //$NON-NLS-1$
-
-		img = getFixture2().getSWTImage();
-		assertNotNull("getSWTImage fixture 2 Image invalid", img); //$NON-NLS-1$
-	}
-    
-    public void testTransparency() {
-        Image img = getFixture4().getSWTImage();
-        ImageData imgData = img.getImageData();
-        Rectangle bounds = img.getBounds();
-        
-        // check 4 corners
-        assertTrue(isTransparentAt(imgData, bounds.x + 1, bounds.y + 1));
-        assertTrue(isTransparentAt(imgData, bounds.x + bounds.width - 2, bounds.y + 1));
-        assertTrue(isTransparentAt(imgData, bounds.x + 1, bounds.y + bounds.height - 2));
-        assertTrue(isTransparentAt(imgData, bounds.x + bounds.width - 2, bounds.y + bounds.height - 2));
-    }
-    
-    protected boolean isTransparentAt(ImageData data, int x, int y) {
-        // boundary checking
-        if (x < 0 || x >= data.width || y < 0
-            || y >= data.height)
-            return true;
-
-        ImageData transMaskData = data.getTransparencyMask();
-        // check for alpha channel
-        int transValue = 255;
-        // check for transparency mask
-        if (transMaskData != null) {
-            transValue = transMaskData.getPixel(x, y) == 0 ? 0
-                : 255;
-        }
-
-        if (transValue != 0) {
-            if (data.alphaData != null) {
-                transValue = data.getAlpha(x, y);
-            }
-        }
-
-        // use a tolerance
-        boolean trans = false;
-        if (transValue < 10) {
-            trans = true;
-        }
-
-        return trans;
-    }
-}
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGTranscoderTest.java b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGTranscoderTest.java
deleted file mode 100644
index f30a037..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/src/org/eclipse/gmf/tests/runtime/draw2d/ui/render/internal/svg/SVGTranscoderTest.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.draw2d.ui.render.internal.svg;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export.GraphicsSVG;
-
-
-
-/**
- * @author sshaw
- *
- * Test case for the SVG transcoder
- */
-public class SVGTranscoderTest extends TestCase {
-
-	protected void setUp() {
-		try { 
-			// do nothing for now
-		} catch (Exception e) {
-			fail( "The SVGTranscoderTest.setUp method caught an exception - " + e ); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * SVG export should be resiliant to the size of the image since it is
-	 * in vector format.
-	 */
-	public void testSVGGraphicsOverflow() {
-		Rectangle viewBox = new Rectangle(0,0,100000,100000);
-		GraphicsSVG svgG = GraphicsSVG.getInstance(viewBox);
-		assertNotNull(svgG);
-		
-		svgG.drawRectangle(10, 10, 500, 500);
-		svgG.dispose();
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/test.xml b/org.eclipse.gmf.tests.runtime.draw2d.ui.render/test.xml
deleted file mode 100644
index 91109d1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui.render/test.xml
+++ /dev/null
@@ -1,64 +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.render" />
-	<property name="classname" value="org.eclipse.gmf.tests.runtime.draw2d.ui.render.AllTests" />
-	<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 d3c3426..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/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.draw2d.ui

-Bundle-Version: 1.5.0.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.2.0,2.0.0)",

- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 f7b5cf9..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/build.properties
+++ /dev/null
@@ -1,21 +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,\
-               test.xml
-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 2df0adc..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 Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.draw2d.ui/pom.xml b/org.eclipse.gmf.tests.runtime.draw2d.ui/pom.xml
deleted file mode 100644
index 85c54a1..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.draw2d.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.draw2d.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.draw2d.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.draw2d.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 bda64db..0000000
--- a/org.eclipse.gmf.tests.runtime.draw2d.ui/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 304e861..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 394cc74..0000000
--- a/org.eclipse.gmf.tests.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.tests.runtime.emf.clipboard.core

-Bundle-Version: 1.5.0.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.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.emf.clipboard.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",

- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.examples.library;bundle-version="[2.4.0,3.0.0)",

- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 e68676e..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.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                    |
-#*+------------------------------------------------------------------------+
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               test_models/,\
-               plugin.properties,\
-               about.html,\
-               test.xml
-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 578f314..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/pom.xml b/org.eclipse.gmf.tests.runtime.emf.clipboard.core/pom.xml
deleted file mode 100644
index 3e6962b..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.clipboard.core</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.clipboard.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-  <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.clipboard.core</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.clipboard.core.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 44e53b5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/AllTests.java
+++ /dev/null
@@ -1,51 +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.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 16ef5de..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/BaseClipboardTest.java
+++ /dev/null
@@ -1,328 +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.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 bb7ac08..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/src/org/eclipse/gmf/tests/runtime/emf/clipboard/core/RegressionTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.URI;
-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 org.eclipse.gmf.runtime.emf.clipboard.core.ClipboardUtil;
-import org.eclipse.gmf.runtime.emf.clipboard.core.IClipboardSupport;
-
-
-/**
- * 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, (pastedLibrary.getBranches().get(0)).getParentBranch());
-			assertSame(pastedLibrary, (pastedLibrary.getBranches().get(1)).getParentBranch());
-			assertSame(pastedLibrary, (pastedLibrary.getBranches().get(2)).getParentBranch());
-			assertSame(pastedLibrary, (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());
-		}
-	}
-	
-	/**
-	 * Tests that characters like '&amp;' are escaped in the copy resource.
-	 */
-	public void test_escapeURI_218307() {
-		if (writing()) {
-			List objects = new ArrayList();
-	
-			String name = "/" + PROJECT_NAME + "/test&escapes.extlibrary"; //$NON-NLS-1$ //$NON-NLS-2$
-			testResource.setURI(URI.createPlatformResourceURI(name, true));
-			
-			// 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 that the two <code>createClipboardSupport</code> methods will
-	 * return the same clipboard helper. The correct way is to call the method
-	 * that takes an <code>EObject</code>, but it is possible that clients are
-	 * still calling the method that takes an <code>EClass</code>.
-	 */
-	public void test_createClipboardSupportMethods() {
-		if (writing()) {
-			IClipboardSupport clipboardSupport = ClipboardUtil
-					.createClipboardSupport(level12book.eClass());
-			IClipboardSupport clipboardSupport2 = ClipboardUtil
-					.createClipboardSupport(level12book);
-
-			assertEquals(clipboardSupport, clipboardSupport2);
-		}
-	}
-}
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 e9f5035..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.clipboard.core/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 f8cd074..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.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.tests.runtime.emf.commands.core

-Bundle-Version: 1.5.0.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.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.tests.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.pde.runtime;bundle-version="[3.4.0,4.0.0)",

- org.eclipse.gmf.examples.runtime.diagram.logic.model;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 a8ebe5f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/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,\
-               about.html,\
-               test.xml
-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 984cb11..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.emf.commands.core/pom.xml b/org.eclipse.gmf.tests.runtime.emf.commands.core/pom.xml
deleted file mode 100644
index 7034e0b..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.commands.core</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.commands.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-   <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.commands.core</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.commands.core.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 cb32dd7..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.commands.core/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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.core/.classpath b/org.eclipse.gmf.tests.runtime.emf.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/.cvsignore b/org.eclipse.gmf.tests.runtime.emf.core/.cvsignore
deleted file mode 100644
index d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/.project b/org.eclipse.gmf.tests.runtime.emf.core/.project
deleted file mode 100644
index f70dda6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf.tests.runtime.emf.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.core/META-INF/MANIFEST.MF b/org.eclipse.gmf.tests.runtime.emf.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2c85015..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.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.core

-Bundle-Version: 1.5.0.qualifier

-Bundle-Activator: org.eclipse.gmf.tests.runtime.emf.core.Activator

-Bundle-Vendor: %Plugin.providerName

-Bundle-Localization: plugin

-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.emf.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",

- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.emf.workspace;bundle-version="[1.3.0,2.0.0)",

- org.eclipse.gmf.runtime.notation;bundle-version="[1.2.0, 2.0.0)"

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.gmf.tests.runtime.emf.core/about.html b/org.eclipse.gmf.tests.runtime.emf.core/about.html
deleted file mode 100644
index 4e37f7c..0000000
--- a/org.eclipse.gmf.tests.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>November 5, 2008</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.core/build.properties b/org.eclipse.gmf.tests.runtime.emf.core/build.properties
deleted file mode 100644
index 2069185..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2008  IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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,\
-               test.xml,\
-               test_models/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = test.xml
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/plugin.properties b/org.eclipse.gmf.tests.runtime.emf.core/plugin.properties
deleted file mode 100644
index ed81226..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# ==============================================================================
-#*+------------------------------------------------------------------------+
-#*| Copyright (c) 2008  IBM Corporation and others.                        |
-#*| All rights reserved. This program and the accompanying materials       |
-#*| are made available under the terms of the Eclipse Public License v1.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 Runtime EMF Core Tests
-Plugin.providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/pom.xml b/org.eclipse.gmf.tests.runtime.emf.core/pom.xml
deleted file mode 100644
index 2610d96..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.core</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
- <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.core</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.core.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <argLine>${tycho.testArgLine} -ea</argLine>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/Activator.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/Activator.java
deleted file mode 100644
index 8f25c4c..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/Activator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.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.core/src/org/eclipse/gmf/tests/runtime/emf/core/AllTests.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/AllTests.java
deleted file mode 100644
index c351f56..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/AllTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.gmf.tests.runtime.emf.core.resources.GMFResourceModificationManagerTests;
-import org.eclipse.gmf.tests.runtime.emf.core.util.EMFCoreUtilTests;
-
-public class AllTests extends TestCase implements IApplication {
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTest(GMFEditingDomainFactoryTests.suite());
-		suite.addTest(GMFResourceModificationManagerTests.suite());
-		suite.addTest(EMFCoreUtilTests.suite());
-		return suite;
-	}
-
-	public AllTests() {
-		super(""); //$NON-NLS-1$
-	}
-
-	public Object start(IApplicationContext context) throws Exception {
-		TestRunner.run(suite());
-		return Arrays
-				.asList(new String[] { "Please see raw test suite output for details." }); //$NON-NLS-1$
-	}
-
-	public void stop() {
-		// do nothing
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/BaseTests.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/BaseTests.java
deleted file mode 100644
index 2f803c4..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/BaseTests.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.osgi.framework.Bundle;
-
-
-/**
- * Base TestCase for emf core tests.
- */
-public class BaseTests
-	extends TestCase {
-	public static final Bundle BUNDLE =
-		Platform.getBundle("org.eclipse.gmf.tests.runtime.emf.core"); //$NON-NLS-1$
-	
-	protected IProject project;
-	protected TransactionalEditingDomain domain;
-	protected Resource testEcoreResource;
-	protected EPackage ecoreRoot;
-	protected Resource testNotationResource;
-	protected Diagram notationRoot;
-	
-	protected static final String PROJECT_NAME = "emfcoretests"; //$NON-NLS-1$
-	protected static final String ECORE_RESOURCE_NAME = "/" + PROJECT_NAME + "/emfcoretests.ecore";  //$NON-NLS-1$//$NON-NLS-2$
-	protected static final String NOTATION_RESOURCE_NAME = "/" + PROJECT_NAME + "/emfcorenotationtests.xmi";  //$NON-NLS-1$//$NON-NLS-2$
-
-	public BaseTests() {
-		super();
-	}
-	
-	public BaseTests(String name) {
-		super(name);
-	}
-	
-	//
-	// Test configuration methods
-	//
-	
-	protected void setUp()
-		throws Exception {
-		
-		boolean assertsEnabled = false;
-		assert (assertsEnabled = true) == true;
-		if (!assertsEnabled) {
-		 fail("Asserts must be enabled for this test case. Add the '-ea' VM argument to proceed.");//$NON-NLS-1$
-		}
-		
-		project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-		if (!project.exists()) {
-			project.create(null);
-		}
-		
-		project.open(null);
-	
-		domain = createEditingDomain();
-		
-		AbstractEMFOperation op = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				try {
-					Resource original = domain.loadResource(URI.createURI(
-							BUNDLE.getEntry("/test_models/test_model.ecore") //$NON-NLS-1$
-									.toString()).toString());
-
-					original.setURI(URI.createPlatformResourceURI(
-							NOTATION_RESOURCE_NAME, true));
-					original.save(Collections.EMPTY_MAP);
-					testEcoreResource = original;
-					ecoreRoot = (EPackage) find(testEcoreResource, "root"); //$NON-NLS-1$
-					
-					original = domain.loadResource(URI.createURI(
-							BUNDLE.getEntry("/test_models/test_notation_model.xmi") //$NON-NLS-1$
-									.toString()).toString());
-
-					original.setURI(URI.createPlatformResourceURI(
-							NOTATION_RESOURCE_NAME, true));
-					original.save(Collections.EMPTY_MAP);
-					testNotationResource = original;
-					notationRoot = (Diagram) find(testNotationResource, "root"); //$NON-NLS-1$
-				} catch (IOException e) {
-					fail("Failed to load test model: " + e.getLocalizedMessage()); //$NON-NLS-1$
-				}
-
-				return Status.OK_STATUS;
-			}
-		};
-		
-		try {
-			op.execute(new NullProgressMonitor(), null);
-		} catch (ExecutionException e) {
-			fail("Failed to load test model: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-	}
-	
-	/** May be overridden by subclasses to create non-default editing domains. */
-	protected TransactionalEditingDomain createEditingDomain() {
-		return GMFEditingDomainFactory.getInstance().createEditingDomain();
-	}
-
-	protected void tearDown()
-		throws Exception {
-		
-		ecoreRoot = null;
-		if (testEcoreResource != null) {
-			if (testEcoreResource.isLoaded()) {
-				testEcoreResource.unload();
-			}
-			
-			if (testEcoreResource.getResourceSet() != null) {
-				testEcoreResource.getResourceSet().getResources().remove(testEcoreResource);
-			}
-			testEcoreResource = null;
-		}
-		
-		if ((project != null) && project.exists()) {
-			project.delete(true, true, null);
-		}
-		
-		project = null;
-		domain = null;
-	}
-
-	//
-	// Other framework methods
-	//
-	
-	protected Resource createTestResource(String name) {
-		Resource result = null;
-		
-		try {
-			InputStream input =
-				BUNDLE.getEntry("/test_models/" + name).openStream(); //$NON-NLS-1$
-			
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(PROJECT_NAME + '/' + name));
-			file.create(input, true, null);
-			
-			result = domain.createResource(
-				URI.createPlatformResourceURI(file.getFullPath().toString(), true).toString());
-		} catch (Exception e) {
-			fail("Unexpected exception creating test resource: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		
-		return result;
-	}
-	
-	/**
-	 * 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$
-	}
-	
-	/**
-	 * Asserts that we can find an object having the specified name.
-	 * 
-	 * @param name the name to seek
-	 * 
-	 * @see #find(String)
-	 */
-	protected void assertFound(String name) {
-		assertNotNull("Did not find " + name, find(testEcoreResource, name)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Asserts that we can find an object having the specified name, relative
-	 * to the specified starting object.
-	 * 
-	 * @param start the object from which to start looking (to which the
-	 *     <code>name</code> is relative).  This can be a resource or an
-	 *     element
-	 * @param name the name to seek
-	 * 
-	 * @see #find(Object, String)
-	 */
-	protected void assertFound(Object start, String name) {
-		assertNotNull("Did not find " + name, find(testEcoreResource, name)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Asserts that we cannot find an object having the specified name.
-	 * 
-	 * @param name the name to (not) seek
-	 * 
-	 * @see #find(String)
-	 */
-	protected void assertNotFound(String name) {
-		assertNull("Found " + name, find(testEcoreResource, name)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Asserts that we cannot find an object having the specified name, relative
-	 * to the specified starting object.
-	 * 
-	 * @param start the object from which to start looking (to which the
-	 *     <code>name</code> is relative).  This can be a resource or an
-	 *     element
-	 * @param name the name to (not) seek
-	 * 
-	 * @see #find(Object, String)
-	 */
-	protected void assertNotFound(Object start, String name) {
-		assertNull("Found " + name, find(testEcoreResource, name)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Finds the object in the test model having the specified qualified name,
-	 * starting from some object.
-	 * 
-	 * @param object the starting object (resource or element)
-	 * @param qname a slash-delimited qualified name, relative to the
-	 *     provided <code>object</code>
-	 * @return the matching object, or <code>null</code> if not found
-	 */
-	protected EObject find(Object start, String qname) {
-		EObject result = null;
-		Object current = start;
-		
-		String[] names = tokenize(qname);
-		
-		for (int i = 0; (current != null) && (i < names.length); i++) {
-			String name = names[i];
-			result = null;
-			
-			for (EObject child : getContents(current)) {
-				
-				if (name.equals(getName(child))) {
-					result = child;
-					break;
-				}
-			}
-			
-			current = result;
-		}
-		
-		return result;
-	}
-
-	/**
-	 * Gets the name of a library object.
-	 * 
-	 * @param object the object
-	 * @return its name
-	 */
-	private String getName(EObject object) {
-		
-		if (object instanceof ENamedElement) {
-			return ((ENamedElement) object).getName();
-		} else if (object instanceof Diagram) {
-			return ((Diagram) object).getName();
-		}
-		return null;
-	}
-	
-	/**
-	 * Gets the contents of an object.
-	 * 
-	 * @param object an object, which may be a resource or an element
-	 * @return its immediate contents (children)
-	 */
-	private List<EObject> getContents(Object object) {
-		if (object instanceof EObject) {
-			return ((EObject) object).eContents();
-		} else if (object instanceof Resource) {
-			return ((Resource) object).getContents();
-		} else {
-			return Collections.emptyList();
-		}
-	}
-	
-	/**
-	 * Tokenizes a qualified name on the slashes.
-	 * 
-	 * @param qname a qualified name
-	 * @return the parts between the slashes
-	 */
-	private String[] tokenize(String qname) {
-		return qname.split("/"); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/GMFEditingDomainFactoryTests.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/GMFEditingDomainFactoryTests.java
deleted file mode 100644
index 3e91939..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/GMFEditingDomainFactoryTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.DefaultOperationHistory;
-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.Status;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.ResourceUndoContext;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-
-/**
- * Tests the GMF editing domain factory.
- * 
- * @author ldamus
- */
-public class GMFEditingDomainFactoryTests extends BaseTests {
-
-	private DefaultOperationHistory history;
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(GMFEditingDomainFactoryTests.class,
-				"GMFEditingDomainFactoryTests Test Suite"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		history = new DefaultOperationHistory();
-		super.setUp();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		history = null;
-	}
-
-	@Override
-	protected TransactionalEditingDomain createEditingDomain() {
-		return GMFEditingDomainFactory.getInstance().createEditingDomain(
-				history);
-	}
-
-	/**
-	 * Tests the resource undo policy for the
-	 * <code>GMFEditingDomainFactory</code>. <code>ResourceUndoContext</code>s
-	 * should not be added to operations because of notifications on transient
-	 * features. These are considered as not modifying the resource.
-	 */
-	public void test_transientNotifications() {
-		IUndoContext context = new ResourceUndoContext(domain,
-				testNotationResource);
-		IUndoableOperation op = new AbstractEMFOperation(domain,
-				"transientNotifications") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-
-				notationRoot.getTransientChildren().add(
-						NotationFactory.eINSTANCE.createNode());
-
-				return Status.OK_STATUS;
-			}
-		};
-
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-
-		assertFalse("Resource should not have context", op.hasContext(context));
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/resources/GMFResourceModificationManagerTests.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/resources/GMFResourceModificationManagerTests.java
deleted file mode 100644
index 95a917d..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/resources/GMFResourceModificationManagerTests.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core.resources;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.DefaultOperationHistory;
-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.Status;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.AbstractEMFOperation;
-import org.eclipse.emf.workspace.ResourceUndoContext;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceModificationManager;
-import org.eclipse.gmf.tests.runtime.emf.core.BaseTests;
-
-/**
- * Tests the management of the modified state of GMF resources as operations are
- * executed, undone and redone on the operation history. The modified state of
- * these resources is managed by the {@link GMFResourceModificationManager}.
- * 
- * @author ldamus
- */
-public class GMFResourceModificationManagerTests extends BaseTests {
-
-	private DefaultOperationHistory history;
-	
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(GMFResourceModificationManagerTests.class,
-				"GMFResourceModificationManagerTests Test Suite"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setUp() throws Exception {
-		history = new DefaultOperationHistory();
-		super.setUp();
-		testEcoreResource.setTrackingModification(true);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		history = null;
-	}
-
-	@Override
-	protected TransactionalEditingDomain createEditingDomain() {
-		return GMFEditingDomainFactory.getInstance().createEditingDomain(
-				history);
-	}
-
-	protected IUndoableOperation createOperation(String name) {
-		return new AbstractEMFOperation(domain, name) {
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-
-				ecoreRoot.getEClassifiers().add(
-						EcoreFactory.eINSTANCE.createEClass());
-
-				return Status.OK_STATUS;
-			}
-		};
-	}
-
-	/**
-	 * Tests that the resource reports that it is not modified when the history
-	 * is undone back to a given save point.
-	 */
-	public void test_execute_save_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-
-		IUndoableOperation op1 = createOperation("operation1"); //$NON-NLS-1$
-		IUndoableOperation op2 = createOperation("operation2"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op1, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// save --> not modified
-		try {
-			testEcoreResource.save(null);
-		} catch (IOException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op2, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-
-	/**
-	 * Tests that undo will return the resource to a modified state after a
-	 * save, and that a subsequent redo will return the resource back to its
-	 * unmodified state.
-	 */
-	public void test_execute_save_undo_redo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		IUndoableOperation op = createOperation("op"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// save --> not modified
-		try {
-			testEcoreResource.save(null);
-		} catch (IOException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// undo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// redo --> not modified
-		try {
-			history.redo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-
-	/**
-	 * Tests that the resource is modified after save followed by undo, but is
-	 * not modified after save followed by execute, followed by undo.
-	 */
-	public void test_execute_save_undo_save_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-
-		IUndoableOperation op1 = createOperation("operation1"); //$NON-NLS-1$
-		IUndoableOperation op2 = createOperation("operation2"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op1, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// save --> not modified
-		try {
-			testEcoreResource.save(null);
-		} catch (IOException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// undo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// save --> not modified
-		try {
-			testEcoreResource.save(null);
-		} catch (IOException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op2, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-
-	/**
-	 * Tests that the resource is modified after undo when there is more than
-	 * one operation on the history. Also, tests that the resource is modified
-	 * after save followed by redo.
-	 */
-	public void test_execute_execute_undo_save_redo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-
-		IUndoableOperation op1 = createOperation("operation1"); //$NON-NLS-1$
-		IUndoableOperation op2 = createOperation("operation2"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op1, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op2, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// save --> not modified
-		try {
-			testEcoreResource.save(null);
-		} catch (IOException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// redo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should not be modified", testEcoreResource.isModified());
-	}
-
-	/**
-	 * Tests that after the flush limit is exceeded for operations with a given
-	 * resource context, the resource continues to report that it is modified
-	 * even when all of the operations on the history have been undone.
-	 */
-	public void test_execute_flushLimit_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		history.setLimit(context, 1);
-		IUndoableOperation op1 = createOperation("op1"); //$NON-NLS-1$
-		IUndoableOperation op2 = createOperation("op2"); //$NON-NLS-1$
-
-		// execute --> modified
-		try {
-			history.execute(op1, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op2, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-		assertSame("Operation should have been flushed", history
-				.getUndoHistory(context).length, 1);
-
-		// undo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-	}
-
-	/**
-	 * Tests that if the isModified state of the resource is set to
-	 * <code>false</code> during the execution of an operation, subsequent
-	 * execute followed by undo will return the resource back to its unmodified
-	 * state.
-	 */
-	public void test_executeModifiedFalse_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		IUndoableOperation notModified = new AbstractEMFOperation(domain,
-				"notModified") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-
-				ecoreRoot.getEClassifiers().add(
-						EcoreFactory.eINSTANCE.createEClass());
-				ecoreRoot.eResource().setModified(false);
-
-				return Status.OK_STATUS;
-			}
-
-			@Override
-			public boolean canUndo() {
-				return false;
-			}
-
-			@Override
-			public boolean canRedo() {
-				return false;
-			}
-		};
-
-		IUndoableOperation op = createOperation("operation"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> not modified
-		try {
-			history.execute(notModified, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-
-	/**
-	 * Tests that if the isModified state of the resource is set to
-	 * <code>false</code> during the undo of an operation, subsequent
-	 * execute followed by undo will return the resource back to its unmodified
-	 * state.
-	 */
-	public void test_execute_undoModifiedFalse_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		IUndoableOperation notModified = new AbstractEMFOperation(domain,
-				"notModified") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-
-				ecoreRoot.getEClassifiers().add(
-						EcoreFactory.eINSTANCE.createEClass());
-				ecoreRoot.eResource().setModified(false);
-
-				return Status.OK_STATUS;
-			}
-			@Override
-			protected IStatus doUndo(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				IStatus status = super.doUndo(monitor, info);
-				ecoreRoot.eResource().setModified(false);
-				return status;
-			}
-		};
-
-		IUndoableOperation op = createOperation("operation"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> not modified
-		try {
-			history.execute(notModified, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-		
-		// execute --> modified
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-
-	/**
-	 * Tests that if the isModified state of the resource is set to
-	 * <code>false</code> during the redo of an operation, subsequent
-	 * execute followed by undo will return the resource back to its unmodified
-	 * state.
-	 */
-	public void test_execute_undo_redoModifiedFalse_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		IUndoableOperation notModified = new AbstractEMFOperation(domain,
-				"notModified") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-
-				ecoreRoot.getEClassifiers().add(
-						EcoreFactory.eINSTANCE.createEClass());
-				ecoreRoot.eResource().setModified(false);
-
-				return Status.OK_STATUS;
-			}
-			@Override
-			protected IStatus doUndo(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				IStatus status = super.doUndo(monitor, info);
-				ecoreRoot.eResource().setModified(false);
-				return status;
-			}
-
-			@Override
-			protected IStatus doRedo(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				IStatus status = super.doRedo(monitor, info);
-				ecoreRoot.eResource().setModified(false);
-				return status;
-			}
-		};
-
-		IUndoableOperation op = createOperation("operation"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> not modified
-		try {
-			history.execute(notModified, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// redo --> not modified
-		try {
-			history.redo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-		
-		// execute --> modified
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-	
-	/**
-	 * Tests that if only the isModified state of the resource is set to <true> then
-	 * <code>false</code> during the execution of an operation (no other change
-	 * to the resource), subsequent execute followed by undo will return the
-	 * resource back to its unmodified state.
-	 */
-	public void test_modifiedTrueFalse_execute_undo() {
-		IUndoContext context = new ResourceUndoContext(domain, testEcoreResource);
-		IUndoableOperation notModified = new AbstractEMFOperation(domain,
-				"notModified") { //$NON-NLS-1$
-			@Override
-			protected IStatus doExecute(IProgressMonitor monitor,
-					IAdaptable info) throws ExecutionException {
-				ecoreRoot.eResource().setModified(true);
-				ecoreRoot.eResource().setModified(false);
-
-				return Status.OK_STATUS;
-			}
-
-			@Override
-			public boolean canUndo() {
-				return false;
-			}
-
-			@Override
-			public boolean canRedo() {
-				return false;
-			}
-		};
-
-		IUndoableOperation op = createOperation("operation"); //$NON-NLS-1$
-
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> not modified
-		try {
-			history.execute(notModified, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-
-		// execute --> modified
-		try {
-			history.execute(op, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertTrue("Resource should be modified", testEcoreResource.isModified());
-
-		// undo --> not modified
-		try {
-			history.undo(context, null, null);
-		} catch (ExecutionException e) {
-			fail("Unexpected exception: " + e.getLocalizedMessage()); //$NON-NLS-1$
-		}
-		assertFalse("Resource should not be modified", testEcoreResource
-				.isModified());
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/util/EMFCoreUtilTests.java b/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/util/EMFCoreUtilTests.java
deleted file mode 100644
index 0fc2648..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/src/org/eclipse/gmf/tests/runtime/emf/core/util/EMFCoreUtilTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.core.util;
-
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EObject;
-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.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.core.resources.IExtendedResourceFactory;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.tests.runtime.emf.core.BaseTests;
-
-/**
- * Unit tests for <code>EMFCoreUtil</code>.
- * 
- * @author ldamus
- */
-public class EMFCoreUtilTests extends BaseTests {
-
-	public static String EMF_CORE_UTIL_TESTS_PROXY_ID = "EMFCoreUtilTests_proxyID";
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(EMFCoreUtilTests.class,
-				"EMFCoreUtilTests Test Suite"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Tests that when a resource factory override is registered for a proxy in
-	 * the <code>extensionToFactoryMap</code>, it will be used to provide the
-	 * proxy ID.
-	 */
-	public void test_getProxyID_288303() {
-
-		// Make the class element a proxy
-		EObject clazz = find(ecoreRoot, "class"); //$NON-NLS-1$
-		((InternalEObject) clazz).eSetProxyURI(EcoreUtil.getURI(clazz));
-
-		// Check the default proxy ID
-		String result = EMFCoreUtil.getProxyID(clazz);
-		assertEquals("Unexpected Proxy ID", "//class", result);
-
-		// Register a custom resource factory
-		ResourceSet resourceSet = domain.getResourceSet();
-		Map<String, Object> extensionToFactoryMap = resourceSet
-				.getResourceFactoryRegistry().getExtensionToFactoryMap();
-		Object original = extensionToFactoryMap
-				.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
-		extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-				new EMFCoreUtilTestsResourceFactory());
-
-		// Check the custom proxy ID
-		result = EMFCoreUtil.getProxyID(clazz);
-		assertEquals("Unexpected Proxy ID", EMF_CORE_UTIL_TESTS_PROXY_ID, result);
-
-		// Restore the original resource factory
-		extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-				original);
-	}
-
-	protected class EMFCoreUtilTestsResourceFactory extends ResourceFactoryImpl
-			implements IExtendedResourceFactory {
-
-		public String getProxyClassID(EObject proxy) {
-			return null;
-		}
-
-		public String getProxyID(EObject proxy) {
-			return EMF_CORE_UTIL_TESTS_PROXY_ID;
-		}
-
-		public String getProxyName(EObject proxy) {
-			return null;
-		}
-
-		public String getProxyQualifiedName(EObject proxy) {
-			return null;
-		}
-
-		public EObject resolve(TransactionalEditingDomain domain, EObject proxy) {
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/test.xml b/org.eclipse.gmf.tests.runtime.emf.core/test.xml
deleted file mode 100644
index 77d49eb..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/test.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright (c) 2008  IBM Corporation and others.                       -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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.core" />
-	<property name="classname" value="org.eclipse.gmf.tests.runtime.emf.core.AllTests" />
-	<property name="library-file" value="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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.core/test_models/test_model.ecore b/org.eclipse.gmf.tests.runtime.emf.core/test_models/test_model.ecore
deleted file mode 100644
index ae59603..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/test_models/test_model.ecore
+++ /dev/null
@@ -1,7 +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="root">
-  <eClassifiers xsi:type="ecore:EClass" name="class"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="enum"/>
-</ecore:EPackage>
diff --git a/org.eclipse.gmf.tests.runtime.emf.core/test_models/test_notation_model.xmi b/org.eclipse.gmf.tests.runtime.emf.core/test_models/test_notation_model.xmi
deleted file mode 100644
index f7508dd..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.core/test_models/test_notation_model.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" name="root">
-  <children/>
-</notation:Diagram>
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 304e861..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 4ea6ed1..0000000
--- a/org.eclipse.gmf.tests.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.tests.runtime.emf.type.core; singleton:=true

-Bundle-Version: 1.5.0.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.5.0,4.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",

- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 fca5b77..0000000
--- a/org.eclipse.gmf.tests.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/,\
-               .,\
-               model/,\
-               about.html,\
-               test.xml
-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 1ce41b8..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 Modeling Project
-# ====================================================================
-
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 66ea536..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/plugin.xml
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2005, 2010  IBM Corporation and others.                       -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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>
-   
-   <!-- EObject type for testing bugzilla 298661 -->
-   <extension
-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
-         <metamodel
-                nsURI="http://www.eclipse.org/emf/2002/Ecore">
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.298661.eObject"     
-                   name="EObject"
-                   eclass="EObject"> 
-           </metamodelType>
-         </metamodel>
-         <metamodel
-                nsURI="http:///org.eclipse.gmf.tests.runtime.emf.type.core/Employee.ecore">      
-           <metamodelType
-                   id="org.eclipse.gmf.tests.runtime.emf.type.core.298661.student"     
-                   name="Student"
-                   eclass="Student"> 
-           </metamodelType>
-         </metamodel>
-   </extension> 
-   
-   <!-- client context that is bound to the EObject type for bugzilla 298661 -->
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings">
-      <clientContext id="org.eclipse.gmf.tests.runtime.emf.type.core.298661_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.298661"/>
-         </enablement>
-      </clientContext> 
-
-      <binding 
-            context="org.eclipse.gmf.tests.runtime.emf.type.core.298661_context">
-         <elementType pattern="org.eclipse.gmf.tests.runtime.emf.type.core.298661.*"/>
-      </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/pom.xml b/org.eclipse.gmf.tests.runtime.emf.type.core/pom.xml
deleted file mode 100644
index b1e3ede..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.type.core</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.type.core</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-   <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.type.core</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.type.core.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <argLine>${tycho.testArgLine} -ea</argLine>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 cfb3479..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/AllTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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(MetamodelTypeTest.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 c3a567a..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, 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;
-
-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/MetamodelTypeTest.java b/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MetamodelTypeTest.java
deleted file mode 100644
index 80adaca..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/src/org/eclipse/gmf/tests/runtime/emf/type/core/MetamodelTypeTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
-
-public class MetamodelTypeTest extends TestCase {
-
-	private MetamodelType fixture;
-
-	public MetamodelTypeTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	public static Test suite() {
-		return new TestSuite(MetamodelTypeTest.class, "MetamodelType Tests"); //$NON-NLS-1$
-	}
-
-	protected MetamodelType getFixture() {
-		return fixture;
-	}
-
-	protected void setFixture(MetamodelType fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Verifies that the super types of an element type that extends
-	 * EModelElement will include the type for EObject.
-	 */
-	public void test_metamodelType_298661() {
-
-		setFixture((MetamodelType) ElementTypeRegistry.getInstance().getType(
-				"org.eclipse.gmf.tests.runtime.emf.type.core.298661.student")); //$NON-NLS-1$
-
-		MetamodelType eObjectType = (MetamodelType) ElementTypeRegistry
-				.getInstance()
-				.getType(
-						"org.eclipse.gmf.tests.runtime.emf.type.core.298661.eObject"); //$NON-NLS-1$
-
-		assertTrue("Missing EObject supertype", Arrays.asList(
-				getFixture().getAllSuperTypes()).contains(eObjectType));
-	}
-}
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 4172128..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.3 2009/01/23 16:09:59 aboyko 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 13afc5e..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.3 2009/01/23 16:09:59 aboyko 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 b572519..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 801a39a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.core/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 7ba5720..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.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.tests.runtime.emf.type.ui; singleton:=true

-Bundle-Version: 1.5.0.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

-Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.common.core;bundle-version="[1.2.0,2.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.emf.type.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.tests.runtime.emf.type.core;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.runtime.diagram.ui.geoshapes;bundle-version="[1.2.0,2.0.0)"

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 058f6ce..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/build.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                    |
-#*+------------------------------------------------------------------------+
-# ==============================================================================
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               test.xml
-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 1ce41b8..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 Modeling Project
-# ====================================================================
-
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/pom.xml b/org.eclipse.gmf.tests.runtime.emf.type.ui/pom.xml
deleted file mode 100644
index 8910de5..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.type.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.type.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-   <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.type.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.type.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <argLine>${tycho.testArgLine} -ea</argLine>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 001daf8..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.type.ui/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 817964f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.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.tests.runtime.emf.ui.properties
-Bundle-Version: 1.5.0.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.5.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.views;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gmf.runtime.emf.ui.properties;bundle-version="1.2.0",
- org.eclipse.emf.transaction;bundle-version="[1.3.0,2.0.0)",
- org.junit;bundle-version="[3.8.0,5.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 1b8f940..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, 2007</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 a8ebe5f..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/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,\
-               about.html,\
-               test.xml
-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 23d21d8..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 Modeling Project
\ No newline at end of file
diff --git a/org.eclipse.gmf.tests.runtime.emf.ui.properties/pom.xml b/org.eclipse.gmf.tests.runtime.emf.ui.properties/pom.xml
deleted file mode 100644
index 4721287..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.ui.properties</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.ui.properties</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-   <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.ui.properties</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.ui.properties.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <argLine>${tycho.testArgLine} -ea</argLine>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 087ba1a..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/AllTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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;
-import org.eclipse.gmf.tests.runtime.emf.ui.properties.sections.UndoableModelPropertySectionTest;
-
-/**
- * @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.addTestSuite(UndoableModelPropertySectionTest.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$
-	}
-
-}
\ 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/sections/UndoableModelPropertySectionTest.java b/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/sections/UndoableModelPropertySectionTest.java
deleted file mode 100644
index b7ef1ec..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/src/org/eclipse/gmf/tests/runtime/emf/ui/properties/sections/UndoableModelPropertySectionTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Obeo and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Mariot Chauvin <mariot.chauvin@obeo.fr> - initial API and implementation 
- ****************************************************************************/
-
-
-package org.eclipse.gmf.tests.runtime.emf.ui.properties.sections;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.operations.IOperationHistory;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-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.EPackage;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.RecordingCommand;
-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.runtime.emf.ui.properties.sections.PropertySheetEntry;
-import org.eclipse.gmf.runtime.emf.ui.properties.sections.UndoableModelPropertySheetEntry;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- *@author mchauvin 
- */
-public class UndoableModelPropertySectionTest extends TestCase {
-
-	
-	/**
-	 * @see bug 303184
-	 */
-	public void testEditorValueConsistentIfOperationIsCanceled() {
-		
-		TransactionalEditingDomain domain = createEditingDomain();
-	   
-		final Resource resource = domain.getResourceSet().createResource(URI.createURI("test.ecore"));
-		
-		final EPackage testPackage = createEPackage("test");
-		final EPackage goodPackage = createEPackage("good one");
-		final EPackage shouldBeCanceledPackage = createEPackage("should be canceled");
-		
-		
-		domain.getCommandStack().execute(new RecordingCommand(domain) {
-			@Override
-			protected void doExecute() {
-				resource.getContents().add(testPackage);
-				resource.getContents().add(goodPackage);
-				resource.getContents().add(shouldBeCanceledPackage);
-			}
-		});
-		
-		
-		final UndoableModelPropertySheetEntryForTest root = new UndoableModelPropertySheetEntryForTest(OperationHistoryFactory.getOperationHistory());
-	    root.setEditingDomain(domain);
-	    IPropertySourceProvider provider = new IPropertySourceProvider() {
-			public IPropertySource getPropertySource(Object value) {
-				return new PropertySourceForTests((EPackage) value);
-			}
-		}; 
-	    root.setPropertySourceProvider(provider);
-	    final EPackage[] values = {testPackage};
-	    root.setValues(values);
-	    
-	    
-	    final UndoableModelPropertySheetEntryForTest entry = (UndoableModelPropertySheetEntryForTest) root.createChildEntry();
-	    entry.setValues(values);
-	    entry.setPropertySourceProvider(provider);
-	    
-	    entry.setValue(goodPackage);
-	    assertEquals(goodPackage, entry.getValueForTest());
-	   
-	    addPostCommitListenerToCancelTransaction(domain);
-	    
-	    entry.setValue(shouldBeCanceledPackage);
-	    assertEquals(goodPackage, entry.getValueForTest());
-	}
-	
-	 private TransactionalEditingDomain createEditingDomain() {
-	        return TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
-	 }
-	
-	 private EPackage createEPackage(final String name) {
-			final EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
-			ePackage.setName(name);
-			return ePackage;
-	 }
-	 
-	 private void addPostCommitListenerToCancelTransaction(TransactionalEditingDomain domain) {
-		    domain.addResourceSetListener(new ResourceSetListenerImpl(NotificationFilter.ANY) {
-	            @Override
-	            public boolean isPrecommitOnly() {
-	                return true;
-	            }
-
-				@Override
-	            public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
-	                throw new RollbackException(Status.CANCEL_STATUS);
-	            }
-	        });
-	 }
-	 
-	private final class UndoableModelPropertySheetEntryForTest extends UndoableModelPropertySheetEntry {
-
-		public UndoableModelPropertySheetEntryForTest(IOperationHistory operationHistory) {
-			super(operationHistory);
-			descriptor = new TextPropertyDescriptor("id", "display");
-		}
-		
-		@Override
-		public void setValue(Object newValue) {
-			super.setValue(newValue);
-		}
-		
-		public Object getValueForTest() {
-			return editValue;
-		}
-
-		@Override
-		public PropertySheetEntry createChildEntry() {
-			UndoableModelPropertySheetEntryForTest child  = new UndoableModelPropertySheetEntryForTest(getOperationHistory());
-			child.parent = this;
-			return child;
-		}		
-	}
-	
-	private final class PropertySourceForTests implements IPropertySource {
-
-		private boolean isSet;
-		
-		private EPackage ePackage;
-		
-		public PropertySourceForTests(EPackage ePackage) {
-			this.ePackage = ePackage;
-		}
-		
-		public Object getEditableValue() {
-			return ePackage.getName();
-		}
-
-		public IPropertyDescriptor[] getPropertyDescriptors() {
-			return null;
-		}
-
-		public Object getPropertyValue(Object id) {
-			return ePackage.getName();
-		}
-
-		public boolean isPropertySet(Object id) {
-			return isSet;
-		}
-
-		public void resetPropertyValue(Object id) {
-			isSet = false;
-		}
-
-		public void setPropertyValue(Object id, Object value) {
-			this.ePackage.setName((String) value);
-			isSet = true;
-		}
-		
-	}
-}
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 0d655c0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui.properties/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 df87d7b..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/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.emf.ui;singleton:=true

-Bundle-Version: 1.5.0.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,5.0.0)",

- org.eclipse.gmf.runtime.emf.ui;bundle-version="[1.2.0,2.0.0)",

- org.eclipse.gmf.tests.runtime.common.core;bundle-version="[1.2.0,2.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 f3f6868..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.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 = plugin.properties,\
-               *.jar,\
-               META-INF/,\
-               .,\
-               about.html,\
-               test.xml
-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 91daa1b..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 Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/plugin.xml b/org.eclipse.gmf.tests.runtime.emf.ui/plugin.xml
deleted file mode 100644
index 7530aa1..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- Copyright (c) 2008  IBM Corporation and others.                       -->
-<!-- All rights reserved. This program and the accompanying materials      -->
-<!-- are made available under the terms of the Eclipse Public License v1.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>
-   
-   <!-- testStaticMethodInExtension -->
-   <extension
-         point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders">
-      <modelingAssistantProvider
-            class="org.eclipse.gmf.tests.runtime.emf.ui.ModelingAssistantServiceTests$MyModelingAssistantProviderViaXML">
-         <Priority
-               name="Lowest">
-         </Priority>
-         <object
-               class="org.eclipse.gmf.tests.runtime.emf.ui.ModelingAssistantServiceTests$MyElementType"
-               id="MyElementType">
-            <staticMethod
-                  name="org.eclipse.gmf.tests.runtime.emf.ui/org.eclipse.gmf.tests.runtime.emf.ui.ModelingAssistantServiceTests.myStaticMethod()"
-                  value="true"/>
-         </object>
-         <context
-               elements="MyElementType">
-         </context>
-      </modelingAssistantProvider>
-   </extension>
-   
-</plugin>
diff --git a/org.eclipse.gmf.tests.runtime.emf.ui/pom.xml b/org.eclipse.gmf.tests.runtime.emf.ui/pom.xml
deleted file mode 100644
index 2262fd6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.emf.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.emf.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
- <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.emf.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.emf.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-     <argLine>${tycho.testArgLine} -ea</argLine>
-     <dependencies>
-   	      <!-- Need to add this dependency to have platform-specific fragment -->
-            <dependency>
-              <type>p2-installable-unit</type>
-              <artifactId>org.eclipse.gmf.tests.runtime.feature.group</artifactId><!-- maybe best to use org.eclipse.gmf.runtime.rcp-feature -->
-              <version>0.0.0</version>
-            </dependency>
-    	</dependencies>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 18fd0d6..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/src/org/eclipse/gmf/tests/runtime/emf/ui/ModelingAssistantServiceTests.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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.
-	 */
-	public static 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 static boolean shouldBeContributed = false;
-
-	public static boolean myStaticMethod() {
-        return shouldBeContributed;
-    }
-
-    public static class MyModelingAssistantProviderViaXML
-        extends ModelingAssistantProvider {
-
-        public List getTypesForPopupBar(IAdaptable host) {
-            if (host.getAdapter(MyElementType.class) != null) {
-                return Collections.singletonList(new MyElementType("TYPE1")); //$NON-NLS-1$
-            } else {
-                return Collections.EMPTY_LIST;
-            }
-        }
-    }
-		
-	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()));
-	}
-	
-	  
-    /**
-     * Tests the ability of a client to use a static method to assist in
-     * identifying the editor in the extension point XML.This test uses the
-     * modeling assistant extension point defined in the XML for this plugin.
-     * 
-     * @throws Exception
-     */
-    //public void testStaticMethodInExtension()
-    //    throws Exception {
-
-    //    shouldBeContributed = true;
-    //    assertTrue(!ModelingAssistantService.getInstance().getTypesForPopupBar(
-    //        new MyElementType("TYPE1")).isEmpty());
-
-    //    shouldBeContributed = false;
-    //    assertTrue(ModelingAssistantService.getInstance().getTypesForPopupBar(
-    //        new MyElementType("TYPE1")).isEmpty());
-
-    //}   
-
-}
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 80c40ae..0000000
--- a/org.eclipse.gmf.tests.runtime.emf.ui/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 472ee29..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 d567ba0..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-target
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 30b3890..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.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.gef.ui

-Bundle-Version: 1.5.0.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.2.0,2.0.0)",

- org.eclipse.draw2d;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",

- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

- org.junit;bundle-version="[3.8.0,5.0.0)",

- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"

-Bundle-ActivationPolicy: lazy

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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 1b8f940..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, 2007</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 39c0133..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.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,\
-               META-INF/,\
-               .,\
-               about.html,\
-               test.xml
-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 115b98c..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 Modeling Project
diff --git a/org.eclipse.gmf.tests.runtime.gef.ui/pom.xml b/org.eclipse.gmf.tests.runtime.gef.ui/pom.xml
deleted file mode 100644
index 2e72945..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>tests</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf.tests.runtime.gef.ui</groupId>
-  <artifactId>org.eclipse.gmf.tests.runtime.gef.ui</artifactId>
-  <version>1.5.0.qualifier</version>
-  <packaging>eclipse-test-plugin</packaging>
-   <build>
-  <plugins>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-surefire-plugin</artifactId>
-    <version>${tycho-version}</version>
-    <configuration>
-     <testSuite>org.eclipse.gmf.tests.runtime.gef.ui</testSuite>
-     <testClass>org.eclipse.gmf.tests.runtime.gef.ui.AllTests</testClass>
-     <useUIHarness>true</useUIHarness>
-     <useUIThread>true</useUIThread>
-    </configuration>
-    </plugin>
-    </plugins>      
-  </build>
-</project>
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 5665d69..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/src/org/eclipse/gmf/tests/runtime/gef/ui/FigureSlidableAnchorTests.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this 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
- *
- */
-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);
-		assertEquals(p2.preciseX(), reference.preciseX(), 0);
-
-		// Sliding anchor test inside figure's bounds
-		p1 = new Point(110,200); 
-		p2 = new Point(112,300); 
-		anchor = fig.getSourceConnectionAnchorAt(p1);
-		reference = anchor.getLocation(p2);
-		assertEquals(p2.preciseX(), reference.preciseX(), 0);
-	}
-	
-	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));
-		assertEquals(p2.preciseY(), reference.preciseY(), 0);
-	}
-	
-	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();
-		assertEquals(0, reference.preciseX(), 0);
-		assertEquals(0, reference.preciseY(), 0);
-
-		// Sliding anchor test inside figure's bounds
-		p = new Point(8,8); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertEquals(p.preciseX(), reference.preciseX(), 0);
-		assertEquals(p.preciseY(), reference.preciseY(), 0);
-
-		// Sliding anchor test outside figure's bounds
-		p = new Point(12,12); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertEquals(10, reference.preciseX(), 0);
-		assertEquals(10, reference.preciseY(), 0);
-		
-		p = new Point(15,0); 
-		anchor = fig.getSourceConnectionAnchorAt(p);
-		reference = anchor.getReferencePoint();
-		assertEquals(10, reference.preciseX(), 0);
-		assertEquals(0, reference.preciseY(), 0);
-	}
-	
-	public void testAnchorLocationOnPolygonFigure() {
-		DiamondFigure fig = new DiamondFigure(new Dimension(1058, 1058));
-		fig.setBounds(Rectangle.SINGLETON);
-		fig.getBounds().setLocation(-100,-100);
-		fig.getBounds().setSize(200,200);
-		Point reference = new Point(200,0);
-		
-		// Default anchor location
-		Point position = new Point(20,20);
-		ConnectionAnchor anchor = fig.getSourceConnectionAnchorAt(position);
-		Point location = anchor.getLocation(reference);
-		assertEquals(100, location.preciseX(), 0);
-		assertEquals(0, location.preciseY(), 0);
-		
-		// Sliding anchor location inside the figure
-		position = new Point(-80,0);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertEquals(100, location.preciseX(), 0);
-		assertEquals(0, location.preciseY(), 0);
-		
-		// Sliding anchor location outside the figure
-		position = new Point(100,100);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertEquals(100, location.preciseX(), 0);
-		assertEquals(0, location.preciseY(), 0);
-		
-		// Sliding anchor location on the diamond shape vertex
-		position = new Point(100,50);
-		anchor = fig.getSourceConnectionAnchorAt(position);
-		location = anchor.getLocation(reference);
-		assertEquals(0, location.preciseX(), 0);
-		assertEquals(100, location.preciseY(), 0);
-
-		// Reference inside the figure
-		reference = new Point(-20,50);
-		location = anchor.getLocation(reference);
-		assertEquals(-50, location.preciseX(), 0);
-		assertEquals(50, location.preciseY(), 0);
-		
-		// Reference and anchor's position are equal
-		reference = new Point(100,50);
-		location = anchor.getLocation(reference);
-		assertEquals(200d/3d, location.preciseX(), 0);
-		assertEquals(100d/3d, location.preciseY(), 0);
-		
-		// Reference 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);
-		assertEquals(0, location.preciseX(), 0);
-		assertEquals(0, location.preciseY(), 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 90c24ee..0000000
--- a/org.eclipse.gmf.tests.runtime.gef.ui/test.xml
+++ /dev/null
@@ -1,64 +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="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/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">
-		<mkdir dir="${results}/consolelogs" />
-		<copy failonerror="false" file="${eclipse-home}/results/${classname}.txt" tofile="${results}/consolelogs/${classname}_${platform}.metadata.log.txt" />
-	</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="junits" 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 c835067..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 0d0a7a4..0000000
--- a/org.eclipse.gmf/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.gmf</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.gmf/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.gmf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cc2dd5d..0000000
--- a/org.eclipse.gmf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Nov 10 22:01:38 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.gmf/META-INF/MANIFEST.MF b/org.eclipse.gmf/META-INF/MANIFEST.MF
deleted file mode 100644
index ba1d9de..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.4.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmf/about.html b/org.eclipse.gmf/about.html
deleted file mode 100644
index 1b8f940..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, 2007</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 344dd1b..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 Modeling Project
diff --git a/org.eclipse.gmf/pom.xml b/org.eclipse.gmf/pom.xml
deleted file mode 100644
index 7a17f39..0000000
--- a/org.eclipse.gmf/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.gmf-runtime</groupId>
-    <artifactId>plugins</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.eclipse.gmf-runtime</groupId>
-  <artifactId>org.eclipse.gmf</artifactId>
-  <version>1.4.1.qualifier</version>
-  <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file